xserver-xorg-video-glint: Changes to 'debian-experimental'
ChangeLog | 126 ++++++++++++
README | 20 ++
configure.ac | 6
debian/README.source | 73 +++++++
debian/changelog | 33 +++
debian/control | 4
debian/patches/03_gen_pci_ids.diff | 26 --
debian/patches/series | 1
debian/xserver-xorg-video-glint.install | 1
debian/xsfbs/xsfbs.mk | 21 --
debian/xsfbs/xsfbs.sh | 311 --------------------------------
man/glint.man | 2
src/Makefile.am | 2
src/glint.h | 1
src/glint_driver.c | 210 ++-------------------
src/glint_shadow.c | 1
src/pm3_dac.c | 1
src/pm3_video.c | 1
18 files changed, 288 insertions(+), 552 deletions(-)
New commits:
commit a8c3b2eebee9f654461d24331ce14c83d9773164
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 6 03:05:19 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index f6413f8..1441fb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-glint (1:1.2.4-1) UNRELEASED; urgency=low
+xserver-xorg-video-glint (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 <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:05:17 +0100
xserver-xorg-video-glint (1:1.2.3-1) unstable; urgency=low
commit b534fea76e93483935727e2155cda639f4b803f6
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 a2a2be4..f6413f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-glint (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 <tjaalton@ubuntu.com> Mon, 30 Nov 2009 16:21:12 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:07 +0200
xserver-xorg-video-glint (1:1.2.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d487d72..410f495 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-gl-dev,
x11proto-video-dev,
x11proto-xf86dga-dev,
commit e61643b355adc607fdd5f20968046e31bf0f1b52
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 30 16:24:42 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 354637e..a2a2be4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-glint (1:1.2.4-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 16:21:12 +0200
diff --git a/debian/control b/debian/control
index b0fe0a7..d487d72 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,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-glint
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glint.git
commit 9462ee5a022940f93dd53f72fefd7846ec388523
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 30 16:22:05 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index c76f137..64068cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+commit ab648787e729651e45e615cc05a1080ba46e9ce4
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Jul 30 12:04:27 2009 +1000
+
+ glint: bump for release 1.2.4
+
+commit d67bba116851bb4682df9fcbac12b0cda10aa28b
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:40 2009 +1000
+
+ glint: change to using ABI version check
+
+commit a7c9dd7039005cc656108d00c95fc7eb75b74642
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:30 2009 +1000
+
+ glint: update for resources/RAC API removal
+
+commit f74a51285651c2eea31efb43734600b79caa0507
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 16 11:39:13 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.hutterer@who-t.net>
+
commit 833a4f3fcc859a80b4edc9d4c45061c11f8290ab
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:12:21 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 20092f0..354637e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-glint (1:1.2.4-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 16:21:12 +0200
+
xserver-xorg-video-glint (1:1.2.3-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 ab648787e729651e45e615cc05a1080ba46e9ce4
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:27 2009 +1000
glint: bump for release 1.2.4
diff --git a/configure.ac b/configure.ac
index 2a52607..2a3ca8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-glint],
- 1.2.3,
+ 1.2.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-glint)
commit d67bba116851bb4682df9fcbac12b0cda10aa28b
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:40 2009 +1000
glint: change to using ABI version check
diff --git a/src/glint_driver.c b/src/glint_driver.c
index 78caa87..ba51fee 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -42,7 +42,7 @@
#include "xf86cmap.h"
#include "shadowfb.h"
#include "fbdevhw.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
commit a7c9dd7039005cc656108d00c95fc7eb75b74642
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:30 2009 +1000
glint: update for resources/RAC API removal
diff --git a/src/glint_driver.c b/src/glint_driver.c
index efb624f..78caa87 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -42,8 +42,10 @@
#include "xf86cmap.h"
#include "shadowfb.h"
#include "fbdevhw.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
#include "xf86int10.h"
#include "dixstruct.h"
#include "vbe.h"
@@ -934,12 +936,13 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
+#ifndef XSERVER_LIBPCIACCESS
xf86SetOperatingState(resVga, pGlint->pEnt->index, ResDisableOpr);
/* Operations for which memory access is required. */
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
-
+#endif
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
/*
@@ -1266,6 +1269,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
pGlint->irq = pGlint->pEnt->device->irq;
+#ifndef XSERVER_LIBPCIACCESS
/* Register all entities */
for (i = 0; i < pScrn->numEntities; i++) {
EntityInfoPtr pEnt;
@@ -1276,8 +1280,10 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
}
+#endif
}
+
#if !defined(__sparc__)
/* Initialize the card through int10 interface if needed */
if (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_GAMMA &&
diff --git a/src/glint_shadow.c b/src/glint_shadow.c
index a0a9819..6b36a1b 100644
--- a/src/glint_shadow.c
+++ b/src/glint_shadow.c
@@ -12,7 +12,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "glint.h"
diff --git a/src/pm3_video.c b/src/pm3_video.c
index 6f07ed3..f0d34a9 100644
--- a/src/pm3_video.c
+++ b/src/pm3_video.c
@@ -30,7 +30,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
commit eecb91496bc942bdb555af3abe9b43927db3c572
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:34:57 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index d813939..20092f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-glint (1:1.2.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-glint (1:1.2.3-1) unstable; urgency=low
[ David Nusinow ]
* Remove 03_gen_pci_ids.diff. The X server now uses an internal table to
@@ -11,7 +11,7 @@ xserver-xorg-video-glint (1:1.2.3-1) UNRELEASED; urgency=low
+ Fix endianness problem causing wrong memory size detection,
closes: #420738.
- -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:31:57 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:34:52 +0200
xserver-xorg-video-glint (1:1.2.2-2) unstable; urgency=low
commit edc44cf7d754c1bb540f651df924acfade3a3709
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:27:44 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 961c285..c76f137 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,100 @@
+commit 833a4f3fcc859a80b4edc9d4c45061c11f8290ab
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Jul 2 11:12:21 2009 -0400
+
+ glint 1.2.3
+
+commit 599fd0c36e38014cf4611130d2f75847af549a95
+Author: Mark Kettenis <mark.kettenis@xs4all.nl>
+Date: Fri Jun 5 14:28:57 2009 -0600
+
+ Don't set the default depth to 8bpp.
+
+ These days 24/32bpp makes much more sense.
+
+ Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit db324d0a4d9faf1df3a5c9be8f5a837e852e22cb
+Author: Mark Kettenis <mark.kettenis@xs4all.nl>
+Date: Fri Jun 5 14:27:55 2009 -0600
+
+ Disable int10 code if __sparc__.
+
+ Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit fc258c28f99101f7a08bac3f08a66b70ba273161
+Author: Mark Kettenis <mark.kettenis@xs4all.nl>
+Date: Thu Jun 4 11:29:10 2009 -0600
+
+ Fix DDC probe.
+
+ The driver tried to do DDC stuff without having its registers mapped.
+
+ Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 2c022e126c027d20b4b060e31cccb012265cec6a
+Author: Mark Kettenis <mark.kettenis@xs4all.nl>
+Date: Thu Jun 4 11:27:07 2009 -0600
+
+ Only map a 64k block of registers.
+
+ The driver tries to map a block of registers that is too large. The
+ mmio registers consist of two blocks of 64k. The first 64k provide a
+ little-endian view, the second 64k provide a big-endian view. However
+ the driver always tries to map 128k. And mapping 128k from the offset
+ where the big-endian view starts will fail on OpenBSD.
+
+ This changes things such that the driver maps just 64k. There is no
+ reason to map the big-endian view on little-endian machines.
+
+ Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 1b36ca0c453191e4837cea25794731b166df19f7
+Author: Mark Kettenis <mark.kettenis@xs4all.nl>
+Date: Thu Jun 4 11:24:15 2009 -0600
+
+ Fix for big-endian machines.
+
+ The problem is that the card provides a big-endian view on its
+ registers, which the driver uses on big-endian machines. However, the
+ driver uses MMIO_OUT32() and friends to access these registers. And
+ on sparc64, these macros do byte swapping themselves. The net result
+ of course is that no byte swapping gets done at all, and things fail
+ miserably.
+
+ The fix is to make the macros not do byte swapping, which can be done
+ by defining SPARC_MMIO_IS_BE. There is a similar define for powerpc
+ as well. I assume these defines were accidentally dropped in the
+ autoconfiscation of Xorg.
+
+ Other people came up with the same conclusion see:
+
+ http://www.mail-archive.com/opensolaris-discuss@opensolaris.org/msg20874.html
+
+ and
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=10742
+
+ Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 860e3c4bc40b6e130411b954f8945e8fbc42c9bb
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 14:58:01 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit 6b6cca87d65d062035b156485e3865e1973115e4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 30 20:39:18 2009 -0800
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+commit 4a03cf57e4c8c998bca8bd4378777cf0008764bd
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 9 16:28:39 2009 -0800
+
+ Remove xorgconfig & xorgcfg from See Also list in man page
+
commit f0b4f9629c4c11c33f8c6d382b21da99a0c52570
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 22 14:33:28 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index ae9d409..d813939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-glint (1:1.2.2-3) UNRELEASED; urgency=low
+xserver-xorg-video-glint (1:1.2.3-1) UNRELEASED; urgency=low
[ David Nusinow ]
* Remove 03_gen_pci_ids.diff. The X server now uses an internal table to
@@ -6,8 +6,12 @@ xserver-xorg-video-glint (1:1.2.2-3) UNRELEASED; urgency=low
[ Brice Goglin ]
* Add README.source, bump Standards-Version to 3.8.2.
+ * New upstream release.
+ + Fix crash at startup, closes: #531918.
+ + Fix endianness problem causing wrong memory size detection,
+ closes: #420738.
- -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:24:55 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:31:57 +0200
xserver-xorg-video-glint (1:1.2.2-2) unstable; urgency=low
commit bcc8c45a476a3575963b7af132a75c360df5f0e5
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:26:07 2009 +0200
Don't try to install usr/share/xserver-xorg/pci/* anymore
diff --git a/debian/xserver-xorg-video-glint.install b/debian/xserver-xorg-video-glint.install
index 8a9f4ba..614cfb4 100644
--- a/debian/xserver-xorg-video-glint.install
+++ b/debian/xserver-xorg-video-glint.install
@@ -1,3 +1,2 @@
usr/lib/xorg/modules/drivers/*.so
usr/share/man/man4/*
-usr/share/xserver-xorg/pci/*
commit 6453aa468a301816e89e35dbfbc3c19f3601ba8a
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 18:25:01 2009 +0200
Adding README.source means we can bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index e632a90..ae9d409 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xserver-xorg-video-glint (1:1.2.2-3) UNRELEASED; urgency=low
+ [ David Nusinow ]
* Remove 03_gen_pci_ids.diff. The X server now uses an internal table to
choose a driver during autoconfiguration.
- -- David Nusinow <dnusinow@debian.org> Mon, 04 May 2009 21:53:31 -0400
+ [ Brice Goglin ]
+ * Add README.source, bump Standards-Version to 3.8.2.
+
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 18:24:55 +0200
xserver-xorg-video-glint (1:1.2.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 43eadba..b0fe0a7 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,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-glint
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glint.git
commit f74a51285651c2eea31efb43734600b79caa0507
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:39:13 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.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 98c74cc..2a52607 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,10 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $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/glint_driver.c b/src/glint_driver.c
index 73cfd11..efb624f 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -65,8 +65,13 @@
#endif
#include "globals.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
#define DEBUG 0
commit 833a4f3fcc859a80b4edc9d4c45061c11f8290ab
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:12:21 2009 -0400
glint 1.2.3
diff --git a/configure.ac b/configure.ac
index b1b24a1..98c74cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
Reply to: