commit: a7d62b253fad8aac4a287d10048e8609a404f626 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Thu Oct 31 21:24:29 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Thu Oct 31 22:12:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7d62b25
media-video/handbrake: drop 1.4.2-r2, 1.5.1-r1 Bug: https://bugs.gentoo.org/921166 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> media-video/handbrake/Manifest | 2 - .../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 --------------------- 5 files changed, 383 deletions(-) diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 3e8e31e4f65d..eee2cfadc435 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -1,3 +1 @@ -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 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 <[email protected]> -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 <ogg/ogg.h> -+#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 - <media-video/ffmpeg-5.1:=[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="${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 -}
