ChangeLog | 36 +++++++ README | 20 ++++ configure.ac | 2 debian/README.source | 73 ++++++++++++++ debian/changelog | 9 + debian/control | 2 debian/xsfbs/xsfbs.mk | 21 ---- debian/xsfbs/xsfbs.sh | 245 -------------------------------------------------- src/ark_driver.c | 55 +---------- 9 files changed, 149 insertions(+), 314 deletions(-)
New commits: commit 848087c51b264fb20fb8766669dbf0492eb5ab3b Author: Timo Aaltonen <[email protected]> Date: Mon Nov 30 15:59:54 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index 06a3f4d..7b45e94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xserver-xorg-video-ark (1:0.7.2-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * New upstream release. + * Bump Standards-Version to 3.8.3. -- Timo Aaltonen <[email protected]> Mon, 30 Nov 2009 15:59:01 +0200 diff --git a/debian/control b/debian/control index 2ecdd92..594effd 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git commit 6d3d76414dc6764c935656f1fbdc26011dae77f5 Author: Timo Aaltonen <[email protected]> Date: Mon Nov 30 15:59:24 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index 4442211..66892fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +commit 9d2a2c6b8de41c39f59602e04aac68644dadf45e +Author: Dave Airlie <[email protected]> +Date: Mon Sep 7 14:47:47 2009 +1000 + + ark: fix make distcheck + +commit 93856287f1e753d7df0ebfc51b12b425447138cf +Author: Dave Airlie <[email protected]> +Date: Mon Sep 7 14:44:22 2009 +1000 + + bump release to 0.7.2 + +commit e521e8240c1acc49a514db123cb67beb669dea81 +Author: Dave Airlie <[email protected]> +Date: Tue Jul 28 13:32:28 2009 +1000 + + ark: update for resources/RAC API removal + +commit 150d86dd0fff038db660f993d080cc3f7a09f6c5 +Author: Dave Airlie <[email protected]> +Date: Tue Jul 28 10:03:50 2009 +1000 + + ark: switch to using pci config instead of active + +commit 05ce888200307d9c6f16fbdbf732cbae8b5a3dae +Author: Adam Jackson <[email protected]> +Date: Thu May 28 14:46:19 2009 -0400 + + Remove useless loader symbol lists. + +commit 9acf6f68c98159ea5bb2d29454444ed143e7d6f2 +Author: Alan Coopersmith <[email protected]> +Date: Fri Jan 30 20:30:48 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + commit e686088ac1c4517184bbd676ec16c9bf5d010469 Author: Dave Airlie <[email protected]> Date: Mon Dec 22 15:24:57 2008 +1000 diff --git a/debian/changelog b/debian/changelog index 6bbcab5..06a3f4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -xserver-xorg-video-ark (1:0.7.1-3) UNRELEASED; urgency=low +xserver-xorg-video-ark (1:0.7.2-1) UNRELEASED; urgency=low + [ David Nusinow ] * Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to autodetect devices. + Disable patch system and remove quilt from build-depends - -- David Nusinow <[email protected]> Wed, 29 Apr 2009 22:37:48 -0400 + [ Timo Aaltonen ] + * New upstream release. + + -- Timo Aaltonen <[email protected]> Mon, 30 Nov 2009 15:59:01 +0200 xserver-xorg-video-ark (1:0.7.1-2) unstable; urgency=low commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1 Author: Julien Cristau <[email protected]> Date: Fri Sep 25 16:39:23 2009 +0200 xsfbs.mk: remove more obsolete code We can use plain debconf-updatepo, and don't need to clean the 'imports' directory or shlibs.local. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 82eb45f..5e16b10 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc rm -rf $(STAMP_DIR) - rm -rf imports - dh_clean debian/shlibs.local \ - debian/po/pothead - -# Generate the debconf templates POT file header. -debian/po/pothead: debian/po/pothead.in - sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ - -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ - -# Update POT and PO files. -.PHONY: updatepo -updatepo: debian/po/pothead - debian/scripts/debconf-updatepo --pot-header=pothead --verbose + 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. commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc Author: Julien Cristau <[email protected]> Date: Fri Sep 25 15:43:28 2009 +0200 xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage These variables aren't set anywhere. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 1f86848..82eb45f 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -176,7 +176,7 @@ cleanscripts: xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc - rm -rf $(STAMP_DIR) $(SOURCE_DIR) + rm -rf $(STAMP_DIR) rm -rf imports dh_clean debian/shlibs.local \ debian/po/pothead @@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ - -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \ <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ rm $$MAINTSCRIPT.tmp; \ fi; \ commit bda208ec00d0b7b3632f57fb27e014684cdf73ba Author: Julien Cristau <[email protected]> Date: Fri Sep 25 15:33:39 2009 +0200 xsfbs.sh: fix typo and remove svn keyword diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 45acd59..813fd8d 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -1,5 +1,3 @@ -# $Id$ - # 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 @@ -8,7 +6,7 @@ # 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 +# /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". commit 9d2a2c6b8de41c39f59602e04aac68644dadf45e Author: Dave Airlie <[email protected]> Date: Mon Sep 7 14:47:47 2009 +1000 ark: fix make distcheck diff --git a/src/ark_driver.c b/src/ark_driver.c index ee94a14..5de3b9a 100644 --- a/src/ark_driver.c +++ b/src/ark_driver.c @@ -45,6 +45,10 @@ #include "fb.h" #include "ark.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 +#include "xf86Resources.h" +#endif + #include <string.h> /* commit 93856287f1e753d7df0ebfc51b12b425447138cf Author: Dave Airlie <[email protected]> Date: Mon Sep 7 14:44:22 2009 +1000 bump release to 0.7.2 diff --git a/configure.ac b/configure.ac index 5d8ec8b..7267f4d 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-ark], - 0.7.1, + 0.7.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-ark) commit 5693792171d885769e58dcccc053c08b11acd12a Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:53:36 2009 +0200 xsfbs.mk: no need for shlibs.local diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index f0f8953..1f86848 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -# Generate the shlibs.local file. -debian/shlibs.local: - cat debian/*.shlibs >$@ - SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) commit 1f858adff1ce2687cf542dd9b69b81137412f8a4 Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:47:09 2009 +0200 xsfbs.sh: remove unused reject_whitespace function diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index b3f4bbe..45acd59 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -93,22 +93,6 @@ reject_nondigits () { done } -reject_whitespace () { - # syntax: reject_whitespace [ operand ] - # - # scan operand (typically a shell variable whose value cannot be trusted) for - # whitespace characters and barf if any are found - if [ -n "$1" ]; then - # does the operand contain any whitespace? - if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then - # can't use die(), because I want to avoid forward references - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \ - "possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - fi -} - reject_unlikely_path_chars () { # syntax: reject_unlikely_path_chars [ operand ... ] # commit 0dd71e12416aa7dc60ed68af8127e04609b125f4 Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:23:53 2009 +0200 xsfbs.sh: remove unused find_culprits function diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 7dbb196..b3f4bbe 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -199,53 +199,6 @@ usage_error () { exit $SHELL_LIB_USAGE_ERROR } -find_culprits () { - local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ - msg - - reject_whitespace "$1" - message "Searching for overlapping packages..." - dpkg_info_dir=/var/lib/dpkg/info - if [ -d $dpkg_info_dir ]; then - if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then - possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \ - "(xbase-clients|x11-common|xfs|xlibs)") - if [ -n "$possible_culprits" ]; then - smoking_guns=$(grep -l "$1" $possible_culprits || true) - if [ -n "$smoking_guns" ]; then - bad_packages=$(printf "\\n") - for f in $smoking_guns; do - # too bad you can't nest parameter expansion voodoo - p=${f%*.list} # strip off the trailing ".list" - package=${p##*/} # strip off the directories - bad_packages=$(printf "%s\n%s" "$bad_packages" "$package") - done - msg=$(cat <<EOF -The following packages appear to have file overlaps with the X.Org packages; -these packages are either very old, or in violation of Debian Policy. Try -upgrading each of these packages to the latest available version if possible: -for example, with the command "apt-get install". If no newer version of a -package is available, you will have to remove it; for example, with the command -"apt-get remove". If even the latest available version of the package has -this file overlap, please file a bug against that package with the Debian Bug -Tracking System. You may want to refer the package maintainer to section 12.8 -of the Debian Policy manual. -EOF -) - message "$msg" - message "The overlapping packages are: $bad_packages" - else - message "no overlaps found." - fi - fi - else - message "cannot search; no matches for $dpkg_info_dir/*.list." - fi - else - message "cannot search; $dpkg_info_dir does not exist." - fi -} - font_update () { # run $UPDATECMDS in $FONTDIRS commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:23:06 2009 +0200 xsfbs.sh: remove unused maplink function diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index f869274..7dbb196 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -199,37 +199,6 @@ usage_error () { exit $SHELL_LIB_USAGE_ERROR } - -maplink () { - # returns what symlink should point to; i.e., what the "sane" answer is - # Keep this in sync with the debian/*.links files. - # This is only needed for symlinks to directories. - # - # XXX: Most of these look wrong in the X11R7 world and need to be fixed. - # If we've stopped using this function, fixing it might enable us to re-enable - # it again and catch more errors. - case "$1" in - /etc/X11/xkb/compiled) echo /var/lib/xkb ;; - /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;; - /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;; - /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;; - /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;; - /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;; - /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;; - /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;; - /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;; - /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;; - /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;; - /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;; - /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;; - /usr/bin/X11) echo ../X11R6/bin ;; - /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;; - /usr/include/X11) echo ../X11R6/include/X11 ;; - /usr/lib/X11) echo ../X11R6/lib/X11 ;; - *) internal_error "maplink() called with unknown path \"$1\"" ;; - esac -} - find_culprits () { local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ msg commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28 Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:21:34 2009 +0200 xsfbs.sh: remove unused analyze_path diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 4461b1a..f869274 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -230,32 +230,6 @@ maplink () { esac } -analyze_path () { - # given a supplied set of pathnames, break each one up by directory and do an - # ls -dl on each component, cumulatively; i.e. - # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin - # Thanks to Randolph Chung for this clever hack. - - local f g - - while [ -n "$1" ]; do - reject_whitespace "$1" - g= - message "Analyzing $1:" - for f in $(echo "$1" | tr / \ ); do - if [ -e /$g$f ]; then - ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true - g=$g$f/ - else - message "/$g$f: nonexistent; directory contents of /$g:" - ls -l /$g - break - fi - done - shift - done -} - find_culprits () { local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ msg commit 1d0081bdf60944d8ef0935a531dfbcc5f01739c5 Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:20:11 2009 +0200 xsfbs.sh: remove unused check_symlinks_and_{bomb,warn} diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 781826f..4461b1a 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -303,115 +303,6 @@ EOF fi } -check_symlink () { - # syntax: check_symlink symlink - # - # See if specified symlink points where it is supposed to. Return 0 if it - # does, and 1 if it does not. - # - # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb(). - - local symlink - - # validate arguments - if [ $# -ne 1 ]; then - usage_error "check_symlink() called with wrong number of arguments;" \ - "expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - symlink="$1" - - if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then - return 0 - else - return 1 - fi -} - -check_symlinks_and_warn () { - # syntax: check_symlinks_and_warn symlink ... - # - # For each argument, check for symlink sanity, and warn if it isn't sane. - # - # Call this function from a preinst script in the event $1 is "upgrade" or - # "install". - - local errmsg symlink - - # validate arguments - if [ $# -lt 1 ]; then - usage_error "check_symlinks_and_warn() called with wrong number of" \ - "arguments; expected at least 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - while [ -n "$1" ]; do - symlink="$1" - if [ -L "$symlink" ]; then - if ! check_symlink "$symlink"; then - observe "$symlink symbolic link points to wrong location" \ - "$(readlink "$symlink"); removing" - rm "$symlink" - fi - elif [ -e "$symlink" ]; then - errmsg="$symlink exists and is not a symbolic link; this package cannot" - errmsg="$errmsg be installed until this" - if [ -f "$symlink" ]; then - errmsg="$errmsg file" - elif [ -d "$symlink" ]; then - errmsg="$errmsg directory" - else - errmsg="$errmsg thing" - fi - errmsg="$errmsg is removed" - die "$errmsg" - fi - shift - done -} - -check_symlinks_and_bomb () { - # syntax: check_symlinks_and_bomb symlink ... - # - # For each argument, check for symlink sanity, and bomb if it isn't sane. - # - # Call this function from a postinst script. - - local problem symlink - - # validate arguments - if [ $# -lt 1 ]; then - usage_error "check_symlinks_and_bomb() called with wrong number of" - "arguments; expected at least 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - while [ -n "$1" ]; do - problem= - symlink="$1" - if [ -L "$symlink" ]; then - if ! check_symlink "$symlink"; then - problem=yes - warn "$symlink symbolic link points to wrong location" \ - "$(readlink "$symlink")" - fi - elif [ -e "$symlink" ]; then - problem=yes - warn "$symlink is not a symbolic link" - else - problem=yes - warn "$symlink symbolic link does not exist" - fi - if [ -n "$problem" ]; then - analyze_path "$symlink" "$(readlink "$symlink")" - find_culprits "$symlink" - die "bad symbolic links on system" - fi - shift - done -} - font_update () { # run $UPDATECMDS in $FONTDIRS commit e521e8240c1acc49a514db123cb67beb669dea81 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 13:32:28 2009 +1000 ark: update for resources/RAC API removal diff --git a/src/ark_driver.c b/src/ark_driver.c index db5303c..ee94a14 100644 --- a/src/ark_driver.c +++ b/src/ark_driver.c @@ -35,7 +35,6 @@ #include "xf86_OSproc.h" #include "xf86Pci.h" #include "xf86PciInfo.h" -#include "xf86Resources.h" #include "xf86fbman.h" #include "xf86cmap.h" #include "compiler.h" @@ -313,16 +312,7 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags) } pEnt = xf86GetEntityInfo(pScrn->entityList[0]); - if (pEnt->resources) { - xfree(pEnt); - ARKFreeRec(pScrn); - return FALSE; - } - pARK->PciInfo = xf86GetPciInfoForEntity(pEnt->index); - xf86RegisterResources(pEnt->index, NULL, ResNone); - xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); - xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); if (pEnt->device->chipset && *pEnt->device->chipset) { pScrn->chipset = pEnt->device->chipset; commit 150d86dd0fff038db660f993d080cc3f7a09f6c5 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 10:03:50 2009 +1000 ark: switch to using pci config instead of active diff --git a/src/ark_driver.c b/src/ark_driver.c index e69250b..db5303c 100644 --- a/src/ark_driver.c +++ b/src/ark_driver.c @@ -207,7 +207,10 @@ static Bool ARKProbe(DriverPtr drv, int flags) if (flags & PROBE_DETECT) foundScreen = TRUE; else for (i=0; i<numUsed; i++) { - ScrnInfoPtr pScrn = xf86AllocateScreen(drv, 0); + ScrnInfoPtr pScrn = NULL; + + pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i], ARKPciChipsets, + NULL, NULL, NULL, NULL, NULL); pScrn->driverVersion = VERSION_MAJOR; pScrn->driverName = DRIVER_NAME; @@ -221,8 +224,6 @@ static Bool ARKProbe(DriverPtr drv, int flags) pScrn->LeaveVT = ARKLeaveVT; pScrn->FreeScreen = ARKFreeScreen; foundScreen = TRUE; - xf86ConfigActivePciEntity(pScrn, usedChips[i], ARKPciChipsets, - NULL, NULL, NULL, NULL, NULL); } xfree(usedChips); commit 8f72294ada477f003888b6776883c1dd98289f3f Author: Julien Cristau <[email protected]> Date: Wed Jun 3 03:37:37 2009 +0200 Kill custom readlink function This was needed for very, very old versions of debianutils. Closes: #498890 diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 197eb74..781826f 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -303,16 +303,6 @@ EOF fi } -# we require a readlink command or shell function -if ! which readlink > /dev/null 2>&1; then - message "The readlink command was not found. Please install version" \ - "1.13.1 or later of the debianutils package." - readlink () { - # returns what symlink in $1 actually points to - perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1" - } -fi - check_symlink () { # syntax: check_symlink symlink # commit 05ce888200307d9c6f16fbdbf732cbae8b5a3dae Author: Adam Jackson <[email protected]> Date: Thu May 28 14:46:19 2009 -0400 Remove useless loader symbol lists. diff --git a/src/ark_driver.c b/src/ark_driver.c index 67eb076..e69250b 100644 --- a/src/ark_driver.c +++ b/src/ark_driver.c @@ -113,34 +113,6 @@ static const OptionInfoRec ARKOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; -static const char *fbSymbols[] = { - "fbPictureInit", - "fbScreenInit", - NULL -}; - -static const char *vgaHWSymbols[] = { - "vgaHWFreeHWRec", - "vgaHWGetHWRec", - "vgaHWGetIOBase", - "vgaHWGetIndex", - "vgaHWInit", - "vgaHWLock", - "vgaHWProtect", - "vgaHWRestore", - "vgaHWSave", - "vgaHWSaveScreen", - "vgaHWUnlock", - "vgaHWUnmapMem", - NULL -}; - -static const char *xaaSymbols[] = { - "XAACreateInfoRec", - "XAAInit", - NULL -}; - #ifdef XFree86LOADER MODULESETUPPROTO(ARKSetup); @@ -167,7 +139,6 @@ pointer ARKSetup(pointer module, pointer opts, int *errmaj, int *errmin) if (!setupDone) { setupDone = TRUE; xf86AddDriver(&ARK, module, 0); - LoaderRefSymLists(fbSymbols, vgaHWSymbols, xaaSymbols, NULL); return (pointer) 1; } else { if (errmaj) @@ -277,8 +248,6 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags) if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE; - xf86LoaderReqSymLists(vgaHWSymbols, NULL); - if (!vgaHWGetHWRec(pScrn)) return FALSE; @@ -499,14 +468,11 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - xf86LoaderReqSymLists(fbSymbols, NULL); - if (!pARK->NoAccel) { if (!xf86LoadSubModule(pScrn, "xaa")) { ARKFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(xaaSymbols, NULL); } return TRUE; commit 7deebf983f53c505bc25171ab77fdc408f250a6e Author: Julien Cristau <[email protected]> Date: Tue May 26 15:58:19 2009 +0200 xsfbs: don't run dpkg --print-installation-architecture This is deprecated in new dpkg, and had no users anyway. diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 8840ff9..197eb74 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -57,8 +57,6 @@ EOF exit $SHELL_LIB_USAGE_ERROR fi -ARCHITECTURE="$(dpkg --print-installation-architecture)" - if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then RECONFIGURE="true" else commit 4178d948cd66a938222d0d7c6353ee8d60229e40 Author: David Nusinow <[email protected]> Date: Mon May 25 20:08:50 2009 -0400 Add README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..34ab4bf --- /dev/null +++ b/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 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. commit fa6396d6bf68b9a0154089146287245f9ad60a1e Author: Julien Cristau <[email protected]> Date: Wed Feb 25 21:31:03 2009 +0100 xsfbs: repack.sh needs to be executable diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh old mode 100644 new mode 100755 commit 9acf6f68c98159ea5bb2d29454444ed143e7d6f2 Author: Alan Coopersmith <[email protected]> Date: Fri Jan 30 20:30:48 2009 -0800 Add README with pointers to mailing list, bugzilla & git repos diff --git a/README b/README new file mode 100644 index 0000000..680472d --- /dev/null +++ b/README @@ -0,0 +1,20 @@ +xf86-video-ark - Ark Logic video driver for Xorg X server + +Please submit bugs & patches to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ark + + http://cgit.freedesktop.org/xorg/driver/xf86-video-ark + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
