Hello community,

here is the log from the commit of package xf86-video-sis for openSUSE:Factory 
checked in at 2013-04-08 15:04:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-sis (Old)
 and      /work/SRC/openSUSE:Factory/.xf86-video-sis.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xf86-video-sis", Maintainer is ""

Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-sis/xf86-video-sis.changes    
2012-09-15 17:31:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-video-sis.new/xf86-video-sis.changes       
2013-04-08 15:04:23.000000000 +0200
@@ -1,0 +2,16 @@
+Sun Apr  7 11:36:06 UTC 2013 - sndir...@suse.com
+
+- u_Fixed-build-with-INPUT_API-19.patch
+  * Added dummy parameters to miPointerSetPosition(...) to fix
+    build with INPUT_API >= 19.
+
+-------------------------------------------------------------------
+Thu Mar 21 14:54:10 UTC 2013 - sndir...@suse.com
+
+- Add mibstore.patch, fixes build with xorg-server 1.14 
+- Replace xf86UnMapVidMem with pci_device_unmap_range
+- Stop including xf86Priv.h
+- introduce hardware supplements conditional on xorg-x11-server
+  package (bnc#810333) 
+
+-------------------------------------------------------------------

New:
----
  U_Remove-mibstore.h.patch
  U_Replace-xf86UnMapVidMem-with-pci_device_unmap_range.patch
  U_Stop-including-xf86Priv.h.patch
  u_Fixed-build-with-INPUT_API-19.patch

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

Other differences:
------------------
++++++ xf86-video-sis.spec ++++++
--- /var/tmp/diff_new_pack.sEGA86/_old  2013-04-08 15:04:24.000000000 +0200
+++ /var/tmp/diff_new_pack.sEGA86/_new  2013-04-08 15:04:24.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package xf86-video-sis
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,10 @@
 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_Replace-xf86UnMapVidMem-with-pci_device_unmap_range.patch
+Patch1:         U_Remove-mibstore.h.patch
+Patch2:         U_Stop-including-xf86Priv.h.patch
+Patch3:         u_Fixed-build-with-INPUT_API-19.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontsproto)
@@ -39,7 +43,7 @@
 BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 BuildRequires:  pkgconfig(xorg-server) >= 1.0.99.901
 BuildRequires:  pkgconfig(xproto)
-Supplements:    xorg-x11-server
+Supplements:    modalias(xorg-x11-server:pci:v00001039d*sv*sd*bc03sc*i*)
 # This was part of the xorg-x11-driver-video package up to version 7.6
 Conflicts:      xorg-x11-driver-video <= 7.6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -54,6 +58,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %configure

++++++ U_Remove-mibstore.h.patch ++++++
>From 926d4f655c8491b68a338f50c810f6729686ec9f Mon Sep 17 00:00:00 2001
From: Adam Jackson <a...@redhat.com>
Date: Tue, 25 Sep 2012 08:54:51 -0400
Subject: [PATCH] Remove mibstore.h

Signed-off-by: Adam Jackson <a...@redhat.com>
---
 src/sis_driver.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/src/sis_driver.c b/src/sis_driver.c
index 4c9b9cb..46cfefd 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -57,7 +57,6 @@
 #include "fb.h"
 #include "micmap.h"
 #include "mipointer.h"
-#include "mibstore.h"
 #include "edid.h"
 
 #define SIS_NEED_inSISREG
@@ -8883,7 +8882,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
     }
     pSiS->SiSFastVidCopyDone = TRUE;
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 
-- 
1.7.10.4

++++++ U_Replace-xf86UnMapVidMem-with-pci_device_unmap_range.patch ++++++
>From 339fb3bc032b9f35b07b90480ae82a0fd352e078 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <j...@jannet.de>
Date: Thu, 30 Aug 2012 20:09:10 +0200
Subject: [PATCH] Replace xf86UnMapVidMem with pci_device_unmap_range

Mixing pci_device_map_range with xf86UnMapVidMem doesn't work too well.

X.Org bug#18028 <https://bugs.freedesktop.org/show_bug.cgi?id=18028>

Bug found by Bryan Henderson <bry...@giraffe-data.com>

Signed-off-by: Julien Cristau <jcris...@debian.org>
---
 src/sis_driver.c |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/sis_driver.c b/src/sis_driver.c
index 61e8075..4c9b9cb 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -7344,7 +7344,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
         if(pSiSEnt->MapCountIOBase) {
            pSiSEnt->MapCountIOBase--;
            if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) {
+#ifndef XSERVER_LIBPCIACCESS
                xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, 
(pSiS->mmioSize * 1024));
+#else
+               pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, 
(pSiS->mmioSize * 1024));
+#endif
                pSiSEnt->IOBase = NULL;
                pSiSEnt->MapCountIOBase = 0;
                pSiSEnt->forceUnmapIOBase = FALSE;
@@ -7355,7 +7359,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
        if(pSiSEnt->MapCountIOBaseDense) {
            pSiSEnt->MapCountIOBaseDense--;
            if((pSiSEnt->MapCountIOBaseDense == 0) || 
(pSiSEnt->forceUnmapIOBaseDense)) {
+#ifndef XSERVER_LIBPCIACCESS
                xf86UnMapVidMem(pScrn->scrnIndex, 
(pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
+#else
+               pci_device_unmap_range(pSiS->PciInfo, 
(pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
+#endif
                pSiSEnt->IOBaseDense = NULL;
                pSiSEnt->MapCountIOBaseDense = 0;
                pSiSEnt->forceUnmapIOBaseDense = FALSE;
@@ -7366,7 +7374,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
        if(pSiSEnt->MapCountFbBase) {
            pSiSEnt->MapCountFbBase--;
            if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) {
+#ifndef XSERVER_LIBPCIACCESS
                xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, 
pSiS->FbMapSize);
+#else
+               pci_device_unmap_range(pSiS->PciInfo, 
(pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
+#endif
                pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL;
                pSiSEnt->MapCountFbBase = 0;
                pSiSEnt->forceUnmapFbBase = FALSE;
@@ -7376,13 +7388,25 @@ SISUnmapMem(ScrnInfoPtr pScrn)
        }
     } else {
 #endif
+#ifndef XSERVER_LIBPCIACCESS
        xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, 
(pSiS->mmioSize * 1024));
+#else
+       pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBase, 
(pSiS->mmioSize * 1024));
+#endif
        pSiS->IOBase = NULL;
 #ifdef __alpha__
+#ifndef XSERVER_LIBPCIACCESS
        xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, 
(pSiS->mmioSize * 1024));
+#else
+       pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, 
(pSiS->mmioSize * 1024));
+#endif
        pSiS->IOBaseDense = NULL;
 #endif
+#ifndef XSERVER_LIBPCIACCESS
        xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, 
pSiS->FbMapSize);
+#else
+       pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->RealFbBase, 
pSiS->FbMapSize);
+#endif
        pSiS->FbBase = pSiS->RealFbBase = NULL;
 #ifdef SISDUALHEAD
     }
-- 
1.7.10.4

++++++ U_Stop-including-xf86Priv.h.patch ++++++
>From 7d4402786b758de3e6ce2641e15a39d612d5c518 Mon Sep 17 00:00:00 2001
From: Adam Jackson <a...@redhat.com>
Date: Mon, 15 Oct 2012 19:11:30 -0400
Subject: [PATCH] Stop including xf86Priv.h

As the name might suggest, it's server-private.

Signed-off-by: Adam Jackson <a...@redhat.com>
---
 src/sis.h        |    1 -
 src/sis_driver.c |    4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/sis.h b/src/sis.h
index 46fca2a..20e6134 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -75,7 +75,6 @@
 
 #include "compiler.h"
 #include "xf86Pci.h"
-#include "xf86Priv.h"
 #include "xf86_OSproc.h"
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 46cfefd..cefe503 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -93,6 +93,10 @@
 #include "dri.h"
 #endif
 
+#ifndef DEFAULT_DPI
+#define DEFAULT_DPI 96
+#endif
+
 /*
  * LookupWindow was removed with video abi 11.
  */
-- 
1.7.10.4

++++++ u_Fixed-build-with-INPUT_API-19.patch ++++++
>From 05d3f172983829a0816bf12b1ff13fb54a98f7bd Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndir...@suse.de>
Date: Sun, 7 Apr 2013 13:31:21 +0200
Subject: [PATCH] Fixed build with INPUT_API >= 19

Added dummy parameters to miPointerSetPosition(...) to fix build with
INPUT_API >=19.
---
 src/sis_driver.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/sis_driver.c b/src/sis_driver.c
index cefe503..069a82b 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -9378,7 +9378,17 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
      }
      if(doit) {
        sigstate = xf86BlockSIGIO();
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 19
+        {
+            double dx = x, dy = y;
+            int nevents;
+            InternalEvent *events;
+            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy,
+                                &nevents, events);
+            x = (int)dx;
+            y = (int)dy;
+        }
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
         {
             double dx = x, dy = y;
             miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);
-- 
1.7.10.4

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to