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

[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;>
 
-   
-   tel...@posteo.de
-   James Beddek
-   
-   
-   Proxy Maintainers
-   proxy-ma...@gentoo.org
-   
+   

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/

[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/

[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/

[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/

[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

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

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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 << 

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

[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/

[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
-   

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

[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/

[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:=

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

[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/

[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/

[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/

[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/

[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/

[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."
 }
 
 

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

[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/

[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 

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

[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/

[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/

[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;>
 
-   
+   
+   tel...@posteo.de
+   James Beddek
+   
+   
+   Proxy Maintainers
+   proxy-ma...@gentoo.org
+   

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/

[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/

[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/

[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/

[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/

[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 

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

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/files/, media-video/handbrake/

[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=( 

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

[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/

[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"
+)
+

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

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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", 

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

[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 

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

[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(_min, _max, );
-@@ -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/

[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/

[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/

[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/

[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 && 

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

[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

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

[David Seifert]

commit: ef63b752628579c2accb308b039f3708ff91af68
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 26 12:23:13 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 26 23:09:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef63b752

media-video/handbrake: [QA] Consistent whitespace in metadata.xml

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

diff --git a/media-video/handbrake/metadata.xml 
b/media-video/handbrake/metadata.xml
index 1c5819c4e49..6f7dc3b848e 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -1,18 +1,18 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-thev00...@gentoo.org
-   Ian Whyman
-  
-  
-Open-source, GPL-licensed, multiplatform, multithreaded video transcoder.
-  
-  
-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 h265 using 
media-libs/x265.
-  
+   
+   thev00...@gentoo.org
+   Ian Whyman
+   
+   
+   Open-source, GPL-licensed, multiplatform, multithreaded video 
transcoder.
+   
+   
+   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 h265 using 
media-libs/x265.
+   
 

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

[Ian Whyman]

commit: dee83f8cd20c1a39c67293071b02db1af0fbf7ed
Author: Ian Whyman  gentoo  org>
AuthorDate: Fri May 12 21:21:58 2017 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Fri May 12 21:21:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee83f8c

media-video/handbrake: Version bump

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-video/handbrake/Manifest   |   1 +
 media-video/handbrake/handbrake-1.0.7.ebuild | 156 +++
 2 files changed, 157 insertions(+)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index e293909d623..53e8bf76b71 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,2 +1,3 @@
 DIST handbrake-0.10.5.tar.bz2 10452839 SHA256 
fb9230dd121b456f6829d1d25ac8bbf76e503b51c4efc70f0a7fd2bb8607e2f0 SHA512 
30aa09f5bf2ceb45500f316aa2bc070f630dbe399c9be739f60fd73bbb97d52157498ba7a1e7d024f7fa5b75aa0154976df3c346abda43168c881b1ad0a858ea
 WHIRLPOOL 
190923ade8b28685d9b2ae275ec0806b74235d3644715f90f3993b7d113e3b65c28caa5c839da507913f8a4cf63d0f89f1d2e77fca65e65308b6091003a9f1f9
 DIST handbrake-1.0.3.tar.bz2 12600683 SHA256 
591fb489edd6146136f0a92f895c2098365f612ad308d5ff9dc83223ad73ed27 SHA512 
2d3dac2e29520f1d51cbca35385f775b5deed823c7cffd6beba0589f124ff99a120bf0db261efae1524c1c2d373789fc0b3e5784664e4aa6eebff372e928b6a2
 WHIRLPOOL 
a16a124a9f2ab8761e2d4494580950f0559e44070829e1115c61b55ecf403fd32ca39be1d3ac2948735361520ee3f6d91919c3cfcff88c37e10f07c454b740c0
+DIST handbrake-1.0.7.tar.bz2 12650549 SHA256 
ffdee112f0288f0146b965107956cd718408406b75db71c44d2188f5296e677f SHA512 
bacc5ff105893a0fdea95174839663e00027c87a13f00fb67d39c347b55e35869c0b998ec52181389b98cc2cc358d221e41d729e76952e4cb21fe8d12ee5a44a
 WHIRLPOOL 
4243959f8d95885681aa61b5905855586ac773d2a7b4aceff280576f9a900bf601b3ade630bd87b228cc5f682d8b31987c26b453394796c74cc3c387bbe4fb5f

diff --git a/media-video/handbrake/handbrake-1.0.7.ebuild 
b/media-video/handbrake/handbrake-1.0.7.ebuild
new file mode 100644
index 000..0ce63641f6e
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.0.7.ebuild
@@ -0,0 +1,156 @@
+# 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-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-10.1: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
+   "${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,
+   

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

[Ian Whyman]

commit: ccbcab29b8332aad09bda93e219df73f1f129d79
Author: Ian Whyman  gentoo  org>
AuthorDate: Mon Mar  6 17:27:30 2017 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Mon Mar  6 17:27:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbcab29

media-video/handbrake: Add missing opus dep

Bug #611764

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/media-video/handbrake/handbrake-1.0.3.ebuild 
b/media-video/handbrake/handbrake-1.0.3.ebuild
index e58596bc42b..0ce63641f6e 100644
--- a/media-video/handbrake/handbrake-1.0.3.ebuild
+++ b/media-video/handbrake/handbrake-1.0.3.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
media-libs/libtheora
media-libs/libvorbis
media-libs/libvpx
+   media-libs/opus
media-libs/x264:=
media-sound/lame
sys-libs/zlib

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index e58596bc42b..0ce63641f6e 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
media-libs/libtheora
media-libs/libvorbis
media-libs/libvpx
+   media-libs/opus
media-libs/x264:=
media-sound/lame
sys-libs/zlib

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

[Alexis Ballier]

commit: b902a433b1c1cd463524e6597ab3efcf1d01cfe6
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Mar  4 13:29:11 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Mar  4 13:36:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b902a433

media-video/handbrake: Add := dep on libbluray

Package-Manager: Portage-2.3.4, Repoman-2.3.2

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

diff --git a/media-video/handbrake/handbrake-0.10.5-r2.ebuild 
b/media-video/handbrake/handbrake-0.10.5-r2.ebuild
index cb5ed2323ed..558ee7f48fc 100644
--- a/media-video/handbrake/handbrake-0.10.5-r2.ebuild
+++ b/media-video/handbrake/handbrake-0.10.5-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
dev-libs/jansson
media-libs/a52dec
media-libs/libass:=
-   media-libs/libbluray
+   media-libs/libbluray:=
media-libs/libdvdnav
media-libs/libdvdread
media-libs/libsamplerate

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index a205b992ba7..66810e2b078 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
dev-libs/jansson
media-libs/a52dec
media-libs/libass:=
-   media-libs/libbluray
+   media-libs/libbluray:=
media-libs/libdvdnav
media-libs/libdvdread
media-libs/libsamplerate

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

[Lars Wendler]

commit: 5a85eb8175cc0a2cc9d9131b9831d4f306bb029c
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jan  7 01:20:09 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jan  7 01:20:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a85eb81

media-video/handbrake: Added sub-slot dep for media-libs/libass.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/media-video/handbrake/handbrake-0.10.5-r2.ebuild 
b/media-video/handbrake/handbrake-0.10.5-r2.ebuild
index 93a0cb9..3a5fa1b 100644
--- a/media-video/handbrake/handbrake-0.10.5-r2.ebuild
+++ b/media-video/handbrake/handbrake-0.10.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,7 +31,7 @@ REQUIRED_USE="^^ ( fdk libav-aac )"
 RDEPEND="
dev-libs/jansson
media-libs/a52dec
-   media-libs/libass
+   media-libs/libass:=
media-libs/libbluray
media-libs/libdvdnav
media-libs/libdvdread

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index ec778dd..e86f0a3 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,7 +31,7 @@ REQUIRED_USE="^^ ( fdk libav-aac )"
 RDEPEND="
dev-libs/jansson
media-libs/a52dec
-   media-libs/libass
+   media-libs/libass:=
media-libs/libbluray
media-libs/libdvdnav
media-libs/libdvdread

[gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/, profiles/default/linux/

[Ian Whyman]

commit: 195d9aabd2533f585e75e7468223ac4232d02fa2
Author: Ian Whyman  gentoo  org>
AuthorDate: Sat Dec 31 16:59:15 2016 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sat Dec 31 17:00:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195d9aab

media-video/handbrake: Bump Libav dep

It doesnt build with less than v12, which is masked, so mask the flag too.

Gentoo-Bug: 578690

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../{handbrake-0.10.5-r1.ebuild => handbrake-0.10.5-r2.ebuild}| 2 +-
 profiles/default/linux/package.use.mask   | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/media-video/handbrake/handbrake-0.10.5-r1.ebuild 
b/media-video/handbrake/handbrake-0.10.5-r2.ebuild
similarity index 98%
rename from media-video/handbrake/handbrake-0.10.5-r1.ebuild
rename to media-video/handbrake/handbrake-0.10.5-r2.ebuild
index ec778dd..93a0cb9 100644
--- a/media-video/handbrake/handbrake-0.10.5-r1.ebuild
+++ b/media-video/handbrake/handbrake-0.10.5-r2.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
media-libs/x264:=
media-sound/lame
sys-libs/zlib
-   libav? ( >=media-video/libav-10.1:0=[fdk?] )
+   libav? ( >=media-video/libav-12:0=[fdk?] )
!libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] )
gstreamer? (
media-libs/gstreamer:1.0

diff --git a/profiles/default/linux/package.use.mask 
b/profiles/default/linux/package.use.mask
index 5117338..87078a5 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Ian Whyman  (31/12/2016)
+# Handbrake needs libav-12 which is masked.
+media-video/handbrake libav
+
 # Jason Zaman  (06 Sep 2015)
 # This is masked in base/package.use.mask as Linux only.
 sys-auth/consolekit -cgroups

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

[Lars Wendler]

commit: b87b98c4dfce262fcb4377c05bd143a869e4bc76
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Sep 27 20:26:13 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Sep 27 22:34:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b87b98c4

media-video/handbrake: Added sub-slot dependency on media-libs/x265

Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler  gentoo.org>

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

diff --git a/media-video/handbrake/handbrake-0.10.5-r1.ebuild 
b/media-video/handbrake/handbrake-0.10.5-r1.ebuild
index 0e9729e..ec778dd 100644
--- a/media-video/handbrake/handbrake-0.10.5-r1.ebuild
+++ b/media-video/handbrake/handbrake-0.10.5-r1.ebuild
@@ -65,7 +65,7 @@ RDEPEND="
virtual/libgudev:=
)
fdk? ( media-libs/fdk-aac )
-   x265? ( >=media-libs/x265-1.7 )
+   x265? ( >=media-libs/x265-1.7:0= )
"
 
 DEPEND="${RDEPEND}

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 0e9729e..ec778dd 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -65,7 +65,7 @@ RDEPEND="
virtual/libgudev:=
)
fdk? ( media-libs/fdk-aac )
-   x265? ( >=media-libs/x265-1.7 )
+   x265? ( >=media-libs/x265-1.7:0= )
"
 
 DEPEND="${RDEPEND}

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

[Ian Whyman]

commit: 7ecb42287bde31f327d37bad52f41023f26da33e
Author: Ian Whyman  gentoo  org>
AuthorDate: Sun Jul 10 14:04:30 2016 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sun Jul 10 14:06:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ecb4228

media-video/handbrake: ffmpeg needs fdk support too (#564228)

Package-Manager: portage-2.3.0

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

diff --git a/media-video/handbrake/handbrake-0.10.5.ebuild 
b/media-video/handbrake/handbrake-0.10.5-r1.ebuild
similarity index 97%
rename from media-video/handbrake/handbrake-0.10.5.ebuild
rename to media-video/handbrake/handbrake-0.10.5-r1.ebuild
index 0dc2756..0e9729e 100644
--- a/media-video/handbrake/handbrake-0.10.5.ebuild
+++ b/media-video/handbrake/handbrake-0.10.5-r1.ebuild
@@ -42,8 +42,8 @@ RDEPEND="
media-libs/x264:=
media-sound/lame
sys-libs/zlib
-   libav? ( >=media-video/libav-10.1:0= )
-   !libav? ( >=media-video/ffmpeg-2.3:0= )
+   libav? ( >=media-video/libav-10.1:0=[fdk?] )
+   !libav? ( >=media-video/ffmpeg-2.3: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 0dc2756..0e9729e 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -42,8 +42,8 @@ RDEPEND="
media-libs/x264:=
media-sound/lame
sys-libs/zlib
-   libav? ( >=media-video/libav-10.1:0= )
-   !libav? ( >=media-video/ffmpeg-2.3:0= )
+   libav? ( >=media-video/libav-10.1:0=[fdk?] )
+   !libav? ( >=media-video/ffmpeg-2.3: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/

[Ian Whyman]

commit: 8ce9a8aceb76a1946e913562bda238124d01279a
Author: Ian Whyman  gentoo  org>
AuthorDate: Sun May 22 11:27:56 2016 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sun May 22 11:27:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ce9a8ac

media-video/handbrake: Reintroduce nolibav patch to both versions

Package-Manager: portage-2.2.28

 media-video/handbrake/handbrake-0.10.5.ebuild | 3 +++
 media-video/handbrake/handbrake-.ebuild   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/media-video/handbrake/handbrake-0.10.5.ebuild 
b/media-video/handbrake/handbrake-0.10.5.ebuild
index fb77b01..0dc2756 100644
--- a/media-video/handbrake/handbrake-0.10.5.ebuild
+++ b/media-video/handbrake/handbrake-0.10.5.ebuild
@@ -98,6 +98,9 @@ src_prepare() {
 
default
 
+   # Get rid of libav specific code when using ffmpeg
+   use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+
cd "${S}/gtk"
# Don't run autogen.sh.
sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call 
failed"

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index fb77b01..0dc2756 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -98,6 +98,9 @@ src_prepare() {
 
default
 
+   # Get rid of libav specific code when using ffmpeg
+   use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+
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/

[Ian Whyman]

commit: 19eecc88aab7dc4f267afdaefb8bde487f4357e0
Author: Ian Whyman  gentoo  org>
AuthorDate: Sun May 22 11:19:06 2016 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sun May 22 11:19:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19eecc88

media-video/handbrake: Fix dupe postinst, remove old #571142

Package-Manager: portage-2.2.28

 media-video/handbrake/Manifest   |   1 -
 media-video/handbrake/handbrake-0.10.2-r1.ebuild | 152 ---
 media-video/handbrake/handbrake-0.10.5.ebuild|   9 +-
 media-video/handbrake/handbrake-.ebuild  |   6 +-
 media-video/handbrake/metadata.xml   |   2 +-
 5 files changed, 5 insertions(+), 165 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 82b86cf..734a9eb 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,2 +1 @@
-DIST handbrake-0.10.2.tar.bz2 10442635 SHA256 
4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699 SHA512 
7059a88fac1e4810c54880eb4afe58716af7ac81e5b098e34f3a68c19d7c03e51b57e1a196603e2c8d377e94bb3a910d20f1d9ed62d3eab6422031e62730d4a2
 WHIRLPOOL 
cd34833035e3fc866d7a69994717709fd7a808545f6cbaeda1447d6b528010b500f5ef0371b66d4b5c81c958d39d053178595fe32bc6236fdac7003cacd9f7d9
 DIST handbrake-0.10.5.tar.bz2 10452839 SHA256 
fb9230dd121b456f6829d1d25ac8bbf76e503b51c4efc70f0a7fd2bb8607e2f0 SHA512 
30aa09f5bf2ceb45500f316aa2bc070f630dbe399c9be739f60fd73bbb97d52157498ba7a1e7d024f7fa5b75aa0154976df3c346abda43168c881b1ad0a858ea
 WHIRLPOOL 
190923ade8b28685d9b2ae275ec0806b74235d3644715f90f3993b7d113e3b65c28caa5c839da507913f8a4cf63d0f89f1d2e77fca65e65308b6091003a9f1f9

diff --git a/media-video/handbrake/handbrake-0.10.2-r1.ebuild 
b/media-video/handbrake/handbrake-0.10.2-r1.ebuild
deleted file mode 100644
index adb5fc3..000
--- a/media-video/handbrake/handbrake-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-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
-   SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 
-> ${P}.tar.bz2"
-   S="${WORKDIR}/HandBrake-${PV}"
-   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-10.1:0= )
-   !libav? ( >=media-video/ffmpeg-2.3:0= )
-   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 )
-   "
-
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   dev-lang/yasm
-   dev-util/intltool
-   sys-devel/automake"
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   epatch_user
-
-   # Get rid of leftover bundled library build definitions,
-   sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-   "${S}"/make/include/main.defs \
-   || die "Contrib removal failed."
-
-   # Remove libdvdnav duplication and call it on the original instead.
-   # It may work this way; if not, we should try to mimic the duplication.
-   epatch "${FILESDIR}"/${PN}--remove-dvdnav-dup.patch
-
-   # Remove faac dependency; TODO: figure out if we need to do this at all.
-   epatch "${FILESDIR}"/${PN}--remove-faac-dependency.patch
-
-   # Fix missing x265 link flag
-   epatch "${FILESDIR}"/${PN}--fix-missing-x265-link-flag.patch
-
-   cd "${S}/gtk"
-   # Don't run autogen.sh.
-   

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

[Ian Stakenvicius]

commit: f171508e181b9592d40e9b0ed1a28affa45ab246
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Tue Apr 19 21:13:02 2016 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Tue Apr 19 21:13:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f171508e

media-video/handbrake: fix  references in metadata.xml

Package-Manager: portage-2.2.26

 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 f6ff75d..7669a95 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -12,7 +12,7 @@
 Support for the streaming media framework from 
media-libs/gstreamer.
 Support for Gimp ToolKit + from x11-libs/gtk+, 
requirement for a GUI-based HandBrake.
 Support for encoding AAC using 
media-libs/fdk-aac.
-Support for encoding AAC using 
media-libs/libav's internal encoder.
+Support for encoding AAC using 
media-video/libav's internal encoder.
Support for encoding h265 using 
media-libs/x265.
   
 

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

[Lars Wendler]

commit: f8de50bd63d121db795264672e2199e53f3f45d5
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 31 12:40:57 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 31 12:45:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8de50bd

media-video/handbrake: Bump to version 0.10.5 (bug #573350).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 media-video/handbrake/Manifest |   1 +
 .../handbrake/files/handbrake-0.10.3-nolibav.patch |  76 ++
 ...handbrake--fix-missing-x265-link-flag.patch |   4 +-
 .../files/handbrake--remove-dvdnav-dup.patch   |   4 +-
 media-video/handbrake/handbrake-0.10.5.ebuild  | 158 +
 5 files changed, 239 insertions(+), 4 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index bd42f75..82b86cf 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1 +1,2 @@
 DIST handbrake-0.10.2.tar.bz2 10442635 SHA256 
4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699 SHA512 
7059a88fac1e4810c54880eb4afe58716af7ac81e5b098e34f3a68c19d7c03e51b57e1a196603e2c8d377e94bb3a910d20f1d9ed62d3eab6422031e62730d4a2
 WHIRLPOOL 
cd34833035e3fc866d7a69994717709fd7a808545f6cbaeda1447d6b528010b500f5ef0371b66d4b5c81c958d39d053178595fe32bc6236fdac7003cacd9f7d9
+DIST handbrake-0.10.5.tar.bz2 10452839 SHA256 
fb9230dd121b456f6829d1d25ac8bbf76e503b51c4efc70f0a7fd2bb8607e2f0 SHA512 
30aa09f5bf2ceb45500f316aa2bc070f630dbe399c9be739f60fd73bbb97d52157498ba7a1e7d024f7fa5b75aa0154976df3c346abda43168c881b1ad0a858ea
 WHIRLPOOL 
190923ade8b28685d9b2ae275ec0806b74235d3644715f90f3993b7d113e3b65c28caa5c839da507913f8a4cf63d0f89f1d2e77fca65e65308b6091003a9f1f9

diff --git a/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch 
b/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch
new file mode 100644
index 000..8539186
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-0.10.3-nolibav.patch
@@ -0,0 +1,76 @@
+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(_min, _max, );
+@@ -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"

diff --git 

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

[Lars Wendler]

commit: 85cc36eb4685f8b8ed374c02020139a7a95ba241
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 31 12:44:46 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 31 12:45:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85cc36eb

media-video/handbrake: Bump live ebuild to EAPI-6.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 media-video/handbrake/handbrake-.ebuild | 33 -
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index adb5fc3..8fb14e6 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -13,8 +13,9 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
KEYWORDS=""
 else
-   SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 
-> ${P}.tar.bz2"
-   S="${WORKDIR}/HandBrake-${PV}"
+   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
 
@@ -73,27 +74,29 @@ DEPEND="${RDEPEND}
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() {
-   epatch_user
-
# Get rid of leftover bundled library build definitions,
sed -i 's:.*\(/contrib\|contrib/\).*::g' \
"${S}"/make/include/main.defs \
|| die "Contrib removal failed."
 
-   # Remove libdvdnav duplication and call it on the original instead.
-   # It may work this way; if not, we should try to mimic the duplication.
-   epatch "${FILESDIR}"/${PN}--remove-dvdnav-dup.patch
-
-   # Remove faac dependency; TODO: figure out if we need to do this at all.
-   epatch "${FILESDIR}"/${PN}--remove-faac-dependency.patch
-
-   # Fix missing x265 link flag
-   epatch "${FILESDIR}"/${PN}--fix-missing-x265-link-flag.patch
+   default
 
cd "${S}/gtk"
# Don't run autogen.sh.

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

[Alexis Ballier]

commit: b2957051516a55c62daa2b629e91c35ba075aebe
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun Oct 11 14:42:04 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Oct 11 14:42:25 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2957051

media-video/handbrake: Allow >= for x265 instead of = lock that would not even 
allow revision bumps.

Package-Manager: portage-2.2.23

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

diff --git a/media-video/handbrake/handbrake-0.10.2.ebuild 
b/media-video/handbrake/handbrake-0.10.2-r1.ebuild
similarity index 99%
rename from media-video/handbrake/handbrake-0.10.2.ebuild
rename to media-video/handbrake/handbrake-0.10.2-r1.ebuild
index d9c8308..adb5fc3 100644
--- a/media-video/handbrake/handbrake-0.10.2.ebuild
+++ b/media-video/handbrake/handbrake-0.10.2-r1.ebuild
@@ -64,7 +64,7 @@ RDEPEND="
virtual/libgudev:=
)
fdk? ( media-libs/fdk-aac )
-   x265? ( =media-libs/x265-1.7 )
+   x265? ( >=media-libs/x265-1.7 )
"
 
 DEPEND="${RDEPEND}

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index d9c8308..adb5fc3 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -64,7 +64,7 @@ RDEPEND="
virtual/libgudev:=
)
fdk? ( media-libs/fdk-aac )
-   x265? ( =media-libs/x265-1.7 )
+   x265? ( >=media-libs/x265-1.7 )
"
 
 DEPEND="${RDEPEND}

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

[Ian Whyman]

commit: 1c166beb0cb663a28db50b2af9b9ab063b602df1
Author: Ian Whyman thev00d00 AT gentoo DOT org
AuthorDate: Thu Aug 27 19:21:08 2015 +
Commit: Ian Whyman thev00d00 AT gentoo DOT org
CommitDate: Thu Aug 27 19:24:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c166beb

media-video/handbrake: Move live from SVN to git

Bug: 558764

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

diff --git a/media-video/handbrake/handbrake-0.10.2.ebuild 
b/media-video/handbrake/handbrake-0.10.2.ebuild
index 0653b7d..d9c8308 100644
--- a/media-video/handbrake/handbrake-0.10.2.ebuild
+++ b/media-video/handbrake/handbrake-0.10.2.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools eutils gnome2-utils python-any-r1
 
 if [[ ${PV} = ** ]]; then
-   ESVN_REPO_URI=svn://svn.handbrake.fr/HandBrake/trunk
-   inherit subversion
+   EGIT_REPO_URI=https://github.com/HandBrake/HandBrake.git;
+   inherit git-r3
KEYWORDS=
 else
SRC_URI=http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 
- ${P}.tar.bz2

diff --git a/media-video/handbrake/handbrake-.ebuild 
b/media-video/handbrake/handbrake-.ebuild
index 0653b7d..d9c8308 100644
--- a/media-video/handbrake/handbrake-.ebuild
+++ b/media-video/handbrake/handbrake-.ebuild
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools eutils gnome2-utils python-any-r1
 
 if [[ ${PV} = ** ]]; then
-   ESVN_REPO_URI=svn://svn.handbrake.fr/HandBrake/trunk
-   inherit subversion
+   EGIT_REPO_URI=https://github.com/HandBrake/HandBrake.git;
+   inherit git-r3
KEYWORDS=
 else
SRC_URI=http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 
- ${P}.tar.bz2

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

[Ian Whyman]

commit: b8f141afeb0e183298fe227672ac9338e0e8e12c
Author: Ian Whyman thev00d00 AT gentoo DOT org
AuthorDate: Sun Aug  9 12:30:22 2015 +
Commit: Ian Whyman thev00d00 AT gentoo DOT org
CommitDate: Sun Aug  9 13:43:25 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f141af

media-video/handbrake: Version Bump to 0.10.2, enable x265, tidyup

- Version bump to 0.10.2
- Cleanup of old versions and patches
- Enable x265: thanks to Peter Foley pefoley2 AT pefoley.com
for the patch

Signed-off-by: Ian Whyman thev00d00 AT gentoo.org

Package-Manager: portage-2.2.20

 media-video/handbrake/Manifest |   4 +-
 ...dbrake-0.9.9-add-gmodule-to-gtk-configure.patch |  11 --
 ...e-0.9.9-fix-compilation-with-mp4v2-v1.9.1.patch |  73 
 .../handbrake-0.9.9-remove-faac-dependency.patch   | 203 -
 .../handbrake--expand-MK_SUBTITLE_PGS.patch|   9 -
 ...ke--fix-compilation-with-mp4v2-v1.9.1.patch |  75 
 ...handbrake--fix-missing-x265-link-flag.patch |  13 ++
 .../files/handbrake--use-older-libmkv.patch|  14 --
 .../files/handbrake--use-unpatched-a52.patch   |  26 ---
 media-video/handbrake/handbrake-0.10.1.ebuild  | 148 ---
 ...ke-0.10.0-r1.ebuild = handbrake-0.10.2.ebuild} |  12 +-
 media-video/handbrake/handbrake-0.9.9-r1.ebuild| 185 ---
 media-video/handbrake/handbrake-.ebuild|  12 +-
 media-video/handbrake/metadata.xml |   2 +-
 14 files changed, 31 insertions(+), 756 deletions(-)

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 7ada6bb..bd42f75 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,3 +1 @@
-DIST handbrake-0.10.0.tar.bz2 10370718 SHA256 
a91042da3cc08454844f7c171ee2fde4f0ed08176407fc0328d5118227ed4114 SHA512 
e1793bf11aae384a63bdbb055b7b8998e13053d4519890ef6b6eb73988c5fb88c18e394e6c8f0af92cf7ba62a19ee83d908701a1f376adc2804c31192584d590
 WHIRLPOOL 
04379fd65000282c7472539aa6621ac668970529c3349f55c1ce5d60a6d96047a3a7e2d5d0d97ec002970769c7b8228ae67ac5623e814c3b2b27192351d8546b
-DIST handbrake-0.10.1.tar.bz2 10441776 SHA256 
7ea42031fd4d5efd04903a9aae79c952c50fd43b6f7bf08fd1a93f6b358a23f5 SHA512 
8e51a8d141749467a51bc781f3f961d507f693d3081b55964c4cb5a04407fd43331739db3a61c290c35c6da51003705e0e8fafe4c2c157c7a25c9c62df49856d
 WHIRLPOOL 
a735fcacf9b157cb2959d351d3fdb043c222ec664893fbd249dbebfceebd9951aabf757cd8c1a19c8911504591c22e67b20ae555dcb07d3cff6140f8f58ffdce
-DIST handbrake-0.9.9.tar.bz2 9315199 SHA256 
a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3 SHA512 
c891e78f5fbc62fd46055bf6cd62e631bc181a2a21167dcf3fe18cbc4b57bb36c11d52dcf39b3c923b807160e79fb2b1f3c36d60f3024149206a86e7bd6d5b68
 WHIRLPOOL 
edcb7758ba68e35b70700bbf484ac7794739a14302d205c080ad4fdf3151b460ee54b0c8dfffd68bca2ccb1a7d4379c9bbb7c3a9939c6bd6a06e1be95f09169e
+DIST handbrake-0.10.2.tar.bz2 10442635 SHA256 
4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699 SHA512 
7059a88fac1e4810c54880eb4afe58716af7ac81e5b098e34f3a68c19d7c03e51b57e1a196603e2c8d377e94bb3a910d20f1d9ed62d3eab6422031e62730d4a2
 WHIRLPOOL 
cd34833035e3fc866d7a69994717709fd7a808545f6cbaeda1447d6b528010b500f5ef0371b66d4b5c81c958d39d053178595fe32bc6236fdac7003cacd9f7d9

diff --git 
a/media-video/handbrake/files/handbrake-0.9.9-add-gmodule-to-gtk-configure.patch
 
b/media-video/handbrake/files/handbrake-0.9.9-add-gmodule-to-gtk-configure.patch
deleted file mode 100644
index e6f7c44..000
--- 
a/media-video/handbrake/files/handbrake-0.9.9-add-gmodule-to-gtk-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 HandBrake-0.9.9.orig/gtk/configure.ac  2013-09-01 12:13:06.684612296 
+0300
-+++ HandBrake-0.9.9/gtk/configure.ac   2013-09-01 20:09:35.446706059 +0300
-@@ -96,7 +96,7 @@ case $host in
- pkg_gudev=gudev-1.0
- ;;
- esac
--GHB_PACKAGES=gthread-2.0 gio-2.0 libnotify dbus-glib-1 $pkg_gudev
-+GHB_PACKAGES=gthread-2.0 gmodule-2.0 gio-2.0 libnotify dbus-glib-1 
$pkg_gudev
-   mingw_flag=no
- ;;
- esac

diff --git 
a/media-video/handbrake/files/handbrake-0.9.9-fix-compilation-with-mp4v2-v1.9.1.patch
 
b/media-video/handbrake/files/handbrake-0.9.9-fix-compilation-with-mp4v2-v1.9.1.patch
deleted file mode 100644
index c558d43..000
--- 
a/media-video/handbrake/files/handbrake-0.9.9-fix-compilation-with-mp4v2-v1.9.1.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-https://github.com/rbrito/pkg-handbrake/blob/master/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
-
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= rbr...@ime.usp.br
-Date: Sun, 22 Apr 2012 05:34:40 -0300
-Subject: libhb: Fix compilation with mp4v2 v1.9.1.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Forwarded: no
-Last-Update: 2012-05-15
-Reviewed-by: Rogério Theodoro de Brito rbr...@ime.usp.br
-Signed-off-by: Rogério Theodoro de Brito rbr...@ime.usp.br