maj directfb#1.4.3-1

4 files changed, 63 insertions, 16 deletions

diff --git a/extra/directfb/.footprint b/extra/directfb/.footprint
index 947fdd682..77d2905b3 100644
--- a/extra/directfb/.footprint
+++ b/extra/directfb/.footprint
@@ -14,6 +14,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/directfb-csource
 -rwxr-xr-x	root/root	usr/bin/mkdfiff
 -rwxr-xr-x	root/root	usr/bin/mkdgiff
+-rwxr-xr-x	root/root	usr/bin/pxa3xx_dump
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/directfb-internal/
 drwxr-xr-x	root/root	usr/include/directfb-internal/core/
@@ -168,6 +169,8 @@ drwxr-xr-x	root/root	usr/lib/directfb-1.4-0/gfxdrivers/
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/gfxdrivers/libdirectfb_nsc.so
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/gfxdrivers/libdirectfb_nvidia.la
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/gfxdrivers/libdirectfb_nvidia.so
+-rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/gfxdrivers/libdirectfb_pxa3xx.la
+-rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/gfxdrivers/libdirectfb_pxa3xx.so
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/gfxdrivers/libdirectfb_radeon.la
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/gfxdrivers/libdirectfb_radeon.so
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/gfxdrivers/libdirectfb_savage.la
@@ -239,26 +242,26 @@ drwxr-xr-x	root/root	usr/lib/directfb-1.4-0/systems/
 drwxr-xr-x	root/root	usr/lib/directfb-1.4-0/wm/
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/wm/libdirectfbwm_default.la
 -rwxr-xr-x	root/root	usr/lib/directfb-1.4-0/wm/libdirectfbwm_default.so
-lrwxrwxrwx	root/root	usr/lib/libdirect-1.4.so.0 -> libdirect-1.4.so.0.1.0
--rwxr-xr-x	root/root	usr/lib/libdirect-1.4.so.0.1.0
+lrwxrwxrwx	root/root	usr/lib/libdirect-1.4.so.0 -> libdirect-1.4.so.0.3.0
+-rwxr-xr-x	root/root	usr/lib/libdirect-1.4.so.0.3.0
 -rwxr-xr-x	root/root	usr/lib/libdirect.la
-lrwxrwxrwx	root/root	usr/lib/libdirect.so -> libdirect-1.4.so.0.1.0
-lrwxrwxrwx	root/root	usr/lib/libdirectfb-1.4.so.0 -> libdirectfb-1.4.so.0.1.0
--rwxr-xr-x	root/root	usr/lib/libdirectfb-1.4.so.0.1.0
+lrwxrwxrwx	root/root	usr/lib/libdirect.so -> libdirect-1.4.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libdirectfb-1.4.so.0 -> libdirectfb-1.4.so.0.3.0
+-rwxr-xr-x	root/root	usr/lib/libdirectfb-1.4.so.0.3.0
 -rwxr-xr-x	root/root	usr/lib/libdirectfb.la
-lrwxrwxrwx	root/root	usr/lib/libdirectfb.so -> libdirectfb-1.4.so.0.1.0
-lrwxrwxrwx	root/root	usr/lib/libfusion-1.4.so.0 -> libfusion-1.4.so.0.1.0
--rwxr-xr-x	root/root	usr/lib/libfusion-1.4.so.0.1.0
+lrwxrwxrwx	root/root	usr/lib/libdirectfb.so -> libdirectfb-1.4.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libfusion-1.4.so.0 -> libfusion-1.4.so.0.3.0
+-rwxr-xr-x	root/root	usr/lib/libfusion-1.4.so.0.3.0
 -rwxr-xr-x	root/root	usr/lib/libfusion.la
