ChangeLog | 95
Makefile.in | 674
aclocal.m4 | 8256 -----------
config.guess | 1526 --
config.h.in | 72
config.sub | 1658 --
configure |23239 -------------------------------
configure.ac | 6
debian/README.source | 73
debian/changelog | 32
debian/control | 19
debian/patches/01_gen_pci_ids.diff | 14
debian/patches/series | 1
debian/rules | 20
debian/xserver-xorg-video-voodoo.install | 1
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs.mk | 21
debian/xsfbs/xsfbs.sh | 311
depcomp | 589
install-sh | 519
ltmain.sh | 6964 ---------
man/Makefile.in | 426
man/voodoo.man | 2
missing | 367
mkinstalldirs | 161
src/Makefile.in | 547
src/voodoo.h | 2
src/voodoo_dga.c | 9
src/voodoo_driver.c | 61
src/voodoo_hardware.c | 64
src/voodoo_pcirename.h | 6
31 files changed, 351 insertions(+), 45416 deletions(-)
New commits:
commit c7d5df26ecff85056063a26cff8f5352d6a5ca7a
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Dec 6 00:48:21 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 42f735a..8e45a5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-voodoo (1:1.2.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-voodoo (1:1.2.3-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:14 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <k...@debian.org> Sun, 06 Dec 2009 00:48:13 +0100
xserver-xorg-video-voodoo (1:1.2.2-1) unstable; urgency=low
commit 7775faad4697f84d53e079ed9f2fb2b76afd4852
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sat Dec 5 02:09:33 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 3aa867f..42f735a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-voodoo (1:1.2.3-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 01 Dec 2009 11:03:03 +0200
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:14 +0200
xserver-xorg-video-voodoo (1:1.2.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e4b05ea..45411aa 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
automake,
libtool,
xutils-dev,
- xserver-xorg-dev (>= 2:1.5),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-xext-dev,
x11proto-xf86dga-dev,
x11proto-core-dev,
commit 0a1ae687ed0a4cf92618789dd7dc0b968d251531
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Dec 1 11:31:08 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index b6aea98..3aa867f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-voodoo (1:1.2.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 01 Dec 2009 11:03:03 +0200
diff --git a/debian/control b/debian/control
index ce45a76..e4b05ea 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
x11proto-randr-dev,
x11proto-render-dev,
dpkg-dev (>= 1.14.17)
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-voodoo
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-voodoo.git
commit eda940c9953de472251c275c4390b65ce4df34c6
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Dec 1 11:03:27 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index c8348e2..5a36399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+commit 89250c594f29fbad78f2006c32573ac083cccd73
+Author: Dave Airlie <airl...@redhat.com>
+Date: Thu Jul 30 12:04:30 2009 +1000
+
+ voodoo: bump for release 1.2.3
+
+commit 405bab2048a4077b7fbe456f4f24e0d9b448829f
+Author: Dave Airlie <airl...@redhat.com>
+Date: Tue Jul 28 15:22:42 2009 +1000
+
+ voodoo: change to using ABI version check
+
+commit 023f464e830185c12de90f38219b34498d3e55d0
+Author: Dave Airlie <airl...@redhat.com>
+Date: Tue Jul 28 13:45:59 2009 +1000
+
+ voodoo: remove rac/resources includes
+
+commit 840b9fe089d79507b660bdda3f26afb72faaa6ff
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu Jul 16 11:59:34 2009 +1000
+
+ Update to xextproto 7.1 support.
+
+ DPMS header was split into dpms.h (client) and dpmsconst.h (server).
Drivers
+ need to include dpmsconst.h if xextproto 7.1 is available.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
commit b88c1e442fa9367ebb0addf744b759cea91a4868
Author: Adam Jackson <a...@redhat.com>
Date: Thu Jul 2 11:55:03 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 7879fb5..b6aea98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-voodoo (1:1.2.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 01 Dec 2009 11:03:03 +0200
+
xserver-xorg-video-voodoo (1:1.2.2-1) unstable; urgency=low
* New upstream release.
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 89250c594f29fbad78f2006c32573ac083cccd73
Author: Dave Airlie <airl...@redhat.com>
Date: Thu Jul 30 12:04:30 2009 +1000
voodoo: bump for release 1.2.3
diff --git a/configure.ac b/configure.ac
index 2fc06b2..7cac538 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
- 1.2.2,
+ 1.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
commit 405bab2048a4077b7fbe456f4f24e0d9b448829f
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 15:22:42 2009 +1000
voodoo: change to using ABI version check
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index 6f35fe1..7ea8e05 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -56,7 +56,7 @@
#include "xf86cmap.h"
#include "shadowfb.h"
#include "vgaHW.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
commit 023f464e830185c12de90f38219b34498d3e55d0
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 13:45:59 2009 +1000
voodoo: remove rac/resources includes
diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index 9ad1962..622c1f9 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -47,8 +47,6 @@
#include "xf86cmap.h"
#include "shadowfb.h"
#include "vgaHW.h"
-#include "xf86RAC.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "xaa.h"
#include "dgaproc.h"
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index e38ea46..6f35fe1 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -56,8 +56,10 @@
#include "xf86cmap.h"
#include "shadowfb.h"
#include "vgaHW.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
#include "compiler.h"
#include "xaa.h"
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index 2493612..60f9dc9 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -48,8 +48,6 @@
#include "xf86cmap.h"
#include "shadowfb.h"
#include "vgaHW.h"
-#include "xf86RAC.h"
-#include "xf86Resources.h"
#include "xaa.h"
#include "compiler.h"
commit 58331ad8fe14b5719a51acc52d9ab83333c12fc7
Author: Brice Goglin <bgog...@debian.org>
Date: Sun Jul 19 23:53:12 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 05b04c7..7879fb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-xserver-xorg-video-voodoo (1:1.2.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-voodoo (1:1.2.2-1) unstable; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.2.
* Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
choose a driver during autoconfiguration.
+ Disable patch system and remove quilt from build-deps.
+ * Add myself to Uploaders.
- -- Brice Goglin <bgog...@debian.org> Mon, 20 Jul 2009 00:02:56 +0200
+ -- Brice Goglin <bgog...@debian.org> Mon, 20 Jul 2009 00:03:22 +0200
xserver-xorg-video-voodoo (1:1.2.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3e4ab23..ce45a76 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-voodoo
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Julien Cristau
<jcris...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Julien Cristau
<jcris...@debian.org>, Brice Goglin <bgog...@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit 3af923feed87f1947e955188d92f11bad71eb6b1
Author: Brice Goglin <bgog...@debian.org>
Date: Mon Jul 20 00:02:20 2009 +0200
Remove 01_gen_pci_ids.diff.
The X server now uses an internal table to choose a driver during
autoconfiguration.
Disable patch system and remove quilt from build-deps.
diff --git a/debian/changelog b/debian/changelog
index 28f2c26..05b04c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ xserver-xorg-video-voodoo (1:1.2.2-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.2.
+ * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+ choose a driver during autoconfiguration.
+ + Disable patch system and remove quilt from build-deps.
- -- Brice Goglin <bgog...@debian.org> Sun, 19 Jul 2009 23:51:48 +0200
+ -- Brice Goglin <bgog...@debian.org> Mon, 20 Jul 2009 00:02:56 +0200
xserver-xorg-video-voodoo (1:1.2.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 66264e6..3e4ab23 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Julien Cristau
<jcris...@debian.
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
- quilt,
automake,
libtool,
xutils-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index c171edb..0000000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- /dev/null
-+++ xserver-xorg-video-voodoo/src/voodoo.ids
-@@ -0,0 +1,2 @@
-+121A0001
-+121A0002
---- xserver-xorg-video-voodoo.orig/src/Makefile.am
-+++ xserver-xorg-video-voodoo/src/Makefile.am
-@@ -34,3 +34,6 @@
- voodoo.h \
- voodoo_pcirename.h \
- voodoo_hardware.c
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = voodoo.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index 90093ec..40826eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ endif
confflags += --disable-static
build: build-stamp
-build-stamp: $(STAMP_DIR)/patch
+build-stamp:
dh_testdir
autoreconf -vfi
@@ -45,7 +45,7 @@ build-stamp: $(STAMP_DIR)/patch
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
>$@
-clean: xsfclean
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
diff --git a/debian/xserver-xorg-video-voodoo.install
b/debian/xserver-xorg-video-voodoo.install
index a8fac35..daf7bfe 100644
--- a/debian/xserver-xorg-video-voodoo.install
+++ b/debian/xserver-xorg-video-voodoo.install
@@ -1,2 +1 @@
usr/lib/xorg/modules/drivers/*.so
-usr/share/xserver-xorg/pci/*
commit c58d3eed614d67ebfe7a46abebf1b1996867d706
Author: Brice Goglin <bgog...@debian.org>
Date: Sun Jul 19 23:52:18 2009 +0200
Adding README.source means we can bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index 31dd299..28f2c26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-voodoo (1:1.2.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgog...@debian.org> Sun, 19 Jul 2009 23:50:58 +0200
+ -- Brice Goglin <bgog...@debian.org> Sun, 19 Jul 2009 23:51:48 +0200
xserver-xorg-video-voodoo (1:1.2.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 5bcc8b2..66264e6 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
x11proto-randr-dev,
x11proto-render-dev,
dpkg-dev (>= 1.14.17)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-voodoo
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-voodoo.git
commit f4abb2b84d1eaf53f2239ce653850c2e938b76da
Author: Brice Goglin <bgog...@debian.org>
Date: Sun Jul 19 23:51:27 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index ad02f7f..c8348e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+commit b88c1e442fa9367ebb0addf744b759cea91a4868
+Author: Adam Jackson <a...@redhat.com>
+Date: Thu Jul 2 11:55:03 2009 -0400
+
+ voodoo 1.2.2
+
+commit bf6571791206d7784e711abcb6f353ae06d54bd8
+Author: Adam Jackson <a...@redhat.com>
+Date: Thu May 28 15:27:48 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit 46fa3eff8d2b8f17e50e575df96b02e4b8a89874
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Fri Jan 9 16:39:21 2009 -0800
+
+ Remove xorgconfig & xorgcfg from See Also list in man page
+
commit 01e0f1442d8883376aeb5eb764e0ee92e00d4fdb
Author: Adam Jackson <a...@redhat.com>
Date: Tue Feb 24 10:29:41 2009 -0500
diff --git a/debian/changelog b/debian/changelog
index df56efc..31dd299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-voodoo (1:1.2.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Brice Goglin <bgog...@debian.org> Sun, 19 Jul 2009 23:50:58 +0200
+
xserver-xorg-video-voodoo (1:1.2.1-1) unstable; urgency=low
* Run autoreconf on build.
commit 840b9fe089d79507b660bdda3f26afb72faaa6ff
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Jul 16 11:59:34 2009 +1000
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 919e29f..2fc06b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto
xf86dgaproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1,
[xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index 9d088a7..9ad1962 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -59,8 +59,13 @@
#include <X11/extensions/xf86dgastr.h>
#include "opaque.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
/***********************************************************************
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index f412215..e38ea46 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -67,8 +67,13 @@
#include <X11/extensions/xf86dgastr.h>
#include "opaque.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
static const OptionInfoRec * VoodooAvailableOptions(int chipid, int busid);
static void VoodooIdentify(int flags);
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index d988b33..2493612 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -58,8 +58,13 @@
#include <X11/extensions/xf86dgastr.h>
#include "opaque.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
