Hello community,
here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory
checked in at Mon Mar 2 01:33:45 CET 2009.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-02-26 16:09:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-02-28 11:59:48.623596783 +0100
@@ -1,0 +2,11 @@
+Fri Feb 27 20:37:31 CET 2009 - sndirsch@suse.de
+
+- xf86-video-sisusb 0.9.1
+- disabled build of mga-1.9.100, vga, xgi
+- xf86-video-nsc-noasm.diff
+ * disabled asm optimization on %ix86 (apparently assyntax.h has
+ been removed from xorg-server 1.6 sources)
+- xf86-video-newport.diff/xf86-video-fbdev.diff
+ * build fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-video-sisusb-0.9.0.tar.bz2
New:
----
xf86-video-fbdev.diff
xf86-video-newport.diff
xf86-video-nsc-noasm.diff
xf86-video-sisusb-0.9.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.O20313/_old 2009-03-02 01:33:19.000000000 +0100
+++ /var/tmp/diff_new_pack.O20313/_new 2009-03-02 01:33:19.000000000 +0100
@@ -22,7 +22,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 41
+Release: 42
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -54,7 +54,7 @@
Source22: xf86-video-savage-2.2.1.tar.bz2
Source23: xf86-video-siliconmotion-1.7.0.tar.bz2
Source24: xf86-video-sis-0.10.1.tar.bz2
-Source25: xf86-video-sisusb-0.9.0.tar.bz2
+Source25: xf86-video-sisusb-0.9.1.tar.bz2
Source33: xf86-video-tdfx-1.4.1.tar.bz2
Source34: xf86-video-tga-1.2.0.tar.bz2
Source35: xf86-video-trident-1.3.1.tar.bz2
@@ -81,6 +81,7 @@
Patch12: xf86-video-mga-hal.diff
Patch14: xf86-video-rendition.diff
Patch16: xf86-video-nsc.diff
+Patch17: xf86-video-nsc-noasm.diff
Patch30: xf86-video-mga.randr12.diff
Patch41: xf86-video-xgi.diff
Patch46: xf86-video-ati.diff
@@ -97,6 +98,8 @@
Patch67: xf86-video-intel-bfo17988.diff
Patch68: xf86-video-ati-bug474071-fix2.diff
Patch69: xf86-video-ati-ia64_screen_blank.diff
+Patch70: xf86-video-newport.diff
+Patch71: xf86-video-fbdev.diff
Patch103: xf86-video-ati-6.7.197-r128-xvideo.patch
Patch104: xf86-video-ati-disable-dri-bug437651-ia64only.diff
@@ -152,6 +155,7 @@
popd
pushd xf86-video-nsc-*
%patch16 -p1
+%patch17 -p0
popd
pushd xf86-video-xgi-*
%patch41
@@ -174,21 +178,28 @@
%patch68 -p2
%patch69 -p2
popd
+pushd xf86-video-newport-*
+%patch70
+popd
+pushd xf86-video-fbdev-*
+%patch71
+popd
%build
for dir in xf86-video-nv-* \
- xf86-video-mga-1.9.100 xf86-video-ati-6.11.* \
+ xf86-video-ati-6.11.* \
$(ls -d xf86-video-* | grep -v -e xf86-video-impact \
-e xf86-video-nv \
-e xf86-video-mga-1.9.100 \
-e xf86-video-ati-6.11 \
-e xf86-video-xgixp \
+ -e xf86-video-vga \
+ -e xf86-video-xgi- \
); do
pushd $dir
case $dir in
xf86-video-mga-1.4.9 | \
xf86-video-intel-* | \
- xf86-video-mga-1.9.100 | \
xf86-video-ati-6.11.* | \
xf86-video-xgixp | \
xf86-video-nsc-*) autoreconf -fi ;;
@@ -202,13 +213,14 @@
%install
for dir in xf86-video-nv-* \
- xf86-video-mga-1.9.100 \
xf86-video-ati-6.11.* \
$(ls -d xf86-video-* | grep -v -e xf86-video-impact \
-e xf86-video-nv \
-e xf86-video-mga-1.9.100 \
-e xf86-video-ati-6.11 \
-e xf86-video-xgixp \
+ -e xf86-video-vga \
+ -e xf86-video-xgi- \
); do
make -C $dir install DESTDIR=$RPM_BUILD_ROOT
done
@@ -265,6 +277,14 @@
/var/lib/hardware/ids/20.%{name}
%changelog
+* Fri Feb 27 2009 sndirsch@suse.de
+- xf86-video-sisusb 0.9.1
+- disabled build of mga-1.9.100, vga, xgi
+- xf86-video-nsc-noasm.diff
+ * disabled asm optimization on %%ix86 (apparently assyntax.h has
+ been removed from xorg-server 1.6 sources)
+- xf86-video-newport.diff/xf86-video-fbdev.diff
+ * build fixes
* Thu Feb 26 2009 sndirsch@suse.de
- xf86-video-apm 1.2.1
- xf86-video-ark 0.7.1
++++++ xf86-video-fbdev.diff ++++++
--- src/fbdev.c.orig 2009-02-28 11:57:23.053111821 +0100
+++ src/fbdev.c 2009-02-28 11:58:16.743503646 +0100
@@ -417,7 +417,7 @@ FBDevProbe(DriverPtr drv, int flags)
entity = xf86ClaimIsaSlot(drv, 0,
devSections[i], TRUE);
- pScrn = xf86ConfigIsaEntity(pScrn,0,entity,
+ pScrn = (pointer) xf86ConfigIsaEntity(pScrn,0,entity,
NULL,RES_SHARED_VGA,
NULL,NULL,NULL,NULL);
} else {
++++++ xf86-video-newport.diff ++++++
--- src/newport_driver.c.orig 2009-02-28 12:01:15.383461850 +0100
+++ src/newport_driver.c 2009-02-28 12:01:23.919842139 +0100
@@ -280,7 +280,7 @@ NewportProbe(DriverPtr drv, int flags)
+ busID * NEWPORT_BASE_OFFSET);
RANGE(range[0], base, base + sizeof(NewportRegs),\
ResExcMemBlock);
- pScrn = xf86ConfigIsaEntity(pScrn, 0, entity, NULL, range, \
+ pScrn = (pointer) xf86ConfigIsaEntity(pScrn, 0, entity, NULL, range, \
NULL, NULL, NULL, NULL);
/* Allocate a ScrnInfoRec */
pScrn->driverVersion = NEWPORT_VERSION;
++++++ xf86-video-nsc-noasm.diff ++++++
--- src/Makefile.am.orig 2009-02-28 11:45:54.310414039 +0100
+++ src/Makefile.am 2009-02-28 11:46:11.547182475 +0100
@@ -49,11 +49,6 @@
nsc.h \
panel.c
-if I386ARCH
-nsc_drv_la_SOURCES += \
- nsc_msr_asm.S
-endif
-
EXTRA_DIST = \
nsc_galfns.c \
nsc_gx2_vga.c \
++++++ xf86-video-sisusb-0.9.0.tar.bz2 -> xf86-video-sisusb-0.9.1.tar.bz2 ++++++
++++ 59429 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-sisusb-0.9.0/config.h.in new/xf86-video-sisusb-0.9.1/config.h.in
--- old/xf86-video-sisusb-0.9.0/config.h.in 2008-03-19 20:35:21.000000000 +0100
+++ new/xf86-video-sisusb-0.9.1/config.h.in 2009-02-24 16:22:18.000000000 +0100
@@ -32,6 +32,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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-sisusb-0.9.0/configure.ac new/xf86-video-sisusb-0.9.1/configure.ac
--- old/xf86-video-sisusb-0.9.0/configure.ac 2008-03-19 20:35:03.000000000 +0100
+++ new/xf86-video-sisusb-0.9.1/configure.ac 2009-02-24 16:22:05.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sisusb],
- 0.9.0,
+ 0.9.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sisusb)
@@ -53,7 +53,6 @@
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
-XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
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-sisusb-0.9.0/man/sisusb.man new/xf86-video-sisusb-0.9.1/man/sisusb.man
--- old/xf86-video-sisusb-0.9.0/man/sisusb.man 2008-03-19 15:31:16.000000000 +0100
+++ new/xf86-video-sisusb-0.9.1/man/sisusb.man 2009-02-24 16:20:59.000000000 +0100
@@ -82,7 +82,7 @@
none.
.SH "SEE ALSO"
#ifdef __xservername__
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), sis(__drivermansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), sis(__drivermansuffix__)
#else
XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__), sis(__drivermansuffix__)
#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-sisusb-0.9.0/README new/xf86-video-sisusb-0.9.1/README
--- old/xf86-video-sisusb-0.9.0/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-sisusb-0.9.1/README 2009-02-24 16:20:59.000000000 +0100
@@ -0,0 +1,20 @@
+xf86-video-sisusb - SiS Net2280-based USB video driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-sisusb
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-sisusb
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
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-sisusb-0.9.0/src/sisusb_cursor.c new/xf86-video-sisusb-0.9.1/src/sisusb_cursor.c
--- old/xf86-video-sisusb-0.9.0/src/sisusb_cursor.c 2008-03-19 20:33:49.000000000 +0100
+++ new/xf86-video-sisusb-0.9.1/src/sisusb_cursor.c 2008-08-19 19:32:32.000000000 +0200
@@ -166,7 +166,7 @@
return TRUE;
}
-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0)
+#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0)
#ifdef ARGB_CURSOR
#ifdef SIS_ARGB_CURSOR
static Bool
@@ -279,7 +279,7 @@
infoPtr->SetCursorColors = SiSUSBSetCursorColors;
infoPtr->LoadCursorImage = SiSUSBLoadCursorImage;
infoPtr->UseHWCursor = SiSUSBUseHWCursor;
-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0)
+#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0)
#ifdef ARGB_CURSOR
#ifdef SIS_ARGB_CURSOR
if(pSiSUSB->OptUseColorCursor) {
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-sisusb-0.9.0/src/sisusb_driver.c new/xf86-video-sisusb-0.9.1/src/sisusb_driver.c
--- old/xf86-video-sisusb-0.9.0/src/sisusb_driver.c 2008-03-19 20:34:28.000000000 +0100
+++ new/xf86-video-sisusb-0.9.1/src/sisusb_driver.c 2008-08-19 19:32:32.000000000 +0200
@@ -43,8 +43,6 @@
#include "mibank.h"
#include "mipointer.h"
#include "mibstore.h"
-#define _XF86MISC_SERVER_
-#include
#include "sisusb_regs.h"
#include "sisusb_dac.h"
@@ -482,11 +480,7 @@
pScrn->LeaveVT = SISUSBLeaveVT;
pScrn->FreeScreen = SISUSBFreeScreen;
pScrn->ValidMode = SISUSBValidMode;
-#ifdef X_XF86MiscPassMessage
- if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) {
- pScrn->HandleMessage = SISUSBHandleMessage;
- }
-#endif
+
foundScreen = TRUE;
}
@@ -829,7 +823,7 @@
}
#endif
#else
-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0)
+#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0)
if(xf86GetVersion() != XF86_VERSION_CURRENT) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"This driver binary is not compiled for this version of " SISUSBMYSERVERNAME "\n");
@@ -2001,7 +1995,7 @@
pSiSUSB->xv_sisdirectunlocked = 0;
#ifdef SIS_GLOBAL_ENABLEXV
-#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0,0)) || (defined(XvExtension))
+#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0)) || (defined(XvExtension))
if(!pSiSUSB->NoXvideo) {
SISUSBInitVideo(pScreen);
}
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-sisusb-0.9.0/src/sisusb_driver.h new/xf86-video-sisusb-0.9.1/src/sisusb_driver.h
--- old/xf86-video-sisusb-0.9.0/src/sisusb_driver.h 2008-03-19 20:33:49.000000000 +0100
+++ new/xf86-video-sisusb-0.9.1/src/sisusb_driver.h 2008-08-15 19:55:29.000000000 +0200
@@ -83,10 +83,6 @@
#endif
/* Optional functions */
-#ifdef X_XF86MiscPassMessage
-extern int SISUSBHandleMessage(int scrnIndex, const char *msgtype,
- const char *msgval, char **retmsg);
-#endif
static void SISUSBFreeScreen(int scrnIndex, int flags);
static ModeStatus SISUSBValidMode(int scrnIndex, DisplayModePtr mode,
Bool verbose, int flags);
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-sisusb-0.9.0/src/sisusb.h new/xf86-video-sisusb-0.9.1/src/sisusb.h
--- old/xf86-video-sisusb-0.9.0/src/sisusb.h 2008-03-19 20:33:49.000000000 +0100
+++ new/xf86-video-sisusb-0.9.1/src/sisusb.h 2008-08-19 16:22:20.000000000 +0200
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
#define SISUSBDRIVERVERSIONYEAR 5
#define SISUSBDRIVERVERSIONMONTH 9
@@ -94,7 +95,7 @@
#include "xorgVersion.h"
#define SISUSBMYSERVERNAME "X.org"
#ifndef XF86_VERSION_NUMERIC
-#define XF86_VERSION_NUMERIC(major,minor,patch,snap,dummy) \
+#define XF86_VERSION_NUMERIC(major,minor,patch,snap) \
(((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap)
#define XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,3,99,902)
#endif
@@ -108,7 +109,7 @@
#define SISUSBMYSERVERNAME "XFree86"
#endif
-#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0,0)) || (defined(XvExtension))
+#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0)) || (defined(XvExtension))
#include "xf86xv.h"
#include
#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-sisusb-0.9.0/src/sisusb_opt.c new/xf86-video-sisusb-0.9.1/src/sisusb_opt.c
--- old/xf86-video-sisusb-0.9.0/src/sisusb_opt.c 2008-03-19 20:33:49.000000000 +0100
+++ new/xf86-video-sisusb-0.9.1/src/sisusb_opt.c 2008-08-19 19:32:32.000000000 +0200
@@ -287,7 +287,7 @@
pSiSUSB->HideHWCursor = FALSE;
pSiSUSB->HWCursorIsVisible = FALSE;
-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
+#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0)
pSiSUSB->OptUseColorCursor = 0;
#else
pSiSUSB->OptUseColorCursor = 1;
@@ -343,7 +343,7 @@
* Enable/disable color hardware cursor
*
*/
-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0)
+#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0)
#ifdef ARGB_CURSOR
#ifdef SIS_ARGB_CURSOR
if(pSiSUSB->HWCursor) {
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-sisusb-0.9.0/src/sisusb_types.h new/xf86-video-sisusb-0.9.1/src/sisusb_types.h
--- old/xf86-video-sisusb-0.9.0/src/sisusb_types.h 2008-03-19 20:33:49.000000000 +0100
+++ new/xf86-video-sisusb-0.9.1/src/sisusb_types.h 2008-08-15 20:27:11.000000000 +0200
@@ -93,12 +93,7 @@
#define SISIOMEMTYPE
-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0)
-typedef unsigned long IOADDRESS;
-typedef unsigned long SISIOADDRESS;
-#else
typedef IOADDRESS SISIOADDRESS;
-#endif
typedef enum _SIS_CHIP_TYPE {
SIS_VGALegacy = 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-sisusb-0.9.0/src/sisusb_utility.c new/xf86-video-sisusb-0.9.1/src/sisusb_utility.c
--- old/xf86-video-sisusb-0.9.0/src/sisusb_utility.c 2008-03-19 20:33:49.000000000 +0100
+++ new/xf86-video-sisusb-0.9.1/src/sisusb_utility.c 2008-08-15 19:55:29.000000000 +0200
@@ -38,8 +38,6 @@
#define NEED_EVENTS
#include
#include "dixstruct.h"
-#define _XF86MISC_SERVER_
-#include
#include "sisusb_videostr.h"
@@ -245,10 +243,6 @@
int (*HandleSiSDirectCommand[SISCTRL_MAX_SCREENS])(xSiSCtrlCommandReply *);
} xSiSCtrlScreenTable;
-#ifdef X_XF86MiscPassMessage
-int SISUSBHandleMessage(int scrnIndex, const char *msgtype,
- const char *msgval, char **retmsg);
-#endif
void SiSUSBCtrlExtInit(ScrnInfoPtr pScrn);
void SiSUSBCtrlExtUnregister(SISUSBPtr pSiSUSB, int index);
@@ -266,19 +260,6 @@
#endif /* SIS_GLOBAL_ENABLEXV */
/***********************************
- * MessageHandler interface *
- * (unused now; use extension) *
- ***********************************/
-
-#ifdef X_XF86MiscPassMessage
-int
-SISUSBHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg)
-{
- return BadMatch;
-}
-#endif
-
-/***********************************
* SiSCtrl extension interface *
***********************************/
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-sisusb-0.9.0/src/sisusb_video.c new/xf86-video-sisusb-0.9.1/src/sisusb_video.c
--- old/xf86-video-sisusb-0.9.0/src/sisusb_video.c 2008-03-19 20:33:49.000000000 +0100
+++ new/xf86-video-sisusb-0.9.1/src/sisusb_video.c 2008-08-19 19:32:32.000000000 +0200
@@ -561,7 +561,7 @@
}
#ifdef SIS_ENABLEXV
-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3,0)
+#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3)
static Bool
RegionsEqual(RegionPtr A, RegionPtr B)
{
@@ -1654,7 +1654,7 @@
/* update cliplist */
if(pPriv->autopaintColorKey &&
(pPriv->grabbedByV4L ||
-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3,0)
+#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3)
(!RegionsEqual(&pPriv->clip, clipBoxes)) ||
#else
(!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) ||
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org