-lrwxrwxrwx	root/root	usr/lib/libfusion.so -> libfusion-1.4.so.0.1.0
+lrwxrwxrwx	root/root	usr/lib/libfusion.so -> libfusion-1.4.so.0.3.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/direct.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/directfb-internal.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/directfb.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/fusion.pc
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/directfb-1.4.1/
--rw-r--r--	root/root	usr/share/directfb-1.4.1/cursor.dat
+drwxr-xr-x	root/root	usr/share/directfb-1.4.3/
+-rw-r--r--	root/root	usr/share/directfb-1.4.3/cursor.dat
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/dfbg.1.gz
diff --git a/extra/directfb/.md5sum b/extra/directfb/.md5sum
index cdedf756b..dfd14a684 100644
--- a/extra/directfb/.md5sum
+++ b/extra/directfb/.md5sum
@@ -1 +1,2 @@
-ef5798a4180af1fc5d86b3561dfe9b40  directfb_1.4.1.orig.tar.gz
+223e036da906ceb4bd44708026839ff1  DirectFB-1.4.3.tar.gz
+bfb34caf0c9cf9499975590d6c047b23  libpng-1.4.patch
diff --git a/extra/directfb/Pkgfile b/extra/directfb/Pkgfile
index 2e1ba60dc..ceaed26ed 100644
--- a/extra/directfb/Pkgfile
+++ b/extra/directfb/Pkgfile
@@ -5,13 +5,14 @@
 # Depends on: libjpeg , libpng, freetype, xorg-libx11, mesa3d, libvncserver
 
 name=directfb
-version=1.4.1
+version=1.4.3
 release=1
-source=(ftp://ftp.debian.org/debian/pool/main/d/directfb/directfb_1.4.1.orig.tar.gz)
-
+source=(http://www.directfb.org/downloads/Core/DirectFB-1.4/DirectFB-$version.tar.gz \
+libpng-1.4.patch)
 # To build with multicore add --enable-multi
 build() {
-	cd $name-$version
+	cd  DirectFB-$version
+	patch -Np1 -i  ../libpng-1.4.patch
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-zlib \
diff --git a/extra/directfb/libpng-1.4.patch b/extra/directfb/libpng-1.4.patch
new file mode 100644
index 000000000..29b49a2ee
--- /dev/null
+++ b/extra/directfb/libpng-1.4.patch
@@ -0,0 +1,42 @@
+diff -Naur DirectFB-1.4.3-orig/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c DirectFB-1.4.3/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
+--- DirectFB-1.4.3-orig/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2010-01-20 00:22:27.000000000 -0500
++++ DirectFB-1.4.3/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2010-01-20 00:24:55.000000000 -0500
+@@ -168,7 +168,7 @@
+ static DFBResult
+ Probe( IDirectFBImageProvider_ProbeContext *ctx )
+ {
+-     if (png_check_sig( ctx->header, 8 ))
++  if (!png_sig_cmp( ctx->header, 0, 8 ))
+           return DFB_OK;
+ 
+      return DFB_UNSUPPORTED;
+diff -Naur DirectFB-1.4.3-orig/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c DirectFB-1.4.3/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
+--- DirectFB-1.4.3-orig/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2010-01-20 00:48:44.000000000 -0500
++++ DirectFB-1.4.3/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2010-01-20 00:50:27.000000000 -0500
+@@ -653,7 +653,7 @@
+           if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
+                u32        key;
+                png_colorp palette    = data->info_ptr->palette;
+-               png_bytep  trans      = data->info_ptr->trans;
++               png_bytep  trans      = data->info_ptr->trans_alpha;
+                int        num_colors = MIN( MAXCOLORMAPSIZE,
+                                             data->info_ptr->num_palette );
+                u8         cmap[3][num_colors];
+@@ -678,7 +678,7 @@
+           }
+           else {
+                /* ...or based on trans rgb value */
+-               png_color_16p trans = &data->info_ptr->trans_values;
++               png_color_16p trans = &data->info_ptr->trans_color;
+ 
+                data->color_key = (((trans->red & 0xff00) << 8) |
+                                   ((trans->green & 0xff00)) |
+@@ -689,7 +689,7 @@
+      switch (data->color_type) {
+           case PNG_COLOR_TYPE_PALETTE: {
+                png_colorp palette    = data->info_ptr->palette;
+-               png_bytep  trans      = data->info_ptr->trans;
++               png_bytep  trans      = data->info_ptr->trans_alpha;
+                int        num_trans  = data->info_ptr->num_trans;
+                int        num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
+