commit: c19e08005d92d1462b77a5507ddbe84606885165 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 27 15:10:40 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jul 27 19:46:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c19e0800
media-video/handbrake: drop 1.9.0-r2 Closes: https://bugs.gentoo.org/959316 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/handbrake/Manifest | 1 - .../files/handbrake-1.9.0-arm64-c99.patch | 77 -------- media-video/handbrake/handbrake-1.9.0-r2.ebuild | 216 --------------------- 3 files changed, 294 deletions(-) diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 3530a2efa489..b339ef8c2871 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -1,4 +1,3 @@ -DIST handbrake-1.9.0.tar.bz2 9427823 BLAKE2B 5e7c4aa054957dc61582956b7e2b9916f6746fac164e0f4a0ed85f863fe3b2aa2fd485761b1381e17ab39d9d3ed42de28266b2f664dad2b8dd0cd7d961886d5e SHA512 6d09a8fea8505dce665fa2d1b03ca2b21c9e0dc4cbb5f8e0b736d6eae39017b13ee48cd4bea172a6a3b8be9bb5deb6467584dadf9c15ce81e7b7a96d3322a179 DIST handbrake-1.9.2.tar.bz2 9431665 BLAKE2B 33591a9b576ba64ca0d8aabe4a14f7ef25b657a1b1553f8ffc18dc7a6a708b0b79443f018f6633c2ec437d25a7b0e4d803c2b46c672d57cb970eab75df48f239 SHA512 3c01b516aa7926c432773f37a311284e215ec6947b74b5c47306c7b3ac5e986e791c4d0adb4f6e614b4bb6bebecb57ac9a59644bdb535d485321e3be65dcc820 DIST handbrake-ffmpeg-7.1.1.tar.bz2 13278839 BLAKE2B dbedc190d1b752f07e0dc30452fe37a02300da75c3269956f09a63ada6f510838b3e6fb12f9882dbac88a82750ef42a16ed34b2214dfbdc56455b17a2cdc63f8 SHA512 db2682bd3f7dbfe4a33a5a7f0803010258d14f92e98ff2a5fdd17197422bc5cbfd992a63b93c9c5fb2b2420371a82e34a16e155f135a2aaf03764ed71adbc16b DIST handbrake-ffmpeg-7.1.tar.bz2 13260188 BLAKE2B 32466fbefdeb30796a329869bf6fe547a0d3285ae8d9505758e5bff5103f5edf1bebd2dd8595822d0cd25e3754929ed47878ab42c420e248fb2d6ea51747145a SHA512 3f28af9a0c0779b4a7f4e5fbfd94616eb83265856ef060a8bb8afbb9f1b899885a218f15b7ac2c48f724d961dd2742ef6544b237118cb94563ecf49fbd740e3b diff --git a/media-video/handbrake/files/handbrake-1.9.0-arm64-c99.patch b/media-video/handbrake/files/handbrake-1.9.0-arm64-c99.patch deleted file mode 100644 index ba795cc607b2..000000000000 --- a/media-video/handbrake/files/handbrake-1.9.0-arm64-c99.patch +++ /dev/null @@ -1,77 +0,0 @@ -https://bugs.gentoo.org/946885 -https://github.com/HandBrake/HandBrake/issues/6454 -https://github.com/HandBrake/HandBrake/pull/6463 - -From f8550e62e853348d36e0f0fc8e757a18fb3ac784 Mon Sep 17 00:00:00 2001 -From: Dash Santosh <[email protected]> -Date: Tue, 3 Dec 2024 06:43:59 -0800 -Subject: [PATCH] build: fix gcc14 aarch64 build failure - ---- - libhb/templates/comb_detect_template.c | 8 ++++---- - libhb/templates/decomb_template.c | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libhb/templates/comb_detect_template.c b/libhb/templates/comb_detect_template.c -index dfda498b2023..89bd0a468a28 100644 ---- a/libhb/templates/comb_detect_template.c -+++ b/libhb/templates/comb_detect_template.c -@@ -270,7 +270,7 @@ static void FUNC(detect_gamma_combed_segment)(hb_filter_private_t *pv, - mask_vec = vandq_u32(mask_vec, condition); - mask_vec = vandq_u32(mask_vec, v_one); - -- vst1q_u32(&mask32, mask_vec); -+ vst1q_u32(mask32, mask_vec); - - mask[0] = mask32[0]; - mask[1] = mask32[1]; -@@ -550,7 +550,7 @@ static void FUNC(detect_combed_segment)(hb_filter_private_t *pv, - mask_vec = vandq_u32(mask_vec, condition); - mask_vec = vandq_u32(mask_vec, v_one); - -- vst1q_u32(&mask32, mask_vec); -+ vst1q_u32(mask32, mask_vec); - - mask[0] = mask32[0]; - mask[1] = mask32[1]; -@@ -568,7 +568,7 @@ static void FUNC(detect_combed_segment)(hb_filter_private_t *pv, - mask_vec = vandq_u32(mask_vec, condition); - mask_vec = vandq_u32(mask_vec, v_one); - -- vst1q_u32(&mask32, mask_vec); -+ vst1q_u32(mask32, mask_vec); - - mask[0] = mask32[0]; - mask[1] = mask32[1]; -@@ -585,7 +585,7 @@ static void FUNC(detect_combed_segment)(hb_filter_private_t *pv, - mask_vec = vandq_u32(mask_vec, condition); - mask_vec = vandq_u32(mask_vec, v_one); - -- vst1q_u32(&mask32, mask_vec); -+ vst1q_u32(mask32, mask_vec); - - mask[0] = mask32[0]; - mask[1] = mask32[1]; -diff --git a/libhb/templates/decomb_template.c b/libhb/templates/decomb_template.c -index a46cae506f9a..b5b557186cc2 100644 ---- a/libhb/templates/decomb_template.c -+++ b/libhb/templates/decomb_template.c -@@ -181,7 +181,7 @@ static void FUNC(blend_filter_line)(const filter_param_t *filter, - result = vshrq_n_s32(result, 3); - - uint32x4_t result_u32 = vreinterpretq_u32_s32(vaddq_s32(result, offset)); -- vst1q_u32(&cr_table_vec, result_u32); -+ vst1q_u32(cr_table_vec, result_u32); - dst[x+0] = crop_table[cr_table_vec[0]]; - dst[x+1] = crop_table[cr_table_vec[1]]; - dst[x+2] = crop_table[cr_table_vec[2]]; -@@ -263,7 +263,7 @@ static void FUNC(blend_filter_line)(const filter_param_t *filter, - result = vshrq_n_s16(result, 3); - - uint16x8_t result_u16 = vreinterpretq_u16_s16(vaddq_s16(result, offset)); -- vst1q_u16(&cr_table_vec, result_u16); -+ vst1q_u16(cr_table_vec, result_u16); - dst[x+0] = crop_table[cr_table_vec[0]]; - dst[x+1] = crop_table[cr_table_vec[1]]; - dst[x+2] = crop_table[cr_table_vec[2]]; - diff --git a/media-video/handbrake/handbrake-1.9.0-r2.ebuild b/media-video/handbrake/handbrake-1.9.0-r2.ebuild deleted file mode 100644 index 8a70204d4539..000000000000 --- a/media-video/handbrake/handbrake-1.9.0-r2.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..13} ) - -inherit edo flag-o-matic multiprocessing python-any-r1 toolchain-funcs xdg - -DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder" -HOMEPAGE="https://handbrake.fr/ https://github.com/HandBrake/HandBrake"; - -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 - -# contrib/<project>/module.defs -declare -A BUNDLED=( - # Heavily patched in an incompatible way. - # Issues related to using system ffmpeg historically. - # See bug #829595 and #922828 - [ffmpeg]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/ffmpeg-7.1.tar.bz2;"; - # Patched in an incompatible way - [x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265_4.1.tar.gz;x265"; - [x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265_4.1.tar.gz;x265"; - [x265_10bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265_4.1.tar.gz;x265"; - [x265_12bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265_4.1.tar.gz;x265"; -) - -bundle_src_uri() { - for name in "${!BUNDLED[@]}"; do - IFS=$';' read -r uri use <<< ${BUNDLED[${name}]} - local tarball=${uri##*/} - if [[ -n ${use} ]]; then - SRC_URI+=" ${use}? ( ${uri} -> handbrake-${tarball} )" - else - SRC_URI+=" ${uri} -> handbrake-${tarball}" - fi - done -} - -bundle_src_uri - -LICENSE="GPL-2" -SLOT="0" -IUSE="amf +fdk gui libdovi numa nvenc qsv x265" - -REQUIRED_USE="numa? ( x265 )" - -# <media-libs/svt-av1-3.0.0: breaking change -# >=media-libs/libvpl-1.13.0: bug #957811 (check libhb/qsvcommon.h for new platform codenames) -COMMON_DEPEND=" - app-arch/bzip2 - >=app-arch/xz-utils-5.2.6 - dev-libs/jansson:= - >=media-libs/dav1d-1.0.0:= - >=media-libs/libjpeg-turbo-2.1.4:= - >=media-libs/libass-0.16.0:= - >=media-libs/libbluray-1.3.4:= - media-libs/libdvdnav - >=media-libs/libdvdread-6.1.3:= - media-libs/libtheora:= - media-libs/libvorbis - >=media-libs/libvpx-1.12.0:= - media-libs/opus - >=media-libs/speex-1.2.1 - <media-libs/svt-av1-3.0.0 - >=media-libs/svt-av1-1.4.1:= - >=media-libs/x264-0.0.20220222:= - >=media-libs/zimg-3.0.4 - media-sound/lame - sys-libs/zlib - fdk? ( media-libs/fdk-aac:= ) - libdovi? ( media-libs/libdovi:= ) - gui? ( - >=gui-libs/gtk-4.4:4[gstreamer] - dev-libs/glib:2 - >=dev-libs/libxml2-2.10.3:= - x11-libs/gdk-pixbuf:2 - x11-libs/pango - ) - numa? ( sys-process/numactl ) - nvenc? ( media-libs/nv-codec-headers ) - qsv? ( - media-libs/libva:= - >=media-libs/libvpl-1.13.0:= - ) -" -RDEPEND=" - ${COMMON_DEPEND} - amf? ( media-video/amdgpu-pro-amf ) -" -DEPEND=" - ${COMMON_DEPEND} - amf? ( media-libs/amf-headers ) -" -# cmake needed for custom script: bug #852701 -BDEPEND=" - ${PYTHON_DEPS} - dev-build/cmake - dev-lang/nasm - gui? ( - dev-build/meson - sys-devel/gettext - ) -" - -PATCHES=( - "${FILESDIR}"/handbrake-1.9.0-link-libdovi-properly.patch - "${FILESDIR}"/handbrake-1.9.0-include-vpl-properly.patch - "${FILESDIR}"/handbrake-1.9.0-arm64-c99.patch -) - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - else - unpack ${P}.tar.bz2 - fi -} - -src_prepare() { - mkdir download || die - for name in "${!BUNDLED[@]}"; do - IFS=$';' read -r uri use <<< ${BUNDLED[${name}]} - local tarball="${uri##*/}" - if [[ -n ${use} ]]; then - use ${use} || continue - fi - cp "${DISTDIR}/handbrake-${tarball}" download/${tarball} || die - done - - # Get rid of leftover bundled library build definitions - sed -i -E \ - -e "/MODULES \+= contrib\// { /($(IFS=$'|'; echo "${!BUNDLED[*]}"))$/! d }" \ - "${S}"/make/include/main.defs || die - - # noop fetching - sed -i -e '/DF..*.exe/ { s/= .*/= true/ }' make/include/tool.defs || die - - # noop strip - sed -i \ - -e "s/\(strip\s*= ToolProbe( 'STRIP.exe',\s*'strip',\s*\)'strip'/\1'true'/" \ - make/configure.py || die - - # Use whichever python is set by portage - sed -i -e "s/for p in .*/for p in ${EPYTHON}/" configure || die - - for tool in ar ranlib libtool; do - # Detect system tools - bug 738110 - sed -i \ - -e "s/\(${tool}\s*= ToolProbe( '${tool^^}.exe',\s*'${tool}',\s*\)'${tool}'/\1os.environ.get('${tool^^}', '${tool}')/" \ - make/configure.py || die - done - - default -} - -src_configure() { - tc-export AR RANLIB - - # ODR violations, lto-type-mismatches - # bug #878899 - filter-lto - - local myconfargs=( - --force - --verbose - --disable-df-fetch - --disable-df-verify - --launch-jobs=$(get_makeopts_jobs) - --prefix="${EPREFIX}/usr" - --disable-flatpak - --no-harden #bug #890279 - $(use_enable amf vce) - $(use_enable fdk fdk-aac) - $(use_enable gui gtk) - $(use_enable libdovi) - $(use_enable numa) - $(use_enable nvenc) - $(use_enable x265) - $(use_enable qsv) - ) - - edo ./configure ${myconfargs[@]} -} - -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 gui ; then - einfo "For the GUI version of HandBrake, you can run \`ghb\`." - fi - - xdg_pkg_postinst -}
