Upstream update to 1.4.5

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

4 files changed, 23 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3884044d0f50..5245c957e7de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 # Generated by mksrcinfo v8
-# Mon Sep 26 02:32:33 UTC 2016
+# Mon Sep 26 02:32:34 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.3
+	pkgver = 1.4.5
 	pkgrel = 1
 	url = http://www.directfb.org
+	changelog = directfb.changelog
 	arch = i686
 	arch = x86_64
 	license = LGPL
@@ -15,12 +16,8 @@ pkgbase = directfb
 	depends = libpng
 	depends = freetype2
 	options = !libtool
-	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
+	source = http://www.directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.5.tar.gz
+	md5sums = 7cfd568a1267c4c2c97ba00c29cb4f7d
 
 pkgname = directfb
 
diff --git a/PKGBUILD b/PKGBUILD
index 6bf8109e3f33..54a09ece1dcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # $Id$
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 
 pkgname=directfb
-pkgver=1.4.3
+pkgver=1.4.5
 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')
@@ -11,16 +12,21 @@ url="http://www.directfb.org"
 license=('LGPL')
 depends=('libjpeg' 'libxext' 'sdl' 'sysfsutils' 'libpng' 'freetype2')
 options=('!libtool')
-source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz libpng-1.4.patch)
-md5sums=('223e036da906ceb4bd44708026839ff1' 'bfb34caf0c9cf9499975590d6c047b23')
-sha1sums=('935ef75b4a9f682e41fc68c887d72dca1fe32875' '0a920067a39ebb0117cb8d5a78267a9ac8d12adf')
+changelog=$pkgname.changelog
+source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz)
+md5sums=('7cfd568a1267c4c2c97ba00c29cb4f7d')
 
 build() {
-  cd "${srcdir}/DirectFB-${pkgver}"
-  patch -p1 < ../libpng-1.4.patch || return 1
+  cd ${srcdir}/DirectFB-${pkgver}
+
   ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-zlib \
               --enable-x11 --enable-sdl --disable-vnc --disable-osx \
               --enable-video4linux2 --enable-voodoo || return 1
   make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
 } 
+
+package() {
+  cd ${srcdir}/DirectFB-${pkgver}
+
+  make DESTDIR=${pkgdir} install || return 1
+}
diff --git a/ChangeLog b/directfb.changelog
index 1b9c7440c84a..e7e4dc64875c 100644
--- a/ChangeLog
+++ b/directfb.changelog
@@ -1,3 +1,8 @@
+2010-08-29  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
+
+	* directfb 1.4.5-1
+	* Upstream update
+
 2010-01-20  Eric Belanger  <eric@archlinux.org>
 
 	* directfb 1.4.3-1
diff --git a/libpng-1.4.patch b/libpng-1.4.patch
deleted file mode 100644
index 29b49a2eef44..000000000000
--- a/libpng-1.4.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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 );
-