1 |
commit: 21c71460a52c001ad8ddbfe88ffa2b0efcab8243 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 5 10:55:27 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 5 10:55:42 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c71460 |
7 |
|
8 |
media-libs/jasper: Bump to v2.0.14 |
9 |
|
10 |
Ebuild changes: |
11 |
=============== |
12 |
- Add patch to disable tests which will require libjpeg |
13 |
when built without jpeg USE flag set. |
14 |
|
15 |
Closes: https://bugs.gentoo.org/629898 |
16 |
Closes: https://bugs.gentoo.org/642020 |
17 |
Package-Manager: Portage-2.3.21, Repoman-2.3.6 |
18 |
|
19 |
media-libs/jasper/Manifest | 1 + |
20 |
.../files/jasper-2.0.14-fix-test-suite.patch | 28 +++++++++ |
21 |
media-libs/jasper/jasper-2.0.14.ebuild | 67 ++++++++++++++++++++++ |
22 |
3 files changed, 96 insertions(+) |
23 |
|
24 |
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest |
25 |
index 639f6735c77..012a855f8d3 100644 |
26 |
--- a/media-libs/jasper/Manifest |
27 |
+++ b/media-libs/jasper/Manifest |
28 |
@@ -1 +1,2 @@ |
29 |
DIST jasper-2.0.12.tar.gz 1311323 BLAKE2B bc9922bfc4765ea4630f9a504c9e5a1c0992f78c2ef68cd077ba0c8a36332debd5db9fc5c639accc7eaa0eda64e478c1e615da9f2eaf363446635dd94a253fa0 SHA512 a308983511119d85e6580772f5164c188e2e170500fa4b98c8831aa63aa87cb661b88952b278e390497571f9ebf9286855a8aa946037692309ba5f41cffe265a |
30 |
+DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940 |
31 |
|
32 |
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 |
33 |
new file mode 100644 |
34 |
index 00000000000..9af83c67c6f |
35 |
--- /dev/null |
36 |
+++ b/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch |
37 |
@@ -0,0 +1,28 @@ |
38 |
+Disable tests which will require LIBJPEG when Jasper was |
39 |
+built without LIBJPEG. |
40 |
+ |
41 |
+Bug: https://bugs.gentoo.org/629898 |
42 |
+ |
43 |
+--- a/CMakeLists.txt |
44 |
++++ b/CMakeLists.txt |
45 |
+@@ -393,12 +393,14 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/test/bin/wrapper.in" |
46 |
+ "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper" @ONLY) |
47 |
+ |
48 |
+ if (BASH_PROGRAM) |
49 |
+- add_test(run_test_1 |
50 |
+- "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper" |
51 |
+- "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_1") |
52 |
+- add_test(run_test_2 |
53 |
+- "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper" |
54 |
+- "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_2") |
55 |
++ if (JAS_ENABLE_LIBJPEG) |
56 |
++ add_test(run_test_1 |
57 |
++ "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper" |
58 |
++ "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_1") |
59 |
++ add_test(run_test_2 |
60 |
++ "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper" |
61 |
++ "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_2") |
62 |
++ endif() |
63 |
+ add_test(run_test_3 |
64 |
+ "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper" |
65 |
+ "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_3") |
66 |
|
67 |
diff --git a/media-libs/jasper/jasper-2.0.14.ebuild b/media-libs/jasper/jasper-2.0.14.ebuild |
68 |
new file mode 100644 |
69 |
index 00000000000..1639b4bca26 |
70 |
--- /dev/null |
71 |
+++ b/media-libs/jasper/jasper-2.0.14.ebuild |
72 |
@@ -0,0 +1,67 @@ |
73 |
+# Copyright 1999-2018 Gentoo Foundation |
74 |
+# Distributed under the terms of the GNU General Public License v2 |
75 |
+ |
76 |
+EAPI=6 |
77 |
+ |
78 |
+inherit cmake-multilib |
79 |
+ |
80 |
+DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard" |
81 |
+HOMEPAGE="https://www.ece.uvic.ca/~mdadams/jasper/" |
82 |
+ |
83 |
+if [[ ${PV} == *9999* ]]; then |
84 |
+ inherit git-r3 |
85 |
+ EGIT_REPO_URI="https://github.com/mdadams/jasper.git" |
86 |
+else |
87 |
+ inherit vcs-snapshot |
88 |
+ SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz" |
89 |
+ 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" |
90 |
+fi |
91 |
+ |
92 |
+# We limit memory usage to 128 MiB by default, specified in bytes |
93 |
+: ${JASPER_MEM_LIMIT:=134217728} |
94 |
+ |
95 |
+LICENSE="JasPer2.0" |
96 |
+SLOT="0/4" |
97 |
+IUSE="doc jpeg opengl test" |
98 |
+ |
99 |
+RDEPEND=" |
100 |
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) |
101 |
+ opengl? ( |
102 |
+ >=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}] |
103 |
+ >=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}] |
104 |
+ virtual/glu[${MULTILIB_USEDEP}] |
105 |
+ x11-libs/libXi[${MULTILIB_USEDEP}] |
106 |
+ x11-libs/libXmu[${MULTILIB_USEDEP}] |
107 |
+ )" |
108 |
+DEPEND="${RDEPEND} |
109 |
+ doc? ( app-doc/doxygen )" |
110 |
+ |
111 |
+PATCHES=( "${FILESDIR}"/${PN}-2.0.14-fix-test-suite.patch ) |
112 |
+ |
113 |
+multilib_src_configure() { |
114 |
+ local mycmakeargs=( |
115 |
+ -DALLOW_IN_SOURCE_BUILD=OFF |
116 |
+ -DBASH_PROGRAM="${EPREFIX}"/bin/bash |
117 |
+ -DJAS_ENABLE_ASAN=OFF |
118 |
+ -DJAS_ENABLE_LSAN=OFF |
119 |
+ -DJAS_ENABLE_MSAN=OFF |
120 |
+ -DJAS_ENABLE_SHARED=ON |
121 |
+ -DJAS_ENABLE_STRICT=ON |
122 |
+ -DJAS_ENABLE_USAN=OFF |
123 |
+ -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} |
124 |
+ |
125 |
+ # JPEG |
126 |
+ -DJAS_ENABLE_LIBJPEG=$(usex jpeg) |
127 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) |
128 |
+ |
129 |
+ # OpenGL |
130 |
+ -DJAS_ENABLE_OPENGL=$(usex opengl) |
131 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl) |
132 |
+ |
133 |
+ # Doxygen |
134 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON) |
135 |
+ |
136 |
+ #-DJAS_ENABLE_PROGRAMS=$(usex test) |
137 |
+ ) |
138 |
+ cmake-utils_src_configure |
139 |
+} |