[SCM] directfb/experimental: Refresh patches
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sat Dec 31 13:48:52 UTC 2016
The following commit has been merged in the experimental branch:
commit 7495d3f138a60bb4f394d0438ceee28756e3b9f9
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sat Dec 31 13:40:07 2016 +0100
Refresh patches
diff --git a/debian/patches/01_default_cflags.patch b/debian/patches/01_default_cflags.patch
index f797d16..6e6d995 100644
--- a/debian/patches/01_default_cflags.patch
+++ b/debian/patches/01_default_cflags.patch
@@ -3,9 +3,11 @@ Author: Fathi Boudra <fabo at debian.org>
Upstream clear default CFLAGS and force -O3.
Use default CFLAGS on Debian.
---- a/configure.in
-+++ b/configure.in
-@@ -155,11 +155,11 @@ AC_CHECK_HEADERS(linux/compiler.h linux/
+Index: directfb/configure.in
+===================================================================
+--- directfb.orig/configure.in
++++ directfb/configure.in
+@@ -175,11 +175,11 @@ AC_CHECK_HEADERS(linux/compiler.h linux/
dnl Clear default CFLAGS
diff --git a/debian/patches/02_fix_sh772x_build.patch b/debian/patches/02_fix_sh772x_build.patch
index a1ac161..acb6df8 100644
--- a/debian/patches/02_fix_sh772x_build.patch
+++ b/debian/patches/02_fix_sh772x_build.patch
@@ -3,8 +3,10 @@ Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Fix FTBFS on Renesas SH (sh4) because libjpeg doesn't link against sh772x driver.
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=536314
---- a/gfxdrivers/sh772x/Makefile.am
-+++ b/gfxdrivers/sh772x/Makefile.am
+Index: directfb/gfxdrivers/sh772x/Makefile.am
+===================================================================
+--- directfb.orig/gfxdrivers/sh772x/Makefile.am
++++ directfb/gfxdrivers/sh772x/Makefile.am
@@ -22,6 +22,8 @@ INCLUDES = \
-I$(top_srcdir)/systems \
-I$(srcdir)/kernel-module
@@ -12,5 +14,5 @@ See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=536314
+libsh7722_jpeg_la_LIBADD = \
+ $(LIBJPEG)
- #lib_LTLIBRARIES = libsh7722_jpeg.la
- #
+ sh7722_LTLIBRARIES = libdirectfb_sh7722.la
+
diff --git a/debian/patches/05_link_dynamic.patch b/debian/patches/05_link_dynamic.patch
index a90457a..27fc873 100644
--- a/debian/patches/05_link_dynamic.patch
+++ b/debian/patches/05_link_dynamic.patch
@@ -1,69 +1,28 @@
Status: sent-upstream
---- a/configure.in
-+++ b/configure.in
-@@ -740,19 +740,6 @@ AC_ARG_ENABLE(png,
- enable_png="$enableval", enable_png=yes)
-
- if test "$enable_png" = "yes"; then
-- dnl Test for libz
-- if test -z "$ZLIB_LIBS"; then
-- AC_CHECK_LIB(z, gzsetparams,
-- [
-- AC_CHECK_HEADER(zlib.h,
-- ZLIB_LIBS='-lz',
-- AC_MSG_WARN([
--*** libz header files not found. PNG image provider will not be built.]))
-- ],[
-- AC_MSG_WARN([ *** libz not found. PNG image provider will not be built.])
-- ])
-- fi
--
- dnl Test for libpng
- if test -n "$LIBPNG_LIBS"; then
- PNG=yes
-@@ -769,7 +756,7 @@ if test "$enable_png" = "yes"; then
- fi
-
- dnl Test for libpng
-- if test -z "$LIBPNG_LIBS" && test -n "$ZLIB_LIBS"; then
-+ if test -z "$LIBPNG_LIBS"; then
- AC_CHECK_LIB(png, png_read_info,
- [
- AC_CHECK_HEADER(png.h,
-@@ -780,7 +767,7 @@ if test "$enable_png" = "yes"; then
- AC_MSG_WARN([
- *** PNG library not found. PNG image provider will not be built.])
- ],
-- $ZLIB_LIBS -lm)
-+ -lm)
- if test "$png_ok" = yes; then
- AC_MSG_CHECKING([for png_structp in png.h])
- AC_TRY_COMPILE([#include <png.h>],
-@@ -792,7 +779,7 @@ if test "$enable_png" = "yes"; then
- AC_MSG_RESULT($png_ok)
- if test "$png_ok" = yes; then
- PNG=yes
-- LIBPNG_LIBS="-lpng $ZLIB_LIBS -lm"
-+ LIBPNG_LIBS="-lpng -lm"
- else
- PNG=no
- AC_MSG_WARN([
-@@ -1508,7 +1495,7 @@ AM_CONDITIONAL(BUILD_TOOLS, test "$with_
+Index: directfb/configure.in
+===================================================================
+--- directfb.orig/configure.in
++++ directfb/configure.in
+@@ -1660,7 +1660,7 @@ AM_CONDITIONAL(BUILD_TOOLS, test "$with_
AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes")
CFLAGS="$CFLAGS $DFB_INTERNAL_CFLAGS"
-DFB_LDFLAGS="$LDFLAGS $ZLIB_LIBS"
+DFB_LDFLAGS="$LDFLAGS"
+ CFLAGS="$CFLAGS $CFLAGS_STD"
-
---- a/src/core/Makefile.am
-+++ b/src/core/Makefile.am
-@@ -82,3 +82,6 @@ libdirectfb_core_la_SOURCES = \
- windows.c \
+Index: directfb/src/core/Makefile.am
+===================================================================
+--- directfb.orig/src/core/Makefile.am
++++ directfb/src/core/Makefile.am
+@@ -143,6 +143,8 @@ libdirectfb_core_la_SOURCES = \
windowstack.c \
wm.c
-+
+
+libdirectfb_core_la_LIBADD = @ZLIB_LIBS@
+
+ distclean-local:
+ rm -f CoreDFB.c
+ rm -f CoreDFB.h
diff --git a/debian/patches/90_linux_config.h.patch b/debian/patches/90_linux_config.h.patch
deleted file mode 100644
index de1778c..0000000
--- a/debian/patches/90_linux_config.h.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Status: distro-specific
-
-# In a distro, we can't rely on compile time detection of these.
-# If we have to ship a config, it would be with these disabled anyway.
-
---- a/lib/direct/ppcasm_memcpy_cachable.S
-+++ b/lib/direct/ppcasm_memcpy_cachable.S
-@@ -34,8 +34,6 @@
-
- #define __ASSEMBLY__
-
--#include <linux/config.h>
--
- #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
- #define L1_CACHE_LINE_SIZE 16
- #define LG_L1_CACHE_LINE_SIZE 4
diff --git a/debian/patches/93_fix_unicode_key_handling.patch b/debian/patches/93_fix_unicode_key_handling.patch
index cfc7576..8ecf267 100644
--- a/debian/patches/93_fix_unicode_key_handling.patch
+++ b/debian/patches/93_fix_unicode_key_handling.patch
@@ -1,6 +1,8 @@
---- a/inputdrivers/keyboard/keyboard.c
-+++ b/inputdrivers/keyboard/keyboard.c
-@@ -87,6 +87,10 @@ keyboard_get_symbol( int
+Index: directfb/inputdrivers/keyboard/keyboard.c
+===================================================================
+--- directfb.orig/inputdrivers/keyboard/keyboard.c
++++ directfb/inputdrivers/keyboard/keyboard.c
+@@ -87,6 +87,10 @@ keyboard_get_symbol( int
unsigned char index = KVAL(value);
int base = (level == DIKSI_BASE);
@@ -42,9 +44,11 @@
return DFB_OK;
}
---- a/inputdrivers/linux_input/linux_input.c
-+++ b/inputdrivers/linux_input/linux_input.c
-@@ -388,6 +388,10 @@ keyboard_get_symbol( int
+Index: directfb/inputdrivers/linux_input/linux_input.c
+===================================================================
+--- directfb.orig/inputdrivers/linux_input/linux_input.c
++++ directfb/inputdrivers/linux_input/linux_input.c
+@@ -419,6 +419,10 @@ keyboard_get_symbol( int
unsigned char index = KVAL(value);
int base = (level == DIKSI_BASE);
@@ -55,7 +59,7 @@
switch (type) {
case KT_FN:
if (index < 20)
-@@ -1356,10 +1360,23 @@ driver_get_keymap_entry( CoreInputDevice
+@@ -1919,10 +1923,23 @@ driver_get_keymap_entry( CoreInputDevice
int code = entry->code;
unsigned short value;
DFBInputDeviceKeyIdentifier identifier;
@@ -79,7 +83,7 @@
/* fetch the base level */
value = keyboard_read_value( driver_data, K_NORMTAB, code );
-@@ -1403,6 +1420,12 @@ driver_get_keymap_entry( CoreInputDevice
+@@ -1966,6 +1983,12 @@ driver_get_keymap_entry( CoreInputDevice
entry->symbols[DIKSI_ALT_SHIFT] = keyboard_get_symbol( code, value,
DIKSI_ALT_SHIFT );
diff --git a/debian/patches/94_fix_mknod.patch b/debian/patches/94_fix_mknod.patch
index efef48d..0ddd09d 100644
--- a/debian/patches/94_fix_mknod.patch
+++ b/debian/patches/94_fix_mknod.patch
@@ -1,30 +1,7 @@
-Description: directfb ftbfs on armel. Implicit declaration error
- Fix for ARM builds failing on:
- ../../../gfxdrivers/davinci/davinci_c64x.c: In function 'davinci_c64x_open':
- ../../../gfxdrivers/davinci/davinci_c64x.c:1900:6: error: implicit declaration of function 'mknod' [-Werror=implicit-function-declaration]
- cc1: some warnings being treated as errors
- .
- directfb (1.2.10.0-4.3) unstable; urgency=low
- .
- * Non-maintainer upload.
- * Fix "directfb ftbfs on armel. Implicit declaration error"
- - Thanks Peter Green for bug report and patch (Closes: #644782)
- * Remove m4 macros when calling clean target
+Description: directfb ftbfs on armel. Implicit declaration error of function 'mknod'
Author: Hector Oron <zumbi at debian.org>
Bug-Debian: http://bugs.debian.org/644782
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/644782
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: http://directfb.org/mantis/view.php?id=16
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
---
gfxdrivers/davinci/davinci_c64x.c | 2 ++
diff --git a/debian/patches/directfb-1.2.10_libpng-1.5.patch b/debian/patches/directfb-1.2.10_libpng-1.5.patch
deleted file mode 100644
index ed96a70..0000000
--- a/debian/patches/directfb-1.2.10_libpng-1.5.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-Description: Add support for libpng 1.5 (based on DirectFB 1.4.16 source code)
-Author: Fathi Boudra <fabo at debian.org>
----
- interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c | 128 ++++++++++
- tools/directfb-csource.c | 25 +
- tools/mkdfiff.c | 4
- 3 files changed, 157 insertions(+)
-
---- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-@@ -204,7 +204,11 @@ Construct( IDirectFBImageProvider *thiz,
- if (!data->png_ptr)
- goto error;
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp( png_jmpbuf( data->png_ptr ))) {
-+#else
- if (setjmp( data->png_ptr->jmpbuf )) {
-+#endif
- D_ERROR( "ImageProvider/PNG: Error reading header!\n" );
- goto error;
- }
-@@ -332,7 +336,11 @@ IDirectFBImageProvider_PNG_RenderTo( IDi
- rect = dst_data->area.wanted;
- }
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp( png_jmpbuf( data->png_ptr ))) {
-+#else
- if (setjmp( data->png_ptr->jmpbuf )) {
-+#endif
- D_ERROR( "ImageProvider/PNG: Error during decoding!\n" );
-
- if (data->stage < STAGE_IMAGE)
-@@ -368,13 +376,21 @@ IDirectFBImageProvider_PNG_RenderTo( IDi
- else {
- CoreSurfaceBufferLock lock;
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ int bit_depth = png_get_bit_depth(data->png_ptr,data->info_ptr);
-+#endif
-+
- ret = dfb_surface_lock_buffer( dst_surface, CSBR_BACK, CSAID_CPU, CSAF_WRITE, &lock );
- if (ret)
- return ret;
-
- switch (data->color_type) {
- case PNG_COLOR_TYPE_PALETTE:
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (dst_surface->config.format == DSPF_LUT8 && bit_depth == 8) {
-+#else
- if (dst_surface->config.format == DSPF_LUT8 && data->info_ptr->bit_depth == 8) {
-+#endif
- /*
- * Special indexed PNG to LUT8 loading.
- */
-@@ -417,7 +433,11 @@ IDirectFBImageProvider_PNG_RenderTo( IDi
- }
- else {
- if (data->color_type == PNG_COLOR_TYPE_GRAY) {
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ int num = 1 << bit_depth;
-+#else
- int num = 1 << data->info_ptr->bit_depth;
-+#endif
-
- for (x=0; x<num; x++) {
- int value = x * 255 / (num - 1);
-@@ -426,7 +446,11 @@ IDirectFBImageProvider_PNG_RenderTo( IDi
- }
- }
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ switch (bit_depth) {
-+#else
- switch (data->info_ptr->bit_depth) {
-+#endif
- case 8:
- for (y=0; y<data->height; y++) {
- u8 *S = data->image + data->pitch * y;
-@@ -481,7 +505,11 @@ IDirectFBImageProvider_PNG_RenderTo( IDi
-
- default:
- D_ERROR( "ImageProvider/PNG: Unsupported indexed bit depth %d!\n",
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ bit_depth );
-+#else
- data->info_ptr->bit_depth );
-+#endif
- }
-
- dfb_scale_linear_32( image_argb, data->width, data->height,
-@@ -633,6 +661,12 @@ png_info_callback( png_structp png_read_
- int i;
- IDirectFBImageProvider_PNG_data *data;
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ u32 bpp1[2] = {0, 0xff};
-+ u32 bpp2[4] = {0, 0x55, 0xaa, 0xff};
-+ u32 bpp4[16] = {0, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
-+#endif
-+
- data = png_get_progressive_ptr( png_read_ptr );
-
- /* error stage? */
-@@ -652,6 +686,41 @@ png_info_callback( png_structp png_read_
- /* generate color key based on palette... */
- if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
- u32 key;
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ png_colorp palette;
-+ png_bytep trans_alpha;
-+ png_color_16p trans_color;
-+ u8 cmap[3][MAXCOLORMAPSIZE];
-+ int num_palette = 0, num_colors = 0, num_trans = 0;
-+
-+ D_DEBUG_AT(imageProviderPNG,"%s(%d) - num_trans %d \n",__FUNCTION__,__LINE__, num_trans);
-+
-+ if (png_get_PLTE(data->png_ptr,data->info_ptr,&palette,&num_palette)) {
-+
-+ if (png_get_tRNS(data->png_ptr,data->info_ptr,
-+ &trans_alpha,&num_trans,&trans_color)) {
-+ num_colors = MIN( MAXCOLORMAPSIZE,num_palette );
-+
-+ for (i=0; i<num_colors; i++) {
-+ cmap[0][i] = palette[i].red;
-+ cmap[1][i] = palette[i].green;
-+ cmap[2][i] = palette[i].blue;
-+ }
-+
-+ key = FindColorKey( num_colors, &cmap[0][0] );
-+
-+ for (i=0; i< num_trans; i++) {
-+ if (!trans_alpha[i]) {
-+ palette[i].red = (key & 0xff0000) >> 16;
-+ palette[i].green = (key & 0x00ff00) >> 8;
-+ palette[i].blue = (key & 0x0000ff);
-+ }
-+ }
-+
-+ data->color_key = key;
-+ }
-+ }
-+#else
- png_colorp palette = data->info_ptr->palette;
- png_bytep trans = data->info_ptr->trans;
- int num_colors = MIN( MAXCOLORMAPSIZE,
-@@ -675,19 +744,77 @@ png_info_callback( png_structp png_read_
- }
-
- data->color_key = key;
-+#endif
- }
- else {
- /* ...or based on trans rgb value */
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ png_bytep trans_alpha;
-+ png_color_16p trans_color;
-+ int num_trans = 0;
-+
-+ D_DEBUG_AT(imageProviderPNG,"%s(%d)\n",__FUNCTION__,__LINE__);
-+
-+ if (png_get_tRNS(data->png_ptr,data->info_ptr,
-+ &trans_alpha,&num_trans,&trans_color)) {
-+ switch(data->bpp) {
-+ case 1:
-+ data->color_key = (((bpp1[trans_color[0].red]) << 16) |
-+ ((bpp1[trans_color[0].green]) << 8) |
-+ ((bpp1[trans_color[0].blue])));
-+ break;
-+ case 2:
-+ data->color_key = (((bpp2[trans_color[0].red]) << 16) |
-+ ((bpp2[trans_color[0].green]) << 8) |
-+ ((bpp2[trans_color[0].blue])));
-+ break;
-+ case 4:
-+ data->color_key = (((bpp4[trans_color[0].red]) << 16) |
-+ ((bpp4[trans_color[0].green]) << 8) |
-+ ((bpp4[trans_color[0].blue])));
-+ break;
-+ case 8:
-+ data->color_key = (((trans_color[0].red & 0x00ff) << 16) |
-+ ((trans_color[0].green & 0x00ff) << 8) |
-+ ((trans_color[0].blue & 0x00ff)));
-+ break;
-+ case 16:
-+ default:
-+ data->color_key = (((trans_color[0].red & 0xff00) << 8) |
-+ ((trans_color[0].green & 0xff00)) |
-+ ((trans_color[0].blue & 0xff00) >> 8));
-+ break;
-+ }
-+ }
-+#else
- png_color_16p trans = &data->info_ptr->trans_values;
-
- data->color_key = (((trans->red & 0xff00) << 8) |
- ((trans->green & 0xff00)) |
- ((trans->blue & 0xff00) >> 8));
-+#endif
- }
- }
-
- switch (data->color_type) {
- case PNG_COLOR_TYPE_PALETTE: {
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ png_colorp palette;
-+ png_bytep trans_alpha;
-+ png_color_16p trans_color;
-+ int num_palette = 0, num_colors = 0, num_trans = 0;
-+
-+
-+ png_get_PLTE(data->png_ptr,data->info_ptr,&palette,&num_palette);
-+
-+ png_get_tRNS(data->png_ptr,data->info_ptr,
-+ &trans_alpha,&num_trans,&trans_color);
-+
-+ num_colors = MIN( MAXCOLORMAPSIZE, num_palette );
-+
-+ for (i=0; i < num_colors; i++) {
-+ data->colors[i].a = (i < num_trans) ? trans_alpha[i] : 0xff;
-+#else
- png_colorp palette = data->info_ptr->palette;
- png_bytep trans = data->info_ptr->trans;
- int num_trans = data->info_ptr->num_trans;
-@@ -695,6 +822,7 @@ png_info_callback( png_structp png_read_
-
- for (i=0; i<num_colors; i++) {
- data->colors[i].a = (i < num_trans) ? trans[i] : 0xff;
-+#endif
- data->colors[i].r = palette[i].red;
- data->colors[i].g = palette[i].green;
- data->colors[i].b = palette[i].blue;
---- a/tools/directfb-csource.c
-+++ b/tools/directfb-csource.c
-@@ -320,7 +320,11 @@ static DFBResult load_image (const char
- if (!png_ptr)
- goto cleanup;
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp (png_jmpbuf(png_ptr))) {
-+#else
- if (setjmp (png_ptr->jmpbuf)) {
-+#endif
- if (desc->preallocated[0].data) {
- free (desc->preallocated[0].data);
- desc->preallocated[0].data = NULL;
-@@ -388,6 +392,25 @@ static DFBResult load_image (const char
-
- switch (src_format) {
- case DSPF_LUT8:
-+ {
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ png_colorp *info_palette;
-+ int num_palette;
-+
-+ png_get_PLTE(png_ptr,info_ptr,info_palette,&num_palette);
-+
-+ if (num_palette) {
-+ png_byte *alpha;
-+ int i, num;
-+
-+ *palette_size = MIN (num_palette, 256);
-+ for (i = 0; i < *palette_size; i++) {
-+ palette[i].a = 0xFF;
-+ palette[i].r = info_palette[i]->red;
-+ palette[i].g = info_palette[i]->green;
-+ palette[i].b = info_palette[i]->blue;
-+ }
-+#else
- if (info_ptr->num_palette) {
- png_byte *alpha;
- int i, num;
-@@ -399,6 +422,7 @@ static DFBResult load_image (const char
- palette[i].g = info_ptr->palette[i].green;
- palette[i].b = info_ptr->palette[i].blue;
- }
-+#endif
- if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) {
- png_get_tRNS (png_ptr, info_ptr, &alpha, &num, NULL);
- for (i = 0; i < MIN (num, *palette_size); i++)
-@@ -406,6 +430,7 @@ static DFBResult load_image (const char
- }
- }
- break;
-+ }
- case DSPF_RGB32:
- png_set_filler (png_ptr, 0xFF,
- #ifdef WORDS_BIGENDIAN
---- a/tools/mkdfiff.c
-+++ b/tools/mkdfiff.c
-@@ -97,7 +97,11 @@ load_image (const char *filen
- if (!png_ptr)
- goto cleanup;
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp (png_jmpbuf(png_ptr))) {
-+#else
- if (setjmp (png_ptr->jmpbuf)) {
-+#endif
- if (desc->preallocated[0].data) {
- free (desc->preallocated[0].data);
- desc->preallocated[0].data = NULL;
diff --git a/debian/patches/series b/debian/patches/series
index 36f3991..b8516a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,5 @@
02_fix_sh772x_build.patch
05_link_dynamic.patch
70_linux_fusion.patch
-90_linux_config.h.patch
93_fix_unicode_key_handling.patch
94_fix_mknod.patch
-directfb-1.2.10_libpng-1.5.patch
--
directfb packaging
More information about the pkg-multimedia-commits
mailing list