[arch-commits] Commit in fbida/trunk (ChangeLog PKGBUILD libpng-1.4.patch)

Eric Bélanger eric at archlinux.org
Mon Jan 18 05:19:44 UTC 2010


    Date: Monday, January 18, 2010 @ 00:19:43
  Author: eric
Revision: 63614

upgpkg: fbida 2.07-4
    Rebuilt for libpng 1.4 and libjpeg 8

Added:
  fbida/trunk/libpng-1.4.patch
Modified:
  fbida/trunk/ChangeLog
  fbida/trunk/PKGBUILD

------------------+
 ChangeLog        |    5 +++++
 PKGBUILD         |   11 ++++++-----
 libpng-1.4.patch |   17 +++++++++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-01-18 05:08:41 UTC (rev 63613)
+++ ChangeLog	2010-01-18 05:19:43 UTC (rev 63614)
@@ -1,3 +1,8 @@
+2010-01-17  Eric Belanger  <eric at archlinux.org>
+
+	* fbida 2.07-4
+	* Rebuilt for libpng 1.4 and libjpeg 8
+
 2009-08-10  Eric Belanger  <eric at archlinux.org>
 
 	* fbida 2.07-3

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-18 05:08:41 UTC (rev 63613)
+++ PKGBUILD	2010-01-18 05:19:43 UTC (rev 63614)
@@ -4,22 +4,23 @@
 
 pkgname=fbida
 pkgver=2.07
-pkgrel=3
+pkgrel=4
 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
 arch=('i686' 'x86_64')
 url="http://linux.bytesex.org/fbida/"
 license=('GPL2')
-depends=('giflib' 'libtiff' 'libjpeg>=7' 'libexif' 'lesstif' 'libxpm' 'libpng' 'libx11' 'libxext' 'fontconfig')
+depends=('giflib' 'libtiff' 'libjpeg' 'libexif' 'lesstif' 'libxpm' 'libpng' 'libx11' 'libxext' 'fontconfig')
 optdepends=('ghostscript: to use fbgs')
 replaces=('fbi')
 provides=('fbi')
 backup=('etc/X11/app-defaults/Ida')
-source=(http://dl.bytesex.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3e05910fb7c1d9b2bd3e272d96db069c')
-sha1sums=('4758178299e09d5251b9cf20337a81cc20553d45')
+source=(http://dl.bytesex.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz libpng-1.4.patch)
+md5sums=('3e05910fb7c1d9b2bd3e272d96db069c' '31b5a5318c16808d55403e06110ff5a5')
+sha1sums=('4758178299e09d5251b9cf20337a81cc20553d45' 'dcb39c82e7e6f4d7d6e8d0e95c661f83a2655c7f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../libpng-1.4.patch || return 1
   rm jpeg/jpeg*
   make Make.config || return 1
   for config in HAVE_LIB{SANE,CURL,LIRC}; do

Added: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch	                        (rev 0)
+++ libpng-1.4.patch	2010-01-18 05:19:43 UTC (rev 63614)
@@ -0,0 +1,17 @@
+diff -Naur fbida-2.07-orig/rd/read-png.c fbida-2.07/rd/read-png.c
+--- fbida-2.07-orig/rd/read-png.c	2010-01-18 00:02:02.000000000 -0500
++++ fbida-2.07/rd/read-png.c	2010-01-18 00:06:09.000000000 -0500
+@@ -69,8 +69,11 @@
+     if (h->color_type == PNG_COLOR_TYPE_PALETTE)
+ 	png_set_palette_to_rgb(h->png);
+     if (h->color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+-	png_set_gray_1_2_4_to_8(h->png);
+-
++#if PNG_LIBPNG_VER < 10400
++      png_set_gray_1_2_4_to_8(h->png);
++#else
++    png_set_expand_gray_1_2_4_to_8(h->png);
++#endif
+     if (png_get_bKGD(h->png, h->info, &file_bg)) {
+ 	png_set_background(h->png,file_bg,PNG_BACKGROUND_GAMMA_FILE,1,1.0);
+     } else {




More information about the arch-commits mailing list