Hello community,
here is the log from the commit of package xf86-video-siliconmotion for
openSUSE:Factory checked in at 2017-01-24 10:35:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-siliconmotion (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-siliconmotion.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-siliconmotion"
Changes:
--------
---
/work/SRC/openSUSE:Factory/xf86-video-siliconmotion/xf86-video-siliconmotion.changes
2016-12-02 16:42:59.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.xf86-video-siliconmotion.new/xf86-video-siliconmotion.changes
2017-01-24 10:36:00.348223994 +0100
@@ -1,0 +2,8 @@
+Thu Jan 19 14:03:11 UTC 2017 - sndir...@suse.com
+
+- Update to version 1.7.9
+ * Adapt Block/WakeupHandler signature for ABI 23
+ * Check for drawables before compositing
+ * Use X11/Xarch.h for endian detection.
+
+-------------------------------------------------------------------
Old:
----
U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
xf86-video-siliconmotion-1.7.8.tar.bz2
xf86-video-siliconmotion-1.7.8.tar.bz2.sig
New:
----
xf86-video-siliconmotion-1.7.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-siliconmotion.spec ++++++
--- /var/tmp/diff_new_pack.urRG1d/_old 2017-01-24 10:36:00.792160933 +0100
+++ /var/tmp/diff_new_pack.urRG1d/_new 2017-01-24 10:36:00.792160933 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xf86-video-siliconmotion
#
-# 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,16 +17,15 @@
Name: xf86-video-siliconmotion
-Version: 1.7.8
+Version: 1.7.9
Release: 0
Summary: Silicon Motion 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
-Source1:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2.sig
+#Source1:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2.sig
Source2: %{name}.keyring
-Patch0: U_Adapt-Block-WakeupHandler-signature-for-ABI-23.patch
BuildRequires: pkg-config
BuildRequires: pkgconfig(fontsproto)
BuildRequires: pkgconfig(pciaccess) >= 0.8.0
@@ -53,7 +52,6 @@
%prep
%setup -q
-%patch0 -p1
%build
%configure
++++++ xf86-video-siliconmotion-1.7.8.tar.bz2 ->
xf86-video-siliconmotion-1.7.9.tar.bz2 ++++++
++++ 21912 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-siliconmotion-1.7.8/ChangeLog
new/xf86-video-siliconmotion-1.7.9/ChangeLog
--- old/xf86-video-siliconmotion-1.7.8/ChangeLog 2015-05-09
16:59:11.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.9/ChangeLog 2017-01-17
23:45:10.000000000 +0100
@@ -1,3 +1,38 @@
+commit d269962724b57e21142c9e1c6631a45a46d87b47
+Author: Matt Turner <matts...@gmail.com>
+Date: Tue Jan 17 14:44:51 2017 -0800
+
+ xf86-video-siliconmotion 1.7.9
+
+ Signed-off-by: Matt Turner <matts...@gmail.com>
+
+commit e67f3949648c20e16ac756ae28ea4a2b4a1d0f4c
+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 647e5a93d9387e3bc8d2c8569e3a5f996acfb169
+Author: Thomas Klausner <w...@netbsd.org>
+Date: Mon Sep 14 18:36:32 2015 +0200
+
+ Use X11/Xarch.h for endian detection.
+
+ Reviewed-by: Connor Behan <connor.be...@gmail.com>
+
+commit a4e406c20ab0590214f779c2319ac7b92594a606
+Author: Connor Behan <connor.be...@gmail.com>
+Date: Sun Aug 23 11:46:37 2015 -0400
+
+ Check for drawables before compositing
+
+ This should prevent a crash when something like Cairo tries to composite
+ a solid picture.
+
+ Signed-off-by: Connor Behan <connor.be...@gmail.com>
+
commit 70d3d3a384651e5d22840a0de8644eb8b10c5775
Author: Julien Cristau <jcris...@debian.org>
Date: Sat May 9 16:56:51 2015 +0200
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-siliconmotion-1.7.8/compile
new/xf86-video-siliconmotion-1.7.9/compile
--- old/xf86-video-siliconmotion-1.7.8/compile 2015-05-08 13:10:00.000000000
+0200
+++ new/xf86-video-siliconmotion-1.7.9/compile 2017-01-17 23:45:06.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-siliconmotion-1.7.8/config.h.in
new/xf86-video-siliconmotion-1.7.9/config.h.in
--- old/xf86-video-siliconmotion-1.7.8/config.h.in 2015-05-09
16:58:55.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.9/config.h.in 2017-01-17
23:45:05.000000000 +0100
@@ -41,8 +41,7 @@
/* X server has new mode code */
#undef HAVE_XMODES
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Name of 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-siliconmotion-1.7.8/configure.ac
new/xf86-video-siliconmotion-1.7.9/configure.ac
--- old/xf86-video-siliconmotion-1.7.8/configure.ac 2015-05-09
16:55:37.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.9/configure.ac 2017-01-17
23:44:47.000000000 +0100
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-siliconmotion],
- [1.7.8],
+ [1.7.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion],
[xf86-video-siliconmotion])
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-siliconmotion-1.7.8/missing
new/xf86-video-siliconmotion-1.7.9/missing
--- old/xf86-video-siliconmotion-1.7.8/missing 2015-05-08 13:10:00.000000000
+0200
+++ new/xf86-video-siliconmotion-1.7.9/missing 2017-01-17 23:45:06.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-siliconmotion-1.7.8/src/compat-api.h
new/xf86-video-siliconmotion-1.7.9/src/compat-api.h
--- old/xf86-video-siliconmotion-1.7.8/src/compat-api.h 2015-05-08
13:08:17.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.9/src/compat-api.h 2017-01-17
23:44:39.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-siliconmotion-1.7.8/src/smi.h
new/xf86-video-siliconmotion-1.7.9/src/smi.h
--- old/xf86-video-siliconmotion-1.7.8/src/smi.h 2015-05-09
16:50:17.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.9/src/smi.h 2016-02-23
08:27:43.000000000 +0100
@@ -34,6 +34,7 @@
#include <string.h>
#include <stdio.h>
+#include <X11/Xarch.h>
#include "xf86.h"
#include "xf86_OSproc.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-siliconmotion-1.7.8/src/smi_driver.c
new/xf86-video-siliconmotion-1.7.9/src/smi_driver.c
--- old/xf86-video-siliconmotion-1.7.8/src/smi_driver.c 2015-05-09
16:50:17.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.9/src/smi_driver.c 2016-02-23
08:27:43.000000000 +0100
@@ -487,7 +487,7 @@
if (pScrn->depth > 8) {
/* The defaults are OK for us */
rgb zeros = {0, 0, 0};
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if X_BYTE_ORDER == X_BIG_ENDIAN
rgb masks = {0xff00,0xff0000,0xff000000};
#else
rgb masks = {0, 0, 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-siliconmotion-1.7.8/src/smi_exa.c
new/xf86-video-siliconmotion-1.7.9/src/smi_exa.c
--- old/xf86-video-siliconmotion-1.7.8/src/smi_exa.c 2015-05-08
13:08:17.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.9/src/smi_exa.c 2016-02-23
08:27:43.000000000 +0100
@@ -623,6 +623,10 @@
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
+
+ if (!pSrc) return FALSE;
+ if (!pSrcPicture->pDrawable) return FALSE;
+
int src_pitch = exaGetPixmapPitch(pSrc) / (pSrc->drawable.bitsPerPixel >>
3);
int dst_pitch = exaGetPixmapPitch(pDst) / (pDst->drawable.bitsPerPixel >>
3);
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-siliconmotion-1.7.8/src/smi_xaa.c
new/xf86-video-siliconmotion-1.7.9/src/smi_xaa.c
--- old/xf86-video-siliconmotion-1.7.8/src/smi_xaa.c 2015-05-08
13:08:17.000000000 +0200
+++ new/xf86-video-siliconmotion-1.7.9/src/smi_xaa.c 2016-02-23
08:27:43.000000000 +0100
@@ -211,7 +211,7 @@
ENTER();
DEBUG("xdir=%d ydir=%d rop=%02X trans=%08X\n", xdir, ydir, rop, trans);
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if X_BYTE_ORDER == X_BIG_ENDIAN
if (pScrn->depth >= 24)
trans = lswapl(trans);
#endif
@@ -296,7 +296,7 @@
| SMI_BITBLT
| SMI_START_ENGINE;
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if X_BYTE_ORDER == X_BIG_ENDIAN
if (pScrn->depth >= 24) {
/* because of the BGR values are in the MSB bytes,
* 'white' is not possible and -1 has a different meaning.
@@ -408,7 +408,7 @@
ENTER();
DEBUG("fg=%08X bg=%08X rop=%02X\n", fg, bg, rop);
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if X_BYTE_ORDER == X_BIG_ENDIAN
if (pScrn->depth >= 24) {
/* see remark elswere */
if (fg == 0x7FFFFFFF)
@@ -431,7 +431,7 @@
WRITE_DPR(pSmi, 0x18, ~fg);
WRITE_DPR(pSmi, 0x20, fg);
} else {
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if X_BYTE_ORDER == X_BIG_ENDIAN
if (bg == 0xFFFFFF7F)
bg = -1;
#endif
@@ -498,7 +498,7 @@
DEBUG("patx=%08X paty=%08X fg=%08X bg=%08X rop=%02X\n",
patx, paty, fg, bg, rop);
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if X_BYTE_ORDER == X_BIG_ENDIAN
if (pScrn->depth >= 24) {
if (fg == 0x7FFFFFFF)
fg = -1;
@@ -524,7 +524,7 @@
WRITE_DPR(pSmi, 0x34, patx);
WRITE_DPR(pSmi, 0x38, paty);
} else {
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if X_BYTE_ORDER == X_BIG_ENDIAN
if (bg == 0xFFFFFF7F)
bg = -1;
#endif
@@ -582,7 +582,7 @@
| SMI_COLOR_PATTERN
| SMI_START_ENGINE;
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if X_BYTE_ORDER == X_BIG_ENDIAN
if (pScrn->depth >= 24)
trans_color = lswapl(trans_color);
#endif
@@ -666,7 +666,7 @@
DEBUG("rop=%02X trans_color=%08X bpp=%d depth=%d\n",
rop, trans_color, bpp, depth);
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if X_BYTE_ORDER == X_BIG_ENDIAN
if (pScrn->depth >= 24)
trans_color = lswapl(trans_color);
#endif
@@ -675,7 +675,7 @@
| SMI_START_ENGINE;
if (trans_color != -1) {
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if X_BYTE_ORDER == X_BIG_ENDIAN
if (trans_color == 0xFFFFFF7F)
trans_color = -1;
#endif
