[gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/, media-libs/jasper/files/

[David Seifert]

commit:     ece2cf67ac87c152c955189229cd3a2b2206e0a9
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 20:46:01 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 21:29:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece2cf67

media-libs/jasper: Version bump to 1.900.3

Gentoo-bug: 513240
* EAPI=6
* Import latest Fedora patchset

Package-Manager: portage-2.3.2

 media-libs/jasper/Manifest                         |  2 +
 .../jasper-1.900.3-remove-stdbool-checks.patch     | 47 ++++++++++++++++++
 media-libs/jasper/jasper-1.900.3.ebuild            | 58 ++++++++++++++++++++++
 3 files changed, 107 insertions(+)

diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index a9004f7..91508c5 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,2 +1,4 @@
 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.3.tar.gz 786626 SHA256 9ca78f4ae646cc1a8e0116fc440caa87beef87f4dc45de31a25b4cfab4e7a9da SHA512 de872ab53dde6dfd2dd99d04f776815a61f564cf656c33c9ebe068fd6043b2d5ab65f3efcb3e3a432269f68454fcdde3b947a700bbb93dbdfa343398adb17c36 WHIRLPOOL d0b825a9768d3de4483fe5e47643f219fafe8de7b37930ca1af868a3b3e42f66ae6a147c0cebd171d298b2c6f43f65232e7a561f4f17cda58a9860dc6d8d6671
+DIST jasper-1.900.3_p20161014-patches.tar.bz2 8918 SHA256 5e3cd08283c57c6f1988c08a56a1be9ad851fde502bac36852c7ba933808407f SHA512 0d1fb92ada3db806dde65f354ea82de26673a52dabbdd8483a9c38ec7ce6fef4f7fa3aafd4e7df1b6e9ffd760ae54eef5612623585e557955c04b553c20a57a3 WHIRLPOOL 7a3991041b6e2c8f82501b5e3ae139611f22df6e5d7bfd883ab0f55ac9f987666503df17fcc4a58ad1a536bc708d80a54f35fbd19526c88393b857187d91ef17

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
new file mode 100644
index 00000000..08764ec
--- /dev/null
+++ b/media-libs/jasper/files/jasper-1.900.3-remove-stdbool-checks.patch
@@ -0,0 +1,47 @@
+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 <stdlib.h>
+ #endif
+ #if defined(HAVE_STDDEF_H)
+@@ -104,32 +102,11 @@
+ #include <sys/types.h>
+ #endif
+ 
+-#ifndef __cplusplus
+-#if defined(HAVE_STDBOOL_H)
+ /*
+  * The C language implementation does correctly provide the standard header
+  * file "stdbool.h".
+  */
+ #include <stdbool.h>
+-#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/jasper-1.900.3.ebuild b/media-libs/jasper/jasper-1.900.3.ebuild
new file mode 100644
index 00000000..db4a6f3
--- /dev/null
+++ b/media-libs/jasper/jasper-1.900.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools 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
+	https://dev.gentoo.org/~soap/distfiles/${PN}-1.900.3_p20161014-patches.tar.bz2"
+
+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"
+
+S="${WORKDIR}/${PN}-version-${PV}"
+PATCHES=(
+	"${WORKDIR}/${PN}-1.900.3-libjasper-stepsizes-overflow.patch"
+	"${WORKDIR}/${PN}-1.900.3-CVE-2008-3520.patch"
+	"${WORKDIR}/${PN}-1.900.3-CVE-2011-4516-CVE-2011-4517-CERT-VU-887409.patch"
+	"${WORKDIR}/${PN}-1.900.3-Coverity-NULL_RETURNS.patch"
+	"${WORKDIR}/${PN}-1.900.3-Coverity-RESOURCE_LEAK.patch"
+	"${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
+}