xserver-xorg-video-i128: Changes to 'debian-experimental'
ChangeLog | 86 +++++++++
configure.ac | 5
debian/README.source | 73 +++++++
debian/changelog | 32 +++
debian/control | 7
debian/patches/01_gen_pci_ids.diff | 16 -
debian/patches/series | 1
debian/rules | 4
debian/xserver-xorg-video-i128.install | 1
debian/xsfbs/repack.sh | 32 +++
debian/xsfbs/xsfbs.mk | 21 --
debian/xsfbs/xsfbs.sh | 311 ---------------------------------
man/i128.man | 2
src/i128.h | 2
src/i128IBMDAC.c | 84 --------
src/i128_driver.c | 128 +------------
src/i128exa.c | 6
17 files changed, 264 insertions(+), 547 deletions(-)
New commits:
commit bae841fea1af5f72f77b1454ce7d669a25f41a42
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 6 03:02:17 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index e93d833..b90e31f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-i128 (1:1.3.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-i128 (1:1.3.3-1) experimental; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:07 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 06 Dec 2009 03:02:15 +0100
xserver-xorg-video-i128 (1:1.3.2-1) unstable; urgency=low
commit ca1ba38711a7cac8b6244c6dfc3942aa8a4ed804
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 02:09:26 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index d87acd8..e93d833 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-i128 (1:1.3.3-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 16:25:38 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:07 +0200
xserver-xorg-video-i128 (1:1.3.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index bb35aa8..c3d1d5a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.
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-core-dev,
x11proto-fonts-dev,
commit 9f7a3ddabebc6c3ee5a577ef73d190014022ba48
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 30 16:27:58 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 4005251..d87acd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-i128 (1:1.3.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 16:25:38 +0200
diff --git a/debian/control b/debian/control
index 1b959ed..bb35aa8 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,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-i128
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-i128.git
commit 3000141c2b1bb51209bffdbbc1d6f13766605882
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 30 16:27:28 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 27d2705..2237c97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+commit 8909e47f36cbb030060d5a40d673a962f997c93a
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Jul 30 12:04:27 2009 +1000
+
+ i128: bump for release 1.3.3
+
+commit 6a5098d0f2439a2f2e338ab30fccc19032fae82a
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:40 2009 +1000
+
+ i128: change to using ABI version check
+
+commit ec37c2ec027ebcaa3bf138c32e417821b78527b0
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:30 2009 +1000
+
+ i128: update for resources/RAC API removal
+
commit 6a1eae8adf2bc8ba2c0e86e28d3b121a54aa8c3b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:16:59 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 3163c6a..4005251 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-i128 (1:1.3.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 16:25:38 +0200
+
xserver-xorg-video-i128 (1:1.3.2-1) unstable; urgency=low
[ David Nusinow ]
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@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 <jcristau@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 <jcristau@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 <jcristau@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 <jcristau@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 <jcristau@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 <jcristau@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 <jcristau@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 <jcristau@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 8909e47f36cbb030060d5a40d673a962f997c93a
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:27 2009 +1000
i128: bump for release 1.3.3
diff --git a/configure.ac b/configure.ac
index a671665..4648fc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-i128],
- 1.3.2,
+ 1.3.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-i128)
commit 6a5098d0f2439a2f2e338ab30fccc19032fae82a
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:40 2009 +1000
i128: change to using ABI version check
diff --git a/src/i128_driver.c b/src/i128_driver.c
index a9c83d4..903a3a8 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -31,7 +31,7 @@
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
commit ec37c2ec027ebcaa3bf138c32e417821b78527b0
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:30 2009 +1000
i128: update for resources/RAC API removal
diff --git a/src/i128.h b/src/i128.h
index db647da..f652e7c 100644
--- a/src/i128.h
+++ b/src/i128.h
@@ -38,8 +38,8 @@ typedef struct {
pciVideoPtr PciInfo;
#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
-#endif
xf86AccessRec Access;
+#endif
int Chipset;
int ChipRev;
Bool Primary;
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 9de7527..a9c83d4 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -31,7 +31,10 @@
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
+#include "xf86RAC.h"
+#endif
#include "compiler.h"
@@ -52,7 +55,6 @@
#include "micmap.h"
#include "xf86DDC.h"
-#include "xf86RAC.h"
#include "vbe.h"
#include "xaa.h"
@@ -723,12 +725,14 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "MMIO registers at 0x%lX\n",
(unsigned long)PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO));
+#ifndef XSERVER_LIBPCIACCESS
if (xf86RegisterResources(pI128->pEnt->index, NULL, ResExclusive)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"xf86RegisterResources() found resource conflicts\n");
I128FreeRec(pScrn);
return FALSE;
}
+#endif
/* HW bpp matches reported bpp */
pI128->bitsPerPixel = pScrn->bitsPerPixel;
commit f487ce14842a83bf76d36ed17594490935e5c5be
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:51:04 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 95d27c1..3163c6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-i128 (1:1.3.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-i128 (1:1.3.2-1) unstable; urgency=low
[ David Nusinow ]
* Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
@@ -8,8 +8,9 @@ xserver-xorg-video-i128 (1:1.3.2-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* Add README.source, bump Standards-Version to 3.8.2.
* New upstream release.
+ * Add myself to Uploaders.
- -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:50:10 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:50:54 +0200
xserver-xorg-video-i128 (1:1.3.1-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d33d367..1b959ed 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-i128
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit 65e363e57af625ae72567aa9f856c5b5b1ec313f
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:27:39 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 43db9fe..27d2705 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+commit 6a1eae8adf2bc8ba2c0e86e28d3b121a54aa8c3b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Jul 2 11:16:59 2009 -0400
+
+ i128 1.3.2
+
+commit b690e9f84e3c4504f3344185c6a8572805dd73d8
+Author: Mark Kettenis <mark.kettenis@xs4all.nl>
+Date: Thu Jun 4 11:46:18 2009 -0600
+
+ Fix endianness bugs in cursor realization code.
+
+ The default cursor realization code seems to work just fine. We just
+ have to set the HARDWARE_CURSOR_NIBBLE_SWAPPED flag on big endian
+ platforms.
+
+ This isn't really surprising since these cards use fairly standard IBM
+ or TI RAMDACs.
+
+ Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit f42dd67d9372bf7f46cf8a35877e4ab8ac82d89b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 14:59:53 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit cee4cdf061ca8e6376846c0eac2fc6d57711129e
+Author: Mark Kettenis <mark.kettenis@xs4all.nl>
+Date: Mon May 4 21:54:30 2009 +0200
+
+ Properly unmap things with libpciaccess.
+
+ If the xf86-vide-i128 is compiled with XSERVER_LIBPCIACCESS, registers and
+ frmaebuffer memory are mapped through libpciaccess. However, I128UnmapMem
+ tried to unmap things vy using xf86UnmapVidMem. This failed because the memory
+ wasn't registered (which only happens if you mapped the memory using
+ xf86MapPciMem.
+
+ Fixes bugzilla #20541
+
+ Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 8bd4dc99bbaa8bf8c6649dc25fc75859e16e35ec
+Author: Thomas Jaeger <ThJaeger@gmail.com>
+Date: Fri Jan 30 16:25:07 2009 -0500
+
+ CheckComposite: Add a few checks
+
+ It looks like the driver doesn't support any form of repeating and only
+ nearest-neighbor interpolation.
+
+commit 8936b17d83c6fa2b67c447ae3cac5159d8d84649
+Author: Chris Ball <cjb@laptop.org>
+Date: Tue Feb 24 13:00:05 2009 -0500
+
+ Build fix for EXA 3
+
+ EXA in xserver head now requires us to pass -DEXA_DRIVER_KNOWN_MAJOR=3.
+
+ Signed-off-by: Chris Ball <cjb@laptop.org>
+
+commit 4fcee9dd9075b28474ae5b248a9edc0789f55b05
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 9 16:28:55 2009 -0800
+
+ Remove xorgconfig & xorgcfg from See Also list in man page
+
commit 4be161bca1ae9fca29e882c5909405781b565cb1
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 4 19:51:58 2008 +0200
diff --git a/debian/changelog b/debian/changelog
index 05f353b..95d27c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-i128 (1:1.3.1-4) UNRELEASED; urgency=low
+xserver-xorg-video-i128 (1:1.3.2-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-i128 (1:1.3.1-4) UNRELEASED; urgency=low
[ Brice Goglin ]
* Add README.source, bump Standards-Version to 3.8.2.
+ * New upstream release.
- -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:24:09 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:50:10 +0200
xserver-xorg-video-i128 (1:1.3.1-3) unstable; urgency=low
commit cef1d126e8df63b9df479b29b7042f7b783a4c8e
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:25:43 2009 +0200
Don't try to install usr/share/xserver-xorg/pci/* anymore
diff --git a/debian/xserver-xorg-video-i128.install b/debian/xserver-xorg-video-i128.install
index 8a9f4ba..614cfb4 100644
--- a/debian/xserver-xorg-video-i128.install
+++ b/debian/xserver-xorg-video-i128.install
@@ -1,3 +1,2 @@
usr/lib/xorg/modules/drivers/*.so
usr/share/man/man4/*
-usr/share/xserver-xorg/pci/*
commit 799f495e98830ff0ee5d626a3f0b230ced81a24a
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:25:12 2009 +0200
Adding README.source means we can bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index 9c5d393..05f353b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
xserver-xorg-video-i128 (1:1.3.1-4) 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 <dnusinow@debian.org> Mon, 04 May 2009 22:01:04 -0400
+ [ Brice Goglin ]
+ * Add README.source, bump Standards-Version to 3.8.2.
+
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:24:09 +0200
xserver-xorg-video-i128 (1:1.3.1-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 48f8f06..d33d367 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,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-i128
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-i128.git
commit 6a1eae8adf2bc8ba2c0e86e28d3b121a54aa8c3b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:16:59 2009 -0400
i128 1.3.2
diff --git a/configure.ac b/configure.ac
index d5a7502..a671665 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-i128],
- 1.3.1,
+ 1.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-i128)
commit b690e9f84e3c4504f3344185c6a8572805dd73d8
Author: Mark Kettenis <mark.kettenis@xs4all.nl>
Date: Thu Jun 4 11:46:18 2009 -0600
Fix endianness bugs in cursor realization code.
The default cursor realization code seems to work just fine. We just
have to set the HARDWARE_CURSOR_NIBBLE_SWAPPED flag on big endian
platforms.
This isn't really surprising since these cards use fairly standard IBM
or TI RAMDACs.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
diff --git a/src/i128IBMDAC.c b/src/i128IBMDAC.c
index 1ad9f65..14acba9 100644
--- a/src/i128IBMDAC.c
+++ b/src/i128IBMDAC.c
@@ -43,8 +43,6 @@ static void I128IBMHideCursor(ScrnInfoPtr pScrn);
static void I128IBMSetCursorPosition(ScrnInfoPtr pScrn, int x, int y);
static void I128IBMSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg);
static void I128IBMLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src);
-static unsigned char *I128IBMRealizeCursor(xf86CursorInfoPtr infoPtr,
- CursorPtr pCurs);
static Bool I128IBMUseHWCursor(ScreenPtr pScrn, CursorPtr pCurs);
@@ -73,86 +71,12 @@ I128IBMHWCursorInit(ScrnInfoPtr pScrn)
infoPtr->Flags = HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
HARDWARE_CURSOR_AND_SOURCE_WITH_MASK |
HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1;
- infoPtr->RealizeCursor = I128IBMRealizeCursor;
- return(xf86InitCursor(pScreen, infoPtr));
-}
-
-
-/*
- * Convert the cursor from server-format to hardware-format. The IBMRGB
- * has two planes, plane 0 selects cursor color 0 or 1 and plane 1
- * selects transparent or display cursor. The bits of these planes
- * are packed together so that one byte has 4 pixels. The organization
- * looks like:
- * Byte 0x000 - 0x00F top scan line, left to right
- * 0x010 - 0x01F
- * . .
- * 0x3F0 - 0x3FF bottom scan line
- *
- * Byte/bit map - D7D6,D5D4,D3D2,D1D0 four pixels, two planes each
- * Pixel/bit map - P1P0 (plane 1) == 1 maps to cursor color
- * (plane 1) == 0 maps to transparent
- * (plane 0) maps to cursor colors 0 and 1
- */
+#if X_BYTE_ORDER == X_BIG_ENDIAN
+ infoPtr->Flags |= HARDWARE_CURSOR_NIBBLE_SWAPPED;
+#endif
-static unsigned char *
-I128IBMRealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
-{
- register int i, j;
- unsigned char *pServMsk;
- unsigned char *pServSrc;
- int wsrc, h;
- unsigned char *mem, *dst;
-
- mem = (unsigned char *)xcalloc(1,1024); /* 64x64x2 bits */
- dst = mem;
-
- if (!mem)
- return NULL;
-
- pServSrc = (unsigned char *)pCurs->bits->source;
- pServMsk = (unsigned char *)pCurs->bits->mask;
-
- h = pCurs->bits->height;
- if (h > infoPtr->MaxHeight)
- h = infoPtr->MaxHeight;
-
- wsrc = PixmapBytePad(pCurs->bits->width, 1); /* bytes per line */
-
- for (i = 0; i < infoPtr->MaxHeight; i++,mem+=16) {
- for (j = 0; j < infoPtr->MaxWidth / 8; j++) {
- register unsigned char mask, source;
-
- if (i < h && j < wsrc) {
Reply to: