[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/

2026-02-13 Thread Michael Mair-Keimberger
commit: 151d9a694284047f2f802b9f2958ae163c035cf9
Author: Michael Mair-Keimberger  gentoo  org>
AuthorDate: Fri Feb 13 08:27:48 2026 +
Commit: Michael Mair-Keimberger  gentoo  org>
CommitDate: Fri Feb 13 08:27:48 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=151d9a69

media-video/handbrake: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gentoo.org>

 .../files/handbrake-1.9.2-x265-cmake4.patch| 101 -
 1 file changed, 101 deletions(-)

diff --git a/media-video/handbrake/files/handbrake-1.9.2-x265-cmake4.patch 
b/media-video/handbrake/files/handbrake-1.9.2-x265-cmake4.patch
deleted file mode 100644
index a443570aefcd..
--- a/media-video/handbrake/files/handbrake-1.9.2-x265-cmake4.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-https://bugs.gentoo.org/958194
-https://bitbucket.org/multicoreware/x265_git/commits/b354c009a60bcd6d7fc04014e200a1ee9c45c167
-https://bitbucket.org/multicoreware/x265_git/commits/51ae8e922bcc4586ad4710812072289af91492a8
-https://bitbucket.org/multicoreware/x265_git/commits/78e5ac35c13c5cbccc5933083edceb0d3eaeaa21
-
-From b354c009a60bcd6d7fc04014e200a1ee9c45c167 Mon Sep 17 00:00:00 2001
-From: yaswanthsastry 
-Date: Mon, 24 Feb 2025 17:07:03 +0530
-Subject: [PATCH 1/1] Fix CMake build error with latest CMake 4.0 release
-
 a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -7,13 +7,13 @@ if(NOT CMAKE_BUILD_TYPE)
- endif()
- message(STATUS "cmake version ${CMAKE_VERSION}")
- if(POLICY CMP0025)
--cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
-+cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang
- endif()
- if(POLICY CMP0042)
- cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
- endif()
- if(POLICY CMP0054)
--cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as 
variables or keywords when unquoted
-+cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as 
variables or keywords when unquoted
- endif()
- 
- project (x265)
--- 
-2.49.0
-
-From 51ae8e922bcc4586ad4710812072289af91492a8 Mon Sep 17 00:00:00 2001
-From: yaswanthsastry 
-Date: Mon, 7 Apr 2025 11:27:36 +0530
-Subject: [PATCH 1/1] Fix for CMake Build Errors in MacOS
-
 a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -6,18 +6,14 @@ if(NOT CMAKE_BUILD_TYPE)
- FORCE)
- endif()
- message(STATUS "cmake version ${CMAKE_VERSION}")
--if(POLICY CMP0025)
--cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang
--endif()
-+
- if(POLICY CMP0042)
- cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
- endif()
--if(POLICY CMP0054)
--cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as 
variables or keywords when unquoted
--endif()
-+
- 
- project (x265)
--cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
-+cmake_minimum_required (VERSION 2.8.8...3.10) # OBJECT libraries require 2.8.8
- include(CheckIncludeFiles)
- include(CheckFunctionExists)
- include(CheckSymbolExists)
-@@ -168,7 +164,7 @@ if(APPLE)
-   add_definitions(-DMACOS=1)
- endif()
- 
--if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} 
STREQUAL "AppleClang")
- set(CLANG 1)
- endif()
- if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
-@@ -740,6 +736,9 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY)
- if(ARM OR CROSS_COMPILE_ARM)
- # compile ARM arch asm files here
- enable_language(ASM)
-+if(APPLE)
-+set(ARM_ARGS ${ARM_ARGS} -arch ${CMAKE_OSX_ARCHITECTURES})
-+endif()
- foreach(ASM ${ARM_ASMS})
-   set(ASM_SRC 
${CMAKE_CURRENT_SOURCE_DIR}/common/arm/${ASM})
- list(APPEND ASM_SRCS ${ASM_SRC})
--- 
-2.49.0
-
-From 78e5ac35c13c5cbccc5933083edceb0d3eaeaa21 Mon Sep 17 00:00:00 2001
-From: yaswanthsastry 
-Date: Wed, 7 May 2025 16:38:47 +0530
-Subject: [PATCH 1/1] Bump CMake Version for dynamicHDR10
-
 a/source/dynamicHDR10/CMakeLists.txt
-+++ b/source/dynamicHDR10/CMakeLists.txt
-@@ -10,7 +10,7 @@ add_library(dynamicHDR10 OBJECT
- hdr10plus.h
- api.cpp )
- 
--cmake_minimum_required (VERSION 2.8.11)
-+cmake_minimum_required (VERSION 2.8.11...3.26)
- project(dynamicHDR10)
- include(CheckIncludeFiles)
- include(CheckFunctionExists)
--- 
-2.49.0
-



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2026-02-10 Thread Sam James
commit: 2521bebf20b4418af0954709b1c446a7e40da24a
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Feb 10 09:28:49 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 11 02:14:08 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2521bebf

media-video/handbrake: prepare for svt-av1 breakage

Upstream commit: 8e01c053aae403af786e43540e6a96256e80bd00

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45722
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.10.2.ebuild | 1 +
 media-video/handbrake/handbrake-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.10.2.ebuild 
b/media-video/handbrake/handbrake-1.10.2.ebuild
index b10f2fbe48ca..89697723bbfd 100644
--- a/media-video/handbrake/handbrake-1.10.2.ebuild
+++ b/media-video/handbrake/handbrake-1.10.2.ebuild
@@ -77,6 +77,7 @@ COMMON_DEPEND="
>=media-libs/libvpx-1.12.0:=
media-libs/opus
>=media-libs/speex-1.2.1
+   =media-libs/svt-av1-3.0.0:=
>=media-libs/x264-0.0.20220222:=
>=media-libs/zimg-3.0.4

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 1ff3e84fde1d..017d7050fbe9 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -77,7 +77,7 @@ COMMON_DEPEND="
>=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-4.0.0:=
>=media-libs/x264-0.0.20220222:=
>=media-libs/zimg-3.0.4
media-sound/lame



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2026-02-10 Thread Sam James
commit: 34874dc5c40cb46ace576f366f3a96a31f1ed8a2
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Feb 10 09:31:16 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 11 02:14:08 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34874dc5

media-video/handbrake: update bundled ffmpeg

Upstream commit: ad21dd99c205642b8931ca0b8fd0d783a4a9420b

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45722
Closes: https://github.com/gentoo/gentoo/pull/45722
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest  | 2 +-
 media-video/handbrake/handbrake-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 7a92f8d35a73..e9b4a5e0e3b2 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,5 +1,5 @@
 DIST handbrake-1.10.2.tar.bz2 9481895 BLAKE2B 
a7e2ec5cf5707d420eb01e561c2d57d5d93d21d1456483c84beb222a330e3ee96adefcd515f3512bac50d5417c3db35cfbd0f7cf2eba83e912f9470b8cd15768
 SHA512 
a1166ffb1597179e1ca58519cb6a7865ffbdedd5f1feda789cdb17cee94a9bb62b120926462bbc34b93c7ea53825099c45f70e809de7c456c88b60fce157b645
 DIST handbrake-1.10.2.tar.bz2.sig 566 BLAKE2B 
cde4ea4223ab9b346572637a27f7e6dfe07b97e56254355f8ab961e928c33630ac42c160d0d196b9e7ff897cf10089086a101b3ab4d93d59c79f4349cb6629d0
 SHA512 
9a33bc058a626c4bf1655abaaeae6641f7a71dd3db88ccb307e386623985791df7241e12ae6552f98a33b7a607b949cbe6fedaa9a36e5f16cd55fb44360455eb
 DIST handbrake-ffmpeg-7.1.1.tar.bz2 13278839 BLAKE2B 
dbedc190d1b752f07e0dc30452fe37a02300da75c3269956f09a63ada6f510838b3e6fb12f9882dbac88a82750ef42a16ed34b2214dfbdc56455b17a2cdc63f8
 SHA512 
db2682bd3f7dbfe4a33a5a7f0803010258d14f92e98ff2a5fdd17197422bc5cbfd992a63b93c9c5fb2b2420371a82e34a16e155f135a2aaf03764ed71adbc16b
-DIST handbrake-ffmpeg-8.0.tar.bz2 13685603 BLAKE2B 
c71bac40acae218bc57ff410c2079c36e7046ead9cb0f9b14c964d76d45509dcd382005f1082ac596d17c4e13470b53a152217a86768345efd136e07cfe920dd
 SHA512 
4ec20d47d6752ea2f1ecb17b582a8bd1523dd9c12c5276dce2a56c75def27f97d4507abce216f350717092a5341299ad35334b300aa6822252d54c82d31b0853
+DIST handbrake-ffmpeg-8.0.1.tar.bz2 13694841 BLAKE2B 
943aae7bbdad657b563d708c2f1f05cd7442538c0cde5673850f3894555900464a0bbd1393fe064086bc980a67feb53c58dcc3fce770a56d5d5cde635a4bf090
 SHA512 
5a07bb78e9a4d98901005040e4e5f3bfa421a49524f43ba19517d0b04a017803db9427c0216d50be6328737e18a91866b1a660a1165d99c6af38aa374e98ecb2
 DIST handbrake-x265-snapshot-20250729-13276.tar.gz 1738652 BLAKE2B 
59cba73b0d46cdaa40845e604e6b28ea428291d08b97ce144d13a072f164e18b0de20b2d4a62a92404ae32609a867d61e7b2d64099cac2124cc5c0640aad744a
 SHA512 
50648176cf1e20e384be4145a525c193f515b73d3ff96ae2042b393ebb3ee3a8cab031e1c5314bdd67f53a6a00010226a5709cdb720dec47142a93c6828469af

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 017d7050fbe9..09dab6664a33 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -33,7 +33,7 @@ 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-8.0.tar.bz2;";
+   
[ffmpeg]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/ffmpeg-8.0.1.tar.bz2;";
# Patched in an incompatible way

[x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";

[x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2026-02-10 Thread Sam James
commit: 94f365fb7050ac0b91b0f5dca8da6724a7758389
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sun Feb  8 04:26:10 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 11 02:14:08 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f365fb

media-video/handbrake: hookup verify-sig

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45722
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest|  1 +
 media-video/handbrake/handbrake-1.10.2.ebuild | 19 ---
 media-video/handbrake/handbrake-.ebuild   | 19 ---
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index b6bc8a40cc19..7a92f8d35a73 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,4 +1,5 @@
 DIST handbrake-1.10.2.tar.bz2 9481895 BLAKE2B 
a7e2ec5cf5707d420eb01e561c2d57d5d93d21d1456483c84beb222a330e3ee96adefcd515f3512bac50d5417c3db35cfbd0f7cf2eba83e912f9470b8cd15768
 SHA512 
a1166ffb1597179e1ca58519cb6a7865ffbdedd5f1feda789cdb17cee94a9bb62b120926462bbc34b93c7ea53825099c45f70e809de7c456c88b60fce157b645
+DIST handbrake-1.10.2.tar.bz2.sig 566 BLAKE2B 
cde4ea4223ab9b346572637a27f7e6dfe07b97e56254355f8ab961e928c33630ac42c160d0d196b9e7ff897cf10089086a101b3ab4d93d59c79f4349cb6629d0
 SHA512 
9a33bc058a626c4bf1655abaaeae6641f7a71dd3db88ccb307e386623985791df7241e12ae6552f98a33b7a607b949cbe6fedaa9a36e5f16cd55fb44360455eb
 DIST handbrake-ffmpeg-7.1.1.tar.bz2 13278839 BLAKE2B 
dbedc190d1b752f07e0dc30452fe37a02300da75c3269956f09a63ada6f510838b3e6fb12f9882dbac88a82750ef42a16ed34b2214dfbdc56455b17a2cdc63f8
 SHA512 
db2682bd3f7dbfe4a33a5a7f0803010258d14f92e98ff2a5fdd17197422bc5cbfd992a63b93c9c5fb2b2420371a82e34a16e155f135a2aaf03764ed71adbc16b
 DIST handbrake-ffmpeg-8.0.tar.bz2 13685603 BLAKE2B 
c71bac40acae218bc57ff410c2079c36e7046ead9cb0f9b14c964d76d45509dcd382005f1082ac596d17c4e13470b53a152217a86768345efd136e07cfe920dd
 SHA512 
4ec20d47d6752ea2f1ecb17b582a8bd1523dd9c12c5276dce2a56c75def27f97d4507abce216f350717092a5341299ad35334b300aa6822252d54c82d31b0853
 DIST handbrake-x265-snapshot-20250729-13276.tar.gz 1738652 BLAKE2B 
59cba73b0d46cdaa40845e604e6b28ea428291d08b97ce144d13a072f164e18b0de20b2d4a62a92404ae32609a867d61e7b2d64099cac2124cc5c0640aad744a
 SHA512 
50648176cf1e20e384be4145a525c193f515b73d3ff96ae2042b393ebb3ee3a8cab031e1c5314bdd67f53a6a00010226a5709cdb720dec47142a93c6828469af

diff --git a/media-video/handbrake/handbrake-1.10.2.ebuild 
b/media-video/handbrake/handbrake-1.10.2.ebuild
index d32ff126894d..b10f2fbe48ca 100644
--- a/media-video/handbrake/handbrake-1.10.2.ebuild
+++ b/media-video/handbrake/handbrake-1.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,11 +11,19 @@ DESCRIPTION="Open-source, GPL-licensed, multiplatform, 
multithreaded video trans
 HOMEPAGE="https://handbrake.fr/ https://github.com/HandBrake/HandBrake";
 
 if [[ ${PV} == ** ]]; then
-   EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
inherit git-r3
+   EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
 else
+   inherit verify-sig
MY_P="HandBrake-${PV}"
-   
SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2
 -> ${P}.tar.bz2"
+   SRC_URI="
+   
https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2
+   -> ${P}.tar.bz2
+   verify-sig? (
+   
https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2.sig
+   -> ${P}.tar.bz2.sig
+   )
+   "
S="${WORKDIR}/${MY_P}"
KEYWORDS="amd64 ~arm64 ~x86"
 fi
@@ -108,6 +116,10 @@ BDEPEND="
sys-devel/gettext
)
 "
+if [[ ${PV} !=  ]]; then
+   BDEPEND+="sec-keys/openpgp-keys-handbrake"
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/handbrake.asc
+fi
 
 PATCHES=(
"${FILESDIR}"/handbrake-1.9.0-link-libdovi-properly.patch
@@ -120,6 +132,7 @@ src_unpack() {
if [[ ${PV} ==  ]]; then
git-r3_src_unpack
else
+   use verify-sig && verify-sig_verify_detached 
"${DISTDIR}"/${P}.tar.bz2{,.sig}
unpack ${P}.tar.bz2
fi
 }

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 7e9b6e76f29d..1ff3e84fde1d 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,11 +11,19 @@ DESCRIP

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2026-02-10 Thread Sam James
commit: 3af054f21f1d47707525f94c5f118338964430fc
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sun Feb  8 04:12:59 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 11 02:14:07 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af054f2

media-video/handbrake: drop 1.9.2-r1, 1.10.1

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45722
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest  |   4 -
 media-video/handbrake/handbrake-1.10.1.ebuild   | 206 ---
 media-video/handbrake/handbrake-1.9.2-r1.ebuild | 213 
 3 files changed, 423 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 16fbc7b855ab..b6bc8a40cc19 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,8 +1,4 @@
-DIST handbrake-1.10.1.tar.bz2 9484661 BLAKE2B 
4906912ea96d682793856fc018bf2e062ec58f285798fbadd6f02775194fbdf264095a7d4297ff11ffd1c95cb5c55fd070e854fdfe3b06e4266327224c4277ce
 SHA512 
0acd82b9e1aab6391e50fbe15466ca1c8afb8428f6b51fc593ba0eef859792e9af274150056f63c55784ae8e7bf0d63d8a82acaa1fc402d676a5b358d91f270f
 DIST handbrake-1.10.2.tar.bz2 9481895 BLAKE2B 
a7e2ec5cf5707d420eb01e561c2d57d5d93d21d1456483c84beb222a330e3ee96adefcd515f3512bac50d5417c3db35cfbd0f7cf2eba83e912f9470b8cd15768
 SHA512 
a1166ffb1597179e1ca58519cb6a7865ffbdedd5f1feda789cdb17cee94a9bb62b120926462bbc34b93c7ea53825099c45f70e809de7c456c88b60fce157b645
-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
 DIST handbrake-ffmpeg-8.0.tar.bz2 13685603 BLAKE2B 
c71bac40acae218bc57ff410c2079c36e7046ead9cb0f9b14c964d76d45509dcd382005f1082ac596d17c4e13470b53a152217a86768345efd136e07cfe920dd
 SHA512 
4ec20d47d6752ea2f1ecb17b582a8bd1523dd9c12c5276dce2a56c75def27f97d4507abce216f350717092a5341299ad35334b300aa6822252d54c82d31b0853
 DIST handbrake-x265-snapshot-20250729-13276.tar.gz 1738652 BLAKE2B 
59cba73b0d46cdaa40845e604e6b28ea428291d08b97ce144d13a072f164e18b0de20b2d4a62a92404ae32609a867d61e7b2d64099cac2124cc5c0640aad744a
 SHA512 
50648176cf1e20e384be4145a525c193f515b73d3ff96ae2042b393ebb3ee3a8cab031e1c5314bdd67f53a6a00010226a5709cdb720dec47142a93c6828469af
-DIST handbrake-x265_4.1.tar.gz 1722231 BLAKE2B 
5950cc5361da88a8db5403b2837081347980cd31848ce77802e8a29cfb70f6b321d14ffa08c20270e80435076e36428c7de8293c3db9b6b2e8837aa512300126
 SHA512 
72798265423b605b0ca5f5541f3cc39f62dae7560a5a4023f8d38f6977ded80b1911ef8154c485fbe62ef97a051d938412934c9a00f3df010f11d83ffc650e7e

diff --git a/media-video/handbrake/handbrake-1.10.1.ebuild 
b/media-video/handbrake/handbrake-1.10.1.ebuild
deleted file mode 100644
index feecaf4b04f9..
--- a/media-video/handbrake/handbrake-1.10.1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-
-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} == ** ]]; 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//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.1.tar.bz2;";
-   # Patched in an incompatible way
-   
[x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
-  

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-10-21 Thread Sam James
commit: dd5c251eddbef21abb15fef6834203bf25ae1366
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 21 11:07:56 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 21 11:07:56 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd5c251e

media-video/handbrake: Stabilize 1.10.2 amd64, #964758

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.10.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.10.2.ebuild 
b/media-video/handbrake/handbrake-1.10.2.ebuild
index 5e004a7d504f..2f1ecd166a35 100644
--- a/media-video/handbrake/handbrake-1.10.2.ebuild
+++ b/media-video/handbrake/handbrake-1.10.2.ebuild
@@ -17,7 +17,7 @@ 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"
+   KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 # contrib//module.defs



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-09-06 Thread Sam James
commit: 4bfc8b23ee2f0c4df704f82bd514d31750e5a454
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sat Sep  6 11:40:01 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  6 14:10:31 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bfc8b23

media-video/handbrake: add 1.10.2

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43692
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest|   1 +
 media-video/handbrake/handbrake-1.10.2.ebuild | 206 ++
 2 files changed, 207 insertions(+)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index fb4404ada103..a2b2dbe18b4c 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,5 +1,6 @@
 DIST handbrake-1.10.0.tar.bz2 9452293 BLAKE2B 
97ba36d1d8a56c7bb7f30ab83c4307ce1a1cbbed877ea3e16213baa0c080ea0d244f4f4d53ef5c49be066d506c0975c71da9f3068455083b8a02776d6701a902
 SHA512 
d03f6c60bde5d968c92044fee68afe533ce394eb9952ec330b06f6250197c99bbef46265393aa346816f3b8e816e453472a8ebd116b7c388a12e8b9142029cfc
 DIST handbrake-1.10.1.tar.bz2 9484661 BLAKE2B 
4906912ea96d682793856fc018bf2e062ec58f285798fbadd6f02775194fbdf264095a7d4297ff11ffd1c95cb5c55fd070e854fdfe3b06e4266327224c4277ce
 SHA512 
0acd82b9e1aab6391e50fbe15466ca1c8afb8428f6b51fc593ba0eef859792e9af274150056f63c55784ae8e7bf0d63d8a82acaa1fc402d676a5b358d91f270f
+DIST handbrake-1.10.2.tar.bz2 9481895 BLAKE2B 
a7e2ec5cf5707d420eb01e561c2d57d5d93d21d1456483c84beb222a330e3ee96adefcd515f3512bac50d5417c3db35cfbd0f7cf2eba83e912f9470b8cd15768
 SHA512 
a1166ffb1597179e1ca58519cb6a7865ffbdedd5f1feda789cdb17cee94a9bb62b120926462bbc34b93c7ea53825099c45f70e809de7c456c88b60fce157b645
 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/handbrake-1.10.2.ebuild 
b/media-video/handbrake/handbrake-1.10.2.ebuild
new file mode 100644
index ..5e004a7d504f
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.10.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+
+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} == ** ]]; 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//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.1.tar.bz2;";
+   # Patched in an incompatible way
+   
[x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
+   
[x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
+   
[x265_10bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
+   
[x265_12bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.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
+

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-09-06 Thread Sam James
commit: a9ac3d9cd92e317dfb0d3e087546098664c8094e
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sat Sep  6 11:40:27 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  6 14:10:32 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ac3d9c

media-video/handbrake: drop 1.10.0

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43692
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest|   1 -
 media-video/handbrake/handbrake-1.10.0.ebuild | 206 --
 2 files changed, 207 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index a2b2dbe18b4c..84ef3436f15f 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,4 +1,3 @@
-DIST handbrake-1.10.0.tar.bz2 9452293 BLAKE2B 
97ba36d1d8a56c7bb7f30ab83c4307ce1a1cbbed877ea3e16213baa0c080ea0d244f4f4d53ef5c49be066d506c0975c71da9f3068455083b8a02776d6701a902
 SHA512 
d03f6c60bde5d968c92044fee68afe533ce394eb9952ec330b06f6250197c99bbef46265393aa346816f3b8e816e453472a8ebd116b7c388a12e8b9142029cfc
 DIST handbrake-1.10.1.tar.bz2 9484661 BLAKE2B 
4906912ea96d682793856fc018bf2e062ec58f285798fbadd6f02775194fbdf264095a7d4297ff11ffd1c95cb5c55fd070e854fdfe3b06e4266327224c4277ce
 SHA512 
0acd82b9e1aab6391e50fbe15466ca1c8afb8428f6b51fc593ba0eef859792e9af274150056f63c55784ae8e7bf0d63d8a82acaa1fc402d676a5b358d91f270f
 DIST handbrake-1.10.2.tar.bz2 9481895 BLAKE2B 
a7e2ec5cf5707d420eb01e561c2d57d5d93d21d1456483c84beb222a330e3ee96adefcd515f3512bac50d5417c3db35cfbd0f7cf2eba83e912f9470b8cd15768
 SHA512 
a1166ffb1597179e1ca58519cb6a7865ffbdedd5f1feda789cdb17cee94a9bb62b120926462bbc34b93c7ea53825099c45f70e809de7c456c88b60fce157b645
 DIST handbrake-1.9.2.tar.bz2 9431665 BLAKE2B 
33591a9b576ba64ca0d8aabe4a14f7ef25b657a1b1553f8ffc18dc7a6a708b0b79443f018f6633c2ec437d25a7b0e4d803c2b46c672d57cb970eab75df48f239
 SHA512 
3c01b516aa7926c432773f37a311284e215ec6947b74b5c47306c7b3ac5e986e791c4d0adb4f6e614b4bb6bebecb57ac9a59644bdb535d485321e3be65dcc820

diff --git a/media-video/handbrake/handbrake-1.10.0.ebuild 
b/media-video/handbrake/handbrake-1.10.0.ebuild
deleted file mode 100644
index 5e004a7d504f..
--- a/media-video/handbrake/handbrake-1.10.0.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-
-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} == ** ]]; 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//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.1.tar.bz2;";
-   # Patched in an incompatible way
-   
[x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
-   
[x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
-   
[x265_10bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
-   
[x265_12bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.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/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:=
-

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-09-06 Thread Sam James
commit: 35c6b309bd7cb45414f625973b064bfc31807e45
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sat Sep  6 10:48:45 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  6 14:10:32 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c6b309

media-video/handbrake: update vendored ffmpeg

Upstream commit: c7867ba49bb9fc22414170c89f9834d4442a8642

Require amf-header-1.4.36-r1 as 1.4.36 won't work.

Bug: https://bugs.gentoo.org/962399
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43692
Closes: https://github.com/gentoo/gentoo/pull/43692
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest  | 1 +
 media-video/handbrake/handbrake-.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 84ef3436f15f..16fbc7b855ab 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -3,5 +3,6 @@ DIST handbrake-1.10.2.tar.bz2 9481895 BLAKE2B 
a7e2ec5cf5707d420eb01e561c2d57d5d9
 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
+DIST handbrake-ffmpeg-8.0.tar.bz2 13685603 BLAKE2B 
c71bac40acae218bc57ff410c2079c36e7046ead9cb0f9b14c964d76d45509dcd382005f1082ac596d17c4e13470b53a152217a86768345efd136e07cfe920dd
 SHA512 
4ec20d47d6752ea2f1ecb17b582a8bd1523dd9c12c5276dce2a56c75def27f97d4507abce216f350717092a5341299ad35334b300aa6822252d54c82d31b0853
 DIST handbrake-x265-snapshot-20250729-13276.tar.gz 1738652 BLAKE2B 
59cba73b0d46cdaa40845e604e6b28ea428291d08b97ce144d13a072f164e18b0de20b2d4a62a92404ae32609a867d61e7b2d64099cac2124cc5c0640aad744a
 SHA512 
50648176cf1e20e384be4145a525c193f515b73d3ff96ae2042b393ebb3ee3a8cab031e1c5314bdd67f53a6a00010226a5709cdb720dec47142a93c6828469af
 DIST handbrake-x265_4.1.tar.gz 1722231 BLAKE2B 
5950cc5361da88a8db5403b2837081347980cd31848ce77802e8a29cfb70f6b321d14ffa08c20270e80435076e36428c7de8293c3db9b6b2e8837aa512300126
 SHA512 
72798265423b605b0ca5f5541f3cc39f62dae7560a5a4023f8d38f6977ded80b1911ef8154c485fbe62ef97a051d938412934c9a00f3df010f11d83ffc650e7e

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 5e004a7d504f..410d013ed435 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -25,7 +25,7 @@ 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.1.tar.bz2;";
+   
[ffmpeg]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/ffmpeg-8.0.tar.bz2;";
# Patched in an incompatible way

[x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";

[x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
@@ -96,7 +96,7 @@ RDEPEND="
 "
 DEPEND="
${COMMON_DEPEND}
-   amf? ( media-libs/amf-headers )
+   amf? ( >=media-libs/amf-headers-1.4.36-r1 )
 "
 # cmake needed for custom script: bug #852701
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-08-25 Thread Sam James
commit: b7ccdde2e914293ede01b2c7c299451beffc51b3
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sat Aug 23 18:43:58 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 25 10:03:35 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7ccdde2

media-video/handbrake: add 1.10.1

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43547
Closes: https://github.com/gentoo/gentoo/pull/43547
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest|   1 +
 media-video/handbrake/handbrake-1.10.1.ebuild | 206 ++
 2 files changed, 207 insertions(+)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 26f69694c46e..fb4404ada103 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,4 +1,5 @@
 DIST handbrake-1.10.0.tar.bz2 9452293 BLAKE2B 
97ba36d1d8a56c7bb7f30ab83c4307ce1a1cbbed877ea3e16213baa0c080ea0d244f4f4d53ef5c49be066d506c0975c71da9f3068455083b8a02776d6701a902
 SHA512 
d03f6c60bde5d968c92044fee68afe533ce394eb9952ec330b06f6250197c99bbef46265393aa346816f3b8e816e453472a8ebd116b7c388a12e8b9142029cfc
+DIST handbrake-1.10.1.tar.bz2 9484661 BLAKE2B 
4906912ea96d682793856fc018bf2e062ec58f285798fbadd6f02775194fbdf264095a7d4297ff11ffd1c95cb5c55fd070e854fdfe3b06e4266327224c4277ce
 SHA512 
0acd82b9e1aab6391e50fbe15466ca1c8afb8428f6b51fc593ba0eef859792e9af274150056f63c55784ae8e7bf0d63d8a82acaa1fc402d676a5b358d91f270f
 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/handbrake-1.10.1.ebuild 
b/media-video/handbrake/handbrake-1.10.1.ebuild
new file mode 100644
index ..5e004a7d504f
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.10.1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+
+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} == ** ]]; 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//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.1.tar.bz2;";
+   # Patched in an incompatible way
+   
[x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
+   
[x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
+   
[x265_10bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
+   
[x265_12bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.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/libvpl-1.13.0: bug #957811 (che

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-08-23 Thread Sam James
commit: eb5cbb256ec0f87d2bed82ee5305c8eba01bd92b
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Aug 11 16:32:59 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 23 07:37:44 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb5cbb25

media-video/handbrake: add 1.10.0

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43411
Closes: https://github.com/gentoo/gentoo/pull/43411
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest  | 1 +
 .../handbrake/{handbrake-.ebuild => handbrake-1.10.0.ebuild}| 2 +-
 media-video/handbrake/handbrake-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index e12bbcf36352..26f69694c46e 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,3 +1,4 @@
+DIST handbrake-1.10.0.tar.bz2 9452293 BLAKE2B 
97ba36d1d8a56c7bb7f30ab83c4307ce1a1cbbed877ea3e16213baa0c080ea0d244f4f4d53ef5c49be066d506c0975c71da9f3068455083b8a02776d6701a902
 SHA512 
d03f6c60bde5d968c92044fee68afe533ce394eb9952ec330b06f6250197c99bbef46265393aa346816f3b8e816e453472a8ebd116b7c388a12e8b9142029cfc
 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/handbrake-.ebuild 
b/media-video/handbrake/handbrake-1.10.0.ebuild
similarity index 99%
copy from media-video/handbrake/handbrake-.ebuild
copy to media-video/handbrake/handbrake-1.10.0.ebuild
index 60294646fd10..5e004a7d504f 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-1.10.0.ebuild
@@ -77,7 +77,7 @@ COMMON_DEPEND="
fdk? ( media-libs/fdk-aac:= )
libdovi? ( media-libs/libdovi:= )
gui? (
-   >=gui-libs/gtk-4.4:4[gstreamer]
+   >=gui-libs/gtk-4.6:4[gstreamer]
dev-libs/glib:2
>=dev-libs/libxml2-2.10.3:=
x11-libs/gdk-pixbuf:2

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 60294646fd10..5e004a7d504f 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -77,7 +77,7 @@ COMMON_DEPEND="
fdk? ( media-libs/fdk-aac:= )
libdovi? ( media-libs/libdovi:= )
gui? (
-   >=gui-libs/gtk-4.4:4[gstreamer]
+   >=gui-libs/gtk-4.6:4[gstreamer]
dev-libs/glib:2
>=dev-libs/libxml2-2.10.3:=
x11-libs/gdk-pixbuf:2



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-07-31 Thread Sam James
commit: ca92676f9f8c8902994e3612d01cb8aedf9b7f7c
Author: Alfred Wingate  protonmail  com>
AuthorDate: Wed Jul 30 21:40:19 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 31 06:59:34 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca92676f

media-video/handbrake: add myself as a maintainer

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43251
Closes: https://github.com/gentoo/gentoo/pull/43251
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/metadata.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-video/handbrake/metadata.xml 
b/media-video/handbrake/metadata.xml
index 40fd5d525ea8..c7ddb40b651e 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -1,7 +1,14 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   [email protected]
+   Alfred Wingate
+   
+   
+   [email protected]
+   Proxy Maintainers
+   

Support for encoding h265 using AMD VCE 
encoder.
Support for encoding AAC using 
media-libs/fdk-aac.



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-07-31 Thread Sam James
commit: c5172d29725b5a665457068da19afc84c908c06d
Author: Alfred Wingate  protonmail  com>
AuthorDate: Wed Jul 30 21:34:18 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 31 06:59:33 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5172d29

media-video/handbrake: update vendored x265

Upstream commit: 15d0308529e681acc2c1c8df16eb94ab2efe337a

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43251
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest  | 2 +-
 media-video/handbrake/handbrake-.ebuild | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index b339ef8c2871..e12bbcf36352 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,5 +1,5 @@
 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
-DIST handbrake-x265-snapshot-20250507-13244.tar.gz 1740846 BLAKE2B 
e2e2458c315510823753f99a006b1b33137af7273443fd9c7045c3215084af9cf255061c1ebc33befcf80457d1af54aa0d7bd543387cd85e8830c38071a400bd
 SHA512 
07f4a825a51f4468ba560811683b9c9a0c0cb3694059fedc14ef1ae5f82c5b8fe5a066f019db60aad512d9e4bbeb06ca68467a5a7b106eb740f290e45ffc7ef5
+DIST handbrake-x265-snapshot-20250729-13276.tar.gz 1738652 BLAKE2B 
59cba73b0d46cdaa40845e604e6b28ea428291d08b97ce144d13a072f164e18b0de20b2d4a62a92404ae32609a867d61e7b2d64099cac2124cc5c0640aad744a
 SHA512 
50648176cf1e20e384be4145a525c193f515b73d3ff96ae2042b393ebb3ee3a8cab031e1c5314bdd67f53a6a00010226a5709cdb720dec47142a93c6828469af
 DIST handbrake-x265_4.1.tar.gz 1722231 BLAKE2B 
5950cc5361da88a8db5403b2837081347980cd31848ce77802e8a29cfb70f6b321d14ffa08c20270e80435076e36428c7de8293c3db9b6b2e8837aa512300126
 SHA512 
72798265423b605b0ca5f5541f3cc39f62dae7560a5a4023f8d38f6977ded80b1911ef8154c485fbe62ef97a051d938412934c9a00f3df010f11d83ffc650e7e

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index cd0d35e8c9c1..60294646fd10 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -27,10 +27,10 @@ declare -A BUNDLED=(
# See bug #829595 and #922828

[ffmpeg]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/ffmpeg-7.1.1.tar.bz2;";
# Patched in an incompatible way
-   
[x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250507-13244.tar.gz;x265";
-   
[x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250507-13244.tar.gz;x265";
-   
[x265_10bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250507-13244.tar.gz;x265";
-   
[x265_12bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250507-13244.tar.gz;x265";
+   
[x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
+   
[x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
+   
[x265_10bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
+   
[x265_12bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250729-13276.tar.gz;x265";
 )
 
 bundle_src_uri() {



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/

2025-07-27 Thread Andreas Sturmlechner
commit: c19e08005d92d1462b77a5507ddbe84606885165
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul 27 15:10:40 2025 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 27 19:46:34 2025 +
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  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..
--- 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 
-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/d

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-06-30 Thread Sam James
commit: 7aed163877921ae4f69c50c849cb216633549c19
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 30 21:10:15 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 30 21:10:15 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aed1638

media-video/handbrake: Stabilize 1.9.2-r1 amd64, #959316

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.9.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.9.2-r1.ebuild 
b/media-video/handbrake/handbrake-1.9.2-r1.ebuild
index 58d8889292cc..d2e7090c99f6 100644
--- a/media-video/handbrake/handbrake-1.9.2-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.9.2-r1.ebuild
@@ -17,7 +17,7 @@ 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"
+   KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 # contrib//module.defs



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/

2025-06-15 Thread Sam James
commit: c277d74e35cac56dd63b1e9d0fc754823f39a12f
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sun Jun 15 21:28:45 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 15 22:28:22 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c277d74e

media-video/handbrake: handle cmake4 in x265

Bug: https://bugs.gentoo.org/958194
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42616
Closes: https://github.com/gentoo/gentoo/pull/42616
Signed-off-by: Sam James  gentoo.org>

 .../files/handbrake-1.9.2-x265-cmake4.patch| 101 +
 media-video/handbrake/handbrake-1.9.2-r1.ebuild|   5 +
 2 files changed, 106 insertions(+)

diff --git a/media-video/handbrake/files/handbrake-1.9.2-x265-cmake4.patch 
b/media-video/handbrake/files/handbrake-1.9.2-x265-cmake4.patch
new file mode 100644
index ..a443570aefcd
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.9.2-x265-cmake4.patch
@@ -0,0 +1,101 @@
+https://bugs.gentoo.org/958194
+https://bitbucket.org/multicoreware/x265_git/commits/b354c009a60bcd6d7fc04014e200a1ee9c45c167
+https://bitbucket.org/multicoreware/x265_git/commits/51ae8e922bcc4586ad4710812072289af91492a8
+https://bitbucket.org/multicoreware/x265_git/commits/78e5ac35c13c5cbccc5933083edceb0d3eaeaa21
+
+From b354c009a60bcd6d7fc04014e200a1ee9c45c167 Mon Sep 17 00:00:00 2001
+From: yaswanthsastry 
+Date: Mon, 24 Feb 2025 17:07:03 +0530
+Subject: [PATCH 1/1] Fix CMake build error with latest CMake 4.0 release
+
+--- a/source/CMakeLists.txt
 b/source/CMakeLists.txt
+@@ -7,13 +7,13 @@ if(NOT CMAKE_BUILD_TYPE)
+ endif()
+ message(STATUS "cmake version ${CMAKE_VERSION}")
+ if(POLICY CMP0025)
+-cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
++cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang
+ endif()
+ if(POLICY CMP0042)
+ cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
+ endif()
+ if(POLICY CMP0054)
+-cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as 
variables or keywords when unquoted
++cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as 
variables or keywords when unquoted
+ endif()
+ 
+ project (x265)
+-- 
+2.49.0
+
+From 51ae8e922bcc4586ad4710812072289af91492a8 Mon Sep 17 00:00:00 2001
+From: yaswanthsastry 
+Date: Mon, 7 Apr 2025 11:27:36 +0530
+Subject: [PATCH 1/1] Fix for CMake Build Errors in MacOS
+
+--- a/source/CMakeLists.txt
 b/source/CMakeLists.txt
+@@ -6,18 +6,14 @@ if(NOT CMAKE_BUILD_TYPE)
+ FORCE)
+ endif()
+ message(STATUS "cmake version ${CMAKE_VERSION}")
+-if(POLICY CMP0025)
+-cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang
+-endif()
++
+ if(POLICY CMP0042)
+ cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
+ endif()
+-if(POLICY CMP0054)
+-cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as 
variables or keywords when unquoted
+-endif()
++
+ 
+ project (x265)
+-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
++cmake_minimum_required (VERSION 2.8.8...3.10) # OBJECT libraries require 2.8.8
+ include(CheckIncludeFiles)
+ include(CheckFunctionExists)
+ include(CheckSymbolExists)
+@@ -168,7 +164,7 @@ if(APPLE)
+   add_definitions(-DMACOS=1)
+ endif()
+ 
+-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
++if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} 
STREQUAL "AppleClang")
+ set(CLANG 1)
+ endif()
+ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+@@ -740,6 +736,9 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY)
+ if(ARM OR CROSS_COMPILE_ARM)
+ # compile ARM arch asm files here
+ enable_language(ASM)
++if(APPLE)
++set(ARM_ARGS ${ARM_ARGS} -arch ${CMAKE_OSX_ARCHITECTURES})
++endif()
+ foreach(ASM ${ARM_ASMS})
+   set(ASM_SRC 
${CMAKE_CURRENT_SOURCE_DIR}/common/arm/${ASM})
+ list(APPEND ASM_SRCS ${ASM_SRC})
+-- 
+2.49.0
+
+From 78e5ac35c13c5cbccc5933083edceb0d3eaeaa21 Mon Sep 17 00:00:00 2001
+From: yaswanthsastry 
+Date: Wed, 7 May 2025 16:38:47 +0530
+Subject: [PATCH 1/1] Bump CMake Version for dynamicHDR10
+
+--- a/source/dynamicHDR10/CMakeLists.txt
 b/source/dynamicHDR10/CMakeLists.txt
+@@ -10,7 +10,7 @@ add_library(dynamicHDR10 OBJECT
+ hdr10plus.h
+ api.cpp )
+ 
+-cmake_minimum_required (VERSION 2.8.11)
++cmake_minimum_required (VERSION 2.8.11...3.26)
+ project(dynamicHDR10)
+ include(CheckIncludeFiles)
+ include(CheckFunctionExists)
+-- 
+2.49.0
+

diff --git a/media-video/handbrake/handbrake-1.9.2-r1.ebuild 
b/media-video/handbrake/handbrake-1.9.2-r1.ebuild
index c78120127376..58d8889292cc 100644
--- a/media-video/handbrake/handbrake-1.9.2-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.9.2-r1.ebuild
@@ -139,6 +139,11 @@ src_prepare() {
cp "${DISTDIR}/handbrake-${tarball}" download/${tarball} || die
done
 
+   if use x265; then
+   

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-06-15 Thread Sam James
commit: 9fd914a6a6f0d3f38003661ec22dea2d654a5c42
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sun Jun 15 20:25:28 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 15 22:28:21 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd914a6

media-video/handbrake: >=media-libs/libvpl-2.13.0

Closes: https://bugs.gentoo.org/957811
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42616
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.9.0-r2.ebuild | 3 ++-
 media-video/handbrake/handbrake-1.9.2-r1.ebuild | 3 ++-
 media-video/handbrake/handbrake-.ebuild | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.9.0-r2.ebuild 
b/media-video/handbrake/handbrake-1.9.0-r2.ebuild
index f33dab2ef00d..8a70204d4539 100644
--- a/media-video/handbrake/handbrake-1.9.0-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.9.0-r2.ebuild
@@ -54,6 +54,7 @@ IUSE="amf +fdk gui libdovi numa nvenc qsv x265"
 REQUIRED_USE="numa? ( x265 )"
 
 # =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
@@ -88,7 +89,7 @@ COMMON_DEPEND="
nvenc? ( media-libs/nv-codec-headers )
qsv? (
media-libs/libva:=
-   media-libs/libvpl:=
+   >=media-libs/libvpl-1.13.0:=
)
 "
 RDEPEND="

diff --git a/media-video/handbrake/handbrake-1.9.2-r1.ebuild 
b/media-video/handbrake/handbrake-1.9.2-r1.ebuild
index 951f401e1991..c78120127376 100644
--- a/media-video/handbrake/handbrake-1.9.2-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.9.2-r1.ebuild
@@ -54,6 +54,7 @@ IUSE="amf +fdk gui libdovi numa nvenc qsv x265"
 REQUIRED_USE="numa? ( x265 )"
 
 # =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
@@ -88,7 +89,7 @@ COMMON_DEPEND="
nvenc? ( media-libs/nv-codec-headers )
qsv? (
media-libs/libva:=
-   media-libs/libvpl:=
+   >=media-libs/libvpl-1.13.0:=
)
 "
 RDEPEND="

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index e044fd40b52b..cd0d35e8c9c1 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -53,6 +53,7 @@ IUSE="amf +fdk gui libdovi numa nvenc qsv x265"
 
 REQUIRED_USE="numa? ( x265 )"
 
+# >=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
@@ -86,7 +87,7 @@ COMMON_DEPEND="
nvenc? ( media-libs/nv-codec-headers )
qsv? (
media-libs/libva:=
-   media-libs/libvpl:=
+   >=media-libs/libvpl-1.13.0:=
)
 "
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-06-15 Thread Michał Górny
commit: 5d7659f5075a57a36acb43bfd6a161843b9a2155
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jun 15 19:12:21 2025 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jun 15 19:12:21 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d7659f5

media-video/handbrake: Add a slot op dep on libtheora

Signed-off-by: Michał Górny  gentoo.org>

 .../handbrake/{handbrake-1.9.0-r1.ebuild => handbrake-1.9.0-r2.ebuild}  | 2 +-
 .../handbrake/{handbrake-1.9.2.ebuild => handbrake-1.9.2-r1.ebuild} | 2 +-
 media-video/handbrake/handbrake-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.9.0-r1.ebuild 
b/media-video/handbrake/handbrake-1.9.0-r2.ebuild
similarity index 99%
rename from media-video/handbrake/handbrake-1.9.0-r1.ebuild
rename to media-video/handbrake/handbrake-1.9.0-r2.ebuild
index 9174a753892a..f33dab2ef00d 100644
--- a/media-video/handbrake/handbrake-1.9.0-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.9.0-r2.ebuild
@@ -64,7 +64,7 @@ COMMON_DEPEND="
>=media-libs/libbluray-1.3.4:=
media-libs/libdvdnav
>=media-libs/libdvdread-6.1.3:=
-   media-libs/libtheora
+   media-libs/libtheora:=
media-libs/libvorbis
>=media-libs/libvpx-1.12.0:=
media-libs/opus

diff --git a/media-video/handbrake/handbrake-1.9.2.ebuild 
b/media-video/handbrake/handbrake-1.9.2-r1.ebuild
similarity index 99%
rename from media-video/handbrake/handbrake-1.9.2.ebuild
rename to media-video/handbrake/handbrake-1.9.2-r1.ebuild
index e087e934d3c4..951f401e1991 100644
--- a/media-video/handbrake/handbrake-1.9.2.ebuild
+++ b/media-video/handbrake/handbrake-1.9.2-r1.ebuild
@@ -64,7 +64,7 @@ COMMON_DEPEND="
>=media-libs/libbluray-1.3.4:=
media-libs/libdvdnav
>=media-libs/libdvdread-6.1.3:=
-   media-libs/libtheora
+   media-libs/libtheora:=
media-libs/libvorbis
>=media-libs/libvpx-1.12.0:=
media-libs/opus

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 25687365c4ee..e044fd40b52b 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -63,7 +63,7 @@ COMMON_DEPEND="
>=media-libs/libbluray-1.3.4:=
media-libs/libdvdnav
>=media-libs/libdvdread-6.1.3:=
-   media-libs/libtheora
+   media-libs/libtheora:=
media-libs/libvorbis
>=media-libs/libvpx-1.12.0:=
media-libs/opus



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/

2025-05-22 Thread Sam James
commit: 193a89966684bd614c5043e16c9d10c0843f2dfd
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed May  7 08:21:09 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 23 06:39:23 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=193a8996

media-video/handbrake: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Part-of: https://github.com/gentoo/gentoo/pull/41972
Signed-off-by: Sam James  gentoo.org>

 .../files/handbrake-1.3.3-x265-link.patch  | 13 ---
 .../files/handbrake-1.6.1-missing-include.patch| 20 -
 .../handbrake--dont-search-for-python.patch| 26 --
 .../files/handbrake--remove-dvdnav-dup.patch   | 20 -
 .../files/handbrake--system-tools.patch| 22 --
 5 files changed, 101 deletions(-)

diff --git a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch 
b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
deleted file mode 100644
index 779366db543b..
--- a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 a/test/module.defs
-+++ a/test/module.defs
-@@ -30,6 +30,10 @@ 
- endif
- endif
- 
-+ifeq (1,$(FEATURE.x265))
-+TEST.GCC.l += x265
-+endif
-+
- ifeq (1,$(FEATURE.flatpak))
- TEST.GCC.l += glib-2.0
- endif

diff --git a/media-video/handbrake/files/handbrake-1.6.1-missing-include.patch 
b/media-video/handbrake/files/handbrake-1.6.1-missing-include.patch
deleted file mode 100644
index cfe16e718fc4..
--- a/media-video/handbrake/files/handbrake-1.6.1-missing-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 a/libhb/muxavformat.c
-+++ b/libhb/muxavformat.c
-@@ -7,6 +7,7 @@
-For full terms see the file COPYING file or visit 
http://www.gnu.org/licenses/gpl-2.0.html
-  */
- 
-+#include 
- #include 
- #include "libavcodec/bsf.h"
- #include "libavformat/avformat.h"
 a/libhb/work.c
-+++ b/libhb/work.c
-@@ -7,6 +7,7 @@
-For full terms see the file COPYING file or visit 
http://www.gnu.org/licenses/gpl-2.0.html
-  */
- 
-+#include 
- #include "handbrake/handbrake.h"
- #include "libavformat/avformat.h"
- #include "handbrake/decomb.h"

diff --git 
a/media-video/handbrake/files/handbrake--dont-search-for-python.patch 
b/media-video/handbrake/files/handbrake--dont-search-for-python.patch
deleted file mode 100644
index f9971e508404..
--- a/media-video/handbrake/files/handbrake--dont-search-for-python.patch
+++ /dev/null
@@ -1,26 +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--remove-dvdnav-dup.patch 
b/media-video/handbrake/files/handbrake--remove-dvdnav-dup.patch
deleted file mode 100644
index 7dc1f69328ea..
--- a/media-video/handbrake/files/handbrake--remove-dvdnav-dup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 a/libhb/dvdnav.c
-+++ b/libhb/dvdnav.c
-@@ -1225,16 +1225,7 @@
- {
- for (kk = 0; kk < buttons; kk++)
- {
--dvdnav_t *dvdnav_copy;
--
--result = dvdnav_dup( &dvdnav_copy, d->dvdnav );
--if (result != DVDNAV_STATUS_OK)
--{
--hb_log("dvdnav dup failed: %s", 
dvdnav_err_to_string(d->dvdnav));
--goto done;
--}
--title = try_button( dvdnav_copy, kk, list_title );
--dvdnav_free_dup( dvdnav_copy );
-+title = try_button( d->dvdnav, kk, list_title );
- 
- if ( title >= 0 )
- {

diff --git a/media-video/handbrake/files/handbrake--system-tools.patch 
b/media-video/handbrake/files/handbrake--system-tools.patch
deleted file mode 100644
index 820b4af8b3e8..
--- a/media-video/handbrake/files/handbrake--system-tools.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# https://bugs.gentoo.org/738110
-
 a/make/configure.py
-+++ b/make/configure.py
-@@ -1626,14 +1626,14 @@ try:
- 
- ## create tools in a scope
- class Tools:
--ar = ToolProbe( 'AR.exe', 'ar', 'ar', 
abort=True )
-+ar = ToolProbe( 'AR.exe',   

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-05-21 Thread Sam James
commit: 36420e588f04002b2c85a1faac4a9c9d95f79f5f
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue May 20 17:16:14 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 21 20:57:59 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36420e58

media-video/handbrake: enable py3.14

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42177
Closes: https://github.com/gentoo/gentoo/pull/42177
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index bf7e0a216e50..25687365c4ee 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 
 inherit edo flag-o-matic multiprocessing python-any-r1 toolchain-funcs xdg
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-05-21 Thread Sam James
commit: b5e12a61d5b7c600a73db4f30a03b8ad2e371c49
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue May 20 17:15:28 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 21 20:57:59 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5e12a61

media-video/handbrake: update vendored x265

Upstream commit: 2ac30707771311e131296f5854b5381801bd07d1

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42177
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest  | 2 +-
 media-video/handbrake/handbrake-.ebuild | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index f02b809317b0..3530a2efa489 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -2,5 +2,5 @@ DIST handbrake-1.9.0.tar.bz2 9427823 BLAKE2B 
5e7c4aa054957dc61582956b7e2b9916f67
 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
-DIST handbrake-x265-snapshot-20250224-13212.tar.gz 1738751 BLAKE2B 
a1ffa6a74ff44af3c322aef34233eafb25f1f235b45d6c5f387c77a8c4c09771d0eb9a41b3eb4bdfcbcf504bec66c44dd3ac37dc2bbb5c4ea969a4a8a55ac81d
 SHA512 
65f244ce56c39da2121ef0e5c6a188b8958e8ae1349a1cc7e6c20c68cb7a07d78e8951b7930c22828da262d4c722a336eb6777ef8d92cbcd87e99439b6a55feb
+DIST handbrake-x265-snapshot-20250507-13244.tar.gz 1740846 BLAKE2B 
e2e2458c315510823753f99a006b1b33137af7273443fd9c7045c3215084af9cf255061c1ebc33befcf80457d1af54aa0d7bd543387cd85e8830c38071a400bd
 SHA512 
07f4a825a51f4468ba560811683b9c9a0c0cb3694059fedc14ef1ae5f82c5b8fe5a066f019db60aad512d9e4bbeb06ca68467a5a7b106eb740f290e45ffc7ef5
 DIST handbrake-x265_4.1.tar.gz 1722231 BLAKE2B 
5950cc5361da88a8db5403b2837081347980cd31848ce77802e8a29cfb70f6b321d14ffa08c20270e80435076e36428c7de8293c3db9b6b2e8837aa512300126
 SHA512 
72798265423b605b0ca5f5541f3cc39f62dae7560a5a4023f8d38f6977ded80b1911ef8154c485fbe62ef97a051d938412934c9a00f3df010f11d83ffc650e7e

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 81bcb6720ef6..bf7e0a216e50 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -27,10 +27,10 @@ declare -A BUNDLED=(
# See bug #829595 and #922828

[ffmpeg]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/ffmpeg-7.1.1.tar.bz2;";
# Patched in an incompatible way
-   
[x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250224-13212.tar.gz;x265";
-   
[x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250224-13212.tar.gz;x265";
-   
[x265_10bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250224-13212.tar.gz;x265";
-   
[x265_12bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250224-13212.tar.gz;x265";
+   
[x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250507-13244.tar.gz;x265";
+   
[x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250507-13244.tar.gz;x265";
+   
[x265_10bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250507-13244.tar.gz;x265";
+   
[x265_12bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250507-13244.tar.gz;x265";
 )
 
 bundle_src_uri() {



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-05-06 Thread Sam James
commit: e965b8b414948935fb2bab0880a1c67ff3570b26
Author: Sam James  gentoo  org>
AuthorDate: Tue May  6 18:42:47 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  6 18:42:47 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e965b8b4

media-video/handbrake: disable py3.10

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.9.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.9.0-r1.ebuild 
b/media-video/handbrake/handbrake-1.9.0-r1.ebuild
index 023f96f36c49..9174a753892a 100644
--- a/media-video/handbrake/handbrake-1.9.0-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.9.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit edo flag-o-matic multiprocessing python-any-r1 toolchain-funcs xdg
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/

2025-05-06 Thread Sam James
commit: 5768e02999c920ec004b58b73912afadd6dfc025
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Mar  3 02:47:50 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  6 18:39:53 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5768e029

media-video/handbrake: add 1.9.2

* Set tools explicitly for ffmpeg. bug #946831
* Take this as a chance to remove potential footguns with complicated seds.

Closes: https://bugs.gentoo.org/946831
Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/41950
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest |   1 +
 ...rake-1.9.2-allow-overriding-tools-via-env.patch |  24 +++
 ...ake-1.9.2-set-ffmpeg-toolchain-explicitly.patch |  36 
 media-video/handbrake/handbrake-1.9.2.ebuild   | 205 +
 4 files changed, 266 insertions(+)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index c413f78e38d3..8be319fc2958 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,3 +1,4 @@
 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.tar.bz2 13260188 BLAKE2B 
32466fbefdeb30796a329869bf6fe547a0d3285ae8d9505758e5bff5103f5edf1bebd2dd8595822d0cd25e3754929ed47878ab42c420e248fb2d6ea51747145a
 SHA512 
3f28af9a0c0779b4a7f4e5fbfd94616eb83265856ef060a8bb8afbb9f1b899885a218f15b7ac2c48f724d961dd2742ef6544b237118cb94563ecf49fbd740e3b
 DIST handbrake-x265_4.1.tar.gz 1722231 BLAKE2B 
5950cc5361da88a8db5403b2837081347980cd31848ce77802e8a29cfb70f6b321d14ffa08c20270e80435076e36428c7de8293c3db9b6b2e8837aa512300126
 SHA512 
72798265423b605b0ca5f5541f3cc39f62dae7560a5a4023f8d38f6977ded80b1911ef8154c485fbe62ef97a051d938412934c9a00f3df010f11d83ffc650e7e

diff --git 
a/media-video/handbrake/files/handbrake-1.9.2-allow-overriding-tools-via-env.patch
 
b/media-video/handbrake/files/handbrake-1.9.2-allow-overriding-tools-via-env.patch
new file mode 100644
index ..8053c70b8aad
--- /dev/null
+++ 
b/media-video/handbrake/files/handbrake-1.9.2-allow-overriding-tools-via-env.patch
@@ -0,0 +1,24 @@
+From 32f63e103413661268452b482f61f0d22b2f359d Mon Sep 17 00:00:00 2001
+From: Alfred Wingate 
+Date: Wed, 25 Dec 2024 20:21:51 +0200
+Subject: [PATCH] Allow prepending tool option via env
+
+* GCC untouched due to incompatible assumptions.
+
+Signed-off-by: Alfred Wingate 
+--- a/make/configure.py
 b/make/configure.py
+@@ -1025,6 +1025,10 @@ class ToolProbe( Action ):
+ self.option = option
+ self.names  = []
+ self.kwargs = kwargs
++if var.endswith('.exe'):
++env = os.environ.get( var.removesuffix('.exe') )
++if env is not None:
++self.names.append( env )
+ for name in names:
+ try:
+ name = str(name)
+-- 
+2.47.1
+

diff --git 
a/media-video/handbrake/files/handbrake-1.9.2-set-ffmpeg-toolchain-explicitly.patch
 
b/media-video/handbrake/files/handbrake-1.9.2-set-ffmpeg-toolchain-explicitly.patch
new file mode 100644
index ..18409625c7d6
--- /dev/null
+++ 
b/media-video/handbrake/files/handbrake-1.9.2-set-ffmpeg-toolchain-explicitly.patch
@@ -0,0 +1,36 @@
+From 7e670380373eb5be0c977f467c102eb1210951b5 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate 
+Date: Wed, 25 Dec 2024 19:49:40 +0200
+Subject: [PATCH 1/2] Set toolchain explicitly for ffmpeg
+
+Signed-off-by: Alfred Wingate 
+--- a/contrib/ffmpeg/module.defs
 b/contrib/ffmpeg/module.defs
+@@ -76,7 +76,13 @@ FFMPEG.CONFIGURE.extra = \
+ --enable-filter=hwdownload \
+ --enable-filter=hwmap \
+ --enable-filter=hwupload \
+---cc="$(FFMPEG.GCC.gcc)"
++--cc="$(FFMPEG.GCC.gcc)" \
++--cxx="$(FFMPEG.GCC.gxx)" \
++--ar="$(AR.exe)" \
++--nm="$(NM.exe)" \
++--strip="$(STRIP.exe)" \
++--ranlib="$(RANLIB.exe)" \
++--pkg-config="$(PKGCONFIG.exe)"
+ 
+ ifeq (size-aggressive,$(GCC.O))
+ FFMPEG.CONFIGURE.extra += \
+--- a/make/configure.py
 b/make/configure.py
+@@ -1665,6 +1665,7 @@ try:
+ strip  = ToolProbe( 'STRIP.exe',  'strip',  'strip', 
abort=True )
+ tar= ToolProbe( 'TAR.exe','tar','gtar', 
'tar', abort=True )
+ python = ToolProbe( 'PYTHON.exe', 'python', 
os.path.basename(sys.executable), abort=True )
++nm  

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-05-06 Thread Sam James
commit: d660bfcb681e18d4cdb2a84042c600aac43afdb4
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue May  6 02:29:08 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  6 18:39:54 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d660bfcb

media-video/handbrake: handle svt-av1-3.0 breakage

1.9.2 and prior will not work with svt-av1-3.0, anything later will
require svt-av1-3.0.

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/41950
Closes: https://github.com/gentoo/gentoo/pull/41950
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.9.0-r1.ebuild | 2 ++
 media-video/handbrake/handbrake-1.9.2.ebuild| 2 ++
 media-video/handbrake/handbrake-.ebuild | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.9.0-r1.ebuild 
b/media-video/handbrake/handbrake-1.9.0-r1.ebuild
index 17c7a2e45a5f..023f96f36c49 100644
--- a/media-video/handbrake/handbrake-1.9.0-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.9.0-r1.ebuild
@@ -53,6 +53,7 @@ IUSE="amf +fdk gui libdovi numa nvenc qsv x265"
 
 REQUIRED_USE="numa? ( x265 )"
 
+# =media-libs/libvpx-1.12.0:=
media-libs/opus
>=media-libs/speex-1.2.1
+   =media-libs/svt-av1-1.4.1:=
>=media-libs/x264-0.0.20220222:=
>=media-libs/zimg-3.0.4

diff --git a/media-video/handbrake/handbrake-1.9.2.ebuild 
b/media-video/handbrake/handbrake-1.9.2.ebuild
index 95c6c604707c..e087e934d3c4 100644
--- a/media-video/handbrake/handbrake-1.9.2.ebuild
+++ b/media-video/handbrake/handbrake-1.9.2.ebuild
@@ -53,6 +53,7 @@ IUSE="amf +fdk gui libdovi numa nvenc qsv x265"
 
 REQUIRED_USE="numa? ( x265 )"
 
+# =media-libs/libvpx-1.12.0:=
media-libs/opus
>=media-libs/speex-1.2.1
+   =media-libs/svt-av1-1.4.1:=
>=media-libs/x264-0.0.20220222:=
>=media-libs/zimg-3.0.4

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 4c18487d9cc1..81bcb6720ef6 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -68,7 +68,7 @@ COMMON_DEPEND="
>=media-libs/libvpx-1.12.0:=
media-libs/opus
>=media-libs/speex-1.2.1
-   >=media-libs/svt-av1-1.4.1:=
+   >=media-libs/svt-av1-3.0.0:=
>=media-libs/x264-0.0.20220222:=
>=media-libs/zimg-3.0.4
media-sound/lame



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-05-06 Thread Sam James
commit: 1752050cfa4436586a270d410c8d2f4afa0061ef
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue May  6 01:35:59 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  6 18:39:52 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1752050c

media-video/handbrake: drop 1.6.1

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/41950
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest   |   1 -
 media-video/handbrake/handbrake-1.6.1.ebuild | 170 ---
 media-video/handbrake/metadata.xml   |   2 -
 3 files changed, 173 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 88e1268ee53e..c413f78e38d3 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,4 +1,3 @@
-DIST handbrake-1.6.1.tar.bz2 15934833 BLAKE2B 
027457c874bd49ff8a625233a5d09d70bdf76c45e6f2664f3ca65efcd0e1705d5575a81c5ac8f2237b8add7025314f12f0a19d6cc7337e2b0edd28c30ee3334b
 SHA512 
e5cc0fee5bf063c4cdb8f64a772dac6800a7214bfdc65042c121e0e81878599fe615b499ebf6466bb78740314374ad8b8fa364fb24ff86852183e7dbbf565617
 DIST handbrake-1.9.0.tar.bz2 9427823 BLAKE2B 
5e7c4aa054957dc61582956b7e2b9916f6746fac164e0f4a0ed85f863fe3b2aa2fd485761b1381e17ab39d9d3ed42de28266b2f664dad2b8dd0cd7d961886d5e
 SHA512 
6d09a8fea8505dce665fa2d1b03ca2b21c9e0dc4cbb5f8e0b736d6eae39017b13ee48cd4bea172a6a3b8be9bb5deb6467584dadf9c15ce81e7b7a96d3322a179
 DIST handbrake-ffmpeg-7.1.tar.bz2 13260188 BLAKE2B 
32466fbefdeb30796a329869bf6fe547a0d3285ae8d9505758e5bff5103f5edf1bebd2dd8595822d0cd25e3754929ed47878ab42c420e248fb2d6ea51747145a
 SHA512 
3f28af9a0c0779b4a7f4e5fbfd94616eb83265856ef060a8bb8afbb9f1b899885a218f15b7ac2c48f724d961dd2742ef6544b237118cb94563ecf49fbd740e3b
 DIST handbrake-x265_4.1.tar.gz 1722231 BLAKE2B 
5950cc5361da88a8db5403b2837081347980cd31848ce77802e8a29cfb70f6b321d14ffa08c20270e80435076e36428c7de8293c3db9b6b2e8837aa512300126
 SHA512 
72798265423b605b0ca5f5541f3cc39f62dae7560a5a4023f8d38f6977ded80b1911ef8154c485fbe62ef97a051d938412934c9a00f3df010f11d83ffc650e7e

diff --git a/media-video/handbrake/handbrake-1.6.1.ebuild 
b/media-video/handbrake/handbrake-1.6.1.ebuild
deleted file mode 100644
index 9cdc3aa1b4a8..
--- a/media-video/handbrake/handbrake-1.6.1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools edo flag-o-matic python-any-r1 toolchain-funcs xdg
-
-if [[ ${PV} == ** ]]; 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 numa nvenc x265" # TODO: qsv vce
-
-REQUIRED_USE="numa? ( x265 )"
-
-RDEPEND="
-   >=app-arch/xz-utils-5.2.6
-   dev-libs/jansson:=
-   >=dev-libs/libxml2-2.10.3
-   media-libs/a52dec
-   >=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/libsamplerate
-   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-1.4.1:=
-   >=media-libs/x264-0.0.20220222:=
-   >=media-libs/zimg-3.0.4
-   media-sound/lame
-   >=media-video/ffmpeg-5.1.2:=[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
-   media-video/ffmpeg[nvenc]
-   )
-   x265? ( >=media-libs/x265-3.5-r2:

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-05-06 Thread Sam James
commit: 8718dce77c83e76f6cbab46ba650780a1f1f97c2
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue May  6 02:04:29 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  6 18:39:54 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8718dce7

media-video/handbrake: update live

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/41950
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest  |  2 ++
 media-video/handbrake/handbrake-.ebuild | 35 -
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 8be319fc2958..f02b809317b0 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,4 +1,6 @@
 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
+DIST handbrake-x265-snapshot-20250224-13212.tar.gz 1738751 BLAKE2B 
a1ffa6a74ff44af3c322aef34233eafb25f1f235b45d6c5f387c77a8c4c09771d0eb9a41b3eb4bdfcbcf504bec66c44dd3ac37dc2bbb5c4ea969a4a8a55ac81d
 SHA512 
65f244ce56c39da2121ef0e5c6a188b8958e8ae1349a1cc7e6c20c68cb7a07d78e8951b7930c22828da262d4c722a336eb6777ef8d92cbcd87e99439b6a55feb
 DIST handbrake-x265_4.1.tar.gz 1722231 BLAKE2B 
5950cc5361da88a8db5403b2837081347980cd31848ce77802e8a29cfb70f6b321d14ffa08c20270e80435076e36428c7de8293c3db9b6b2e8837aa512300126
 SHA512 
72798265423b605b0ca5f5541f3cc39f62dae7560a5a4023f8d38f6977ded80b1911ef8154c485fbe62ef97a051d938412934c9a00f3df010f11d83ffc650e7e

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 541054bbfa55..4c18487d9cc1 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit edo flag-o-matic multiprocessing python-any-r1 toolchain-funcs xdg
 
@@ -25,12 +25,12 @@ 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;";
+   
[ffmpeg]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/ffmpeg-7.1.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";
+   
[x265]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250224-13212.tar.gz;x265";
+   
[x265_8bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250224-13212.tar.gz;x265";
+   
[x265_10bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250224-13212.tar.gz;x265";
+   
[x265_12bit]="https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs2/x265-snapshot-20250224-13212.tar.gz;x265";
 )
 
 bundle_src_uri() {
@@ -111,6 +111,8 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/handbrake-1.9.0-link-libdovi-properly.patch
"${FILESDIR}"/handbrake-1.9.0-include-vpl-properly.patch
+   "${FILESDIR}"/handbrake-1.9.2-set-ffmpeg-toolchain-explicitly.patch
+ 

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-05-06 Thread Sam James
commit: 1ebb3c39e5637d9610909ea1d972c5f4837719b4
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sat May  3 16:26:51 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  6 18:39:53 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ebb3c39

media-video/handbrake: add dev-libs/libxml2 subslot op for incoming ABI break

Signed-off-by: Alfred Wingate  protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/41950
Signed-off-by: Sam James  gentoo.org>

 .../handbrake/{handbrake-1.9.0.ebuild => handbrake-1.9.0-r1.ebuild}   | 2 +-
 media-video/handbrake/handbrake-.ebuild   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.9.0.ebuild 
b/media-video/handbrake/handbrake-1.9.0-r1.ebuild
similarity index 99%
rename from media-video/handbrake/handbrake-1.9.0.ebuild
rename to media-video/handbrake/handbrake-1.9.0-r1.ebuild
index 6d04f2e73ecb..17c7a2e45a5f 100644
--- a/media-video/handbrake/handbrake-1.9.0.ebuild
+++ b/media-video/handbrake/handbrake-1.9.0-r1.ebuild
@@ -78,7 +78,7 @@ COMMON_DEPEND="
gui? (
>=gui-libs/gtk-4.4:4[gstreamer]
dev-libs/glib:2
-   >=dev-libs/libxml2-2.10.3
+   >=dev-libs/libxml2-2.10.3:=
x11-libs/gdk-pixbuf:2
x11-libs/pango
)

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 87d75de6700c..541054bbfa55 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -78,7 +78,7 @@ COMMON_DEPEND="
gui? (
>=gui-libs/gtk-4.4:4[gstreamer]
dev-libs/glib:2
-   >=dev-libs/libxml2-2.10.3
+   >=dev-libs/libxml2-2.10.3:=
x11-libs/gdk-pixbuf:2
x11-libs/pango
)



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2025-04-12 Thread Sam James
commit: 6997e7bbb351c1426496d63f1814977ade6b552e
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 12 20:49:57 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 12 20:49:57 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6997e7bb

media-video/handbrake: Stabilize 1.9.0 amd64, #953699

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.9.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.9.0.ebuild 
b/media-video/handbrake/handbrake-1.9.0.ebuild
index 565fcec3cad9..6d04f2e73ecb 100644
--- a/media-video/handbrake/handbrake-1.9.0.ebuild
+++ b/media-video/handbrake/handbrake-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ 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"
+   KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 # contrib//module.defs



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/, media-video/handbrake/files/

2024-12-25 Thread Sam James
commit: e7c418ad3e6a28b7a34925092a57b89f0cc887e2
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 26 07:01:19 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 26 07:08:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c418ad

media-video/handbrake: fix arm64 build

Closes: https://bugs.gentoo.org/946885
Signed-off-by: Sam James  gentoo.org>

 .../files/handbrake-1.9.0-arm64-c99.patch  | 77 ++
 media-video/handbrake/handbrake-1.9.0.ebuild   |  1 +
 2 files changed, 78 insertions(+)

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
new file mode 100644
index ..ba795cc607b2
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.9.0-arm64-c99.patch
@@ -0,0 +1,77 @@
+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 
+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.ebuild 
b/media-video/handbrake/handbrake-1.9.0.ebuild
index 87d75de6700c..565fcec3cad9 100644
--- a/media-video/handbrake/handbrake-1.9.0.ebuild
+++ b/media-video/handbrake/handbrake-1.9.0.ebuild
@@ -111,6 +111,7 @@ BDEPEND="
 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() {



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2024-12-21 Thread Sam James
commit: 77da9af0ca5db4278b6185be5adee99d016e5bec
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Dec 16 06:11:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 22 06:20:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77da9af0

media-video/handbrake: filter lto and disable build system hardening

* Filter lto due to rampant lto-type-mismatches and ODR violations.
* Disable hardening in build system fixing bug #890279.

Closes: https://bugs.gentoo.org/878899
Closes: https://bugs.gentoo.org/890279
Signed-off-by: Alfred Wingate  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.6.1.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.6.1.ebuild 
b/media-video/handbrake/handbrake-1.6.1.ebuild
index 2fbb8d88ba6b..9cdc3aa1b4a8 100644
--- a/media-video/handbrake/handbrake-1.6.1.ebuild
+++ b/media-video/handbrake/handbrake-1.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit autotools edo python-any-r1 toolchain-funcs xdg
+inherit autotools edo flag-o-matic python-any-r1 toolchain-funcs xdg
 
 if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
@@ -117,6 +117,10 @@ src_prepare() {
 src_configure() {
tc-export AR RANLIB STRIP
 
+   # ODR violations, lto-type-mismatches
+   # bug #878899
+   filter-lto
+
# 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
@@ -125,6 +129,7 @@ src_configure() {
--verbose
--prefix="${EPREFIX}/usr"
--disable-flatpak
+   --no-harden #bug #890279
$(usex !gtk --disable-gtk)
--disable-gtk4
$(usex !gstreamer --disable-gst)



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2024-12-21 Thread Sam James
commit: 8153d74d6804d46300d70a6d523edb657829efa5
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Dec 16 06:40:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 22 06:20:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8153d74d

media-video/handbrake: add documentation to metadata

Signed-off-by: Alfred Wingate  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39725
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-video/handbrake/metadata.xml 
b/media-video/handbrake/metadata.xml
index ef5eae4a0bd1..d82a987a8cbb 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -13,6 +13,7 @@
Support for encoding h265 using 
media-libs/x265.


+   https://handbrake.fr/docs/en/
HandBrake/HandBrake

 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2024-12-21 Thread Sam James
commit: ec4706608de044508e04021fd40e6cdcf79b87f9
Author: Alfred Wingate  protonmail  com>
AuthorDate: Mon Dec 16 02:50:41 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 22 06:20:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec470660

media-video/handbrake: update live

Signed-off-by: Alfred Wingate  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-.ebuild | 179 ++--
 1 file changed, 114 insertions(+), 65 deletions(-)

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index d12123f0bf5e..87d75de6700c 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -3,9 +3,12 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
-inherit autotools edo python-any-r1 toolchain-funcs xdg
+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} == ** ]]; then
EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
@@ -17,27 +20,49 @@ else
KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"
-HOMEPAGE="https://handbrake.fr/ https://github.com/HandBrake/HandBrake";
+# contrib//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="+fdk gstreamer gtk numa nvenc x265" # TODO: qsv vce
+IUSE="amf +fdk gui libdovi numa nvenc qsv x265"
 
 REQUIRED_USE="numa? ( x265 )"
 
-RDEPEND="
+COMMON_DEPEND="
+   app-arch/bzip2
>=app-arch/xz-utils-5.2.6
dev-libs/jansson:=
-   >=dev-libs/libxml2-2.10.3
-   media-libs/a52dec
>=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/libsamplerate
media-libs/libtheora
media-libs/libvorbis
>=media-libs/libvpx-1.12.0:=
@@ -47,95 +72,119 @@ RDEPEND="
>=media-libs/x264-0.0.20220222:=
>=media-libs/zimg-3.0.4
media-sound/lame
-   >=media-video/ffmpeg-5.1.2:=[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
+   libdovi? ( media-libs/libdovi:= )
+   gui? (
+   >=gui-libs/gtk-4.4:4[gstreamer]
dev-libs/glib:2
-   dev-libs/libgudev:=
-   x11-libs/cairo
+   >=dev-libs/libxml2-2.10.3
x11-libs/gdk-pixbuf:2
-   x11-libs/libnotify
x11-libs/pango
)
-   nvenc? (
-   media-libs/nv-codec-headers
-   media-video/ffmpeg[nvenc]
+   numa? ( sys-process/numactl )
+   nvenc? ( media-libs/nv-codec-headers )
+   qsv? (
+   media-libs/libva:=
+   media-libs/libvpl:=
)
-   x265? ( >=media-libs/x265-3.5-r2:=[10bit,12bit,numa?

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/

2024-11-23 Thread James Le Cuirot
commit: 1a937786721168d8d69aa9b4c4f8c066b0c93e82
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Nov 23 16:34:57 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Nov 23 22:23:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a937786

media-video/handbrake: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: James Le Cuirot  gentoo.org>

 .../handbrake--remove-faac-dependency.patch| 84 --
 1 file changed, 84 deletions(-)

diff --git 
a/media-video/handbrake/files/handbrake--remove-faac-dependency.patch 
b/media-video/handbrake/files/handbrake--remove-faac-dependency.patch
deleted file mode 100644
index 12a0814fc056..
--- a/media-video/handbrake/files/handbrake--remove-faac-dependency.patch
+++ /dev/null
@@ -1,84 +0,0 @@
 a/libhb/common.c
-+++ b/libhb/common.c
-@@ -375,7 +375,6 @@ hb_encoder_internal_t hb_audio_encoders[]  =
- {
- // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
- { { "",   "dts",NULL,  
HB_ACODEC_DCA_PASS,HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, 
HB_GID_ACODEC_DTS_PASS,   },
--{ { "AAC (faac)", "faac",   NULL,  0, 
HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, 
HB_GID_ACODEC_AAC,},
- { { "AAC (ffmpeg)",   "ffaac",  NULL,  
HB_ACODEC_FFAAC,   HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, 
HB_GID_ACODEC_AAC,},
- { { "AC3 (ffmpeg)",   "ffac3",  NULL,  
HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, 
HB_GID_ACODEC_AC3,},
- { { "MP3 (lame)", "lame",   NULL,  
HB_ACODEC_LAME,HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, 
HB_GID_ACODEC_MP3,},
 a/scripts/manicure.rb
-+++ b/scripts/manicure.rb
-@@ -349,7 +349,7 @@ class Display
-   audioEncoders << "copy:dtshd"
- when /AAC Pass/
-   audioEncoders << "copy:aac"
--when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+when "AAC (ffmpeg)", "AAC (avcodec)"
-   audioEncoders << "av_aac"
- when "AAC (FDK)"
-   audioEncoders << "fdk_aac"
-@@ -466,7 +466,7 @@ class Display
- case hash["AudioEncoderFallback"]
-   when /AC3/
- audioEncoderFallback << "ac3"
--  when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+  when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
-   when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -748,7 +748,7 @@ class Display
-   audioEncoders << "copy:dtshd"
- when /AAC Pass/
-   audioEncoders << "copy:aac"
--when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+when "AAC (ffmpeg)", "AAC (avcodec)"
-   audioEncoders << "av_aac"
- when "AAC (FDK)"
-   audioEncoders << "fdk_aac"
-@@ -865,7 +865,7 @@ class Display
- case hash["AudioEncoderFallback"]
-   when /AC3/
- audioEncoderFallback << "ac3"
--  when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+  when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
-   when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -1148,7 +1148,7 @@ class Display
-   audioEncoders << "copy:dtshd"
- when /AAC Pass/
-   audioEncoders << "copy:aac"
--when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+when "AAC (ffmpeg)", "AAC (avcodec)"
-   audioEncoders << "av_aac"
- when "AAC (FDK)"
-   audioEncoders << "fdk_aac"
-@@ -1283,7 +1283,7 @@ class Display
- case hash["AudioEncoderFallback"]
-   when /AC3/
- audioEncoderFallback << "ac3"
--  when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+  when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
-   when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -1600,7 +1600,7 @@ class Display
-   audioEncoders << "copy:dtshd"
- when /AAC Pass/
-   audioEncoders << "copy:aac"
--when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+when "AAC (ffmpeg)", "AAC (avcodec)"
-   audioEncoders << "av_aac"
- when "AAC (FDK)"
-   audioEncoders << "fdk_aac"
-@@ -1717,7 +1717,7 @@ class Display
- case hash["AudioEncoderFallback"]
-   when /AC3/
- audioEncoderFallback << "ac3"
--  when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+  when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
-   when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2024-10-31 Thread Andreas K. Hüttel
commit: 0ece4332ac4526ea010eefed5ba0f2f10364cbb4
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu Oct 31 22:27:22 2024 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Thu Oct 31 22:27:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ece4332

media-video/handbrake: drop unused useflag

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 media-video/handbrake/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

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.




[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/, media-video/handbrake/files/

2024-10-31 Thread Andreas K. Hüttel
commit: a7d62b253fad8aac4a287d10048e8609a404f626
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu Oct 31 21:24:29 2024 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Thu Oct 31 22:12:33 2024 +
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  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..
--- 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..
--- 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..
--- 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} = ** ]]; 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/downlo

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2024-08-12 Thread Michał Górny
commit: b364255803c645cea9fe1867c43c97d97ac080d5
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Aug 13 04:46:11 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 13 04:55:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3642558

media-video/handbrake: Add := to media-libs/svt-av1 dep

Signed-off-by: Michał Górny  gentoo.org>

 media-video/handbrake/handbrake-1.6.1.ebuild | 2 +-
 media-video/handbrake/handbrake-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.6.1.ebuild 
b/media-video/handbrake/handbrake-1.6.1.ebuild
index 427b5614f5b4..2fbb8d88ba6b 100644
--- a/media-video/handbrake/handbrake-1.6.1.ebuild
+++ b/media-video/handbrake/handbrake-1.6.1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
>=media-libs/libvpx-1.12.0:=
media-libs/opus
>=media-libs/speex-1.2.1
-   >=media-libs/svt-av1-1.4.1
+   >=media-libs/svt-av1-1.4.1:=
>=media-libs/x264-0.0.20220222:=
>=media-libs/zimg-3.0.4
media-sound/lame

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 0201e9e8dd27..d12123f0bf5e 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
>=media-libs/libvpx-1.12.0:=
media-libs/opus
>=media-libs/speex-1.2.1
-   >=media-libs/svt-av1-1.4.1
+   >=media-libs/svt-av1-1.4.1:=
>=media-libs/x264-0.0.20220222:=
>=media-libs/zimg-3.0.4
media-sound/lame



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/

2024-07-05 Thread Miroslav Å ulc
commit: c8e55f2fac7987ceba39f73eebe4a93ca268a16f
Author: Miroslav Å ulc  gentoo  org>
AuthorDate: Fri Jul  5 09:05:16 2024 +
Commit: Miroslav Å ulc  gentoo  org>
CommitDate: Fri Jul  5 09:05:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e55f2f

media-video/handbrake: added missing includes + scrubbed patches

Closes: https://bugs.gentoo.org/921166
Signed-off-by: Miroslav Å ulc  gentoo.org>

 .../handbrake-1.3.0-dont-search-for-python.patch |  2 --
 .../handbrake/files/handbrake-1.3.3-x265-link.patch  |  4 ++--
 .../handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch |  9 -
 .../files/handbrake-1.6.1-missing-include.patch  | 20 
 .../handbrake--remove-faac-dependency.patch  |  4 
 .../files/handbrake--system-tools.patch  |  2 --
 media-video/handbrake/handbrake-1.6.1.ebuild |  2 ++
 7 files changed, 24 insertions(+), 19 deletions(-)

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
index 551a64ee3817..851ca0a11072 100644
--- 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
@@ -1,5 +1,3 @@
-diff --git a/configure b/configure
-index 5c870e1d7..2f5834083 100755
 --- a/configure
 +++ b/configure
 @@ -14,20 +14,8 @@ inpath()

diff --git a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch 
b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
index 6a1464571ec3..779366db543b 100644
--- a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
+++ b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
@@ -1,5 +1,5 @@
 a/test/module.defs 2020-06-13 15:05:35.0 +0100
-+++ a/test/module.defs 2020-07-03 11:15:53.951205608 +0100
+--- a/test/module.defs
 a/test/module.defs
 @@ -30,6 +30,10 @@ 
  endif
  endif

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
index 643605076294..2ec2f3170de1 100644
--- 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
@@ -9,13 +9,6 @@ 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

- libhb/decavcodec.c  | 1 +
- libhb/muxavformat.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
-index 372f86f82cf..e7a63289c0f 100644
 --- a/libhb/decavcodec.c
 +++ b/libhb/decavcodec.c
 @@ -41,6 +41,7 @@
@@ -26,8 +19,6 @@ index 372f86f82cf..e7a63289c0f 100644
  #include "libavfilter/avfilter.h"
  #include "libavfilter/buffersrc.h"
  #include "libavfilter/buffersink.h"
-diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
-index 232edd0942a..ad8e2a1d8fa 100644
 --- a/libhb/muxavformat.c
 +++ b/libhb/muxavformat.c
 @@ -8,6 +8,7 @@

diff --git a/media-video/handbrake/files/handbrake-1.6.1-missing-include.patch 
b/media-video/handbrake/files/handbrake-1.6.1-missing-include.patch
new file mode 100644
index ..cfe16e718fc4
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.6.1-missing-include.patch
@@ -0,0 +1,20 @@
+--- a/libhb/muxavformat.c
 b/libhb/muxavformat.c
+@@ -7,6 +7,7 @@
+For full terms see the file COPYING file or visit 
http://www.gnu.org/licenses/gpl-2.0.html
+  */
+ 
++#include 
+ #include 
+ #include "libavcodec/bsf.h"
+ #include "libavformat/avformat.h"
+--- a/libhb/work.c
 b/libhb/work.c
+@@ -7,6 +7,7 @@
+For full terms see the file COPYING file or visit 
http://www.gnu.org/licenses/gpl-2.0.html
+  */
+ 
++#include 
+ #include "handbrake/handbrake.h"
+ #include "libavformat/avformat.h"
+ #include "handbrake/decomb.h"

diff --git 
a/media-video/handbrake/files/handbrake--remove-faac-dependency.patch 
b/media-video/handbrake/files/handbrake--remove-faac-dependency.patch
index a75bb24bf5b3..12a0814fc056 100644
--- a/media-video/handbrake/files/handbrake--remove-faac-dependency.patch
+++ b/media-video/handbrake/files/handbrake--remove-faac-dependency.patch
@@ -1,5 +1,3 @@
-diff --git a/libhb/common.c b/libhb/common.c
-index f43efdbb5..c917151b7 100644
 --- a/libhb/common.c
 +++ b/libhb/common.c
 @@ -375,7 +375,6 @@ hb_encoder_internal_t hb_audio_encoders[]  =
@@ -10,8 +8,6 @@ index f43efdbb5..c917151b7 100644
  { { "AAC (ffmpeg)",   "ffaac",  NULL,  
HB_ACODEC_FFAAC,   HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, 
HB_GID_ACODEC_AAC,},
  { { "AC3 (ffmpeg)",   "ffac3",  NULL,  
HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, 
HB_GID_ACODEC_AC3,},
  { { "MP3 (lam

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2024-01-28 Thread Jonas Stein
commit: 31e1dd84fd5a208635096fb7e2afa1f775aababd
Author: Jonas Stein  gentoo  org>
AuthorDate: Sun Jan 28 22:50:16 2024 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Sun Jan 28 22:52:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e1dd84

media-video/handbrake: drop to maintainer-needed

Bug: https://bugs.gentoo.org/747400
Signed-off-by: Jonas Stein  gentoo.org>

 media-video/handbrake/metadata.xml | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/media-video/handbrake/metadata.xml 
b/media-video/handbrake/metadata.xml
index f3a4081b7b29..2a156bc117f3 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -1,14 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   [email protected]
-   James Beddek
-   
-   
-   Proxy Maintainers
-   [email protected]
-   
+   

Support for the streaming media 
framework from media-libs/gstreamer.
Install the GTK UI, ghb.



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2023-09-27 Thread Joonas Niilola
commit: 2b58e690d78e98b8036b61ba76e6946d23387973
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Sep 27 13:21:54 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Sep 27 13:21:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b58e690

media-video/handbrake: Stabilize 1.6.1 amd64, #914619

Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/handbrake/handbrake-1.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.6.1.ebuild 
b/media-video/handbrake/handbrake-1.6.1.ebuild
index 41a2061311b8..f829de7ac8f3 100644
--- a/media-video/handbrake/handbrake-1.6.1.ebuild
+++ b/media-video/handbrake/handbrake-1.6.1.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2023-07-12 Thread Sam James
commit: 4e395048dc74d1c1dcf8c73009e5f03abcca4dda
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 12 07:37:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 12 07:37:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e395048

media-video/handbrake: enable py3.12

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.6.1.ebuild | 2 +-
 media-video/handbrake/handbrake-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.6.1.ebuild 
b/media-video/handbrake/handbrake-1.6.1.ebuild
index 3780bf5f521e..41a2061311b8 100644
--- a/media-video/handbrake/handbrake-1.6.1.ebuild
+++ b/media-video/handbrake/handbrake-1.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools edo python-any-r1 toolchain-funcs xdg
 

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 3780bf5f521e..41a2061311b8 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools edo python-any-r1 toolchain-funcs xdg
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2023-07-12 Thread Sam James
commit: 68885d34a3ef978f87de54c0b4b2a74d5a394a2a
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 12 07:35:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 12 07:35:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68885d34

media-video/handbrake: forward ~arm64

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.6.1.ebuild | 2 +-
 media-video/handbrake/handbrake-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.6.1.ebuild 
b/media-video/handbrake/handbrake-1.6.1.ebuild
index e1b96f247c82..3780bf5f521e 100644
--- a/media-video/handbrake/handbrake-1.6.1.ebuild
+++ b/media-video/handbrake/handbrake-1.6.1.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index e1b96f247c82..3780bf5f521e 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2023-07-12 Thread Sam James
commit: c3da746c188a4ed2ec40d3b3384b6f82acb30ee7
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 12 07:25:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 12 07:33:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3da746c

media-video/handbrake: add 1.6.1

Closes: https://bugs.gentoo.org/892083
Closes: https://bugs.gentoo.org/907406
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest |  1 +
 ...andbrake-.ebuild => handbrake-1.6.1.ebuild} | 34 +++---
 media-video/handbrake/handbrake-.ebuild| 34 +++---
 3 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 1838ad0338f1..3e8e31e4f65d 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,2 +1,3 @@
 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/handbrake-.ebuild 
b/media-video/handbrake/handbrake-1.6.1.ebuild
similarity index 85%
copy from media-video/handbrake/handbrake-.ebuild
copy to media-video/handbrake/handbrake-1.6.1.ebuild
index f66b4dfeec5d..e1b96f247c82 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-1.6.1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
-inherit autotools python-any-r1 toolchain-funcs xdg
+inherit autotools edo python-any-r1 toolchain-funcs xdg
 
-if [[ ${PV} = ** ]]; then
+if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
inherit git-r3
 else
@@ -27,27 +27,27 @@ IUSE="+fdk gstreamer gtk numa nvenc x265" # TODO: qsv vce
 REQUIRED_USE="numa? ( x265 )"
 
 RDEPEND="
-   app-arch/xz-utils
+   >=app-arch/xz-utils-5.2.6
dev-libs/jansson:=
-   dev-libs/libxml2
+   >=dev-libs/libxml2-2.10.3
media-libs/a52dec
-   >=media-libs/dav1d-0.5.1:=
-   media-libs/libjpeg-turbo:=
-   media-libs/libass:=
-   >=media-libs/libbluray-1.0:=
+   >=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:=
+   >=media-libs/libdvdread-6.1.3:=
media-libs/libsamplerate
media-libs/libtheora
media-libs/libvorbis
-   >=media-libs/libvpx-1.8:=
+   >=media-libs/libvpx-1.12.0:=
media-libs/opus
-   media-libs/speex
+   >=media-libs/speex-1.2.1
>=media-libs/svt-av1-1.4.1
-   media-libs/x264:=
-   media-libs/zimg
+   >=media-libs/x264-0.0.20220222:=
+   >=media-libs/zimg-3.0.4
media-sound/lame
-   >=media-video/ffmpeg-5.1:=[postproc,fdk?]
+   >=media-video/ffmpeg-5.1.2:=[postproc,fdk?]
sys-libs/zlib
fdk? ( media-libs/fdk-aac:= )
gstreamer? (
@@ -75,7 +75,7 @@ RDEPEND="
media-libs/nv-codec-headers
media-video/ffmpeg[nvenc]
)
-   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+   x265? ( >=media-libs/x265-3.5-r2:=[10bit,12bit,numa?] )
 "
 DEPEND="${RDEPEND}"
 # cmake needed for custom script: bug #852701
@@ -135,7 +135,7 @@ src_configure() {
# TODO: $(use_enable vce)
)
 
-   ./configure "${myconfargs[@]}" || die "Configure failed."
+   edo ./configure "${myconfargs[@]}"
 }
 
 src_compile() {

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index f66b4dfeec5d..e1b96f247c82 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
-inherit autotools python-any-r1 toolchain-funcs xdg
+inherit autotools edo python-any-r1 toolchain-funcs xdg
 
-if [[ ${PV} = ** ]]; then
+if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="http

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2023-06-02 Thread Sam James
commit: 0084dabc1316efb481cae059ce802ebd832be307
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 05:15:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 05:15:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0084dabc

media-video/handbrake: Keyword 1.5.1-r1 arm64, #907280

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.5.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.5.1-r1.ebuild 
b/media-video/handbrake/handbrake-1.5.1-r1.ebuild
index c4a8cd2ca5dc..7c9e08992e02 100644
--- a/media-video/handbrake/handbrake-1.5.1-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2023-05-31 Thread Sam James
commit: 5e53838025d2377dd7a0261c52563d1401b0acca
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  1 03:26:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  1 03:27:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e538380

media-video/handbrake: depend on older ffmpeg

Handbrake is kind of a special situation and  already works w/ >=5.1.

Bug: https://bugs.gentoo.org/907406
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.5.1-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.5.1-r1.ebuild 
b/media-video/handbrake/handbrake-1.5.1-r1.ebuild
index ca4053318273..c4a8cd2ca5dc 100644
--- a/media-video/handbrake/handbrake-1.5.1-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1-r1.ebuild
@@ -26,6 +26,7 @@ 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:=
@@ -46,7 +47,7 @@ RDEPEND="
media-libs/x264:=
media-libs/zimg
media-sound/lame
-   >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+   

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2023-05-06 Thread Sam James
commit: 904db230c151aadb050f46ab2169011551d29d8e
Author: Sam James  gentoo  org>
AuthorDate: Sat May  6 11:23:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  6 11:33:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=904db230

media-video/handbrake: drop stale dev-util/intltool dep

Signed-off-by: Sam James  gentoo.org>

 .../handbrake/{handbrake-1.5.1.ebuild => handbrake-1.5.1-r1.ebuild}  | 1 -
 media-video/handbrake/handbrake-.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.5.1.ebuild 
b/media-video/handbrake/handbrake-1.5.1-r1.ebuild
similarity index 99%
rename from media-video/handbrake/handbrake-1.5.1.ebuild
rename to media-video/handbrake/handbrake-1.5.1-r1.ebuild
index 97c89c1d5812..ca4053318273 100644
--- a/media-video/handbrake/handbrake-1.5.1.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1-r1.ebuild
@@ -79,7 +79,6 @@ BDEPEND="
${PYTHON_DEPS}
dev-lang/nasm
dev-util/cmake
-   dev-util/intltool
 "
 
 PATCHES=(

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 6887723ed4b9..f66b4dfeec5d 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -83,7 +83,6 @@ BDEPEND="
${PYTHON_DEPS}
dev-lang/nasm
dev-util/cmake
-   dev-util/intltool
 "
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2023-05-02 Thread Sam James
commit: 0fa207956ef2d1ba6b44e52441fd19d2428f63c6
Author: Jon Janzen  jonjanzen  com>
AuthorDate: Wed May  3 01:14:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May  3 04:42:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fa20795

media-video/handbrake: enable py3.11

Bug: https://bugs.gentoo.org/897050
Signed-off-by: Jon Janzen  jonjanzen.com>
Closes: https://github.com/gentoo/gentoo/pull/30850
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.4.2-r2.ebuild | 2 +-
 media-video/handbrake/handbrake-1.5.1.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.4.2-r2.ebuild 
b/media-video/handbrake/handbrake-1.4.2-r2.ebuild
index 618137c80e46..5f5a8b0e7e24 100644
--- a/media-video/handbrake/handbrake-1.4.2-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools python-any-r1 toolchain-funcs xdg
 

diff --git a/media-video/handbrake/handbrake-1.5.1.ebuild 
b/media-video/handbrake/handbrake-1.5.1.ebuild
index a5d8c9da21ac..97c89c1d5812 100644
--- a/media-video/handbrake/handbrake-1.5.1.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools python-any-r1 toolchain-funcs xdg
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2023-04-07 Thread Sam James
commit: d65316b91fe2e8997536270a59e7560e4b28a0f6
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  7 11:43:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  7 11:43:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d65316b9

media-video/handbrake: update deps

Closes: https://bugs.gentoo.org/868327
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 81707377e6f7..d399e643ee4b 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -43,10 +43,11 @@ RDEPEND="
>=media-libs/libvpx-1.8:=
media-libs/opus
media-libs/speex
+   >=media-libs/svt-av1-1.4.1
media-libs/x264:=
media-libs/zimg
media-sound/lame
-   >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+   >=media-video/ffmpeg-5.1:=[postproc,fdk?]
sys-libs/zlib
fdk? ( media-libs/fdk-aac:= )
gstreamer? (



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2022-06-19 Thread Sam James
commit: e52a4a935f8793a7b86ab5e27b7fc5143a8d5f78
Author: James Beddek  posteo  de>
AuthorDate: Mon Jun 20 01:57:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 20 02:32:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e52a4a93

media-video/handbrake: fix missing dep on cmake required by custom configure 
script

Closes: https://bugs.gentoo.org/852701
Signed-off-by: James Beddek  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/25985
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.5.1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-video/handbrake/handbrake-1.5.1.ebuild 
b/media-video/handbrake/handbrake-1.5.1.ebuild
index ee1c94368572..ef06b33b19dd 100644
--- a/media-video/handbrake/handbrake-1.5.1.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1.ebuild
@@ -79,6 +79,8 @@ DEPEND="
dev-lang/nasm
dev-util/intltool
 "
+# Needed for custom script: bug #852701
+BDEPEND="dev-util/cmake"
 
 PATCHES=(
# Remove libdvdnav duplication and call it on the original instead.



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2022-06-19 Thread Sam James
commit: 2763e5cb78e38d7e0315aa78ea287be8e15ab9d3
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 20 02:33:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 20 02:33:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2763e5cb

media-video/handbrake: fixup BDEPEND; sync live

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.5.1.ebuild | 8 
 media-video/handbrake/handbrake-.ebuild  | 8 +---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.5.1.ebuild 
b/media-video/handbrake/handbrake-1.5.1.ebuild
index ef06b33b19dd..5401dffd7c51 100644
--- a/media-video/handbrake/handbrake-1.5.1.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1.ebuild
@@ -73,14 +73,14 @@ RDEPEND="
nvenc? ( media-libs/nv-codec-headers )
x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
 "
-DEPEND="
+DEPEND="${RDEPEND}"
+# cmake needed for custom script: bug #852701
+BDEPEND="
${PYTHON_DEPS}
-   ${RDEPEND}
dev-lang/nasm
+   dev-util/cmake
dev-util/intltool
 "
-# Needed for custom script: bug #852701
-BDEPEND="dev-util/cmake"
 
 PATCHES=(
# Remove libdvdnav duplication and call it on the original instead.

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index ab3d4b77a810..eb1f331a43f3 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -73,10 +73,12 @@ RDEPEND="
nvenc? ( media-libs/nv-codec-headers )
x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
 "
-DEPEND="
+DEPEND="${RDEPEND}"
+# cmake needed for custom script: bug #852701
+BDEPEND="
${PYTHON_DEPS}
-   ${RDEPEND}
dev-lang/nasm
+   dev-util/cmake
dev-util/intltool
 "
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2022-06-18 Thread Agostino Sarubbo
commit: 5bdc9570d885c5987b05ec2582d90fba8a3b2c3e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jun 18 16:53:10 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jun 18 16:53:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdc9570

media-video/handbrake: amd64 stable wrt bug #844895

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/handbrake/handbrake-1.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.5.1.ebuild 
b/media-video/handbrake/handbrake-1.5.1.ebuild
index c5f8eebf74a2..ee1c94368572 100644
--- a/media-video/handbrake/handbrake-1.5.1.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/

2022-02-09 Thread Conrad Kostecki
commit: 0e71cefa9cdbb19d722c823448df7b9e186164b8
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Feb  7 06:25:19 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Feb  9 23:01:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e71cefa

media-video/handbrake: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/24104
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...audio-encoders-when-linking-to-FFmpeg-4.4.patch | 28 
 .../handbrake-1.3.3-remove-faac-dependency.patch   | 84 --
 2 files changed, 112 deletions(-)

diff --git 
a/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
 
b/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
deleted file mode 100644
index d7cc565377fd..
--- 
a/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f28289fb06ab461ea082b4be56d6d1504c0c31c2 Mon Sep 17 00:00:00 2001
-From: Damiano Galassi 
-Date: Sat, 10 Apr 2021 13:18:02 +0200
-Subject: [PATCH] libhb: fix audio encoders when linking to FFmpeg 4.4.
-

- libhb/encavcodecaudio.c | 5 -
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
-index 52fc4565d..e6cf42414 100644
 a/libhb/encavcodecaudio.c
-+++ b/libhb/encavcodecaudio.c
-@@ -410,7 +410,10 @@ static void Encode(hb_work_object_t *w, hb_buffer_list_t 
*list)
- 
- // Prepare input frame
- int out_size;
--AVFrame frame = { .nb_samples = pv->samples_per_frame, };
-+AVFrame frame = { .nb_samples = pv->samples_per_frame,
-+  .format = pv->context->sample_fmt,
-+  .channels = pv->context->channels
-+};
- 
- out_size = av_samples_get_buffer_size(NULL,
-   pv->context->channels,
--- 
-2.26.3
-

diff --git 
a/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch 
b/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch
deleted file mode 100644
index 7e8ab99730a8..
--- a/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch
+++ /dev/null
@@ -1,84 +0,0 @@
 a/libhb/common.c
-+++ b/libhb/common.c
-@@ -243,7 +243,6 @@
- {
- // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
- { { "",   "dts",NULL,  
HB_ACODEC_DCA_PASS,HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 
HB_GID_ACODEC_DTS_PASS,   },
--{ { "AAC (faac)", "faac",   NULL,  0, 
HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 
HB_GID_ACODEC_AAC,},
- { { "AAC (ffmpeg)",   "ffaac",  NULL,  
HB_ACODEC_FFAAC,   HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 
HB_GID_ACODEC_AAC,},
- { { "AC3 (ffmpeg)",   "ffac3",  NULL,  
HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 
HB_GID_ACODEC_AC3,},
- { { "MP3 (lame)", "lame",   NULL,  
HB_ACODEC_LAME,HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 
HB_GID_ACODEC_MP3,},
 a/scripts/manicure.rb
-+++ b/scripts/manicure.rb
-@@ -349,7 +349,7 @@
-   audioEncoders << "copy:dtshd"
- when /AAC Pass/
-   audioEncoders << "copy:aac"
--when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+when "AAC (ffmpeg)", "AAC (avcodec)"
-   audioEncoders << "av_aac"
- when "AAC (FDK)"
-   audioEncoders << "fdk_aac"
-@@ -466,7 +466,7 @@
- case hash["AudioEncoderFallback"]
-   when /AC3/
- audioEncoderFallback << "ac3"
--  when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+  when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
-   when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -753,7 +753,7 @@
-   audioEncoders << "copy:dtshd"
- when /AAC Pass/
-   audioEncoders << "copy:aac"
--when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+when "AAC (ffmpeg)", "AAC (avcodec)"
-   audioEncoders << "av_aac"
- when "AAC (FDK)"
-   audioEncoders << "fdk_aac"
-@@ -870,7 +870,7 @@
- case hash["AudioEncoderFallback"]
-   when /AC3/
- audioEncoderFallback << "ac3"
--  when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+  when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
-   when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -1163,7 +1163,7 @@
-   audioEncoders << "copy

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/, media-video/handbrake/files/

2022-01-18 Thread Sam James
commit: 0ad18e0ac69d1dc63a3bef23a81ae347a396d279
Author: James Beddek  posteo  de>
AuthorDate: Sun Jan 16 03:47:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 19 01:15:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad18e0a

media-video/handbrake: add ffmpeg 5.0 patch

Signed-off-by: James Beddek  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 .../files/handbrake-1.5.1-ffmpeg-5.0.patch | 40 ++
 media-video/handbrake/handbrake-1.5.1.ebuild   |  3 ++
 2 files changed, 43 insertions(+)

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
new file mode 100644
index ..643605076294
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch
@@ -0,0 +1,40 @@
+# 
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
+---
+ libhb/decavcodec.c  | 1 +
+ libhb/muxavformat.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
+index 372f86f82cf..e7a63289c0f 100644
+--- 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"
+diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
+index 232edd0942a..ad8e2a1d8fa 100644
+--- 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.5.1.ebuild 
b/media-video/handbrake/handbrake-1.5.1.ebuild
index e8bee8b1fe39..c5f8eebf74a2 100644
--- a/media-video/handbrake/handbrake-1.5.1.ebuild
+++ b/media-video/handbrake/handbrake-1.5.1.ebuild
@@ -96,6 +96,9 @@ PATCHES=(
 
# 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() {



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2022-01-15 Thread Sam James
commit: 8724013fab8fc9dac4890ac15e42a4718a3bc975
Author: James Beddek  posteo  de>
AuthorDate: Sat Jan 15 00:04:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 02:23:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8724013f

media-video/handbrake: drop 1.3.3-r4, 1.3.3-r5

Signed-off-by: James Beddek  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/23737
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest  |   1 -
 media-video/handbrake/handbrake-1.3.3-r4.ebuild | 162 ---
 media-video/handbrake/handbrake-1.3.3-r5.ebuild | 165 
 3 files changed, 328 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 3a17698fe66e..1838ad0338f1 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,3 +1,2 @@
-DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B 
c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a
 SHA512 
a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
 DIST handbrake-1.4.2.tar.bz2 15991593 BLAKE2B 
966b54d35dd5544800208edc9045eaf26f3253aa470686b9ea29cdf69393af140829b21072133684661fd881eee7f97b90f9c7edfa87f187058dd1b14d1a748b
 SHA512 
ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e
 DIST handbrake-1.5.1.tar.bz2 16137974 BLAKE2B 
9ce1f1ae7b2fe514ba1fb6ed30a345d18144829272a6298f2af0831e5ea7533ef2f8b201fd98389269b0ea12bbba15d0b76f09afeff6ed1d9ed313f20cf8f3a1
 SHA512 
63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568

diff --git a/media-video/handbrake/handbrake-1.3.3-r4.ebuild 
b/media-video/handbrake/handbrake-1.3.3-r4.ebuild
deleted file mode 100644
index 9c12dd2d8f8f..
--- a/media-video/handbrake/handbrake-1.3.3-r4.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = ** ]]; 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/";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-   app-arch/xz-utils
-   media-libs/speex
-   dev-libs/jansson:=
-   dev-libs/libxml2
-   media-libs/a52dec
-   media-libs/libass:=
-   >=media-libs/libbluray-1.0:=
-   >=media-libs/dav1d-0.5.1:=
-   media-libs/libdvdnav
-   media-libs/libdvdread:=
-   media-libs/libsamplerate
-   media-libs/libtheora
-   media-libs/libvorbis
-   >=media-libs/libvpx-1.8:=
-   nvenc? ( media-libs/nv-codec-headers )
-   media-libs/opus
-   media-libs/x264:=
-   media-sound/lame
-   sys-libs/zlib
-   >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
-   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
-   )
-   fdk? ( media-libs/fdk-aac:= )
-   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
-
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   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}--remove-dvdnav-dup.patch"
-
-   # Remove faac dependency; TODO: figure out if we need to do this at all.
-   "${FILESDIR}/${P}-remove-faac-dependency.patch"
-
-   # Use whichever python is set by portage
-   "${FILESDIR}/${PN}-1.3.0-dont-search-for-python

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2022-01-15 Thread Sam James
commit: 1f0ed76732e0496fa2da40ce9b798ea4734b617e
Author: James Beddek  posteo  de>
AuthorDate: Tue Jan 11 09:31:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 02:23:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f0ed767

media-video/handbrake: add 1.5.1

Closes: https://bugs.gentoo.org/775710
Signed-off-by: James Beddek  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest   |   1 +
 media-video/handbrake/handbrake-1.5.1.ebuild | 160 +++
 2 files changed, 161 insertions(+)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 8dfc1a5454b3..3a17698fe66e 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,2 +1,3 @@
 DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B 
c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a
 SHA512 
a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
 DIST handbrake-1.4.2.tar.bz2 15991593 BLAKE2B 
966b54d35dd5544800208edc9045eaf26f3253aa470686b9ea29cdf69393af140829b21072133684661fd881eee7f97b90f9c7edfa87f187058dd1b14d1a748b
 SHA512 
ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e
+DIST handbrake-1.5.1.tar.bz2 16137974 BLAKE2B 
9ce1f1ae7b2fe514ba1fb6ed30a345d18144829272a6298f2af0831e5ea7533ef2f8b201fd98389269b0ea12bbba15d0b76f09afeff6ed1d9ed313f20cf8f3a1
 SHA512 
63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568

diff --git a/media-video/handbrake/handbrake-1.5.1.ebuild 
b/media-video/handbrake/handbrake-1.5.1.ebuild
new file mode 100644
index ..e8bee8b1fe39
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.5.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-any-r1 toolchain-funcs xdg
+
+if [[ ${PV} = ** ]]; 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}--remove-dvdnav-dup.patch"
+
+   # Remove faac dependency; TODO: figure out if we need to do this at all.
+   "${FILESDIR}/${PN}--remove-faac-dependency.patch"
+
+   # Detect system tools - bug 738110
+   "${FILESDIR}/${PN}--system-tools.patch"
+
+   # Use 

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-12-29 Thread Sam James
commit: adfb8cd013cd7f04a6c5a1f26e14e361a742487b
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 30 04:42:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 30 04:42:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adfb8cd0

media-video/handbrake: add subslot dep on libvpx

need to be rebuilt when its ABI changes

Signed-off-by: Sam James  gentoo.org>

 .../{handbrake-1.3.3-r2.ebuild => handbrake-1.3.3-r4.ebuild}  | 8 
 .../{handbrake-1.3.3-r3.ebuild => handbrake-1.3.3-r5.ebuild}  | 8 
 .../{handbrake-1.4.2-r1.ebuild => handbrake-1.4.2-r2.ebuild}  | 8 
 media-video/handbrake/handbrake-.ebuild   | 8 
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.3.3-r2.ebuild 
b/media-video/handbrake/handbrake-1.3.3-r4.ebuild
similarity index 97%
rename from media-video/handbrake/handbrake-1.3.3-r2.ebuild
rename to media-video/handbrake/handbrake-1.3.3-r4.ebuild
index a8bf0bdbcbdf..9c12dd2d8f8f 100644
--- a/media-video/handbrake/handbrake-1.3.3-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3-r4.ebuild
@@ -32,14 +32,14 @@ RDEPEND="
dev-libs/libxml2
media-libs/a52dec
media-libs/libass:=
-   >=media-libs/libbluray-1.0
-   >=media-libs/dav1d-0.5.1
+   >=media-libs/libbluray-1.0:=
+   >=media-libs/dav1d-0.5.1:=
media-libs/libdvdnav
media-libs/libdvdread:=
media-libs/libsamplerate
media-libs/libtheora
media-libs/libvorbis
-   >=media-libs/libvpx-1.8
+   >=media-libs/libvpx-1.8:=
nvenc? ( media-libs/nv-codec-headers )
media-libs/opus
media-libs/x264:=
@@ -67,7 +67,7 @@ RDEPEND="
x11-libs/libnotify
x11-libs/pango
)
-   fdk? ( media-libs/fdk-aac )
+   fdk? ( media-libs/fdk-aac:= )
x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
 
 DEPEND="${RDEPEND}

diff --git a/media-video/handbrake/handbrake-1.3.3-r3.ebuild 
b/media-video/handbrake/handbrake-1.3.3-r5.ebuild
similarity index 97%
rename from media-video/handbrake/handbrake-1.3.3-r3.ebuild
rename to media-video/handbrake/handbrake-1.3.3-r5.ebuild
index 84a582a27b03..a0f00a16d9e2 100644
--- a/media-video/handbrake/handbrake-1.3.3-r3.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3-r5.ebuild
@@ -32,14 +32,14 @@ RDEPEND="
dev-libs/libxml2
media-libs/a52dec
media-libs/libass:=
-   >=media-libs/libbluray-1.0
-   >=media-libs/dav1d-0.5.1
+   >=media-libs/libbluray-1.0:=
+   >=media-libs/dav1d-0.5.1:=
media-libs/libdvdnav
media-libs/libdvdread:=
media-libs/libsamplerate
media-libs/libtheora
media-libs/libvorbis
-   >=media-libs/libvpx-1.8
+   >=media-libs/libvpx-1.8:=
nvenc? ( media-libs/nv-codec-headers )
media-libs/opus
media-libs/x264:=
@@ -67,7 +67,7 @@ RDEPEND="
x11-libs/libnotify
x11-libs/pango
)
-   fdk? ( media-libs/fdk-aac )
+   fdk? ( media-libs/fdk-aac:= )
x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
 
 DEPEND="${RDEPEND}

diff --git a/media-video/handbrake/handbrake-1.4.2-r1.ebuild 
b/media-video/handbrake/handbrake-1.4.2-r2.ebuild
similarity index 97%
rename from media-video/handbrake/handbrake-1.4.2-r1.ebuild
rename to media-video/handbrake/handbrake-1.4.2-r2.ebuild
index 9baa5b39bf6f..920f82d8e496 100644
--- a/media-video/handbrake/handbrake-1.4.2-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2-r2.ebuild
@@ -31,16 +31,16 @@ RDEPEND="
dev-libs/jansson:=
dev-libs/libxml2
media-libs/a52dec
-   >=media-libs/dav1d-0.5.1
+   >=media-libs/dav1d-0.5.1:=
media-libs/libjpeg-turbo:=
media-libs/libass:=
-   >=media-libs/libbluray-1.0
+   >=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/libvpx-1.8:=
media-libs/opus
media-libs/speex
media-libs/x264:=
@@ -48,7 +48,7 @@ RDEPEND="
media-sound/lame
>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
sys-libs/zlib
-   fdk? ( media-libs/fdk-aac )
+   fdk? ( media-libs/fdk-aac:= )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 75a5cf2fa4aa..ab3d4b77a810 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -31,16 +31,16 @@ RDEPEND="
dev-libs/jansson:=
dev-libs/libxml2
media-libs/a52dec
-   >=media-libs/dav1d-0.5.1
+   >=media-libs/dav1d-0.5.1:=
media-libs/l

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-12-29 Thread Jakov Smolić
commit: 900f46a4c58b3629e26497f41dc8394e264679e2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Dec 29 12:11:35 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Dec 29 12:11:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900f46a4

media-video/handbrake: Stabilize 1.4.2-r1 amd64, #830192

Signed-off-by: Jakov Smolić  gentoo.org>

 media-video/handbrake/handbrake-1.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.4.2-r1.ebuild 
b/media-video/handbrake/handbrake-1.4.2-r1.ebuild
index 75a5cf2fa4aa..9baa5b39bf6f 100644
--- a/media-video/handbrake/handbrake-1.4.2-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-24 Thread Sam James
commit: af6a1b292a1bfd4014b58fb90d807174bdf1d9a5
Author: James Beddek  posteo  de>
AuthorDate: Mon Oct 25 02:06:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 25 03:52:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6a1b29

media-video/handbrake: add missing media-libs/libjpeg-turbo dep

Closes: https://bugs.gentoo.org/820059
Signed-off-by: James Beddek  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22701
Signed-off-by: Sam James  gentoo.org>

 .../handbrake/{handbrake-1.4.2.ebuild => handbrake-1.4.2-r1.ebuild}  | 1 +
 media-video/handbrake/handbrake-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-video/handbrake/handbrake-1.4.2.ebuild 
b/media-video/handbrake/handbrake-1.4.2-r1.ebuild
similarity index 99%
rename from media-video/handbrake/handbrake-1.4.2.ebuild
rename to media-video/handbrake/handbrake-1.4.2-r1.ebuild
index 74fc7df0d86..75a5cf2fa4a 100644
--- a/media-video/handbrake/handbrake-1.4.2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2-r1.ebuild
@@ -32,6 +32,7 @@ RDEPEND="
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

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 74fc7df0d86..75a5cf2fa4a 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -32,6 +32,7 @@ RDEPEND="
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



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-24 Thread Sam James
commit: 71d201a0694a5367ddb502d4d3a99abfa2a6e0ca
Author: James Beddek  posteo  de>
AuthorDate: Sun Oct 24 08:31:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:44:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d201a0

media-video/handbrake: export AR, RANLIB, STRIP to match patch

Signed-off-by: James Beddek  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22694
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.4.2.ebuild | 4 +++-
 media-video/handbrake/handbrake-.ebuild  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.4.2.ebuild 
b/media-video/handbrake/handbrake-1.4.2.ebuild
index cc2edcd67ff..74fc7df0d86 100644
--- a/media-video/handbrake/handbrake-1.4.2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools python-any-r1 xdg
+inherit autotools python-any-r1 toolchain-funcs xdg
 
 if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
@@ -110,6 +110,8 @@ src_prepare() {
 }
 
 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

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index cc2edcd67ff..74fc7df0d86 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools python-any-r1 xdg
+inherit autotools python-any-r1 toolchain-funcs xdg
 
 if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
@@ -110,6 +110,8 @@ src_prepare() {
 }
 
 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



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-24 Thread Sam James
commit: 3e20efa3118b849ad1ec17dcb99ce21a9c3a1a1b
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 24 08:27:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:27:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e20efa3

media-video/handbrake: fix HttpsUrlAvailable

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.3.3-r2.ebuild | 2 +-
 media-video/handbrake/handbrake-1.3.3-r3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.3.3-r2.ebuild 
b/media-video/handbrake/handbrake-1.3.3-r2.ebuild
index b7246e9a055..a8bf0bdbcbd 100644
--- a/media-video/handbrake/handbrake-1.3.3-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3-r2.ebuild
@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"
-HOMEPAGE="http://handbrake.fr/";
+HOMEPAGE="https://handbrake.fr/";
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/media-video/handbrake/handbrake-1.3.3-r3.ebuild 
b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
index 103a789e634..84a582a27b0 100644
--- a/media-video/handbrake/handbrake-1.3.3-r3.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"
-HOMEPAGE="http://handbrake.fr/";
+HOMEPAGE="https://handbrake.fr/";
 
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-24 Thread Sam James
commit: 78fe8e01fa8aca49733cec12a298cfef25ea
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 24 08:27:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:27:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78fe8e01

media-video/handbrake: fix WhitespaceFound

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.4.2.ebuild | 2 +-
 media-video/handbrake/handbrake-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.4.2.ebuild 
b/media-video/handbrake/handbrake-1.4.2.ebuild
index ccc9b241fcf..cc2edcd67ff 100644
--- a/media-video/handbrake/handbrake-1.4.2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2.ebuild
@@ -128,7 +128,7 @@ src_configure() {
$(use_enable nvenc)
$(use_enable x265)
)
-   
+
./configure "${myconfargs[@]}" || die "Configure failed."
 }
 

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index ccc9b241fcf..cc2edcd67ff 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -128,7 +128,7 @@ src_configure() {
$(use_enable nvenc)
$(use_enable x265)
)
-   
+
./configure "${myconfargs[@]}" || die "Configure failed."
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-24 Thread Sam James
commit: 38720deacdda9f4cc2802eafdad04b1c48e73e31
Author: James Beddek  posteo  de>
AuthorDate: Sun Oct 24 08:20:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:21:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38720dea

media-video/handbrake: sync live

Signed-off-by: James Beddek  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22693
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-.ebuild | 83 ++---
 1 file changed, 39 insertions(+), 44 deletions(-)

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index a0fb6014561..ccc9b241fcf 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools gnome2-utils python-any-r1 xdg-utils
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-any-r1 xdg
 
 if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
@@ -17,7 +18,7 @@ else
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"
-HOMEPAGE="http://handbrake.fr/";
+HOMEPAGE="https://handbrake.fr/ https://github.com/HandBrake/HandBrake";
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,25 +28,26 @@ REQUIRED_USE="^^ ( fdk libav-aac )"
 
 RDEPEND="
app-arch/xz-utils
-   media-libs/speex
dev-libs/jansson:=
dev-libs/libxml2
media-libs/a52dec
+   >=media-libs/dav1d-0.5.1
media-libs/libass:=
>=media-libs/libbluray-1.0
-   >=media-libs/dav1d-0.5.1
media-libs/libdvdnav
media-libs/libdvdread:=
media-libs/libsamplerate
media-libs/libtheora
media-libs/libvorbis
>=media-libs/libvpx-1.8
-   nvenc? ( media-libs/nv-codec-headers )
media-libs/opus
+   media-libs/speex
media-libs/x264:=
+   media-libs/zimg
media-sound/lame
-   sys-libs/zlib
>=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
@@ -67,13 +69,15 @@ RDEPEND="
x11-libs/libnotify
x11-libs/pango
)
-   fdk? ( media-libs/fdk-aac )
-   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
-
-DEPEND="${RDEPEND}
+   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"
+   dev-util/intltool
+"
 
 PATCHES=(
# Remove libdvdnav duplication and call it on the original instead.
@@ -83,6 +87,9 @@ PATCHES=(
# Remove faac dependency; TODO: figure out if we need to do this at all.
"${FILESDIR}/${PN}--remove-faac-dependency.patch"
 
+   # Detect system tools - bug 738110
+   "${FILESDIR}/${PN}--system-tools.patch"
+
# Use whichever python is set by portage
"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
 
@@ -98,9 +105,7 @@ src_prepare() {
 
default
 
-   cd "${S}/gtk"
-   # Don't run autogen.sh.
-   sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call 
failed"
+   cd "${S}/gtk" || die
eautoreconf
 }
 
@@ -108,35 +113,31 @@ src_configure() {
# 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
-   ./configure \
-   --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) || die "Configure failed."
+   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."
 }
 
 sr

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/

2021-10-24 Thread Sam James
commit: fe3d914b623aa403e90098a23968b394b2f0e6c3
Author: James Beddek  posteo  de>
AuthorDate: Sun Oct 24 07:15:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:21:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3d914b

media-video/handbrake: add 1.4.2

Closes: https://bugs.gentoo.org/806392
Closes: https://bugs.gentoo.org/738110
Closes: https://bugs.gentoo.org/804891
Signed-off-by: James Beddek  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 .../files/handbrake--system-tools.patch| 24 ++
 media-video/handbrake/handbrake-1.4.2.ebuild   |  4 
 2 files changed, 28 insertions(+)

diff --git a/media-video/handbrake/files/handbrake--system-tools.patch 
b/media-video/handbrake/files/handbrake--system-tools.patch
new file mode 100644
index 000..9d76e628ccb
--- /dev/null
+++ b/media-video/handbrake/files/handbrake--system-tools.patch
@@ -0,0 +1,24 @@
+# https://bugs.gentoo.org/738110
+
+diff --git a/make/configure.py b/make/configure.py
+index 87118fcbe..df869856d 100644
+--- a/make/configure.py
 b/make/configure.py
+@@ -1626,14 +1626,14 @@ try:
+ 
+ ## create tools in a scope
+ class Tools:
+-ar = ToolProbe( 'AR.exe', 'ar', 'ar', 
abort=True )
++ar = ToolProbe( 'AR.exe', 'ar', 
os.environ.get('AR', 'ar'), abort=True )
+ cp = ToolProbe( 'CP.exe', 'cp', 'cp', 
abort=True )
+ m4 = ToolProbe( 'M4.exe', 'm4', 'gm4', 'm4', 
abort=True )
+ mkdir  = ToolProbe( 'MKDIR.exe',  'mkdir',  'mkdir', 
abort=True )
+ patch  = ToolProbe( 'PATCH.exe',  'patch',  'gpatch', 
'patch', abort=True )
+ rm = ToolProbe( 'RM.exe', 'rm', 'rm', 
abort=True )
+-ranlib = ToolProbe( 'RANLIB.exe', 'ranlib', 'ranlib', 
abort=True )
+-strip  = ToolProbe( 'STRIP.exe',  'strip',  'strip', 
abort=True )
++ranlib = ToolProbe( 'RANLIB.exe', 'ranlib', 
os.environ.get('RANLIB', 'ranlib'), abort=True )
++strip  = ToolProbe( 'STRIP.exe',  'strip',  
os.environ.get('STRIP', 'strip'), abort=True )
+ tar= ToolProbe( 'TAR.exe','tar','gtar', 
'tar', abort=True )
+ python = ToolProbe( 'PYTHON.exe', 'python', 
os.path.basename(sys.executable), abort=True )
+ 

diff --git a/media-video/handbrake/handbrake-1.4.2.ebuild 
b/media-video/handbrake/handbrake-1.4.2.ebuild
index 80d947f2777..2978319d46f 100644
--- a/media-video/handbrake/handbrake-1.4.2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
nvenc? ( media-libs/nv-codec-headers )
media-libs/opus
media-libs/x264:=
+   media-libs/zimg
media-sound/lame
sys-libs/zlib
>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
@@ -86,6 +87,9 @@ PATCHES=(
# Remove faac dependency; TODO: figure out if we need to do this at all.
"${FILESDIR}/${PN}--remove-faac-dependency.patch"
 
+   # Detect system tools - bug 738110
+   "${FILESDIR}/${PN}--system-tools.patch"
+
# Use whichever python is set by portage
"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/, media-video/handbrake/files/

2021-10-24 Thread Sam James
commit: 338778222bc95745d0675590f99ae12b434465d6
Author: James Beddek  posteo  de>
AuthorDate: Sun Oct 24 07:12:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:21:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33877822

media-video/handbrake: rebase remove-faac patch

Signed-off-by: James Beddek  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/Manifest |  1 +
 ...> handbrake-1.3.3-remove-faac-dependency.patch} |  0
 .../handbrake--remove-faac-dependency.patch| 32 --
 media-video/handbrake/handbrake-1.3.3-r2.ebuild|  2 +-
 media-video/handbrake/handbrake-1.3.3-r3.ebuild|  2 +-
 ...rake-1.3.3-r2.ebuild => handbrake-1.4.2.ebuild} | 27 --
 6 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index abb9a1f6185..8dfc1a5454b 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1 +1,2 @@
 DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B 
c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a
 SHA512 
a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
+DIST handbrake-1.4.2.tar.bz2 15991593 BLAKE2B 
966b54d35dd5544800208edc9045eaf26f3253aa470686b9ea29cdf69393af140829b21072133684661fd881eee7f97b90f9c7edfa87f187058dd1b14d1a748b
 SHA512 
ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e

diff --git 
a/media-video/handbrake/files/handbrake--remove-faac-dependency.patch 
b/media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch
similarity index 100%
copy from 
media-video/handbrake/files/handbrake--remove-faac-dependency.patch
copy to media-video/handbrake/files/handbrake-1.3.3-remove-faac-dependency.patch

diff --git 
a/media-video/handbrake/files/handbrake--remove-faac-dependency.patch 
b/media-video/handbrake/files/handbrake--remove-faac-dependency.patch
index 7e8ab99730a..a75bb24bf5b 100644
--- a/media-video/handbrake/files/handbrake--remove-faac-dependency.patch
+++ b/media-video/handbrake/files/handbrake--remove-faac-dependency.patch
@@ -1,16 +1,20 @@
+diff --git a/libhb/common.c b/libhb/common.c
+index f43efdbb5..c917151b7 100644
 --- a/libhb/common.c
 +++ b/libhb/common.c
-@@ -243,7 +243,6 @@
+@@ -375,7 +375,6 @@ hb_encoder_internal_t hb_audio_encoders[]  =
  {
  // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
- { { "",   "dts",NULL,  
HB_ACODEC_DCA_PASS,HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 
HB_GID_ACODEC_DTS_PASS,   },
--{ { "AAC (faac)", "faac",   NULL,  0, 
HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 
HB_GID_ACODEC_AAC,},
- { { "AAC (ffmpeg)",   "ffaac",  NULL,  
HB_ACODEC_FFAAC,   HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 
HB_GID_ACODEC_AAC,},
- { { "AC3 (ffmpeg)",   "ffac3",  NULL,  
HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 
HB_GID_ACODEC_AC3,},
- { { "MP3 (lame)", "lame",   NULL,  
HB_ACODEC_LAME,HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 
HB_GID_ACODEC_MP3,},
+ { { "",   "dts",NULL,  
HB_ACODEC_DCA_PASS,HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, 
HB_GID_ACODEC_DTS_PASS,   },
+-{ { "AAC (faac)", "faac",   NULL,  0, 
HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, 
HB_GID_ACODEC_AAC,},
+ { { "AAC (ffmpeg)",   "ffaac",  NULL,  
HB_ACODEC_FFAAC,   HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, 
HB_GID_ACODEC_AAC,},
+ { { "AC3 (ffmpeg)",   "ffac3",  NULL,  
HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, 
HB_GID_ACODEC_AC3,},
+ { { "MP3 (lame)", "lame",   NULL,  
HB_ACODEC_LAME,HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, 
HB_GID_ACODEC_MP3,},
+diff --git a/scripts/manicure.rb b/scripts/manicure.rb
+index fb4afa9ec..424288298 100755
 --- a/scripts/manicure.rb
 +++ b/scripts/manicure.rb
-@@ -349,7 +349,7 @@
+@@ -349,7 +349,7 @@ class Display
audioEncoders << "copy:dtshd"
  when /AAC Pass/
audioEncoders << "copy:aac"
@@ -19,7 +23,7 @@
audioEncoders << "av_aac"
  when "AAC (FDK)"
audioEncoders << "fdk_aac"
-@@ -466,7 +466,7 @@
+@@ -466,7 +466,7 @@ class Display
  case hash["AudioEncoderFal

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-24 Thread Sam James
commit: 27d8127dcb2ef57f8ee4de77c94a86e426085e1f
Author: James Beddek  posteo  de>
AuthorDate: Sun Oct 24 07:57:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:21:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27d8127d

media-video/handbrake: use myconfargs array for configure

Signed-off-by: James Beddek  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.4.2.ebuild | 31 +++-
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.4.2.ebuild 
b/media-video/handbrake/handbrake-1.4.2.ebuild
index c8f9db9d002..fee2f21aa6a 100644
--- a/media-video/handbrake/handbrake-1.4.2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2.ebuild
@@ -113,20 +113,23 @@ src_configure() {
# 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
-   ./configure \
-   --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) || die "Configure failed."
+   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() {



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-24 Thread Sam James
commit: 951245e5db43c6f8962359d06f0caf5d471627bd
Author: James Beddek  posteo  de>
AuthorDate: Sun Oct 24 08:16:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:21:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=951245e5

media-video/handbrake: sort deps

Signed-off-by: James Beddek  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.4.2.ebuild | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.4.2.ebuild 
b/media-video/handbrake/handbrake-1.4.2.ebuild
index fee2f21aa6a..ca7e92b4fd6 100644
--- a/media-video/handbrake/handbrake-1.4.2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2.ebuild
@@ -28,26 +28,26 @@ REQUIRED_USE="^^ ( fdk libav-aac )"
 
 RDEPEND="
app-arch/xz-utils
-   media-libs/speex
dev-libs/jansson:=
dev-libs/libxml2
media-libs/a52dec
+   >=media-libs/dav1d-0.5.1
media-libs/libass:=
>=media-libs/libbluray-1.0
-   >=media-libs/dav1d-0.5.1
media-libs/libdvdnav
media-libs/libdvdread:=
media-libs/libsamplerate
media-libs/libtheora
media-libs/libvorbis
>=media-libs/libvpx-1.8
-   nvenc? ( media-libs/nv-codec-headers )
media-libs/opus
+   media-libs/speex
media-libs/x264:=
media-libs/zimg
media-sound/lame
-   sys-libs/zlib
>=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
@@ -69,7 +69,7 @@ RDEPEND="
x11-libs/libnotify
x11-libs/pango
)
-   fdk? ( media-libs/fdk-aac )
+   nvenc? ( media-libs/nv-codec-headers )
x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
 "
 DEPEND="
@@ -144,7 +144,6 @@ src_compile() {
 
 src_install() {
emake -C build DESTDIR="${D}" install
-
dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-24 Thread Sam James
commit: 0c287a51dd3e53e7d95f64a14b368b89f275223b
Author: James Beddek  posteo  de>
AuthorDate: Sat Oct 23 21:49:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:21:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c287a51

media-video/handbrake: add myself as a maintainer

Signed-off-by: James Beddek  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/metadata.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-video/handbrake/metadata.xml 
b/media-video/handbrake/metadata.xml
index ffc4a33c70c..2a996322704 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -1,7 +1,14 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   [email protected]
+   James Beddek
+   
+   
+   Proxy Maintainers
+   [email protected]
+   

Support for the streaming media 
framework from media-libs/gstreamer.
Install the GTK UI, ghb.



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-24 Thread Sam James
commit: 7809e331c4b8f0c0fbaf0432a3b6e501aafb31cf
Author: James Beddek  posteo  de>
AuthorDate: Sun Oct 24 07:56:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:21:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7809e331

media-video/handbrake: remove useless sed call

Signed-off-by: James Beddek  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.4.2.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.4.2.ebuild 
b/media-video/handbrake/handbrake-1.4.2.ebuild
index f0554499dcf..c8f9db9d002 100644
--- a/media-video/handbrake/handbrake-1.4.2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2.ebuild
@@ -106,8 +106,6 @@ src_prepare() {
default
 
cd "${S}/gtk" || die
-   # Don't run autogen.sh.
-   sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call 
failed"
eautoreconf
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-24 Thread Sam James
commit: 4a1a7800339e6ad7bb74c469817c13fb3cd66dc1
Author: James Beddek  posteo  de>
AuthorDate: Sun Oct 24 07:35:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:21:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1a7800

media-video/handbrake: enable py3.10

Signed-off-by: James Beddek  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.4.2.ebuild 
b/media-video/handbrake/handbrake-1.4.2.ebuild
index cb2e8435408..f0554499dcf 100644
--- a/media-video/handbrake/handbrake-1.4.2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools python-any-r1 xdg
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-24 Thread Sam James
commit: 1dfa308a93807d1aa58eff862a0830f346faddb6
Author: James Beddek  posteo  de>
AuthorDate: Sun Oct 24 08:16:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:21:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfa308a

media-video/handbrake: remove doc building note (not applicable)

Signed-off-by: James Beddek  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.4.2.ebuild | 6 --
 1 file changed, 6 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.4.2.ebuild 
b/media-video/handbrake/handbrake-1.4.2.ebuild
index ca7e92b4fd6..ccc9b241fcf 100644
--- a/media-video/handbrake/handbrake-1.4.2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2.ebuild
@@ -134,12 +134,6 @@ src_configure() {
 
 src_compile() {
emake -C build
-
-   # TODO: Documentation building is currently broken, try to fix it.
-   #
-   # if use doc ; then
-   #   emake -C build doc
-   # fi
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-24 Thread Sam James
commit: 1ce82bd38458905e3e7f87fcc2de1654656742cd
Author: James Beddek  posteo  de>
AuthorDate: Sun Oct 24 07:34:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 08:21:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ce82bd3

media-video/handbrake: update HOMEPAGE

Signed-off-by: James Beddek  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-1.4.2.ebuild 
b/media-video/handbrake/handbrake-1.4.2.ebuild
index 2978319d46f..cb2e8435408 100644
--- a/media-video/handbrake/handbrake-1.4.2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"
-HOMEPAGE="http://handbrake.fr/";
+HOMEPAGE="https://handbrake.fr/ https://github.com/HandBrake/HandBrake";
 
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/

2021-10-15 Thread Sam James
commit: ff3c488b4c491c2beb5e9ad2e8ffefe43bc2c5f0
Author: Matthew White  inventati  org>
AuthorDate: Thu May 20 13:30:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 16 01:23:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3c488b

media-video/handbrake: fix audio encoders with FFmpeg 4.4

Applies the upstream patch:
https://github.com/HandBrake/HandBrake/commit/f28289fb06ab461ea082b4be56d6d1504c0c31c2

Closes: https://bugs.gentoo.org/791220
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matteo Bianco  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/20896
Signed-off-by: Sam James  gentoo.org>

 ...audio-encoders-when-linking-to-FFmpeg-4.4.patch |  28 
 media-video/handbrake/handbrake-1.3.3-r3.ebuild| 165 +
 2 files changed, 193 insertions(+)

diff --git 
a/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
 
b/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
new file mode 100644
index 000..d7cc565377f
--- /dev/null
+++ 
b/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
@@ -0,0 +1,28 @@
+From f28289fb06ab461ea082b4be56d6d1504c0c31c2 Mon Sep 17 00:00:00 2001
+From: Damiano Galassi 
+Date: Sat, 10 Apr 2021 13:18:02 +0200
+Subject: [PATCH] libhb: fix audio encoders when linking to FFmpeg 4.4.
+
+---
+ libhb/encavcodecaudio.c | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
+index 52fc4565d..e6cf42414 100644
+--- a/libhb/encavcodecaudio.c
 b/libhb/encavcodecaudio.c
+@@ -410,7 +410,10 @@ static void Encode(hb_work_object_t *w, hb_buffer_list_t 
*list)
+ 
+ // Prepare input frame
+ int out_size;
+-AVFrame frame = { .nb_samples = pv->samples_per_frame, };
++AVFrame frame = { .nb_samples = pv->samples_per_frame,
++  .format = pv->context->sample_fmt,
++  .channels = pv->context->channels
++};
+ 
+ out_size = av_samples_get_buffer_size(NULL,
+   pv->context->channels,
+-- 
+2.26.3
+

diff --git a/media-video/handbrake/handbrake-1.3.3-r3.ebuild 
b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
new file mode 100644
index 000..a02d836a04b
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools gnome2-utils python-any-r1 xdg-utils
+
+if [[ ${PV} = ** ]]; 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="http://handbrake.fr/";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+   app-arch/xz-utils
+   media-libs/speex
+   dev-libs/jansson:=
+   dev-libs/libxml2
+   media-libs/a52dec
+   media-libs/libass:=
+   >=media-libs/libbluray-1.0
+   >=media-libs/dav1d-0.5.1
+   media-libs/libdvdnav
+   media-libs/libdvdread:=
+   media-libs/libsamplerate
+   media-libs/libtheora
+   media-libs/libvorbis
+   >=media-libs/libvpx-1.8
+   nvenc? ( media-libs/nv-codec-headers )
+   media-libs/opus
+   media-libs/x264:=
+   media-sound/lame
+   sys-libs/zlib
+   >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+   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
+   )
+   fdk? ( media-libs/fdk-aac )
+   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
+
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   dev-lang/nasm
+   dev-util/intltool"
+
+PATCHES=(
+   # Remove libdvdnav duplic

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-10-15 Thread Sam James
commit: a0b040c31bd9e25e58da14228e53efc2000faf42
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 16 01:24:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 16 01:24:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b040c3

media-video/handbrake: sync live ebuild

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index f90d1b9f152..a0fb6014561 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -68,8 +68,7 @@ RDEPEND="
x11-libs/pango
)
fdk? ( media-libs/fdk-aac )
-   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
-   "
+   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
 
 DEPEND="${RDEPEND}
${PYTHON_DEPS}



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-09-25 Thread Sam James
commit: c20a1bb406401603520c244e8b33b316a5fc8430
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 25 18:59:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 25 19:08:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c20a1bb4

media-video/handbrake: add libjansson subslot dep

Earlier versions of libjansson lacked symbol versioning, causing crashes.

Bug: https://bugs.gentoo.org/812119
Signed-off-by: Sam James  gentoo.org>

 .../handbrake/{handbrake-1.3.3-r1.ebuild => handbrake-1.3.3-r2.ebuild}  | 2 +-
 media-video/handbrake/handbrake-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.3.3-r1.ebuild 
b/media-video/handbrake/handbrake-1.3.3-r2.ebuild
similarity index 99%
rename from media-video/handbrake/handbrake-1.3.3-r1.ebuild
rename to media-video/handbrake/handbrake-1.3.3-r2.ebuild
index 2473cf819b8..a0fb6014561 100644
--- a/media-video/handbrake/handbrake-1.3.3-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3-r2.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="^^ ( fdk libav-aac )"
 RDEPEND="
app-arch/xz-utils
media-libs/speex
-   dev-libs/jansson
+   dev-libs/jansson:=
dev-libs/libxml2
media-libs/a52dec
media-libs/libass:=

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index d6c33bf6088..f90d1b9f152 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="^^ ( fdk libav-aac )"
 RDEPEND="
app-arch/xz-utils
media-libs/speex
-   dev-libs/jansson
+   dev-libs/jansson:=
dev-libs/libxml2
media-libs/a52dec
media-libs/libass:=



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/

2021-07-13 Thread Conrad Kostecki
commit: 90df404c0b5d87b409245a35464e0e708479e73e
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Jul 12 18:14:32 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Jul 13 21:14:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90df404c

media-video/handbrake: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/21615
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-video/handbrake/files/handbrake-1.3.2-x265-link.patch | 12 
 1 file changed, 12 deletions(-)

diff --git a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch 
b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
deleted file mode 100644
index 589a204cc19..000
--- a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru a/test/module.defs b/test/module.defs
 a/test/module.defs 2020-05-23 17:23:21.912103481 +0200
-+++ b/test/module.defs 2020-05-23 17:23:36.106103799 +0200
-@@ -16,7 +16,7 @@
- TEST.GCC.l = \
- ass avformat avfilter avcodec avutil swresample postproc mp3lame 
dvdnav \
- dvdread fribidi \
--swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
-+swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
- bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d
- 
- ifeq (,$(filter $(HOST.system),darwin cygwin mingw))



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-06-01 Thread Sam James
commit: 515aee70a3e8c9b73b75c986c547b31209292c1a
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  1 14:05:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  1 14:05:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=515aee70

media-video/handbrake: add Python 3.9

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.3.3-r1.ebuild | 5 ++---
 media-video/handbrake/handbrake-.ebuild | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.3.3-r1.ebuild 
b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
index 01c79b64512..2473cf819b8 100644
--- a/media-video/handbrake/handbrake-1.3.3-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools gnome2-utils python-any-r1 xdg-utils
 
 if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index d90a6c15069..d6c33bf6088 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools gnome2-utils python-any-r1 xdg-utils
 
 if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-05-31 Thread Sam James
commit: 04fa4a1baec81b44f8c5ad5ece7f8559cff61ad6
Author: Sam James  gentoo  org>
AuthorDate: Mon May 31 23:12:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 31 23:19:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04fa4a1b

media-video/handbrake: drop 1.3.3

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.3.3.ebuild | 165 ---
 1 file changed, 165 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.3.3.ebuild 
b/media-video/handbrake/handbrake-1.3.3.ebuild
deleted file mode 100644
index ca460ce1ce3..000
--- a/media-video/handbrake/handbrake-1.3.3.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = ** ]]; 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="http://handbrake.fr/";
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-   app-arch/xz-utils
-   media-libs/speex
-   dev-libs/jansson
-   dev-libs/libxml2
-   media-libs/a52dec
-   media-libs/libass:=
-   >=media-libs/libbluray-1.0
-   >=media-libs/dav1d-0.5.1
-   media-libs/libdvdnav
-   media-libs/libdvdread:=
-   media-libs/libsamplerate
-   media-libs/libtheora
-   media-libs/libvorbis
-   >=media-libs/libvpx-1.8
-   nvenc? ( media-libs/nv-codec-headers )
-   media-libs/opus
-   media-libs/x264:=
-   media-sound/lame
-   sys-libs/zlib
-   >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
-   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
-   )
-   fdk? ( media-libs/fdk-aac )
-   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
-   "
-
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   dev-lang/yasm
-   dev-util/intltool
-   sys-devel/automake"
-
-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}--remove-dvdnav-dup.patch"
-
-   # Remove faac dependency; TODO: figure out if we need to do this at all.
-   "${FILESDIR}/${PN}--remove-faac-dependency.patch"
-
-   # Use whichever python is set by portage
-   "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
-
-   # Fix x265 linkage... again #724650
-   "${FILESDIR}/${PN}-1.3.2-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"
-   # Don't run autogen.sh.
-   sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call 
failed"
-   eautoreconf
-}
-
-src_configure() {
-   # 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
-   ./configure \
-   --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) || die "Configure failed."
-}
-
-src_compile() {
-   emake -C build
-
-   # TODO: Documentation building is

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-05-31 Thread Sam James
commit: 4f9c217860362a505db256c460ed7989ba04d315
Author: Sam James  gentoo  org>
AuthorDate: Mon May 31 23:11:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 31 23:19:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9c2178

media-video/handbrake: add github remote-id

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-video/handbrake/metadata.xml 
b/media-video/handbrake/metadata.xml
index 83b12addd42..17ea50de1e3 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -14,4 +14,7 @@
Adds support for NVIDIA Encoder (NVENC) API 
for hardware accelerated encoding on NVIDIA cards.
Support for encoding h265 using 
media-libs/x265.

+   
+   HandBrake/HandBrake
+   
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2021-05-31 Thread Sam James
commit: d1524eec1755d46264c01249b925ee981b1dd1b1
Author: Sam James  gentoo  org>
AuthorDate: Mon May 31 23:13:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 31 23:19:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1524eec

media-video/handbrake: sync live ebuild

Signed-off-by: Sam James  gentoo.org>

 media-video/handbrake/handbrake-1.3.3-r1.ebuild | 10 +++---
 media-video/handbrake/handbrake-.ebuild | 22 ++
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.3.3-r1.ebuild 
b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
index 73db57b803d..01c79b64512 100644
--- a/media-video/handbrake/handbrake-1.3.3-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
@@ -19,8 +19,8 @@ fi
 
 DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"
 HOMEPAGE="http://handbrake.fr/";
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
 
@@ -69,16 +69,12 @@ RDEPEND="
x11-libs/pango
)
fdk? ( media-libs/fdk-aac )
-   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
-   "
+   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
 
 DEPEND="${RDEPEND}
${PYTHON_DEPS}
dev-lang/nasm
-   dev-util/cmake
-   dev-util/intltool
-   dev-util/meson
-   sys-devel/automake"
+   dev-util/intltool"
 
 PATCHES=(
# Remove libdvdnav duplication and call it on the original instead.

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 115170471f2..d90a6c15069 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -12,15 +12,15 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
 else
MY_P="HandBrake-${PV}"
-   SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> 
${P}.tar.bz2"
+   
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="http://handbrake.fr/";
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
 
@@ -46,7 +46,7 @@ RDEPEND="
media-libs/x264:=
media-sound/lame
sys-libs/zlib
-   >=media-video/ffmpeg-4.2.1:0=[fdk?]
+   >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -74,9 +74,8 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
${PYTHON_DEPS}
-   dev-lang/yasm
-   dev-util/intltool
-   sys-devel/automake"
+   dev-lang/nasm
+   dev-util/intltool"
 
 PATCHES=(
# Remove libdvdnav duplication and call it on the original instead.
@@ -88,6 +87,9 @@ PATCHES=(
 
# 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() {
@@ -152,15 +154,11 @@ pkg_postinst() {
einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
fi
 
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
xdg_desktop_database_update
 }
 
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
 pkg_postrm() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
xdg_desktop_database_update
 }



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2020-09-14 Thread Michał Górny
commit: 5472eadce4816b8f81d9f8e375b2c02e2a3d4ec7
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep 14 19:30:11 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Sep 14 19:31:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5472eadc

media-video/handbrake: [QA] Fix PkgMetadataXmlInvalidPkgRef

Signed-off-by: Michał Górny  gentoo.org>

 media-video/handbrake/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/handbrake/metadata.xml 
b/media-video/handbrake/metadata.xml
index 8c6e664cd0b..83b12addd42 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -9,7 +9,7 @@
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 
media-video/libav's internal encoder.
+   Support for encoding AAC using libav's 
internal encoder.
Adds support for x265's NUMA 
capabilities.
Adds support for NVIDIA Encoder (NVENC) API 
for hardware accelerated encoding on NVIDIA cards.
Support for encoding h265 using 
media-libs/x265.



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/, media-video/handbrake/files/

2020-08-19 Thread Ben Kohler
commit: dc51888cc64e6ce07980564274c180ddd0ffd9f6
Author: Ben Kohler  gentoo  org>
AuthorDate: Wed Aug 19 18:33:06 2020 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Wed Aug 19 18:33:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc51888c

media-video/handbrake: add new x265 link patch & tweak DEPEND

Closes: https://bugs.gentoo.org/730034
Closes: https://bugs.gentoo.org/730544
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Ben Kohler  gentoo.org>

 .../files/handbrake-1.3.3-x265-link.patch  |  13 ++
 media-video/handbrake/handbrake-1.3.3-r1.ebuild| 168 +
 2 files changed, 181 insertions(+)

diff --git a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch 
b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
new file mode 100644
index 000..6a1464571ec
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
@@ -0,0 +1,13 @@
+--- a/test/module.defs 2020-06-13 15:05:35.0 +0100
 a/test/module.defs 2020-07-03 11:15:53.951205608 +0100
+@@ -30,6 +30,10 @@ 
+ endif
+ endif
+ 
++ifeq (1,$(FEATURE.x265))
++TEST.GCC.l += x265
++endif
++
+ ifeq (1,$(FEATURE.flatpak))
+ TEST.GCC.l += glib-2.0
+ endif

diff --git a/media-video/handbrake/handbrake-1.3.3-r1.ebuild 
b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
new file mode 100644
index 000..2dccc821812
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
+   inherit git-r3
+   KEYWORDS=""
+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="http://handbrake.fr/";
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+   app-arch/xz-utils
+   media-libs/speex
+   dev-libs/jansson
+   dev-libs/libxml2
+   media-libs/a52dec
+   media-libs/libass:=
+   >=media-libs/libbluray-1.0
+   >=media-libs/dav1d-0.5.1
+   media-libs/libdvdnav
+   media-libs/libdvdread:=
+   media-libs/libsamplerate
+   media-libs/libtheora
+   media-libs/libvorbis
+   >=media-libs/libvpx-1.8
+   nvenc? ( media-libs/nv-codec-headers )
+   media-libs/opus
+   media-libs/x264:=
+   media-sound/lame
+   sys-libs/zlib
+   >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+   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
+   )
+   fdk? ( media-libs/fdk-aac )
+   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+   "
+
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   dev-lang/nasm
+   dev-util/cmake
+   dev-util/intltool
+   dev-util/meson
+   sys-devel/automake"
+
+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}--remove-dvdnav-dup.patch"
+
+   # Remove faac dependency; TODO: figure out if we need to do this at all.
+   "${FILESDIR}/${PN}--remove-faac-dependency.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"
+   # Don't run autogen.sh.
+   sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call 
failed

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/, media-video/handbrake/files/

2020-06-27 Thread Ian Whyman
commit: 927f4ed4b243fa5db70f8f0a5e4f7041dd5e0eb3
Author: Ian Whyman  gentoo  org>
AuthorDate: Sat Jun 27 08:17:05 2020 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sat Jun 27 09:39:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=927f4ed4

media-video/handbrake: Tidy old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Ian Whyman  gentoo.org>

 media-video/handbrake/Manifest |   1 -
 ...ndbrake-1.2.2-backport-hardware-configure.patch |  88 ---
 ...andbrake-1.2.2-fix-missing-x265-link-flag.patch |  13 --
 media-video/handbrake/handbrake-1.2.2-r3.ebuild| 168 -
 4 files changed, 270 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 70dab8d3bfb..bf3bc269790 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,3 +1,2 @@
-DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 
75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e
 SHA512 
434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c
 DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 
2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4
 SHA512 
40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
 DIST handbrake-1.3.2.tar.bz2 16813741 BLAKE2B 
b59186f60d12a5478b2a34f736c9450ce6bba98f0606fc42af11c64f55b2324177302d49089003a39d0a8c1d82776211573a7c4ef1b6b6fabdbc35aed2e5cde7
 SHA512 
857f358a8754b08e55acfddb1431d99cc1035cf52174ab1d5243524fffe60e6cbc7d2a5d5912d55e6dc6b8ec621d503ebd21614a9064706a95c920e72a760f6a

diff --git 
a/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch 
b/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch
deleted file mode 100644
index 0618c9004e9..000
--- 
a/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From c7119499f5a2da7e5be0afd50a6757778fed53e7 Mon Sep 17 00:00:00 2001
-From: Bradley Sepos 
-Date: Sat, 23 Feb 2019 11:44:34 -0500
-Subject: [PATCH] configure: Enable hardware encoders by default on suitable
- platforms.
-
-Print special encoders status at end of configure output, minor cosmetics.

- make/configure.py | 46 +-
- 1 file changed, 29 insertions(+), 17 deletions(-)
-
-diff --git a/make/configure.py b/make/configure.py
-index c8bc712fe5..e673c9c5a0 100644
 a/make/configure.py
-+++ b/make/configure.py
-@@ -1298,36 +1298,37 @@ def createCLI():
- grp.add_option( '--disable-gtk', default=False, action='store_true', 
help=h )
- 
- h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', 
'*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
--
- grp.add_option( '--disable-gtk-update-checks', default=False, 
action='store_true', help=h )
- 
- h = IfHost( 'enable GTK GUI (mingw)', '*-*-mingw*', 
none=optparse.SUPPRESS_HELP ).value
- grp.add_option( '--enable-gtk-mingw', default=False, action='store_true', 
help=h )
- 
- h = IfHost( 'disable GStreamer (live preview)', '*-*-linux*', 
'*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
--
- grp.add_option( '--disable-gst', default=False, action='store_true', 
help=h )
- 
--h = IfHost( 'enable Intel Quick Sync Video (QSV) hardware acceleration. 
(Windows and Linux only)', '*-*-linux*', '*-*-mingw*', 
none=optparse.SUPPRESS_HELP ).value
--grp.add_option( '--enable-qsv', default=False, action='store_true', 
help=h )
-+h = IfHost( 'Intel Quick Sync Video (QSV) hardware acceleration (Windows 
and Linux only)', '*-*-linux*', '*-*-mingw*', none=optparse.SUPPRESS_HELP 
).value
-+grp.add_option( '--enable-qsv', dest="enable_qsv", default=host.match( 
'*-*-mingw*' ), action='store_true', help=(( 'enable %s' %h ) if h != 
optparse.SUPPRESS_HELP else h) )
-+grp.add_option( '--disable-qsv', dest="enable_qsv", action='store_false', 
help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
--h = IfHost( 'enable AMD VCE hardware acceleration. (Windows only)', 
'*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
--grp.add_option( '--enable-vce', default=False, action='store_true', 
help=h )
-+h = IfHost( 'AMD VCE hardware acceleration (Windows only)', '*-*-mingw*', 
none=optparse.SUPPRESS_HELP ).value
-+grp.add_option( '--enable-vce', dest="enable_vce", default=host.match( 
'*-*-mingw*' ), action='store_true', help=(( 'enable %s' %h ) if h != 
optparse.SUPPRESS_HELP else h) )
-+grp.add_option( '--disable-vce', dest="enable_vce", action='store_false', 
help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
- 
--h = IfHost( 'enable x265 video encoder', '*-*-

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/

2020-06-27 Thread Ian Whyman
commit: de81c6b585f654b688425b8d84801677c4357c57
Author: Ian Whyman  gentoo  org>
AuthorDate: Sat Jun 27 09:38:40 2020 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sat Jun 27 09:39:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de81c6b5

media-video/handbrake: Bump, fix x265 link, drop old

Closes: https://bugs.gentoo.org/713598
Closes: https://bugs.gentoo.org/724650
Closes: https://bugs.gentoo.org/724650
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Ian Whyman  gentoo.org>

 media-video/handbrake/Manifest |   3 +-
 .../handbrake-1.3.0-missing-linker-flags.patch |  27 
 .../files/handbrake-1.3.2-x265-link.patch  |  12 ++
 media-video/handbrake/handbrake-1.3.0-r2.ebuild| 170 -
 ...ndbrake-1.3.2.ebuild => handbrake-1.3.3.ebuild} |   5 +-
 5 files changed, 17 insertions(+), 200 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index bf3bc269790..abb9a1f6185 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,2 +1 @@
-DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 
2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4
 SHA512 
40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
-DIST handbrake-1.3.2.tar.bz2 16813741 BLAKE2B 
b59186f60d12a5478b2a34f736c9450ce6bba98f0606fc42af11c64f55b2324177302d49089003a39d0a8c1d82776211573a7c4ef1b6b6fabdbc35aed2e5cde7
 SHA512 
857f358a8754b08e55acfddb1431d99cc1035cf52174ab1d5243524fffe60e6cbc7d2a5d5912d55e6dc6b8ec621d503ebd21614a9064706a95c920e72a760f6a
+DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B 
c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a
 SHA512 
a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c

diff --git 
a/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch 
b/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch
deleted file mode 100644
index 598fc7c6efa..000
--- a/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/gtk/configure.ac b/gtk/configure.ac
-index 92aabcbe8..1f4a1df95 100644
 a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
- 
- GHB_CFLAGS="$HBINC $GHB_CFLAGS"
- 
--HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d 
-lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg 
-lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass 
-lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
-+HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d 
-lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg 
-lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass 
-lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma -ldl"
- 
- if test "x$use_fdk_aac" = "xyes" ; then
- HB_LIBS="$HB_LIBS -lfdk-aac"
-diff --git a/test/module.defs b/test/module.defs
-index ffc00a8b2..62b01ffd5 100644
 a/test/module.defs
-+++ b/test/module.defs
-@@ -69,6 +69,9 @@ else ifeq ($(HOST.system),linux)
- ifeq (1, $(FEATURE.numa))
- TEST.GCC.l += numa
- endif
-+ifeq (1, $(FEATURE.x265))
-+TEST.GCC.l += x265
-+endif
- else ifeq ($(HOST.system),kfreebsd)
- TEST.GCC.l += pthread dl m
- else ifeq ($(HOST.system),freebsd)

diff --git a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch 
b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
new file mode 100644
index 000..589a204cc19
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch
@@ -0,0 +1,12 @@
+diff -Naru a/test/module.defs b/test/module.defs
+--- a/test/module.defs 2020-05-23 17:23:21.912103481 +0200
 b/test/module.defs 2020-05-23 17:23:36.106103799 +0200
+@@ -16,7 +16,7 @@
+ TEST.GCC.l = \
+ ass avformat avfilter avcodec avutil swresample postproc mp3lame 
dvdnav \
+ dvdread fribidi \
+-swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
++swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
+ bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d
+ 
+ ifeq (,$(filter $(HOST.system),darwin cygwin mingw))

diff --git a/media-video/handbrake/handbrake-1.3.0-r2.ebuild 
b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
deleted file mode 100644
index e7362b5877d..000
--- a/media-video/handbrake/handbrake-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2020-05-23 Thread Ian Whyman
commit: ddeb26c79cf05eb83f79c29a1743060590bb9b51
Author: Ian Whyman  gentoo  org>
AuthorDate: Sat May 23 09:51:30 2020 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sat May 23 09:51:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddeb26c7

media-video/handbrake: Version bump

Closes: https://bugs.gentoo.org/713364
Closes: https://bugs.gentoo.org/712612
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Ian Whyman  gentoo.org>

 media-video/handbrake/Manifest   |   1 +
 media-video/handbrake/handbrake-1.3.2.ebuild | 163 +++
 2 files changed, 164 insertions(+)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 39ca8d3e610..70dab8d3bfb 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,2 +1,3 @@
 DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 
75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e
 SHA512 
434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c
 DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 
2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4
 SHA512 
40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
+DIST handbrake-1.3.2.tar.bz2 16813741 BLAKE2B 
b59186f60d12a5478b2a34f736c9450ce6bba98f0606fc42af11c64f55b2324177302d49089003a39d0a8c1d82776211573a7c4ef1b6b6fabdbc35aed2e5cde7
 SHA512 
857f358a8754b08e55acfddb1431d99cc1035cf52174ab1d5243524fffe60e6cbc7d2a5d5912d55e6dc6b8ec621d503ebd21614a9064706a95c920e72a760f6a

diff --git a/media-video/handbrake/handbrake-1.3.2.ebuild 
b/media-video/handbrake/handbrake-1.3.2.ebuild
new file mode 100644
index 000..e5a5b302194
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.3.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
+   inherit git-r3
+   KEYWORDS=""
+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="http://handbrake.fr/";
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+   app-arch/xz-utils
+   media-libs/speex
+   dev-libs/jansson
+   dev-libs/libxml2
+   media-libs/a52dec
+   media-libs/libass:=
+   >=media-libs/libbluray-1.0
+   >=media-libs/dav1d-0.5.1
+   media-libs/libdvdnav
+   media-libs/libdvdread:=
+   media-libs/libsamplerate
+   media-libs/libtheora
+   media-libs/libvorbis
+   >=media-libs/libvpx-1.8
+   nvenc? ( media-libs/nv-codec-headers )
+   media-libs/opus
+   media-libs/x264:=
+   media-sound/lame
+   sys-libs/zlib
+   >=media-video/ffmpeg-4.2.1:0=[fdk?]
+   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
+   )
+   fdk? ( media-libs/fdk-aac )
+   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+   "
+
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   dev-lang/yasm
+   dev-util/intltool
+   sys-devel/automake"
+
+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}--remove-dvdnav-dup.patch"
+
+   # Remove faac dependency; TODO: figure out if we need to do this at all.
+   "${FILESDIR}/${PN}--remove-faac-dependency.patch"
+
+   # Use whichever python is set by portage
+   "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
+)
+
+src_prepa

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2020-04-26 Thread Mikle Kolyada
commit: 556814880b332350c2af62639333757cdfeb8822
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Apr 26 18:26:44 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Apr 26 18:27:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55681488

media-video/handbrake: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-video/handbrake/handbrake-1.2.2-r3.ebuild | 7 +++
 media-video/handbrake/handbrake-1.3.0-r2.ebuild | 5 ++---
 media-video/handbrake/handbrake-.ebuild | 5 ++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.2.2-r3.ebuild 
b/media-video/handbrake/handbrake-1.2.2-r3.ebuild
index a2e9041ccde..723f649b7e2 100644
--- a/media-video/handbrake/handbrake-1.2.2-r3.ebuild
+++ b/media-video/handbrake/handbrake-1.2.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/";
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac nvenc x265"
+IUSE="+fdk gstreamer gtk libav-aac nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -45,8 +45,7 @@ RDEPEND="
media-libs/x264:=
media-sound/lame
sys-libs/zlib
-   libav? ( >=media-video/libav-12.2:0=[fdk?] )
-   !libav? ( >=media-video/ffmpeg-4.1:0=[fdk?] )
+   >=media-video/ffmpeg-4.1:0=[fdk?]
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0

diff --git a/media-video/handbrake/handbrake-1.3.0-r2.ebuild 
b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
index 2f99c1e31eb..e7362b5877d 100644
--- a/media-video/handbrake/handbrake-1.3.0-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/";
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac numa nvenc x265"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -47,8 +47,7 @@ RDEPEND="
media-libs/x264:=
media-sound/lame
sys-libs/zlib
-   libav? ( >=media-video/libav-12.2:0=[fdk?] )
-   !libav? ( >=media-video/ffmpeg-4.2.1:0=[fdk?] )
+   >=media-video/ffmpeg-4.2.1:0=[fdk?]
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index c1345ae1ac6..ed8a647b082 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/";
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac numa nvenc x265"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -47,8 +47,7 @@ RDEPEND="
media-libs/x264:=
media-sound/lame
sys-libs/zlib
-   libav? ( >=media-video/libav-12.2:0=[fdk?] )
-   !libav? ( >=media-video/ffmpeg-4.2.1:0=[fdk?] )
+   >=media-video/ffmpeg-4.2.1:0=[fdk?]
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2020-04-18 Thread Craig Andrews
commit: 2baa3abd4bca3b14d3c3d3cde1999b5a5172b89a
Author: neeshy  tfwno  gf>
AuthorDate: Wed Mar 25 19:36:51 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Sun Apr 19 02:35:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2baa3abd

media-video/handbrake: add python3_8 target

Signed-off-by: Nima Sadeghi  tfwno.gf>
Signed-off-by: Craig Andrews  gentoo.org>

 media-video/handbrake/handbrake-1.3.0-r2.ebuild | 2 +-
 media-video/handbrake/handbrake-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.3.0-r2.ebuild 
b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
index 6c8e01b4f37..2f99c1e31eb 100644
--- a/media-video/handbrake/handbrake-1.3.0-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
 

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 753a5a36156..c1345ae1ac6 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/

2019-11-20 Thread Ian Whyman
commit: 4e2f5be328aca632b1ccbc6244c04be904b21a81
Author: Ian Whyman  gentoo  org>
AuthorDate: Wed Nov 20 18:33:04 2019 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Wed Nov 20 18:33:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e2f5be3

media-video/handbrake: Sync/Fix live ebuild

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Ian Whyman  gentoo.org>

 media-video/handbrake/files/handbrake--libdl-link.patch | 13 -
 media-video/handbrake/handbrake-.ebuild | 13 +
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/media-video/handbrake/files/handbrake--libdl-link.patch 
b/media-video/handbrake/files/handbrake--libdl-link.patch
deleted file mode 100644
index ace1528053a..000
--- a/media-video/handbrake/files/handbrake--libdl-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gtk/configure.ac b/gtk/configure.ac
-index 92aabcbe8..1f4a1df95 100644
 a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
- 
- GHB_CFLAGS="$HBINC $GHB_CFLAGS"
- 
--HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d 
-lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg 
-lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass 
-lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
-+HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d 
-lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg 
-lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass 
-lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma -ldl"
- 
- if test "x$use_fdk_aac" = "xyes" ; then
- HB_LIBS="$HB_LIBS -lfdk-aac"

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 13e3bf9a6ad..cfc362cad18 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/";
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac nvenc x265"
+IUSE="+fdk gstreamer gtk libav libav-aac numa nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -71,7 +71,7 @@ RDEPEND="
x11-libs/pango
)
fdk? ( media-libs/fdk-aac )
-   x265? ( >=media-libs/x265-2.9:0= )
+   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
"
 
 DEPEND="${RDEPEND}
@@ -88,14 +88,10 @@ PATCHES=(
# Remove faac dependency; TODO: figure out if we need to do this at all.
"${FILESDIR}/${PN}--remove-faac-dependency.patch"
 
-   # Fix missing -ldl
-   "${FILESDIR}/${PN}--libdl-link.patch"
+   # Use whichever python is set by portage
+   "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
 )
 
-pkg_setup() {
-   python-any-r1_pkg_setup
-}
-
 src_prepare() {
# Get rid of leftover bundled library build definitions,
sed -i 's:.*\(/contrib\|contrib/\).*::g' \
@@ -125,6 +121,7 @@ src_configure() {
$(use_enable fdk fdk-aac) \
$(usex !gtk --disable-gtk) \
$(usex !gstreamer --disable-gst) \
+   $(use_enable numa) \
$(use_enable nvenc) \
$(use_enable x265) || die "Configure failed."
 }



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/

2019-11-20 Thread Ian Whyman
commit: 478aa705b11104a1a067877e02d959ad109a7b25
Author: Ian Whyman  gentoo  org>
AuthorDate: Wed Nov 20 18:23:56 2019 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Wed Nov 20 18:24:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=478aa705

media-video/handbrake: Dont search for python

The ebuild would prefer calling python3 even if the eclass had chosen a
2.7 version, upsetting python_wrapper_setup

Closes: https://bugs.gentoo.org/700706
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Ian Whyman  gentoo.org>

 .../handbrake-1.3.0-dont-search-for-python.patch   | 27 ++
 ...e-1.3.0-r1.ebuild => handbrake-1.3.0-r2.ebuild} |  7 +++---
 2 files changed, 30 insertions(+), 4 deletions(-)

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
new file mode 100644
index 000..551a64ee381
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch
@@ -0,0 +1,27 @@
+diff --git a/configure b/configure
+index 5c870e1d7..2f5834083 100755
+--- 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/handbrake-1.3.0-r1.ebuild 
b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
similarity index 97%
rename from media-video/handbrake/handbrake-1.3.0-r1.ebuild
rename to media-video/handbrake/handbrake-1.3.0-r2.ebuild
index ddd53059745..21bb95bbbdb 100644
--- a/media-video/handbrake/handbrake-1.3.0-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
@@ -90,11 +90,10 @@ PATCHES=(
 
# Fix missing flags
"${FILESDIR}/${P}-missing-linker-flags.patch"
-)
 
-pkg_setup() {
-   python-any-r1_pkg_setup
-}
+   # Use whichever python is set by portage
+   "${FILESDIR}/${P}-dont-search-for-python.patch"
+)
 
 src_prepare() {
# Get rid of leftover bundled library build definitions,



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/, media-video/handbrake/files/

2019-11-18 Thread Ian Whyman
commit: 9f0ac6765b861a64775387c797b180d3a07a8b38
Author: Ian Whyman  gentoo  org>
AuthorDate: Mon Nov 18 18:43:21 2019 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Mon Nov 18 18:43:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f0ac676

media-video/handbrake: 1.2.2: restore missing patch

Closes: https://bugs.gentoo.org/700482
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Ian Whyman  gentoo.org>

 .../files/handbrake-1.2.2-fix-missing-x265-link-flag.patch  | 13 +
 ...{handbrake-1.2.2-r2.ebuild => handbrake-1.2.2-r3.ebuild} |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git 
a/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch 
b/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch
new file mode 100644
index 000..a999fc32564
--- /dev/null
+++ 
b/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch
@@ -0,0 +1,13 @@
+Written by: Peter Foley 
+Gentoo Bug: #552792
+
+--- ./test/module.defs.bak 2015-06-21 13:19:40.626249439 -0400
 ./test/module.defs 2015-06-21 13:19:54.919757726 -0400
+@@ -25,6 +25,7 @@
+ 
+ ifeq (1,$(FEATURE.x265))
+ TEST.GCC.D += USE_X265
++TEST.GCC.l += x265
+ endif
+ 
+ TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))

diff --git a/media-video/handbrake/handbrake-1.2.2-r2.ebuild 
b/media-video/handbrake/handbrake-1.2.2-r3.ebuild
similarity index 98%
rename from media-video/handbrake/handbrake-1.2.2-r2.ebuild
rename to media-video/handbrake/handbrake-1.2.2-r3.ebuild
index 6d9379f3013..a2e9041ccde 100644
--- a/media-video/handbrake/handbrake-1.2.2-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.2.2-r3.ebuild
@@ -86,7 +86,7 @@ PATCHES=(
"${FILESDIR}/${PN}--remove-faac-dependency.patch"
 
# Fix missing x265 link flag
-   "${FILESDIR}/${PN}--fix-missing-x265-link-flag.patch"
+   "${FILESDIR}/${P}-fix-missing-x265-link-flag.patch"
 
# Allow disabling nvenc etc
"${FILESDIR}/${P}-backport-hardware-configure.patch"



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/, media-video/handbrake/files/

2019-11-16 Thread Ian Whyman
commit: d09b96ef52113113a42c3b7b51ed8dd858bec4c7
Author: Ian Whyman  gentoo  org>
AuthorDate: Sat Nov 16 21:50:22 2019 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sat Nov 16 21:50:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09b96ef

media-video/handbrake: 1.3.0: Fix x265, Add numa

Closes: https://bugs.gentoo.org/700098
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Ian Whyman  gentoo.org>

 .../handbrake-1.3.0-missing-linker-flags.patch | 27 ++
 ...handbrake--fix-missing-x265-link-flag.patch | 13 ---
 ...rake-1.3.0.ebuild => handbrake-1.3.0-r1.ebuild} |  9 
 media-video/handbrake/metadata.xml |  1 +
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git 
a/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch 
b/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch
new file mode 100644
index 000..598fc7c6efa
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch
@@ -0,0 +1,27 @@
+diff --git a/gtk/configure.ac b/gtk/configure.ac
+index 92aabcbe8..1f4a1df95 100644
+--- a/gtk/configure.ac
 b/gtk/configure.ac
+@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
+ 
+ GHB_CFLAGS="$HBINC $GHB_CFLAGS"
+ 
+-HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d 
-lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg 
-lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass 
-lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
++HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d 
-lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg 
-lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass 
-lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma -ldl"
+ 
+ if test "x$use_fdk_aac" = "xyes" ; then
+ HB_LIBS="$HB_LIBS -lfdk-aac"
+diff --git a/test/module.defs b/test/module.defs
+index ffc00a8b2..62b01ffd5 100644
+--- a/test/module.defs
 b/test/module.defs
+@@ -69,6 +69,9 @@ else ifeq ($(HOST.system),linux)
+ ifeq (1, $(FEATURE.numa))
+ TEST.GCC.l += numa
+ endif
++ifeq (1, $(FEATURE.x265))
++TEST.GCC.l += x265
++endif
+ else ifeq ($(HOST.system),kfreebsd)
+ TEST.GCC.l += pthread dl m
+ else ifeq ($(HOST.system),freebsd)

diff --git 
a/media-video/handbrake/files/handbrake--fix-missing-x265-link-flag.patch 
b/media-video/handbrake/files/handbrake--fix-missing-x265-link-flag.patch
deleted file mode 100644
index a963fe0af21..000
--- 
a/media-video/handbrake/files/handbrake--fix-missing-x265-link-flag.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Written by: Peter Foley 
-Gentoo Bug: #552792
-
 a/test/module.defs
-+++ b/test/module.defs
-@@ -25,6 +25,7 @@
- 
- ifeq (1,$(FEATURE.x265))
- TEST.GCC.D += USE_X265
-+TEST.GCC.l += x265
- endif
- 
- TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))

diff --git a/media-video/handbrake/handbrake-1.3.0.ebuild 
b/media-video/handbrake/handbrake-1.3.0-r1.ebuild
similarity index 95%
rename from media-video/handbrake/handbrake-1.3.0.ebuild
rename to media-video/handbrake/handbrake-1.3.0-r1.ebuild
index 13e3bf9a6ad..ddd53059745 100644
--- a/media-video/handbrake/handbrake-1.3.0.ebuild
+++ b/media-video/handbrake/handbrake-1.3.0-r1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/";
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac nvenc x265"
+IUSE="+fdk gstreamer gtk libav libav-aac numa nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -71,7 +71,7 @@ RDEPEND="
x11-libs/pango
)
fdk? ( media-libs/fdk-aac )
-   x265? ( >=media-libs/x265-2.9:0= )
+   x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
"
 
 DEPEND="${RDEPEND}
@@ -88,8 +88,8 @@ PATCHES=(
# Remove faac dependency; TODO: figure out if we need to do this at all.
"${FILESDIR}/${PN}--remove-faac-dependency.patch"
 
-   # Fix missing -ldl
-   "${FILESDIR}/${PN}--libdl-link.patch"
+   # Fix missing flags
+   "${FILESDIR}/${P}-missing-linker-flags.patch"
 )
 
 pkg_setup() {
@@ -125,6 +125,7 @@ src_configure() {
$(use_enable fdk fdk-aac) \
$(usex !gtk --disable-gtk) \
$(usex !gstreamer --disable-gst) \
+   $(use_enable numa) \
$(use_enable nvenc) \
$(use_enable x265) || die "Configure failed."
 }

diff --git a/media-video/handbrake/metadata.xml 
b/media-video/handbrake/metadata.xml
index 0bab35dd0f0..66de5356243 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -13,6 +13,7 @@
Install the GTK UI, ghb.
Support for encoding AAC using 
media-libs/fdk-aac.
Support for encoding AAC using 
media-video/libav's internal encoder.
+

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2019-11-15 Thread Ian Whyman
commit: a9402dcb1e2bbc0f90b3f996780a205820cca7f3
Author: Ian Whyman  gentoo  org>
AuthorDate: Fri Nov 15 20:50:01 2019 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Fri Nov 15 20:50:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9402dcb

media-video/handbrake: 1.3.0 Bump

Closes: https://bugs.gentoo.org/698970
Closes: https://bugs.gentoo.org/700098
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Ian Whyman  gentoo.org>

 media-video/handbrake/Manifest  | 1 +
 media-video/handbrake/{handbrake-.ebuild => handbrake-1.3.0.ebuild} | 2 ++
 media-video/handbrake/handbrake-.ebuild | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 704911517b5..39ca8d3e610 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1 +1,2 @@
 DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 
75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e
 SHA512 
434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c
+DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 
2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4
 SHA512 
40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-1.3.0.ebuild
similarity index 98%
copy from media-video/handbrake/handbrake-.ebuild
copy to media-video/handbrake/handbrake-1.3.0.ebuild
index f75730cee0d..13e3bf9a6ad 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-1.3.0.ebuild
@@ -31,9 +31,11 @@ RDEPEND="
app-arch/xz-utils
media-libs/speex
dev-libs/jansson
+   dev-libs/libxml2
media-libs/a52dec
media-libs/libass:=
>=media-libs/libbluray-1.0
+   >=media-libs/dav1d-0.5.1
media-libs/libdvdnav
media-libs/libdvdread:=
media-libs/libsamplerate

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index f75730cee0d..13e3bf9a6ad 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -31,9 +31,11 @@ RDEPEND="
app-arch/xz-utils
media-libs/speex
dev-libs/jansson
+   dev-libs/libxml2
media-libs/a52dec
media-libs/libass:=
>=media-libs/libbluray-1.0
+   >=media-libs/dav1d-0.5.1
media-libs/libdvdnav
media-libs/libdvdread:=
media-libs/libsamplerate



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/, media-video/handbrake/files/

2019-11-08 Thread Ian Whyman
commit: a8cd5bdcf4af8346c1af8c6e85d19b3959f6b7e9
Author: Ian Whyman  gentoo  org>
AuthorDate: Fri Nov  8 21:57:55 2019 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Fri Nov  8 21:58:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cd5bdc

media-video/handbrake: Tidy old, fix git ebuild

Bug: https://bugs.gentoo.org/698970
Closes: https://bugs.gentoo.org/625866
Closes: https://bugs.gentoo.org/698214
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Ian Whyman  gentoo.org>

 media-video/handbrake/Manifest |   3 -
 .../handbrake/files/handbrake-1.1.0-nolibav.patch  | 235 -
 .../files/handbrake--libdl-link.patch  |  13 ++
 media-video/handbrake/handbrake-1.1.0-r1.ebuild| 158 --
 media-video/handbrake/handbrake-1.1.1.ebuild   | 158 --
 media-video/handbrake/handbrake-1.1.2.ebuild   | 158 --
 media-video/handbrake/handbrake-.ebuild|  45 ++--
 7 files changed, 41 insertions(+), 729 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 6a06e9b1e7d..704911517b5 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,4 +1 @@
-DIST handbrake-1.1.0.tar.bz2 15262590 BLAKE2B 
b2f892c57cd562124460ac2846949bd0ce05eff0b87fbd733d7102eeda9455f57997fb0bbd72d991d0f2d8ab3f02e6f82d88a0449158c3a947595f50198eb4bd
 SHA512 
48cbbc57e93e74a8aa3d224311f5d97905061e103c3ecb07aa5e09d8f401687679cac0e8952e146fea0fad5d00e6c26fe90159c11e87b8b413469abbe900edc3
-DIST handbrake-1.1.1.tar.bz2 15319551 BLAKE2B 
d0569a796f3838f5696e3dcfed348a5111e063841cb594bbce7283568cdf868e6b751f3cd6086ebc83af5f2d6ad9e238717425f953677cca9e2908a9c0301aa9
 SHA512 
990035a5f850fafbc68c77dd61d7f7371c3eda2cc6e6ceb377f111c9016713523cf1685f519926ae8859446c99392c64b7ce91d72f9b5f9643a35a3d0326eef4
-DIST handbrake-1.1.2.tar.bz2 15291003 BLAKE2B 
b502ba18139c3332b8614e831005b4a846c0fab9a31bce2c9f3481d6d41ba3f087ded30adb6bd58220b14002f230fb920db1cc45ec7baee4fda573148fddfc8e
 SHA512 
360f7fe3e4571bb623f54a00e9478a78d655448ffb1b8d72b7d32636a230f2ae4dabbfe803f6f9491537064ea4f6e238700b3d29912ae34383fbb1922e18e9b8
 DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 
75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e
 SHA512 
434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c

diff --git a/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch 
b/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch
deleted file mode 100644
index bb7e17bdde5..000
--- a/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-From 9e1f245708a157231c427c0ef9b91729d59a30e1 Mon Sep 17 00:00:00 2001
-From: John Stebbins 
-Date: Tue, 28 Nov 2017 08:22:54 -0800
-Subject: [PATCH] add sdtp (sample dependency) box to mp4 (#1006)
-
-* add sdtp (sample dependency) box to mp4
-
-The AppleTV 4K requires this box in order to play 2160p60 video.

- contrib/ffmpeg/A21-mp4-sdtp.patch | 126 ++
- libhb/encavcodec.c|   8 ++-
- libhb/encx264.c   |   7 +--
- libhb/encx265.c   |   3 +
- libhb/muxavformat.c   |   4 ++
- 5 files changed, 140 insertions(+), 8 deletions(-)
- create mode 100644 contrib/ffmpeg/A21-mp4-sdtp.patch
-
-diff --git a/contrib/ffmpeg/A21-mp4-sdtp.patch 
b/contrib/ffmpeg/A21-mp4-sdtp.patch
-new file mode 100644
-index 0..5d2221c47
 /dev/null
-+++ b/contrib/ffmpeg/A21-mp4-sdtp.patch
-@@ -0,0 +1,126 @@
-+From c2204c579c8411771b53a4bc66324c7c5d07698a Mon Sep 17 00:00:00 2001
-+From: John Stebbins 
-+Date: Thu, 16 Nov 2017 14:40:12 -0800
-+Subject: [PATCH] movenc: add sdtp (sample dependency) box to mp4
-+
-+The AppleTV 4K requires this box in order to play 2160p60 video.
-+---
-+ libavcodec/avcodec.h |  9 +++--
-+ libavformat/movenc.c | 34 +-
-+ libavformat/movenc.h |  6 ++
-+ 3 files changed, 46 insertions(+), 3 deletions(-)
-+
-+diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
-+index 5624835023..48e9d23679 100644
-+--- a/libavcodec/avcodec.h
- b/libavcodec/avcodec.h
-+@@ -1161,8 +1161,13 @@ typedef struct AVPacket {
-+ int64_t convergence_duration;
-+ #endif
-+ } AVPacket;
-+-#define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe
-+-#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
-++#define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe
-++#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
-++/**
-++ * Flag is used to indicate packets that contain frames that can
-++ * be discarded by the decoder.  I.e. Non-reference frames.
-++ */
-++#define AV_PKT_FLAG_DISPOSABLE  0x0004
-+ 
-+ enum AVSideDataParamChangeFlags {

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2019-03-12 Thread Ian Whyman
commit: 398a8e5b8ee3b29ea8954e2fdc3406390cfe9950
Author: Ian Whyman  gentoo  org>
AuthorDate: Tue Mar 12 21:54:43 2019 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Tue Mar 12 21:54:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=398a8e5b

media-video/handbrake: Drop VAAPI flag

Add message that our builds are not supported by upstream

Closes: https://bugs.gentoo.org/625822
Closes: https://bugs.gentoo.org/679964
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Ian Whyman  gentoo.org>

 .../{handbrake-1.2.2-r1.ebuild => handbrake-1.2.2-r2.ebuild}  | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.2.2-r1.ebuild 
b/media-video/handbrake/handbrake-1.2.2-r2.ebuild
similarity index 91%
rename from media-video/handbrake/handbrake-1.2.2-r1.ebuild
rename to media-video/handbrake/handbrake-1.2.2-r2.ebuild
index 4d4a09eb378..d780a55c6e2 100644
--- a/media-video/handbrake/handbrake-1.2.2-r1.ebuild
+++ b/media-video/handbrake/handbrake-1.2.2-r2.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/";
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac nvenc x265 vaapi"
+IUSE="+fdk gstreamer gtk libav libav-aac nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -124,7 +124,6 @@ src_configure() {
$(use_enable gtk) \
$(usex !gstreamer --disable-gst) \
$(use_enable nvenc) \
-   $(use_enable vaapi qsv) \
$(use_enable x265) || die "Configure failed."
 }
 
@@ -145,10 +144,14 @@ src_install() {
 }
 
 pkg_postinst() {
-   einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+   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 ""
einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
fi
 



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/, media-video/handbrake/files/

2019-03-10 Thread Ian Whyman
commit: 2a16187c2c99bd6900494d5e8c7d3dd9ccb67672
Author: Ian Whyman  gentoo  org>
AuthorDate: Sun Mar 10 17:34:32 2019 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sun Mar 10 17:34:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a16187c

media-video/handbrake: Fix nvenc build failure

Backport patch from upstream to allow enable/disable nvenc, qsv encoding

Closes: https://bugs.gentoo.org/679840
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Ian Whyman  gentoo.org>

 ...ndbrake-1.2.2-backport-hardware-configure.patch | 88 ++
 ...rake-1.2.2.ebuild => handbrake-1.2.2-r1.ebuild} |  8 +-
 media-video/handbrake/metadata.xml |  1 +
 3 files changed, 96 insertions(+), 1 deletion(-)

diff --git 
a/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch 
b/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch
new file mode 100644
index 000..0618c9004e9
--- /dev/null
+++ 
b/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch
@@ -0,0 +1,88 @@
+From c7119499f5a2da7e5be0afd50a6757778fed53e7 Mon Sep 17 00:00:00 2001
+From: Bradley Sepos 
+Date: Sat, 23 Feb 2019 11:44:34 -0500
+Subject: [PATCH] configure: Enable hardware encoders by default on suitable
+ platforms.
+
+Print special encoders status at end of configure output, minor cosmetics.
+---
+ make/configure.py | 46 +-
+ 1 file changed, 29 insertions(+), 17 deletions(-)
+
+diff --git a/make/configure.py b/make/configure.py
+index c8bc712fe5..e673c9c5a0 100644
+--- a/make/configure.py
 b/make/configure.py
+@@ -1298,36 +1298,37 @@ def createCLI():
+ grp.add_option( '--disable-gtk', default=False, action='store_true', 
help=h )
+ 
+ h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', 
'*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
+-
+ grp.add_option( '--disable-gtk-update-checks', default=False, 
action='store_true', help=h )
+ 
+ h = IfHost( 'enable GTK GUI (mingw)', '*-*-mingw*', 
none=optparse.SUPPRESS_HELP ).value
+ grp.add_option( '--enable-gtk-mingw', default=False, action='store_true', 
help=h )
+ 
+ h = IfHost( 'disable GStreamer (live preview)', '*-*-linux*', 
'*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
+-
+ grp.add_option( '--disable-gst', default=False, action='store_true', 
help=h )
+ 
+-h = IfHost( 'enable Intel Quick Sync Video (QSV) hardware acceleration. 
(Windows and Linux only)', '*-*-linux*', '*-*-mingw*', 
none=optparse.SUPPRESS_HELP ).value
+-grp.add_option( '--enable-qsv', default=False, action='store_true', 
help=h )
++h = IfHost( 'Intel Quick Sync Video (QSV) hardware acceleration (Windows 
and Linux only)', '*-*-linux*', '*-*-mingw*', none=optparse.SUPPRESS_HELP 
).value
++grp.add_option( '--enable-qsv', dest="enable_qsv", default=host.match( 
'*-*-mingw*' ), action='store_true', help=(( 'enable %s' %h ) if h != 
optparse.SUPPRESS_HELP else h) )
++grp.add_option( '--disable-qsv', dest="enable_qsv", action='store_false', 
help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
+ 
+-h = IfHost( 'enable AMD VCE hardware acceleration. (Windows only)', 
'*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
+-grp.add_option( '--enable-vce', default=False, action='store_true', 
help=h )
++h = IfHost( 'AMD VCE hardware acceleration (Windows only)', '*-*-mingw*', 
none=optparse.SUPPRESS_HELP ).value
++grp.add_option( '--enable-vce', dest="enable_vce", default=host.match( 
'*-*-mingw*' ), action='store_true', help=(( 'enable %s' %h ) if h != 
optparse.SUPPRESS_HELP else h) )
++grp.add_option( '--disable-vce', dest="enable_vce", action='store_false', 
help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) )
+ 
+-h = IfHost( 'enable x265 video encoder', '*-*-*', 
none=optparse.SUPPRESS_HELP ).value
+-grp.add_option( '--enable-x265', dest="enable_x265", default=True, 
action='store_true', help=h )
+-grp.add_option( '--disable-x265', dest="enable_x265", 
action='store_false' )
++h = IfHost( 'x265 video encoder', '*-*-*', none=optparse.SUPPRESS_HELP 
).value
++grp.add_option( '--enable-x265', dest="enable_x265", default=True, 
action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP 
else h) )
++grp.add_option( '--disable-x265', dest="enable_x265", 
action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP 
else h) )
+ 
+-h = IfHost( 'enable FDK AAC audio encoder', '*-*-*', 
none=optparse.SUPPRESS_HELP ).value
+-grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=False, 
action='store_true', help=h )
+-grp.add_option( '--disable-fdk-aac', dest="enable_fdk_aac", 
action='store_false' )
++h = IfHost( 'FDK AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP 
).value
++grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", def

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2019-03-09 Thread Ian Whyman
commit: 57ee32503ffbb7f20f8d1b1ce25d35585a0fb23e
Author: Ian Whyman  gentoo  org>
AuthorDate: Sat Mar  9 10:33:16 2019 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sat Mar  9 10:33:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ee3250

media-video/handbrake: v1.2.2 Bump

Closes: https://bugs.gentoo.org/675216
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Ian Whyman  gentoo.org>

 media-video/handbrake/Manifest   |   1 +
 media-video/handbrake/handbrake-1.2.2.ebuild | 160 +++
 2 files changed, 161 insertions(+)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 746c12fa747..6a06e9b1e7d 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,3 +1,4 @@
 DIST handbrake-1.1.0.tar.bz2 15262590 BLAKE2B 
b2f892c57cd562124460ac2846949bd0ce05eff0b87fbd733d7102eeda9455f57997fb0bbd72d991d0f2d8ab3f02e6f82d88a0449158c3a947595f50198eb4bd
 SHA512 
48cbbc57e93e74a8aa3d224311f5d97905061e103c3ecb07aa5e09d8f401687679cac0e8952e146fea0fad5d00e6c26fe90159c11e87b8b413469abbe900edc3
 DIST handbrake-1.1.1.tar.bz2 15319551 BLAKE2B 
d0569a796f3838f5696e3dcfed348a5111e063841cb594bbce7283568cdf868e6b751f3cd6086ebc83af5f2d6ad9e238717425f953677cca9e2908a9c0301aa9
 SHA512 
990035a5f850fafbc68c77dd61d7f7371c3eda2cc6e6ceb377f111c9016713523cf1685f519926ae8859446c99392c64b7ce91d72f9b5f9643a35a3d0326eef4
 DIST handbrake-1.1.2.tar.bz2 15291003 BLAKE2B 
b502ba18139c3332b8614e831005b4a846c0fab9a31bce2c9f3481d6d41ba3f087ded30adb6bd58220b14002f230fb920db1cc45ec7baee4fda573148fddfc8e
 SHA512 
360f7fe3e4571bb623f54a00e9478a78d655448ffb1b8d72b7d32636a230f2ae4dabbfe803f6f9491537064ea4f6e238700b3d29912ae34383fbb1922e18e9b8
+DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 
75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e
 SHA512 
434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c

diff --git a/media-video/handbrake/handbrake-1.2.2.ebuild 
b/media-video/handbrake/handbrake-1.2.2.ebuild
new file mode 100644
index 000..b4c350e8909
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.2.2.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
+   inherit git-r3
+   KEYWORDS=""
+else
+   MY_P="HandBrake-${PV}"
+   SRC_URI="https://download2.handbrake.fr/${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="http://handbrake.fr/";
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav libav-aac x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+   app-arch/xz-utils
+   media-libs/speex
+   dev-libs/jansson
+   media-libs/a52dec
+   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
+   media-libs/opus
+   media-libs/x264:=
+   media-sound/lame
+   sys-libs/zlib
+   libav? ( >=media-video/libav-12.2:0=[fdk?] )
+   !libav? ( >=media-video/ffmpeg-4.1:0=[fdk?] )
+   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
+   )
+   gtk? (
+   >=x11-libs/gtk+-3.10
+   dev-libs/dbus-glib
+   dev-libs/glib:2
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2
+   x11-libs/libnotify
+   x11-libs/pango
+   virtual/libgudev:=
+   )
+   fdk? ( media-libs/fdk-aac )
+   x265? ( >=media-libs/x265-2.9:0= )
+   "
+
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   dev-lang/yasm
+   dev-util/intltool
+   sys-devel/automake"
+
+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}--remove-dvdnav-dup.patch"
+
+   # Remove faac dependency; TODO: figure out if we need to do this at all.
+   "${FILESDIR}/${PN}--remove-faac-dependency.patch"
+
+   # Fix mi

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/

2019-03-03 Thread Aaron Bauman
commit: b1f81c470cb6e81ded3f8acc6a21fbd913678e73
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Mar  2 11:58:15 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Mar  4 03:11:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f81c47

media-video/handbrake: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11212
Signed-off-by: Aaron Bauman  gentoo.org>

 .../handbrake/files/handbrake-0.10.3-nolibav.patch | 76 --
 1 file changed, 76 deletions(-)

diff --git a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch 
b/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch
deleted file mode 100644
index 8539186aaa5..000
--- a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 75549414927212d4d1666730133805b33447de79 Mon Sep 17 00:00:00 2001
-From: John Stebbins 
-Date: Tue, 3 Nov 2015 10:16:01 -0800
-Subject: [PATCH] muxavformat: add support for mp4 fallback audio signalling
-

-diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
-index 0d70597..373c2ab 100644
 a/libhb/muxavformat.c
-+++ b/libhb/muxavformat.c
-@@ -121,7 +121,7 @@ static int avformatInit( hb_mux_object_t * m )
- hb_mux_data_t * track;
- int meta_mux;
- int max_tracks;
--int ii, ret;
-+int ii, jj, ret;
- 
- int clock_min, clock_max, clock;
- hb_video_framerate_get_limits(&clock_min, &clock_max, &clock);
-@@ -589,6 +589,56 @@ static int avformatInit( hb_mux_object_t * m )
- }
- }
- 
-+// Check for audio track associations
-+for (ii = 0; ii < hb_list_count(job->list_audio); ii++)
-+{
-+audio = hb_list_item(job->list_audio, ii);
-+switch (audio->config.out.codec & HB_ACODEC_MASK)
-+{
-+case HB_ACODEC_FFAAC:
-+case HB_ACODEC_CA_AAC:
-+case HB_ACODEC_CA_HAAC:
-+case HB_ACODEC_FDK_AAC:
-+case HB_ACODEC_FDK_HAAC:
-+break;
-+
-+default:
-+{
-+// Mark associated fallback audio tracks for any non-aac track
-+for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ )
-+{
-+hb_audio_t* fallback;
-+int codec;
-+
-+if (ii == jj) continue;
-+
-+fallback = hb_list_item( job->list_audio, jj );
-+codec = fallback->config.out.codec & HB_ACODEC_MASK;
-+if (fallback->config.in.track == audio->config.in.track &&
-+(codec == HB_ACODEC_FFAAC ||
-+ codec == HB_ACODEC_CA_AAC ||
-+ codec == HB_ACODEC_CA_HAAC ||
-+ codec == HB_ACODEC_FDK_AAC ||
-+ codec == HB_ACODEC_FDK_HAAC))
-+{
-+hb_mux_data_t * fallback_track;
-+int   * sd;
-+
-+track = audio->priv.mux_data;
-+fallback_track = fallback->priv.mux_data;
-+sd = (int*)av_stream_new_side_data(track->st,
-+ 
AV_PKT_DATA_FALLBACK_TRACK,
-+ sizeof(int));
-+if (sd != NULL)
-+{
-+*sd = fallback_track->st->index;
-+}
-+}
-+}
-+} break;
-+}
-+}
-+
- char * subidx_fmt =
- "size: %dx%d\n"
- "org: %d, %d\n"



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2018-10-25 Thread Ian Whyman
commit: 1340cf0c06d0b471a45d586aae1b6800166dd502
Author: Ian Whyman  gentoo  org>
AuthorDate: Thu Oct 25 18:34:25 2018 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Thu Oct 25 18:34:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1340cf0c

media-video/handbrake: bump

Signed-off-by: Ian Whyman  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/handbrake/Manifest   |   1 +
 media-video/handbrake/handbrake-1.1.2.ebuild | 158 +++
 2 files changed, 159 insertions(+)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 9bd0e845dc8..746c12fa747 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,2 +1,3 @@
 DIST handbrake-1.1.0.tar.bz2 15262590 BLAKE2B 
b2f892c57cd562124460ac2846949bd0ce05eff0b87fbd733d7102eeda9455f57997fb0bbd72d991d0f2d8ab3f02e6f82d88a0449158c3a947595f50198eb4bd
 SHA512 
48cbbc57e93e74a8aa3d224311f5d97905061e103c3ecb07aa5e09d8f401687679cac0e8952e146fea0fad5d00e6c26fe90159c11e87b8b413469abbe900edc3
 DIST handbrake-1.1.1.tar.bz2 15319551 BLAKE2B 
d0569a796f3838f5696e3dcfed348a5111e063841cb594bbce7283568cdf868e6b751f3cd6086ebc83af5f2d6ad9e238717425f953677cca9e2908a9c0301aa9
 SHA512 
990035a5f850fafbc68c77dd61d7f7371c3eda2cc6e6ceb377f111c9016713523cf1685f519926ae8859446c99392c64b7ce91d72f9b5f9643a35a3d0326eef4
+DIST handbrake-1.1.2.tar.bz2 15291003 BLAKE2B 
b502ba18139c3332b8614e831005b4a846c0fab9a31bce2c9f3481d6d41ba3f087ded30adb6bd58220b14002f230fb920db1cc45ec7baee4fda573148fddfc8e
 SHA512 
360f7fe3e4571bb623f54a00e9478a78d655448ffb1b8d72b7d32636a230f2ae4dabbfe803f6f9491537064ea4f6e238700b3d29912ae34383fbb1922e18e9b8

diff --git a/media-video/handbrake/handbrake-1.1.2.ebuild 
b/media-video/handbrake/handbrake-1.1.2.ebuild
new file mode 100644
index 000..6e3559d14f9
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.1.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
+   inherit git-r3
+   KEYWORDS=""
+else
+   MY_P="HandBrake-${PV}"
+   SRC_URI="https://download2.handbrake.fr/${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="http://handbrake.fr/";
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav libav-aac x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+   dev-libs/jansson
+   media-libs/a52dec
+   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
+   media-libs/opus
+   media-libs/x264:=
+   media-sound/lame
+   sys-libs/zlib
+   libav? ( >=media-video/libav-12.2:0=[fdk?] )
+   !libav? ( >=media-video/ffmpeg-3.4:0=[fdk?] )
+   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
+   )
+   gtk? (
+   >=x11-libs/gtk+-3.10
+   dev-libs/dbus-glib
+   dev-libs/glib:2
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2
+   x11-libs/libnotify
+   x11-libs/pango
+   virtual/libgudev:=
+   )
+   fdk? ( media-libs/fdk-aac )
+   x265? ( >=media-libs/x265-1.7:0= )
+   "
+
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   dev-lang/yasm
+   dev-util/intltool
+   sys-devel/automake"
+
+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}--remove-dvdnav-dup.patch"
+
+   # Remove faac dependency; TODO: figure out if we need to do this at all.
+   "${FILESDIR}/${PN}--remove-faac-dependency.patch"
+
+   # Fix missing x265 link flag
+   "${FILESDIR}/${PN}--fix-missing-x265-link-flag.patch"
+)
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+}
+
+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
+
+   # Get rid 

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2018-07-29 Thread Ian Whyman
commit: f93a2a9cc092ab0254ce4edf54eb6b00bae56b6b
Author: Ian Whyman  gentoo  org>
AuthorDate: Sun Jul 29 08:41:37 2018 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sun Jul 29 08:41:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f93a2a9c

media-video/handbrake: Bump to 1.1.1, drop old

Fixes: https://bugs.gentoo.org/659470
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 media-video/handbrake/Manifest |   3 +-
 media-video/handbrake/handbrake-0.10.5-r2.ebuild   | 155 -
 ...ndbrake-1.0.7.ebuild => handbrake-1.1.1.ebuild} |  14 +-
 3 files changed, 9 insertions(+), 163 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 87e00f41991..9bd0e845dc8 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,3 +1,2 @@
-DIST handbrake-0.10.5.tar.bz2 10452839 BLAKE2B 
50dd8cc968fc7da262c9a17d4baa7b4093a33746a08afcb8980de539f947f1fd3607dc0d0c3824023d24abd4d430d5418e92d5e939f334e090c1fa192dfdb3ec
 SHA512 
30aa09f5bf2ceb45500f316aa2bc070f630dbe399c9be739f60fd73bbb97d52157498ba7a1e7d024f7fa5b75aa0154976df3c346abda43168c881b1ad0a858ea
-DIST handbrake-1.0.7.tar.bz2 12650549 BLAKE2B 
54fa6f4ee053de3ce1840695e66b0fef5ac09aed79f61755f146dbf990c624608e9acf2f81e69871ece85daf5a3f09780a75f43567c5b08afc55863495958ec7
 SHA512 
bacc5ff105893a0fdea95174839663e00027c87a13f00fb67d39c347b55e35869c0b998ec52181389b98cc2cc358d221e41d729e76952e4cb21fe8d12ee5a44a
 DIST handbrake-1.1.0.tar.bz2 15262590 BLAKE2B 
b2f892c57cd562124460ac2846949bd0ce05eff0b87fbd733d7102eeda9455f57997fb0bbd72d991d0f2d8ab3f02e6f82d88a0449158c3a947595f50198eb4bd
 SHA512 
48cbbc57e93e74a8aa3d224311f5d97905061e103c3ecb07aa5e09d8f401687679cac0e8952e146fea0fad5d00e6c26fe90159c11e87b8b413469abbe900edc3
+DIST handbrake-1.1.1.tar.bz2 15319551 BLAKE2B 
d0569a796f3838f5696e3dcfed348a5111e063841cb594bbce7283568cdf868e6b751f3cd6086ebc83af5f2d6ad9e238717425f953677cca9e2908a9c0301aa9
 SHA512 
990035a5f850fafbc68c77dd61d7f7371c3eda2cc6e6ceb377f111c9016713523cf1685f519926ae8859446c99392c64b7ce91d72f9b5f9643a35a3d0326eef4

diff --git a/media-video/handbrake/handbrake-0.10.5-r2.ebuild 
b/media-video/handbrake/handbrake-0.10.5-r2.ebuild
deleted file mode 100644
index 558ee7f48fc..000
--- a/media-video/handbrake/handbrake-0.10.5-r2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2-utils python-any-r1
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
-   inherit git-r3
-   KEYWORDS=""
-else
-   MY_P="HandBrake-${PV}"
-   SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> 
${P}.tar.bz2"
-   S="${WORKDIR}/${MY_P}"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder"
-HOMEPAGE="http://handbrake.fr/";
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-   dev-libs/jansson
-   media-libs/a52dec
-   media-libs/libass:=
-   media-libs/libbluray:=
-   media-libs/libdvdnav
-   media-libs/libdvdread
-   media-libs/libsamplerate
-   media-libs/libtheora
-   media-libs/libvorbis
-   media-libs/libvpx
-   media-libs/x264:=
-   media-sound/lame
-   sys-libs/zlib
-   libav? ( >=media-video/libav-12:0=[fdk?] )
-   !libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] )
-   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
-   )
-   gtk? (
-   >=x11-libs/gtk+-3.10
-   dev-libs/dbus-glib
-   dev-libs/glib:2
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf:2
-   x11-libs/libnotify
-   x11-libs/pango
-   virtual/libgudev:=
-   )
-   fdk? ( media-libs/fdk-aac )
-   x265? ( >=media-libs/x265-1.7:0= )
-   "
-
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   dev-lang/yasm
-   dev-util/intltool
-   sys-devel/automake"
-
-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}--remove-dvdnav-dup.patch"
-
-   # Remove faac dependency; TODO: figure out if we need to do this at all.
-   "${FILESDIR}/${PN}--remove-faac-dependency.patch"
-
-   # Fix missing x265 link flag
-

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2018-05-05 Thread Ian Whyman
commit: 7d9e2ecbba97b1e1db4b7238c2c1d106a6eb0388
Author: Ian Whyman  gentoo  org>
AuthorDate: Sat May  5 13:29:49 2018 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sat May  5 13:30:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9e2ecb

media-video/handbrake: Bump ffmpeg/libav deps.

Update live ebuild with changes from 1.1.0.

Closes: https://bugs.gentoo.org/653932
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 .../{handbrake-1.1.0.ebuild => handbrake-1.1.0-r1.ebuild}  |  4 ++--
 media-video/handbrake/handbrake-.ebuild| 14 --
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/media-video/handbrake/handbrake-1.1.0.ebuild 
b/media-video/handbrake/handbrake-1.1.0-r1.ebuild
similarity index 97%
rename from media-video/handbrake/handbrake-1.1.0.ebuild
rename to media-video/handbrake/handbrake-1.1.0-r1.ebuild
index e5423a88492..cd52cd8ded2 100644
--- a/media-video/handbrake/handbrake-1.1.0.ebuild
+++ b/media-video/handbrake/handbrake-1.1.0-r1.ebuild
@@ -42,8 +42,8 @@ RDEPEND="
media-libs/x264:=
media-sound/lame
sys-libs/zlib
-   libav? ( >=media-video/libav-10.1:0=[fdk?] )
-   !libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] )
+   libav? ( >=media-video/libav-12.2:0=[fdk?] )
+   !libav? ( >=media-video/ffmpeg-3.4:0=[fdk?] )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 0ce63641f6e..2ba4dd148d2 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils gnome2-utils python-any-r1
+inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
 
 if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
@@ -13,7 +13,7 @@ if [[ ${PV} = ** ]]; then
KEYWORDS=""
 else
MY_P="HandBrake-${PV}"
-   SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> 
${P}.tar.bz2"
+   SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> 
${P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
KEYWORDS="~amd64 ~x86"
 fi
@@ -42,8 +42,8 @@ RDEPEND="
media-libs/x264:=
media-sound/lame
sys-libs/zlib
-   libav? ( >=media-video/libav-10.1:0=[fdk?] )
-   !libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] )
+   libav? ( >=media-video/libav-12.3:0=[fdk?] )
+   !libav? ( >=media-video/ffmpeg-3.4:0=[fdk?] )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -99,7 +99,7 @@ src_prepare() {
default
 
# Get rid of libav specific code when using ffmpeg
-   use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+   use libav || eapply -R "${FILESDIR}/${PN}-1.1.0-nolibav.patch"
 
cd "${S}/gtk"
# Don't run autogen.sh.
@@ -145,6 +145,7 @@ pkg_postinst() {
fi
 
gnome2_icon_cache_update
+   xdg_desktop_database_update
 }
 
 pkg_preinst() {
@@ -153,4 +154,5 @@ pkg_preinst() {
 
 pkg_postrm() {
gnome2_icon_cache_update
+   xdg_desktop_database_update
 }



[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/files/, media-video/handbrake/

2018-04-20 Thread Ian Whyman
commit: 5af06626ddac2bdc28d9eeb557a231c0e1ff1b81
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Apr 19 08:26:19 2018 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Fri Apr 20 19:11:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af06626

media-video/handbrake: Fixed build with USE="-libav".

Also add xdg_desktop_database_update calls.

Closes: https://bugs.gentoo.org/653254
Package-Manager: Portage-2.3.30, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8065

 .../handbrake/files/handbrake-1.1.0-nolibav.patch  | 235 +
 media-video/handbrake/handbrake-1.1.0.ebuild   |   6 +-
 2 files changed, 239 insertions(+), 2 deletions(-)

diff --git a/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch 
b/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch
new file mode 100644
index 000..bb7e17bdde5
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.1.0-nolibav.patch
@@ -0,0 +1,235 @@
+From 9e1f245708a157231c427c0ef9b91729d59a30e1 Mon Sep 17 00:00:00 2001
+From: John Stebbins 
+Date: Tue, 28 Nov 2017 08:22:54 -0800
+Subject: [PATCH] add sdtp (sample dependency) box to mp4 (#1006)
+
+* add sdtp (sample dependency) box to mp4
+
+The AppleTV 4K requires this box in order to play 2160p60 video.
+---
+ contrib/ffmpeg/A21-mp4-sdtp.patch | 126 ++
+ libhb/encavcodec.c|   8 ++-
+ libhb/encx264.c   |   7 +--
+ libhb/encx265.c   |   3 +
+ libhb/muxavformat.c   |   4 ++
+ 5 files changed, 140 insertions(+), 8 deletions(-)
+ create mode 100644 contrib/ffmpeg/A21-mp4-sdtp.patch
+
+diff --git a/contrib/ffmpeg/A21-mp4-sdtp.patch 
b/contrib/ffmpeg/A21-mp4-sdtp.patch
+new file mode 100644
+index 0..5d2221c47
+--- /dev/null
 b/contrib/ffmpeg/A21-mp4-sdtp.patch
+@@ -0,0 +1,126 @@
++From c2204c579c8411771b53a4bc66324c7c5d07698a Mon Sep 17 00:00:00 2001
++From: John Stebbins 
++Date: Thu, 16 Nov 2017 14:40:12 -0800
++Subject: [PATCH] movenc: add sdtp (sample dependency) box to mp4
++
++The AppleTV 4K requires this box in order to play 2160p60 video.
++---
++ libavcodec/avcodec.h |  9 +++--
++ libavformat/movenc.c | 34 +-
++ libavformat/movenc.h |  6 ++
++ 3 files changed, 46 insertions(+), 3 deletions(-)
++
++diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
++index 5624835023..48e9d23679 100644
++--- a/libavcodec/avcodec.h
+ b/libavcodec/avcodec.h
++@@ -1161,8 +1161,13 @@ typedef struct AVPacket {
++ int64_t convergence_duration;
++ #endif
++ } AVPacket;
++-#define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe
++-#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
+++#define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe
+++#define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted
+++/**
+++ * Flag is used to indicate packets that contain frames that can
+++ * be discarded by the decoder.  I.e. Non-reference frames.
+++ */
+++#define AV_PKT_FLAG_DISPOSABLE  0x0004
++ 
++ enum AVSideDataParamChangeFlags {
++ AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT  = 0x0001,
++diff --git a/libavformat/movenc.c b/libavformat/movenc.c
++index a546fdfead..d263f444f4 100644
++--- a/libavformat/movenc.c
+ b/libavformat/movenc.c
++@@ -227,6 +227,30 @@ static int mov_write_stss_tag(AVIOContext *pb, MOVTrack 
*track, uint32_t flag)
++ return update_size(pb, pos);
++ }
++ 
+++/* Sample dependency atom */
+++static int mov_write_sdtp_tag(AVIOContext *pb, MOVTrack *track)
+++{
+++int i;
+++uint8_t leading, dependent, reference, redundancy;
+++int64_t pos = avio_tell(pb);
+++avio_wb32(pb, 0); // size
+++ffio_wfourcc(pb, "sdtp");
+++avio_wb32(pb, 0); // version & flags
+++for (i = 0; i < track->entry; i++) {
+++dependent = MOV_SAMPLE_DEPENDENCY_YES;
+++leading = reference = redundancy = MOV_SAMPLE_DEPENDENCY_UNKNOWN;
+++if (track->cluster[i].flags & MOV_DISPOSABLE_SAMPLE) {
+++reference = MOV_SAMPLE_DEPENDENCY_NO;
+++}
+++if (track->cluster[i].flags & MOV_SYNC_SAMPLE) {
+++dependent = MOV_SAMPLE_DEPENDENCY_NO;
+++}
+++avio_w8(pb, (leading << 6)   | (dependent << 4) |
+++(reference << 2) | redundancy);
+++}
+++return update_size(pb, pos);
+++}
+++
++ static int mov_write_amr_tag(AVIOContext *pb, MOVTrack *track)
++ {
++ avio_wb32(pb, 0x11); /* size */
++@@ -1211,8 +1235,12 @@ static int mov_write_stbl_tag(AVFormatContext *s, 
AVIOContext *pb, MOVTrack *tra
++ mov_write_stts_tag(pb, track);
++ if ((track->par->codec_type == AVMEDIA_TYPE_VIDEO ||
++  track->par->codec_tag == MKTAG('r','t','p',' ')) &&
++-track->has_keyframes && track->has_keyframes < track->entry)
+++track->has_keyframes && track->has_keyframes < track->entry) {
++ mov_

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/

2018-04-15 Thread Ian Whyman
commit: a21532d8740f8b7124574c4249b0f2291d15eb2a
Author: Ian Whyman  gentoo  org>
AuthorDate: Sun Apr 15 14:16:06 2018 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sun Apr 15 14:16:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a21532d8

media-video/handbrake: Version bump

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-video/handbrake/Manifest| 2 +-
 .../handbrake/{handbrake-1.0.3.ebuild => handbrake-1.1.0.ebuild}  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 35ec1d93018..87e00f41991 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,3 +1,3 @@
 DIST handbrake-0.10.5.tar.bz2 10452839 BLAKE2B 
50dd8cc968fc7da262c9a17d4baa7b4093a33746a08afcb8980de539f947f1fd3607dc0d0c3824023d24abd4d430d5418e92d5e939f334e090c1fa192dfdb3ec
 SHA512 
30aa09f5bf2ceb45500f316aa2bc070f630dbe399c9be739f60fd73bbb97d52157498ba7a1e7d024f7fa5b75aa0154976df3c346abda43168c881b1ad0a858ea
-DIST handbrake-1.0.3.tar.bz2 12600683 BLAKE2B 
0e21b84b179acb5c389493847803292076bfc65b2edf30aa303f0ea1bbdb349a6dc02f5182d7f204c30f1eaceaea1be7b396f5661ad49a9b1bde35b741ef8482
 SHA512 
2d3dac2e29520f1d51cbca35385f775b5deed823c7cffd6beba0589f124ff99a120bf0db261efae1524c1c2d373789fc0b3e5784664e4aa6eebff372e928b6a2
 DIST handbrake-1.0.7.tar.bz2 12650549 BLAKE2B 
54fa6f4ee053de3ce1840695e66b0fef5ac09aed79f61755f146dbf990c624608e9acf2f81e69871ece85daf5a3f09780a75f43567c5b08afc55863495958ec7
 SHA512 
bacc5ff105893a0fdea95174839663e00027c87a13f00fb67d39c347b55e35869c0b998ec52181389b98cc2cc358d221e41d729e76952e4cb21fe8d12ee5a44a
+DIST handbrake-1.1.0.tar.bz2 15262590 BLAKE2B 
b2f892c57cd562124460ac2846949bd0ce05eff0b87fbd733d7102eeda9455f57997fb0bbd72d991d0f2d8ab3f02e6f82d88a0449158c3a947595f50198eb4bd
 SHA512 
48cbbc57e93e74a8aa3d224311f5d97905061e103c3ecb07aa5e09d8f401687679cac0e8952e146fea0fad5d00e6c26fe90159c11e87b8b413469abbe900edc3

diff --git a/media-video/handbrake/handbrake-1.0.3.ebuild 
b/media-video/handbrake/handbrake-1.1.0.ebuild
similarity index 96%
rename from media-video/handbrake/handbrake-1.0.3.ebuild
rename to media-video/handbrake/handbrake-1.1.0.ebuild
index 0ce63641f6e..4ea9a4d91e3 100644
--- a/media-video/handbrake/handbrake-1.0.3.ebuild
+++ b/media-video/handbrake/handbrake-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = ** ]]; then
KEYWORDS=""
 else
MY_P="HandBrake-${PV}"
-   SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> 
${P}.tar.bz2"
+   SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> 
${P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
KEYWORDS="~amd64 ~x86"
 fi



  1   2   >