Hello community,
here is the log from the commit of package xf86-video-mach64 for openSUSE:Factory checked in at 2012-12-28 22:50:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-mach64 (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-mach64.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-mach64", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-mach64/xf86-video-mach64.changes 2012-09-23 08:10:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-video-mach64.new/xf86-video-mach64.changes 2012-12-28 22:50:58.000000000 +0100
@@ -1,0 +2,12 @@
+Sat Dec 22 23:45:48 UTC 2012 - zaitor@opensuse.org
+
+- Update to version 6.9.4:
+ + Remove call to obsolete miInitializeBackingStore()
+ + Remove dummy UTS / DFS hooks. fdo#51137
+ + Mach64PixelARGB should use exaGetPixmapFirstPixel
+ + Fix build with neither XAA nor EXA against xserver 1.13.0
+ + Don't gratuitously disable Render when ShadowFBing
+ + mach64: fix build on 32-bit. tvout code only builds on 32-bit.
+- Drop U_mach64-fix-build-on-32-bit.patch, fixed upstream.
+
+-------------------------------------------------------------------
Old:
----
U_mach64-fix-build-on-32-bit.patch
xf86-video-mach64-6.9.3.tar.bz2
New:
----
xf86-video-mach64-6.9.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-mach64.spec ++++++
--- /var/tmp/diff_new_pack.erhrqb/_old 2012-12-28 22:50:59.000000000 +0100
+++ /var/tmp/diff_new_pack.erhrqb/_new 2012-12-28 22:50:59.000000000 +0100
@@ -17,14 +17,13 @@
Name: xf86-video-mach64
-Version: 6.9.3
+Version: 6.9.4
Release: 0
Summary: ATI Mach64 series 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_mach64-fix-build-on-32-bit.patch
BuildRequires: Mesa-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig(fontsproto)
@@ -49,7 +48,6 @@
%prep
%setup -q
-%patch0 -p1
%build
%configure
++++++ xf86-video-mach64-6.9.3.tar.bz2 -> xf86-video-mach64-6.9.4.tar.bz2 ++++++
++++ 23183 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-mach64-6.9.3/ChangeLog new/xf86-video-mach64-6.9.4/ChangeLog
--- old/xf86-video-mach64-6.9.3/ChangeLog 2012-07-17 08:22:32.000000000 +0200
+++ new/xf86-video-mach64-6.9.4/ChangeLog 2012-12-20 07:16:30.000000000 +0100
@@ -1,3 +1,101 @@
+commit 0d8639f3cd4128ae856ae27f3787c1da224bb564
+Author: Alan Coopersmith
+Date: Wed Dec 19 22:14:08 2012 -0800
+
+ xf86-video-mach64 6.9.4
+
+ Signed-off-by: Alan Coopersmith
+
+commit f694490b3cec78d7b17eeb0a9c4daadd1028776a
+Author: Alan Coopersmith
+Date: Tue Dec 18 15:42:30 2012 -0800
+
+ Remove call to obsolete miInitializeBackingStore()
+
+ Definition was deleted from Xorg during 1.14 merge window, but has
+ been a no-op since 1.10 merge window.
+
+ Signed-off-by: Alan Coopersmith
+ Reviewed-by: Alex Deucher
+
+commit ece8d3557eb1ffb27104bffb7841503aae4dcd6f
+Author: Connor Behan
+Date: Fri Dec 7 13:53:38 2012 -0800
+
+ Remove dummy UTS / DFS hooks
+
+ When EXA was added to mach64, it included UploadToScreen and
+ DownloadFromScreen hooks that did the same thing that EXA would do in a
+ software fallback. Now they are out of date and cause crashes. The
+ slight benefit of reimplementing those hooks (if there is any) is not
+ worth the maintenance burden of having to rewrite them every time there
+ is a change to the way EXA handles pixmaps.
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=51137
+
+ Signed-off-by: Connor Behan
+ Tested-by: Alan Coopersmith
+ Signed-off-by: Alan Coopersmith
+
+commit f0d44c18d71e7450b99189c1221a2f89c7817ab6
+Author: Alan Coopersmith
+Date: Thu Dec 6 16:49:12 2012 -0800
+
+ Mach64PixelARGB should use exaGetPixmapFirstPixel
+
+ Fixes crash attempting to read a pixel from a NULL pPixmap->devPrivate.ptr
+
+ Signed-off-by: Alan Coopersmith
+ Reviewed-by: Michel Dänzer
+
+commit 42c4e423eec789606eec9703be23a9fd4483a14a
+Author: Adam Jackson
+Date: Tue Oct 2 10:19:47 2012 -0400
+
+ Fix build with neither XAA nor EXA against xserver 1.13.0
+
+ Pull in picturestr.h to get GLYPH_HAS_GLYPH_PICTURE_ACCESSOR defined
+ before compat-api.h is parsed, otherwise you fail with:
+
+ In file included from /usr/include/xorg/picturestr.h:28:0,
+ from /usr/include/xorg/exa.h:38,
+ from atimach64accel.h:31,
+ from atiscreen.c:46:
+ /usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '*' token
+ /usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '(' token
+ /usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '*' token
+ /usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '(' token
+
+ Signed-off-by: Adam Jackson
+
+commit 104e3e067a7dcac143cb672fe42d56396ba6087b
+Author: Adam Jackson
+Date: Wed Sep 26 16:21:25 2012 -0400
+
+ Don't gratuitously disable Render when ShadowFBing
+
+ There's no reason to do this, and I am at a loss to explain why that was
+ ever done. The first instance of this logic comes from xfree86 (over 11
+ years ago!):
+
+ http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c.diff?r1=1.15&r2=1.16
+
+ Now, cfb never had Render support, so that might make some sense if
+ there was an intermediate uncommitted state where the driver used fb for
+ direct but cfb for shadowed. But that's really the only plausible
+ explanation I can think of.
+
+ Signed-off-by: Adam Jackson
+
+commit 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c
+Author: Dave Airlie
+Date: Wed Jul 18 18:46:49 2012 +1000
+
+ mach64: fix build on 32-bit.
+
+ tvout code only builds on 32-bit, fix build.
+
+ Signed-off-by: Dave Airlie
+
commit 2776fc9cd69f18ba6f09f39ca747f3a9333bf9e4
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-mach64-6.9.3/configure.ac new/xf86-video-mach64-6.9.4/configure.ac
--- old/xf86-video-mach64-6.9.3/configure.ac 2012-07-17 08:00:16.000000000 +0200
+++ new/xf86-video-mach64-6.9.4/configure.ac 2012-12-20 07:16:00.000000000 +0100
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-mach64],
- [6.9.3],
+ [6.9.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-mach64])
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-mach64-6.9.3/missing new/xf86-video-mach64-6.9.4/missing
--- old/xf86-video-mach64-6.9.3/missing 2012-06-05 21:11:37.000000000 +0200
+++ new/xf86-video-mach64-6.9.4/missing 2012-12-20 07:16:11.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2009-04-28.21; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -84,6 +84,7 @@
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
+ tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -121,6 +122,15 @@
# Not GNU programs, they don't have --version.
;;
+ tar*)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
@@ -216,7 +226,7 @@
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG=\${$#}
+ eval LASTARG="\${$#}"
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -246,7 +256,7 @@
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG=\${$#}
+ eval LASTARG="\${$#}"
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -308,6 +318,41 @@
touch $file
;;
+ tar*)
+ shift
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar "$@" && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar "$@" && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
+ ;;
+
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg.
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-mach64-6.9.3/src/atimach64exa.c new/xf86-video-mach64-6.9.4/src/atimach64exa.c
--- old/xf86-video-mach64-6.9.3/src/atimach64exa.c 2012-06-06 11:36:01.000000000 +0200
+++ new/xf86-video-mach64-6.9.4/src/atimach64exa.c 2012-12-20 07:16:00.000000000 +0100
@@ -387,60 +387,6 @@
static void Mach64DoneSolid(PixmapPtr pPixmap) { }
-/*
- * Memcpy-based UTS.
- */
-static Bool
-Mach64UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
- char *src, int src_pitch)
-{
- char *dst = pDst->devPrivate.ptr;
- int dst_pitch = exaGetPixmapPitch(pDst);
-
- int bpp = pDst->drawable.bitsPerPixel;
- int cpp = (bpp + 7) / 8;
- int wBytes = w * cpp;
-
- exaWaitSync(pDst->drawable.pScreen);
-
- dst += (x * cpp) + (y * dst_pitch);
-
- while (h--) {
- memcpy(dst, src, wBytes);
- src += src_pitch;
- dst += dst_pitch;
- }
-
- return TRUE;
-}
-
-/*
- * Memcpy-based DFS.
- */
-static Bool
-Mach64DownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
- char *dst, int dst_pitch)
-{
- char *src = pSrc->devPrivate.ptr;
- int src_pitch = exaGetPixmapPitch(pSrc);
-
- int bpp = pSrc->drawable.bitsPerPixel;
- int cpp = (bpp + 7) / 8;
- int wBytes = w * cpp;
-
- exaWaitSync(pSrc->drawable.pScreen);
-
- src += (x * cpp) + (y * src_pitch);
-
- while (h--) {
- memcpy(dst, src, wBytes);
- src += src_pitch;
- dst += dst_pitch;
- }
-
- return TRUE;
-}
-
#include "atimach64render.c"
/* Compute log base 2 of val. */
@@ -659,12 +605,6 @@
pExa->Copy = Mach64Copy;
pExa->DoneCopy = Mach64DoneCopy;
- /* EXA hits more optimized paths when it does not have to fallback because
- * of missing UTS/DFS, hook memcpy-based UTS/DFS.
- */
- pExa->UploadToScreen = Mach64UploadToScreen;
- pExa->DownloadFromScreen = Mach64DownloadFromScreen;
-
if (pATI->RenderAccelEnabled) {
if (pATI->Chip >= ATI_CHIP_264GTPRO) {
/* 3D Rage Pro does not support NPOT textures. */
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-mach64-6.9.3/src/atimach64render.c new/xf86-video-mach64-6.9.4/src/atimach64render.c
--- old/xf86-video-mach64-6.9.3/src/atimach64render.c 2012-06-06 11:36:01.000000000 +0200
+++ new/xf86-video-mach64-6.9.4/src/atimach64render.c 2012-12-20 07:16:00.000000000 +0100
@@ -209,22 +209,7 @@
CARD8 comp;
int bits, shift;
- /* Ensure that texture drawing has completed. */
- exaWaitSync(pPixmap->drawable.pScreen);
-
- /* exaGetPixmapFirstPixel() */
-
- switch (pPixmap->drawable.bitsPerPixel) {
- case 32:
- pixel = *(CARD32 *)(pPixmap->devPrivate.ptr);
- break;
- case 16:
- pixel = *(CARD16 *)(pPixmap->devPrivate.ptr);
- break;
- default:
- pixel = *(CARD8 *)(pPixmap->devPrivate.ptr);
- break;
- }
+ pixel = exaGetPixmapFirstPixel(pPixmap);
/* exaGetRGBAFromPixel()/viaPixelARGB8888() */
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-mach64-6.9.3/src/atiscreen.c new/xf86-video-mach64-6.9.4/src/atiscreen.c
--- old/xf86-video-mach64-6.9.3/src/atiscreen.c 2012-06-06 11:36:01.000000000 +0200
+++ new/xf86-video-mach64-6.9.4/src/atiscreen.c 2012-12-20 07:16:00.000000000 +0100
@@ -476,21 +476,11 @@
}
}
- /* If applicable, initialise RENDER extension */
+ /* initialise RENDER extension */
+ if (!fbPictureInit(pScreen, NULL, 0) && (serverGeneration == 1))
{
- if (pATI->OptionShadowFB)
- {
- if (serverGeneration == 1)
- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
- "RENDER extension not supported with a shadowed"
- " framebuffer.\n");
- }
- else if (!fbPictureInit(pScreen, NULL, 0) &&
- (serverGeneration == 1))
- {
- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
- "RENDER extension initialisation failed.\n");
- }
+ xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+ "RENDER extension initialisation failed.\n");
}
xf86SetBlackWhitePixels(pScreen);
@@ -542,7 +532,6 @@
#endif /* AVOID_DGA */
/* Initialise backing store */
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
/* Initialise cursor */
@@ -580,7 +569,7 @@
#ifdef TV_OUT
/* Fix-up TV out after ImpacTV probe */
if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO)
- ATISwitchMode(0, pScreenInfo->currentMode, 0);
+ ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode));
#endif /* TV_OUT */
#ifdef XF86DRI_DEVEL
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-mach64-6.9.3/src/atistruct.h new/xf86-video-mach64-6.9.4/src/atistruct.h
--- old/xf86-video-mach64-6.9.3/src/atistruct.h 2012-06-06 11:36:01.000000000 +0200
+++ new/xf86-video-mach64-6.9.4/src/atistruct.h 2012-12-20 07:16:00.000000000 +0100
@@ -51,6 +51,7 @@
#endif /* TV_OUT */
+#include "picturestr.h"
#ifdef USE_EXA
#include "exa.h"
#endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org