upgpkg: directfb 1.4.3-1

    Upstream update

git-svn-id: file:///srv/repos/svn-community/svn@8441 9fca08f4-af9d-4005-b8df-a31f2cc04f65

4 files changed, 61 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e64dfc5d158..3884044d0f50 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,22 +2,25 @@
 # Mon Sep 26 02:32:33 UTC 2016
 pkgbase = directfb
 	pkgdesc = A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device
-	pkgver = 1.4.2
+	pkgver = 1.4.3
 	pkgrel = 1
 	url = http://www.directfb.org
 	arch = i686
 	arch = x86_64
 	license = LGPL
-	depends = libjpeg>=7
+	depends = libjpeg
 	depends = libxext
 	depends = sdl
 	depends = sysfsutils
 	depends = libpng
 	depends = freetype2
 	options = !libtool
-	source = http://www.directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.2.tar.gz
-	md5sums = e4376c6c5b8e27d735edb7f62a7a8e86
-	sha1sums = 29a5e5a82b1a9e2cbfe31af127a54767fffae975
+	source = http://www.directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.3.tar.gz
+	source = libpng-1.4.patch
+	md5sums = 223e036da906ceb4bd44708026839ff1
+	md5sums = bfb34caf0c9cf9499975590d6c047b23
+	sha1sums = 935ef75b4a9f682e41fc68c887d72dca1fe32875
+	sha1sums = 0a920067a39ebb0117cb8d5a78267a9ac8d12adf
 
 pkgname = directfb
 
diff --git a/ChangeLog b/ChangeLog
index 789ef8fe9069..1b9c7440c84a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-20  Eric Belanger  <eric@archlinux.org>
+
+	* directfb 1.4.3-1
+	* Upstream update
+
 2009-11-08  Eric Belanger  <eric@archlinux.org>
 
 	* directfb 1.4.2-1
diff --git a/PKGBUILD b/PKGBUILD
index 6ca43fc5c5ea..6bf8109e3f33 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,21 @@
 # Contributor: Eric Belanger <eric@archlinux.org>
 
 pkgname=directfb
-pkgver=1.4.2
+pkgver=1.4.3
 pkgrel=1
 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device"
 arch=('i686' 'x86_64')
 url="http://www.directfb.org"
 license=('LGPL')
-depends=('libjpeg>=7' 'libxext' 'sdl' 'sysfsutils' 'libpng' 'freetype2')
+depends=('libjpeg' 'libxext' 'sdl' 'sysfsutils' 'libpng' 'freetype2')
 options=('!libtool')
-source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz)
-md5sums=('e4376c6c5b8e27d735edb7f62a7a8e86')
-sha1sums=('29a5e5a82b1a9e2cbfe31af127a54767fffae975')
+source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz libpng-1.4.patch)
+md5sums=('223e036da906ceb4bd44708026839ff1' 'bfb34caf0c9cf9499975590d6c047b23')
+sha1sums=('935ef75b4a9f682e41fc68c887d72dca1fe32875' '0a920067a39ebb0117cb8d5a78267a9ac8d12adf')
 
 build() {
   cd "${srcdir}/DirectFB-${pkgver}"
+  patch -p1 < ../libpng-1.4.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-zlib \
               --enable-x11 --enable-sdl --disable-vnc --disable-osx \
               --enable-video4linux2 --enable-voodoo || return 1
diff --git a/libpng-1.4.patch b/libpng-1.4.patch
new file mode 100644
index 000000000000..29b49a2eef44
--- /dev/null
+++ b/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 );
+