From 748ff9670d5144df8e87a49e7031740b3d77214c Mon Sep 17 00:00:00 2001 From: David Seifert Date: Tue, 18 Oct 2016 20:23:25 +0200 Subject: media-libs/jasper: Version bump to 1.900.6 Gentoo-bug: 597208 Package-Manager: portage-2.3.2 --- media-libs/jasper/Manifest | 2 +- .../jasper-1.900.3-remove-stdbool-checks.patch | 47 ------------ .../files/jasper-1.900.6-fix-build-system.patch | 87 ++++++++++++++++++++++ media-libs/jasper/jasper-1.900.5.ebuild | 48 ------------ media-libs/jasper/jasper-1.900.6.ebuild | 48 ++++++++++++ 5 files changed, 136 insertions(+), 96 deletions(-) delete mode 100644 media-libs/jasper/files/jasper-1.900.3-remove-stdbool-checks.patch create mode 100644 media-libs/jasper/files/jasper-1.900.6-fix-build-system.patch delete mode 100644 media-libs/jasper/jasper-1.900.5.ebuild create mode 100644 media-libs/jasper/jasper-1.900.6.ebuild (limited to 'media-libs/jasper') diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest index c735309eb396..d65f756130f5 100644 --- a/media-libs/jasper/Manifest +++ b/media-libs/jasper/Manifest @@ -1,3 +1,3 @@ DIST jasper-1.900.1-fixes-20120611.patch.bz2 26303 SHA256 8727c94843f141c311be54eed97eca18f96542f52b991df6f7d4f005bad2ec59 SHA512 36ec1735a89008fa6be16698f78ca5ec52d4ef34f10653ba3bf081c665c4e2d747cdbd7bfc0d56859ad4dc0fac166cf08248336d25d3ba8e7feb57e65d5c5ef6 WHIRLPOOL 341639dc208c44eefb18d14b16bc74591989e4ec0bf6426bee1ed161f1c997a23dad487ac821f2bf8e1ae16ae74d6174dce39a913b44b4e24628a7a1510395a7 DIST jasper-1.900.1.zip 1415752 SHA256 6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494 SHA512 e3a3c803de848b50482f5bd693b1945197c6999285226c45b671855734d7bb2611fbe6f28cd8ba9c56a4ea59417795eba42d72516c9fec93b8fbaa21b8210cb6 WHIRLPOOL cd53901537bb8d32706e82326bf01f7f960af5172e2da738d1fcc9c5a4087829210a177d3df96617cf289e5db8ec97e06aa6cd60ada3b887db65418b90e9a86b -DIST jasper-1.900.5.tar.gz 787631 SHA256 282750114cbf0a748db86fd9ed250d0366811536b5265375ce3e303475870583 SHA512 63efdf28ac06d0555837c10d41d8411d0564483662474db21a8748c20486fc3b40dd36694c010db2d8d668190fc692871d9ca3b91211073abd4bc35ee6627ea9 WHIRLPOOL fe3e75a841dfeec7c6445e4316cb6ed60ead6af3008076422ea5f782a29a0641d4454f39332026a880306d92e0d0ab8b40b9e045697f9b7d3ca293540aa76423 +DIST jasper-1.900.6.tar.gz 787271 SHA256 5d0b4d684d19104b4564ef7142f4059eda91902620af36a3a6205d3dae66e027 SHA512 096e77609bf977eb0bbc9b1fc804bce7be1c7c81d066db7e367b61c4f6fa772a7a7ef21f7613485de46c3ca22cce57dce1e80c3736f54eb77eb44153218983b6 WHIRLPOOL 23edd5abc05248b43085f5a77a0210dcaf52089c57e31686478bd9b01284f294459ac1cad71eae4a594ef2632ba4323190b25d1a37dd36af0c0d7cd69579e568 diff --git a/media-libs/jasper/files/jasper-1.900.3-remove-stdbool-checks.patch b/media-libs/jasper/files/jasper-1.900.3-remove-stdbool-checks.patch deleted file mode 100644 index 08764ec5e51e..000000000000 --- a/media-libs/jasper/files/jasper-1.900.3-remove-stdbool-checks.patch +++ /dev/null @@ -1,47 +0,0 @@ -Remove undefining of true/false macros, this is not 1998. -See also: https://bugs.gentoo.org/show_bug.cgi?id=513240 - ---- a/src/libjasper/include/jasper/jas_types.h -+++ b/src/libjasper/include/jasper/jas_types.h -@@ -93,8 +93,6 @@ - #endif - - #if defined(HAVE_STDLIB_H) --#undef false --#undef true - #include - #endif - #if defined(HAVE_STDDEF_H) -@@ -104,32 +102,11 @@ - #include - #endif - --#ifndef __cplusplus --#if defined(HAVE_STDBOOL_H) - /* - * The C language implementation does correctly provide the standard header - * file "stdbool.h". - */ - #include --#else -- --/* -- * The C language implementation does not provide the standard header file -- * "stdbool.h" as required by ISO/IEC 9899:1999. Try to compensate for this -- * braindamage below. -- */ --#if !defined(bool) --#define bool int --#endif --#if !defined(true) --#define true 1 --#endif --#if !defined(false) --#define false 0 --#endif --#endif -- --#endif - - #if defined(HAVE_STDINT_H) - /* diff --git a/media-libs/jasper/files/jasper-1.900.6-fix-build-system.patch b/media-libs/jasper/files/jasper-1.900.6-fix-build-system.patch new file mode 100644 index 000000000000..d4ac76eaba19 --- /dev/null +++ b/media-libs/jasper/files/jasper-1.900.6-fix-build-system.patch @@ -0,0 +1,87 @@ +Include the the correct path for the produced jas_config.h header, +in order to enable VPATH builds. +See also: https://bugs.gentoo.org/show_bug.cgi?id=597208 + +--- a/src/appl/Makefile.am ++++ b/src/appl/Makefile.am +@@ -78,7 +78,7 @@ + man_MANS = imgcmp.1 imginfo.1 jasper.1 jiv.1 + EXTRA_DIST = $(man_MANS) + +-AM_CPPFLAGS = -I$(top_srcdir)/src/libjasper/include ++AM_CPPFLAGS = -I$(top_builddir)/src/libjasper/include -I$(top_srcdir)/src/libjasper/include + + MYLDFLAGS = ../libjasper/libjasper.la + jasper_LDADD = $(MYLDFLAGS) +--- a/src/libjasper/base/Makefile.am ++++ b/src/libjasper/base/Makefile.am +@@ -73,4 +73,4 @@ + jas_tvp.c \ + jas_version.c + +-AM_CPPFLAGS = -I$(top_srcdir)/src/libjasper/include ++AM_CPPFLAGS = -I$(top_builddir)/src/libjasper/include -I$(top_srcdir)/src/libjasper/include +--- a/src/libjasper/bmp/Makefile.am ++++ b/src/libjasper/bmp/Makefile.am +@@ -64,4 +64,4 @@ + bmp_dec.c \ + bmp_enc.c + +-AM_CPPFLAGS = -I$(top_srcdir)/src/libjasper/include ++AM_CPPFLAGS = -I$(top_builddir)/src/libjasper/include -I$(top_srcdir)/src/libjasper/include +--- a/src/libjasper/jp2/Makefile.am ++++ b/src/libjasper/jp2/Makefile.am +@@ -64,4 +64,4 @@ + jp2_dec.c \ + jp2_enc.c + +-AM_CPPFLAGS = -I$(top_srcdir)/src/libjasper/include ++AM_CPPFLAGS = -I$(top_builddir)/src/libjasper/include -I$(top_srcdir)/src/libjasper/include +--- a/src/libjasper/jpc/Makefile.am ++++ b/src/libjasper/jpc/Makefile.am +@@ -102,4 +102,4 @@ + jpc_t2enc.c \ + jpc_util.c + +-AM_CPPFLAGS = -I$(top_srcdir)/src/libjasper/include ++AM_CPPFLAGS = -I$(top_builddir)/src/libjasper/include -I$(top_srcdir)/src/libjasper/include +--- a/src/libjasper/jpg/Makefile.am ++++ b/src/libjasper/jpg/Makefile.am +@@ -76,4 +76,4 @@ + jpg_enc.c \ + jpg_dummy.c + +-AM_CPPFLAGS = -I$(top_srcdir)/src/libjasper/include ++AM_CPPFLAGS = -I$(top_builddir)/src/libjasper/include -I$(top_srcdir)/src/libjasper/include +--- a/src/libjasper/mif/Makefile.am ++++ b/src/libjasper/mif/Makefile.am +@@ -63,4 +63,4 @@ + mif_cod.h \ + mif_cod.c + +-AM_CPPFLAGS = -I$(top_srcdir)/src/libjasper/include ++AM_CPPFLAGS = -I$(top_builddir)/src/libjasper/include -I$(top_srcdir)/src/libjasper/include +--- a/src/libjasper/pgx/Makefile.am ++++ b/src/libjasper/pgx/Makefile.am +@@ -64,4 +64,4 @@ + pgx_dec.c \ + pgx_enc.c + +-AM_CPPFLAGS = -I$(top_srcdir)/src/libjasper/include ++AM_CPPFLAGS = -I$(top_builddir)/src/libjasper/include -I$(top_srcdir)/src/libjasper/include +--- a/src/libjasper/pnm/Makefile.am ++++ b/src/libjasper/pnm/Makefile.am +@@ -64,4 +64,4 @@ + pnm_dec.c \ + pnm_enc.c + +-AM_CPPFLAGS = -I$(top_srcdir)/src/libjasper/include ++AM_CPPFLAGS = -I$(top_builddir)/src/libjasper/include -I$(top_srcdir)/src/libjasper/include +--- a/src/libjasper/ras/Makefile.am ++++ b/src/libjasper/ras/Makefile.am +@@ -64,4 +64,4 @@ + ras_dec.c \ + ras_enc.c + +-AM_CPPFLAGS = -I$(top_srcdir)/src/libjasper/include ++AM_CPPFLAGS = -I$(top_builddir)/src/libjasper/include -I$(top_srcdir)/src/libjasper/include diff --git a/media-libs/jasper/jasper-1.900.5.ebuild b/media-libs/jasper/jasper-1.900.5.ebuild deleted file mode 100644 index 1fff50746f0c..000000000000 --- a/media-libs/jasper/jasper-1.900.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit autotools vcs-snapshot multilib-minimal - -DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard" -HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/" -SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="JasPer2.0" -SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="jpeg opengl static-libs" - -RDEPEND=" - jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) - opengl? ( - >=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}] - >=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}] - virtual/glu - )" -DEPEND="${RDEPEND} - app-arch/unzip" - -PATCHES=( "${FILESDIR}/${PN}-1.900.3-remove-stdbool-checks.patch" ) - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable jpeg libjpeg) \ - $(use_enable opengl) \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - einstalldocs - dodoc -r doc/. - - # package provides .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/jasper/jasper-1.900.6.ebuild b/media-libs/jasper/jasper-1.900.6.ebuild new file mode 100644 index 000000000000..b97fefe01e32 --- /dev/null +++ b/media-libs/jasper/jasper-1.900.6.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools vcs-snapshot multilib-minimal + +DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard" +HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/" +SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="JasPer2.0" +SLOT="0/1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="jpeg opengl static-libs" + +RDEPEND=" + jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) + opengl? ( + >=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}] + >=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}] + virtual/glu + )" +DEPEND="${RDEPEND} + app-arch/unzip" + +PATCHES=( "${FILESDIR}/${PN}-1.900.6-fix-build-system.patch" ) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable jpeg libjpeg) \ + $(use_enable opengl) \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + dodoc -r doc/. + + # package provides .pc files + find "${D}" -name '*.la' -delete || die +} -- cgit v1.2.3-65-gdbad