commit: 338778222bc95745d0675590f99ae12b434465d6
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sun Oct 24 07:12:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 08:21:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33877822
media-video/handbrake: rebase remove-faac patch
Signed-off-by: James Beddek <telans <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/handbrake/Manifest | 1 +
...> handbrake-1.3.3-remove-faac-dependency.patch} | 0
.../handbrake-9999-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-9999-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-9999-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-9999-remove-faac-dependency.patch
b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
index 7e8ab99730a..a75bb24bf5b 100644
--- a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
+++ b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
@@ -1,16 +1,20 @@
+diff --git a/libhb/common.c b/libhb/common.c
+index f43efdbb5..c917151b7 100644
--- a/libhb/common.c
+++ b/libhb/common.c
-@@ -243,7 +243,6 @@
+@@ -375,7 +375,6 @@ hb_encoder_internal_t hb_audio_encoders[] =
{
// legacy encoders, back to HB 0.9.4 whenever possible (disabled)
- { { "", "dts", NULL,
HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0,
HB_GID_ACODEC_DTS_PASS, },
-- { { "AAC (faac)", "faac", NULL, 0,
HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0,
HB_GID_ACODEC_AAC, },
- { { "AAC (ffmpeg)", "ffaac", NULL,
HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0,
HB_GID_ACODEC_AAC, },
- { { "AC3 (ffmpeg)", "ffac3", NULL,
HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0,
HB_GID_ACODEC_AC3, },
- { { "MP3 (lame)", "lame", NULL,
HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0,
HB_GID_ACODEC_MP3, },
+ { { "", "dts", NULL,
HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0,
HB_GID_ACODEC_DTS_PASS, },
+- { { "AAC (faac)", "faac", NULL, 0,
HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0,
HB_GID_ACODEC_AAC, },
+ { { "AAC (ffmpeg)", "ffaac", NULL,
HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0,
HB_GID_ACODEC_AAC, },
+ { { "AC3 (ffmpeg)", "ffac3", NULL,
HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0,
HB_GID_ACODEC_AC3, },
+ { { "MP3 (lame)", "lame", NULL,
HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0,
HB_GID_ACODEC_MP3, },
+diff --git a/scripts/manicure.rb b/scripts/manicure.rb
+index fb4afa9ec..424288298 100755
--- a/scripts/manicure.rb
+++ b/scripts/manicure.rb
-@@ -349,7 +349,7 @@
+@@ -349,7 +349,7 @@ class Display
audioEncoders << "copy:dtshd"
when /AAC Pass/
audioEncoders << "copy:aac"
@@ -19,7 +23,7 @@
audioEncoders << "av_aac"
when "AAC (FDK)"
audioEncoders << "fdk_aac"
-@@ -466,7 +466,7 @@
+@@ -466,7 +466,7 @@ class Display
case hash["AudioEncoderFallback"]
when /AC3/
audioEncoderFallback << "ac3"
@@ -28,7 +32,7 @@
audioEncoderFallback << "av_aac"
when "AAC (FDK)"
audioEncoderFallback << "fdk_aac"
-@@ -753,7 +753,7 @@
+@@ -748,7 +748,7 @@ class Display
audioEncoders << "copy:dtshd"
when /AAC Pass/
audioEncoders << "copy:aac"
@@ -37,7 +41,7 @@
audioEncoders << "av_aac"
when "AAC (FDK)"
audioEncoders << "fdk_aac"
-@@ -870,7 +870,7 @@
+@@ -865,7 +865,7 @@ class Display
case hash["AudioEncoderFallback"]
when /AC3/
audioEncoderFallback << "ac3"
@@ -46,7 +50,7 @@
audioEncoderFallback << "av_aac"
when "AAC (FDK)"
audioEncoderFallback << "fdk_aac"
-@@ -1163,7 +1163,7 @@
+@@ -1148,7 +1148,7 @@ class Display
audioEncoders << "copy:dtshd"
when /AAC Pass/
audioEncoders << "copy:aac"
@@ -55,7 +59,7 @@
audioEncoders << "av_aac"
when "AAC (FDK)"
audioEncoders << "fdk_aac"
-@@ -1298,7 +1298,7 @@
+@@ -1283,7 +1283,7 @@ class Display
case hash["AudioEncoderFallback"]
when /AC3/
audioEncoderFallback << "ac3"
@@ -64,7 +68,7 @@
audioEncoderFallback << "av_aac"
when "AAC (FDK)"
audioEncoderFallback << "fdk_aac"
-@@ -1615,7 +1615,7 @@
+@@ -1600,7 +1600,7 @@ class Display
audioEncoders << "copy:dtshd"
when /AAC Pass/
audioEncoders << "copy:aac"
@@ -73,7 +77,7 @@
audioEncoders << "av_aac"
when "AAC (FDK)"
audioEncoders << "fdk_aac"
-@@ -1732,7 +1732,7 @@
+@@ -1717,7 +1717,7 @@ class Display
case hash["AudioEncoderFallback"]
when /AC3/
audioEncoderFallback << "ac3"
diff --git a/media-video/handbrake/handbrake-1.3.3-r2.ebuild
b/media-video/handbrake/handbrake-1.3.3-r2.ebuild
index a0fb6014561..b7246e9a055 100644
--- a/media-video/handbrake/handbrake-1.3.3-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3-r2.ebuild
@@ -81,7 +81,7 @@ PATCHES=(
"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
# Remove faac dependency; TODO: figure out if we need to do this at all.
- "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+ "${FILESDIR}/${P}-remove-faac-dependency.patch"
# Use whichever python is set by portage
"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
diff --git a/media-video/handbrake/handbrake-1.3.3-r3.ebuild
b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
index a02d836a04b..103a789e634 100644
--- a/media-video/handbrake/handbrake-1.3.3-r3.ebuild
+++ b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
@@ -81,7 +81,7 @@ PATCHES=(
"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
# Remove faac dependency; TODO: figure out if we need to do this at all.
- "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+ "${FILESDIR}/${P}-remove-faac-dependency.patch"
# Use whichever python is set by portage
"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
diff --git a/media-video/handbrake/handbrake-1.3.3-r2.ebuild
b/media-video/handbrake/handbrake-1.4.2.ebuild
similarity index 92%
copy from media-video/handbrake/handbrake-1.3.3-r2.ebuild
copy to media-video/handbrake/handbrake-1.4.2.ebuild
index a0fb6014561..80d947f2777 100644
--- a/media-video/handbrake/handbrake-1.3.3-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.4.2.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,9} )
+
+inherit autotools python-any-r1 xdg
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git";
@@ -68,12 +69,14 @@ RDEPEND="
x11-libs/pango
)
fdk? ( media-libs/fdk-aac )
- x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
-
-DEPEND="${RDEPEND}
+ 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.
@@ -98,7 +101,7 @@ src_prepare() {
default
- cd "${S}/gtk"
+ cd "${S}/gtk" || die
# Don't run autogen.sh.
sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call
failed"
eautoreconf
@@ -152,11 +155,5 @@ pkg_postinst() {
einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
fi
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
+ xdg_pkg_postinst
}
