From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9A12915800A for ; Wed, 12 Jul 2023 07:33:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBDECE0788; Wed, 12 Jul 2023 07:33:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5A89E0788 for ; Wed, 12 Jul 2023 07:33:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9B85340BEF for ; Wed, 12 Jul 2023 07:33:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 300F9ACA for ; Wed, 12 Jul 2023 07:33:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1689147192.c3da746c188a4ed2ec40d3b3384b6f82acb30ee7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/handbrake/Manifest media-video/handbrake/handbrake-1.6.1.ebuild media-video/handbrake/handbrake-9999.ebuild X-VCS-Directories: media-video/handbrake/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c3da746c188a4ed2ec40d3b3384b6f82acb30ee7 X-VCS-Branch: master Date: Wed, 12 Jul 2023 07:33:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bcc6bd50-be9f-4503-b2c1-1a25b3b8d053 X-Archives-Hash: 0fe2f6431a7220dd606054746fc0174e commit: c3da746c188a4ed2ec40d3b3384b6f82acb30ee7 Author: Sam James gentoo org> AuthorDate: Wed Jul 12 07:25:37 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jul 12 07:33:12 2023 +0000 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-9999.ebuild => handbrake-1.6.1.ebuild} | 34 +++++++++++----------- media-video/handbrake/handbrake-9999.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-9999.ebuild b/media-video/handbrake/handbrake-1.6.1.ebuild similarity index 85% copy from media-video/handbrake/handbrake-9999.ebuild copy to media-video/handbrake/handbrake-1.6.1.ebuild index f66b4dfeec5d..e1b96f247c82 100644 --- a/media-video/handbrake/handbrake-9999.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} = *9999* ]]; then +if [[ ${PV} == *9999* ]]; 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-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild index f66b4dfeec5d..e1b96f247c82 100644 --- a/media-video/handbrake/handbrake-9999.ebuild +++ b/media-video/handbrake/handbrake-9999.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} = *9999* ]]; then +if [[ ${PV} == *9999* ]]; 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() {