[arch-commits] Commit in devil/repos (8 files)

Laurent Carlier lcarlier at nymeria.archlinux.org
Fri Aug 16 23:32:06 UTC 2013


    Date: Saturday, August 17, 2013 @ 01:32:05
  Author: lcarlier
Revision: 95807

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  devil/repos/community-staging-i686/
  devil/repos/community-staging-i686/PKGBUILD
    (from rev 95806, devil/trunk/PKGBUILD)
  devil/repos/community-staging-i686/devil.install
    (from rev 95806, devil/trunk/devil.install)
  devil/repos/community-staging-i686/libpng14.patch
    (from rev 95806, devil/trunk/libpng14.patch)
  devil/repos/community-staging-x86_64/
  devil/repos/community-staging-x86_64/PKGBUILD
    (from rev 95806, devil/trunk/PKGBUILD)
  devil/repos/community-staging-x86_64/devil.install
    (from rev 95806, devil/trunk/devil.install)
  devil/repos/community-staging-x86_64/libpng14.patch
    (from rev 95806, devil/trunk/libpng14.patch)

-----------------------------------------+
 community-staging-i686/PKGBUILD         |   38 ++++++++++++++++++++++++++++++
 community-staging-i686/devil.install    |   11 ++++++++
 community-staging-i686/libpng14.patch   |   33 ++++++++++++++++++++++++++
 community-staging-x86_64/PKGBUILD       |   38 ++++++++++++++++++++++++++++++
 community-staging-x86_64/devil.install  |   11 ++++++++
 community-staging-x86_64/libpng14.patch |   33 ++++++++++++++++++++++++++
 6 files changed, 164 insertions(+)

Copied: devil/repos/community-staging-i686/PKGBUILD (from rev 95806, devil/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2013-08-16 23:32:05 UTC (rev 95807)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: TheHoff <forums>
+
+pkgname=devil
+pkgver=1.7.8
+pkgrel=17
+pkgdesc="Library for reading several different image formats"
+arch=('i686' 'x86_64')
+url="http://openil.sourceforge.net/"
+depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr')
+install=devil.install
+options=('!libtool' '!docs' '!emptydirs')
+license=('GPL')
+source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch)
+md5sums=('7918f215524589435e5ec2e8736d5e1d'
+         '0f839ccefd43b0ee8b4b3f99806147fc')
+
+build() {
+  cd ${srcdir}/devil-$pkgver
+
+  patch -Np1 -i ${srcdir}/libpng14.patch
+
+  if [[ $CARCH == x86_64 ]]; then
+    ./configure --prefix=/usr --enable-ILU
+  else
+    ./configure --prefix=/usr --enable-ILU --disable-sse3
+  fi
+
+  make
+}
+
+package() {
+  cd ${srcdir}/devil-$pkgver
+
+  make prefix=${pkgdir}/usr install
+}

Copied: devil/repos/community-staging-i686/devil.install (from rev 95806, devil/trunk/devil.install)
===================================================================
--- community-staging-i686/devil.install	                        (rev 0)
+++ community-staging-i686/devil.install	2013-08-16 23:32:05 UTC (rev 95807)
@@ -0,0 +1,11 @@
+infodir=usr/share/info
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
+}

Copied: devil/repos/community-staging-i686/libpng14.patch (from rev 95806, devil/trunk/libpng14.patch)
===================================================================
--- community-staging-i686/libpng14.patch	                        (rev 0)
+++ community-staging-i686/libpng14.patch	2013-08-16 23:32:05 UTC (rev 95807)
@@ -0,0 +1,33 @@
+diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c
+--- devil-1.7.8.orig/src-IL/src/il_icon.c	2009-03-08 09:10:09.000000000 +0200
++++ devil-1.7.8/src-IL/src/il_icon.c	2010-01-17 00:54:09.000000000 +0200
+@@ -525,7 +525,7 @@
+ 
+ 	// Expand low-bit-depth grayscale images to 8 bits
+ 	if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+-		png_set_gray_1_2_4_to_8(ico_png_ptr);
++		png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
+ 	}
+ 
+ 	// Expand RGB images with transparency to full alpha channels
+diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c
+--- devil-1.7.8.orig/src-IL/src/il_png.c	2009-03-08 09:10:09.000000000 +0200
++++ devil-1.7.8/src-IL/src/il_png.c	2010-01-17 00:55:26.000000000 +0200
+@@ -105,7 +105,7 @@
+ 	Read = iread(Signature, 1, 8);
+ 	iseek(-Read, IL_SEEK_CUR);
+ 
+-	return png_check_sig(Signature, 8);
++	return png_sig_cmp(Signature, 0, 8) == 0;
+ }
+ 
+ 
+@@ -278,7 +278,7 @@
+ 
+ 	// Expand low-bit-depth grayscale images to 8 bits
+ 	if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+-		png_set_gray_1_2_4_to_8(png_ptr);
++		png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 	}
+ 
+ 	// Expand RGB images with transparency to full alpha channels

