* [gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/files/, media-libs/jasper/
@ 2016-10-18 18:35 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2016-10-18 18:35 UTC (permalink / raw
To: gentoo-commits
commit: 748ff9670d5144df8e87a49e7031740b3d77214c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 18:23:25 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 18:35:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=748ff967
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 ++++++++++++++++++++++
...jasper-1.900.5.ebuild => jasper-1.900.6.ebuild} | 2 +-
4 files changed, 89 insertions(+), 49 deletions(-)
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index c735309..d65f756 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 08764ec..00000000
--- 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 <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/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 00000000..d4ac76e
--- /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.6.ebuild
similarity index 94%
rename from media-libs/jasper/jasper-1.900.5.ebuild
rename to media-libs/jasper/jasper-1.900.6.ebuild
index 1fff507..b97fefe 100644
--- a/media-libs/jasper/jasper-1.900.5.ebuild
+++ b/media-libs/jasper/jasper-1.900.6.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
DEPEND="${RDEPEND}
app-arch/unzip"
-PATCHES=( "${FILESDIR}/${PN}-1.900.3-remove-stdbool-checks.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.900.6-fix-build-system.patch" )
src_prepare() {
default
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/files/, media-libs/jasper/
@ 2016-10-23 14:18 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2016-10-23 14:18 UTC (permalink / raw
To: gentoo-commits
commit: d77b676ea52f91f2cfefcca27f0224f3732b5d7c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 13:33:34 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 14:17:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d77b676e
media-libs/jasper: Remove old
Package-Manager: portage-2.3.2
media-libs/jasper/Manifest | 2 -
media-libs/jasper/files/CVE-2011-4516+7.patch | 24 --
media-libs/jasper/files/jasper-1.701.0-GL-ac.patch | 11 -
media-libs/jasper/files/jasper-1.701.0-GL.patch | 11 -
media-libs/jasper/files/jasper-CVE-2014-8137.patch | 57 ----
media-libs/jasper/files/jasper-CVE-2014-8138.patch | 14 -
media-libs/jasper/files/jasper-CVE-2014-8157.patch | 12 -
media-libs/jasper/files/jasper-CVE-2014-8158.patch | 329 ---------------------
media-libs/jasper/files/jasper-CVE-2014-9029.patch | 29 --
media-libs/jasper/files/jasper-pkgconfig.patch | 48 ---
media-libs/jasper/jasper-1.900.1-r9.ebuild | 59 ----
11 files changed, 596 deletions(-)
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index d65f756..65c6795 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,3 +1 @@
-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.6.tar.gz 787271 SHA256 5d0b4d684d19104b4564ef7142f4059eda91902620af36a3a6205d3dae66e027 SHA512 096e77609bf977eb0bbc9b1fc804bce7be1c7c81d066db7e367b61c4f6fa772a7a7ef21f7613485de46c3ca22cce57dce1e80c3736f54eb77eb44153218983b6 WHIRLPOOL 23edd5abc05248b43085f5a77a0210dcaf52089c57e31686478bd9b01284f294459ac1cad71eae4a594ef2632ba4323190b25d1a37dd36af0c0d7cd69579e568
diff --git a/media-libs/jasper/files/CVE-2011-4516+7.patch b/media-libs/jasper/files/CVE-2011-4516+7.patch
deleted file mode 100644
index 1f1c7bb..00000000
--- a/media-libs/jasper/files/CVE-2011-4516+7.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up jasper-1.900.1/src/libjasper/jpc/jpc_cs.c.CERT-VU-887409 jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
---- jasper-1.900.1/src/libjasper/jpc/jpc_cs.c.CERT-VU-887409 2011-10-25 17:25:39.000000000 +0200
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c 2011-10-25 17:29:14.379371908 +0200
-@@ -744,6 +744,10 @@ static int jpc_cox_getcompparms(jpc_ms_t
- return -1;
- }
- compparms->numrlvls = compparms->numdlvls + 1;
-+ if (compparms->numrlvls > JPC_MAXRLVLS) {
-+ jpc_cox_destroycompparms(compparms);
-+ return -1;
-+ }
- if (prtflag) {
- for (i = 0; i < compparms->numrlvls; ++i) {
- if (jpc_getuint8(in, &tmp)) {
-@@ -1331,7 +1335,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
- jpc_crgcomp_t *comp;
- uint_fast16_t compno;
- crg->numcomps = cstate->numcomps;
-- if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
-+ if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(jpc_crgcomp_t)))) {
- return -1;
- }
- for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
-
diff --git a/media-libs/jasper/files/jasper-1.701.0-GL-ac.patch b/media-libs/jasper/files/jasper-1.701.0-GL-ac.patch
deleted file mode 100644
index bf57143..00000000
--- a/media-libs/jasper/files/jasper-1.701.0-GL-ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- jasper-1.701.0.GEO/configure.ac.GL 2006-02-20 19:58:02.000000000 -0600
-+++ jasper-1.701.0.GEO/configure.ac 2006-02-24 07:40:38.000000000 -0600
-@@ -242,7 +242,7 @@
- OPENGL_LIBS=""
- if test $ENABLE_OPENGL = yes; then
- if test $HAVE_OPENGL = no; then
-- TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+ TMPLIBS="-lglut -lGL -lGLU"
- AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
- OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
- fi
diff --git a/media-libs/jasper/files/jasper-1.701.0-GL.patch b/media-libs/jasper/files/jasper-1.701.0-GL.patch
deleted file mode 100644
index ba199e2..00000000
--- a/media-libs/jasper/files/jasper-1.701.0-GL.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- jasper-1.701.0.GEO/configure.GL 2006-02-20 20:01:30.000000000 -0600
-+++ jasper-1.701.0.GEO/configure 2006-02-24 07:40:46.000000000 -0600
-@@ -9464,7 +9464,7 @@
- OPENGL_LIBS=""
- if test $ENABLE_OPENGL = yes; then
- if test $HAVE_OPENGL = no; then
-- TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+ TMPLIBS="-lglut -lGL -lGLU"
- echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
- echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
- if test "${ac_cv_lib_glut_glutInit+set}" = set; then
diff --git a/media-libs/jasper/files/jasper-CVE-2014-8137.patch b/media-libs/jasper/files/jasper-CVE-2014-8137.patch
deleted file mode 100644
index 9600cd3..00000000
--- a/media-libs/jasper/files/jasper-CVE-2014-8137.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c 2014-12-11 14:06:44.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_icc.c 2014-12-11 15:16:37.971272386 +0100
-@@ -1009,7 +1009,6 @@ static int jas_icccurv_input(jas_iccattr
- return 0;
-
- error:
-- jas_icccurv_destroy(attrval);
- return -1;
- }
-
-@@ -1127,7 +1126,6 @@ static int jas_icctxtdesc_input(jas_icca
- #endif
- return 0;
- error:
-- jas_icctxtdesc_destroy(attrval);
- return -1;
- }
-
-@@ -1206,8 +1204,6 @@ static int jas_icctxt_input(jas_iccattrv
- goto error;
- return 0;
- error:
-- if (txt->string)
-- jas_free(txt->string);
- return -1;
- }
-
-@@ -1328,7 +1324,6 @@ static int jas_icclut8_input(jas_iccattr
- goto error;
- return 0;
- error:
-- jas_icclut8_destroy(attrval);
- return -1;
- }
-
-@@ -1497,7 +1492,6 @@ static int jas_icclut16_input(jas_iccatt
- goto error;
- return 0;
- error:
-- jas_icclut16_destroy(attrval);
- return -1;
- }
-
---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:30:54.193209780 +0100
-+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:36:46.313217814 +0100
-@@ -291,7 +291,10 @@ jas_image_t *jp2_decode(jas_stream_t *in
- case JP2_COLR_ICC:
- iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp,
- dec->colr->data.colr.iccplen);
-- assert(iccprof);
-+ if (!iccprof) {
-+ jas_eprintf("error: failed to parse ICC profile\n");
-+ goto error;
-+ }
- jas_iccprof_gethdr(iccprof, &icchdr);
- jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc);
- jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc));
diff --git a/media-libs/jasper/files/jasper-CVE-2014-8138.patch b/media-libs/jasper/files/jasper-CVE-2014-8138.patch
deleted file mode 100644
index 5aaf8ab..00000000
--- a/media-libs/jasper/files/jasper-CVE-2014-8138.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:44.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:26.000000000 +0100
-@@ -386,6 +386,11 @@ jas_image_t *jp2_decode(jas_stream_t *in
- /* Determine the type of each component. */
- if (dec->cdef) {
- for (i = 0; i < dec->numchans; ++i) {
-+ /* Is the channel number reasonable? */
-+ if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) {
-+ jas_eprintf("error: invalid channel number in CDEF box\n");
-+ goto error;
-+ }
- jas_image_setcmpttype(dec->image,
- dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo],
- jp2_getct(jas_image_clrspc(dec->image),
diff --git a/media-libs/jasper/files/jasper-CVE-2014-8157.patch b/media-libs/jasper/files/jasper-CVE-2014-8157.patch
deleted file mode 100644
index ebfc1b2..00000000
--- a/media-libs/jasper/files/jasper-CVE-2014-8157.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up jasper-1.900.1/src/libjasper/jpc/jpc_dec.c.CVE-2014-8157 jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
---- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c.CVE-2014-8157 2015-01-19 16:59:36.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2015-01-19 17:07:41.609863268 +0100
-@@ -489,7 +489,7 @@ static int jpc_dec_process_sot(jpc_dec_t
- dec->curtileendoff = 0;
- }
-
-- if (JAS_CAST(int, sot->tileno) > dec->numtiles) {
-+ if (JAS_CAST(int, sot->tileno) >= dec->numtiles) {
- jas_eprintf("invalid tile number in SOT marker segment\n");
- return -1;
- }
diff --git a/media-libs/jasper/files/jasper-CVE-2014-8158.patch b/media-libs/jasper/files/jasper-CVE-2014-8158.patch
deleted file mode 100644
index ce9e4b4..00000000
--- a/media-libs/jasper/files/jasper-CVE-2014-8158.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-diff -up jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c.CVE-2014-8158 jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c
---- jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c.CVE-2014-8158 2015-01-19 17:25:28.730195502 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c 2015-01-19 17:27:20.214663127 +0100
-@@ -306,11 +306,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
- {
-
- int bufsize = JPC_CEILDIVPOW2(numcols, 1);
--#if !defined(HAVE_VLA)
- jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
--#else
-- jpc_fix_t splitbuf[bufsize];
--#endif
- jpc_fix_t *buf = splitbuf;
- register jpc_fix_t *srcptr;
- register jpc_fix_t *dstptr;
-@@ -318,7 +314,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
- register int m;
- int hstartcol;
-
--#if !defined(HAVE_VLA)
- /* Get a buffer. */
- if (bufsize > QMFB_SPLITBUFSIZE) {
- if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
-@@ -326,7 +321,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
- abort();
- }
- }
--#endif
-
- if (numcols >= 2) {
- hstartcol = (numcols + 1 - parity) >> 1;
-@@ -360,12 +354,10 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
- }
- }
-
--#if !defined(HAVE_VLA)
- /* If the split buffer was allocated on the heap, free this memory. */
- if (buf != splitbuf) {
- jas_free(buf);
- }
--#endif
-
- }
-
-@@ -374,11 +366,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
- {
-
- int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
- jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
--#else
-- jpc_fix_t splitbuf[bufsize];
--#endif
- jpc_fix_t *buf = splitbuf;
- register jpc_fix_t *srcptr;
- register jpc_fix_t *dstptr;
-@@ -386,7 +374,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
- register int m;
- int hstartcol;
-
--#if !defined(HAVE_VLA)
- /* Get a buffer. */
- if (bufsize > QMFB_SPLITBUFSIZE) {
- if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
-@@ -394,7 +381,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
- abort();
- }
- }
--#endif
-
- if (numrows >= 2) {
- hstartcol = (numrows + 1 - parity) >> 1;
-@@ -428,12 +414,10 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
- }
- }
-
--#if !defined(HAVE_VLA)
- /* If the split buffer was allocated on the heap, free this memory. */
- if (buf != splitbuf) {
- jas_free(buf);
- }
--#endif
-
- }
-
-@@ -442,11 +426,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
- {
-
- int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
- jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE];
--#else
-- jpc_fix_t splitbuf[bufsize * JPC_QMFB_COLGRPSIZE];
--#endif
- jpc_fix_t *buf = splitbuf;
- jpc_fix_t *srcptr;
- jpc_fix_t *dstptr;
-@@ -457,7 +437,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
- int m;
- int hstartcol;
-
--#if !defined(HAVE_VLA)
- /* Get a buffer. */
- if (bufsize > QMFB_SPLITBUFSIZE) {
- if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
-@@ -465,7 +444,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
- abort();
- }
- }
--#endif
-
- if (numrows >= 2) {
- hstartcol = (numrows + 1 - parity) >> 1;
-@@ -517,12 +495,10 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
- }
- }
-
--#if !defined(HAVE_VLA)
- /* If the split buffer was allocated on the heap, free this memory. */
- if (buf != splitbuf) {
- jas_free(buf);
- }
--#endif
-
- }
-
-@@ -531,11 +507,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
- {
-
- int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
- jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE];
--#else
-- jpc_fix_t splitbuf[bufsize * numcols];
--#endif
- jpc_fix_t *buf = splitbuf;
- jpc_fix_t *srcptr;
- jpc_fix_t *dstptr;
-@@ -546,7 +518,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
- int m;
- int hstartcol;
-
--#if !defined(HAVE_VLA)
- /* Get a buffer. */
- if (bufsize > QMFB_SPLITBUFSIZE) {
- if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
-@@ -554,7 +525,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
- abort();
- }
- }
--#endif
-
- if (numrows >= 2) {
- hstartcol = (numrows + 1 - parity) >> 1;
-@@ -606,12 +576,10 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
- }
- }
-
--#if !defined(HAVE_VLA)
- /* If the split buffer was allocated on the heap, free this memory. */
- if (buf != splitbuf) {
- jas_free(buf);
- }
--#endif
-
- }
-
-@@ -619,18 +587,13 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
- {
-
- int bufsize = JPC_CEILDIVPOW2(numcols, 1);
--#if !defined(HAVE_VLA)
- jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
--#else
-- jpc_fix_t joinbuf[bufsize];
--#endif
- jpc_fix_t *buf = joinbuf;
- register jpc_fix_t *srcptr;
- register jpc_fix_t *dstptr;
- register int n;
- int hstartcol;
-
--#if !defined(HAVE_VLA)
- /* Allocate memory for the join buffer from the heap. */
- if (bufsize > QMFB_JOINBUFSIZE) {
- if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
-@@ -638,7 +601,6 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
- abort();
- }
- }
--#endif
-
- hstartcol = (numcols + 1 - parity) >> 1;
-
-@@ -670,12 +632,10 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
- ++srcptr;
- }
-
--#if !defined(HAVE_VLA)
- /* If the join buffer was allocated on the heap, free this memory. */
- if (buf != joinbuf) {
- jas_free(buf);
- }
--#endif
-
- }
-
-@@ -684,18 +644,13 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
- {
-
- int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
- jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
--#else
-- jpc_fix_t joinbuf[bufsize];
--#endif
- jpc_fix_t *buf = joinbuf;
- register jpc_fix_t *srcptr;
- register jpc_fix_t *dstptr;
- register int n;
- int hstartcol;
-
--#if !defined(HAVE_VLA)
- /* Allocate memory for the join buffer from the heap. */
- if (bufsize > QMFB_JOINBUFSIZE) {
- if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
-@@ -703,7 +658,6 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
- abort();
- }
- }
--#endif
-
- hstartcol = (numrows + 1 - parity) >> 1;
-
-@@ -735,12 +689,10 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
- ++srcptr;
- }
-
--#if !defined(HAVE_VLA)
- /* If the join buffer was allocated on the heap, free this memory. */
- if (buf != joinbuf) {
- jas_free(buf);
- }
--#endif
-
- }
-
-@@ -749,11 +701,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a,
- {
-
- int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
- jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE];
--#else
-- jpc_fix_t joinbuf[bufsize * JPC_QMFB_COLGRPSIZE];
--#endif
- jpc_fix_t *buf = joinbuf;
- jpc_fix_t *srcptr;
- jpc_fix_t *dstptr;
-@@ -763,7 +711,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a,
- register int i;
- int hstartcol;
-
--#if !defined(HAVE_VLA)
- /* Allocate memory for the join buffer from the heap. */
- if (bufsize > QMFB_JOINBUFSIZE) {
- if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
-@@ -771,7 +718,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a,
- abort();
- }
- }
--#endif
-
- hstartcol = (numrows + 1 - parity) >> 1;
-
-@@ -821,12 +767,10 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a,
- srcptr += JPC_QMFB_COLGRPSIZE;
- }
-
--#if !defined(HAVE_VLA)
- /* If the join buffer was allocated on the heap, free this memory. */
- if (buf != joinbuf) {
- jas_free(buf);
- }
--#endif
-
- }
-
-@@ -835,11 +779,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a,
- {
-
- int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
- jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE];
--#else
-- jpc_fix_t joinbuf[bufsize * numcols];
--#endif
- jpc_fix_t *buf = joinbuf;
- jpc_fix_t *srcptr;
- jpc_fix_t *dstptr;
-@@ -849,7 +789,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a,
- register int i;
- int hstartcol;
-
--#if !defined(HAVE_VLA)
- /* Allocate memory for the join buffer from the heap. */
- if (bufsize > QMFB_JOINBUFSIZE) {
- if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
-@@ -857,7 +796,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a,
- abort();
- }
- }
--#endif
-
- hstartcol = (numrows + 1 - parity) >> 1;
-
-@@ -907,12 +845,10 @@ void jpc_qmfb_join_colres(jpc_fix_t *a,
- srcptr += numcols;
- }
-
--#if !defined(HAVE_VLA)
- /* If the join buffer was allocated on the heap, free this memory. */
- if (buf != joinbuf) {
- jas_free(buf);
- }
--#endif
-
- }
-
diff --git a/media-libs/jasper/files/jasper-CVE-2014-9029.patch b/media-libs/jasper/files/jasper-CVE-2014-9029.patch
deleted file mode 100644
index 98a2035..00000000
--- a/media-libs/jasper/files/jasper-CVE-2014-9029.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:45:44.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:44:58.000000000 +0100
-@@ -1281,7 +1281,7 @@ static int jpc_dec_process_coc(jpc_dec_t
- jpc_coc_t *coc = &ms->parms.coc;
- jpc_dec_tile_t *tile;
-
-- if (JAS_CAST(int, coc->compno) > dec->numcomps) {
-+ if (JAS_CAST(int, coc->compno) >= dec->numcomps) {
- jas_eprintf("invalid component number in COC marker segment\n");
- return -1;
- }
-@@ -1307,7 +1307,7 @@ static int jpc_dec_process_rgn(jpc_dec_t
- jpc_rgn_t *rgn = &ms->parms.rgn;
- jpc_dec_tile_t *tile;
-
-- if (JAS_CAST(int, rgn->compno) > dec->numcomps) {
-+ if (JAS_CAST(int, rgn->compno) >= dec->numcomps) {
- jas_eprintf("invalid component number in RGN marker segment\n");
- return -1;
- }
-@@ -1356,7 +1356,7 @@ static int jpc_dec_process_qcc(jpc_dec_t
- jpc_qcc_t *qcc = &ms->parms.qcc;
- jpc_dec_tile_t *tile;
-
-- if (JAS_CAST(int, qcc->compno) > dec->numcomps) {
-+ if (JAS_CAST(int, qcc->compno) >= dec->numcomps) {
- jas_eprintf("invalid component number in QCC marker segment\n");
- return -1;
- }
diff --git a/media-libs/jasper/files/jasper-pkgconfig.patch b/media-libs/jasper/files/jasper-pkgconfig.patch
deleted file mode 100644
index c8af5ca..00000000
--- a/media-libs/jasper/files/jasper-pkgconfig.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur jasper-1.900.1/configure.ac jasper-1.900.1.new/configure.ac
---- jasper-1.900.1/configure.ac 2007-01-19 21:47:11.000000000 +0000
-+++ jasper-1.900.1.new/configure.ac 2009-10-29 13:37:02.000000000 +0000
-@@ -399,6 +399,8 @@
- src/libjasper/pnm/Makefile
- src/libjasper/ras/Makefile
- src/msvc/Makefile
-+pkgconfig/Makefile
-+pkgconfig/jasper.pc
- jasper.spec
- ])
- AC_OUTPUT
-diff -Naur jasper-1.900.1/Makefile.am jasper-1.900.1.new/Makefile.am
---- jasper-1.900.1/Makefile.am 2007-01-19 21:43:14.000000000 +0000
-+++ jasper-1.900.1.new/Makefile.am 2009-10-29 13:36:28.000000000 +0000
-@@ -64,7 +64,7 @@
- # Note: We need to put the derived file "jasper.spec" in the distribution
- # in order to facilitate RPM building.
-
--SUBDIRS = src
-+SUBDIRS = src pkgconfig
-
- rpm: dist
- for i in BUILD RPMS SRPMS SOURCES SPECS; do \
-diff -Naur jasper-1.900.1/pkgconfig/jasper.pc.in jasper-1.900.1.new/pkgconfig/jasper.pc.in
---- jasper-1.900.1/pkgconfig/jasper.pc.in 1970-01-01 01:00:00.000000000 +0100
-+++ jasper-1.900.1.new/pkgconfig/jasper.pc.in 2009-10-29 16:30:43.000000000 +0000
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: Jasper
-+Description: JPEG 2000 encoding and decoding library
-+Version: @VERSION@
-+
-+Libs: -L${libdir} -ljasper
-+Cflags: -I${includedir}/jasper
-diff -Naur jasper-1.900.1/pkgconfig/Makefile.am jasper-1.900.1.new/pkgconfig/Makefile.am
---- jasper-1.900.1/pkgconfig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ jasper-1.900.1.new/pkgconfig/Makefile.am 2009-10-29 13:38:59.000000000 +0000
-@@ -0,0 +1,5 @@
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = jasper.pc
-+
-+EXTRA_DIST = \
-+ jasper.pc.in
diff --git a/media-libs/jasper/jasper-1.900.1-r9.ebuild b/media-libs/jasper/jasper-1.900.1-r9.ebuild
deleted file mode 100644
index bdd90ff..00000000
--- a/media-libs/jasper/jasper-1.900.1-r9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# outdated './configure': breaks in 'USE=opengl ABI_X86="32 64"' case:
-# uses /usr/lib64 for 32-bit ABI.
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-multilib
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/"
-SRC_URI="
- http://www.ece.uvic.ca/~mdadams/${PN}/software/${P}.zip
- mirror://gentoo/${P}-fixes-20120611.patch.bz2"
-
-LICENSE="JasPer2.0"
-SLOT="0"
-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=(
- "${WORKDIR}"/${P}-fixes-20120611.patch
- "${FILESDIR}"/${PN}-1.701.0-GL-ac.patch
- "${FILESDIR}"/${PN}-1.701.0-GL.patch
- "${FILESDIR}"/${PN}-CVE-2014-9029.patch
- "${FILESDIR}"/${PN}-CVE-2014-8137.patch
- "${FILESDIR}"/${PN}-CVE-2014-8138.patch
- "${FILESDIR}"/${PN}-CVE-2014-8157.patch
- "${FILESDIR}"/${PN}-CVE-2014-8158.patch
- "${FILESDIR}"/${PN}-pkgconfig.patch
- )
-
-DOCS=( NEWS README doc/. )
-
-src_prepare() {
- chmod -R o-w "${S}" || die
- autotools-multilib_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable jpeg libjpeg)
- $(use_enable opengl)
- )
- autotools-multilib_src_configure
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/files/, media-libs/jasper/
@ 2016-11-27 10:24 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2016-11-27 10:24 UTC (permalink / raw
To: gentoo-commits
commit: 2d999e4fab11e650d00119c5ecb65587bb44c806
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 10:21:34 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 10:24:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d999e4f
media-libs/jasper: Version bump to 2.0.0
Package-Manager: portage-2.3.2
media-libs/jasper/Manifest | 1 +
.../files/jasper-2.0.0-fix-build-system.patch | 92 ++++++++++++++++++++++
media-libs/jasper/jasper-2.0.0.ebuild | 63 +++++++++++++++
3 files changed, 156 insertions(+)
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index d1f7939..e809c72 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,2 +1,3 @@
DIST jasper-1.900.26.tar.gz 1289435 SHA256 b27e14639b0cbd5362fcf537660a1294c4c183539c20767d3b75df60b02ffd1a SHA512 977df6f79175854cc750224ed136022d66b543bae3d4b0a5cfee61e57d2723e221ee0b784bdfbcc8bd95a4ec7afdc35ad47bc0cc6f8fbbf39b715790815878fd WHIRLPOOL 24e99cb400aa2e21a0bdf576768cebb0d5563aa003da2a46186ad27fb2c7b268995351cbe76b1a059024e51fa339872d8ac0ccc450466c6fc06a4ba840369ee1
DIST jasper-1.900.6.tar.gz 787271 SHA256 5d0b4d684d19104b4564ef7142f4059eda91902620af36a3a6205d3dae66e027 SHA512 096e77609bf977eb0bbc9b1fc804bce7be1c7c81d066db7e367b61c4f6fa772a7a7ef21f7613485de46c3ca22cce57dce1e80c3736f54eb77eb44153218983b6 WHIRLPOOL 23edd5abc05248b43085f5a77a0210dcaf52089c57e31686478bd9b01284f294459ac1cad71eae4a594ef2632ba4323190b25d1a37dd36af0c0d7cd69579e568
+DIST jasper-2.0.0.tar.gz 1306305 SHA256 37fb86fbdc880e8ee566cf2ac226f0bfe259394914fad4d9e26bbe0764f8c378 SHA512 1b216e6cfe49155a3f416a0411523e48e7dffcf84688e2c4e7cabbe30585e6c50b9c865930fe3c4aec472ff01697e77d3c02e97f2bb4c72d35d1509ae9916ddd WHIRLPOOL e64929dfe3d679975a8404a63c4b3a28b72d6601c4e05e05228df1893578eff96c38135bc46f13b9e2c306011533bb3ef062d356ddea4b91dfeed93cc25f045a
diff --git a/media-libs/jasper/files/jasper-2.0.0-fix-build-system.patch b/media-libs/jasper/files/jasper-2.0.0-fix-build-system.patch
new file mode 100644
index 00000000..bae5476
--- /dev/null
+++ b/media-libs/jasper/files/jasper-2.0.0-fix-build-system.patch
@@ -0,0 +1,92 @@
+* Fix build system to honour Gentoo's multilib-strict (lib32/lib64)
+* jiv also requires OpenGL libs, not just GLUT
+* Only look for OpenGL+GLUT if JAS_ENABLE_OPENGL is actually on
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -65,6 +65,7 @@
+ option(JAS_ENABLE_OPENGL "Enable use of OpenGL Library" true)
+ option(JAS_ENABLE_STRICT "Enable pedantic error checking" false)
+ option(JAS_ENABLE_SHARED "Enable building of shared library" true)
++option(CMAKE_INSTALL_LIBDIR "Path to install libraries into" lib)
+
+ if (APPLE AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ set(MACOSX true)
+@@ -173,21 +174,18 @@
+ # set(JPEG_INCLUDE_DIR "")
+ #endif()
+
+-find_package(GLUT)
+-if(GLUT_FOUND)
+- include_directories("${GLUT_INCLUDE_DIR}")
+-endif()
+-check_include_files(GL/glut.h JAS_HAVE_GL_GLUT_H)
+-message("GLUT library found: ${GLUT_FOUND}")
+-message("GLUT libraries: ${GLUT_LIBRARIES}")
+-message("GLUT include directory: ${GLUT_INCLUDE_DIR}")
+-message("JAS_ENABLE_OPENGL: ${JAS_ENABLE_OPENGL}")
+-message("JAS_HAVE_GL_GLUT_H: ${JAS_HAVE_GL_GLUT_H}")
+-if(GLUT_FOUND AND (NOT JAS_HAVE_GL_GLUT_H OR NOT JAS_ENABLE_OPENGL))
+- message("disabling GLUT")
+- set(GLUT_FOUND false)
+- set(GLUT_LIBRARIES "")
+- set(GLUT_INCLUDE_DIR "")
++if(JAS_ENABLE_OPENGL)
++ find_package(OpenGL REQUIRED)
++ find_package(GLUT REQUIRED)
++
++ check_include_files(GL/glut.h JAS_HAVE_GL_GLUT_H)
++ message("GLUT library found: ${GLUT_FOUND}")
++ message("GLUT libraries: ${GLUT_LIBRARIES}")
++ message("GLUT include directory: ${GLUT_INCLUDE_DIR}")
++ message("JAS_HAVE_GL_GLUT_H: ${JAS_HAVE_GL_GLUT_H}")
++ if(NOT JAS_HAVE_GL_GLUT_H)
++ message(FATAL_ERROR "GL/glut.h cannot be found or is not working.")
++ endif()
+ endif()
+
+ if(UNIX)
+@@ -219,7 +217,7 @@
+ # the RPATH to be used when installing, but only if it's not a system directory
+ LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+ IF("${isSystemDir}" STREQUAL "-1")
+- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+ ENDIF("${isSystemDir}" STREQUAL "-1")
+
+ ################################################################################
+@@ -275,7 +273,7 @@
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/build/jasper.pc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/build/jasper.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/jasper.pc
+- DESTINATION lib/pkgconfig)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/build/jasper.spec.in
+ ${CMAKE_CURRENT_BINARY_DIR}/build/jasper.spec @ONLY)
+--- a/src/appl/CMakeLists.txt
++++ b/src/appl/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ # The jiv program (which requires GLUT)
+ if(GLUT_FOUND)
+ add_executable(jiv jiv.c)
+- target_link_libraries(jiv libjasper ${JPEG_LIBRARIES} ${GLUT_LIBRARIES} ${MATH_LIBRARY})
++ target_link_libraries(jiv libjasper ${JPEG_LIBRARIES} ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${MATH_LIBRARY})
+ set(programs "${programs}" jiv)
+ set(man_pages "${man_pages}" jiv.1)
+ else()
+@@ -33,4 +33,4 @@
+ install(TARGETS ${programs} DESTINATION bin)
+
+ # Install the manual pages for the programs that were built.
+-install(FILES ${man_pages} DESTINATION man)
++install(FILES ${man_pages} DESTINATION share/man/man1)
+--- a/src/libjasper/CMakeLists.txt
++++ b/src/libjasper/CMakeLists.txt
+@@ -151,5 +151,5 @@
+ # MacOSX does cannot build a shared library without this line.
+ target_link_libraries(libjasper ${JPEG_LIBRARIES})
+
+-install(TARGETS libjasper DESTINATION lib)
++install(TARGETS libjasper DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES ${libjasper_headers} DESTINATION include/jasper)
diff --git a/media-libs/jasper/jasper-2.0.0.ebuild b/media-libs/jasper/jasper-2.0.0.ebuild
new file mode 100644
index 00000000..199e8dc
--- /dev/null
+++ b/media-libs/jasper/jasper-2.0.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
+HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/"
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+ 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"
+fi
+
+# We limit memory usage to 128 MiB by default, specified in bytes
+: ${JASPER_MEM_LIMIT:=134217728}
+
+LICENSE="JasPer2.0"
+SLOT="0/4"
+IUSE="jpeg opengl"
+
+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}-2.0.0-fix-build-system.patch
+)
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DALLOW_IN_SOURCE_BUILD=OFF
+ -DBASH_PROGRAM="${EPREFIX}"/bin/bash
+ -DJAS_ENABLE_ASAN=OFF
+ -DJAS_ENABLE_LIBJPEG=$(usex jpeg)
+ -DJAS_ENABLE_LSAN=OFF
+ -DJAS_ENABLE_MSAN=OFF
+ -DJAS_ENABLE_OPENGL=$(usex opengl)
+ -DJAS_ENABLE_SHARED=ON
+ -DJAS_ENABLE_STRICT=ON
+ -DJAS_ENABLE_USAN=OFF
+ )
+ cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ dodoc -r doc/{jasper,jpeg2000}.pdf
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/files/, media-libs/jasper/
@ 2016-12-03 13:45 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2016-12-03 13:45 UTC (permalink / raw
To: gentoo-commits
commit: 1b1bbaacd217d1c9bdeea2f88b52f079fad1c231
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 11:54:04 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 13:45:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b1bbaac
media-libs/jasper: Fix underlinking detected using ld.gold
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=601070
Package-Manager: portage-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
media-libs/jasper/files/jasper-2.0.0-add_libm.patch | 11 +++++++++++
media-libs/jasper/jasper-2.0.0.ebuild | 5 ++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/media-libs/jasper/files/jasper-2.0.0-add_libm.patch b/media-libs/jasper/files/jasper-2.0.0-add_libm.patch
new file mode 100644
index 00000000..8ca2ea6
--- /dev/null
+++ b/media-libs/jasper/files/jasper-2.0.0-add_libm.patch
@@ -0,0 +1,11 @@
+--- jasper-2.0.0/src/libjasper/CMakeLists.txt.ori 2016-11-28 13:32:57.245053411 +0100
++++ jasper-2.0.0/src/libjasper/CMakeLists.txt 2016-11-28 13:33:24.707547620 +0100
+@@ -135,6 +135,8 @@
+ "${CMAKE_CURRENT_SOURCE_DIR}/include"
+ )
+
++target_link_libraries(libjasper m)
++
+ if (UNIX)
+ set_target_properties(libjasper PROPERTIES OUTPUT_NAME jasper)
+ endif()
diff --git a/media-libs/jasper/jasper-2.0.0.ebuild b/media-libs/jasper/jasper-2.0.0.ebuild
index 199e8dc..d4e7deb 100644
--- a/media-libs/jasper/jasper-2.0.0.ebuild
+++ b/media-libs/jasper/jasper-2.0.0.ebuild
@@ -33,12 +33,15 @@ RDEPEND="
>=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}]
>=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}]
virtual/glu
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXmu[${MULTILIB_USEDEP}]
)"
DEPEND="${RDEPEND}
app-arch/unzip"
PATCHES=(
- "${FILESDIR}"/${PN}-2.0.0-fix-build-system.patch
+ "${FILESDIR}"/${P}-fix-build-system.patch
+ "${FILESDIR}"/${P}-add_libm.patch
)
multilib_src_configure() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/files/, media-libs/jasper/
@ 2017-05-16 6:39 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2017-05-16 6:39 UTC (permalink / raw
To: gentoo-commits
commit: 34021ba28f658439a6c09fd7ae78ebd9bd932ccb
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 06:39:11 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue May 16 06:39:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34021ba2
media-libs/jasper: Remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-libs/jasper/Manifest | 2 -
.../files/jasper-1.900.6-fix-build-system.patch | 87 ----------------------
media-libs/jasper/jasper-1.900.6.ebuild | 47 ------------
media-libs/jasper/jasper-2.0.10.ebuild | 65 ----------------
4 files changed, 201 deletions(-)
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 0ee7767291f..5121c7b5a0a 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,3 +1 @@
-DIST jasper-1.900.6.tar.gz 787271 SHA256 5d0b4d684d19104b4564ef7142f4059eda91902620af36a3a6205d3dae66e027 SHA512 096e77609bf977eb0bbc9b1fc804bce7be1c7c81d066db7e367b61c4f6fa772a7a7ef21f7613485de46c3ca22cce57dce1e80c3736f54eb77eb44153218983b6 WHIRLPOOL 23edd5abc05248b43085f5a77a0210dcaf52089c57e31686478bd9b01284f294459ac1cad71eae4a594ef2632ba4323190b25d1a37dd36af0c0d7cd69579e568
-DIST jasper-2.0.10.tar.gz 1310613 SHA256 d48193de3b82e7f5792fe933fba2ef6714228de4d904ce98f3d69217ed7a85ec SHA512 8f96f72b73197088ff28364c7b4db79745a3188aa9be888ad3b211541bb4d1e45f23604b36d0b6c4176a432c2da888d1e31f119279aaab73e09430699e036859 WHIRLPOOL 37f98278af2baf2978b21a894c618166b4086c744c21ce953bad1b7aec9191550eda7d161aa93533c6a8f36399160633de5ea912e5d1e7ac37d5b3eece48062b
DIST jasper-2.0.12.tar.gz 1311323 SHA256 f0bcc1c4de5fab199f2e792acf269eb34d54689777c305d80e2498788f9f204b SHA512 a308983511119d85e6580772f5164c188e2e170500fa4b98c8831aa63aa87cb661b88952b278e390497571f9ebf9286855a8aa946037692309ba5f41cffe265a WHIRLPOOL 375eebf63f99081171d04414bae4ef0ce5514955818ddf5c985e9dc7bb93e539bf4b90adecdd497c43bcf0658d68c9261cc7e53f164d3fe5436e02da778f6ee3
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
deleted file mode 100644
index d4ac76eaba1..00000000000
--- a/media-libs/jasper/files/jasper-1.900.6-fix-build-system.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-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.6.ebuild b/media-libs/jasper/jasper-1.900.6.ebuild
deleted file mode 100644
index e6d1d371172..00000000000
--- a/media-libs/jasper/jasper-1.900.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-}
diff --git a/media-libs/jasper/jasper-2.0.10.ebuild b/media-libs/jasper/jasper-2.0.10.ebuild
deleted file mode 100644
index 86b1c13ff39..00000000000
--- a/media-libs/jasper/jasper-2.0.10.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/"
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
-else
- inherit vcs-snapshot
- SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
- 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"
-fi
-
-# We limit memory usage to 128 MiB by default, specified in bytes
-: ${JASPER_MEM_LIMIT:=134217728}
-
-LICENSE="JasPer2.0"
-SLOT="0/4"
-IUSE="doc jpeg opengl"
-
-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[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXmu[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DALLOW_IN_SOURCE_BUILD=OFF
- -DBASH_PROGRAM="${EPREFIX}"/bin/bash
- -DJAS_ENABLE_ASAN=OFF
- -DJAS_ENABLE_LSAN=OFF
- -DJAS_ENABLE_MSAN=OFF
- -DJAS_ENABLE_SHARED=ON
- -DJAS_ENABLE_STRICT=ON
- -DJAS_ENABLE_USAN=OFF
- -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
- # JPEG
- -DJAS_ENABLE_LIBJPEG=$(usex jpeg)
- -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-
- # OpenGL
- -DJAS_ENABLE_OPENGL=$(usex opengl)
- -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
-
- # Doxygen
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/files/, media-libs/jasper/
@ 2018-02-05 10:55 Thomas Deutschmann
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Deutschmann @ 2018-02-05 10:55 UTC (permalink / raw
To: gentoo-commits
commit: 21c71460a52c001ad8ddbfe88ffa2b0efcab8243
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 10:55:27 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 10:55:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c71460
media-libs/jasper: Bump to v2.0.14
Ebuild changes:
===============
- Add patch to disable tests which will require libjpeg
when built without jpeg USE flag set.
Closes: https://bugs.gentoo.org/629898
Closes: https://bugs.gentoo.org/642020
Package-Manager: Portage-2.3.21, Repoman-2.3.6
media-libs/jasper/Manifest | 1 +
.../files/jasper-2.0.14-fix-test-suite.patch | 28 +++++++++
media-libs/jasper/jasper-2.0.14.ebuild | 67 ++++++++++++++++++++++
3 files changed, 96 insertions(+)
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 639f6735c77..012a855f8d3 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1 +1,2 @@
DIST jasper-2.0.12.tar.gz 1311323 BLAKE2B bc9922bfc4765ea4630f9a504c9e5a1c0992f78c2ef68cd077ba0c8a36332debd5db9fc5c639accc7eaa0eda64e478c1e615da9f2eaf363446635dd94a253fa0 SHA512 a308983511119d85e6580772f5164c188e2e170500fa4b98c8831aa63aa87cb661b88952b278e390497571f9ebf9286855a8aa946037692309ba5f41cffe265a
+DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
diff --git a/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch b/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch
new file mode 100644
index 00000000000..9af83c67c6f
--- /dev/null
+++ b/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch
@@ -0,0 +1,28 @@
+Disable tests which will require LIBJPEG when Jasper was
+built without LIBJPEG.
+
+Bug: https://bugs.gentoo.org/629898
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -393,12 +393,14 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/test/bin/wrapper.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper" @ONLY)
+
+ if (BASH_PROGRAM)
+- add_test(run_test_1
+- "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
+- "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_1")
+- add_test(run_test_2
+- "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
+- "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_2")
++ if (JAS_ENABLE_LIBJPEG)
++ add_test(run_test_1
++ "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
++ "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_1")
++ add_test(run_test_2
++ "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
++ "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_2")
++ endif()
+ add_test(run_test_3
+ "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
+ "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_3")
diff --git a/media-libs/jasper/jasper-2.0.14.ebuild b/media-libs/jasper/jasper-2.0.14.ebuild
new file mode 100644
index 00000000000..1639b4bca26
--- /dev/null
+++ b/media-libs/jasper/jasper-2.0.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
+HOMEPAGE="https://www.ece.uvic.ca/~mdadams/jasper/"
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# We limit memory usage to 128 MiB by default, specified in bytes
+: ${JASPER_MEM_LIMIT:=134217728}
+
+LICENSE="JasPer2.0"
+SLOT="0/4"
+IUSE="doc jpeg opengl test"
+
+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[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXmu[${MULTILIB_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.14-fix-test-suite.patch )
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DALLOW_IN_SOURCE_BUILD=OFF
+ -DBASH_PROGRAM="${EPREFIX}"/bin/bash
+ -DJAS_ENABLE_ASAN=OFF
+ -DJAS_ENABLE_LSAN=OFF
+ -DJAS_ENABLE_MSAN=OFF
+ -DJAS_ENABLE_SHARED=ON
+ -DJAS_ENABLE_STRICT=ON
+ -DJAS_ENABLE_USAN=OFF
+ -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+
+ # JPEG
+ -DJAS_ENABLE_LIBJPEG=$(usex jpeg)
+ -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
+
+ # OpenGL
+ -DJAS_ENABLE_OPENGL=$(usex opengl)
+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
+
+ # Doxygen
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
+
+ #-DJAS_ENABLE_PROGRAMS=$(usex test)
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/files/, media-libs/jasper/
@ 2024-01-14 14:14 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-01-14 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 8fca8b44f82cedc54cb66491692003a9d05717db
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 05:53:30 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 14:14:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fca8b44
media-libs/jasper: test fixes
Some test fixes I noticed when looking at bug #907259 and bug #922074.
* Patch out `which` usage (https://github.com/jasper-software/jasper/pull/369).
* Depend on openjpeg for tests for the opj2_compress and opj2_decompress
binaries.
Bug: https://bugs.gentoo.org/907259
Bug: https://bugs.gentoo.org/922074
Closes: https://github.com/gentoo/gentoo/pull/34794
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../jasper/files/jasper-4.1.2-which-hunt.patch | 34 ++++++++++++++++++++++
media-libs/jasper/jasper-4.1.2.ebuild | 10 +++++--
media-libs/jasper/jasper-9999.ebuild | 10 +++++--
3 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/media-libs/jasper/files/jasper-4.1.2-which-hunt.patch b/media-libs/jasper/files/jasper-4.1.2-which-hunt.patch
new file mode 100644
index 000000000000..e04255a714ee
--- /dev/null
+++ b/media-libs/jasper/files/jasper-4.1.2-which-hunt.patch
@@ -0,0 +1,34 @@
+https://github.com/jasper-software/jasper/pull/369
+
+From de3e9d43224977cda178df609d09e222674200e6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 14 Jan 2024 05:49:55 +0000
+Subject: [PATCH] test: run_test_3: drop use of `which`
+
+`which` is non-portable (not part of POSIX) and distributions like Debian and
+Gentoo are looking to remove it from their base set of packages.
+
+Switch to `type -P` instead given `test/bin/run_test_3` already has a Bash
+shebang.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ test/bin/run_test_3 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/bin/run_test_3 b/test/bin/run_test_3
+index fad80412..5bc9da93 100755
+--- a/test/bin/run_test_3
++++ b/test/bin/run_test_3
+@@ -36,8 +36,8 @@ set_source_and_build_dirs || panic "cannot set source and build directories"
+
+ #$CMDDIR/rundectests jasper || exit 1
+
+-oj_compress=$(which opj2_compress) || oj_compress=""
+-oj_decompress=$(which opj2_decompress) || oj_decompress=""
++oj_compress=$(type -P opj2_compress) || oj_compress=""
++oj_decompress=$(type -P opj2_decompress) || oj_decompress=""
+
+ run_test="$cmd_dir/run_codec_test"
+
+
diff --git a/media-libs/jasper/jasper-4.1.2.ebuild b/media-libs/jasper/jasper-4.1.2.ebuild
index 335732079920..6540d3819942 100644
--- a/media-libs/jasper/jasper-4.1.2.ebuild
+++ b/media-libs/jasper/jasper-4.1.2.ebuild
@@ -19,7 +19,8 @@ fi
LICENSE="JasPer2.0"
SLOT="0/7"
-IUSE="doc heif jpeg opengl"
+IUSE="doc heif jpeg opengl test"
+RESTRICT="!test? ( test )"
RDEPEND="
heif? ( media-libs/libheif:= )
@@ -37,7 +38,12 @@ BDEPEND="
dev-texlive/texlive-latexextra
dev-texlive/texlive-plaingeneric
virtual/latex-base
- )"
+ )
+ test? ( media-libs/openjpeg )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.1.2-which-hunt.patch
+)
src_configure() {
local mycmakeargs=(
diff --git a/media-libs/jasper/jasper-9999.ebuild b/media-libs/jasper/jasper-9999.ebuild
index 335732079920..6540d3819942 100644
--- a/media-libs/jasper/jasper-9999.ebuild
+++ b/media-libs/jasper/jasper-9999.ebuild
@@ -19,7 +19,8 @@ fi
LICENSE="JasPer2.0"
SLOT="0/7"
-IUSE="doc heif jpeg opengl"
+IUSE="doc heif jpeg opengl test"
+RESTRICT="!test? ( test )"
RDEPEND="
heif? ( media-libs/libheif:= )
@@ -37,7 +38,12 @@ BDEPEND="
dev-texlive/texlive-latexextra
dev-texlive/texlive-plaingeneric
virtual/latex-base
- )"
+ )
+ test? ( media-libs/openjpeg )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.1.2-which-hunt.patch
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-01-14 14:14 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-18 18:35 [gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/files/, media-libs/jasper/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2016-10-23 14:18 David Seifert
2016-11-27 10:24 David Seifert
2016-12-03 13:45 Justin Lecher
2017-05-16 6:39 David Seifert
2018-02-05 10:55 Thomas Deutschmann
2024-01-14 14:14 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox