--- xserver-xorg-video-tdfx-1.4.3.orig/autogen.sh +++ xserver-xorg-video-tdfx-1.4.3/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" --- xserver-xorg-video-tdfx-1.4.3.orig/ChangeLog +++ xserver-xorg-video-tdfx-1.4.3/ChangeLog @@ -1,76 +1,532 @@ -2006-06-17 Donnie Berkholz +commit 96ad72682ca7925918e8cb7298a2241dc096bd6f +Author: Dave Airlie +Date: Thu Jul 30 12:04:30 2009 +1000 - * src/tdfx_priv.c: (TDFXResetFifo), (TDFXSyncFifo): - Bug #7149 - Change use of getsecs to xf86getsecs (Gustavo Pichorim Boiko). + tdfx: bump for release 1.4.3 -2006-04-07 Adam Jackson +commit 690aaaedb3cf6e8241cad802651a640277094f22 +Author: Dave Airlie +Date: Tue Jul 28 15:22:41 2009 +1000 - * configure.ac: - * src/tdfx.h: - Bump to 1.2.1 for Xv changes. + tdfx: change to using ABI version check -2006-04-07 Aaron Plattner +commit 7149d16ed17c064cc91cb1473f10e8e80055347c +Author: Dave Airlie +Date: Tue Jul 28 13:32:38 2009 +1000 - * src/tdfx_video.c: (TDFXPutImageTexture), (TDFXPutImageOverlay): - Add a DrawablePtr argument to the XV functions to pave the way for - redirected video. + tdfx: update for resources/RAC API removal -2006-04-07 Adam Jackson +commit b656f6522f287efb8595509c678ce6ec60843944 +Author: Adam Jackson +Date: Thu Jul 2 11:48:35 2009 -0400 - * configure.ac: - * src/tdfx.h: - * src/tdfx_accel.c: - * src/tdfx_dga.c: - * src/tdfx_dri.c: - * src/tdfx_driver.c: - * src/tdfx_hwcurs.c: - * src/tdfx_io.c: - * src/tdfx_priv.c: - * src/tdfx_sli.c: - Unlibcwrap. Bump server version requirement. Bump to 1.2.0. + tdfx 1.4.2 -2005-12-20 Kevin E. Martin +commit 871db4476dedf77e440a4ef121643bb2eb897254 +Author: Adam Jackson +Date: Thu May 28 15:21:22 2009 -0400 - * configure.ac: - Update package version for X11R7 release. + Remove useless loader symbol lists. -2005-12-14 Kevin E. Martin +commit 5fd80e29b10b9e9b6c5ad4a2ecdf5d9b4013a9e4 +Author: Alan Coopersmith +Date: Fri Jan 30 21:04:39 2009 -0800 - * configure.ac: - Update package version number for final X11R7 release candidate. + Add README with pointers to mailing list, bugzilla & git repos -2005-12-06 Kevin E. Martin +commit 86c9439917cab56c2b0eef6cd5fd6d8fad886c33 +Author: Alan Coopersmith +Date: Fri Jan 9 16:36:56 2009 -0800 - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Remove xorgconfig & xorgcfg from See Also list in man page -2005-12-03 Kevin E. Martin +commit e30873010523a8cde8d23ed473343b2c60794cb6 +Author: Dave Airlie +Date: Mon Dec 22 15:20:26 2008 +1000 - * configure.ac: - Update package version number for X11R7 RC3 release. + tdfx 1.4.1 -2005-12-01 Kevin E. Martin +commit 6379b129119ed77b9a45cb0207dedd68c32f73a1 +Author: Jakub Bogusz +Date: Fri Oct 17 17:25:39 2008 -0400 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + Bug #17557: Fix device initialization. -2005-11-20 Adam Jackson +commit fe77fea533068f5698cf4d8e9bc076a6e06d2cd2 +Author: Tiago Vignatti +Date: Mon Jul 7 14:31:32 2008 -0300 - * configure.ac: - Bump libdrm dep to 2.0. + Fix my bad typo in last commit. + + Switch inexistent getsecs() function to gettimeofday(). -2005-11-29 Adam Jackson +commit 2de0dcfff822e2a8e5b993936bbad771bf9420b1 +Author: Tiago Vignatti +Date: Fri Jul 4 04:13:05 2008 -0300 - * configure.ac: - Only build dlloader modules by default. + Remove libc wrapper functions. -2005-11-09 Kevin E. Martin +commit fdff22e2372635f47587f5cdaf888e26d913ee41 +Author: Adam Jackson +Date: Wed Mar 19 15:39:11 2008 -0400 - * configure.ac: - Update package version number for X11R7 RC2 release. + tdfx 1.4.0 -2005-11-01 Kevin E. Martin +commit e270c5baeb00f45abacba2b2f4e82505c339e984 +Author: Adam Jackson +Date: Wed Mar 19 15:37:46 2008 -0400 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + Death to RCS tags. + +commit b838b854e96c388081c0ae52320a849645f547c5 +Author: Matthieu Herrb +Date: Sun Mar 9 00:00:33 2008 +0100 + + Makefile.am: nuke RCS Id + +commit 8bbace5deb7b86c481ea3b0f764e8a6b879c5f7f +Author: Dave Airlie +Date: Wed Feb 27 10:13:01 2008 +1000 + + update tdfx to use proper pciaccess detection + +commit 463f0590fdce3cfa0e74a6769ccf5f32dad33cbc +Author: James Cloos +Date: Mon Sep 3 05:52:46 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 36ee971310cd4536291829a1021ab8853cf62e9c +Author: James Cloos +Date: Thu Aug 23 19:25:59 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 7f733531e54e455f9c27555c7552184f9da81f41 +Author: Brice Goglin +Date: Tue Aug 7 11:57:02 2007 +0200 + + TDFX_*_VERSION using PACKAGE_VERSION_* + +commit 673c665c02f02e13d57303f817702177a170e80d +Author: Ian Romanick +Date: Fri Mar 30 08:00:12 2007 -0700 + + Initial pass at porting driver to pci-rework. DOES NOT WORK. + + This is my initial pass at porting xf86-video-tdfx to the pci-rework + interfaces. For reasons that I'm not able to understand, it doesn't quite + work. It's clear that some piece of the hardware isn't being initialized + properly, but, by comparing the old code to the new, it's not clear why. + + Does not impact the functionality of non-pci-rework builds. + +commit 347b27bc79838d17cbbae2afb36ce968c1eba620 +Author: Ian Romanick +Date: Wed Mar 14 15:27:05 2007 -0700 + + White-space police in TDFXInitChips. + +commit daccdfe1957752dd3215281c4f35ff271d2cc17a +Author: Ian Romanick +Date: Wed Mar 14 15:18:56 2007 -0700 + + Minor code cleaning in TDFXMapMem. + +commit 3c886166d5cc9c44ccf701e02b56392b3ac26db3 +Author: Ian Romanick +Date: Wed Mar 14 15:16:06 2007 -0700 + + Make TDFXGetRec return the pointer instead of a bool. + +commit 229a8f64abd685c7efd9cf7baf66fac5ab71b131 +Author: Ian Romanick +Date: Wed Mar 14 15:09:31 2007 -0700 + + Wrap pciReadLong / pciWriteLong with macros. + + The pciReadLong and pciWriteLong function calls are wrapped with macros for + a couple reasons. First, this will reduce the "noise" when support for + pci-rework is added to tdfx. Second, by having them wrapped in macros it is + easier to support both pci-rework and the "classic" interfaces in the same + code base. + +commit ed38e9fd300e8ab989017dea276a2720b9423191 +Author: Ian Romanick +Date: Fri Mar 9 11:09:46 2007 -0800 + + Supply NULL driverFunc pointer in DriverRec. + +commit 220cc642c2d6b131f47d2c9769cb521bc6fe8c09 +Author: Michael Lorenz +Date: Tue Feb 27 21:31:51 2007 -0500 + + Add DDC2/I2C support to the tdfx driver + + Based on Michael Lorenz's code in bug 4246 + cleaned up and modified slightly by me. + +commit c5b95a8d219dd4ef25c6aa14f44b70865d1a8be7 +Author: Alex Deucher +Date: Wed Nov 22 12:15:48 2006 -0500 + + bump to 1.3.0 for release + +commit 4f76e63ac4f7beb802561807554b64386a22b6e1 +Author: Alex Deucher +Date: Wed Nov 22 12:12:06 2006 -0500 + + bump to 1.3.0 for release. + +commit cd0808bd2dc6c77557e0691579a6119f8901adf6 +Author: Alex Deucher +Date: Wed Nov 22 11:44:48 2006 -0500 + + Fix locking in tdfx driver. Fixes bug 9032. + +commit 867f0a956a3240466347e0ee17d7518740835048 +Author: Adam Jackson +Date: Fri Oct 13 18:45:16 2006 -0400 + + Bump to 1.2.2 + +commit de5adbae146a4db8ee491a9387f65284ea919ff9 +Author: Donnie Berkholz +Date: Sat Jun 17 16:35:04 2006 +0000 + + Bug #7149 Change use of + getsecs to xf86getsecs (Gustavo Pichorim Boiko). + +commit acee015839a798546a9d17fdc31e443b10630c76 +Author: Adam Jackson +Date: Sat Apr 8 01:50:08 2006 +0000 + + Bump to 1.2.1 for Xv changes. + +commit 55954625ff815b932d365422864745b31c4eadb4 +Author: Aaron Plattner +Date: Fri Apr 7 23:15:56 2006 +0000 + + Add a DrawablePtr argument to the XV functions to pave the way for + redirected video. + +commit e8c71c95ea67e5db17eeabaac9907924099e164f +Author: Adam Jackson +Date: Fri Apr 7 21:37:49 2006 +0000 + + Unlibcwrap. Bump server version requirement. Bump to 1.2.0. + +commit 8cfc6971a58e03894040c4f4f74da4734897df16 +Author: Kevin E Martin +Date: Wed Dec 21 02:30:03 2005 +0000 + + Update package version for X11R7 release. + +commit 5300267cfe87b18139a95ec555f8d43cc1465669 +Author: Adam Jackson +Date: Mon Dec 19 16:25:55 2005 +0000 + + Stub COPYING files + +commit c3882fb9c050d4a4b3d8bb6bff712cb9143ae97c +Author: Kevin E Martin +Date: Thu Dec 15 00:24:20 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit d214866d794e5125196c53ff96921debfb50ae74 +Author: Kevin E Martin +Date: Tue Dec 6 22:48:39 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit c8db07f0b1574a9cde265505552d318e5a1f21b1 +Author: Kevin E Martin +Date: Sat Dec 3 05:49:36 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 32e28c8f5c3b5c51fc46778d6c346cadec6ba440 +Author: Kevin E Martin +Date: Fri Dec 2 02:16:11 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit 0d640f8ed56da1782faac5c590efa3bc6ff76f7f +Author: Adam Jackson +Date: Wed Nov 30 18:51:58 2005 +0000 + + Bump libdrm dep to 2.0. + +commit 84a6bfdd3ab8307071376c81349b6701242c82f5 +Author: Adam Jackson +Date: Tue Nov 29 23:30:05 2005 +0000 + + Only build dlloader modules by default. + +commit e9d4eaa5c966e1c062a8585bc3a2e74795c6434f +Author: Alan Coopersmith +Date: Mon Nov 28 22:04:14 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit 44af3f869cb0c401fe064f5ba16e77c3fcdd3524 +Author: Eric Anholt +Date: Mon Nov 21 10:49:20 2005 +0000 + + Add .cvsignores for drivers. + +commit a2427c29767471615c4a257dfc3b1d7db4e091c9 +Author: Kevin E Martin +Date: Wed Nov 9 21:31:21 2005 +0000 + + Bump version numbers for X11R6.9/X11R7 RC2. + +commit 906f1bd3d4365e45dcdc5c40ea5d4940add79703 +Author: Kevin E Martin +Date: Wed Nov 9 21:15:22 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 9558a7b9448b2a906abe52ec31fd76f141c54ca4 +Author: Kevin E Martin +Date: Tue Nov 1 15:08:55 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit 1a194e47f962da387af7d8682ef49deade787964 +Author: Adam Jackson +Date: Sun Oct 23 18:30:19 2005 +0000 + + Bug #4829: Remove some useless DRI symbol checks. + +commit 0cf2b66e13412f1a07d002eb6bd2097debc91a20 +Author: Kevin E Martin +Date: Wed Oct 19 02:48:05 2005 +0000 + + Update package version number for RC1 release. + +commit 99a441cb4e56066d1eca600a20eee8213dd55bcb +Author: Alan Coopersmith +Date: Tue Oct 18 00:01:55 2005 +0000 + + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro + substitutions to work better with BSD make + +commit 74f86678173470b5413cd138565a0a102151e785 +Author: Adam Jackson +Date: Mon Oct 17 22:57:37 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit e3e08b9a2dacd40da3e5ef57b0cbc5ed9b20f58a +Author: Alan Coopersmith +Date: Mon Oct 17 00:09:07 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit 0f8e96a0d81303acd705be15c666cb775a1ae52b +Author: Adam Jackson +Date: Sat Sep 24 18:45:46 2005 +0000 + + Disable the {Open,Close}FullScreen DRI protocol. Remove empty FullScreen + stubs from drivers, comment the non-empty ones. + +commit efe1280e8f9c1d4ce06b9c11b5f8a64e6ecc9640 +Author: Daniel Stone +Date: Mon Aug 22 04:24:32 2005 +0000 + + Fix test for DRI headers, bump to 1.0.1. + +commit 436871d3174f56c8bf7acc8e132a81f5e6fe603a +Author: Daniel Stone +Date: Thu Aug 18 09:03:52 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 5d98e054f44c5cf1e51bb7b4646b07192cb6cb7a +Author: Alan Hourihane +Date: Mon Aug 15 07:30:06 2005 +0000 + + Egbert's 64bit fixes for mixed 32/64bit clients + +commit 1c68da251e1bf3828ca2c728a4d7b93bb59659a9 +Author: Ian Romanick +Date: Fri Aug 5 23:04:33 2005 +0000 + + I have resolved this by making all the "Direct rendering disabled" messages + X_WARNING and all the "Direct rendering enabled" messages X_INFO. + Ideally, we need to factor some of this stuff out to common code. There + is a *LOT* of duplication among the *_dri.c files under + programs/Xserver/hw/xfree86/drivers. + I'm trying to clean up as much low hanging fruit as I can and got tired of + waiting for ajax. :P + +commit 341cd708a7511dac3e728e260166b4b790df733f +Author: Adam Jackson +Date: Sun Jul 31 17:19:29 2005 +0000 + + Post-merge fixups: + - Disable building the gamma driver + - Fix numerous Imakefiles to get header paths and subdirs right + - Symlink client-side GLX lib source from Mesa + - Add new shader subdirs to the Mesa core build + - Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need it, + since they don't generate protocol, and it was breaking the build. + +commit 397246d1d1b55227456dd9092581871da7d17323 +Author: Kevin E Martin +Date: Fri Jul 29 21:22:45 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit 535a7c83e000a3410b11ffa6769127eae1464b3b +Author: Søren Sandmann Pedersen +Date: Wed Jul 27 21:23:29 2005 +0000 + + Add xf86driproto to dependencies for drivers with DRI support. Patch from + Donnie Berkholz + +commit 38a86d5b1897427147543b933a1991a780f9b103 +Author: Søren Sandmann Pedersen +Date: Tue Jul 26 23:47:49 2005 +0000 + + Build system for tdfx + +commit 4cb0dd1252ed112a2e3be6de417d2ce8d849c5fe +Author: Adam Jackson +Date: Mon Jul 11 02:30:02 2005 +0000 + + Prep for modular builds by adding guarded #include "config.h" everywhere. + +commit d254bed4315a09eca7c41ce26efd575b60db2526 +Author: Adam Jackson +Date: Mon Jul 11 01:06:22 2005 +0000 + + Fix the build with DRI enabled. Still at least one runtime issue... + +commit cd1894c3df1ab667a755852085143fcc261eb985 +Author: Adam Jackson +Date: Sun Jul 10 21:36:32 2005 +0000 + + First cut at driver build skeleton. + +commit 2c5f2e65f81699c619854b183d9f7825f350e118 +Author: Adam Jackson +Date: Sat Jun 25 21:16:57 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit 2f8fb13b9c14ff9bc24f6737658d79ea647befc7 +Author: Adam Jackson +Date: Wed May 18 17:47:36 2005 +0000 + + Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version + number of the DRIInfoRec, disambiguating it from the XF86DRI protocol + version number. Modify DRIQueryVersion to return the libdri version + number, which all DDXes were requesting implicitly. Fix the DDXes to + check for the DRIINFO version they were compiled against. + +commit 4db50246111e420ad5e6ae9ac8c7e03ec0d5d704 +Author: Daniel Stone +Date: Wed Apr 20 12:25:30 2005 +0000 + + Fix includes right throughout the Xserver tree: + change "foo.h" to for core headers, e.g. X.h, Xpoll.h; + change "foo.h", "extensions/foo.h" and "X11/foo.h" to + for extension headers, e.g. Xv.h; + change "foo.[ch]" to for Xtrans files. + +commit 9b0caee37f7ee99831735e819d97f9ccf155562a +Author: Matthieu Herrb +Date: Mon Oct 4 21:14:44 2004 +0000 + + Manual pages fixes (XFree86 bugzilla #1487, Nicolas Joly). + +commit a490c1eec95ec111bdc3555d29b77192bf8caf90 +Author: Eric Anholt +Date: Wed Jun 16 09:44:00 2004 +0000 + + Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers, + with the following notes: + - Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to + insecurity. + - VIA driver converted to new drmContext and drmHandle names. + - Radeon driver merge conflicted in many places, and MergedFB at least + could probably use some checking at this point. + +commit 5172fd205abbbe649205b21fc24f47df5cc5ac8a +Author: Eric Anholt +Date: Wed Jun 16 09:27:19 2004 +0000 + + DRI trunk-20040613 import + +commit 982a12c6ae9d15e4d22d579de4f2c8fac1a2dcee +Author: Eric Anholt +Date: Wed Jun 16 09:24:02 2004 +0000 + + DRI XFree86-4_3_99_12-merge import + +commit 6f6d502351b3c7da0585791375b0102aa65e48be +Author: Egbert Eich +Date: Fri Apr 23 19:49:53 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 38f39f7f4a75693866227156a7ef3673b587e3de +Author: Egbert Eich +Date: Sun Mar 14 08:33:37 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit e91530f65fe7ef236459c97c06f2203cac507736 +Author: Egbert Eich +Date: Wed Mar 3 12:12:27 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 3cef3b10af1d67b237bde8a71ffddcef6bc7ba65 +Author: Egbert Eich +Date: Thu Feb 26 13:35:55 2004 +0000 + + readding XFree86's cvs IDs + +commit d97a6f7a36b93bbd12e9d878cddfe1625f87e21d +Author: Egbert Eich +Date: Thu Feb 26 09:23:27 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 7aa6b58d626657e97cc5e72d43a2bd4c1b8611ce +Author: Egbert Eich +Date: Thu Jan 29 08:08:37 2004 +0000 + + Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 + +commit a5301d652c98dbf07869a62c4198bae2d3f83571 +Author: Kaleb Keithley +Date: Tue Nov 25 19:28:43 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit d95aec56ffcf85524ee04d34caeb07d9b95ab463 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:55 2003 +0000 + + XFree86 4.3.0.1 + +commit c4dd1bf20f2bae6d34db059ae47f053012d8a822 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:55 2003 +0000 + + Initial revision --- xserver-xorg-video-tdfx-1.4.3.orig/debian/xserver-xorg-video-tdfx.install +++ xserver-xorg-video-tdfx-1.4.3/debian/xserver-xorg-video-tdfx.install @@ -0,0 +1,2 @@ +usr/lib/xorg/modules/drivers/*.so +usr/share/man/man4/* --- xserver-xorg-video-tdfx-1.4.3.orig/debian/watch +++ xserver-xorg-video-tdfx-1.4.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-tdfx-(.*)\.tar\.gz --- xserver-xorg-video-tdfx-1.4.3.orig/debian/xserver-xorg-video-tdfx.links +++ xserver-xorg-video-tdfx-1.4.3/debian/xserver-xorg-video-tdfx.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-tdfx/script --- xserver-xorg-video-tdfx-1.4.3.orig/debian/changelog +++ xserver-xorg-video-tdfx-1.4.3/debian/changelog @@ -0,0 +1,257 @@ +xserver-xorg-video-tdfx (1:1.4.3-3) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois Sat, 16 Oct 2010 21:19:15 +0200 + +xserver-xorg-video-tdfx (1:1.4.3-2) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + + [ Cyril Brulebois ] + * Update to new xsfbs, replace deprecated ${xserver:Depends} with + ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev + accordingly. + * Add myself to Uploaders. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). + + -- Cyril Brulebois Tue, 04 May 2010 00:46:28 +0200 + +xserver-xorg-video-tdfx (1:1.4.3-1) experimental; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. + * Remove 04_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 01:26:20 +0100 + +xserver-xorg-video-tdfx (1:1.4.1-1) unstable; urgency=low + + * New upstream release. + * Run autoreconf on build. + * Allow parallel builds. + * Upload to unstable. + + -- Julien Cristau Thu, 09 Apr 2009 12:12:21 +0100 + +xserver-xorg-video-tdfx (1:1.4.0-2) experimental; urgency=low + + * Build against xserver 1.5. + + -- Julien Cristau Wed, 10 Sep 2008 00:29:26 +0100 + +xserver-xorg-video-tdfx (1:1.4.0-1) unstable; urgency=low + + [ Brice Goglin ] + * Add upstream URL to debian/copyright. + + [ David Nusinow ] + * Add 05_request_16bpp_depth.diff + Voodoo3's can't handle DRI in anything higher than 16bpp. We were using + the xserver postinst to default to this, but instead have the server just + request this depth. The user can override this if they choose. A better + patch would be to specifically check for voodoo3's, so interested parties + should submit the appropriate patches. + + [ Julien Cristau ] + * New upstream release. + * Refresh patches 01_tdfx_disable_dri_on_16mb_with_highres.diff, + 02_tdfx_improve_mode_rejection_diagnostics.diff and + 05_request_16bpp_depth.diff. + * Remove Branden from Uploaders with his permission, and add myself. + * Bump Standards-Version to 3.7.3. + * Drop the XS- prefix from Vcs-* control fields. + * Drop obsolete patch 03_tdfx_includes.patch. + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from + /usr/bin/Xorg and other modules, and that's not a bug, so we want + dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on + dpkg-dev >= 1.14.17. + + -- Julien Cristau Fri, 06 Jun 2008 13:01:46 +0200 + +xserver-xorg-video-tdfx (1:1.3.0-6) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 15:43:48 -0400 + +xserver-xorg-video-tdfx (1:1.3.0-5) experimental; urgency=low + + * Build against and build-dep on xserver 1.4 + * Bump standards version to 3.7.2.2. No changes needed. + + -- David Nusinow Sun, 09 Sep 2007 23:05:49 -0400 + +xserver-xorg-video-tdfx (1:1.3.0-4) experimental; urgency=low + + * Build against xserver 1.3.99.0. Build-dep on it. + * Add 04_gen_pci_ids.diff. This patch provides a list of PCI id's supported + by this driver so that the server can automatically load it when needed. + + -- David Nusinow Wed, 22 Aug 2007 20:51:33 -0400 + +xserver-xorg-video-tdfx (1:1.3.0-3) UNRELEASED; urgency=low + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-tdfx. + + [ Brice Goglin ] + * Install the upstream changelog. + * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 + (needed to let xsfbs get access to serverminver). + * Add XS-Vcs-*. + * Add a link to www.X.org and a reference to the xf86-video-tdfx + module in the long description. + * Remove Fabio from uploaders with his permission. He's always welcome back. + + -- Brice Goglin Tue, 01 May 2007 12:46:26 +0200 + +xserver-xorg-video-tdfx (1:1.3.0-2) experimental; urgency=low + + * Generate server dependencies automatically from the ABI + + -- David Nusinow Wed, 21 Feb 2007 22:54:41 -0500 + +xserver-xorg-video-tdfx (1:1.3.0-1) unstable; urgency=low + + [ Julien Cristau ] + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. + * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous + versions don't have the bug script. + + [ David Nusinow ] + * New upstream release + * Fixes DRI locking bug. Thanks Svante Signell. Closes: #395044 + * Don't build-dep on libdrm-dev on hurd-i386. Thanks Michael Banck. + Closes: #392871 + + -- David Nusinow Sat, 25 Nov 2006 11:54:04 -0500 + +xserver-xorg-video-tdfx (1:1.2.1-5) unstable; urgency=low + + * Add 03_tdfx_includes.patch which fixes some missing symbol errors. Thanks + Martin Krafft, Henrik Persson, Kaupo Arulo. Thanks Guillem Jover for the + patch. Closes: #388998 + + -- David Nusinow Sat, 30 Sep 2006 12:58:39 -0400 + +xserver-xorg-video-tdfx (1:1.2.1-4) unstable; urgency=low + + [ Steve Langasek ] + * Add missing build-dependency on quilt. Closes: #388413. + + [ David Nusinow ] + * Bump standards version to 3.7.2.0. No change needed. + + -- David Nusinow Thu, 21 Sep 2006 22:43:16 -0400 + +xserver-xorg-video-tdfx (1:1.2.1-3) unstable; urgency=low + + [ Steve Langasek ] + * Upload to unstable + + -- David Nusinow Mon, 18 Sep 2006 19:58:08 -0400 + +xserver-xorg-video-tdfx (1:1.2.1-2) experimental; urgency=low + + [ Drew Parsons ] + * Provides: xserver-xorg-video-1.0 not xserver-xorg-video. + + [ David Nusinow ] + * Bump xserver (build-)depends epochs to 2: to deal with botched + server upload + + -- David Nusinow Tue, 22 Aug 2006 23:46:46 +0000 + +xserver-xorg-video-tdfx (1:1.2.1-1) experimental; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + + [ David Nusinow ] + * New upstream release + * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for + the build-dep on xserver-xorg-dev. + * Bump debhelper compat to 5 + + -- David Nusinow Wed, 16 Aug 2006 00:22:35 +0000 + +xserver-xorg-video-tdfx (1:1.1.1.3-3) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:26:20 -0500 + +xserver-xorg-video-tdfx (1:1.1.1.3-2) experimental; urgency=low + + * Port patches from trunk + + general/035_tdfx_disable_dri_on_16mb_with_highres.diff + + general/099q_tdfx_improve_mode_rejection_diagnostics.diff + + -- David Nusinow Sun, 26 Feb 2006 18:03:00 -0500 + +xserver-xorg-video-tdfx (1:1.1.1.3-1) experimental; urgency=low + + * First upload to Debian + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Fri, 13 Jan 2006 00:41:52 -0500 + +xserver-xorg-driver-tdfx (1:1.1.1.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Add provides on xserver-xorg-driver. + + -- Daniel Stone Wed, 4 Jan 2006 20:07:03 +1100 + +xserver-xorg-driver-tdfx (1:1.1.1.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 09:12:50 +1100 + +xserver-xorg-driver-tdfx (1:1.1.1.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Bump Build-Depends on libdrm-dev to >> 2.0. + + -- Daniel Stone Mon, 12 Dec 2005 13:33:04 +1100 + +xserver-xorg-driver-tdfx (1:1.1.1-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev, + x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, libdrm + (>> 1.0.5), x11proto-xf86dri-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:58:18 +1100 + +xserver-xorg-driver-tdfx (1:1.1.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:37:00 +1100 + +xserver-xorg-driver-tdfx (1:1.1.0.1-1) dapper; urgency=low + + * Bump to new upstream version. + + -- Daniel Stone Tue, 25 Oct 2005 18:50:45 +1000 + +xserver-xorg-driver-tdfx (1:1.0.1-1) breezy; urgency=low + + * First xserver-xorg-driver-tdfx release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-tdfx-1.4.3.orig/debian/control +++ xserver-xorg-video-tdfx-1.4.3/debian/control @@ -0,0 +1,43 @@ +Source: xserver-xorg-video-tdfx +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Uploaders: David Nusinow , Cyril Brulebois +Build-Depends: + debhelper (>= 5.0.0), + pkg-config, + automake, + libtool, + xutils-dev, + xserver-xorg-dev (>= 2:1.9.0.901), + x11proto-gl-dev, + x11proto-video-dev, + x11proto-xf86dga-dev, + libgl1-mesa-dev | libgl-dev, + x11proto-core-dev, + x11proto-fonts-dev, + x11proto-randr-dev, + x11proto-render-dev, + x11proto-xext-dev, + libdrm-dev (>> 2.0) [!hurd-i386], + x11proto-xf86dri-dev, + quilt, + dpkg-dev (>= 1.14.17) +Standards-Version: 3.8.4 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tdfx +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tdfx.git + +Package: xserver-xorg-video-tdfx +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends} +Provides: ${xviddriver:Provides} +Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-tdfx +Conflicts: xserver-xorg-driver-tdfx +Description: X.Org X server -- tdfx display driver + This package provides the driver for 3dfx Voodoo video cards and their + derivatives. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-tdfx driver module. --- xserver-xorg-video-tdfx-1.4.3.orig/debian/rules +++ xserver-xorg-video-tdfx-1.4.3/debian/rules @@ -0,0 +1,95 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xserver-xorg-driver-tdfx package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include debian/xsfbs/xsfbs.mk + +CFLAGS = -Wall -g +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so +confflags += --disable-static + +build: build-stamp +build-stamp: $(STAMP_DIR)/patch + dh_testdir + + autoreconf -vfi + mkdir -p build + cd build && \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info $(confflags) \ + CFLAGS="$(CFLAGS)" + cd build && $(MAKE) + >$@ + +clean: xsfclean + dh_testdir + dh_testroot + rm -f build-stamp + + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf build + rm -f aclocal.m4 config.guess config.sub config.h.in configure + rm -f depcomp install-sh ltmain.sh missing mkinstalldirs + rm -f $$(find -name Makefile.in) + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + +# Build architecture-dependent files here. +binary-arch: build install serverabi + dh_testdir + dh_testroot + + dh_installdocs + dh_installchangelogs ChangeLog + dh_install --sourcedir=debian/tmp --list-missing + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps -- --warnings=6 + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +binary-indep: build install +# Nothing to do + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xserver-xorg-video-tdfx-1.4.3.orig/debian/README.source +++ xserver-xorg-video-tdfx-1.4.3/debian/README.source @@ -0,0 +1,73 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. + +quilt is actually invoked by the Debian X packaging through a larger +set of scripts called XSFBS. XSFBS brings some other X specific +features such as managing dependencies and conflicts due to the video +and input driver ABIs. +XSFBS itself is maintained in a separate repository at + git://git.debian.org/pkg-xorg/xsfbs.git +and it is pulled inside the other Debian X repositories when needed. + +The XSFBS patching system requires a build dependency on quilt. Also +a dependency on $(STAMP_DIR)/patch has to be added to debian/rules +so that the XSFBS patching occurs before the actual build. So the +very first target of the build (likely the one running autoreconf) +should depend on $(STAMP_DIR)/patch. It should also not depend on +anything so that parallel builds are correctly supported (nothing +should probably run while patching is being done). And finally, the +clean target should depend on the xsfclean target so that patches +are unapplied on clean. + +When the upstream sources contain some DFSG-nonfree files, they are +listed in text files in debian/prune/ in the "debian-*" branch of +the Debian repository. XSFBS' scripts then take care of removing +these listed files during the build so as to generate a modified +DFSG-free .orig.tar.gz tarball. --- xserver-xorg-video-tdfx-1.4.3.orig/debian/compat +++ xserver-xorg-video-tdfx-1.4.3/debian/compat @@ -0,0 +1 @@ +5 --- xserver-xorg-video-tdfx-1.4.3.orig/debian/copyright +++ xserver-xorg-video-tdfx-1.4.3/debian/copyright @@ -0,0 +1,25 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +All Rights Reserved. + +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 the rights to use, copy, modify, merge, publish, +distribute, sub license, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- xserver-xorg-video-tdfx-1.4.3.orig/debian/xsfbs/xsfbs.sh +++ xserver-xorg-video-tdfx-1.4.3/debian/xsfbs/xsfbs.sh @@ -0,0 +1,622 @@ +# This is the X Strike Force shell library for X Window System package +# maintainer scripts. It serves to define shell functions commonly used by +# such packages, and performs some error checking necessary for proper operation +# of those functions. By itself, it does not "do" much; the maintainer scripts +# invoke the functions defined here to accomplish package installation and +# removal tasks. + +# If you are reading this within a Debian package maintainer script (e.g., +# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can +# skip past this library by scanning forward in this file to the string +# "GOBSTOPPER". + +SOURCE_VERSION=@SOURCE_VERSION@ +OFFICIAL_BUILD=@OFFICIAL_BUILD@ + +# Use special abnormal exit codes so that problems with this library are more +# easily tracked down. +SHELL_LIB_INTERNAL_ERROR=86 +SHELL_LIB_THROWN_ERROR=74 +SHELL_LIB_USAGE_ERROR=99 + +# old -> new variable names +if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then + DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" +fi +if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then + DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" +fi + +# initial sanity checks +if [ -z "$THIS_PACKAGE" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of this package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ -z "$THIS_SCRIPT" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of the +"$THIS_PACKAGE" package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then + RECONFIGURE="true" +else + RECONFIGURE= +fi + +if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then + FIRSTINST="yes" +fi + +if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then + UPGRADE="yes" +fi + +trap "message;\ + message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ + message;\ + exit 1" HUP INT QUIT TERM + +reject_nondigits () { + # syntax: reject_nondigits [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters other than decimal digits and barf if any are found + while [ -n "$1" ]; do + # does the operand contain anything but digits? + if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then + # can't use die(), because it wraps message() which wraps this function + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ + "possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +reject_unlikely_path_chars () { + # syntax: reject_unlikely_path_chars [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters unlikely to be seen in a path and which the shell might + # interpret and barf if any are found + while [ -n "$1" ]; do + # does the operand contain any funny characters? + if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then + # can't use die(), because I want to avoid forward references + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ + "encountered possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the +# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while +# the script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +message () { + # pretty-print messages of arbitrary length + reject_nondigits "$COLUMNS" + echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 +} + +observe () { + # syntax: observe message ... + # + # issue observational message suitable for logging someday when support for + # it exists in dpkg + if [ -n "$DEBUG_XORG_PACKAGE" ]; then + message "$THIS_PACKAGE $THIS_SCRIPT note: $*" + fi +} + +warn () { + # syntax: warn message ... + # + # issue warning message suitable for logging someday when support for + # it exists in dpkg; also send to standard error + message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" +} + +die () { + # syntax: die message ... + # + # exit script with error message + message "$THIS_PACKAGE $THIS_SCRIPT error: $*" + exit $SHELL_LIB_THROWN_ERROR +} + +internal_error () { + # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message + message "internal error: $*" + if [ -n "$OFFICIAL_BUILD" ]; then + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + fi + exit $SHELL_LIB_INTERNAL_ERROR +} + +usage_error () { + message "usage error: $*" + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + exit $SHELL_LIB_USAGE_ERROR +} + +font_update () { + # run $UPDATECMDS in $FONTDIRS + + local dir cmd shortcmd x_font_dir_prefix + + x_font_dir_prefix="/usr/share/fonts/X11" + + if [ -z "$UPDATECMDS" ]; then + usage_error "font_update() called but \$UPDATECMDS not set" + fi + if [ -z "$FONTDIRS" ]; then + usage_error "font_update() called but \$FONTDIRS not set" + fi + + reject_unlikely_path_chars "$UPDATECMDS" + reject_unlikely_path_chars "$FONTDIRS" + + for dir in $FONTDIRS; do + if [ -d "$x_font_dir_prefix/$dir" ]; then + for cmd in $UPDATECMDS; do + if which "$cmd" > /dev/null 2>&1; then + shortcmd=${cmd##*/} + observe "running $shortcmd in $dir font directory" + cmd_opts= + if [ "$shortcmd" = "update-fonts-alias" ]; then + cmd_opts=--x11r7-layout + fi + if [ "$shortcmd" = "update-fonts-dir" ]; then + cmd_opts=--x11r7-layout + fi + if [ "$shortcmd" = "update-fonts-scale" ]; then + cmd_opts=--x11r7-layout + fi + $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \ + "failed; font directory data may not" \ + "be up to date" + else + warn "$cmd not found; not updating corresponding $dir font" \ + "directory data" + fi + done + else + warn "$dir is not a directory; not updating font directory data" + fi + done +} + +remove_conffile_prepare () { + # syntax: remove_conffile_prepare filename official_md5sum ... + # + # Check a conffile "filename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + local conffile current_checksum + + # validate arguments + if [ $# -lt 2 ]; then + usage_error "remove_conffile_prepare() called with wrong number of" \ + "arguments; expected at least 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + shift + + # does the conffile even exist? + if [ -e "$conffile" ]; then + # calculate its checksum + current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//') + # compare it to each supplied checksum + while [ -n "$1" ]; do + if [ "$current_checksum" = "$1" ]; then + # we found a match; move the confffile and stop looking + observe "preparing obsolete conffile $conffile for removal" + mv "$conffile" "$conffile.$THIS_PACKAGE-tmp" + break + fi + shift + done + fi +} + +remove_conffile_lookup () { + # syntax: remove_conffile_lookup package filename + # + # Lookup the md5sum of a conffile in dpkg's database, and prepare for removal + # if it matches the actual file's md5sum. + # + # Call this function when you would call remove_conffile_prepare but only + # want to check against dpkg's status database instead of known checksums. + + local package conffile old_md5sum + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "remove_conffile_lookup() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + package="$1" + conffile="$2" + + if ! [ -e "$conffile" ]; then + return + fi + old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$package" | \ + awk '{ if (match($0, "^ '"$conffile"' ")) print $2}')" + if [ -n "$old_md5sum" ]; then + remove_conffile_prepare "$conffile" "$old_md5sum" + fi +} + +remove_conffile_commit () { + # syntax: remove_conffile_commit filename + # + # Complete the removal of a conffile "filename" that has become obsolete. + # + # Call this function from a postinst script after having used + # remove_conffile_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_commit() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, remove it + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "committing removal of obsolete conffile $conffile" + rm "$conffile.$THIS_PACKAGE-tmp" + fi +} + +remove_conffile_rollback () { + # syntax: remove_conffile_rollback filename + # + # Roll back the removal of a conffile "filename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" is after having used remove_conffile_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_rollback() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, move it + # back + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "rolling back removal of obsolete conffile $conffile" + mv "$conffile.$THIS_PACKAGE-tmp" "$conffile" + fi +} + +replace_conffile_with_symlink_prepare () { + # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ + # official_md5sum ... + # + # Check a conffile "oldfilename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. Otherwise copy it + # to newfilename and let dpkg handle it through conffiles mechanism. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + local conffile current_checksum + + # validate arguments + if [ $# -lt 3 ]; then + usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ + " number of arguments; expected at least 3, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + shift + newconffile="$1" + shift + + remove_conffile_prepare "$_oldconffile" "$@" + # If $oldconffile still exists, then md5sums didn't match. + # Copy it to new one. + if [ -f "$oldconffile" ]; then + cp "$oldconffile" "$newconffile" + fi + +} + +replace_conffile_with_symlink_commit () { + # syntax: replace_conffile_with_symlink_commit oldfilename + # + # Complete the removal of a conffile "oldfilename" that has been + # replaced by a symlink. + # + # Call this function from a postinst script after having used + # replace_conffile_with_symlink_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "replace_conffile_with_symlink_commit() called with wrong" \ + "number of arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + remove_conffile_commit "$conffile" +} + +replace_conffile_with_symlink_rollback () { + # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename + # + # Roll back the replacing of a conffile "oldfilename" with symlink to + # "newfilename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" and verify $2 to ensure the package failed to upgrade + # from a version (or install over a version removed-but-not-purged) prior + # to the one in which the conffile was obsoleted. + # You should have used replace_conffile_with_symlink_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ + "number of arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + newconffile="$2" + + remove_conffile_rollback "$_oldconffile" + if [ -f "$newconffile" ]; then + rm "$newconffile" + fi +} + +run () { + # syntax: run command [ argument ... ] + # + # Run specified command with optional arguments and report its exit status. + # Useful for commands whose exit status may be nonzero, but still acceptable, + # or commands whose failure is not fatal to us. + # + # NOTE: Do *not* use this function with db_get or db_metaget commands; in + # those cases the return value of the debconf command *must* be checked + # before the string returned by debconf is used for anything. + + local retval + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "run() called with wrong number of arguments; expected at" \ + "least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + "$@" || retval=$? + + if [ ${retval:-0} -ne 0 ]; then + observe "command \"$*\" exited with status $retval" + fi +} + +make_symlink_sane () { + # syntax: make_symlink_sane symlink target + # + # Ensure that the symbolic link symlink exists, and points to target. + # + # If symlink does not exist, create it and point it at target. + # + # If symlink exists but is not a symbolic link, back it up. + # + # If symlink exists, is a symbolic link, but points to the wrong location, fix + # it. + # + # If symlink exists, is a symbolic link, and already points to target, do + # nothing. + # + # This function wouldn't be needed if ln had an -I, --idempotent option. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "make_symlink_sane() called with wrong number of arguments;" \ + "expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local symlink target + + symlink="$1" + target="$2" + + if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then + observe "link from $symlink to $target already exists" + else + observe "creating symbolic link from $symlink to $target" + mkdir -p "${target%/*}" "${symlink%/*}" + ln -s -b -S ".dpkg-old" "$target" "$symlink" + fi +} + +migrate_dir_to_symlink () { + # syntax: migrate_dir_to_symlink old_location new_location + # + # Per Debian Policy section 6.5.4, "A directory will never be replaced by a + # symbolic link to a directory or vice versa; instead, the existing state + # (symlink or not) will be left alone and dpkg will follow the symlink if + # there is one." + # + # We have to do it ourselves. + # + # This function moves the contents of old_location, a directory, into + # new_location, a directory, then makes old_location a symbolic link to + # new_location. + # + # old_location need not exist, but if it does, it must be a directory (or a + # symlink to a directory). If it is not, it is backed up. If new_location + # exists already and is not a directory, it is backed up. + # + # This function should be called from a package's preinst so that other + # packages unpacked after this one --- but before this package's postinst runs + # --- are unpacked into new_location even if their payloads contain + # old_location filespecs. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "migrate_dir_to_symlink() called with wrong number of" + "arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local new old + + old="$1" + new="$2" + + # Is old location a symlink? + if [ -L "$old" ]; then + # Does it already point to new location? + if [ "$(readlink "$old")" = "$new" ]; then + # Nothing to do; migration has already been done. + observe "migration of $old to $new already done" + return 0 + else + # Back it up. + warn "backing up symbolic link $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + fi + + # Does old location exist, but is not a directory? + if [ -e "$old" ] && ! [ -d "$old" ]; then + # Back it up. + warn "backing up non-directory $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + + observe "migrating $old to $new" + + # Is new location a symlink? + if [ -L "$new" ]; then + # Does it point the wrong way, i.e., back to where we're migrating from? + if [ "$(readlink "$new")" = "$old" ]; then + # Get rid of it. + observe "removing symbolic link $new which points to $old" + rm "$new" + else + # Back it up. + warn "backing up symbolic link $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + fi + + # Does new location exist, but is not a directory? + if [ -e "$new" ] && ! [ -d "$new" ]; then + warn "backing up non-directory $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + + # Create new directory if it does not yet exist. + if ! [ -e "$new" ]; then + observe "creating $new" + mkdir -p "$new" + fi + + # Copy files in old location to new location. Back up any filenames that + # already exist in the new location with the extension ".dpkg-old". + observe "copying files from $old to $new" + if ! (cd "$old" && cp -a -b -S ".dpkg-old" . "$new"); then + die "error(s) encountered while copying files from $old to $new" + fi + + # Remove files at old location. + observe "removing $old" + rm -r "$old" + + # Create symlink from old location to new location. + make_symlink_sane "$old" "$new" +} + +# vim:set ai et sw=2 ts=2 tw=80: + +# GOBSTOPPER: The X Strike Force shell library ends here. --- xserver-xorg-video-tdfx-1.4.3.orig/debian/xsfbs/xsfbs.mk +++ xserver-xorg-video-tdfx-1.4.3/debian/xsfbs/xsfbs.mk @@ -0,0 +1,285 @@ +#!/usr/bin/make -f + +# Debian X Strike Force Build System (XSFBS): Make portion + +# Copyright 1996 Stephen Early +# Copyright 1997 Mark Eichin +# Copyright 1998-2005, 2007 Branden Robinson +# Copyright 2005 David Nusinow +# +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# Originally by Stephen Early +# Modified by Mark W. Eichin +# Modified by Adam Heath +# Modified by Branden Robinson +# Modified by Fabio Massimo Di Nitto +# Modified by David Nusinow +# Acknowledgements to Manoj Srivastava. + +# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. +export DH_OPTIONS + +# force quilt to not use ~/.quiltrc and to use debian/patches +QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null + +# Set up parameters for the upstream build environment. + +# Determine (source) package name from Debian changelog. +SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Source:' | awk '{print $$2}') + +# Determine package version from Debian changelog. +SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Version:' | awk '{print $$2}') + +# Determine upstream version number. +UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') + +# Determine the source version without the epoch for make-orig-tar-gz +NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') + +# Figure out who's building this package. +BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) + +# Find out if this is an official build; an official build has nothing but +# digits, dots, and/or the codename of a release in the Debian part of the +# version number. Anything else indicates an unofficial build. +OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) + +# Set up parameters for the Debian build environment. + +# Determine our architecture. +BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) +# Work around some old-time dpkg braindamage. +BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) +# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. +ifdef DEB_HOST_ARCH + ARCH:=$(DEB_HOST_ARCH) +else + # dpkg-cross sets the ARCH environment variable; if set, use it. + ifdef ARCH + ARCH:=$(ARCH) + else + ARCH:=$(BUILD_ARCH) + endif +endif + +# $(STAMP_DIR) houses stamp files for complex targets. +STAMP_DIR:=stampdir + +# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place +# their files. +DEBTREEDIR:=$(CURDIR)/debian/tmp + +# All "important" targets have four lines: +# 1) A target name that is invoked by a package-building tool or the user. +# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. +# 2) A line delcaring 1) as a phony target (".PHONY:"). +# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may +# depend on other targets. +# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the +# "$(STAMP_DIR)/" prefix is omitted. +# +# This indirection is needed so that the "stamp" files that signify when a rule +# is done can be located in a separate "stampdir". Recall that make has no way +# to know when a goal has been met for a phony target (like "build" or +# "install"). +# +# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" +# so that the target will not be run again. Removing the file will make Make +# run the target over. + +# All phony targets should be declared as dependencies of .PHONY, even if they +# do not have "($STAMP_DIR)/"-prefixed counterparts. + +# Define a harmless default rule to keep things from going nuts by accident. +.PHONY: default +default: + +# Set up the $(STAMP_DIR) directory. +.PHONY: stampdir +stampdir_targets+=stampdir +stampdir: $(STAMP_DIR)/stampdir +$(STAMP_DIR)/stampdir: + mkdir $(STAMP_DIR) + >$@ + +# Set up the package build directory as quilt expects to find it. +.PHONY: prepare +stampdir_targets+=prepare +prepare: $(STAMP_DIR)/prepare +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts + >$@ + +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir + mkdir -p $(STAMP_DIR)/log + >$@ + +# Apply all patches to the upstream source. +.PHONY: patch +stampdir_targets+=patch +patch: $(STAMP_DIR)/patch +$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare + if ! [ `which quilt` ]; then \ + echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ + exit 1; \ + fi; \ + if $(QUILT) next >/dev/null 2>&1; then \ + echo -n "Applying patches..."; \ + if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ + cat $(STAMP_DIR)/log/patch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/patch; \ + echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "No patches to apply"; \ + fi; \ + >$@ + +# Revert all patches to the upstream source. +.PHONY: unpatch +unpatch: $(STAMP_DIR)/logdir + rm -f $(STAMP_DIR)/patch + @echo -n "Unapplying patches..."; \ + if $(QUILT) applied >/dev/null 2>/dev/null; then \ + if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "nothing to do."; \ + fi + +# Clean the generated maintainer scripts. +.PHONY: cleanscripts +cleanscripts: + rm -f $(STAMP_DIR)/genscripts + rm -f debian/*.config \ + debian/*.postinst \ + debian/*.postrm \ + debian/*.preinst \ + debian/*.prerm + +# Clean the package build tree. +.PHONY: xsfclean +xsfclean: cleanscripts unpatch + dh_testdir + rm -rf .pc + rm -rf $(STAMP_DIR) + dh_clean + +# Remove files from the upstream source tree that we don't need, or which have +# licensing problems. It must be run before creating the .orig.tar.gz. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: prune-upstream-tree +prune-upstream-tree: + # Ensure we're in the correct directory. + dh_testdir + grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf + +# Verify that there are no offsets or fuzz in the patches we apply. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: patch-audit +patch-audit: prepare unpatch + @echo -n "Auditing patches..."; \ + >$(STAMP_DIR)/log/patch; \ + FUZZY=; \ + while [ -n "$$($(QUILT) next)" ]; do \ + RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ + case "$$RESULT" in \ + succeeded) \ + echo "fuzzy patch: $$($(QUILT) top)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ + FUZZY=yes; \ + ;; \ + FAILED) \ + echo "broken patch: $$($(QUILT) next)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ + exit 1; \ + ;; \ + esac; \ + done; \ + if [ -n "$$FUZZY" ]; then \ + echo "there were fuzzy patches; please fix."; \ + exit 1; \ + else \ + echo "done."; \ + fi + +# Generate the maintainer scripts. +.PHONY: genscripts +stampdir_targets+=genscripts +genscripts: $(STAMP_DIR)/genscripts +$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir + for FILE in debian/*.config.in \ + debian/*.postinst.in \ + debian/*.postrm.in \ + debian/*.preinst.in \ + debian/*.prerm.in; do \ + if [ -e "$$FILE" ]; then \ + MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ + sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ + cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ + sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ + sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ + -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ + <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ + rm $$MAINTSCRIPT.tmp; \ + fi; \ + done + # Validate syntax of generated shell scripts. + #sh debian/scripts/validate-posix-sh debian/*.config \ + # debian/*.postinst \ + # debian/*.postrm \ + # debian/*.preinst \ + # debian/*.prerm + >$@ + +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze +VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) +INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input + +ifeq ($(PACKAGE),) +PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) +endif + +.PHONY: serverabi +serverabi: install +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' + @exit 1 +else + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars +endif + +# vim:set noet ai sts=8 sw=8 tw=0: --- xserver-xorg-video-tdfx-1.4.3.orig/debian/xsfbs/repack.sh +++ xserver-xorg-video-tdfx-1.4.3/debian/xsfbs/repack.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +if ! [ -d debian/prune ]; then + exit 0 +fi + +if [ "x$1" != x--upstream-version ]; then + exit 1 +fi + +version="$2" +filename="$3" + +if [ -z "$version" ] || ! [ -f "$filename" ]; then + exit 1 +fi + +dir="$(pwd)" +tempdir="$(mktemp -d)" + +cd "$tempdir" +tar xf "$dir/$filename" +cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done + +tar czf "$dir/$filename" * +cd "$dir" +rm -rf "$tempdir" +echo "Done pruning upstream tarball" + +exit 0 --- xserver-xorg-video-tdfx-1.4.3.orig/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff +++ xserver-xorg-video-tdfx-1.4.3/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff @@ -0,0 +1,41 @@ +--- xserver-xorg-video-tdfx.orig/src/tdfx_driver.c ++++ xserver-xorg-video-tdfx/src/tdfx_driver.c +@@ -2689,8 +2689,16 @@ + TDFXPtr pTDFX; + + TDFXTRACE("TDFXValidMode start\n"); +- if ((mode->HDisplay>2048) || (mode->VDisplay>1536)) ++ if (mode->HDisplay>2048) { ++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with horizontal resolution %d" ++ " exceeding maximum of 2048\n", mode->HDisplay); + return MODE_BAD; ++ } ++ if (mode->VDisplay>1536) { ++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with vertical resolution %d" ++ " exceeding maximum of 1536\n", mode->VDisplay); ++ return MODE_BAD; ++ } + /* Banshee doesn't support interlace, but Voodoo 3 and higher do. */ + pScrn = xf86Screens[scrnIndex]; + pTDFX = TDFXPTR(pScrn); +@@ -2704,13 +2712,19 @@ + return MODE_OK; + break; + default: ++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with unsupported" ++ " interlace flag\n"); + return MODE_BAD; + break; + } + } + /* In clock doubled mode widths must be divisible by 16 instead of 8 */ +- if ((mode->Clock>TDFX2XCUTOFF) && (mode->HDisplay%16)) ++ if ((mode->Clock>TDFX2XCUTOFF) && (mode->HDisplay%16)) { ++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with horizontal resolution %d" ++ " not divisibile by 16 and clock %d greater than %d\n", ++ mode->HDisplay, mode->Clock, TDFX2XCUTOFF); + return MODE_BAD; ++ } + return MODE_OK; + } + --- xserver-xorg-video-tdfx-1.4.3.orig/debian/patches/series +++ xserver-xorg-video-tdfx-1.4.3/debian/patches/series @@ -0,0 +1,3 @@ +01_tdfx_disable_dri_on_16mb_with_highres.diff +02_tdfx_improve_mode_rejection_diagnostics.diff +05_request_16bpp_depth.diff --- xserver-xorg-video-tdfx-1.4.3.orig/debian/patches/01_tdfx_disable_dri_on_16mb_with_highres.diff +++ xserver-xorg-video-tdfx-1.4.3/debian/patches/01_tdfx_disable_dri_on_16mb_with_highres.diff @@ -0,0 +1,25 @@ +--- xserver-xorg-video-tdfx.orig/src/tdfx_dri.c ++++ xserver-xorg-video-tdfx/src/tdfx_dri.c +@@ -308,6 +308,22 @@ + return FALSE; + } + ++ /* Disable DRI if using a 16Mb card with virtual resolution higher than ++ * 1024x768 because DRI does not have enough memory available for textures ++ * at higher resolutions, and will not operate correctly. ++ */ ++ xf86DrvMsg(pScreen->myNum, X_INFO, "[dri] VideoRAM = %d, VirtualXres = %d, VirtualYres= %d,\n", ++ pScrn->videoRam, pScrn->virtualX, pScrn->virtualY); ++ ++ if ( (pTDFX->ChipType == PCI_CHIP_VOODOO3) || (pTDFX->ChipType == PCI_CHIP_BANSHEE) ) { ++ if (pScrn->videoRam <= 16384 && ((pScrn->virtualX * pScrn->virtualY) > (1024 * 768)) ) { ++ xf86DrvMsg(pScreen->myNum, X_WARNING, ++ "[dri] To use DRI, with a 16Mb Voodoo 3 or Banshee card, you must\n" ++ "\tinvoke the server using a maximum resolution of 1024x768 or lower.\n"); ++ return FALSE; ++ } ++ } ++ + /* Check that the GLX, DRI, and DRM modules have been loaded by testing + for canonical symbols in each module. */ + if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE; --- xserver-xorg-video-tdfx-1.4.3.orig/debian/patches/05_request_16bpp_depth.diff +++ xserver-xorg-video-tdfx-1.4.3/debian/patches/05_request_16bpp_depth.diff @@ -0,0 +1,11 @@ +--- xserver-xorg-video-tdfx.orig/src/tdfx_driver.c ++++ xserver-xorg-video-tdfx/src/tdfx_driver.c +@@ -990,7 +990,7 @@ + pScrn->monitor = pScrn->confScreen->monitor; + + flags24=Support24bppFb | Support32bppFb | SupportConvert32to24; +- if (!xf86SetDepthBpp(pScrn, 0, 0, 0, flags24)) { ++ if (!xf86SetDepthBpp(pScrn, 16, 0, 0, flags24)) { + return FALSE; + } else { + switch (pScrn->depth) {