[arch-commits] Commit in jbig2dec/repos (8 files)
Gaetan Bisson
bisson at archlinux.org
Wed Apr 8 22:23:25 UTC 2015
Date: Thursday, April 9, 2015 @ 00:23:25
Author: bisson
Revision: 130999
archrelease: copy trunk to community-x86_64, community-i686
Added:
jbig2dec/repos/community-i686/PKGBUILD
(from rev 130998, jbig2dec/trunk/PKGBUILD)
jbig2dec/repos/community-i686/libpng.patch
(from rev 130998, jbig2dec/trunk/libpng.patch)
jbig2dec/repos/community-x86_64/PKGBUILD
(from rev 130998, jbig2dec/trunk/PKGBUILD)
jbig2dec/repos/community-x86_64/libpng.patch
(from rev 130998, jbig2dec/trunk/libpng.patch)
Deleted:
jbig2dec/repos/community-i686/PKGBUILD
jbig2dec/repos/community-i686/jbig2dec-0.11-libpng15.patch
jbig2dec/repos/community-x86_64/PKGBUILD
jbig2dec/repos/community-x86_64/jbig2dec-0.11-libpng15.patch
-----------------------------------------------+
/PKGBUILD | 66 ++++++++++++++++++++++++
community-i686/PKGBUILD | 32 -----------
community-i686/jbig2dec-0.11-libpng15.patch | 31 -----------
community-i686/libpng.patch | 31 +++++++++++
community-x86_64/PKGBUILD | 32 -----------
community-x86_64/jbig2dec-0.11-libpng15.patch | 31 -----------
community-x86_64/libpng.patch | 31 +++++++++++
7 files changed, 128 insertions(+), 126 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-04-08 22:22:54 UTC (rev 130998)
+++ community-i686/PKGBUILD 2015-04-08 22:23:25 UTC (rev 130999)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-
-pkgname=jbig2dec
-pkgver=0.11
-pkgrel=7
-pkgdesc="decoder implementation of the JBIG2 image compression format"
-arch=('x86_64' 'i686')
-url="http://jbig2dec.sourceforge.net/"
-license=('GPL3')
-depends=('glibc' 'libpng')
-source=(https://github.com/rillian/jbig2dec/archive/$pkgver.tar.gz
- $pkgname-$pkgver-libpng15.patch)
-sha256sums=('8af7b94b6026aff718d4b41ad990f2702f8fd4a348d565c4b48a695988ca0e9a'
- 'ed871abd9419dbf35ba7f38d4835098d3838fd9400856ac4ec029e63bb42d859')
-prepare() {
- cd $pkgname-$pkgver
- patch -Np0 -i "$srcdir"/$pkgname-$pkgver-libpng15.patch
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
-}
-
-build() {
- cd $pkgname-$pkgver
- ./autogen.sh --prefix=/usr
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir/" install
-}
Copied: jbig2dec/repos/community-i686/PKGBUILD (from rev 130998, jbig2dec/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-04-08 22:23:25 UTC (rev 130999)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Bartłomiej Piotrowski
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+
+pkgname=jbig2dec
+pkgver=0.12
+pkgrel=1
+pkgdesc='Decoder implementation of the JBIG2 image compression format'
+url='http://www.ghostscript.com/jbig2dec.html'
+arch=('x86_64' 'i686')
+license=('GPL3')
+depends=('libpng')
+source=("http://downloads.ghostscript.com/public/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'libpng.patch')
+sha1sums=('b543d1c73267bc029f0fc57f468f8fcac27dd20f'
+ '96ce78085af547d0563af75fd8ac78eebb0402f5')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../libpng.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./autogen.sh --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/jbig2dec-0.11-libpng15.patch
===================================================================
--- community-i686/jbig2dec-0.11-libpng15.patch 2015-04-08 22:22:54 UTC (rev 130998)
+++ community-i686/jbig2dec-0.11-libpng15.patch 2015-04-08 22:23:25 UTC (rev 130999)
@@ -1,31 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -45,7 +45,7 @@
- fi
- dnl libpng requires pow() which may be in libm
- AC_SEARCH_LIBS([pow], [m])
-- AC_CHECK_LIB([png], [png_check_sig], [
-+ AC_CHECK_LIB([png], [png_sig_cmp], [
- AC_CHECK_LIB([z], [deflate], [
- AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)])
- LIBS="-lpng -lz $LIBS"
---- jbig2_image_png.c
-+++ jbig2_image_png.c
-@@ -33,7 +33,7 @@
- {
- png_size_t check;
-
-- check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
-+ check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));
- if (check != length) {
- png_error(png_ptr, "Write Error");
- }
-@@ -43,7 +43,7 @@
- jbig2_png_flush(png_structp png_ptr)
- {
- png_FILE_p io_ptr;
-- io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
-+ io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr);
- if (io_ptr != NULL)
- fflush(io_ptr);
- }
Copied: jbig2dec/repos/community-i686/libpng.patch (from rev 130998, jbig2dec/trunk/libpng.patch)
===================================================================
--- community-i686/libpng.patch (rev 0)
+++ community-i686/libpng.patch 2015-04-08 22:23:25 UTC (rev 130999)
@@ -0,0 +1,31 @@
+diff -aur old/jbig2_image_png.c new/jbig2_image_png.c
+--- old/jbig2_image_png.c 2014-10-31 03:30:04.000000000 -1000
++++ new/jbig2_image_png.c 2015-04-08 12:15:31.535949306 -1000
+@@ -25,8 +25,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <png.h>
+-#include <pngstruct.h>
++#include <libpng16/png.h>
+ #define CVT_PTR(ptr) (ptr)
+
+ #include "jbig2.h"
+@@ -40,7 +39,7 @@
+ {
+ png_size_t check;
+
+- check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
++ check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));
+ if (check != length) {
+ png_error(png_ptr, "Write Error");
+ }
+@@ -50,7 +49,7 @@
+ jbig2_png_flush(png_structp png_ptr)
+ {
+ png_FILE_p io_ptr;
+- io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
++ io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr);
+ if (io_ptr != NULL)
+ fflush(io_ptr);
+ }
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-04-08 22:22:54 UTC (rev 130998)
+++ community-x86_64/PKGBUILD 2015-04-08 22:23:25 UTC (rev 130999)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-
-pkgname=jbig2dec
-pkgver=0.11
-pkgrel=7
-pkgdesc="decoder implementation of the JBIG2 image compression format"
-arch=('x86_64' 'i686')
-url="http://jbig2dec.sourceforge.net/"
-license=('GPL3')
-depends=('glibc' 'libpng')
-source=(https://github.com/rillian/jbig2dec/archive/$pkgver.tar.gz
- $pkgname-$pkgver-libpng15.patch)
-sha256sums=('8af7b94b6026aff718d4b41ad990f2702f8fd4a348d565c4b48a695988ca0e9a'
- 'ed871abd9419dbf35ba7f38d4835098d3838fd9400856ac4ec029e63bb42d859')
-prepare() {
- cd $pkgname-$pkgver
- patch -Np0 -i "$srcdir"/$pkgname-$pkgver-libpng15.patch
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
-}
-
-build() {
- cd $pkgname-$pkgver
- ./autogen.sh --prefix=/usr
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir/" install
-}
Copied: jbig2dec/repos/community-x86_64/PKGBUILD (from rev 130998, jbig2dec/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-04-08 22:23:25 UTC (rev 130999)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Bartłomiej Piotrowski
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+
+pkgname=jbig2dec
+pkgver=0.12
+pkgrel=1
+pkgdesc='Decoder implementation of the JBIG2 image compression format'
+url='http://www.ghostscript.com/jbig2dec.html'
+arch=('x86_64' 'i686')
+license=('GPL3')
+depends=('libpng')
+source=("http://downloads.ghostscript.com/public/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'libpng.patch')
+sha1sums=('b543d1c73267bc029f0fc57f468f8fcac27dd20f'
+ '96ce78085af547d0563af75fd8ac78eebb0402f5')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../libpng.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./autogen.sh --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/jbig2dec-0.11-libpng15.patch
===================================================================
--- community-x86_64/jbig2dec-0.11-libpng15.patch 2015-04-08 22:22:54 UTC (rev 130998)
+++ community-x86_64/jbig2dec-0.11-libpng15.patch 2015-04-08 22:23:25 UTC (rev 130999)
@@ -1,31 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -45,7 +45,7 @@
- fi
- dnl libpng requires pow() which may be in libm
- AC_SEARCH_LIBS([pow], [m])
-- AC_CHECK_LIB([png], [png_check_sig], [
-+ AC_CHECK_LIB([png], [png_sig_cmp], [
- AC_CHECK_LIB([z], [deflate], [
- AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)])
- LIBS="-lpng -lz $LIBS"
---- jbig2_image_png.c
-+++ jbig2_image_png.c
-@@ -33,7 +33,7 @@
- {
- png_size_t check;
-
-- check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
-+ check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));
- if (check != length) {
- png_error(png_ptr, "Write Error");
- }
-@@ -43,7 +43,7 @@
- jbig2_png_flush(png_structp png_ptr)
- {
- png_FILE_p io_ptr;
-- io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
-+ io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr);
- if (io_ptr != NULL)
- fflush(io_ptr);
- }
Copied: jbig2dec/repos/community-x86_64/libpng.patch (from rev 130998, jbig2dec/trunk/libpng.patch)
===================================================================
--- community-x86_64/libpng.patch (rev 0)
+++ community-x86_64/libpng.patch 2015-04-08 22:23:25 UTC (rev 130999)
@@ -0,0 +1,31 @@
+diff -aur old/jbig2_image_png.c new/jbig2_image_png.c
+--- old/jbig2_image_png.c 2014-10-31 03:30:04.000000000 -1000
++++ new/jbig2_image_png.c 2015-04-08 12:15:31.535949306 -1000
+@@ -25,8 +25,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <png.h>
+-#include <pngstruct.h>
++#include <libpng16/png.h>
+ #define CVT_PTR(ptr) (ptr)
+
+ #include "jbig2.h"
+@@ -40,7 +39,7 @@
+ {
+ png_size_t check;
+
+- check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
++ check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));
+ if (check != length) {
+ png_error(png_ptr, "Write Error");
+ }
+@@ -50,7 +49,7 @@
+ jbig2_png_flush(png_structp png_ptr)
+ {
+ png_FILE_p io_ptr;
+- io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
++ io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr);
+ if (io_ptr != NULL)
+ fflush(io_ptr);
+ }
More information about the arch-commits
mailing list