media-libs/libheif: security cleanup (#696302)

Bug: https://bugs.gentoo.org/696302
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 0a30dd8db3c9ecd4e4a3adcf849c7d762c7943b4..3ce8988436713f81a3dc9b2ce7af524882f9a087 100644 (file)
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,4 +1 @@
-DIST libheif-1.3.2.tar.gz 1328174 BLAKE2B 4c0f82bb90d48f89a4ce9aed525c5823bb5d008e54e580e761f6fa4f5493f265929a0607e7b81046ba7c249bd2ca21a0c5ab91da83b7e7f3a2a63e8f24df88ed SHA512 bcc8b4b2522ef6fe68f5a9ffd5312c2c8f6bc3718394eef1860e199c30fb735bb214f665ed6480b5f5fe5d578b3ed77a4301af93775ae2349ba5038b3f3ef63a
-DIST libheif-1.4.0.tar.gz 1366030 BLAKE2B a93b3b59a4f89e0aa5a5069fdebc54b9d09adeeff05ebf28b9535baa2fb26e4122b4c5d96b7015fdd181720f10e3dd0887038f0c5567c94509aa76d2ef119dd9 SHA512 fc48caaadb71ffa87227de75c9e13d5006c66f1c966ce454552defb8947999f5242a9bbd1413f58be1ccbf61df7f118defe96d67376e3b4e7b12fe5dfa0fe0c7
-DIST libheif-1.4.1.tar.gz 950721 BLAKE2B 39793dbf4334b7ca93993ba518f9c935eb6d29a2debea12a3f1727d245572945e456b7997d79403da53bb5701ee62af8235a9815221402e5b901d9c07aa015a0 SHA512 c6e7d00c040885c506dde40469ba51b0346126689ed238abce123b471f748431cb29914015b3ca97749855a0f1f7c8e9a58388d4468da3c2d17c7a3a15270af0
 DIST libheif-1.5.1.tar.gz 1510087 BLAKE2B 1dd5e913c8913c6b62b770653585f8ccf7cda14c4dd79ff2073bf085da4d730accaef8d0f8008ac941238a7e3e131add1a218e0c78a886847b3bcf253d66c9b6 SHA512 05e32ebff08d5f0e82e9b1107253c27882ae1694150033fe7b3ca07db8c64567f09002081276e92a3b490a63022a1522d577b094a7f489742139758d17f484b8

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
deleted file mode 100644 (file)
index 1382959..0000000
--- a/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-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 <stddef.h>
-+    #include <stdio.h>
-+    #include <jpeglib.h>
-+],[
-+    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 <stddef.h>
-+#include <stdio.h>
-+#include <jpeglib.h>
-+
-+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 <http://www.gnu.org/licenses/>.
-  */
-+#if defined(HAVE_CONFIG_H)
-+#include "config.h"
-+#endif
-+
- #include <assert.h>
- #include <errno.h>
- #include <string.h>
---- a/examples/encoder_jpeg.h
-+++ b/examples/encoder_jpeg.h
-@@ -24,6 +24,9 @@
- #include <stddef.h>
- #include <stdio.h>
- 
-+// Prevent duplicate definition for newer versions of libjpeg-turbo.
-+#undef HAVE_STDDEF_H
-+#undef HAVE_STDLIB_H
- #include <jpeglib.h>
- 
- #include <string>
---- 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 <jpeglib.h>
- }
- #endif

diff --git a/media-libs/libheif/libheif-1.3.2-r1.ebuild b/media-libs/libheif/libheif-1.3.2-r1.ebuild
deleted file mode 100644 (file)
index f65ef1d..0000000
--- a/media-libs/libheif/libheif-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 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 arm64 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.4.0.ebuild b/media-libs/libheif/libheif-1.4.0.ebuild
deleted file mode 100644 (file)
index 4950607..0000000
--- a/media-libs/libheif/libheif-1.4.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 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 ~arm64 ~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.4"
-IUSE="static-libs test +threads"
-
-BDEPEND="test? ( dev-lang/go )"
-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
-
-       # prevent "stat heif-test.go: no such file or directory"
-       multilib_copy_sources
-}
-
-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.4.1.ebuild b/media-libs/libheif/libheif-1.4.1.ebuild
deleted file mode 100644 (file)
index cdb69af..0000000
--- a/media-libs/libheif/libheif-1.4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools xdg-utils 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}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~amd64 ~arm64 ~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.4"
-IUSE="static-libs test +threads"
-
-BDEPEND="test? ( dev-lang/go )"
-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
-
-       # prevent "stat heif-test.go: no such file or directory"
-       multilib_copy_sources
-}
-
-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
-}
-
-pkg_postinst() {
-       xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-       xdg_mimeinfo_database_update
-}