summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Jolly <kangie@gentoo.org>2024-03-21 12:52:55 +1000
committerMatt Jolly <kangie@gentoo.org>2024-03-21 13:01:28 +1000
commitd93b40b52e42450c939d2f0b08e2981cb2089d1d (patch)
tree6eb53b30b99d7f78cf822a55fac5181645a9b62d /www-client
parentmedia-gfx/sane-airscan: Modern C fixes (diff)
downloadgentoo-d93b40b52e42450c939d2f0b08e2981cb2089d1d.tar.gz
gentoo-d93b40b52e42450c939d2f0b08e2981cb2089d1d.tar.bz2
gentoo-d93b40b52e42450c939d2f0b08e2981cb2089d1d.zip
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 <kangie@gentoo.org>
Diffstat (limited to 'www-client')
-rw-r--r--www-client/opera/Manifest1
-rw-r--r--www-client/opera/opera-108.0.5067.29-r1.ebuild (renamed from www-client/opera/opera-108.0.5067.29.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
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