diff options
author | Matt Jolly <kangie@gentoo.org> | 2024-03-21 12:57:24 +1000 |
---|---|---|
committer | Matt Jolly <kangie@gentoo.org> | 2024-03-21 13:01:28 +1000 |
commit | 8eaa5ad2bdf808188df02c659d71ed2ed67c7215 (patch) | |
tree | 8a22d3c01bc7134d2027522c90bd207100306881 /www-client/opera-beta | |
parent | www-client/opera: update proprietary codecs support. (diff) | |
download | gentoo-8eaa5ad2bdf808188df02c659d71ed2ed67c7215.tar.gz gentoo-8eaa5ad2bdf808188df02c659d71ed2ed67c7215.tar.bz2 gentoo-8eaa5ad2bdf808188df02c659d71ed2ed67c7215.zip |
www-client/opera-beta: update proprietary-codecs USE
Enable the use of media-video/ffmpeg or
media-video/ffmpeg-chromium to provide proprietary codecs
support based on USE=ffmpeg-chromium.
Signed-off-by: Matt Jolly <kangie@gentoo.org>
Diffstat (limited to 'www-client/opera-beta')
-rw-r--r-- | www-client/opera-beta/Manifest | 1 | ||||
-rw-r--r-- | www-client/opera-beta/metadata.xml | 1 | ||||
-rw-r--r-- | www-client/opera-beta/opera-beta-108.0.5067.14-r1.ebuild (renamed from www-client/opera-beta/opera-beta-108.0.5067.14.ebuild) | 19 | ||||
-rw-r--r-- | www-client/opera-beta/opera-beta-109.0.5097.24-r1.ebuild (renamed from www-client/opera-beta/opera-beta-109.0.5097.24.ebuild) | 19 | ||||
-rw-r--r-- | www-client/opera-beta/opera-beta-109.0.5097.5-r1.ebuild (renamed from www-client/opera-beta/opera-beta-109.0.5097.5.ebuild) | 19 |
5 files changed, 37 insertions, 22 deletions
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest index fd6745dc307b..12fb45576186 100644 --- a/www-client/opera-beta/Manifest +++ b/www-client/opera-beta/Manifest @@ -1,4 +1,3 @@ DIST opera-beta_108.0.5067.14_amd64.deb 115510280 BLAKE2B 01671adad09c457f397ae1f62001ed9cb4f833c7413b719299f307704686ea6d3bf3713582f93b2a417c7e076b5c95b9f9dc37a16bf6d42390116dc9428093ee SHA512 1839af51c996f09aafe777505267f1c6f97334fd02f9840a693540b694761b31a5419687ada78bb3a05783d3315bb3b4e62b55ea9fd86692ec10ccf158026239 DIST opera-beta_109.0.5097.24_amd64.deb 115266488 BLAKE2B 02031e0bf755c111efd3e77adf639b5ca27a6325e94f3d43e20419dfa8c93170aa19d839d5d718fd5dfd94d28b1c974f107f2a99c73b3de27bce94c2a66c46cf SHA512 a9b19e07d9cd11bdaaf1fbee1ec765366994304d940711c66f9e041f5e8cca33d29ec158768c659bcf2bbe1b5914c5a67ef86800a4a0ffa27bc06054b55f80ca DIST opera-beta_109.0.5097.5_amd64.deb 115139344 BLAKE2B ebe2dbc2aecd0a79c1446cafc7fb4195cac2cf927f2e2f43413ec322007efcfcbb037f2377e973a40baf2d0eff7ce76cd88999d6578ff72be695831b20066520 SHA512 245bb6d45bf85b2d53f19ea015a2899853e43043f53216d3b7b2a87c8cf45b00a541df92840b357c09328c1ea4aedf70a6303ffce113d88f91d2c8da83763217 -DIST opera-ffmpeg-codecs-114.0.5735.9.tar.xz 1315192 BLAKE2B ef9a0cfc8c30ac0a837863644f3c2d5e78059575e2b8f6fda9253304f4815a39d021602e802dac7e1d5a1685aa5015a02019c4a0399f0bdc81136f956cc1d55f SHA512 bdad66bd5d238bdeb81a4e2a956f0a814633360f05c7bed2161df9506d2ccc444445ba452cc8974c755fe0d3f46adceb90324a472a5dac72e9c65391ae7a841c diff --git a/www-client/opera-beta/metadata.xml b/www-client/opera-beta/metadata.xml index b26bda26dc59..43f810908023 100644 --- a/www-client/opera-beta/metadata.xml +++ b/www-client/opera-beta/metadata.xml @@ -6,6 +6,7 @@ <name>Chromium in Gentoo Project</name> </maintainer> <use> + <flag name="ffmpeg-chromium">Use Chromium FFmpeg fork (<pkg>media-video/ffmpeg-chromium</pkg>) rather than mainline FFmpeg (<pkg>media-video/ffmpeg</pkg>)</flag> <flag name="proprietary-codecs">Enable codecs for patent-encumbered audio and video formats.</flag> </use> </pkgmetadata> diff --git a/www-client/opera-beta/opera-beta-108.0.5067.14.ebuild b/www-client/opera-beta/opera-beta-108.0.5067.14-r1.ebuild index 4580a368fd6c..ad276bb735ac 100644 --- a/www-client/opera-beta/opera-beta-108.0.5067.14.ebuild +++ b/www-client/opera-beta/opera-beta-108.0.5067.14-r1.ebuild @@ -39,17 +39,17 @@ 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" SLOT="0" KEYWORDS="-* ~amd64" -IUSE="+proprietary-codecs +suid qt5 qt6" +IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6" RESTRICT="bindist mirror strip" RDEPEND=" @@ -79,6 +79,10 @@ RDEPEND=" x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango + proprietary-codecs? ( + !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) + ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} ) + ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] @@ -151,7 +155,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$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \ + /${OPERA_HOME}/libffmpeg.so fi if ! use qt5; then diff --git a/www-client/opera-beta/opera-beta-109.0.5097.24.ebuild b/www-client/opera-beta/opera-beta-109.0.5097.24-r1.ebuild index 4580a368fd6c..ad276bb735ac 100644 --- a/www-client/opera-beta/opera-beta-109.0.5097.24.ebuild +++ b/www-client/opera-beta/opera-beta-109.0.5097.24-r1.ebuild @@ -39,17 +39,17 @@ 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" SLOT="0" KEYWORDS="-* ~amd64" -IUSE="+proprietary-codecs +suid qt5 qt6" +IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6" RESTRICT="bindist mirror strip" RDEPEND=" @@ -79,6 +79,10 @@ RDEPEND=" x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango + proprietary-codecs? ( + !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) + ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} ) + ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] @@ -151,7 +155,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$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \ + /${OPERA_HOME}/libffmpeg.so fi if ! use qt5; then diff --git a/www-client/opera-beta/opera-beta-109.0.5097.5.ebuild b/www-client/opera-beta/opera-beta-109.0.5097.5-r1.ebuild index 4580a368fd6c..ad276bb735ac 100644 --- a/www-client/opera-beta/opera-beta-109.0.5097.5.ebuild +++ b/www-client/opera-beta/opera-beta-109.0.5097.5-r1.ebuild @@ -39,17 +39,17 @@ 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" SLOT="0" KEYWORDS="-* ~amd64" -IUSE="+proprietary-codecs +suid qt5 qt6" +IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6" RESTRICT="bindist mirror strip" RDEPEND=" @@ -79,6 +79,10 @@ RDEPEND=" x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango + proprietary-codecs? ( + !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) + ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} ) + ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] @@ -151,7 +155,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$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \ + /${OPERA_HOME}/libffmpeg.so fi if ! use qt5; then |