Copied: devil/repos/community-staging-x86_64/PKGBUILD (from rev 95806, devil/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2013-08-16 23:32:05 UTC (rev 95807)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: TheHoff <forums>
+
+pkgname=devil
+pkgver=1.7.8
+pkgrel=17
+pkgdesc="Library for reading several different image formats"
+arch=('i686' 'x86_64')
+url="http://openil.sourceforge.net/"
+depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr')
+install=devil.install
+options=('!libtool' '!docs' '!emptydirs')
+license=('GPL')
+source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch)
+md5sums=('7918f215524589435e5ec2e8736d5e1d'
+         '0f839ccefd43b0ee8b4b3f99806147fc')
+
+build() {
+  cd ${srcdir}/devil-$pkgver
+
+  patch -Np1 -i ${srcdir}/libpng14.patch
+
+  if [[ $CARCH == x86_64 ]]; then
+    ./configure --prefix=/usr --enable-ILU
+  else
+    ./configure --prefix=/usr --enable-ILU --disable-sse3
+  fi
+
+  make
+}
+
+package() {
+  cd ${srcdir}/devil-$pkgver
+
+  make prefix=${pkgdir}/usr install
+}

Copied: devil/repos/community-staging-x86_64/devil.install (from rev 95806, devil/trunk/devil.install)
===================================================================
--- community-staging-x86_64/devil.install	                        (rev 0)
+++ community-staging-x86_64/devil.install	2013-08-16 23:32:05 UTC (rev 95807)
@@ -0,0 +1,11 @@
+infodir=usr/share/info
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
+}

Copied: devil/repos/community-staging-x86_64/libpng14.patch (from rev 95806, devil/trunk/libpng14.patch)
===================================================================
--- community-staging-x86_64/libpng14.patch	                        (rev 0)
+++ community-staging-x86_64/libpng14.patch	2013-08-16 23:32:05 UTC (rev 95807)
@@ -0,0 +1,33 @@
+diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c
+--- devil-1.7.8.orig/src-IL/src/il_icon.c	2009-03-08 09:10:09.000000000 +0200
++++ devil-1.7.8/src-IL/src/il_icon.c	2010-01-17 00:54:09.000000000 +0200
+@@ -525,7 +525,7 @@
+ 
+ 	// Expand low-bit-depth grayscale images to 8 bits
+ 	if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+-		png_set_gray_1_2_4_to_8(ico_png_ptr);
++		png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
+ 	}
+ 
+ 	// Expand RGB images with transparency to full alpha channels
+diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c
+--- devil-1.7.8.orig/src-IL/src/il_png.c	2009-03-08 09:10:09.000000000 +0200
++++ devil-1.7.8/src-IL/src/il_png.c	2010-01-17 00:55:26.000000000 +0200
+@@ -105,7 +105,7 @@
+ 	Read = iread(Signature, 1, 8);
+ 	iseek(-Read, IL_SEEK_CUR);
+ 
+-	return png_check_sig(Signature, 8);
++	return png_sig_cmp(Signature, 0, 8) == 0;
+ }
+ 
+ 
+@@ -278,7 +278,7 @@
+ 
+ 	// Expand low-bit-depth grayscale images to 8 bits
+ 	if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+-		png_set_gray_1_2_4_to_8(png_ptr);
++		png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 	}
+ 
+ 	// Expand RGB images with transparency to full alpha channels




More information about the arch-commits mailing list