xserver-xorg-video-openchrome: Changes to 'debian-experimental'
Rebased ref, commits from common ancestor:
commit 31c3cb985a8d420edd5198f21732e811e3eb5d21
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 14 18:34:55 2008 +0200
Build against xserver 1.5.
diff --git a/debian/changelog b/debian/changelog
index a37b29e..502ae9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-openchrome (1:0.2.902+svn579-3) experimental; urgency=low
+
+ * Build against xserver 1.5.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 14 Sep 2008 18:34:49 +0200
+
xserver-xorg-video-openchrome (1:0.2.902+svn579-2) unstable; urgency=low
[ Raphael Geissert ]
diff --git a/debian/control b/debian/control
index 2ffb643..62652a6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Raphael Geissert <atomo64@gmail.com>
-Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake, libtool, pkg-config, xserver-xorg-dev (>= 2:1.3.0.0), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, x11proto-xf86dri-dev, x11proto-video-dev, x11proto-gl-dev, libdrm-dev (>> 2.0), libx11-dev, libgl1-mesa-dev | libgl1-dev, libxvmc-dev, quilt
+Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake, libtool, pkg-config, xserver-xorg-dev (>= 2:1.5), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, x11proto-xf86dri-dev, x11proto-video-dev, x11proto-gl-dev, libdrm-dev (>> 2.0), libx11-dev, libgl1-mesa-dev | libgl1-dev, libxvmc-dev, quilt
Build-Conflicts: autoconf2.13
Standards-Version: 3.8.0
Homepage: http://www.openchrome.org
commit 22c2d273341904aefcd2093df6f7e5ff9e162088
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 14 17:53:20 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index a6a4f9c..a37b29e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-video-openchrome (1:0.2.902+svn579-1+lenny1) unstable; urgency=low
+xserver-xorg-video-openchrome (1:0.2.902+svn579-2) unstable; urgency=low
+ [ Raphael Geissert ]
* Cherry-picked the following changesets adding support for new cards:
+ 580: MSI VR321
+ 583: Foxconn P4M9007MB-8RS2H
@@ -7,7 +8,7 @@ xserver-xorg-video-openchrome (1:0.2.902+svn579-1+lenny1) unstable; urgency=low
+ 589: Gigabyte M704 / RoverPC A700GQ
+ 581: ECS CLE266
- -- Raphael Geissert <atomo64@gmail.com> Wed, 20 Aug 2008 21:47:28 -0500
+ -- Julien Cristau <jcristau@debian.org> Sun, 14 Sep 2008 17:52:58 +0200
xserver-xorg-video-openchrome (1:0.2.902+svn579-1) unstable; urgency=low
commit 4de54ce031a4bdb33d0c716d00c5d4816cc6f98d
Author: Raphael Geissert <atomo64@gmail.com>
Date: Wed Aug 20 21:59:53 2008 -0500
Added some overrides
diff --git a/debian/overrides b/debian/overrides
index 847b813..e441ab4 100644
--- a/debian/overrides
+++ b/debian/overrides
@@ -1,3 +1,5 @@
xserver-xorg-video-openchrome: non-dev-pkg-with-shlib-symlink usr/lib/libchromeXvMCPro.so.1.0.0 usr/lib/libchromeXvMCPro.so
xserver-xorg-video-openchrome: non-dev-pkg-with-shlib-symlink usr/lib/libchromeXvMC.so.1.0.0 usr/lib/libchromeXvMC.so
xserver-xorg-video-openchrome: package-name-doesnt-match-sonames libchromeXvMC1 libchromeXvMCPro1
+xserver-xorg-video-openchrome: no-symbols-control-file usr/lib/libchromeXvMCPro.so.1.0.0
+xserver-xorg-video-openchrome: no-symbols-control-file usr/lib/libchromeXvMC.so.1.0.0
commit 3ad2facae369d12bcecc10f72e0233e3b26c1771
Author: Raphael Geissert <atomo64@gmail.com>
Date: Wed Aug 20 21:50:59 2008 -0500
Added new changelog entry
diff --git a/debian/changelog b/debian/changelog
index 72ebc45..a6a4f9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-openchrome (1:0.2.902+svn579-1+lenny1) unstable; urgency=low
+
+ * Cherry-picked the following changesets adding support for new cards:
+ + 580: MSI VR321
+ + 583: Foxconn P4M9007MB-8RS2H
+ + 586: MSI K9MM-V
+ + 589: Gigabyte M704 / RoverPC A700GQ
+ + 581: ECS CLE266
+
+ -- Raphael Geissert <atomo64@gmail.com> Wed, 20 Aug 2008 21:47:28 -0500
+
xserver-xorg-video-openchrome (1:0.2.902+svn579-1) unstable; urgency=low
[ Timo Aaltonen ]
commit aceecbbc920016208c3168b35b5ce8c427dfa5cd
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Mon Jul 14 20:33:32 2008 +0000
ECS CLE266 (reported by Mohammed Abd El Hameed)
git-svn-id: http://svn.openchrome.org/svn/trunk@581 e8d65cb0-85f4-0310-8831-c60e2a5ce829
(cherry picked from commit 0e4b70c57b375cf7414052366226febeaf81cd5f)
diff --git a/src/via_id.c b/src/via_id.c
index fafe724..a231385 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -39,6 +39,7 @@
*/
static struct ViaCardIdStruct ViaCardId[] = {
/*** CLE266 ***/
+ {"ECS CLE266 (1.0)", VIA_CLE266, 0x1019, 0x1B43, VIA_DEVICE_CRT | VIA_DEVICE_TV},
{"LT21 VA28", VIA_CLE266, 0x1019, 0x1B44, VIA_DEVICE_CRT},
{"ECS G320", VIA_CLE266, 0x1019, 0xB320, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Asustek Terminator C3V", VIA_CLE266, 0x1043, 0x8155, VIA_DEVICE_CRT},
commit 64833f585bf13eb5dd42cc085de27af94e13c338
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Wed Aug 20 20:44:27 2008 +0000
Gigabyte M704 / RoverPC A700GQ
git-svn-id: http://svn.openchrome.org/svn/trunk@589 e8d65cb0-85f4-0310-8831-c60e2a5ce829
(cherry picked from commit adbe20d5b3029f9b5d8f13666e66010d80e077d7)
diff --git a/src/via_id.c b/src/via_id.c
index 99ca16f..fafe724 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -195,6 +195,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Samsung Q1B", VIA_CX700, 0x144D, 0xC02C, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"FIC CE260", VIA_CX700, 0x1509, 0x2D30, VIA_DEVICE_LCD},
{"FIC CE261", VIA_CX700, 0x1509, 0x2F07, VIA_DEVICE_LCD},
+ {"Gigabyte M704 / RoverPC A700GQ", VIA_CX700, 0x161F, 0x2060, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Packard Bell EasyNote XS", VIA_CX700, 0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */
/*** P4M890, VN890 ***/
commit da3980bd941c882328161bbccf2073a12eb06a53
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Tue Aug 12 13:14:18 2008 +0000
MSI K9MM-V
git-svn-id: http://svn.openchrome.org/svn/trunk@586 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index 3d378b7..99ca16f 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -94,6 +94,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"MSI K8M Neo-V", VIA_K8M800, 0x1462, 0x0320, VIA_DEVICE_CRT},
{"MSI K8MM-V", VIA_K8M800, 0x1462, 0x7142, VIA_DEVICE_CRT},
{"MSI K8MM3-V", VIA_K8M800, 0x1462, 0x7181, VIA_DEVICE_CRT},
+ {"MSI K9MM-V", VIA_K8M800, 0x1462, 0x7312, VIA_DEVICE_CRT},
{"MSI K8MM-ILSR", VIA_K8M800, 0x1462, 0x7410, VIA_DEVICE_CRT},
{"Abit KV-80", VIA_K8M800, 0x147B, 0x1419, VIA_DEVICE_CRT},
{"Abit KV-81", VIA_K8M800, 0x147B, 0x141A, VIA_DEVICE_CRT},
commit 5bdedaff47ac416b2a970b270e03abe8c193a0cb
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Wed Jul 23 14:23:49 2008 +0000
Foxconn P4M9007MB-8RS2H (reported by Stephen Yu)
git-svn-id: http://svn.openchrome.org/svn/trunk@583 e8d65cb0-85f4-0310-8831-c60e2a5ce829
(cherry picked from commit fa8d2e2fc566d7921a31c3ab4d653a31162ecc82)
diff --git a/src/via_id.c b/src/via_id.c
index cc81923..3d378b7 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -169,6 +169,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Hewlett Packard 2133 Mini-Note", VIA_P4M900, 0x103C, 0x3030, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Asustek P5VD2-VM", VIA_P4M900, 0x1043, 0x81CE, VIA_DEVICE_CRT},
{"Asustek P5VD2-VM SE", VIA_P4M900, 0x1043, 0x8252, VIA_DEVICE_CRT},
+ {"Foxconn P4M9007MB-8RS2H", VIA_P4M900, 0x105B, 0x0C87, VIA_DEVICE_CRT},
{"Mitac 8515", VIA_P4M900, 0x1071, 0x8515, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Medion Notebook MD96483", VIA_P4M900, 0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Mitac 8624", VIA_P4M900, 0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
commit 042283ff97a1365cfede82c262859dc436cab719
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Mon Jul 7 19:21:30 2008 +0000
MSI VR321 (reported by Kot Cheshirsky)
git-svn-id: http://svn.openchrome.org/svn/trunk@580 e8d65cb0-85f4-0310-8831-c60e2a5ce829
(cherry picked from commit e50f06a219452ebc12b12c6bc6a4e39454eb9c2a)
diff --git a/src/via_id.c b/src/via_id.c
index 6f7a0f9..cc81923 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -174,6 +174,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Mitac 8624", VIA_P4M900, 0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"VIA VT3364 (P4M900)", VIA_P4M900, 0x1106, 0x3371, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Gigabyte GA-VM900M", VIA_P4M900, 0x1458, 0xD000, VIA_DEVICE_CRT},
+ {"MSI VR321", VIA_P4M900, 0x1462, 0x3355, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"MSI P4M900M / P4M900M2-F/L", VIA_P4M900, 0x1462, 0x7255, VIA_DEVICE_CRT},
{"Everex NC1501/NC1503", VIA_P4M900, 0x1509, 0x1E30, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Clevo M660SE", VIA_P4M900, 0x1558, 0x0664, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
commit 778397f2b58003755bb9f45d1cbaed5d2135e067
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 12 21:29:17 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index c4232ec..72ebc45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-openchrome (1:0.2.902+svn579-1) UNRELEASED; urgency=low
+xserver-xorg-video-openchrome (1:0.2.902+svn579-1) unstable; urgency=low
[ Timo Aaltonen ]
* debian/patches/01_gen_pci_ids.diff:
@@ -21,7 +21,7 @@ xserver-xorg-video-openchrome (1:0.2.902+svn579-1) UNRELEASED; urgency=low
* Removed a useless lintian override
* Install a symlink to xserver-xorg-core's bugreport script
- -- Raphael Geissert <atomo64@gmail.com> Thu, 19 Jun 2008 23:39:43 -0500
+ -- Julien Cristau <jcristau@debian.org> Sat, 12 Jul 2008 21:29:00 +0200
xserver-xorg-video-openchrome (1:0.2.902+svn570-1) unstable; urgency=low
commit 4a56a50d718a6a52ded88a657746fafe13de94ec
Author: Raphael Geissert <atomo64@gmail.com>
Date: Mon Jun 30 18:28:42 2008 -0500
Updating revision
diff --git a/debian/changelog b/debian/changelog
index 72a3185..c4232ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-openchrome (1:0.2.902+svn578-1) UNRELEASED; urgency=low
+xserver-xorg-video-openchrome (1:0.2.902+svn579-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* debian/patches/01_gen_pci_ids.diff:
commit 2dc54927ca132094fa0e283bdea09c31001f5ba6
Author: Raphael Geissert <atomo64@gmail.com>
Date: Mon Jun 30 18:22:15 2008 -0500
s/find/filter
diff --git a/debian/changelog b/debian/changelog
index c0eb849..72a3185 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ xserver-xorg-video-openchrome (1:0.2.902+svn578-1) UNRELEASED; urgency=low
+ Disables XvDMA for P4M890 and K8M890, as it is broken.
+ Enables CLE video engine on VM800/CN700.
* Bump Standards-Version to 3.8.0
- + Use find instead of findstring for DEB_BUILD_OPTIONS parsing in d/rules
+ + Use filter instead of findstring for DEB_BUILD_OPTIONS parsing in d/rules
* Stripped enclosing chevrons from the unichrome link (Closes: #485957)
- p.d.o displays the link with or without them, and looks ugly
* Removed a useless lintian override
diff --git a/debian/rules b/debian/rules
index 57ae5d5..8ddf7b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
DEB_CONFIGURE_EXTRA_FLAGS += --host=$(DEB_HOST_GNU_TYPE)
endif
-ifneq (,$(find debug,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
DEB_CONFIGURE_EXTRA_FLAGS += \
--enable-debug=yes \
--enable-xv-debug=yes
commit 6a550146a28b5b4c907531059a61fc73d6cbaca6
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Mon Jun 30 22:33:04 2008 +0000
fix interpolation for CN400
git-svn-id: http://svn.openchrome.org/svn/trunk@579 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 0287e78..a937edf 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -823,6 +823,9 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
pVia->agpEnable = FALSE;
pVia->DRIIrqEnable = FALSE;
break;
+ case VIA_PM800:
+ pVia->VideoEngine = VIDEO_ENGINE_CME;
+ break;
case VIA_VM800:
pVia->agpEnable = FALSE;
break;
@@ -839,7 +842,6 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
pVia->dmaXV = FALSE;
break;
case VIA_CX700:
- case VIA_PM800:
pVia->VideoEngine = VIDEO_ENGINE_CME;
pVia->swov.maxWInterp = 1920;
pVia->swov.maxHInterp = 1080;
commit 56aedafe24e9ee727367c5625d1827bfcad041a1
Author: Raphael Geissert <atomo64@gmail.com>
Date: Sat Jun 28 22:19:12 2008 -0500
Update reference to upstream's revision in changelog
diff --git a/debian/changelog b/debian/changelog
index 747f4e2..c0eb849 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-openchrome (1:0.2.902+svn577-1) UNRELEASED; urgency=low
+xserver-xorg-video-openchrome (1:0.2.902+svn578-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* debian/patches/01_gen_pci_ids.diff:
commit 2d40b7d9b65a8a32fbd6bd8ee38ef6698b3bd7ab
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Thu Jun 26 21:55:46 2008 +0000
re-enable XV on panel for VM800
git-svn-id: http://svn.openchrome.org/svn/trunk@578 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_swov.c b/src/via_swov.c
index 2a13419..e85d0ba 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -1727,7 +1727,8 @@ Upd_Video(ScrnInfoPtr pScrn, unsigned long videoFlag,
* FIXME:
* Enable video on secondary
*/
- if (pVia->VideoEngine == VIDEO_ENGINE_CME
+ if ((pVia->VideoEngine == VIDEO_ENGINE_CME
+ || pVia->Chipset == VIA_VM800)
&& pVia->pBIOSInfo->PanelActive) {
/* V1_ON_SND_DISPLAY */
vidCtl |= 0x80000000;
commit 35d572278ab77763f782f95c822f5dad72178b5e
Author: Raphael Geissert <atomo64@gmail.com>
Date: Sat Jun 21 10:55:01 2008 -0500
Add openchrome.ids bug closer
diff --git a/debian/changelog b/debian/changelog
index 5d88f2a..747f4e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ xserver-xorg-video-openchrome (1:0.2.902+svn577-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* debian/patches/01_gen_pci_ids.diff:
- This patch adds a list of pci id's that the driver supports so that
- the server can automatically load it. Stolen from via.
+ the server can automatically load it. Stolen from via. (Closes: #487327)
* debian/control:
- Add quilt to build-deps.
* debian/rules:
commit c5c9d9ffcc17d044df0068b999f56828ecb15838
Author: Raphael Geissert <atomo64@gmail.com>
Date: Thu Jun 19 23:42:47 2008 -0500
Added missing dh_link call
diff --git a/debian/rules b/debian/rules
index f4cc01f..57ae5d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,6 +72,7 @@ binary-arch: serverabi install
install -D -m 0644 debian/overrides \
debian/$(PACKAGE)/usr/share/lintian/overrides/$(PACKAGE)
dh_strip
+ dh_link
dh_compress
dh_fixperms
dh_makeshlibs
commit de8c9ca1a60c2b8aebc6bfe72728ff8c26c0a0a2
Author: Raphael Geissert <atomo64@gmail.com>
Date: Thu Jun 19 23:40:47 2008 -0500
Install a symlink to xserver-xorg-core's bugreport script
diff --git a/debian/changelog b/debian/changelog
index e48cbb8..5d88f2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ xserver-xorg-video-openchrome (1:0.2.902+svn577-1) UNRELEASED; urgency=low
* Stripped enclosing chevrons from the unichrome link (Closes: #485957)
- p.d.o displays the link with or without them, and looks ugly
* Removed a useless lintian override
+ * Install a symlink to xserver-xorg-core's bugreport script
- -- Raphael Geissert <atomo64@gmail.com> Thu, 19 Jun 2008 22:10:17 -0500
+ -- Raphael Geissert <atomo64@gmail.com> Thu, 19 Jun 2008 23:39:43 -0500
xserver-xorg-video-openchrome (1:0.2.902+svn570-1) unstable; urgency=low
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..aedc5bd
--- /dev/null
+++ b/debian/links
@@ -0,0 +1 @@
+usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-openchrome/script
\ No newline at end of file
commit f25e8a67fb8d1e3664e9d03ed66843c7eb2d7695
Author: Raphael Geissert <atomo64@gmail.com>
Date: Thu Jun 19 22:11:10 2008 -0500
Update changelog to reflect changes made by upstream
diff --git a/debian/changelog b/debian/changelog
index 84476fc..e48cbb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-openchrome (1:0.2.902+svn575-1) UNRELEASED; urgency=low
+xserver-xorg-video-openchrome (1:0.2.902+svn577-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* debian/patches/01_gen_pci_ids.diff:
@@ -13,13 +13,14 @@ xserver-xorg-video-openchrome (1:0.2.902+svn575-1) UNRELEASED; urgency=low
* New upstream snapshot.
+ Fixes some Xv issues.
+ Disables XvDMA for P4M890 and K8M890, as it is broken.
+ + Enables CLE video engine on VM800/CN700.
* Bump Standards-Version to 3.8.0
+ Use find instead of findstring for DEB_BUILD_OPTIONS parsing in d/rules
* Stripped enclosing chevrons from the unichrome link (Closes: #485957)
- p.d.o displays the link with or without them, and looks ugly
* Removed a useless lintian override
- -- Raphael Geissert <atomo64@gmail.com> Sun, 15 Jun 2008 16:38:30 -0500
+ -- Raphael Geissert <atomo64@gmail.com> Thu, 19 Jun 2008 22:10:17 -0500
xserver-xorg-video-openchrome (1:0.2.902+svn570-1) unstable; urgency=low
commit da2e50a6485667c0d2c5fc1b2b15610523c705ef
Author: ben <ben@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sun Jun 15 22:17:42 2008 +0000
VM800/CN700 appears to have a CLE video engine (reported by Vincent Magnin).
git-svn-id: http://svn.openchrome.org/svn/trunk@577 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index e51ed8e..0287e78 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -824,7 +824,6 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
pVia->DRIIrqEnable = FALSE;
break;
case VIA_VM800:
- pVia->VideoEngine = VIDEO_ENGINE_CME;
pVia->agpEnable = FALSE;
break;
case VIA_K8M890:
commit 0ca2f123dda4897f4d26c67f5fe4202deb04c784
Author: Raphael Geissert <atomo64@gmail.com>
Date: Sun Jun 15 16:39:12 2008 -0500
Removed a useless lintian override
diff --git a/debian/changelog b/debian/changelog
index c71ebf1..84476fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ xserver-xorg-video-openchrome (1:0.2.902+svn575-1) UNRELEASED; urgency=low
+ Use find instead of findstring for DEB_BUILD_OPTIONS parsing in d/rules
* Stripped enclosing chevrons from the unichrome link (Closes: #485957)
- p.d.o displays the link with or without them, and looks ugly
+ * Removed a useless lintian override
- -- Raphael Geissert <atomo64@gmail.com> Thu, 12 Jun 2008 11:52:35 -0500
+ -- Raphael Geissert <atomo64@gmail.com> Sun, 15 Jun 2008 16:38:30 -0500
xserver-xorg-video-openchrome (1:0.2.902+svn570-1) unstable; urgency=low
diff --git a/debian/overrides b/debian/overrides
index 2884826..847b813 100644
--- a/debian/overrides
+++ b/debian/overrides
@@ -1,4 +1,3 @@
xserver-xorg-video-openchrome: non-dev-pkg-with-shlib-symlink usr/lib/libchromeXvMCPro.so.1.0.0 usr/lib/libchromeXvMCPro.so
xserver-xorg-video-openchrome: non-dev-pkg-with-shlib-symlink usr/lib/libchromeXvMC.so.1.0.0 usr/lib/libchromeXvMC.so
-xserver-xorg-video-openchrome: several-sonames-in-same-package libchromeXvMC.so.1 libchromeXvMCPro.so.1
xserver-xorg-video-openchrome: package-name-doesnt-match-sonames libchromeXvMC1 libchromeXvMCPro1
commit 48a5888fcb96eb619891de62f101181c81299b52
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Fri Jun 13 19:31:32 2008 +0000
fix typo
git-svn-id: http://svn.openchrome.org/svn/trunk@576 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_swov.c b/src/via_swov.c
index 1806c0e..2a13419 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -1727,7 +1727,7 @@ Upd_Video(ScrnInfoPtr pScrn, unsigned long videoFlag,
* FIXME:
* Enable video on secondary
*/
- if (pVia->VideoEngine == VIDEO_ENGINE_CME;
+ if (pVia->VideoEngine == VIDEO_ENGINE_CME
&& pVia->pBIOSInfo->PanelActive) {
/* V1_ON_SND_DISPLAY */
vidCtl |= 0x80000000;
commit 468c47a26204ffe00c14f68ec5c4a7dc6eb3a9bf
Author: Raphael Geissert <atomo64@gmail.com>
Date: Thu Jun 12 11:58:15 2008 -0500
Stripped enclosing chevrons from the unichrome link (Closes: #485957)
- p.d.o displays the link with or without them, and looks ugly
diff --git a/debian/changelog b/debian/changelog
index 63d4d31..c71ebf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,10 @@ xserver-xorg-video-openchrome (1:0.2.902+svn575-1) UNRELEASED; urgency=low
+ Disables XvDMA for P4M890 and K8M890, as it is broken.
* Bump Standards-Version to 3.8.0
+ Use find instead of findstring for DEB_BUILD_OPTIONS parsing in d/rules
+ * Stripped enclosing chevrons from the unichrome link (Closes: #485957)
+ - p.d.o displays the link with or without them, and looks ugly
- -- Raphael Geissert <atomo64@gmail.com> Tue, 10 Jun 2008 20:06:13 -0500
+ -- Raphael Geissert <atomo64@gmail.com> Thu, 12 Jun 2008 11:52:35 -0500
xserver-xorg-video-openchrome (1:0.2.902+svn570-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 5f70f9f..2ffb643 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Description: X.Org X server -- VIA display driver
.
Originally called the 'snapshot' release, since it was a snapshot of an
experimental branch of the unichrome cvs code, this is a continued development
- of the open source unichrome driver (from <URL:http://unichrome.sf.net>) which
+ of the open source unichrome driver (from http://unichrome.sf.net) which
also incorporates support for the unichrome-pro chipsets.
.
Support for hardware acceleration (XvMC) for all chipsets has subsequently
commit 5e0b63eab36cc7b23df6dfd975c501767c504af8
Author: Raphael Geissert <atomo64@gmail.com>
Date: Tue Jun 10 20:08:35 2008 -0500
Bump Standards-Version to 3.8.0
+ Use find instead of findstring for DEB_BUILD_OPTIONS parsing in d/rules
diff --git a/debian/changelog b/debian/changelog
index 23a6f98..63d4d31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ xserver-xorg-video-openchrome (1:0.2.902+svn575-1) UNRELEASED; urgency=low
* New upstream snapshot.
+ Fixes some Xv issues.
+ Disables XvDMA for P4M890 and K8M890, as it is broken.
+ * Bump Standards-Version to 3.8.0
+ + Use find instead of findstring for DEB_BUILD_OPTIONS parsing in d/rules
- -- Raphael Geissert <atomo64@gmail.com> Tue, 10 Jun 2008 19:01:30 -0500
+ -- Raphael Geissert <atomo64@gmail.com> Tue, 10 Jun 2008 20:06:13 -0500
xserver-xorg-video-openchrome (1:0.2.902+svn570-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1bcfc08..5f70f9f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Raphael Geissert <atomo64@gmail.com>
Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake, libtool, pkg-config, xserver-xorg-dev (>= 2:1.3.0.0), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, x11proto-xf86dri-dev, x11proto-video-dev, x11proto-gl-dev, libdrm-dev (>> 2.0), libx11-dev, libgl1-mesa-dev | libgl1-dev, libxvmc-dev, quilt
Build-Conflicts: autoconf2.13
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://www.openchrome.org
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-openchrome.git
diff --git a/debian/rules b/debian/rules
index 941b396..f4cc01f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
DEB_CONFIGURE_EXTRA_FLAGS += --host=$(DEB_HOST_GNU_TYPE)
endif
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(find debug,$(DEB_BUILD_OPTIONS)))
DEB_CONFIGURE_EXTRA_FLAGS += \
--enable-debug=yes \
--enable-xv-debug=yes
commit f1f4bac3bcd22270caabade503daeb068a34900d
Author: Raphael Geissert <atomo64@gmail.com>
Date: Tue Jun 10 19:57:10 2008 -0500
Add watch file
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..3318687
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://www.openchrome.org/releases/xf86-video-openchrome-(.*)\.tar\.gz
commit 6161cda378a1e6550d8ffcf7f58ebf6ded3a475e
Author: Raphael Geissert <atomo64@gmail.com>
Date: Tue Jun 10 19:14:18 2008 -0500
Refresh patch and add a header
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
index dcf6d74..9318c90 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -1,9 +1,12 @@
---- a/src/Makefile.am.orig 2008-01-09 02:50:10.000000000 +0200
-+++ b/src/Makefile.am 2008-01-09 02:59:40.000000000 +0200
-@@ -84,6 +84,12 @@
- via_xvmc.h
+Generate a list of known PCIs for xorg to auto-detect them and use openchrome for those
+Index: xserver-xorg-video-openchrome/src/Makefile.am
+===================================================================
+--- xserver-xorg-video-openchrome.orig/src/Makefile.am
++++ xserver-xorg-video-openchrome/src/Makefile.am
+@@ -86,6 +86,12 @@ EXTRA_DIST += \
endif
+
+pcidatadir = $(datadir)/xserver-xorg/pci
+pcidata_DATA = openchrome.ids
+
@@ -11,5 +14,5 @@
+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/via_id.h | sed -e 's/0x/1106/' > openchrome.ids
+
via_driver.lo: svnversion.h
- svnversion.h:
- @if [ -f svnrelease.h ]; then \
+ svnversion.h: $(openchrome_drv_la_SOURCES)
+ @if [ -d .svn ]; then \
commit aa70295e295037a3d7186742f65d0979797f0809
Author: Raphael Geissert <atomo64@gmail.com>
Date: Tue Jun 10 19:06:18 2008 -0500
Update changelog to reflect upstream's revision
diff --git a/debian/changelog b/debian/changelog
index e29c6e6..23a6f98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-video-openchrome (1:0.2.902+svn570-2) UNRELEASED; urgency=low
+xserver-xorg-video-openchrome (1:0.2.902+svn575-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* debian/patches/01_gen_pci_ids.diff:
- This patch adds a list of pci id's that the driver supports so that
the server can automatically load it. Stolen from via.
@@ -8,7 +9,12 @@ xserver-xorg-video-openchrome (1:0.2.902+svn570-2) UNRELEASED; urgency=low
* debian/rules:
- Support for patches.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Wed, 11 Jun 2008 01:10:52 +0300
+ [ Raphael Geissert ]
+ * New upstream snapshot.
+ + Fixes some Xv issues.
+ + Disables XvDMA for P4M890 and K8M890, as it is broken.
+
+ -- Raphael Geissert <atomo64@gmail.com> Tue, 10 Jun 2008 19:01:30 -0500
xserver-xorg-video-openchrome (1:0.2.902+svn570-1) unstable; urgency=low
commit b60c440ea84a08e98e541dc8bef5ad3cfb44aa82
Author: Raphael Geissert <atomo64@gmail.com>
Date: Tue Jun 10 18:55:25 2008 -0500
PHONY target doesn't need the patches, the stamp does (using the patch stamp
file name instead of 'patch' as dependency so build-stamp doesn't become PHONY)
diff --git a/debian/rules b/debian/rules
index 027ce4c..941b396 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,8 +27,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
endif
.PHONY: build
-build: patch debian/build-stamp
-debian/build-stamp: $(DEB_BUILDDIR)/config.status
+build: debian/build-stamp
+debian/build-stamp: $(STAMP_DIR)/patch $(DEB_BUILDDIR)/config.status
dh_testdir
$(MAKE) -C $(DEB_BUILDDIR)
touch $@
commit 0cd39ec58eb6cba3400d1ce935f42e3f99354b61
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Jun 11 01:14:09 2008 +0300
Add a patch to generate openchrome.ids.
* debian/patches/01_gen_pci_ids.diff:
- This patch adds a list of pci id's that the driver supports so that
the server can automatically load it. Stolen from via.
* debian/control:
- Add quilt to build-deps.
* debian/rules:
- Support for patches.
diff --git a/debian/changelog b/debian/changelog
index 3336a71..e29c6e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xserver-xorg-video-openchrome (1:0.2.902+svn570-2) UNRELEASED; urgency=low
+
+ * debian/patches/01_gen_pci_ids.diff:
+ - This patch adds a list of pci id's that the driver supports so that
+ the server can automatically load it. Stolen from via.
+ * debian/control:
+ - Add quilt to build-deps.
+ * debian/rules:
+ - Support for patches.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Wed, 11 Jun 2008 01:10:52 +0300
+
xserver-xorg-video-openchrome (1:0.2.902+svn570-1) unstable; urgency=low
* First upload to Debian (Closes: #464848)
diff --git a/debian/control b/debian/control
index 2e00b57..1bcfc08 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Raphael Geissert <atomo64@gmail.com>
-Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake, libtool, pkg-config, xserver-xorg-dev (>= 2:1.3.0.0), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, x11proto-xf86dri-dev, x11proto-video-dev, x11proto-gl-dev, libdrm-dev (>> 2.0), libx11-dev, libgl1-mesa-dev | libgl1-dev, libxvmc-dev
+Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake, libtool, pkg-config, xserver-xorg-dev (>= 2:1.3.0.0), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, x11proto-xf86dri-dev, x11proto-video-dev, x11proto-gl-dev, libdrm-dev (>> 2.0), libx11-dev, libgl1-mesa-dev | libgl1-dev, libxvmc-dev, quilt
Build-Conflicts: autoconf2.13
Standards-Version: 3.7.3
Homepage: http://www.openchrome.org
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
new file mode 100644
index 0000000..dcf6d74
--- /dev/null
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -0,0 +1,15 @@
+--- a/src/Makefile.am.orig 2008-01-09 02:50:10.000000000 +0200
++++ b/src/Makefile.am 2008-01-09 02:59:40.000000000 +0200
+@@ -84,6 +84,12 @@
+ via_xvmc.h
+ endif
+
++pcidatadir = $(datadir)/xserver-xorg/pci
++pcidata_DATA = openchrome.ids
++
++openchrome.ids : via_id.h
++ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/via_id.h | sed -e 's/0x/1106/' > openchrome.ids
++
+ via_driver.lo: svnversion.h
+ svnversion.h:
+ @if [ -f svnrelease.h ]; then \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b55d79f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index 0406496..027ce4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
endif
.PHONY: build
-build: debian/build-stamp
+build: patch debian/build-stamp
debian/build-stamp: $(DEB_BUILDDIR)/config.status
dh_testdir
$(MAKE) -C $(DEB_BUILDDIR)
commit cfe34353c4ad43c8b220da322349e682df973375
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Tue Jun 10 21:48:13 2008 +0000
put an end to the Xv on panel issues
git-svn-id: http://svn.openchrome.org/svn/trunk@575 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 0287e78..e51ed8e 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -824,6 +824,7 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
pVia->DRIIrqEnable = FALSE;
break;
case VIA_VM800:
+ pVia->VideoEngine = VIDEO_ENGINE_CME;
pVia->agpEnable = FALSE;
break;
case VIA_K8M890:
diff --git a/src/via_swov.c b/src/via_swov.c
index 534baa2..1806c0e 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -1727,10 +1727,7 @@ Upd_Video(ScrnInfoPtr pScrn, unsigned long videoFlag,
* FIXME:
* Enable video on secondary
*/
- if ((pVia->Chipset == VIA_P4M900 ||
- pVia->Chipset == VIA_K8M890 ||
- pVia->Chipset == VIA_VM800 ||
- pVia->Chipset == VIA_CX700)
+ if (pVia->VideoEngine == VIDEO_ENGINE_CME;
&& pVia->pBIOSInfo->PanelActive) {
/* V1_ON_SND_DISPLAY */
vidCtl |= 0x80000000;
commit efee5e4e521dbe38fbc94c50fab9aacf385f6ab9
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Mon Jun 9 20:03:14 2008 +0000
fix Xv on LCD for K8M890
git-svn-id: http://svn.openchrome.org/svn/trunk@574 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_swov.c b/src/via_swov.c
index 2a2b47a..534baa2 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -1728,6 +1728,7 @@ Upd_Video(ScrnInfoPtr pScrn, unsigned long videoFlag,
* Enable video on secondary
*/
if ((pVia->Chipset == VIA_P4M900 ||
+ pVia->Chipset == VIA_K8M890 ||
pVia->Chipset == VIA_VM800 ||
pVia->Chipset == VIA_CX700)
&& pVia->pBIOSInfo->PanelActive) {
commit 1f77ab060b83c456bdf9f4c5b3d57d53a503fc2e
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sat Jun 7 16:54:02 2008 +0000
Samsung Q1B (reported by Massimo Vighetti)
git-svn-id: http://svn.openchrome.org/svn/trunk@573 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index 30a1733..6f7a0f9 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -189,6 +189,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"VIA VT8454B", VIA_CX700, 0x0908, 0x1975, VIA_DEVICE_CRT}, /* Evaluation board, reference possibly wrong */
{"VIA VT3324 (CX700)", VIA_CX700, 0x1106, 0x3157, VIA_DEVICE_CRT},
{"MSI Fuzzy CX700/CX700D", VIA_CX700, 0x1462, 0x8020, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
+ {"Samsung Q1B", VIA_CX700, 0x144D, 0xC02C, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"FIC CE260", VIA_CX700, 0x1509, 0x2D30, VIA_DEVICE_LCD},
{"FIC CE261", VIA_CX700, 0x1509, 0x2F07, VIA_DEVICE_LCD},
{"Packard Bell EasyNote XS", VIA_CX700, 0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */
commit 49250d70a98a38e7b8afba9239ffdfadb14ebf35
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 31 23:45:10 2008 +0200
This is a driver, not a library
diff --git a/debian/copyright b/debian/copyright
index 4aa7129..04afe9f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,7 +19,7 @@ Copyright (c) 2004-2006 Terry Barnaby. All Rights Reserved.
Copyright (c) 2004-2006 Thomas Hellstrom. All Rights Reserved.
Copyright (c) 2005-2008 The Openchrome Project [openchrome.org]
-Library License:
+Driver (upstream) License:
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
commit a7f7a6fbede663aba2f55445f11656f4ef2c89e8
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sat May 31 15:00:58 2008 +0000
Disable XvDMA for P4M890 and K8M890, it is broken...
git-svn-id: http://svn.openchrome.org/svn/trunk@572 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 26f85da..0287e78 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -829,6 +829,7 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
case VIA_K8M890:
pVia->VideoEngine = VIDEO_ENGINE_CME;
pVia->agpEnable = FALSE;
+ pVia->dmaXV = FALSE;
break;
case VIA_P4M900:
pVia->VideoEngine = VIDEO_ENGINE_CME;
@@ -845,6 +846,7 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
break;
case VIA_P4M890:
pVia->VideoEngine = VIDEO_ENGINE_CME;
+ pVia->dmaXV = FALSE;
break;
}
commit 68554963cf26c4734dcdd2a89a844f9287638d74
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sat May 31 12:17:01 2008 +0000
new pci id: Mercury P4VM800M7
git-svn-id: http://svn.openchrome.org/svn/trunk@571 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index 8c23bb9..30a1733 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -75,6 +75,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Epox EP-8KMM3I", VIA_KM400, 0x1695, 0x9023, VIA_DEVICE_CRT},
{"ASRock Inc. K7VM2/3/4", VIA_KM400, 0x1849, 0x7205, VIA_DEVICE_CRT},
{"ACorp KM400QP", VIA_KM400, 0x1915, 0x1100, VIA_DEVICE_CRT | VIA_DEVICE_TV},
+ {"Mercury P4VM800M7 (1.0)", VIA_KM400, 0x3344, 0x1122, VIA_DEVICE_CRT},
{"Soyo K7VME", VIA_KM400, 0xA723, 0x10FD, VIA_DEVICE_CRT},
/*** K8M800, K8N800, K8N800A ***/
@@ -200,7 +201,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Mitac 8615", VIA_P4M890, 0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"VIA VT3343 (P4M890)", VIA_P4M890, 0x1106, 0x3343, VIA_DEVICE_CRT},
{"MSI P4M890M-L/IL (MS-7255)", VIA_P4M890, 0x1462, 0x7255, VIA_DEVICE_CRT},
- {"Biostar P4M890-M7 FE/SE/TE", VIA_P4M890, 0x1565, 0x1207, VIA_DEVICE_CRT},
+ {"Biostar P4M890-M7 TE", VIA_P4M890, 0x1565, 0x1207, VIA_DEVICE_CRT},
{"ASRock P4VM890", VIA_P4M890, 0x1849, 0x3343, VIA_DEVICE_CRT},
/* keep this */
commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat May 31 13:23:24 2008 +0200
Update xsfbs/quilt patching rules to be compatible with the
"3.0 (quilt)" source package.
Thanks to Raphael Hertzog.
See http://lists.debian.org/debian-x/2008/05/msg01250.html for details.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index c11923f..b871b3b 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,10 +21,8 @@
# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
export DH_OPTIONS
-# force quilt to not use ~/.quiltrc
Reply to: