Hello community,

here is the log from the commit of package xf86-video-sis for openSUSE:Factory 
checked in at 2015-02-10 20:17:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-sis (Old)
 and      /work/SRC/openSUSE:Factory/.xf86-video-sis.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xf86-video-sis"

Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-sis/xf86-video-sis.changes    
2013-08-23 11:09:50.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-video-sis.new/xf86-video-sis.changes       
2015-02-10 20:17:07.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Feb  6 13:27:22 UTC 2015 - sndir...@suse.com
+
+- U_sis-fix-build-against-latest-xserver.patch/
+  U_sis-more-build-fixes-against-master-X-server.patch
+  * fixes build against xorg-server 1.17 
+
+-------------------------------------------------------------------

New:
----
  U_sis-fix-build-against-latest-xserver.patch
  U_sis-more-build-fixes-against-master-X-server.patch

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

Other differences:
------------------
++++++ xf86-video-sis.spec ++++++
--- /var/tmp/diff_new_pack.x6N0TT/_old  2015-02-10 20:17:08.000000000 +0100
+++ /var/tmp/diff_new_pack.x6N0TT/_new  2015-02-10 20:17:08.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xf86-video-sis
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -28,6 +28,8 @@
 Patch1:         U_Remove-mibstore.h.patch
 Patch2:         U_Stop-including-xf86Priv.h.patch
 Patch3:         u_Fixed-build-with-INPUT_API-19.patch
+Patch4:         U_sis-fix-build-against-latest-xserver.patch
+Patch5:         U_sis-more-build-fixes-against-master-X-server.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontsproto)
@@ -63,6 +65,8 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %configure

++++++ U_sis-fix-build-against-latest-xserver.patch ++++++
>From d0550de19cacab3e591641ba358a72fbc798b231 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airl...@redhat.com>
Date: Mon, 22 Sep 2014 12:45:02 +1000
Subject: [PATCH] sis: fix build against latest xserver

---
 src/sis.h     | 2 ++
 src/vstruct.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/sis.h b/src/sis.h
index 20e6134..385b784 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -1004,7 +1004,9 @@ typedef struct {
     ScrnInfoPtr                pScrn;
     pciVideoPtr                PciInfo;
     int                        PciBus, PciDevice, PciFunc;
+#ifndef XSERVER_LIBPCIACCESS
     PCITAG             PciTag;
+#endif
     EntityInfoPtr      pEnt;
     int                        Chipset;
     unsigned char      ChipType;
diff --git a/src/vstruct.h b/src/vstruct.h
index 88f7eb6..5d7a98d 100644
--- a/src/vstruct.h
+++ b/src/vstruct.h
@@ -237,8 +237,10 @@ struct SiS_Private
        unsigned char                   ChipType;
        unsigned char                   ChipRevision;
 #ifdef SIS_XORG_XF86
+#ifndef XSERVER_LIBPCIACCESS
        PCITAG                          PciTag;
 #endif
+#endif
 #ifdef SIS_LINUX_KERNEL
        void                            *ivideo;
 #endif
-- 
1.8.4.5

++++++ U_sis-more-build-fixes-against-master-X-server.patch ++++++
>From d2597696ba81862d80ec17b978d8370c58572e27 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airl...@redhat.com>
Date: Wed, 12 Nov 2014 08:04:21 +1000
Subject: [PATCH] sis: more build fixes against master X server.

---
 src/sis_driver.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/sis_driver.c b/src/sis_driver.c
index bd9c4e1..125eee7 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -3279,9 +3279,11 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
     pSiS->PciDevice = PCI_CFG_DEV(pSiS->PciInfo); 
/*SIS_PCI_DEVICE(pSiS->PciInfo);*/
     pSiS->PciFunc = PCI_CFG_FUNC(pSiS->PciInfo);  
/*SIS_PCI_FUNC(pSiS->PciInfo);*/
 
+#ifndef XSERVER_LIBPCIACCESS
     pSiS->PciTag = pciTag(PCI_DEV_BUS(pSiS->PciInfo),
                          PCI_DEV_DEV(pSiS->PciInfo),
                          PCI_DEV_FUNC(pSiS->PciInfo));
+#endif
 
 #ifdef SIS_NEED_MAP_IOP
     /********************************************/
@@ -3905,7 +3907,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
        if(pSiSEnt) pSiSEnt->SiS_Pr = pSiS->SiS_Pr;
 #endif
        memset(pSiS->SiS_Pr, 0, sizeof(struct SiS_Private));
+#ifndef XSERVER_LIBPCIACCESS
        pSiS->SiS_Pr->PciTag = pSiS->PciTag;
+#endif
        pSiS->SiS_Pr->ChipType = pSiS->ChipType;
        pSiS->SiS_Pr->ChipRevision = pSiS->ChipRev;
        pSiS->SiS_Pr->SiS_Backup70xx = 0xff;
@@ -7134,7 +7138,9 @@ static Bool
 SISMapMem(ScrnInfoPtr pScrn)
 {
     SISPtr pSiS = SISPTR(pScrn);
+#ifndef XSERVER_LIBPCIACCESS
     int mmioFlags = VIDMEM_MMIO;
+#endif
 #ifdef SISDUALHEAD
     SISEntPtr pSiSEnt = pSiS->entityPrivate;
 #endif
@@ -7144,9 +7150,11 @@ SISMapMem(ScrnInfoPtr pScrn)
      * (For Alpha, we need to map SPARSE memory, since we need
      * byte/short access.)
      */
+#ifndef XSERVER_LIBPCIACCESS
 #if defined(__alpha__)
     mmioFlags |= VIDMEM_SPARSE;
 #endif
+#endif
 
 #ifdef SISDUALHEAD
     if(pSiS->DualHeadMode) {
@@ -14017,6 +14025,7 @@ SiS_GetSetBIOSScratch(ScrnInfoPtr pScrn, UShort offset, 
UChar value)
        break;
     }
 
+#ifndef XSERVER_LIBPCIACCESS
 #ifdef SIS_USE_BIOS_SCRATCH
     if(SISPTR(pScrn)->Primary) {
        base = xf86MapVidMem(pScrn->scrnIndex, VIDMEM_MMIO, 0, 0x2000);
@@ -14035,6 +14044,7 @@ SiS_GetSetBIOSScratch(ScrnInfoPtr pScrn, UShort offset, 
UChar value)
        xf86UnMapVidMem(pScrn->scrnIndex, base, 0x2000);
     }
 #endif
+#endif
     return ret;
 }
 
-- 
1.8.4.5

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

Reply via email to