Hello community,

here is the log from the commit of package xf86-video-r128 for openSUSE:Factory 
checked in at 2017-01-23 11:22:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-r128 (Old)
 and      /work/SRC/openSUSE:Factory/.xf86-video-r128.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xf86-video-r128"

Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-r128/xf86-video-r128.changes  
2016-12-06 14:22:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xf86-video-r128.new/xf86-video-r128.changes     
2017-01-23 11:22:34.655898139 +0100
@@ -1,0 +2,9 @@
+Thu Jan 19 14:57:19 UTC 2017 - sndir...@suse.com
+
+- Update to version 6.10.2
+  * Adapt Block/WakeupHandler signature for ABI 23
+  * Remove gatos advertisement
+  * xextproto 7.1 support update to the source code
+- supersedes  U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch 
+
+-------------------------------------------------------------------

Old:
----
  U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
  xf86-video-r128-6.10.1.tar.bz2

New:
----
  xf86-video-r128-6.10.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xf86-video-r128.spec ++++++
--- /var/tmp/diff_new_pack.bgu9Aw/_old  2017-01-23 11:22:35.011847606 +0100
+++ /var/tmp/diff_new_pack.bgu9Aw/_new  2017-01-23 11:22:35.011847606 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xf86-video-r128
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,13 @@
 
 
 Name:           xf86-video-r128
-Version:        6.10.1
+Version:        6.10.2
 Release:        0
 Summary:        ATI Rage 128 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_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontsproto)
@@ -59,7 +58,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure

++++++ xf86-video-r128-6.10.1.tar.bz2 -> xf86-video-r128-6.10.2.tar.bz2 ++++++
++++ 2005 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-r128-6.10.1/ChangeLog new/xf86-video-r128-6.10.2/ChangeLog
--- old/xf86-video-r128-6.10.1/ChangeLog        2016-01-22 04:45:44.000000000 
+0100
+++ new/xf86-video-r128-6.10.2/ChangeLog        2017-01-17 23:43:38.000000000 
+0100
@@ -1,3 +1,43 @@
+commit b93b78f41154d24371acb1081c423351e8f370fd
+Author: Matt Turner <matts...@gmail.com>
+Date:   Tue Jan 17 14:43:12 2017 -0800
+
+    xf86-video-r128 6.10.2
+    
+    Signed-off-by: Matt Turner <matts...@gmail.com>
+
+commit 5ab23b3a8ef18ab9ff96ac8be174380d36e185e5
+Author: Adam Jackson <a...@redhat.com>
+Date:   Tue Jul 19 10:03:56 2016 -0400
+
+    Adapt Block/WakeupHandler signature for ABI 23
+    
+    Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit a589dd6baf7fa26f8ea7008ba6bd533a5ba3e76e
+Author: Connor Behan <connor.be...@gmail.com>
+Date:   Wed Apr 13 12:41:00 2016 -0400
+
+    Remove gatos advertisement
+    
+    There are many current working ways to use a TV tuner with Linux. This
+    is not one of them.
+    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=94915
+    
+    Signed-off-by: Connor Behan <connor.be...@gmail.com>
+
+commit 3328547c840664896c12d0fd2db8f63e3a398a62
+Author: Kevin Brace <kevinbr...@gmx.com>
+Date:   Wed Mar 16 18:59:23 2016 -0700
+
+    xextproto 7.1 support update to the source code
+    
+    While the compilation script was updated, for some reason, the source
+    code did not get the update.
+    
+    Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
+    Reviewed-by: Connor Behan <connor.be...@gmail.com>
+
 commit d3f3c9549119629ddd9447a0f9b699a909b916d5
 Author: Connor Behan <connor.be...@gmail.com>
 Date:   Thu Jan 21 22:12:25 2016 -0500
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-r128-6.10.1/compile new/xf86-video-r128-6.10.2/compile
--- old/xf86-video-r128-6.10.1/compile  2014-10-01 03:49:39.000000000 +0200
+++ new/xf86-video-r128-6.10.2/compile  2017-01-17 23:43:34.000000000 +0100
@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tro...@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
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-r128-6.10.1/configure.ac new/xf86-video-r128-6.10.2/configure.ac
--- old/xf86-video-r128-6.10.1/configure.ac     2016-01-22 04:11:55.000000000 
+0100
+++ new/xf86-video-r128-6.10.2/configure.ac     2017-01-17 23:43:10.000000000 
+0100
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-r128],
-        [6.10.1],
+        [6.10.2],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-r128])
 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-r128-6.10.1/missing new/xf86-video-r128-6.10.2/missing
