summaryrefslogtreecommitdiff
path: root/media-libs/libvpx
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-11-06 09:19:37 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-11-06 09:19:37 +0000
commit6003fc7a6eda56862fcff321f47e40cd34e60098 (patch)
tree342368c16c4837b5d9eaf8c4d8c0ea298d1e3308 /media-libs/libvpx
parent30c2cb2c8971dc95b672303f9191d166d622fe47 (diff)
gentoo auto-resync : 06:11:2022 - 09:19:37
Diffstat (limited to 'media-libs/libvpx')
-rw-r--r--media-libs/libvpx/Manifest9
-rw-r--r--media-libs/libvpx/files/libvpx-1.12.0-configure-clang16.patch37
-rw-r--r--media-libs/libvpx/libvpx-1.11.0.ebuild137
-rw-r--r--media-libs/libvpx/libvpx-1.12.0-r1.ebuild (renamed from media-libs/libvpx/libvpx-1.12.0.ebuild)3
-rw-r--r--media-libs/libvpx/libvpx-1.9.0.ebuild119
5 files changed, 41 insertions, 264 deletions
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index be83b0d129d2..1c72bcb0350f 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,11 +1,6 @@
+AUX libvpx-1.12.0-configure-clang16.patch 1466 BLAKE2B e13ec892716dcd9c3940fe955a9e0feddca7ab2af5fbdfd1be6443f2d87b341e626de036244793a403e6ff18080413d2c728e5af88cdb44fb2deab95a422c70b SHA512 86180645d90be302253ac3285bb32764c783a42794f45294ece8647d77f677385afce7b633bad3b5d92c095fe607b8b566fbba960391cf3ed8157884bd5ef1c7
AUX libvpx-1.3.0-sparc-configure.patch 406 BLAKE2B 02b1f0484a9659fdc90eb567db517a8b63f679521ae9ab510bfaa88b9fd5e1430d0eceeb8e4a138b00cb43ac4a1db6451dd29a808367973dc885fe5b9eacd665 SHA512 159ba5577fc0eee3e958740d8607a7570f374a8f64a36f1e7832a126482ec0bb96ba2be451eefdf50d84a412a2be73ae75da3d69da78ec13dfe0e24a14685035
-DIST libvpx-1.11.0.tar.gz 5347256 BLAKE2B 2c350e14fc3b8a3c10a71e230e893fbb9a68e6eeb6a413cc359bdbfddda21cc5c15d0de4b6110889845f88f8a946ef1266980c0a1b26aaf55b52330fe038e261 SHA512 7aa5d30afa956dccda60917fd82f6f9992944ca893437c8cd53a04d1b7a94e0210431954aa136594dc400340123cc166dcc855753e493c8d929667f4c42b65a5
DIST libvpx-1.12.0.tar.gz 5465627 BLAKE2B 92e61ef91ef3bb7e09f359acdef6469843921345b1008a7a24042587fbcfc72c4671fc9eb4e1bf8c1e9de0fa5506ed751dcd6934a9164a6e0fe528cfe8c23154 SHA512 dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0
-DIST libvpx-1.9.0.tar.gz 5326239 BLAKE2B 6403a5d8326235a8d27ca3727f45398556cbe72cd125ae358c22f729cc01d6a81917cca8a6e97ad0ed01e7fc04ca4212baf21f371323b93ccc8830c4a11acf91 SHA512 8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298
-DIST libvpx-testdata-1.11.0.tar.xz 444614504 BLAKE2B ab6de4c46a771dc1c0dfb19326e580a492768c629eebbfb276db7da02e13256b2a66fdaadf76e5856879e871c7a17fcff657139582b1a3a84ad39c6018b912be SHA512 772e9d69dc9fc8e5a9411e1a532d908e86d90b03019e958349115a74697dcb35972ce71325312193d3a84030c3ff1d9bdbd09ed58918fffcba39c120ce4be868
DIST libvpx-testdata-1.12.0.tar.xz 499226656 BLAKE2B 8172ecbed4c678593882702c0d24e30d3e5d20a19c55ae73d4470ecd07b03905f25c62e1c32756e27fca2d02c841c11b11f1768dee60fa3419b8b983f6e66bf9 SHA512 28034e5940cd6a433eb6f8924ba5f0f555cb7526ff3356fa66282830a11818c32d2d70f6f9e959b278499397512663bca7f9de17e04b8b209efdf89e9d68ab57
-DIST libvpx-testdata-1.9.0.tar.xz 450868860 BLAKE2B aaed7f2ef4f70ff352e39be2630e3a5cd803e8d2408c4fd5c3e06e040a75d2f593a10bc267a497aa91eaceb64286e81f69e86ca0940160e4f34b62c08e91df7b SHA512 bcc89062a436d652d15d5852a842cb4985c4783855b943ab11667c022b5082887129fd9579b8da3af209a3031f95ff8dc625c380f79559db160501cd676736ea
-EBUILD libvpx-1.11.0.ebuild 4338 BLAKE2B a83124c9a4f0d72185eb9d8e474c19c2ba1ff0673f25df0220bcca8acc07c23b518390a73a6a533f22417b5cfa24558c72b3779f06597447c14d4543b7d2c596 SHA512 4bc994c6127712d2374bd01a6499b4bedf5204126555ab18044ee9ea8f91b336fcfae8dbeb001fe7ff7144a5158352bf7e1a81b3d7d3f003159f00d7fbd80708
-EBUILD libvpx-1.12.0.ebuild 4224 BLAKE2B 793dd18196d277bbd3de3fe456934b6276f890f5e725b5d25da694c46ad09233e01ecd6444c3cba1cf3af94ea7e6bf5c9821e942a2144550bab32d3cd6ad84d7 SHA512 18b073e567e8973ea0c3ee4af106d57b60294377d5832fd6d9bd5eeca78c46bf076cb384a014b6f0bb32652c2dea7fe90bae30cc902a5d7652bb6efd6cfc824e
-EBUILD libvpx-1.9.0.ebuild 3505 BLAKE2B d680f2ffeff02eda59a858acde96a24e5a3e77576aa3e5abbd45664b01f186bf20d9f69976792a08553a8a9a348ed08abb860eacb395050182398a6495a4966f SHA512 a690c1fcad0f7daf7c772e4186216274c310151b9b4c135f65fecec91fe1e9628b70ea7dd82e05e9b06304f8bc8c32af4c0970755805ab852e3a9a26b984fa96
+EBUILD libvpx-1.12.0-r1.ebuild 4267 BLAKE2B 442b3d73b55f719d257433c1775ebf7cfc60f6f6659b6ae9e2aabd4dee009e364432d2bb5c1165a841000fbcbf1d330fb934d63efd4cf71aa764f24d2a6ab6b8 SHA512 060f4a233715ff26a280befefa42d2a7f25389d605ee327ca3a6a3f54d530fe18de53aee0fc01fcfdc931d5cff86e3a707967492eaea2b6244d41bb4d86b1003
MISC metadata.xml 655 BLAKE2B 00bcc63009898b794c7e142cd83096f779758e0d5ce274d10f97cc08f4b98f929719c01898d64137aa125c7628bb991fb128d07a490e7e7b029be6f1041e28ac SHA512 0d2dd46ed564109ca5cd841b41ccc30ddb45e5c0e416624b7e8c0895d67217cfcc71cba0d13ab96af2a898add5f1cf8feb44b6a015ff8487668055c0f288e9fc
diff --git a/media-libs/libvpx/files/libvpx-1.12.0-configure-clang16.patch b/media-libs/libvpx/files/libvpx-1.12.0-configure-clang16.patch
new file mode 100644
index 000000000000..bb815b887885
--- /dev/null
+++ b/media-libs/libvpx/files/libvpx-1.12.0-configure-clang16.patch
@@ -0,0 +1,37 @@
+https://chromium-review.googlesource.com/c/webm/libvpx/+/4004627
+
+From 62dee8012ea70a9f0628471609c5768f98a1e726 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Nov 2022 04:11:59 +0000
+Subject: [PATCH] build: fix -Wimplicit-int (Clang 16)
+
+Clang 16 will make -Wimplicit-int error by default which can, in addition to
+other things, lead to some configure tests silently failing/returning the wrong result.
+
+Fixes this error:
+```
++/var/tmp/portage/media-libs/libvpx-1.12.0/temp/vpx-conf-1802-30624.c:1:15: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
+```
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], gentoo-dev@ [2],
+or the (new) c-std-porting mailing list [3].
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
+[3] hosted at lists.linux.dev.
+
+Bug: https://bugs.gentoo.org/879705
+Change-Id: Id73a98944ab3c99a368b9da7a5e902ddff9d937f
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -1511,7 +1511,7 @@ EOF
+
+ # Try to find which inline keywords are supported
+ check_cc <<EOF && INLINE="inline"
+-static inline function() {}
++static inline int function(void) {}
+ EOF
+
+ # Almost every platform uses pthreads.
diff --git a/media-libs/libvpx/libvpx-1.11.0.ebuild b/media-libs/libvpx/libvpx-1.11.0.ebuild
deleted file mode 100644
index 00b9211d078f..000000000000
--- a/media-libs/libvpx/libvpx-1.11.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit toolchain-funcs multilib-minimal
-
-# To create a new testdata tarball:
-# 1. Unpack source tarball or checkout git tag
-# 2. mkdir libvpx-testdata
-# 3. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
-# 4. configure --enable-unit-tests --enable-vp9-highbitdepth
-# 5. make testdata
-# 6. tar -caf libvpx-testdata-${MY_PV}.tar.xz libvpx-testdata
-
-LIBVPX_TESTDATA_VER=1.11.0
-
-DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="https://www.webmproject.org"
-SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0/7"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_ppc_vsx3 doc +highbitdepth postproc static-libs test +threads"
-
-REQUIRED_USE="test? ( threads )"
-
-# Disable test phase when USE="-test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/perl
- abi_x86_32? ( dev-lang/yasm )
- abi_x86_64? ( dev-lang/yasm )
- abi_x86_x32? ( dev-lang/yasm )
- doc? (
- app-doc/doxygen
- dev-lang/php
- )
-"
-
-PATCHES=(
- "${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
-)
-
-src_configure() {
- # https://bugs.gentoo.org/show_bug.cgi?id=384585
- # https://bugs.gentoo.org/show_bug.cgi?id=465988
- # copied from php-pear-r1.eclass
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/ #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
- addpredict /session_mm_cli0.sem #nowarn
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- unset CODECS #357487
-
- # #498364: sse doesn't work without sse2 enabled,
- local myconfargs=(
- --prefix="${EPREFIX}"/usr
- --libdir="${EPREFIX}"/usr/$(get_libdir)
- --enable-pic
- --enable-vp8
- --enable-vp9
- --enable-shared
- --disable-optimizations
- $(use_enable postproc)
- $(use_enable static-libs static)
- $(use_enable test unit-tests)
- $(use_enable threads multithread)
- $(use_enable highbitdepth vp9-highbitdepth)
- )
-
- # let the build system decide which AS to use (it honours $AS but
- # then feeds it with yasm flags without checking...) #345161
- tc-export AS
- case "${CHOST}" in
- i?86*) export AS=yasm;;
- x86_64*) export AS=yasm;;
- esac
-
- # libvpx is fragile: both for tests at runtime.
- # We force using the generic target unless we know things work to
- # avoid runtime breakage on exotic arches.
- if [[ ${ABI} == amd64 ]] ; then
- myconfargs+=( --force-target=x86_64-linux-gcc )
- elif [[ ${ABI} == x86 ]] ; then
- myconfargs+=( --force-target=x86-linux-gcc )
- elif [[ ${ABI} == arm64 ]] ; then
- myconfargs+=( --force-target=arm64-linux-gcc )
- elif [[ ${ABI} == arm ]] && [[ ${CHOST} == *armv7* ]] ; then
- myconfargs+=( --force-target=armv7-linux-gcc )
- elif [[ ${ABI} == ppc64 ]] && [[ $(tc-endian) != big ]] && use cpu_flags_ppc_vsx3; then
- # only enable this target for at least power9 CPU running little-endian
- myconfargs+=( --force-target=ppc64le-linux-gcc )
- else
- myconfargs+=( --force-target=generic-gnu )
- fi
-
- # powerpc toolchain is not recognized anymore, #694368
- #[[ ${CHOST} == powerpc-* ]] && myconfargs+=( --force-target=generic-gnu )
-
- # Build with correct toolchain.
- tc-export CC CXX AR NM
- # Link with gcc by default, the build system should override this if needed.
- export LD="${CC}"
-
- if multilib_is_native_abi; then
- myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
- else
- # not needed for multilib and will be overwritten anyway.
- myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
- fi
-
- echo "${S}"/configure "${myconfargs[@]}" >&2
- "${S}"/configure "${myconfargs[@]}" || die
-}
-
-multilib_src_compile() {
- # build verbose by default and do not build examples that will not be installed
- # disable stripping of debug info, bug #752057
- # (only works as long as upstream does not use non-gnu strip)
- emake verbose=yes GEN_EXAMPLES= HAVE_GNU_STRIP=no
-}
-
-multilib_src_test() {
- local -x LD_LIBRARY_PATH="${BUILD_DIR}"
- local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
- emake verbose=yes GEN_EXAMPLES= test
-}
-
-multilib_src_install() {
- emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
- multilib_is_native_abi && use doc && dodoc -r docs/html
-}
diff --git a/media-libs/libvpx/libvpx-1.12.0.ebuild b/media-libs/libvpx/libvpx-1.12.0-r1.ebuild
index c6c94481f2c1..72ccda036cbe 100644
--- a/media-libs/libvpx/libvpx-1.12.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.12.0-r1.ebuild
@@ -42,7 +42,8 @@ BDEPEND="dev-lang/perl
PATCHES=(
# bug #501010
- "${FILESDIR}/libvpx-1.3.0-sparc-configure.patch"
+ "${FILESDIR}/${PN}-1.3.0-sparc-configure.patch"
+ "${FILESDIR}/${P}-configure-clang16.patch"
)
src_configure() {
diff --git a/media-libs/libvpx/libvpx-1.9.0.ebuild b/media-libs/libvpx/libvpx-1.9.0.ebuild
deleted file mode 100644
index 70a6d2fe44fd..000000000000
--- a/media-libs/libvpx/libvpx-1.9.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit toolchain-funcs multilib-minimal
-
-# To create a new testdata tarball:
-# 1. Unpack source tarball or checkout git tag
-# 2. mkdir libvpx-testdata
-# 3. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
-# 4. configure --enable-unit-tests --enable-vp9-highbitdepth
-# 5. make testdata
-# 6. tar -caf libvpx-testdata-${MY_PV}.tar.xz libvpx-testdata
-
-LIBVPX_TESTDATA_VER=1.9.0
-
-DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="https://www.webmproject.org"
-SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- test? ( https://dev.gentoo.org/~whissi/dist/libvpx/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0/6"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc +highbitdepth postproc static-libs test +threads"
-
-REQUIRED_USE="test? ( threads )"
-
-# Disable test phase when USE="-test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/perl
- abi_x86_32? ( dev-lang/yasm )
- abi_x86_64? ( dev-lang/yasm )
- abi_x86_x32? ( dev-lang/yasm )
- doc? (
- app-doc/doxygen
- dev-lang/php
- )
-"
-
-PATCHES=(
- "${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
-)
-
-src_configure() {
- # https://bugs.gentoo.org/show_bug.cgi?id=384585
- # https://bugs.gentoo.org/show_bug.cgi?id=465988
- # copied from php-pear-r1.eclass
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/ #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
- addpredict /session_mm_cli0.sem #nowarn
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- unset CODECS #357487
-
- # #498364: sse doesn't work without sse2 enabled,
- local myconfargs=(
- --prefix="${EPREFIX}"/usr
- --libdir="${EPREFIX}"/usr/$(get_libdir)
- --enable-pic
- --enable-vp8
- --enable-vp9
- --enable-shared
- --extra-cflags="${CFLAGS}"
- $(use_enable postproc)
- $(use_enable static-libs static)
- $(use_enable test unit-tests)
- $(use_enable threads multithread)
- $(use_enable highbitdepth vp9-highbitdepth)
- )
-
- # let the build system decide which AS to use (it honours $AS but
- # then feeds it with yasm flags without checking...) #345161
- tc-export AS
- case "${CHOST}" in
- i?86*) export AS=yasm;;
- x86_64*) export AS=yasm;;
- esac
-
- # powerpc toolchain is not recognized anymore, #694368
- [[ ${CHOST} == powerpc-* ]] && myconfargs+=( --force-target=generic-gnu )
-
- # Build with correct toolchain.
- tc-export CC CXX AR NM
- # Link with gcc by default, the build system should override this if needed.
- export LD="${CC}"
-
- if multilib_is_native_abi; then
- myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
- else
- # not needed for multilib and will be overwritten anyway.
- myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
- fi
-
- echo "${S}"/configure "${myconfargs[@]}" >&2
- "${S}"/configure "${myconfargs[@]}"
-}
-
-multilib_src_compile() {
- # build verbose by default and do not build examples that will not be installed
- # disable stripping of debug info, bug #752057
- # (only works as long as upstream does not use non-gnu strip)
- emake verbose=yes GEN_EXAMPLES= HAVE_GNU_STRIP=no
-}
-
-multilib_src_test() {
- local -x LD_LIBRARY_PATH="${BUILD_DIR}"
- local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
- emake verbose=yes GEN_EXAMPLES= test
-}
-
-multilib_src_install() {
- emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
- multilib_is_native_abi && use doc && dodoc -r docs/html
-}