diff options
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | 0001-Remove-call-to-LoaderGetOS.patch | 48 | ||||
-rw-r--r-- | 0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch | 30 | ||||
-rw-r--r-- | PKGBUILD | 21 |
4 files changed, 103 insertions, 11 deletions
@@ -1,22 +1,25 @@ -# Generated by mksrcinfo v8 -# Thu Jan 12 08:28:07 UTC 2017 pkgbase = xf86-video-geode pkgdesc = Xorg X11 Geode video driver pkgver = 2.11.19 - pkgrel = 2 + pkgrel = 3 url = http://www.x.org arch = i686 groups = xorg-drivers license = MIT makedepends = xorg-server-devel - makedepends = X-ABI-VIDEODRV_VERSION=23 + makedepends = X-ABI-VIDEODRV_VERSION=24.0 conflicts = xf86-video-geode-git - conflicts = X-ABI-VIDEODRV_VERSION<23 - conflicts = X-ABI-VIDEODRV_VERSION>=24 + conflicts = X-ABI-VIDEODRV_VERSION<24 + conflicts = X-ABI-VIDEODRV_VERSION>=25 source = http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.11.19.tar.bz2 source = http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.11.19.tar.bz2.sig + source = 0001-Remove-call-to-LoaderGetOS.patch + source = 0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch + validpgpkeys = C89002C77A8BEC6A4E6D7390AE1F8277C4B4D7B6 sha256sums = c6694c21ee3d9560f6e925925ef1d3818b1988e899b6a0592dbae597c87ac97e sha256sums = SKIP + sha256sums = 6b5df7020c88e61ca098677cc8621cd985cc8131f17e48f8be826ccda8e738ee + sha256sums = c27fb4f6479b7f93ea46107612c21ac495ef7372e6c483c79ca4934468afab94 pkgname = xf86-video-geode diff --git a/0001-Remove-call-to-LoaderGetOS.patch b/0001-Remove-call-to-LoaderGetOS.patch new file mode 100644 index 000000000000..44d47ccd6b4e --- /dev/null +++ b/0001-Remove-call-to-LoaderGetOS.patch @@ -0,0 +1,48 @@ +From 09aaa3d1fae4aeb099b16e7a046151761bcdea95 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 24 Jan 2017 09:53:06 -0500 +Subject: [PATCH] Remove call to LoaderGetOS + +On OSes that don't have a /dev/videox we'll just fail the open() and not +initialize the Xv adaptor. + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + src/z4l.c | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/src/z4l.c b/src/z4l.c +index eccefe8..be0d345 100644 +--- a/src/z4l.c ++++ b/src/z4l.c +@@ -1709,7 +1709,6 @@ _X_EXPORT XF86ModuleData ztvModuleData = { &z4lVersionRec, z4lSetup, NULL }; + static pointer + z4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) + { +- const char *osname; + static Bool setupDone = FALSE; + + if (setupDone != FALSE) { +@@ -1719,19 +1718,7 @@ z4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) + } + + setupDone = TRUE; +- LoaderGetOS(&osname, NULL, NULL, NULL); +- +- if (osname == NULL || strcmp(osname, "linux") != 0) { +- if (errmaj) +- *errmaj = LDR_BADOS; +- if (errmin) +- *errmin = 0; +- +- return NULL; +- } +- + xf86AddDriver(&Z4l, module, 0); +- + return (pointer) 1; + } + +-- +2.1.4 + diff --git a/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch b/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch new file mode 100644 index 000000000000..92bd545311e5 --- /dev/null +++ b/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch @@ -0,0 +1,30 @@ +From 8382e6bb0c76a8029493eae3f2d7a3dbfd0cfc12 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Mon, 5 Mar 2018 10:28:15 -0500 +Subject: [PATCH] gx: Fix RANDR initialization for xserver 1.20 + +xf86DisableRandR() doesn't exist anymore, and we don't need it anyway, +the core code will notice that we set up RANDR ourselves. + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + src/gx_driver.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gx_driver.c b/src/gx_driver.c +index ab57df1..4de336e 100644 +--- a/src/gx_driver.c ++++ b/src/gx_driver.c +@@ -1426,7 +1426,9 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL) + + /* Set up RandR */ + ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24 + xf86DisableRandR(); /* We provide our own RandR goodness */ ++#endif + + /* Try to set up the shadow FB for rotation */ + +-- +2.11.0 + @@ -2,18 +2,29 @@ pkgname=xf86-video-geode pkgver=2.11.19 -pkgrel=2 +pkgrel=3 pkgdesc='Xorg X11 Geode video driver' arch=('i686') url='http://www.x.org' license=('MIT') groups=('xorg-drivers') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23') -conflicts=('xf86-video-geode-git' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=24.0') +conflicts=('xf86-video-geode-git' 'X-ABI-VIDEODRV_VERSION<24' 'X-ABI-VIDEODRV_VERSION>=25') validpgpkeys=('C89002C77A8BEC6A4E6D7390AE1F8277C4B4D7B6') -source=("http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2"{,.sig}) +source=("http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2"{,.sig} + '0001-Remove-call-to-LoaderGetOS.patch' + '0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch') sha256sums=('c6694c21ee3d9560f6e925925ef1d3818b1988e899b6a0592dbae597c87ac97e' - 'SKIP') + 'SKIP' + '6b5df7020c88e61ca098677cc8621cd985cc8131f17e48f8be826ccda8e738ee' + 'c27fb4f6479b7f93ea46107612c21ac495ef7372e6c483c79ca4934468afab94') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}/" + + patch -Np1 < ../0001-Remove-call-to-LoaderGetOS.patch + patch -Np1 < ../0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}/" |