--- old/xf86-video-r128-6.10.1/missing  2014-10-01 03:49:40.000000000 +0200
+++ new/xf86-video-r128-6.10.2/missing  2017-01-17 23:43:34.000000000 +0100
@@ -3,7 +3,7 @@
 
 scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
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-r128-6.10.1/src/compat-api.h 
new/xf86-video-r128-6.10.2/src/compat-api.h
--- old/xf86-video-r128-6.10.1/src/compat-api.h 2014-10-01 03:49:41.000000000 
+0200
+++ new/xf86-video-r128-6.10.2/src/compat-api.h 2017-01-17 23:42:44.000000000 
+0100
@@ -75,8 +75,13 @@
 
 #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
 
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
+#define BLOCKHANDLER_ARGS arg, pTimeout
+#else
 #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer 
pReadmask
 #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+#endif
 
 #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
 #define CLOSE_SCREEN_ARGS 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-r128-6.10.1/src/r128_crtc.c 
new/xf86-video-r128-6.10.2/src/r128_crtc.c
--- old/xf86-video-r128-6.10.1/src/r128_crtc.c  2015-03-02 21:28:06.000000000 
+0100
+++ new/xf86-video-r128-6.10.2/src/r128_crtc.c  2017-01-17 23:42:44.000000000 
+0100
@@ -35,7 +35,13 @@
 
 #include "xf86.h"
 #include "xf86Modes.h"
+
+#ifdef HAVE_XEXTPROTO_71
 #include "X11/extensions/dpmsconst.h"
+#else
+#define DPMS_SERVER
+#include "X11/extensions/dpms.h"
+#endif
 
 #include "r128.h"
 #include "r128_probe.h"
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-r128-6.10.1/src/r128_driver.c 
new/xf86-video-r128-6.10.2/src/r128_driver.c
--- old/xf86-video-r128-6.10.1/src/r128_driver.c        2015-03-24 
02:45:07.000000000 +0100
+++ new/xf86-video-r128-6.10.2/src/r128_driver.c        2017-01-17 
23:42:44.000000000 +0100
@@ -1435,10 +1435,6 @@
     if (info->MMIO) R128UnmapMMIO(pScrn);
     info->MMIO = NULL;
 
-    xf86DrvMsg(pScrn->scrnIndex, X_NOTICE,
-       "For information on using the multimedia capabilities\n\tof this"
-       " adapter, please see http://gatos.sf.net.\n";);
-
     return TRUE;
 
   fail:
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-r128-6.10.1/src/r128_output.c 
new/xf86-video-r128-6.10.2/src/r128_output.c
--- old/xf86-video-r128-6.10.1/src/r128_output.c        2016-01-17 
22:44:52.000000000 +0100
+++ new/xf86-video-r128-6.10.2/src/r128_output.c        2017-01-17 
23:42:44.000000000 +0100
@@ -35,7 +35,13 @@
 
 #include "xf86.h"
 #include "xf86Modes.h"
+
+#ifdef HAVE_XEXTPROTO_71
 #include "X11/extensions/dpmsconst.h"
+#else
+#define DPMS_SERVER
+#include "X11/extensions/dpms.h"
+#endif
 
 #include "r128.h"
 #include "r128_probe.h"


Reply via email to