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