diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/Manifest.gz | bin | 25371 -> 25366 bytes | |||
| -rw-r--r-- | media-video/handbrake/Manifest | 3 | ||||
| -rw-r--r-- | media-video/handbrake/files/handbrake-9999-dont-search-for-python.patch | 26 | ||||
| -rw-r--r-- | media-video/handbrake/handbrake-9999.ebuild | 27 |
4 files changed, 42 insertions, 14 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex bceace2405f4..e669fff0f1dd 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 7fc75c54ac3b..baf862d18bec 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -1,6 +1,7 @@ AUX handbrake-1.3.0-dont-search-for-python.patch 691 BLAKE2B 623654494bf61cedb531df3f9b3e64aa17a2a3d03cf9d71577ba1961961d3d058dfa383ef3bb5215eba8a2c84231531b35f1a331850070ae0bcc5b5fa1586c67 SHA512 044b0cb7d9302f74e1ef92e37162135b8ac76d96bf7d647c269ef19b5cf2a8771ce0cc76cbc8817b2480cc3e40af6bafd717888a3982b3e679d831519aad4e64 AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6e884637c8dc9a900774db9db07d1c0686a1b5c2db9276ca1c14612615e3974a7f9b05cb48c23f8f30ed0851238b92c32 SHA512 a74a2d20972a01b89dbfd7b81c070608d57e646de2ce63d9ae2d2e1486d31ca63e96d5ec803052b52e68bee157d5a1882914e0009ae480d1f8192031d79852eb AUX handbrake-1.5.1-ffmpeg-5.0.patch 1338 BLAKE2B b4cd48ac769858779b8870eef7b7a4f66d67cce42d2c3e5c4cbbe7012c9f3f5622eae5b708f88300108539e683218292f395e0d6e32702e5ea3f2039556f9204 SHA512 cec727b44485847f20abb25d2ec6a8d1f59165c984a118f60803bdd70fd42b1b8209b76fe097961a4197e939720443979d5ba92df0857d195d918cd38ba2b733 +AUX handbrake-9999-dont-search-for-python.patch 626 BLAKE2B 25226e243d06fb1a4bf7d7a9a0b2d5f77b37e87fd413c17bad285f10c0cefd33bee9dc193cc3497cd0740a36d3c596579502d3c76eccb514fa09b5976a171e48 SHA512 fd7684b0e312772c4e9e206dad402f3672c600a570cc60da543dc7e984b2bb91c7a3843b1a86dfe11179b86e35396aafa1c7464d6d7d0e93472d740ab6bcc4d9 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0 AUX handbrake-9999-remove-faac-dependency.patch 4037 BLAKE2B fa3d059198f79334d2b4e8109fd5d39d9f02ded8e46c287009bb8486d9c968b5387813f894fb78ccdd584e4f72fbcc4ee42cd00fc834933f90601c7fb08d0737 SHA512 155b8f5585a66167ae39d568d4c12227ffb7cf327707b556ed28532e6f8adce1a81601ae35403e14d6850e3c9411b1b9142c90dc2af50be1083abe21fa3d68f7 AUX handbrake-9999-system-tools.patch 1489 BLAKE2B 2a3286dc1cd37d85e1edb1312688a354f000d560a767dc4c4fc23b7874bec46692f21a5b7e2c2b6cc7b6efb221a00084355659ee9d9965a28a23c7012adfbd3d SHA512 eb07b8e675cf6a8b4eee1d0fcb682ae7d61c9ec8423202b6c8672fc94f6b011b1e01a5e9654b2e63d15b66c122e8c2c57b385e36a43d3c68fba69bf144beb508 @@ -8,5 +9,5 @@ DIST handbrake-1.4.2.tar.bz2 15991593 BLAKE2B 966b54d35dd5544800208edc9045eaf26f DIST handbrake-1.5.1.tar.bz2 16137974 BLAKE2B 9ce1f1ae7b2fe514ba1fb6ed30a345d18144829272a6298f2af0831e5ea7533ef2f8b201fd98389269b0ea12bbba15d0b76f09afeff6ed1d9ed313f20cf8f3a1 SHA512 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568 EBUILD handbrake-1.4.2-r2.ebuild 4072 BLAKE2B 79912b5bb6eb3e4c171597a46d9310c130e03580adc7b24a7f93015073effe7f568353193e3d554659a6715e35718abfbebec5db8fd31bc038087796fec6ca76 SHA512 233436972a3a2c10688ffd60d167f457132dc7962bbffc9853ad9d804b4141e089e70c53d18d36704594d0a1d0885ec86cb3f3e1e00e5f8dd1e7e51bd4db4b80 EBUILD handbrake-1.5.1.ebuild 4225 BLAKE2B f2a9987b7536cced3e2cb7a422dd00560c3ba2893a4495d37d028a11f8df5fd03d9c63190df038df496794b25dc8797d0ae0817d8e851c7185d8f373128e0275 SHA512 5dbf47d53c651b0115835f60aa8339aeb3cffd2a904eca058dd595350528b4732728a94c5e283f3730e3e13926f97b2b347a5fcaf32fef5b9a47d7a818794a6b -EBUILD handbrake-9999.ebuild 4169 BLAKE2B 5b707c983763450ba5c9f567d1e5066760748fcf6eca63bbd928776510bd5b72d80be4802afd2ad9786e5b4a19b1d93e3cbdfbce71b7da5737b79856368d8f2a SHA512 40b0bf157cb948e50e446b283115637f7faa1bbf74591e12d60ace1ba88782565c3bd5d9a81594d7fd657bef5bb1d33bdb2ec4fa7c587cf05cf56dfcc87bfce6 +EBUILD handbrake-9999.ebuild 4092 BLAKE2B 45a4e664ffae332b381c2e164f23c1633c104c607c621b1f72d1dadf59af672e89e37c640e07962a6f1c9c4ef8ba5687033318258a53f9eef99f3be4da1c50c6 SHA512 4a52d7acdfa2147050013493cc0213b5dadf5faa4c662beaea4462614b08e8e74465434ab35c00aacbc73f9a4eca1fbbeb4b4e71788793d85c60da610a846c2a MISC metadata.xml 988 BLAKE2B 2c2543998aaf038e587c97734225e42d3ffcfdb3700756c6c4933fec290c5925f1ea622689a6af6d3ffe56740a713d59034786853aa59617cbb43543438f1970 SHA512 013be7227a93e05f90c45411b46d35e26c14ba1d25d1e801b259bc641d643f81489611bfc1aa0b17d6df1689e9f2878454301ff33e8ffa417839b8e2ab486383 diff --git a/media-video/handbrake/files/handbrake-9999-dont-search-for-python.patch b/media-video/handbrake/files/handbrake-9999-dont-search-for-python.patch new file mode 100644 index 000000000000..f9971e508404 --- /dev/null +++ b/media-video/handbrake/files/handbrake-9999-dont-search-for-python.patch @@ -0,0 +1,26 @@ +--- 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-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild index d399e643ee4b..6887723ed4b9 100644 --- a/media-video/handbrake/handbrake-9999.ebuild +++ b/media-video/handbrake/handbrake-9999.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 @@ -22,9 +22,9 @@ HOMEPAGE="https://handbrake.fr/ https://github.com/HandBrake/HandBrake" LICENSE="GPL-2" SLOT="0" -IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265" +IUSE="+fdk gstreamer gtk numa nvenc x265" # TODO: qsv vce -REQUIRED_USE="^^ ( fdk libav-aac )" +REQUIRED_USE="numa? ( x265 )" RDEPEND=" app-arch/xz-utils @@ -71,7 +71,10 @@ RDEPEND=" x11-libs/libnotify x11-libs/pango ) - nvenc? ( media-libs/nv-codec-headers ) + nvenc? ( + media-libs/nv-codec-headers + media-video/ffmpeg[nvenc] + ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) " DEPEND="${RDEPEND}" @@ -88,14 +91,11 @@ PATCHES=( # It may work this way; if not, we should try to mimic the duplication. "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch" - # Remove faac dependency; TODO: figure out if we need to do this at all. - "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch" - # Detect system tools - bug 738110 "${FILESDIR}/${PN}-9999-system-tools.patch" # Use whichever python is set by portage - "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch" + "${FILESDIR}/${PN}-9999-dont-search-for-python.patch" # Fix x265 linkage... again again #730034 "${FILESDIR}/${PN}-1.3.3-x265-link.patch" @@ -123,16 +123,17 @@ src_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) + --disable-gtk4 $(usex !gstreamer --disable-gst) + $(use_enable x265) $(use_enable numa) + $(use_enable fdk fdk-aac) + --enable-ffmpeg-aac # Forced on $(use_enable nvenc) - $(use_enable x265) + # TODO: $(use_enable qsv) + # TODO: $(use_enable vce) ) ./configure "${myconfargs[@]}" || die "Configure failed." |