.cvsignore | 19 -------------------
ChangeLog | 43 +++++++++++++++++++++++++++++++++++++++++++
debian/changelog | 7 +++++--
debian/control | 2 +-
man/.cvsignore | 2 --
src/.cvsignore | 6 ------
src/sis.h | 8 ++++----
src/sis_dri.h | 3 ---
src/sis_video.h | 2 +-
9 files changed, 54 insertions(+), 38 deletions(-)
New commits:
commit e53e3c39f526c243a7504944d2c99ca5f08df12c
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sun Nov 11 12:07:43 2007 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 5b4c0d6..9de6bdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xserver-xorg-video-sis (1:0.9.3-6) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.9.3-6) unstable; urgency=low
* Pull upstream commits up to 748df8070893675ad3839fff295bec913be876f2
+ Fix xserver version detection, closes: #449280.
* Add upstream URL to debian/copyright.
+ * Add myself to Uploaders, and remove Branden with his permission.
- -- Brice Goglin <[EMAIL PROTECTED]> Sun, 11 Nov 2007 12:01:08 +0100
+ -- Brice Goglin <[EMAIL PROTECTED]> Sun, 11 Nov 2007 12:07:21 +0100
xserver-xorg-video-sis (1:0.9.3-5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 526c3b0..58fe032 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-sis
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4),
x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, x11proto-xinerama-dev,
x11proto-xf86dga-dev, x11proto-xf86misc-dev, libgl1-mesa-dev | libgl-dev,
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev,
libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt
Standards-Version: 3.7.2.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sis
commit a512770ff15154d9661d587da493455d40941679
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sun Nov 11 12:04:02 2007 +0100
Pull upstream commits up to 748df8070893675ad3839fff295bec913be876f2
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 2df4a8d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
-*~
diff --git a/ChangeLog b/ChangeLog
index 9acc886..b83b444 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+commit 748df8070893675ad3839fff295bec913be876f2
+Author: James Cloos <[EMAIL PROTECTED]>
+Date: Mon Sep 3 05:52:43 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit f269b388cb8853b4eabfe8c42e03baf4caa32ad8
+Author: James Cloos <[EMAIL PROTECTED]>
+Date: Thu Aug 23 19:25:55 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit ba3c4d45d6e8f04536e6512103db820f0d21b77a
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Thu Aug 9 03:36:07 2007 +0200
+
+ Get rid of the XFree86Server macro.
+
+ It's not exported by xserver these days, so don't test it.
+
+commit 391dad44fa305be4cded31cf2f9a4fba7420af99
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Thu Aug 9 03:35:12 2007 +0200
+
+ Fix xserver version detection.
+
+ Newer xserver releases report a version of 1.x, which is smaller
+ than 6.8.99.900.
+
+commit 89d2f2118a2409d1bf0239448a4e3d2f6e7a1919
+Author: Brice Goglin <[EMAIL PROTECTED]>
+Date: Tue Aug 7 12:57:23 2007 +0200
+
+ Define SIS_*_VERSION using PACKAGE_VERSION*
+
+commit 346693719a49cf50ff62cb25b09d433d2d8db9ea
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Tue Feb 27 20:35:35 2007 -0500
+
+ bump Xv image height up from 1080 to 1088 for 315 chips
+
+ fixes bug 10075
+
commit be1d494e0921d234918c899c6fe833c5d74b16fd
Author: Eamon Walsh <[EMAIL PROTECTED]>
Date: Mon Dec 18 14:09:45 2006 -0500
diff --git a/debian/changelog b/debian/changelog
index 79dd8c3..5b4c0d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
xserver-xorg-video-sis (1:0.9.3-6) UNRELEASED; urgency=low
+ * Pull upstream commits up to 748df8070893675ad3839fff295bec913be876f2
+ + Fix xserver version detection, closes: #449280.
* Add upstream URL to debian/copyright.
- -- Brice Goglin <[EMAIL PROTECTED]> Sat, 15 Sep 2007 02:17:40 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]> Sun, 11 Nov 2007 12:01:08 +0100
xserver-xorg-video-sis (1:0.9.3-5) unstable; urgency=low
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
commit 748df8070893675ad3839fff295bec913be876f2
Author: James Cloos <[EMAIL PROTECTED]>
Date: Mon Sep 3 05:52:43 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index fb1befd..2df4a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libtool
ltmain.sh
missing
stamp-h1
+*~
commit f269b388cb8853b4eabfe8c42e03baf4caa32ad8
Author: James Cloos <[EMAIL PROTECTED]>
Date: Thu Aug 23 19:25:55 2007 -0400
Rename .cvsignore to .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit ba3c4d45d6e8f04536e6512103db820f0d21b77a
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Aug 9 03:36:07 2007 +0200
Get rid of the XFree86Server macro.
It's not exported by xserver these days, so don't test it.
diff --git a/src/sis_dri.h b/src/sis_dri.h
index 0d8e4a5..8834151 100644
--- a/src/sis_dri.h
+++ b/src/sis_dri.h
@@ -115,8 +115,6 @@ typedef struct {
int dummy;
} SISDRIContextRec, *SISDRIContextPtr;
-#ifdef XFree86Server
-
#include "screenint.h"
Bool SISDRIScreenInit(ScreenPtr pScreen);
@@ -124,4 +122,3 @@ void SISDRICloseScreen(ScreenPtr pScreen);
Bool SISDRIFinishScreenInit(ScreenPtr pScreen);
#endif
-#endif
commit 391dad44fa305be4cded31cf2f9a4fba7420af99
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Aug 9 03:35:12 2007 +0200
Fix xserver version detection.
Newer xserver releases report a version of 1.x, which is smaller
than 6.8.99.900.
diff --git a/src/sis.h b/src/sis.h
index 8529710..f17b5cb 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -92,7 +92,7 @@
(((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap)
#define XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,3,99,902,0)
#endif
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0)
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0) ||
XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
#define SISISXORG6899900
#endif
#if 0
commit 89d2f2118a2409d1bf0239448a4e3d2f6e7a1919
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Tue Aug 7 12:57:23 2007 +0200
Define SIS_*_VERSION using PACKAGE_VERSION*
diff --git a/src/sis.h b/src/sis.h
index 3f5c2d3..8529710 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -109,10 +109,10 @@
#define SIS_NAME "SIS"
#define SIS_DRIVER_NAME "sis"
-#define SIS_MAJOR_VERSION 0
+#define SIS_MAJOR_VERSION PACKAGE_VERSION_MAJOR
#ifdef SISISXORG6899900
-#define SIS_MINOR_VERSION 9 /* DRI changes */
-#define SIS_PATCHLEVEL 1
+#define SIS_MINOR_VERSION PACKAGE_VERSION_MINOR /* DRI changes */
+#define SIS_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
#else
#define SIS_MINOR_VERSION 7
#define SIS_PATCHLEVEL 1
commit 346693719a49cf50ff62cb25b09d433d2d8db9ea
Author: Alex Deucher <[EMAIL PROTECTED]>
Date: Tue Feb 27 20:35:35 2007 -0500
bump Xv image height up from 1080 to 1088 for 315 chips
fixes bug 10075
diff --git a/src/sis_video.h b/src/sis_video.h
index 01a26fa..64a85f9 100644
--- a/src/sis_video.h
+++ b/src/sis_video.h
@@ -163,7 +163,7 @@ extern int SISGetPortUtilAttribute(ScrnInfoPtr pScrn,
Atom attribute,
#define IMAGE_MAX_WIDTH_315 1920
#define IMAGE_MAX_WIDTH_340 1920 /* ? */
#define IMAGE_MAX_WIDTH_761 1920 /* ? */
-#define IMAGE_MAX_HEIGHT_315 1080
+#define IMAGE_MAX_HEIGHT_315 1088
#define OVERLAY_MIN_WIDTH 32 /* Minimum overlay sizes */
#define OVERLAY_MIN_HEIGHT 24
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
