From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EF3041382C5 for ; Mon, 5 Feb 2018 10:55:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BE09E08FB; Mon, 5 Feb 2018 10:55:58 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A1ADE08FB for ; Mon, 5 Feb 2018 10:55:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9CD90335C39 for ; Mon, 5 Feb 2018 10:55:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 344D619B for ; Mon, 5 Feb 2018 10:55:55 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1517828142.21c71460a52c001ad8ddbfe88ffa2b0efcab8243.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/jasper/files/, media-libs/jasper/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/jasper/Manifest media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch media-libs/jasper/jasper-2.0.14.ebuild X-VCS-Directories: media-libs/jasper/files/ media-libs/jasper/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 21c71460a52c001ad8ddbfe88ffa2b0efcab8243 X-VCS-Branch: master Date: Mon, 5 Feb 2018 10:55:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 553c2021-d664-4faa-ab26-5717371a4dbf X-Archives-Hash: 3881953399c00b3ffd44520a9857b6aa commit: 21c71460a52c001ad8ddbfe88ffa2b0efcab8243 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Feb 5 10:55:27 2018 +0000 Commit: Thomas Deutschmann gentoo 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 +}