Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Mon Nov 19 10:27:50 CET 2007.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-11-15 22:22:19.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-11-16 17:15:12.291980000 +0100
@@ -1,0 +2,7 @@
+Fri Nov 16 17:21:25 CET 2007 - sndirsch@suse.de
+
+- xf86-video-sis 0.9.4
+ * This release fixes DRI with xorg-server 1.3 and above, which
+ weren't detected properly.
+
+-------------------------------------------------------------------
Old:
----
xf86-video-sis-0.9.3.tar.bz2
New:
----
xf86-video-sis-0.9.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.c19716/_old 2007-11-19 10:27:36.000000000 +0100
+++ /var/tmp/diff_new_pack.c19716/_new 2007-11-19 10:27:36.000000000 +0100
@@ -14,7 +14,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 35
+Release: 37
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -45,7 +45,7 @@
Source21: xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2
Source22: xf86-video-savage-2.1.3.tar.bz2
Source23: xf86-video-siliconmotion-1.5.1.tar.bz2
-Source24: xf86-video-sis-0.9.3.tar.bz2
+Source24: xf86-video-sis-0.9.4.tar.bz2
Source25: xf86-video-sisusb-X11R7.1-0.8.1.tar.bz2
Source33: xf86-video-tdfx-1.3.0.tar.bz2
Source34: xf86-video-tga-X11R7.1-1.1.0.tar.bz2
@@ -255,6 +255,10 @@
/usr/%{_lib}/xorg/modules/
%{_mandir}/man4/*
%changelog
+* Fri Nov 16 2007 - sndirsch@suse.de
+- xf86-video-sis 0.9.4
+ * This release fixes DRI with xorg-server 1.3 and above, which
+ weren't detected properly.
* Thu Nov 15 2007 - sndirsch@suse.de
- xf86-video-intel 2.2.0
* Since the 2.1.0 release, over 160 bugs have been resolved. That
++++++ xf86-video-sis-0.9.3.tar.bz2 -> xf86-video-sis-0.9.4.tar.bz2 ++++++
++++ 9822 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.3/config.h.in new/xf86-video-sis-0.9.4/config.h.in
--- old/xf86-video-sis-0.9.3/config.h.in 2006-11-30 18:58:34.000000000 +0100
+++ new/xf86-video-sis-0.9.4/config.h.in 2007-11-16 12:41:08.000000000 +0100
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.3/configure.ac new/xf86-video-sis-0.9.4/configure.ac
--- old/xf86-video-sis-0.9.3/configure.ac 2006-11-30 18:58:10.000000000 +0100
+++ new/xf86-video-sis-0.9.4/configure.ac 2007-11-16 12:37:59.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sis],
- 0.9.3,
+ 0.9.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sis)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.3/missing new/xf86-video-sis-0.9.4/missing
--- old/xf86-video-sis-0.9.3/missing 2006-11-30 18:58:36.000000000 +0100
+++ new/xf86-video-sis-0.9.4/missing 2007-11-16 12:41:08.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.3/src/sis_dri.h new/xf86-video-sis-0.9.4/src/sis_dri.h
--- old/xf86-video-sis-0.9.3/src/sis_dri.h 2006-11-30 15:09:43.000000000 +0100
+++ new/xf86-video-sis-0.9.4/src/sis_dri.h 2007-11-16 12:37:29.000000000 +0100
@@ -115,8 +115,6 @@
int dummy;
} SISDRIContextRec, *SISDRIContextPtr;
-#ifdef XFree86Server
-
#include "screenint.h"
Bool SISDRIScreenInit(ScreenPtr pScreen);
@@ -124,4 +122,3 @@
Bool SISDRIFinishScreenInit(ScreenPtr pScreen);
#endif
-#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.3/src/sis.h new/xf86-video-sis-0.9.4/src/sis.h
--- old/xf86-video-sis-0.9.3/src/sis.h 2006-11-30 15:09:43.000000000 +0100
+++ new/xf86-video-sis-0.9.4/src/sis.h 2007-11-16 12:37:29.000000000 +0100
@@ -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
@@ -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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.3/src/sis_video.h new/xf86-video-sis-0.9.4/src/sis_video.h
--- old/xf86-video-sis-0.9.3/src/sis_video.h 2006-11-30 15:09:43.000000000 +0100
+++ new/xf86-video-sis-0.9.4/src/sis_video.h 2007-11-16 12:37:30.000000000 +0100
@@ -163,7 +163,7 @@
#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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org