splitting radeon out of ati
Hello,
On Michel's request, I am planning to split out the radeon driver of the
ati package so that people can install radeon without r128 or mach64.
We'd have:
* xserver-xorg-video-ati contains the ati driver wrapper and depends on
-radeon, -r128 and -mach64
* -radeon only contains the radeon driver
* -radeon-dbg contains what you guess
* -ati-dbg contains the ati driver wrapper debugging symbols and depends
on -radeon-dbg, -r128-dbg and -mach64-dbg
xserver-xorg-video-ati would not ship any ati.ids anymore, only
radeon.ids would be in radeon (as well as r128.ids and mach64.ids in
-r128 and -mach64). So the server would autoload radeon, r128 or mach64,
never autoload the ati wrapper.
Patch attached. Anything to say before I upload this? Anything to fix in
the descriptions?
Brice
commit 1ed5039236efe1f0775c48a5526ad9d74bc90562
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Jun 18 16:34:37 2008 +0200
Split a -radeon binary package out of -ati
diff --git a/debian/changelog b/debian/changelog
index 0d7e840..4c600ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-ati (1:6.8.191-2) unstable; urgency=low
+
+ * Split the package into into the -ati package containing the ati driver
+ wrapper, and xserver-xorg-video-radeon containing the actual radeon
+ sub-driver.
+ xserver-xorg-video-ati now depends on -r128, -mach64 and -radeon
+ while -ati-dbg depends on their corresponding -dbg packages.
+
+ -- Brice Goglin <bgoglin@debian.org> Wed, 18 Jun 2008 16:29:14 +0200
+
xserver-xorg-video-ati (1:6.8.191-1) unstable; urgency=low
* New upstream release candidate.
diff --git a/debian/control b/debian/control
index b6277b7..b5da6b3 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,44 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ati.git
Package: xserver-xorg-video-ati
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, xserver-xorg-video-r128, xserver-xorg-video-mach64
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, xserver-xorg-video-r128, xserver-xorg-video-mach64, xserver-xorg-video-radeon
Provides: ${xviddriver:Provides}
-Description: X.Org X server -- ATI display driver
+Description: X.Org X server -- ATI display driver wrapper
+ This driver for the X.Org X server (see xserver-xorg for a further description)
+ provides support for the ATI Mach64, Rage128, Radeon and FireGL series.
+ It provides the 'ati' driver wrapper which brings support for this hardware
+ by bringing the 'mach64', 'r128' and 'ati' sub-drivers through package
+ dependencies.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This package is built from the X.org xf86-video-ati driver module.
+
+Package: xserver-xorg-video-ati-dbg
+Architecture: any
+Depends: xserver-xorg-video-ati (= ${binary:Version}), xserver-xorg-video-mach64-dbg, xserver-xorg-video-r128-dbg, xserver-xorg-video-radeon-dbg,
+Priority: extra
+Description: X.Org X server -- ATI display driver wrapper (debugging symbols)
+ This driver for the X.Org X server (see xserver-xorg for a further description)
+ provides support for the ATI Mach64, Rage128, Radeon and FireGL series.
+ It provides the 'ati' driver wrapper which brings support for this hardware
+ by bringing the 'mach64', 'r128' and 'ati' sub-drivers through package
+ dependencies.
+ .
+ This package provides debugging symbols for the Xorg X server ATI display
+ driver wrapper.
+
+Package: xserver-xorg-video-radeon
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Provides: ${xviddriver:Provides}
+Description: X.Org X server -- ATI Radeon display driver
This driver for the X.Org X server (see xserver-xorg for a further description)
provides support for the ATI Radeon and FireGL series. It provides the 'radeon'
- sub-driver.
+ driver.
.
Note that this is not the same as the ATI-provided, binary-only, 'fglrx'
driver, which provides additional 3D functionality for some newer Radeon
@@ -30,16 +62,16 @@ Description: X.Org X server -- ATI display driver
.
This package is built from the X.org xf86-video-ati driver module.
-Package: xserver-xorg-video-ati-dbg
+Package: xserver-xorg-video-radeon-dbg
Architecture: any
-Depends: xserver-xorg-video-ati (= ${binary:Version})
+Depends: xserver-xorg-video-radeon (= ${binary:Version})
Priority: extra
-Description: X.Org X server -- ATI display driver (debugging symbols)
+Description: X.Org X server -- ATI Radeon display driver (debugging symbols)
This driver for the X.Org X server (see xserver-xorg for a further description)
provides support for the ATI Radeon and FireGL series. It provides the 'radeon'
- sub-driver.
+ driver.
.
This driver provides support for Radeon and FireGL series ATI cards.
.
- This package provides debugging symbols for the Xorg X server ATI display
- driver.
+ This package provides debugging symbols for the Xorg X server ATI Radeon
+ display driver.
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
index 7a7dfe7..5160ff7 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -12,7 +12,7 @@ Index: xserver-xorg-video-ati/src/Makefile.am
radeon_atombios.h
+
+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = ati.ids
++pcidata_DATA = radeon.ids
+
-+ati.ids: ati_pciids_gen.h
-+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/ati_pciids_gen.h | sed -e 's/0x/1002/' > ati.ids
++radeon.ids: ati_pciids_gen.h
++ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/ati_pciids_gen.h | sed -e 's/0x/1002/' > radeon.ids
diff --git a/debian/rules b/debian/rules
index c80f62c..bc106ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,8 @@ binary-arch: build install serverabi
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=usr/share/man/man4
dh_installman
dh_link
- dh_strip --dbg-package=xserver-xorg-video-ati-dbg
+ dh_strip -pxserver-xorg-video-ati --dbg-package=xserver-xorg-video-ati-dbg
+ dh_strip -pxserver-xorg-video-radeon --dbg-package=xserver-xorg-video-radeon-dbg
dh_compress
dh_fixperms
dh_installdeb
diff --git a/debian/xserver-xorg-video-ati.install b/debian/xserver-xorg-video-ati.install
index 71bacbe..f825193 100644
--- a/debian/xserver-xorg-video-ati.install
+++ b/debian/xserver-xorg-video-ati.install
@@ -1,3 +1 @@
-usr/lib/xorg/modules/drivers/*.so
-usr/lib/xorg/modules/multimedia/*.so
-usr/share/xserver-xorg/pci/*
+usr/lib/xorg/modules/drivers/ati_drv.so
diff --git a/debian/xserver-xorg-video-ati.manpages b/debian/xserver-xorg-video-ati.manpages
index 603f9bd..9491a85 100644
--- a/debian/xserver-xorg-video-ati.manpages
+++ b/debian/xserver-xorg-video-ati.manpages
@@ -1 +1 @@
-debian/tmp/usr/share/man/man4/*
+debian/tmp/usr/share/man/man4/ati.4
diff --git a/debian/xserver-xorg-video-radeon.install b/debian/xserver-xorg-video-radeon.install
new file mode 100644
index 0000000..a2bc59b
--- /dev/null
+++ b/debian/xserver-xorg-video-radeon.install
@@ -0,0 +1,3 @@
+usr/lib/xorg/modules/drivers/radeon_drv.so
+usr/lib/xorg/modules/multimedia/*.so
+usr/share/xserver-xorg/pci/*
diff --git a/debian/xserver-xorg-video-radeon.links b/debian/xserver-xorg-video-radeon.links
new file mode 100644
index 0000000..b7dd6d4
--- /dev/null
+++ b/debian/xserver-xorg-video-radeon.links
@@ -0,0 +1 @@
+usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-ati/script
diff --git a/debian/xserver-xorg-video-radeon.manpages b/debian/xserver-xorg-video-radeon.manpages
new file mode 100644
index 0000000..75a7c89
--- /dev/null
+++ b/debian/xserver-xorg-video-radeon.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man4/radeon.4
diff --git a/src/Makefile.in b/src/Makefile.in
index 64b6f69..14ec2b2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -433,7 +433,7 @@ EXTRA_DIST = \
radeon_atombios.h
pcidatadir = $(datadir)/xserver-xorg/pci
-pcidata_DATA = ati.ids
+pcidata_DATA = radeon.ids
all: all-am
.SUFFIXES:
@@ -1000,8 +1000,8 @@ uninstall-am: uninstall-ati_drv_laLTLIBRARIES uninstall-pcidataDATA \
uninstall-theatre_drv_laLTLIBRARIES
-ati.ids: ati_pciids_gen.h
- awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/ati_pciids_gen.h | sed -e 's/0x/1002/' > ati.ids
+radeon.ids: ati_pciids_gen.h
+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/ati_pciids_gen.h | sed -e 's/0x/1002/' > radeon.ids
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Reply to: