Hello community,
here is the log from the commit of package xf86-video-savage for openSUSE:Factory checked in at 2013-10-02 13:34:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-savage (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-savage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-savage"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-savage/xf86-video-savage.changes 2013-08-23 11:09:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-video-savage.new/xf86-video-savage.changes 2013-10-02 13:34:19.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Oct 1 10:52:44 UTC 2013 - sndirsch@suse.com
+
+- Update to version 2.3.7
+ * small bugfix for video playback on MX/IX/SuperSavage
+ * usual catch-up to the ever-changing xserver, build and run on
+ 1.14, and default to EXA now that the xserver does not support
+ XAA anymore.
+- obsoletes U_savage-move-compat-api.h-down-to-proper-place.patch,
+ U_savage-fix-default-accel-arch-when-built-with-no-XAA.patch
+
+-------------------------------------------------------------------
Old:
----
U_savage-fix-default-accel-arch-when-built-with-no-XAA.patch
U_savage-move-compat-api.h-down-to-proper-place.patch
xf86-video-savage-2.3.6.tar.bz2
New:
----
xf86-video-savage-2.3.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-savage.spec ++++++
--- /var/tmp/diff_new_pack.hFtgsl/_old 2013-10-02 13:34:20.000000000 +0200
+++ /var/tmp/diff_new_pack.hFtgsl/_new 2013-10-02 13:34:20.000000000 +0200
@@ -17,15 +17,13 @@
Name: xf86-video-savage
-Version: 2.3.6
+Version: 2.3.7
Release: 0
Summary: S3 Savage video driver for the Xorg X server
License: MIT
Group: System/X11/Servers/XF86_4
Url: http://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
-Patch0: U_savage-move-compat-api.h-down-to-proper-place.patch
-Patch1: U_savage-fix-default-accel-arch-when-built-with-no-XAA.patch
Patch2: u_Disable-tiling-on-SuperSavage-Novell-Bugzilla-805380.patch
BuildRequires: Mesa-devel
BuildRequires: pkg-config
@@ -56,8 +54,6 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%patch2 -p1
%build
++++++ xf86-video-savage-2.3.6.tar.bz2 -> xf86-video-savage-2.3.7.tar.bz2 ++++++
++++ 2583 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-savage-2.3.6/ChangeLog new/xf86-video-savage-2.3.7/ChangeLog
--- old/xf86-video-savage-2.3.6/ChangeLog 2012-07-17 08:27:47.000000000 +0200
+++ new/xf86-video-savage-2.3.7/ChangeLog 2013-09-24 23:27:50.000000000 +0200
@@ -1,3 +1,97 @@
+commit d27abbf74fee30ddb9a3ca0d597ca0ce16a1bc35
+Author: Tormod Volden
+Date: Tue Sep 24 23:14:35 2013 +0200
+
+ xf86-video-savage: bump to version 2.3.7
+
+ Signed-off-by: Tormod Volden
+
+commit 966a0e95d6c420e5e0ab01e665144e66a4004846
+Author: Alexander Grothe
+Date: Sun Sep 15 11:00:41 2013 +0200
+
+ Drop miInitializeBackingStore() call
+
+ It was only needed up to xserver 1.4 and is not supported in the
+ recent xserver versions.
+
+ Thanks to Alexander Grothe for reporting the issue and providing
+ the fix.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=65444
+
+ > commit 1cb0261ef54b7dd6a7ef84e1c3959e424706228b
+ > Author: Daniel Martin
+ > Date: Thu Sep 6 00:38:26 2012 +0200
+ >
+ > dix: Delete mibstore.h
+ >
+ > Since Nov 2010 (commit c4c4676) the only purpose of mibstore.h was to
+ > define an empty function (miInitializeBackingStore()) for backward
+ > compatibility. Time to say goodbye.
+
+ Signed-off-by: Tormod Volden
+
+commit 44581aef5f878e7f2b34d5693d50ef75263b195c
+Author: Tormod Volden
+Date: Wed Feb 6 22:14:59 2013 +0100
+
+ Fix video window height on MX/IX/SuperSavage
+
+ Some copy-pasto caused the width to be written into the height register.
+
+ Thanks to Hans-Jürgen Mauser for pointing out a couple of more places this
+ was wrong.
+
+ Signed-off-by: Tormod Volden
+
+commit 3425ddb4c5dd7bbd91068c7ba0b1c001719795a5
+Author: Tormod Volden
+Date: Thu May 9 12:39:58 2013 +0000
+
+ Fix building with TRACEON defined
+
+ Signed-off-by: Tormod Volden
+
+commit ac460e6836bdd2cd16c9d29743376c16fdc6924e
+Author: Tormod Volden
+Date: Tue May 7 22:41:31 2013 +0200
+
+ exa: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr
+
+ Signed-off-by: Tormod Volden
+
+commit c30f9b4a61283f21f6bd230950f52961afa203cf
+Author: Tormod Volden
+Date: Thu May 9 12:36:33 2013 +0000
+
+ Really fix default accel arch when built with no XAA
+
+ After ca9718a887ecbc59b76869af673791ab591b849b it would
+ still default to XAA unless AccelMethod option was used.
+
+ Make sure the default is EXA if there is no XAA support.
+
+ Signed-off-by: Tormod Volden
+
+commit ca9718a887ecbc59b76869af673791ab591b849b
+Author: Dave Airlie
+Date: Sat Dec 22 20:00:00 2012 +1000
+
+ savage: fix default accel arch when built with no XAA
+
+ Signed-off-by: Dave Airlie
+
+commit 3d181030a6ba2205a57ef4665e53aed0251ccaa6
+Author: Dave Airlie
+Date: Wed Jul 18 18:52:38 2012 +1000
+
+ savage: move compat-api.h down to proper place.
+
+ This screws up when DRI isn't enabled.
+
+ Signed-off-by: Dave Airlie
+
commit cb27a7a072c6e087a2e272d84c1d569dc717da8b
Author: Dave Airlie
Date: Tue Jul 17 16:05:09 2012 +1000
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-savage-2.3.6/configure.ac new/xf86-video-savage-2.3.7/configure.ac
--- old/xf86-video-savage-2.3.6/configure.ac 2012-07-17 08:00:16.000000000 +0200
+++ new/xf86-video-savage-2.3.7/configure.ac 2013-09-24 23:14:04.000000000 +0200
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-savage],
- [2.3.6],
+ [2.3.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-savage])
AC_CONFIG_SRCDIR([Makefile.am])
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-savage-2.3.6/src/savage_driver.c new/xf86-video-savage-2.3.7/src/savage_driver.c
--- old/xf86-video-savage-2.3.6/src/savage_driver.c 2012-07-16 04:38:19.000000000 +0200
+++ new/xf86-video-savage-2.3.7/src/savage_driver.c 2013-09-19 22:14:25.000000000 +0200
@@ -1266,6 +1266,7 @@
if(!psav->NoAccel) {
from = X_DEFAULT;
char *strptr;
+#ifdef HAVE_XAA_H
if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) {
if(!xf86NameCmp(strptr,"XAA")) {
from = X_CONFIG;
@@ -1274,7 +1275,10 @@
from = X_CONFIG;
psav->useEXA = TRUE;
}
- }
+ }
+#else
+ psav->useEXA = TRUE;
+#endif
xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n",
psav->useEXA ? "EXA" : "XAA");
}
@@ -2239,7 +2243,7 @@
ScreenPtr pScreen;
#endif
- TRACE(("SavageLeaveVT(%d)\n", flags));
+ TRACE(("SavageLeaveVT()\n"));
gpScrn = pScrn;
#ifdef SAVAGEDRI
@@ -3408,7 +3412,6 @@
SavageInitAccel(pScreen);
}
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
if( !psav->shadowFB && !psav->useEXA )
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-savage-2.3.6/src/savage_driver.h new/xf86-video-savage-2.3.7/src/savage_driver.h
--- old/xf86-video-savage-2.3.6/src/savage_driver.h 2012-07-16 04:35:12.000000000 +0200
+++ new/xf86-video-savage-2.3.7/src/savage_driver.h 2013-02-06 22:00:25.000000000 +0100
@@ -85,8 +85,6 @@
#include "GL/glxint.h"
#include "xf86drm.h"
-#include "compat-api.h"
-
/* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up
* to 32 clients. */
#define SAVAGE_NUM_BUFFERS 32
@@ -153,6 +151,8 @@
#endif
+#include "compat-api.h"
+
typedef enum {
MT_NONE,
MT_CRT,
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-savage-2.3.6/src/savage_exa.c new/xf86-video-savage-2.3.7/src/savage_exa.c
--- old/xf86-video-savage-2.3.6/src/savage_exa.c 2012-06-06 12:21:27.000000000 +0200
+++ new/xf86-video-savage-2.3.7/src/savage_exa.c 2013-05-09 16:01:38.000000000 +0200
@@ -567,7 +567,7 @@
Bool
SavageDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch)
{
- unsigned char *src = pSrc->devPrivate.ptr;
+ unsigned char *src = (unsigned char *) exaGetPixmapFirstPixel(pSrc);
int src_pitch = exaGetPixmapPitch(pSrc);
int bpp = pSrc->drawable.bitsPerPixel;
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-savage-2.3.6/src/savage_video.c new/xf86-video-savage-2.3.7/src/savage_video.c
--- old/xf86-video-savage-2.3.6/src/savage_video.c 2012-06-06 12:21:27.000000000 +0200
+++ new/xf86-video-savage-2.3.7/src/savage_video.c 2013-05-09 16:01:38.000000000 +0200
@@ -1717,28 +1717,28 @@
OUTREG(SEC_STREAM2_STRIDE_LPB, pitch & 0xfff );
OUTREG(SEC_STREAM2_WINDOW_START, ((dstBox->x1+1) << 16) | (dstBox->y1+1) );
OUTREG(SEC_STREAM2_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16)
- | (dstBox->x2-dstBox->x1) );
+ | (dstBox->y2 - dstBox->y1) );
} else if (psav->IsPrimary) {
OUTREG(SEC_STREAM_FBUF_ADDR0, (offset + (x1>>15))
& (0x7ffffff & ~BASE_PAD));
OUTREG(SEC_STREAM_STRIDE, pitch & 0xfff );
OUTREG(SEC_STREAM_WINDOW_START, ((dstBox->x1+1) << 16) | (dstBox->y1+1) );
OUTREG(SEC_STREAM_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16)
- | (dstBox->x2-dstBox->x1) );
+ | (dstBox->y2 - dstBox->y1) );
} else {
OUTREG(SEC_STREAM_FBUF_ADDR0, (offset + (x1>>15))
& (0x7ffffff & ~BASE_PAD));
OUTREG(SEC_STREAM_STRIDE, pitch & 0xfff );
OUTREG(SEC_STREAM_WINDOW_START, ((dstBox->x1+1) << 16) | (dstBox->y1+1) );
OUTREG(SEC_STREAM_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16)
- | (dstBox->x2-dstBox->x1) );
+ | (dstBox->y2 - dstBox->y1) );
#if 0
OUTREG(SEC_STREAM2_FBUF_ADDR0, (offset + (x1>>15))
& (0x7ffffff & ~BASE_PAD));
OUTREG(SEC_STREAM2_STRIDE_LPB, pitch & 0xfff );
OUTREG(SEC_STREAM2_WINDOW_START, ((dstBox->x1+1) << 16) | (dstBox->y1+1) );
OUTREG(SEC_STREAM2_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16)
- | (dstBox->x2-dstBox->x1) );
+ | (dstBox->y2 - dstBox->y1) );
#endif
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org