[gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/, media-libs/jasper/files/
commit: 77aebdf0b31765b33831ca5b02ea3d98f13c46cd Author: David Seifert gentoo org> AuthorDate: Tue Aug 27 09:07:01 2019 + Commit: David Seifert gentoo org> CommitDate: Tue Aug 27 09:07:01 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77aebdf0 media-libs/jasper: Remove from tree Bug: https://bugs.gentoo.org/674214 Closes: https://bugs.gentoo.org/601068 Closes: https://bugs.gentoo.org/614028 Closes: https://bugs.gentoo.org/614032 Closes: https://bugs.gentoo.org/614566 Closes: https://bugs.gentoo.org/619120 Closes: https://bugs.gentoo.org/624988 Closes: https://bugs.gentoo.org/629286 Closes: https://bugs.gentoo.org/635552 Closes: https://bugs.gentoo.org/662160 Closes: https://bugs.gentoo.org/674154 Closes: https://bugs.gentoo.org/684826 Closes: https://bugs.gentoo.org/689784 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> media-libs/jasper/Manifest | 2 - .../files/jasper-2.0.14-fix-test-suite.patch | 28 - media-libs/jasper/jasper-2.0.14.ebuild | 67 -- media-libs/jasper/jasper-2.0.16.ebuild | 65 - media-libs/jasper/jasper-.ebuild | 65 - media-libs/jasper/metadata.xml | 11 6 files changed, 238 deletions(-) diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest deleted file mode 100644 index abc38bb5ab0..000 --- a/media-libs/jasper/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940 -DIST jasper-2.0.16.tar.gz 1311944 BLAKE2B 7402a3f08911e375ab51d531c8bcc57ccb3266763f2d92f45070e52697b99ca41dab4032a3d795105c05ddccd0641a6de24a6d7b148635efce37cd0be07c3e65 SHA512 b3bca227f833567c9061c4a29c0599784ed6a131b5cceddfd1696542d19add821eda445ce6d83782b454b266723b24d0f028cbc644a25c0e3a75304e615b34ee 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 deleted file mode 100644 index 9af83c67c6f..000 --- a/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index 1a72b593b94..000 --- a/media-libs/jasper/jasper-2.0.14.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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} == ** ]]; 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 ~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-r
[gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/, media-libs/jasper/files/
commit: a513e175f81ed2bbb95d91d9946bd5502d686bf1 Author: David Seifert gentoo org> AuthorDate: Wed Dec 7 19:58:16 2016 + Commit: David Seifert gentoo org> CommitDate: Wed Dec 7 19:58:56 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a513e175 media-libs/jasper: Remove old Package-Manager: portage-2.3.3 media-libs/jasper/Manifest | 2 - .../jasper/files/jasper-2.0.0-add_libm.patch | 11 --- .../files/jasper-2.0.0-fix-build-system.patch | 92 -- media-libs/jasper/jasper-1.900.26.ebuild | 59 -- media-libs/jasper/jasper-2.0.0.ebuild | 66 5 files changed, 230 deletions(-) diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest index 635480f..1844843 100644 --- a/media-libs/jasper/Manifest +++ b/media-libs/jasper/Manifest @@ -1,4 +1,2 @@ -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 DIST jasper-2.0.5.tar.gz 1309369 SHA256 77478d80bef35616ca554924d719922064343cdc5b6f5223a2a4118c9afe535d SHA512 d827e1bd7e36d0c33471563b4193b64bfb73d6b02ade810861a27ba97b773973221299c13ddee01613bda4cc78e35d9185253b78dac3bcc7e67ac514cb5a WHIRLPOOL bbfae6ed49f9c6a05964a0447ffd373e51695259caab3cddead773ea668f842b5a5f560ed7c5392fa16e0bd99c1eb6fb5ebb09ae41c9a036eb33561509f0678a 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 deleted file mode 100644 index 8ca2ea6.. --- a/media-libs/jasper/files/jasper-2.0.0-add_libm.patch +++ /dev/null @@ -1,11 +0,0 @@ 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/files/jasper-2.0.0-fix-build-system.patch b/media-libs/jasper/files/jasper-2.0.0-fix-build-system.patch deleted file mode 100644 index f95023b.. --- a/media-libs/jasper/files/jasper-2.0.0-fix-build-system.patch +++ /dev/null @@ -1,92 +0,0 @@ -* 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) -+set(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Path to install libraries into") - - 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_DI
[gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/, media-libs/jasper/files/
commit: ece2cf67ac87c152c955189229cd3a2b2206e0a9 Author: David Seifert gentoo org> AuthorDate: Fri Oct 14 20:46:01 2016 + Commit: David Seifert gentoo org> CommitDate: Fri Oct 14 21:29:13 2016 + 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 ..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 + #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 boolint +-#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 ..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 +