ChangeLog | 42 +++ configure.ac | 2 debian/README.source | 73 ++++++ debian/changelog | 30 ++ debian/control | 5 debian/patches/02_gen_pci_ids.diff | 25 -- debian/patches/series | 1 debian/rules | 4 debian/xserver-xorg-video-neomagic.install | 1 debian/xsfbs/repack.sh | 32 ++ debian/xsfbs/xsfbs.mk | 21 - debian/xsfbs/xsfbs.sh | 311 ----------------------------- man/neomagic.man | 2 src/neo_driver.c | 119 +---------- src/neo_shadow.c | 1 15 files changed, 203 insertions(+), 466 deletions(-)
New commits: commit 28edb8b2d40fa971705c3c249c3a7305ce3bf4ba Author: Cyril Brulebois <k...@debian.org> Date: Sun Dec 6 02:43:30 2009 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 7ae66cb..c652b05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -xserver-xorg-video-neomagic (1:1.2.4-1) UNRELEASED; urgency=low +xserver-xorg-video-neomagic (1:1.2.4-1) experimental; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. - -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:08 +0200 + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois <k...@debian.org> Sun, 06 Dec 2009 02:43:23 +0100 xserver-xorg-video-neomagic (1:1.2.3-1) unstable; urgency=low commit 4b98420a91b177b631a6dc86b5b319ba3fbc737e Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Sat Dec 5 02:09:27 2009 +0200 Build against Xserver 1.7. diff --git a/debian/changelog b/debian/changelog index 1cda647..7ae66cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ xserver-xorg-video-neomagic (1:1.2.4-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. - -- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 30 Nov 2009 16:49:11 +0200 + -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:08 +0200 xserver-xorg-video-neomagic (1:1.2.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 3f45a6e..47b57ff 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org Build-Depends: debhelper (>= 5.0.0), pkg-config, - xserver-xorg-dev (>= 2:1.5.99.901), + xserver-xorg-dev (>= 2:1.7), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, commit 868a327a3f1030b8614146865b8f715d37b36346 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Mon Nov 30 16:50:36 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index edeeced..1cda647 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-neomagic (1:1.2.4-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.8.3. -- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 30 Nov 2009 16:49:11 +0200 diff --git a/debian/control b/debian/control index 2eececd..3f45a6e 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-neomagic Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-neomagic.git commit 46dc1937fc7dca6973fba8c2e4dcfb695f11685c Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Mon Nov 30 16:50:10 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index 041a6f7..ccb3848 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +commit dcfff9bc194f3d86104e281a14226ff489b199ab +Author: Dave Airlie <airl...@redhat.com> +Date: Thu Jul 30 12:04:31 2009 +1000 + + neomagic: bump for release 1.2.4 + +commit ee5229754f87c8859641926bee82c0141727c7c4 +Author: Dave Airlie <airl...@redhat.com> +Date: Tue Jul 28 15:22:40 2009 +1000 + + neomagic: change to using ABI version check + +commit 44c8d148f8a68c13a65fc989adb09b1a675f1a2a +Author: Dave Airlie <airl...@redhat.com> +Date: Tue Jul 28 13:32:31 2009 +1000 + + neomagic: update for resources/RAC API removal + +commit e822477ae9cb0f7dd859a49e5da3f30993532ca5 +Author: Dave Airlie <airl...@redhat.com> +Date: Tue Jul 28 10:32:59 2009 +1000 + + neomagic: remove unneeded include + commit 33997831f0ffe61452fac111b51dabffef348b76 Author: Adam Jackson <a...@redhat.com> Date: Thu Jul 2 11:24:20 2009 -0400 diff --git a/debian/changelog b/debian/changelog index 948fbde..edeeced 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-neomagic (1:1.2.4-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 30 Nov 2009 16:49:11 +0200 + xserver-xorg-video-neomagic (1:1.2.3-1) unstable; urgency=low [ David Nusinow ] commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1 Author: Julien Cristau <jcris...@debian.org> 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 <jcris...@debian.org> 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 <jcris...@debian.org> 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 5693792171d885769e58dcccc053c08b11acd12a Author: Julien Cristau <jcris...@debian.org> 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 <jcris...@debian.org> 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 <jcris...@debian.org> 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 <jcris...@debian.org> 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 <jcris...@debian.org> 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 <jcris...@debian.org> 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 dcfff9bc194f3d86104e281a14226ff489b199ab Author: Dave Airlie <airl...@redhat.com> Date: Thu Jul 30 12:04:31 2009 +1000 neomagic: bump for release 1.2.4 diff --git a/configure.ac b/configure.ac index 4fb509d..02bba42 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-neomagic], - 1.2.3, + 1.2.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-neomagic) commit ee5229754f87c8859641926bee82c0141727c7c4 Author: Dave Airlie <airl...@redhat.com> Date: Tue Jul 28 15:22:40 2009 +1000 neomagic: change to using ABI version check diff --git a/src/neo_driver.c b/src/neo_driver.c index 29d003a..ddb6812 100644 --- a/src/neo_driver.c +++ b/src/neo_driver.c @@ -54,7 +54,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Everything using inb/outb, etc needs "compiler.h" */ #include "compiler.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" /* Needed by Resources Access Control (RAC) */ #include "xf86RAC.h" commit 44c8d148f8a68c13a65fc989adb09b1a675f1a2a Author: Dave Airlie <airl...@redhat.com> Date: Tue Jul 28 13:32:31 2009 +1000 neomagic: update for resources/RAC API removal diff --git a/src/neo_driver.c b/src/neo_driver.c index 686fc05..29d003a 100644 --- a/src/neo_driver.c +++ b/src/neo_driver.c @@ -54,7 +54,11 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Everything using inb/outb, etc needs "compiler.h" */ #include "compiler.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +/* Needed by Resources Access Control (RAC) */ +#include "xf86RAC.h" +#endif /* Drivers for PCI hardware need this */ #include "xf86PciInfo.h" @@ -81,9 +85,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "fb.h" -/* Needed by Resources Access Control (RAC) */ -#include "xf86RAC.h" - /* int10 */ #include "xf86int10.h" #include "vbe.h" @@ -687,7 +688,9 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags) /* This is the general case */ for (i = 0; i<pScrn->numEntities; i++) { nPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[i]); +#ifndef XSERVER_LIBPCIACCESS if (nPtr->pEnt->resources) return FALSE; +#endif nPtr->NeoChipset = nPtr->pEnt->chipset; pScrn->chipset = (char *)xf86TokenToString(NEOChipsets, nPtr->pEnt->chipset); @@ -1171,11 +1174,15 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags) nPtr->NeoMMIOAddr2); } } +#ifndef XSERVER_LIBPCIACCESS /* XXX What about VGA resources in OPERATING mode? */ if (xf86RegisterResources(nPtr->pEnt->index, NULL, ResExclusive)) RETURN; +#endif - } else if (nPtr->pEnt->location.type == BUS_ISA) { + } +#ifndef XSERVER_LIBPCIACCESS + else if (nPtr->pEnt->location.type == BUS_ISA) { unsigned int addr; resRange linearRes[] = { {ResExcMemBlock|ResBios|ResBus,0,0},_END }; @@ -1194,12 +1201,15 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags) "MMIO base address is set at 0x%lX.\n", nPtr->NeoMMIOAddr); } + linearRes[0].rBegin = nPtr->NeoLinearAddr; linearRes[1].rEnd = nPtr->NeoLinearAddr + nPtr->NeoFbMapSize - 1; if (xf86RegisterResources(nPtr->pEnt->index,linearRes,ResNone)) { nPtr->noLinear = TRUE; /* XXX */ } - } else + } +#endif + else RETURN; if (nPtr->pEnt->device->videoRam != 0) { @@ -1426,7 +1436,9 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) int ret; VisualPtr visual; int allocatebase, freespace, currentaddr; +#ifndef XSERVER_LIBPCIACCESS unsigned int racflag = RAC_FB; +#endif unsigned char *FBStart; int height, width, displayWidth; @@ -1718,11 +1730,13 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) CMAP_PALETTED_TRUECOLOR | CMAP_RELOAD_ON_MODE_SWITCH)) return FALSE; +#ifndef XSERVER_LIBPCIACCESS racflag |= RAC_COLORMAP; if (nPtr->NeoHWCursorInitialized) racflag |= RAC_CURSOR; pScrn->racIoFlags = pScrn->racMemFlags = racflag; +#endif NEOInitVideo(pScreen); commit e822477ae9cb0f7dd859a49e5da3f30993532ca5 Author: Dave Airlie <airl...@redhat.com> Date: Tue Jul 28 10:32:59 2009 +1000 neomagic: remove unneeded include diff --git a/src/neo_shadow.c b/src/neo_shadow.c index c5b682f..ee4a56b 100644 --- a/src/neo_shadow.c +++ b/src/neo_shadow.c @@ -10,7 +10,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "shadowfb.h" commit 61a9b5ab2779b18651c11d6ad4985971252fa4f7 Author: Brice Goglin <bgog...@debian.org> Date: Sat Jul 25 23:59:47 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 36286ff..948fbde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-neomagic (1:1.2.3-1) UNRELEASED; urgency=low +xserver-xorg-video-neomagic (1:1.2.3-1) unstable; urgency=low [ David Nusinow ] * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to @@ -9,7 +9,7 @@ xserver-xorg-video-neomagic (1:1.2.3-1) UNRELEASED; urgency=low * Add README.source, bump Standards-Version to 3.8.2. * New upstream release. - -- Brice Goglin <bgog...@debian.org> Sat, 25 Jul 2009 23:58:39 +0200 + -- Brice Goglin <bgog...@debian.org> Sat, 25 Jul 2009 23:59:37 +0200 xserver-xorg-video-neomagic (1:1.2.2-2) unstable; urgency=low commit d7f19a6fe892f2e4886e4a22a04f27339c0b2c9a Author: Brice Goglin <bgog...@debian.org> Date: Sat Jul 25 23:59:34 2009 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index 559b171..041a6f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +commit 33997831f0ffe61452fac111b51dabffef348b76 +Author: Adam Jackson <a...@redhat.com> +Date: Thu Jul 2 11:24:20 2009 -0400 + + neomagic 1.2.3 + +commit d97ccdfef1107c7721c838f0cd3fbed5f456dc13 +Author: Adam Jackson <a...@redhat.com> +Date: Thu May 28 15:07:11 2009 -0400 + + Remove useless loader symbol lists. + +commit 31e1e1e4a789295545d6924031ba6d56078f9afa +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Fri Jan 9 16:31:03 2009 -0800 + + Remove xorgconfig & xorgcfg from See Also list in man page + commit 9bfdc7232a77472c4a1c13c869f6bc52916ce664 Author: Dave Airlie <airl...@redhat.com> Date: Mon Dec 22 14:37:21 2008 +1000 diff --git a/debian/changelog b/debian/changelog index b615fb7..36286ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-neomagic (1:1.2.2-3) UNRELEASED; urgency=low +xserver-xorg-video-neomagic (1:1.2.3-1) UNRELEASED; urgency=low [ David Nusinow ] * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to @@ -7,8 +7,9 @@ xserver-xorg-video-neomagic (1:1.2.2-3) UNRELEASED; urgency=low [ Brice Goglin ] * Add README.source, bump Standards-Version to 3.8.2. + * New upstream release. - -- Brice Goglin <bgog...@debian.org> Sat, 25 Jul 2009 23:55:19 +0200 + -- Brice Goglin <bgog...@debian.org> Sat, 25 Jul 2009 23:58:39 +0200 xserver-xorg-video-neomagic (1:1.2.2-2) unstable; urgency=low commit 134a6b3c26ca44d8615373efb2dc219ba51b5663 Author: Brice Goglin <bgog...@debian.org> Date: Sat Jul 25 23:55:43 2009 +0200 Bump Standards-Version to 3.8.2 now that we have README.source diff --git a/debian/changelog b/debian/changelog index ad35200..b615fb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ xserver-xorg-video-neomagic (1:1.2.2-3) UNRELEASED; urgency=low + [ David Nusinow ] * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to choose a driver during autoconfiguration. + Disable the patch system and remove quilt from the build-deps. - -- David Nusinow <dnusi...@debian.org> Mon, 04 May 2009 22:19:41 -0400 + [ Brice Goglin ] + * Add README.source, bump Standards-Version to 3.8.2. + + -- Brice Goglin <bgog...@debian.org> Sat, 25 Jul 2009 23:55:19 +0200 xserver-xorg-video-neomagic (1:1.2.2-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 9925cab..2eececd 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-neomagic Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-neomagic.git commit 4031dee80df64c2707584d5e69353f6c29b6b523 Author: Brice Goglin <bgog...@debian.org> Date: Sat Jul 25 23:50:02 2009 +0200 Don't try to install usr/share/xserver-xorg/pci/* anymore diff --git a/debian/xserver-xorg-video-neomagic.install b/debian/xserver-xorg-video-neomagic.install index 8a9f4ba..614cfb4 100644 --- a/debian/xserver-xorg-video-neomagic.install +++ b/debian/xserver-xorg-video-neomagic.install @@ -1,3 +1,2 @@ usr/lib/xorg/modules/drivers/*.so usr/share/man/man4/* -usr/share/xserver-xorg/pci/* commit 33997831f0ffe61452fac111b51dabffef348b76 Author: Adam Jackson <a...@redhat.com> Date: Thu Jul 2 11:24:20 2009 -0400 neomagic 1.2.3 diff --git a/configure.ac b/configure.ac index 2f7843a..4fb509d 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-neomagic], - 1.2.2, + 1.2.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-neomagic) commit 8f72294ada477f003888b6776883c1dd98289f3f Author: Julien Cristau <jcris...@debian.org> 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 d97ccdfef1107c7721c838f0cd3fbed5f456dc13 Author: Adam Jackson <a...@redhat.com> Date: Thu May 28 15:07:11 2009 -0400 Remove useless loader symbol lists. diff --git a/src/neo_driver.c b/src/neo_driver.c index f472601..686fc05 100644 --- a/src/neo_driver.c +++ b/src/neo_driver.c @@ -412,79 +412,6 @@ static const OptionInfoRec NEOOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; -/* - * List of symbols from other modules that this module references. This - * list is used to tell the loader that it is OK for symbols here to be - * unresolved providing that it hasn't been told that they haven't been - * told that they are essential via a call to xf86LoaderReqSymbols() or - * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about - * unresolved symbols that are not required. - */ - -static const char *vgahwSymbols[] = { - "vgaHWFreeHWRec", - "vgaHWGetHWRec", - "vgaHWGetIOBase", - "vgaHWGetIndex", - "vgaHWInit", - "vgaHWLock", - "vgaHWMapMem", - "vgaHWProtect", - "vgaHWRestore", - "vgaHWSave", - "vgaHWSaveScreenWeak", - "vgaHWSetStdFuncs", - "vgaHWUnlock", - "vgaHWddc1SetSpeedWeak", - NULL -}; - -static const char *fbSymbols[] = { - "fbPictureInit", - "fbScreenInit", - NULL -}; - -static const char *xaaSymbols[] = { - "XAACreateInfoRec", - "XAADestroyInfoRec", - "XAAInit", - NULL -}; - -static const char *ramdacSymbols[] = { - "xf86CreateCursorInfoRec", -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org