[arch-commits] Commit in xf86-video-sisusb/repos (8 files)
Laurent Carlier
lcarlier at archlinux.org
Fri Aug 11 09:39:58 UTC 2017
Date: Friday, August 11, 2017 @ 09:39:57
Author: lcarlier
Revision: 301899
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-video-sisusb/repos/extra-i686/PKGBUILD
(from rev 301898, xf86-video-sisusb/trunk/PKGBUILD)
xf86-video-sisusb/repos/extra-i686/git-fixes.patch
(from rev 301898, xf86-video-sisusb/trunk/git-fixes.patch)
xf86-video-sisusb/repos/extra-x86_64/PKGBUILD
(from rev 301898, xf86-video-sisusb/trunk/PKGBUILD)
xf86-video-sisusb/repos/extra-x86_64/git-fixes.patch
(from rev 301898, xf86-video-sisusb/trunk/git-fixes.patch)
Deleted:
xf86-video-sisusb/repos/extra-i686/PKGBUILD
xf86-video-sisusb/repos/extra-i686/git-fixes.patch
xf86-video-sisusb/repos/extra-x86_64/PKGBUILD
xf86-video-sisusb/repos/extra-x86_64/git-fixes.patch
------------------------------+
/PKGBUILD | 84 ++++++++++++++++++++++++++++
/git-fixes.patch | 122 +++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 34 -----------
extra-i686/git-fixes.patch | 61 --------------------
extra-x86_64/PKGBUILD | 34 -----------
extra-x86_64/git-fixes.patch | 61 --------------------
6 files changed, 206 insertions(+), 190 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-08-11 09:39:50 UTC (rev 301898)
+++ extra-i686/PKGBUILD 2017-08-11 09:39:57 UTC (rev 301899)
@@ -1,34 +0,0 @@
-# $Id$
-#Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-sisusb
-pkgver=0.9.6
-pkgrel=8
-pkgdesc="X.org SiS USB video driver"
-arch=(i686 x86_64)
-url="https://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
-conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
-sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
- '90c6c295107f0af0d3480d1731baac659448a573a06524e4d239ce0c64c08089')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/git-fixes.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-sisusb/repos/extra-i686/PKGBUILD (from rev 301898, xf86-video-sisusb/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-08-11 09:39:57 UTC (rev 301899)
@@ -0,0 +1,42 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-sisusb
+pkgver=0.9.6
+pkgrel=9
+pkgdesc="X.org SiS USB video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
+ '90c6c295107f0af0d3480d1731baac659448a573a06524e4d239ce0c64c08089')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
+ # With them, module fail to load with undefined symbol.
+ # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
+ export CFLAGS=${CFLAGS/-fno-plt}
+ export CXXFLAGS=${CXXFLAGS/-fno-plt}
+ export LDFLAGS=${LDFLAGS/,-z,now}
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: extra-i686/git-fixes.patch
===================================================================
--- extra-i686/git-fixes.patch 2017-08-11 09:39:50 UTC (rev 301898)
+++ extra-i686/git-fixes.patch 2017-08-11 09:39:57 UTC (rev 301899)
@@ -1,61 +0,0 @@
-From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Tue, 25 Sep 2012 12:54:52 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax at redhat.com>
----
-diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
-index 539b9f1..0fdc8e9 100644
---- a/src/sisusb_driver.c
-+++ b/src/sisusb_driver.c
-@@ -39,7 +39,6 @@
- #include "shadowfb.h"
- #include "micmap.h"
- #include "mipointer.h"
--#include "mibstore.h"
-
- #include "sisusb_regs.h"
- #include "sisusb_dac.h"
-@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL)
- /* Initialize the accelerators */
- SiSUSBAccelInit(pScreen);
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
-
- /* NO SilkenMouse. Never. Ever. */
---
-cgit v0.9.0.2-2-gbebe
-From e236d49a874cf5325f63e631a44edb037f74124a Mon Sep 17 00:00:00 2001
-From: Laurent Carlier <lordheavym at gmail.com>
-Date: Mon, 21 Nov 2016 14:13:23 +0100
-Subject: [PATCH] Adapt BlockHandler signature for ABI 23
-
-Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
----
- src/compat-api.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/compat-api.h b/src/compat-api.h
-index 6bc946f..89976e4 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -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
---
-2.10.2
-
-
Copied: xf86-video-sisusb/repos/extra-i686/git-fixes.patch (from rev 301898, xf86-video-sisusb/trunk/git-fixes.patch)
===================================================================
--- extra-i686/git-fixes.patch (rev 0)
+++ extra-i686/git-fixes.patch 2017-08-11 09:39:57 UTC (rev 301899)
@@ -0,0 +1,61 @@
+From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 12:54:52 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
+index 539b9f1..0fdc8e9 100644
+--- a/src/sisusb_driver.c
++++ b/src/sisusb_driver.c
+@@ -39,7 +39,6 @@
+ #include "shadowfb.h"
+ #include "micmap.h"
+ #include "mipointer.h"
+-#include "mibstore.h"
+
+ #include "sisusb_regs.h"
+ #include "sisusb_dac.h"
+@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL)
+ /* Initialize the accelerators */
+ SiSUSBAccelInit(pScreen);
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+
+ /* NO SilkenMouse. Never. Ever. */
+--
+cgit v0.9.0.2-2-gbebe
+From e236d49a874cf5325f63e631a44edb037f74124a Mon Sep 17 00:00:00 2001
+From: Laurent Carlier <lordheavym at gmail.com>
+Date: Mon, 21 Nov 2016 14:13:23 +0100
+Subject: [PATCH] Adapt BlockHandler signature for ABI 23
+
+Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
+---
+ src/compat-api.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -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
+--
+2.10.2
+
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-08-11 09:39:50 UTC (rev 301898)
+++ extra-x86_64/PKGBUILD 2017-08-11 09:39:57 UTC (rev 301899)
@@ -1,34 +0,0 @@
-# $Id$
-#Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xf86-video-sisusb
-pkgver=0.9.6
-pkgrel=8
-pkgdesc="X.org SiS USB video driver"
-arch=(i686 x86_64)
-url="https://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
-conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
-sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
- '90c6c295107f0af0d3480d1731baac659448a573a06524e4d239ce0c64c08089')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/git-fixes.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xf86-video-sisusb/repos/extra-x86_64/PKGBUILD (from rev 301898, xf86-video-sisusb/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-08-11 09:39:57 UTC (rev 301899)
@@ -0,0 +1,42 @@
+# $Id$
+#Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xf86-video-sisusb
+pkgver=0.9.6
+pkgrel=9
+pkgdesc="X.org SiS USB video driver"
+arch=(i686 x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
+ '90c6c295107f0af0d3480d1731baac659448a573a06524e4d239ce0c64c08089')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
+ # With them, module fail to load with undefined symbol.
+ # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
+ export CFLAGS=${CFLAGS/-fno-plt}
+ export CXXFLAGS=${CXXFLAGS/-fno-plt}
+ export LDFLAGS=${LDFLAGS/,-z,now}
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
Deleted: extra-x86_64/git-fixes.patch
===================================================================
--- extra-x86_64/git-fixes.patch 2017-08-11 09:39:50 UTC (rev 301898)
+++ extra-x86_64/git-fixes.patch 2017-08-11 09:39:57 UTC (rev 301899)
@@ -1,61 +0,0 @@
-From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Tue, 25 Sep 2012 12:54:52 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax at redhat.com>
----
-diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
-index 539b9f1..0fdc8e9 100644
---- a/src/sisusb_driver.c
-+++ b/src/sisusb_driver.c
-@@ -39,7 +39,6 @@
- #include "shadowfb.h"
- #include "micmap.h"
- #include "mipointer.h"
--#include "mibstore.h"
-
- #include "sisusb_regs.h"
- #include "sisusb_dac.h"
-@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL)
- /* Initialize the accelerators */
- SiSUSBAccelInit(pScreen);
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
-
- /* NO SilkenMouse. Never. Ever. */
---
-cgit v0.9.0.2-2-gbebe
-From e236d49a874cf5325f63e631a44edb037f74124a Mon Sep 17 00:00:00 2001
-From: Laurent Carlier <lordheavym at gmail.com>
-Date: Mon, 21 Nov 2016 14:13:23 +0100
-Subject: [PATCH] Adapt BlockHandler signature for ABI 23
-
-Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
----
- src/compat-api.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/compat-api.h b/src/compat-api.h
-index 6bc946f..89976e4 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -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
---
-2.10.2
-
-
Copied: xf86-video-sisusb/repos/extra-x86_64/git-fixes.patch (from rev 301898, xf86-video-sisusb/trunk/git-fixes.patch)
===================================================================
--- extra-x86_64/git-fixes.patch (rev 0)
+++ extra-x86_64/git-fixes.patch 2017-08-11 09:39:57 UTC (rev 301899)
@@ -0,0 +1,61 @@
+From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 12:54:52 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
+index 539b9f1..0fdc8e9 100644
+--- a/src/sisusb_driver.c
++++ b/src/sisusb_driver.c
+@@ -39,7 +39,6 @@
+ #include "shadowfb.h"
+ #include "micmap.h"
+ #include "mipointer.h"
+-#include "mibstore.h"
+
+ #include "sisusb_regs.h"
+ #include "sisusb_dac.h"
+@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL)
+ /* Initialize the accelerators */
+ SiSUSBAccelInit(pScreen);
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+
+ /* NO SilkenMouse. Never. Ever. */
+--
+cgit v0.9.0.2-2-gbebe
+From e236d49a874cf5325f63e631a44edb037f74124a Mon Sep 17 00:00:00 2001
+From: Laurent Carlier <lordheavym at gmail.com>
+Date: Mon, 21 Nov 2016 14:13:23 +0100
+Subject: [PATCH] Adapt BlockHandler signature for ABI 23
+
+Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
+---
+ src/compat-api.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -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
+--
+2.10.2
+
+
More information about the arch-commits
mailing list