From 7e2ab882b91b64fb5c596a43d582ea0cbf3ed451 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 28 Feb 2013 16:38:25 +0100 Subject: update to latest upstream --- package/DirectFB/Makefile | 11 ++--- package/DirectFB/patches/patch-configure | 11 ----- .../patches/patch-include_directfb_build_h | 11 ----- .../patch-lib_direct_ppcasm_memcpy_cachable_S | 11 ----- package/DirectFB/patches/patch-ltmain_sh | 11 ----- .../patches/patch-tools_directfb-csource_c | 48 ---------------------- 6 files changed, 6 insertions(+), 97 deletions(-) delete mode 100644 package/DirectFB/patches/patch-configure delete mode 100644 package/DirectFB/patches/patch-include_directfb_build_h delete mode 100644 package/DirectFB/patches/patch-lib_direct_ppcasm_memcpy_cachable_S delete mode 100644 package/DirectFB/patches/patch-ltmain_sh delete mode 100644 package/DirectFB/patches/patch-tools_directfb-csource_c diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index db3a9f115..682c763ec 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -4,16 +4,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= DirectFB -PKG_VERSION:= 1.4.11 -PKG_RELEASE:= 2 -PKG_EXTRAVER:= 1.4-5 -PKG_MD5SUM:= 94735ccec21120794adcce93a61445d2 +PKG_VERSION:= 1.6.3 +PKG_RELEASE:= 1 +PKG_EXTRAVER:= 1.6-0 +PKG_MD5SUM:= 641e8e999c017770da647f9b5b890906 PKG_DESCR:= Thin graphic library for the Linux framebuffer devices PKG_SECTION:= libs PKG_DEPENDS:= libpng libjpeg PKG_BUILDDEP:= libpng jpeg freetype PKG_URL:= http://www.directfb.org/ -PKG_SITES:= http://directfb.org/downloads/Core/DirectFB-1.4/ +PKG_SITES:= http://directfb.org/downloads/Core/DirectFB-1.6/ PKG_SUBPKGS:= DIRECTFB DIRECTFB_DEV PKGSD_DIRECTFB_DEV:= development files for DirectFB @@ -24,6 +24,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,DIRECTFB_DEV,directfb-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DIRECTFB_DEV},${PKGSC_DIRECTFB_DEV})) +TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 CONFIGURE_ARGS+= --with-inputdrivers=linuxinput,keyboard,ps2mouse \ --with-gfxdrivers=none \ --without-tools \ diff --git a/package/DirectFB/patches/patch-configure b/package/DirectFB/patches/patch-configure deleted file mode 100644 index 86831102d..000000000 --- a/package/DirectFB/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- DirectFB-1.4.11.orig/configure 2010-11-15 22:35:38.000000000 +0100 -+++ DirectFB-1.4.11/configure 2011-01-08 11:46:41.000000000 +0100 -@@ -16257,7 +16257,7 @@ if test x"$CFLAGS" = x"-g -O2"; then - CFLAGS= - fi - --CFLAGS="-O3 -ffast-math -pipe $CFLAGS" -+CFLAGS="-ffast-math -pipe $CFLAGS" - - DFB_INTERNAL_CFLAGS="-D_GNU_SOURCE $DFB_INTERNAL_CFLAGS" - diff --git a/package/DirectFB/patches/patch-include_directfb_build_h b/package/DirectFB/patches/patch-include_directfb_build_h deleted file mode 100644 index 87eca8617..000000000 --- a/package/DirectFB/patches/patch-include_directfb_build_h +++ /dev/null @@ -1,11 +0,0 @@ ---- DirectFB-1.4.11.orig/include/directfb_build.h 2010-11-15 22:35:45.000000000 +0100 -+++ DirectFB-1.4.11/include/directfb_build.h 2011-03-28 22:30:51.451811000 +0200 -@@ -29,7 +29,7 @@ - #ifndef __DIRECTFB_BUILD_H__ - #define __DIRECTFB_BUILD_H__ - --#define DIRECTFB_BUILD_VOODOO (1) -+#define DIRECTFB_BUILD_VOODOO (0) - #define DIRECTFB_BUILD_PURE_VOODOO (0) - - #endif /* __DIRECTFB_BUILD_H__ */ diff --git a/package/DirectFB/patches/patch-lib_direct_ppcasm_memcpy_cachable_S b/package/DirectFB/patches/patch-lib_direct_ppcasm_memcpy_cachable_S deleted file mode 100644 index 5352a950c..000000000 --- a/package/DirectFB/patches/patch-lib_direct_ppcasm_memcpy_cachable_S +++ /dev/null @@ -1,11 +0,0 @@ ---- DirectFB-1.4.11.orig/lib/direct/ppcasm_memcpy_cachable.S 2010-10-08 14:43:46.000000000 +0200 -+++ DirectFB-1.4.11/lib/direct/ppcasm_memcpy_cachable.S 2011-08-08 14:52:51.448015034 +0200 -@@ -34,8 +34,6 @@ - - #define __ASSEMBLY__ - --#include -- - #if defined(CONFIG_8xx) || defined(CONFIG_403GCX) - #define L1_CACHE_LINE_SIZE 16 - #define LG_L1_CACHE_LINE_SIZE 4 diff --git a/package/DirectFB/patches/patch-ltmain_sh b/package/DirectFB/patches/patch-ltmain_sh deleted file mode 100644 index cd25bbd95..000000000 --- a/package/DirectFB/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- DirectFB-1.4.11.orig/ltmain.sh 2010-11-03 11:14:45.000000000 +0100 -+++ DirectFB-1.4.11/ltmain.sh 2011-01-14 00:24:52.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/DirectFB/patches/patch-tools_directfb-csource_c b/package/DirectFB/patches/patch-tools_directfb-csource_c deleted file mode 100644 index 84711d86f..000000000 --- a/package/DirectFB/patches/patch-tools_directfb-csource_c +++ /dev/null @@ -1,48 +0,0 @@ ---- DirectFB-1.4.11.orig/tools/directfb-csource.c 2010-10-31 09:49:49.000000000 +0100 -+++ DirectFB-1.4.11/tools/directfb-csource.c 2011-03-29 10:57:18.453068981 +0200 -@@ -338,7 +338,7 @@ static DFBResult load_image (const char - if (!png_ptr) - goto cleanup; - -- if (setjmp (png_ptr->jmpbuf)) { -+ if (setjmp (png_jmpbuf (png_ptr))) { - if (desc->preallocated[0].data) { - free (desc->preallocated[0].data); - desc->preallocated[0].data = NULL; -@@ -405,17 +405,22 @@ static DFBResult load_image (const char - } - - switch (src_format) { -- case DSPF_LUT8: -- if (info_ptr->num_palette) { -+ case DSPF_LUT8: { -+ png_colorp png_palette; -+ int num_palette; -+ -+ png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette ); -+ -+ if (num_palette) { - png_byte *alpha; - int i, num; - -- *palette_size = MIN (info_ptr->num_palette, 256); -+ *palette_size = MIN (num_palette, 256); - for (i = 0; i < *palette_size; i++) { - palette[i].a = 0xFF; -- palette[i].r = info_ptr->palette[i].red; -- palette[i].g = info_ptr->palette[i].green; -- palette[i].b = info_ptr->palette[i].blue; -+ palette[i].r = png_palette[i].red; -+ palette[i].g = png_palette[i].green; -+ palette[i].b = png_palette[i].blue; - } - if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) { - png_get_tRNS (png_ptr, info_ptr, &alpha, &num, NULL); -@@ -424,6 +429,7 @@ static DFBResult load_image (const char - } - } - break; -+ } - case DSPF_RGB32: - png_set_filler (png_ptr, 0xFF, - #ifdef WORDS_BIGENDIAN -- cgit v1.2.3