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 BE0A4158041 for ; Thu, 21 Mar 2024 03:04:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2564E29AE; Thu, 21 Mar 2024 03:04:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80485E29AE for ; Thu, 21 Mar 2024 03:04:10 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9189833BDEF for ; Thu, 21 Mar 2024 03:04:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3126A1525 for ; Thu, 21 Mar 2024 03:04:08 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1710990088.d93b40b52e42450c939d2f0b08e2981cb2089d1d.kangie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/opera/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/opera/Manifest www-client/opera/opera-108.0.5067.29-r1.ebuild www-client/opera/opera-108.0.5067.29.ebuild X-VCS-Directories: www-client/opera/ X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: d93b40b52e42450c939d2f0b08e2981cb2089d1d X-VCS-Branch: master Date: Thu, 21 Mar 2024 03:04:08 +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: 059424ce-16bd-4e73-a2e7-5a2a1ee2b3f1 X-Archives-Hash: ce6c80dd97c162ae52a8f768bc1a4180 commit: d93b40b52e42450c939d2f0b08e2981cb2089d1d Author: Matt Jolly gentoo org> AuthorDate: Thu Mar 21 02:52:55 2024 +0000 Commit: Matt Jolly gentoo org> CommitDate: Thu Mar 21 03:01:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d93b40b5 www-client/opera: update proprietary codecs support. Use media-video/ffmpeg-chromium to provide optional decoder support for H.264 (etc). Closes: https://bugs.gentoo.org/924391 Signed-off-by: Matt Jolly gentoo.org> www-client/opera/Manifest | 1 - ...08.0.5067.29.ebuild => opera-108.0.5067.29-r1.ebuild} | 16 ++++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index 9f6feae995a4..ed7f69238245 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -1,2 +1 @@ -DIST opera-ffmpeg-codecs-114.0.5735.9.tar.xz 1315192 BLAKE2B ef9a0cfc8c30ac0a837863644f3c2d5e78059575e2b8f6fda9253304f4815a39d021602e802dac7e1d5a1685aa5015a02019c4a0399f0bdc81136f956cc1d55f SHA512 bdad66bd5d238bdeb81a4e2a956f0a814633360f05c7bed2161df9506d2ccc444445ba452cc8974c755fe0d3f46adceb90324a472a5dac72e9c65391ae7a841c DIST opera-stable_108.0.5067.29_amd64.deb 115339860 BLAKE2B 17b1ce49e2c6eadfe259e453fdf9e40726b61bc6aa9ae69d7f9226d004fd3de585c6d4bc54378d6dcef65654a601eed296835202ef2569de4c23d16d9f7ad0e6 SHA512 5e97f53aa87e70efa90ffd87c0a904b2e9b5410d39e1d0549b5018245ddddbb8cbc06ae7a322aa97643b3402bdc7f64fd8525e08a47f9a369396acf889f6727e diff --git a/www-client/opera/opera-108.0.5067.29.ebuild b/www-client/opera/opera-108.0.5067.29-r1.ebuild similarity index 88% rename from www-client/opera/opera-108.0.5067.29.ebuild rename to www-client/opera/opera-108.0.5067.29-r1.ebuild index 67b029cadff1..a97bb25328be 100644 --- a/www-client/opera/opera-108.0.5067.29.ebuild +++ b/www-client/opera/opera-108.0.5067.29-r1.ebuild @@ -39,11 +39,11 @@ else MY_PN=${PN} fi -FFMPEG_VERSION="114.0.5735.9" -SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}} - proprietary-codecs? ( - mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz - )" +# Commit ref from `strings libffmpeg.so | grep -F "FFmpeg version"` matches this Chromium version +# used to select the correct ffmpeg-chromium version (corresponds to a major version of Chromium) +# Does not need to be updated for every new version of Opera, only when it breaks +CHROMIUM_VERSION="121" +SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}" S=${WORKDIR} LICENSE="OPERA-2018" @@ -79,6 +79,9 @@ RDEPEND=" x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango + proprietary-codecs? ( + media-video/ffmpeg-chromium:${CHROMIUM_VERSION} + ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] @@ -151,7 +154,8 @@ src_install() { # install proprietary codecs rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die if use proprietary-codecs; then - mv lib_extra "${OPERA_HOME}" + dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \ + /${OPERA_HOME}/libffmpeg.so fi if ! use qt5; then