From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- media-video/handbrake/Manifest | 7 +- media-video/handbrake/handbrake-1.3.3-r1.ebuild | 15 +-- media-video/handbrake/handbrake-1.3.3.ebuild | 165 ------------------------ media-video/handbrake/handbrake-9999.ebuild | 27 ++-- media-video/handbrake/metadata.xml | 3 + 5 files changed, 23 insertions(+), 194 deletions(-) delete mode 100644 media-video/handbrake/handbrake-1.3.3.ebuild (limited to 'media-video/handbrake') diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 015e72ccda13..5bb8c8fa7472 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -4,7 +4,6 @@ AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c -EBUILD handbrake-1.3.3-r1.ebuild 4233 BLAKE2B a1fb93cadb03edcc9d23f32b0813f6ab35aa88a0daf8369626c42ea9d4a3856e9c9d15200a0fc3d7b731e7501a7651e4e3477aaab1700bfd90cf7c1e1a31f28f SHA512 f65efb0930c8d60967424c3b4cae81e05cbca0088b2d99058f86384b06c2eb7d5bacce114fe804174171dbe81932eb9b1e10c597a1fe257183cdc6489770413a -EBUILD handbrake-1.3.3.ebuild 4195 BLAKE2B 54069e7692834c134dc0ad25076a01477da704d3132a31ac375ac9b04020d81def7829ff217ba87e41e59244257ac91a4747ca2dc2c8c0fcbcba159aa5e4a44e SHA512 2a673ff6375a2dc24255224082c37b35e1b89f311c6943cd12be3e8ae16f1fe7a2db6041ecb87897ef0e79c59f38c41c7b6712061c40ddf2877a221c47433822 -EBUILD handbrake-9999.ebuild 4126 BLAKE2B 866ea8ec000176f422c5f0f34986d8f6830c119243ea98fddfb7de07f3fdd39fff0df85deab023fb66b20db6bf584566085f7c27792327df060eaab74691c795 SHA512 ec1ee333ab3b8fe58b257fa4278453e42d5ecdf7c2d983ce15277eca897544f99c95325d8a98f304ab955f52be5bb017c6f72c2e2b3cd9edf5782f215101cb57 -MISC metadata.xml 881 BLAKE2B b93483d20041e7125f725d81c22cfd416898fc3477d20ba07d364348a258e868efe4444f91d36bac07f0a3881aedebef7580f5fcd0aa5b3f8a59a05e49418dd2 SHA512 ec78ed56c9011af44b902eb8e9f418515d4bc7ab9feaee142b2808c15f8a69638de43196ef38246c696b2258124b472a0831dabf5671b5ef4000ebf146f634b3 +EBUILD handbrake-1.3.3-r1.ebuild 4173 BLAKE2B 00f0f0214e52a1ec0cbb5a0aaeaf438d1a728f56b0c942fc3ba808b89793e16cc5c1db0a773b54821201b2b594aa1397bf6a8784793d8c6eb8e529303075cb04 SHA512 8dffe9fc3e05b210f3251cea43e720bc67d9edd9c0771886c3e83abf3d3a7f18a903c6923c3ef33d30a35f00f9f536e991e98575168acf45351eb1866c4ad499 +EBUILD handbrake-9999.ebuild 4175 BLAKE2B 7e9a8a9be4f0a3e1d33daeeecd62b40b2a4aadee12f3fe10b4a25af638a557912bb70490e641d37361a849583b0a2accac5ff453ed03e74b2e1a9d05e929814e SHA512 aab693480348d51909c134ded062bb4b7b4bfdcad985cce409c1b6916dc5898272755d53bd36f8abd8f803ad692229f8f0ba18b2208eaa2088e6f871fde3b603 +MISC metadata.xml 965 BLAKE2B 6fbf638b2d5da5eaac6f21526b669ba057b8ebcc227c4240c8b13b58dbaf50a40df8501107a1eade5fb54f4a44339bd0d71a5b702adb9c4f5d746cfa9dbd4997 SHA512 2cc363e02af3f624e4323d58ceef6e37c31ef878f40faab2463b7fee6920b86343f2240600a999d660da3d01e3cc05001c8ce09c516a0bb3543b7a54398eb65a diff --git a/media-video/handbrake/handbrake-1.3.3-r1.ebuild b/media-video/handbrake/handbrake-1.3.3-r1.ebuild index 73db57b803de..2473cf819b8c 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} = *9999* ]]; then EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git" @@ -19,8 +18,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 +68,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-1.3.3.ebuild b/media-video/handbrake/handbrake-1.3.3.ebuild deleted file mode 100644 index ca460ce1ce33..000000000000 --- 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} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git" - inherit git-r3 -else - MY_P="HandBrake-${PV}" - SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64 ~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}-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" - - # 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 currently broken, try to fix it. - # - # if use doc ; then - # emake -C build doc - # fi -} - -src_install() { - emake -C build DESTDIR="${D}" install - - dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown -} - -pkg_postinst() { - einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they" - einfo "do not use the bundled (and often patched) upstream libraries." - einfo "" - einfo "Please do not raise bugs with upstream because of these ebuilds," - einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead." - - einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`." - if use gtk ; then - 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 -} diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild index 115170471f2a..d6c33bf60882 100644 --- a/media-video/handbrake/handbrake-9999.ebuild +++ b/media-video/handbrake/handbrake-9999.ebuild @@ -3,24 +3,23 @@ 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} = *9999* ]]; then EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git" 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 +45,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 +73,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 +86,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 +153,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 } diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml index 83b12addd42e..17ea50de1e38 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 + -- cgit v1.2.3