xserver-xorg-video-siliconmotion: Changes to 'debian-experimental'
COPYING | 76 +++++
ChangeLog | 197 +++++++++++++++
README | 77 +----
configure.ac | 6
debian/README.source | 73 +++++
debian/changelog | 33 ++
debian/control | 4
debian/patches/02_gen_pci_ids.diff | 19 -
debian/patches/series | 1
debian/xserver-xorg-video-siliconmotion.install | 1
debian/xsfbs/xsfbs.mk | 21 -
debian/xsfbs/xsfbs.sh | 311 ------------------------
man/siliconmotion.man | 8
src/smi.h | 2
src/smi_501.c | 5
src/smi_501.h | 2
src/smi_driver.c | 247 ++++++++-----------
src/smi_exa.c | 40 ---
src/smi_video.c | 12
src/smilynx_crtc.c | 114 +++++---
src/smilynx_hw.c | 12
src/smilynx_output.c | 42 +--
22 files changed, 626 insertions(+), 677 deletions(-)
New commits:
commit 77e0b3fc97e4dc1b510328b5fafb0108146ddb50
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 6 01:50:26 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index ceeb592..21c2ab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-siliconmotion (1:1.7.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-siliconmotion (1:1.7.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:11 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 06 Dec 2009 01:50:22 +0100
xserver-xorg-video-siliconmotion (1:1.7.2-1) unstable; urgency=low
commit 9be1a095c9149488938a1366cbe06cf1758f7e74
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 02:09:30 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 0e8d8c6..ceeb592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-siliconmotion (1:1.7.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> Tue, 01 Dec 2009 10:14:42 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:11 +0200
xserver-xorg-video-siliconmotion (1:1.7.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e710954..8fa31e9 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-xext-dev,
x11proto-core-dev,
commit eed36a78fad642f798c30f9095144ba586231719
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 1 10:15:39 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 55b9700..0e8d8c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-siliconmotion (1:1.7.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 10:14:42 +0200
diff --git a/debian/control b/debian/control
index c13eca3..e710954 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-siliconmotion
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-siliconmotion.git
commit 614f398e8dba9d00086a122838100ea5f7e20a3c
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 1 10:15:17 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index d6633da..4751671 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+commit 52f40e7569bbcc9bce8f5d885b0de2868398e8df
+Author: Dave Airlie <airlied@redhat.com>
+Date: Wed Aug 5 11:09:26 2009 +1000
+
+ fix build after headers moved
+
+commit 9d9bfe0349693b283e5dc1ced6fa882f10619253
+Author: Dave Airlie <airlied@redhat.com>
+Date: Wed Aug 5 11:08:15 2009 +1000
+
+ update for 1.7.3
+
+commit 115b564f78b038baef2d14c037785850efb4e9ca
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:41 2009 +1000
+
+ siliconmotion: change to using ABI version check
+
+commit 70f2463faa6d21517d97aa460871e1b5f3fa6505
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:36 2009 +1000
+
+ siliconmotion: update for resources/RAC API removal
+
+commit 841df790b5b6700e9a1d6d41ee04b0b913329084
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 16 11:55:05 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 d754e9a2954e56a26a94e58d87a450a825c250e6
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:43:52 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index 600fe5e..55b9700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-siliconmotion (1:1.7.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 10:14:42 +0200
+
xserver-xorg-video-siliconmotion (1:1.7.2-1) unstable; urgency=low
* New upstream release.
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 52f40e7569bbcc9bce8f5d885b0de2868398e8df
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Aug 5 11:09:26 2009 +1000
fix build after headers moved
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 39448c4..391efbc 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -31,7 +31,7 @@ authorization from The XFree86 Project or Silicon Motion.
#include "config.h"
#endif
-
+#include "xf86.h"
#include "xf86DDC.h"
#include "xf86int10.h"
#include "vbe.h"
commit 9d9bfe0349693b283e5dc1ced6fa882f10619253
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Aug 5 11:08:15 2009 +1000
update for 1.7.3
diff --git a/configure.ac b/configure.ac
index e38433e..e461861 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-siliconmotion],
- 1.7.2,
+ 1.7.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-siliconmotion)
commit 115b564f78b038baef2d14c037785850efb4e9ca
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
siliconmotion: change to using ABI version check
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 9c07f61..39448c4 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -36,7 +36,7 @@ authorization from The XFree86 Project or Silicon Motion.
#include "xf86int10.h"
#include "vbe.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
commit 70f2463faa6d21517d97aa460871e1b5f3fa6505
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:36 2009 +1000
siliconmotion: update for resources/RAC API removal
diff --git a/src/smi_driver.c b/src/smi_driver.c
index b9b7b18..9c07f61 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -31,12 +31,16 @@ authorization from The XFree86 Project or Silicon Motion.
#include "config.h"
#endif
-#include "xf86Resources.h"
-#include "xf86RAC.h"
+
#include "xf86DDC.h"
#include "xf86int10.h"
#include "vbe.h"
+#ifndef XSERVER_LIBPCIACCESS
+#include "xf86Resources.h"
+#include "xf86RAC.h"
+#endif
+
#include "smi.h"
#include "smi_501.h"
#include "smilynx.h"
@@ -416,7 +420,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
LEAVE(TRUE);
}
- if (pEnt->location.type != BUS_PCI || pEnt->resources) {
+ if (pEnt->location.type != BUS_PCI) {
xfree(pEnt);
SMI_FreeRec(pScrn);
LEAVE(FALSE);
@@ -626,10 +630,9 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
}
}
+#ifndef XSERVER_LIBPCIACCESS
xf86RegisterResources(pEnt->index, NULL, ResExclusive);
-/* xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); */
-/* xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); */
-
+#endif
/*
* Set the Chipset and ChipRev, allowing config file entries to
* override.
commit 976b6738d9d9197763b47500ee1d42b1f7869d91
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 00:13:45 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 1fcab88..600fe5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-siliconmotion (1:1.7.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-siliconmotion (1:1.7.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.
- -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 00:12:47 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 00:13:38 +0200
xserver-xorg-video-siliconmotion (1:1.7.1-1) unstable; urgency=low
commit fc32a9937876c958bbc62db08e60a7a33b763d10
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 00:13:28 2009 +0200
Remove 01_gen_pci_ids.diff.
The X server now uses an internal table to choose a driver during
autoconfiguration.
diff --git a/debian/changelog b/debian/changelog
index d9a2744..1fcab88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xserver-xorg-video-siliconmotion (1:1.7.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.
- -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 00:10:55 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 00:12:47 +0200
xserver-xorg-video-siliconmotion (1:1.7.1-1) unstable; urgency=low
diff --git a/debian/patches/02_gen_pci_ids.diff b/debian/patches/02_gen_pci_ids.diff
deleted file mode 100644
index 540c02a..0000000
--- a/debian/patches/02_gen_pci_ids.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- /dev/null
-+++ xserver-xorg-video-siliconmotion/src/siliconmotion.ids
-@@ -0,0 +1,7 @@
-+126F0910
-+126F0810
-+126F0820
-+126F0710
-+126F0712
-+126F0720
-+126F0730
---- xserver-xorg-video-siliconmotion.orig/src/Makefile.am
-+++ xserver-xorg-video-siliconmotion/src/Makefile.am
-@@ -51,3 +51,6 @@
- smilynx.h \
- smi501_crtc.c \
- smi501_output.c
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = siliconmotion.ids
diff --git a/debian/patches/series b/debian/patches/series
index 09a16fd..5e9a9e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
#01_siliconmotion_rotate_option_disables_randr.diff
-02_gen_pci_ids.diff
diff --git a/debian/xserver-xorg-video-siliconmotion.install b/debian/xserver-xorg-video-siliconmotion.install
index 8a9f4ba..614cfb4 100644
--- a/debian/xserver-xorg-video-siliconmotion.install
+++ b/debian/xserver-xorg-video-siliconmotion.install
@@ -1,3 +1,2 @@
usr/lib/xorg/modules/drivers/*.so
usr/share/man/man4/*
-usr/share/xserver-xorg/pci/*
commit aea4e2e85d0662cbe99f2530c12e32d1574331eb
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 00:11:16 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index fa254f0..d6633da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+commit d754e9a2954e56a26a94e58d87a450a825c250e6
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Jul 2 11:43:52 2009 -0400
+
+ siliconmotion 1.7.2
+
+commit cd9e9f25294abb739c1772e3a9a7a9c0a921ee82
+Author: Francisco Jerez <currojerez@riseup.net>
+Date: Tue Jun 23 13:11:02 2009 +0200
+
+ Fix EXA rotation for SM502 at 32bpp (bug 22432).
+
+commit 97498c048c897e5753e61d3b4ab231025974d67c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 15:17:58 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit 536e5df957698251206326edc5a13e833f7c72b1
+Author: Francisco Jerez <currojerez@riseup.net>
+Date: Wed May 27 01:23:36 2009 +0200
+
+ Program MCLK/MXCLK on startup for a secondary SM502.
+
+ This should allow using a SM502 as secondary display
+ device (bug 21810).
+
+commit 6a370fa2b6b8fcbd556dd6f9bf92872e9bea23e8
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon May 11 22:31:30 2009 -0700
+
+ Fill in COPYING file, add SubmittingPatches URL to README
+
+commit 962e0c4f08180ac51994aef8d6d042108d5841c1
+Author: Francisco Jerez <currojerez@riseup.net>
+Date: Sun May 10 01:53:05 2009 +0200
+
+ Widen the pixel clock readjust interval for SM712.
+
+ Set it to 3MHz so that the pixel clock frequency is overridden
+ when it's found to be 49MHz, which is reported to be unstable.
+
+commit 3cc1b9d4bcf1b7a756ea4426c93392ff6d82e9a6
+Author: Francisco Jerez <currojerez@riseup.net>
+Date: Tue May 5 00:45:10 2009 +0200
+
+ Fail gracefully when the specified virtual screen doesn't fit in RAM.
+
+commit 32628d9884d577d7a672c172c12b7097be276700
+Author: Francisco Jerez <currojerez@riseup.net>
+Date: Tue May 5 00:44:17 2009 +0200
+
+ Probe the amount of installed memory by trial and error on SM712.
+
+ In some cases the BIOS hasn't filled in the "scratchpad registers"
+ (SR71) with the right amount of memory installed (e.g. MIPS
+ platform). There seems to be no other way to do it than to test it.
+
+ This should fix bug 21528.
+
commit 00921b014fa0b5358c22a769cf2450cbd4bdc8a5
Author: Francisco Jerez <currojerez@riseup.net>
Date: Tue Apr 28 22:24:03 2009 +0200
diff --git a/debian/changelog b/debian/changelog
index 8a5cd6e..d9a2744 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-siliconmotion (1:1.7.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-siliconmotion (1:1.7.2-1) UNRELEASED; urgency=low
+ * New upstream release.
* Bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 00:09:57 +0200
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 00:10:55 +0200
xserver-xorg-video-siliconmotion (1:1.7.1-1) unstable; urgency=low
commit 58d938a7cde6c604632c97dd575b6e229db3ac52
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Jul 20 00:10:15 2009 +0200
Adding README.source means we can bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index f103a3f..8a5cd6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-siliconmotion (1:1.7.1-2) UNRELEASED; urgency=low
+
+ * Bump Standards-Version to 3.8.2.
+
+ -- Brice Goglin <bgoglin@debian.org> Mon, 20 Jul 2009 00:09:57 +0200
+
xserver-xorg-video-siliconmotion (1:1.7.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index ce76da6..c13eca3 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-siliconmotion
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-siliconmotion.git
commit 841df790b5b6700e9a1d6d41ee04b0b913329084
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:55:05 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 ec0e99e..e38433e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# 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/smi_501.c b/src/smi_501.c
index a392eb0..a605e0d 100644
--- a/src/smi_501.c
+++ b/src/smi_501.c
@@ -35,8 +35,13 @@ authorization from The XFree86 Project or Silicon Motion.
#include "smi_501.h"
#include "regsmi.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
/* Want to see register dumps for now */
#undef VERBLEV
diff --git a/src/smi_driver.c b/src/smi_driver.c
index b47f774..b9b7b18 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -43,8 +43,13 @@ authorization from The XFree86 Project or Silicon Motion.
#include "smi_crtc.h"
#include "globals.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
Reply to: