summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-17 19:00:06 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-17 20:26:15 +0200
commit15a3acd9401a80e7182a0ba188efebf04ce43f35 (patch)
tree7cc3ed73766d2f36e6e874116523177f47928429
parent3873eb096abc3bdd70ea143836824c31496b221b (diff)
update to latest stable version
-rw-r--r--package/xf86-video-geode/Makefile7
-rw-r--r--package/xf86-video-geode/patches/patch-ltmain_sh11
-rw-r--r--package/xf86-video-geode/patches/patch-src_geode_dcon_c10
-rw-r--r--package/xf86-video-geode/patches/patch-src_z4l_c10
4 files changed, 15 insertions, 23 deletions
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
index f2c34cd31..db084c168 100644
--- a/package/xf86-video-geode/Makefile
+++ b/package/xf86-video-geode/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xf86-video-geode
-PKG_VERSION:= 2.11.13
+PKG_VERSION:= 2.11.15
PKG_RELEASE:= 1
-PKG_MD5SUM:= df78ec2c76598b9b3a3f00c7b9215414
+PKG_MD5SUM:= a38a23055fcabed87dbd5e7c9e32bc05
PKG_DESCR:= X11 driver for AMD Geode VGA chip
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
@@ -16,11 +16,14 @@ PKG_NEED_CXX:= 1
PKG_ARCH_DEPENDS:= x86
PKG_CFLINE_XF86_VIDEO_GEODE:= depends on ADK_TARGET_WITH_VGA
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XF86_VIDEO_GEODE,xf86-video-geode,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+CONFIGURE_ARGS+= --with-pic
+
xf86-video-geode-install:
${INSTALL_DIR} ${IDIR_XF86_VIDEO_GEODE}/usr/lib/xorg/modules/drivers
${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/geode_drv.so \
diff --git a/package/xf86-video-geode/patches/patch-ltmain_sh b/package/xf86-video-geode/patches/patch-ltmain_sh
deleted file mode 100644
index 6c6beb7dd..000000000
--- a/package/xf86-video-geode/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- xf86-video-geode-2.11.6.orig/ltmain.sh 2009-09-27 14:01:31.000000000 +0200
-+++ xf86-video-geode-2.11.6/ltmain.sh 2011-01-17 17:43:27.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
diff --git a/package/xf86-video-geode/patches/patch-src_geode_dcon_c b/package/xf86-video-geode/patches/patch-src_geode_dcon_c
new file mode 100644
index 000000000..a80c00dfe
--- /dev/null
+++ b/package/xf86-video-geode/patches/patch-src_geode_dcon_c
@@ -0,0 +1,10 @@
+--- xf86-video-geode-2.11.15.orig/src/geode_dcon.c 2013-10-09 13:47:09.000000000 +0200
++++ xf86-video-geode-2.11.15/src/geode_dcon.c 2014-05-17 18:56:45.000000000 +0200
+@@ -29,6 +29,7 @@
+
+ /* Includes that are used by all drivers */
+ #include <xf86.h>
++#include <xf86Modes.h>
+ #include <xf86_OSproc.h>
+ #include <compiler.h>
+
diff --git a/package/xf86-video-geode/patches/patch-src_z4l_c b/package/xf86-video-geode/patches/patch-src_z4l_c
deleted file mode 100644
index 6875eb2f3..000000000
--- a/package/xf86-video-geode/patches/patch-src_z4l_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- xf86-video-geode-2.11.10.orig/src/z4l.c 2010-11-09 10:20:07.000000000 +0100
-+++ xf86-video-geode-2.11.10/src/z4l.c 2011-07-31 20:58:18.763424329 +0200
-@@ -55,7 +55,6 @@ typedef long long __s64;
- #define __u64 __u_64
- typedef unsigned long long __u64;
-
--#include "linux/videodev.h"
- #define __user
- #include "linux/videodev2.h"
-