xserver-xorg-video-openchrome: Changes to 'debian-unstable'
debian/changelog | 4 +++-
debian/control | 2 +-
debian/patches/01_gen_pci_ids.diff | 15 +++++++++------
debian/rules | 2 +-
debian/watch | 3 +++
5 files changed, 17 insertions(+), 9 deletions(-)
New commits:
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 \
Reply to: