From aac5e1b02ac846f5e1ce85f4f66fdec46aa9b0d1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Nov 2024 03:04:34 +0000 Subject: gentoo auto-resync : 01:11:2024 - 03:04:33 --- media-video/Manifest.gz | Bin 23213 -> 23194 bytes media-video/handbrake/Manifest | 8 +- .../handbrake-1.3.0-dont-search-for-python.patch | 25 ---- .../files/handbrake-1.5.1-ffmpeg-5.0.patch | 31 ---- media-video/handbrake/handbrake-1.4.2-r2.ebuild | 160 -------------------- media-video/handbrake/handbrake-1.5.1-r1.ebuild | 165 --------------------- media-video/handbrake/metadata.xml | 1 - 7 files changed, 1 insertion(+), 389 deletions(-) delete mode 100644 media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch delete mode 100644 media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch delete mode 100644 media-video/handbrake/handbrake-1.4.2-r2.ebuild delete mode 100644 media-video/handbrake/handbrake-1.5.1-r1.ebuild (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index c774523e3234..b701baf48bb1 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 620d7bc156ba..902c1c3ed94c 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -1,16 +1,10 @@ -AUX handbrake-1.3.0-dont-search-for-python.patch 622 BLAKE2B 4976c3cc58ac58c1236f9e2a0b7f5112417b0f88380be49ae449c7e38d94105f08c104cbcd47be4b7b83bdc7ee099644ebde70b0cdbacb5874eb5c49150d5b53 SHA512 6ba8b62c91741b27a9c270995b768e6fa0773feb15492f78b50cdf9ed5c7c0bd70401051b644e12a52bc41ce1a4fed2151552a703db061ec4302b12ba9b760d3 AUX handbrake-1.3.3-x265-link.patch 205 BLAKE2B e65b844a3924f2a332112502b9fb627eb876165d24ee4610c10a9d32a6d6e4eb98046d524837e7c1ce603135d40c77fa461128c3900734ae06681cb4d5bebd47 SHA512 d094c5348356ee3fde1ca1a0181b5b9bb64e9d10f956e34aed5033c21abb81db262970efc9fc72ef75b931ddc240dcb275f18dcc118b73dc585c933f537678e7 -AUX handbrake-1.5.1-ffmpeg-5.0.patch 1061 BLAKE2B 768f067caaeacc2fe3a68e4250a2aab98f08cd31fae0ae7d52056ccc36f901f0ee296eb8cacaae638fa841f3d58518dca8874452d422af200bee67cae1637f4d SHA512 b9665ab9658115a753ad62387cb16e27e01b4b0ec3d388eb237ed52e929ed5f87e0d69cde14107e907f595e21b85738941e879c435614ad753866f6881092a56 AUX handbrake-1.6.1-missing-include.patch 550 BLAKE2B 874c646bd6ce430dd2b273fc80406bee3ab4b405be41f984a6f8600b69a9344996de31e007db3d62c4a423d4e5c75758e47d7d089a5c7b07ea7e866a7b222fd4 SHA512 7b09ad791823f34ca8d64312bbcf0583a087522502625eba043fb9c81db5a135c7585bdd8d8241ecb2a3dd045cee4192b0bab83a9457d419b82204cb1b48432d AUX handbrake-9999-dont-search-for-python.patch 626 BLAKE2B 25226e243d06fb1a4bf7d7a9a0b2d5f77b37e87fd413c17bad285f10c0cefd33bee9dc193cc3497cd0740a36d3c596579502d3c76eccb514fa09b5976a171e48 SHA512 fd7684b0e312772c4e9e206dad402f3672c600a570cc60da543dc7e984b2bb91c7a3843b1a86dfe11179b86e35396aafa1c7464d6d7d0e93472d740ab6bcc4d9 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0 AUX handbrake-9999-remove-faac-dependency.patch 3869 BLAKE2B 41f5c9499430fbd4e38d22403d1d84dce5c1c0a0cc16c3e544028ee6612175c28913587cdca922d7438fe41761a28e4b1f80eb2073c6619bb2d954e848857451 SHA512 39ee580ff14a4286b9f74557866fb0ceef2521628eeb6f2d311dd46a8cfbc0c5933068deb2bc717cdf29d014a2eb3d54470f17f2214626ceba43a2d89f5be8b8 AUX handbrake-9999-system-tools.patch 1404 BLAKE2B b18f3149ba5012bc97084c29a1dc4409de6dd7e76a83687fed961c54534c226077e170d227d3d8e1c1d973e8c843ac9c5f796c2dadece1a14e3eb831323c4ac6 SHA512 965eb699193ab22f64621e3776e7af68f0fc13abcf16c779e7dddb3c6aa121afbe8791c63f2a6969842bc11c28c7b0f91f8eb26f1959e2fdb8fb08da4ceb182e -DIST handbrake-1.4.2.tar.bz2 15991593 BLAKE2B 966b54d35dd5544800208edc9045eaf26f3253aa470686b9ea29cdf69393af140829b21072133684661fd881eee7f97b90f9c7edfa87f187058dd1b14d1a748b SHA512 ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e -DIST handbrake-1.5.1.tar.bz2 16137974 BLAKE2B 9ce1f1ae7b2fe514ba1fb6ed30a345d18144829272a6298f2af0831e5ea7533ef2f8b201fd98389269b0ea12bbba15d0b76f09afeff6ed1d9ed313f20cf8f3a1 SHA512 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568 DIST handbrake-1.6.1.tar.bz2 15934833 BLAKE2B 027457c874bd49ff8a625233a5d09d70bdf76c45e6f2664f3ca65efcd0e1705d5575a81c5ac8f2237b8add7025314f12f0a19d6cc7337e2b0edd28c30ee3334b SHA512 e5cc0fee5bf063c4cdb8f64a772dac6800a7214bfdc65042c121e0e81878599fe615b499ebf6466bb78740314374ad8b8fa364fb24ff86852183e7dbbf565617 -EBUILD handbrake-1.4.2-r2.ebuild 4072 BLAKE2B e8d02d4ba17fdea73fe53b242c9860ab450ec1221069aa3dd36b1b7e37c398aef66dca8e6ad6b2c410459b01dd3495f3793e3d5e6654000dd9520676efe21020 SHA512 06d292b5e1a455f9fdbc07bfded936653e892ea7bf1e05e8455a8c76a8b3e66dfa320d6fcd6d85cfaa22a987b1f243421681f947ce5b39c8a2eda2e994875c0d -EBUILD handbrake-1.5.1-r1.ebuild 4246 BLAKE2B 6d29d5701826e2fb45a57b3a4aaab081571e8d0d1d2f506529bbd6ba04bcc94c8ed268989c61dda32a4617dcd87afe88f4eb6ee5ae383f5b88862b5418f64933 SHA512 d3caf8497dd139975729c29ac32b051e27e293ec585b0665b4974372418257d8d6d5763640601ce58ef8dbe84cd116b7bd451d59ff7166311183763e10be66da EBUILD handbrake-1.6.1.ebuild 4197 BLAKE2B 9ea44d080f1c0808f3bced34af7dc7cb4cd7d98f25bc322fa289553df928aa20922514793d5f71dc15258209e26c932685861e007db58dc4dad53d4121d7119d SHA512 b3da04d14b2294828f24b6681a6d39ae358ac4ac0ba3744ebc1d366f23e93d81452dd750e804a568d41c2448a67a8bd2ce6e7ea95b75980b74869227b870aac1 EBUILD handbrake-9999.ebuild 4148 BLAKE2B 2ca9fa15b9c576e9b4494b782afb049069411c2c9916f3113c9790f311fd0139c18b5a3fc53e25104d838caf452c32aa37877ef2ebe4462ce1b3b00efe78860c SHA512 2e40ce634fcc90da415e4369beae5da02a28f2b394626dc6036cb085bc4a5354c6548e32195225e9432a1a600738d9c18c4d4f293c95701ac7800f834aeb28d7 -MISC metadata.xml 764 BLAKE2B b55002f9d3df7bb894d64f6cbebcf5eb54298f160500a1ba46f132613a903c8a8cdcdd1bc6d425272b850e4142800dbdcec2fcf1208cc84a07961a31fc054ddb SHA512 ba170b59a2b96eb804e34a36845909b781fab783989db97f7c4c15b98d0b5497978bc7ae0b247958532031537d53e1878582d858b1c92a345b82fafecf98f7e1 +MISC metadata.xml 675 BLAKE2B e71f893af2575768aa8b76ea53395e44574b6d8e3a20891c91d09a4c265ddf76e0de9f2fa08100ac1cc87b24d1f90ae026205efa6bf2447aa144a0dc7bf5f112 SHA512 30d982bb80f40d020178bd580d8381a5646e9c3dcc68ee42e83ce921d0f6795d24d317556bfc3cc0de452a64db527647cacb2b06d02be7875973d23eb31ecce0 diff --git a/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch deleted file mode 100644 index 851ca0a11072..000000000000 --- a/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/configure -+++ b/configure -@@ -14,20 +14,8 @@ inpath() - } - - if ( inpath bash ); then -- pp="" -- for p in python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python2 python2.7 python -- do -- if ( inpath $p ); then -- pp="$p" -- break -- fi -- done -- if [ pp != "" ]; then -- exec $pp `dirname $0`/make/configure.py "$@" -- exit 0 -- else -- echo "ERROR: no suitable version of python found." -- fi -+ exec python `dirname $0`/make/configure.py "$@" -+ exit 0 - else - echo "ERROR: bash shell not found." - fi diff --git a/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch b/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch deleted file mode 100644 index 2ec2f3170de1..000000000000 --- a/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch +++ /dev/null @@ -1,31 +0,0 @@ -# https://git.exherbo.org/media.git/commit/?id=b7a022928103184b7528d0e40ad0a4edcfbbd7a4 - -From 8a9d11e96b771422247c458ae6b07f3a13848f3a Mon Sep 17 00:00:00 2001 -From: Timo Gurr -Date: Sat, 15 Jan 2022 20:44:53 +0100 -Subject: [PATCH] FFmpeg deprecations fixes for FFmpeg >= 5 - -avcodec.h stopped including bsf.h per FFmpeg commit -57b5ec6ba7df [1]. Fixes compilation error against -FFmpeg later than the mentioned commit. -[1] https://github.com/FFmpeg/FFmpeg/commit/57b5ec6ba7df442caebc401c4a7ef3ebc066b519 ---- a/libhb/decavcodec.c -+++ b/libhb/decavcodec.c -@@ -41,6 +41,7 @@ - #include "handbrake/handbrake.h" - #include "handbrake/hbffmpeg.h" - #include "handbrake/hbavfilter.h" -+#include "libavcodec/bsf.h" - #include "libavfilter/avfilter.h" - #include "libavfilter/buffersrc.h" - #include "libavfilter/buffersink.h" ---- a/libhb/muxavformat.c -+++ b/libhb/muxavformat.c -@@ -8,6 +8,7 @@ - */ - - #include -+#include "libavcodec/bsf.h" - #include "libavformat/avformat.h" - #include "libavutil/avstring.h" - #include "libavutil/intreadwrite.h" diff --git a/media-video/handbrake/handbrake-1.4.2-r2.ebuild b/media-video/handbrake/handbrake-1.4.2-r2.ebuild deleted file mode 100644 index 5f5a8b0e7e24..000000000000 --- a/media-video/handbrake/handbrake-1.4.2-r2.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit autotools python-any-r1 toolchain-funcs xdg - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git" - inherit git-r3 -else - MY_P="HandBrake-${PV}" - SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}/${MY_P}" - KEYWORDS="amd64 ~x86" -fi - -DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder" -HOMEPAGE="https://handbrake.fr/ https://github.com/HandBrake/HandBrake" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265" - -REQUIRED_USE="^^ ( fdk libav-aac )" - -RDEPEND=" - app-arch/xz-utils - dev-libs/jansson:= - dev-libs/libxml2 - media-libs/a52dec - >=media-libs/dav1d-0.5.1:= - media-libs/libjpeg-turbo:= - media-libs/libass:= - >=media-libs/libbluray-1.0:= - media-libs/libdvdnav - media-libs/libdvdread:= - media-libs/libsamplerate - media-libs/libtheora - media-libs/libvorbis - >=media-libs/libvpx-1.8:= - media-libs/opus - media-libs/speex - media-libs/x264:= - media-libs/zimg - media-sound/lame - >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] - sys-libs/zlib - fdk? ( media-libs/fdk-aac:= ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-ugly:1.0 - media-plugins/gst-plugins-a52dec:1.0 - media-plugins/gst-plugins-libav:1.0 - media-plugins/gst-plugins-x264:1.0 - media-plugins/gst-plugins-gdkpixbuf:1.0 - ) - gtk? ( - >=x11-libs/gtk+-3.10 - dev-libs/dbus-glib - dev-libs/glib:2 - dev-libs/libgudev:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/libnotify - x11-libs/pango - ) - nvenc? ( media-libs/nv-codec-headers ) - x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) -" -DEPEND=" - ${PYTHON_DEPS} - ${RDEPEND} - dev-lang/nasm - dev-util/intltool -" - -PATCHES=( - # Remove libdvdnav duplication and call it on the original instead. - # It may work this way; if not, we should try to mimic the duplication. - "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch" - - # Remove faac dependency; TODO: figure out if we need to do this at all. - "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch" - - # Detect system tools - bug 738110 - "${FILESDIR}/${PN}-9999-system-tools.patch" - - # Use whichever python is set by portage - "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch" - - # Fix x265 linkage... again again #730034 - "${FILESDIR}/${PN}-1.3.3-x265-link.patch" -) - -src_prepare() { - # Get rid of leftover bundled library build definitions, - sed -i 's:.*\(/contrib\|contrib/\).*::g' \ - "${S}"/make/include/main.defs \ - || die "Contrib removal failed." - - default - - cd "${S}/gtk" || die - eautoreconf -} - -src_configure() { - tc-export AR RANLIB STRIP - - # Libav was replaced in 1.2 with ffmpeg by default - # but I've elected to not make people change their use flags for AAC - # as its the same code anyway - local myconfargs=( - --force - --verbose - --prefix="${EPREFIX}/usr" - --disable-gtk-update-checks - --disable-flatpak - --disable-gtk4 - $(use_enable libav-aac ffmpeg-aac) - $(use_enable fdk fdk-aac) - $(usex !gtk --disable-gtk) - $(usex !gstreamer --disable-gst) - $(use_enable numa) - $(use_enable nvenc) - $(use_enable x265) - ) - - ./configure "${myconfargs[@]}" || die "Configure failed." -} - -src_compile() { - emake -C build -} - -src_install() { - emake -C build DESTDIR="${D}" install - dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown -} - -pkg_postinst() { - einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they" - einfo "do not use the bundled (and often patched) upstream libraries." - einfo "" - einfo "Please do not raise bugs with upstream because of these ebuilds," - einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead." - - einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`." - if use gtk ; then - einfo "For the GTK+ version of HandBrake, you can run \`ghb\`." - fi - - xdg_pkg_postinst -} diff --git a/media-video/handbrake/handbrake-1.5.1-r1.ebuild b/media-video/handbrake/handbrake-1.5.1-r1.ebuild deleted file mode 100644 index 9c9c548d9e32..000000000000 --- a/media-video/handbrake/handbrake-1.5.1-r1.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit autotools python-any-r1 toolchain-funcs xdg - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git" - inherit git-r3 -else - MY_P="HandBrake-${PV}" - SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}/${MY_P}" - KEYWORDS="amd64 ~arm64 ~x86" -fi - -DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder" -HOMEPAGE="https://handbrake.fr/ https://github.com/HandBrake/HandBrake" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265" - -REQUIRED_USE="^^ ( fdk libav-aac )" - -# < ffmpeg-5.1 dep for bug #907406 -RDEPEND=" - app-arch/xz-utils - dev-libs/jansson:= - dev-libs/libxml2 - media-libs/a52dec - >=media-libs/dav1d-0.5.1:= - media-libs/libjpeg-turbo:= - media-libs/libass:= - >=media-libs/libbluray-1.0:= - media-libs/libdvdnav - media-libs/libdvdread:= - media-libs/libsamplerate - media-libs/libtheora - media-libs/libvorbis - >=media-libs/libvpx-1.8:= - media-libs/opus - media-libs/speex - media-libs/x264:= - media-libs/zimg - media-sound/lame - =x11-libs/gtk+-3.10 - dev-libs/dbus-glib - dev-libs/glib:2 - dev-libs/libgudev:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/libnotify - x11-libs/pango - ) - nvenc? ( media-libs/nv-codec-headers ) - x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) -" -DEPEND="${RDEPEND}" -# cmake needed for custom script: bug #852701 -BDEPEND=" - ${PYTHON_DEPS} - dev-build/cmake - dev-lang/nasm -" - -PATCHES=( - # Remove libdvdnav duplication and call it on the original instead. - # It may work this way; if not, we should try to mimic the duplication. - "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch" - - # Remove faac dependency; TODO: figure out if we need to do this at all. - "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch" - - # Detect system tools - bug 738110 - "${FILESDIR}/${PN}-9999-system-tools.patch" - - # Use whichever python is set by portage - "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch" - - # Fix x265 linkage... again again #730034 - "${FILESDIR}/${PN}-1.3.3-x265-link.patch" - - # Fix compatability with ffmpeg-5.0 - "${FILESDIR}/${PN}-1.5.1-ffmpeg-5.0.patch" -) - -src_prepare() { - # Get rid of leftover bundled library build definitions, - sed -i 's:.*\(/contrib\|contrib/\).*::g' \ - "${S}"/make/include/main.defs \ - || die "Contrib removal failed." - - default - - cd "${S}/gtk" || die - eautoreconf -} - -src_configure() { - tc-export AR RANLIB STRIP - - # Libav was replaced in 1.2 with ffmpeg by default - # but I've elected to not make people change their use flags for AAC - # as its the same code anyway - local myconfargs=( - --force - --verbose - --prefix="${EPREFIX}/usr" - --disable-gtk-update-checks - --disable-flatpak - --disable-gtk4 - $(use_enable libav-aac ffmpeg-aac) - $(use_enable fdk fdk-aac) - $(usex !gtk --disable-gtk) - $(usex !gstreamer --disable-gst) - $(use_enable numa) - $(use_enable nvenc) - $(use_enable x265) - ) - - ./configure "${myconfargs[@]}" || die "Configure failed." -} - -src_compile() { - emake -C build -} - -src_install() { - emake -C build DESTDIR="${D}" install - dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown -} - -pkg_postinst() { - einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they" - einfo "do not use the bundled (and often patched) upstream libraries." - einfo "" - einfo "Please do not raise bugs with upstream because of these ebuilds," - einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead." - - einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`." - if use gtk ; then - einfo "For the GTK+ version of HandBrake, you can run \`ghb\`." - fi - - xdg_pkg_postinst -} diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml index 2a156bc117f3..eb829c9a924c 100644 --- a/media-video/handbrake/metadata.xml +++ b/media-video/handbrake/metadata.xml @@ -6,7 +6,6 @@ Support for the streaming media framework from media-libs/gstreamer. Install the GTK UI, ghb. Support for encoding AAC using media-libs/fdk-aac. - Support for encoding AAC using libav's internal encoder. Adds support for x265's NUMA capabilities. Support for encoding h265 using media-libs/x265. -- cgit v1.2.3