From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- media-libs/libheif/Manifest | 3 +- .../libheif/files/libheif-1.3.2-openjpeg-2.patch | 93 ++++++++++++++++++++++ media-libs/libheif/libheif-1.3.2-r1.ebuild | 56 +++++++++++++ media-libs/libheif/libheif-1.3.2.ebuild | 56 ------------- 4 files changed, 151 insertions(+), 57 deletions(-) create mode 100644 media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch create mode 100644 media-libs/libheif/libheif-1.3.2-r1.ebuild delete mode 100644 media-libs/libheif/libheif-1.3.2.ebuild (limited to 'media-libs/libheif') diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest index 70b45d460aa8..41563f833a12 100644 --- a/media-libs/libheif/Manifest +++ b/media-libs/libheif/Manifest @@ -1,4 +1,5 @@ +AUX libheif-1.3.2-openjpeg-2.patch 2512 BLAKE2B 165576cb3da35534a9e628f3dfb3c47b52718109ffb3582acfde093a22284053fd1e7986216f670491652f1362011409888084b37a79777e393002b1d9ea7237 SHA512 c8bb96ef7091d2f0e46bbe61e05a30e8a3e93f7b5925d45a30a045cac39e26000c04166d5ea0417ebf530b8bff5992de0b46ca112041e1aa87ecf7eb5928e844 DIST libheif-1.3.2.tar.gz 1328174 BLAKE2B 4c0f82bb90d48f89a4ce9aed525c5823bb5d008e54e580e761f6fa4f5493f265929a0607e7b81046ba7c249bd2ca21a0c5ab91da83b7e7f3a2a63e8f24df88ed SHA512 bcc8b4b2522ef6fe68f5a9ffd5312c2c8f6bc3718394eef1860e199c30fb735bb214f665ed6480b5f5fe5d578b3ed77a4301af93775ae2349ba5038b3f3ef63a -EBUILD libheif-1.3.2.ebuild 1320 BLAKE2B 59c0088337011cf9db2470f68a32f51d66e18fa09432f5ce75e4f01efe06c33d03cca73fe9910e1dbd2cf081ba87206146bc99809de895b8523522e42dd488c2 SHA512 2e3ed1301604c97c502b16977d7863b175703004193edf48dec44f9c029afdc69f800922da94c10322a9f76ac9f70dfc8f13dd30d573c51a2c5db2ddaec01730 +EBUILD libheif-1.3.2-r1.ebuild 1249 BLAKE2B 233f3d365a62e624a021de959e626e99fb25db14a4b8895f4d27f92ec4e0a6d65cab27484e3b8f2c46c1b4b6035f9a08e3b08350f0d48d8db197da759227cf97 SHA512 0fdbb43b6fe4c1cd485007e27b82c74bdc8b1b050aceb4783172e3b69ac084a0f1cf3cedc21e540d7f6bd3c1d808aaf6dca7da6e526527ceab0936f1203ad452 EBUILD libheif-9999.ebuild 1325 BLAKE2B b13d52b4593ca62e796208564edb6a6696e86bfe3d0539ca74277027de4d9db7b89867667fb29b9af1f5eed8c583d337b34ed6a4083292ba681963b5ed871fe1 SHA512 ede20f379e5807387acd892472f8190e7ba71a522b027e1297a37bd722832bff6125ad43a94ce5e0ee6d33ec5beb80b1e93793e27e5d2550c8e83f4db24f9504 MISC metadata.xml 369 BLAKE2B e85296d149b4ebfe852a79ed951dff87e3586617cac09f2e81bc501f2739599e7fda1835f1d677cd923a1324e4f6d85e4f1552eb0589511372dd603d239880c5 SHA512 70bbaa03beb93f3649271be35d4c90e7d79395efefd0cfb9915525a5c736629bcf56bd66e2d1bbf2a746c62a5f21ddb8874cdf28f61180fe9abc3ad22ab51fc8 diff --git a/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch b/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch new file mode 100644 index 000000000000..138295965b4c --- /dev/null +++ b/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch @@ -0,0 +1,93 @@ +Support building against libjpeg-turbo 2.0. + +Backport of https://github.com/strukturag/libheif/pull/85 + +--- a/configure.ac ++++ b/configure.ac +@@ -95,6 +95,22 @@ AC_CHECK_LIB([jpeg], [jpeg_destroy_compress], [ + ], [have_libjpeg="no"]) + fi + AM_CONDITIONAL([HAVE_LIBJPEG], [test "x$have_libjpeg" = "xyes"]) ++if eval "test x$have_libjpeg = xyes"; then ++AC_MSG_CHECKING([for jpeg_write_icc_profile]) ++AC_LANG_PUSH(C++) ++AC_TRY_COMPILE([ ++ #include ++ #include ++ #include ++],[ ++ jpeg_write_icc_profile(NULL, NULL, 0); ++],[has_jpeg_write_icc_profile=yes],[has_jpeg_write_icc_profile=no]); ++AC_LANG_POP(C++) ++AC_MSG_RESULT([$has_jpeg_write_icc_profile]) ++if eval "test x$has_jpeg_write_icc_profile = xyes"; then ++ AC_DEFINE(HAVE_JPEG_WRITE_ICC_PROFILE, 1, [Define to 1 if jpeg_write_icc_profile is available in libjpeg.]) ++fi ++fi + + PKG_CHECK_MODULES([libpng], [libpng], [ + AC_DEFINE([HAVE_LIBPNG], [1], [Whether libpng was found.]) +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -8,6 +8,24 @@ include (${CMAKE_ROOT}/Modules/FindJPEG.cmake) + + if(JPEG_FOUND) + add_definitions(-DHAVE_LIBJPEG=1) ++ ++include (${CMAKE_ROOT}/Modules/CheckCXXSourceCompiles.cmake) ++ ++set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARIES}) ++check_cxx_source_compiles(" ++#include ++#include ++#include ++ ++int main() { ++ jpeg_write_icc_profile(NULL, NULL, 0); ++ return 0; ++} ++" HAVE_JPEG_WRITE_ICC_PROFILE) ++if(HAVE_JPEG_WRITE_ICC_PROFILE) ++ add_definitions(-DHAVE_JPEG_WRITE_ICC_PROFILE=1) ++endif() ++ + set (heif_convert_sources + ${heif_convert_sources} + encoder_jpeg.cc +--- a/examples/encoder_jpeg.cc ++++ b/examples/encoder_jpeg.cc +@@ -17,6 +17,10 @@ + * You should have received a copy of the GNU General Public License + * along with convert. If not, see . + */ ++#if defined(HAVE_CONFIG_H) ++#include "config.h" ++#endif ++ + #include + #include + #include +--- a/examples/encoder_jpeg.h ++++ b/examples/encoder_jpeg.h +@@ -24,6 +24,9 @@ + #include + #include + ++// Prevent duplicate definition for newer versions of libjpeg-turbo. ++#undef HAVE_STDDEF_H ++#undef HAVE_STDLIB_H + #include + + #include +--- a/examples/heif_enc.cc ++++ b/examples/heif_enc.cc +@@ -35,6 +35,9 @@ + + #if HAVE_LIBJPEG + extern "C" { ++// Prevent duplicate definition for newer versions of libjpeg-turbo. ++#undef HAVE_STDDEF_H ++#undef HAVE_STDLIB_H + #include + } + #endif diff --git a/media-libs/libheif/libheif-1.3.2-r1.ebuild b/media-libs/libheif/libheif-1.3.2-r1.ebuild new file mode 100644 index 000000000000..aedf7a7e2591 --- /dev/null +++ b/media-libs/libheif/libheif-1.3.2-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools multilib-minimal + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + + PATCHES=( "${FILESDIR}"/${P}-openjpeg-2.patch ) +fi + +DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" +HOMEPAGE="https://github.com/strukturag/libheif" + +LICENSE="GPL-3" +SLOT="0/1.3" +IUSE="static-libs +threads" + +DEPEND=" + media-libs/libde265:=[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + media-libs/x265:=[${MULTILIB_USEDEP}] + sys-libs/zlib:=[${MULTILIB_USEDEP}] + virtual/jpeg:0=[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i -e 's:-Werror::' \ + configure.ac || die + + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable threads multithreading) + $(use_enable static-libs static) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -delete || die + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +} diff --git a/media-libs/libheif/libheif-1.3.2.ebuild b/media-libs/libheif/libheif-1.3.2.ebuild deleted file mode 100644 index 2bce8218a61a..000000000000 --- a/media-libs/libheif/libheif-1.3.2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" -HOMEPAGE="https://github.com/strukturag/libheif" - -LICENSE="GPL-3" -SLOT="0/1.3" -IUSE="static-libs +threads" - -# Doesn't yet support libjpeg-turbo-2, https://github.com/strukturag/libheif/issues/70 -DEPEND=" - media-libs/libde265:=[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - media-libs/x265:=[${MULTILIB_USEDEP}] - sys-libs/zlib:=[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - !>=media-libs/libjpeg-turbo-2 -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -i -e 's:-Werror::' \ - configure.ac || die - - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable threads multithreading) - $(use_enable static-libs static) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} -- cgit v1.2.3