jbig2dec: import from upstream Gentoo

Upgraded media-libs/jbig2dec to version 0.11-r1 on amd64, arm, x86.

The current ghostscript-gpl ebuild has been bundling jbig2dec, but
with the latest versions (follow up CL), it uses the system one.

BUG=chromium-os:25177
TEST=`cbuildbot chromiumos-sdk` works

Change-Id: I64ef9325386427472c8d34e21e2b9fafe4a943e0
Reviewed-on: https://gerrit.chromium.org/gerrit/20616
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2012-04-19 14:37:48 -04:00 committed by Gerrit
parent 609cfd6aeb
commit dc866fc127
4 changed files with 94 additions and 0 deletions

View File

@ -0,0 +1,2 @@
DIST jb2streams.zip 1285838 RMD160 73553def8ccb64dde6885da425bd149944009bfe SHA1 2501935b72734e899a0c2ca24b8b65b6810fe31a SHA256 3d1e5c79054b59d061cabdb1d7ba2d1b3f84700f5c517ba4306f7047660016f7
DIST jbig2dec-0.11.tar.gz 371499 RMD160 8ee69d11d7aa6c590515a4d84644e273897bb4d0 SHA1 349cd765616db7aac1f4dd1d45957d1da65ea925 SHA256 7e2d8330b36f2765da22043d174827bee0f30db8d78c330904f363275c7dd0b9

View File

@ -0,0 +1,31 @@
--- 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);
}

View File

@ -0,0 +1,47 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild,v 1.11 2012/03/18 17:37:53 armin76 Exp $
EAPI=4
inherit autotools eutils
DESCRIPTION="A decoder implementation of the JBIG2 image compression format"
HOMEPAGE="http://jbig2dec.sourceforge.net/"
SRC_URI="http://ghostscript.com/~giles/jbig2/${PN}/${P}.tar.gz
test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
IUSE="png static-libs test"
RDEPEND="png? ( >=media-libs/libpng-1.2:0 )"
DEPEND="${RDEPEND}
test? ( app-arch/unzip )"
RESTRICT="test"
# bug 324275
DOCS="CHANGES README"
src_prepare() {
epatch "${FILESDIR}"/${P}-libpng15.patch
eautoreconf
if use test; then
mkdir "${WORKDIR}/ubc" || die
mv -v "${WORKDIR}"/*.jb2 "${WORKDIR}/ubc/" || die
mv -v "${WORKDIR}"/*.bmp "${WORKDIR}/ubc/" || die
fi
}
src_configure() {
econf \
$(use_enable static-libs static) \
$(use_with png libpng)
}
src_install() {
default
find "${ED}" -name '*.la' -exec rm -f {} +
}

View File

@ -0,0 +1,14 @@
DEFINED_PHASES=configure install prepare
DEPEND=png? ( >=media-libs/libpng-1.2:0 ) test? ( app-arch/unzip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=A decoder implementation of the JBIG2 image compression format
EAPI=4
HOMEPAGE=http://jbig2dec.sourceforge.net/
IUSE=png static-libs test
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
LICENSE=GPL-3
RDEPEND=png? ( >=media-libs/libpng-1.2:0 )
RESTRICT=test
SLOT=0
SRC_URI=http://ghostscript.com/~giles/jbig2/jbig2dec/jbig2dec-0.11.tar.gz test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
_md5_=546f888f1134478389ee068da19a454c