From 7028dfc12513746bd81e90bc03e5093f917f90fe Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 15 Oct 2017 09:16:17 +0200 Subject: xf86-video-geode: update to 2.11.19 --- package/xf86-video-geode/Makefile | 6 ++--- .../patches/patch-src_compat-api_h | 30 ---------------------- 2 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 package/xf86-video-geode/patches/patch-src_compat-api_h (limited to 'package/xf86-video-geode') diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile index 4b62aeb78..cb0322568 100644 --- a/package/xf86-video-geode/Makefile +++ b/package/xf86-video-geode/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xf86-video-geode -PKG_VERSION:= 2.11.18 +PKG_VERSION:= 2.11.19 PKG_RELEASE:= 1 -PKG_HASH:= 60df188a72ef2b337e6cbc73684edf04b75fe4dd20555460005e1a19814b9046 +PKG_HASH:= 46ef4e23eaf91abc48ffad394ec6479bf60b2482eded8803d6af93f4ccf51aed PKG_DESCR:= x11 driver for amd geode vga chip PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server @@ -14,7 +14,7 @@ PKG_BUILDDEP:= xorg-server PKG_NEEDS:= c++ PKG_SITES:= http://www.x.org/releases/individual/driver/ -PKG_ARCH_DEPENDS:= x86 x86_64 +PKG_ARCH_DEPENDS:= x86 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/xf86-video-geode/patches/patch-src_compat-api_h b/package/xf86-video-geode/patches/patch-src_compat-api_h deleted file mode 100644 index 244111bdd..000000000 --- a/package/xf86-video-geode/patches/patch-src_compat-api_h +++ /dev/null @@ -1,30 +0,0 @@ ---- xf86-video-geode-2.11.18.orig/src/compat-api.h 2016-02-03 19:46:59.000000000 +0100 -+++ xf86-video-geode-2.11.18/src/compat-api.h 2016-11-28 08:39:15.624653928 +0100 -@@ -53,8 +53,13 @@ - - #define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScrn, 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 int arg, pointer blockData, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask -+#endif - - #define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScrn - #define CLOSE_SCREEN_ARGS scrnIndex, pScrn -@@ -89,8 +94,13 @@ - - #define SCREEN_INIT_ARGS_DECL ScreenPtr pScrn, 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 pScrn - #define CLOSE_SCREEN_ARGS pScrn -- cgit v1.2.3