diff options
Diffstat (limited to 'www-client/opera-beta')
| -rw-r--r-- | www-client/opera-beta/Manifest | 7 | ||||
| -rw-r--r-- | www-client/opera-beta/metadata.xml | 1 | ||||
| -rw-r--r-- | www-client/opera-beta/opera-beta-110.0.5130.13.ebuild (renamed from www-client/opera-beta/opera-beta-95.0.4635.10.ebuild) | 36 | ||||
| -rw-r--r-- | www-client/opera-beta/opera-beta-110.0.5130.17.ebuild (renamed from www-client/opera-beta/opera-beta-95.0.4635.12.ebuild) | 36 | ||||
| -rw-r--r-- | www-client/opera-beta/opera-beta-110.0.5130.8.ebuild (renamed from www-client/opera-beta/opera-beta-95.0.4635.15.ebuild) | 36 |
5 files changed, 70 insertions, 46 deletions
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest index 2380f10017ec..758dfe35acbd 100644 --- a/www-client/opera-beta/Manifest +++ b/www-client/opera-beta/Manifest @@ -1,4 +1,3 @@ -DIST opera-beta_95.0.4635.10_amd64.deb 101350684 BLAKE2B eb4d2193be0f8e9313adcfde78700213c5bdc0daa9d58fd338b2c1a6657ec2f0a4aef119b008741edbe66f7c560d0008d9d5bb1a12ccd0331b8195fa3a6e7700 SHA512 f3eca403b34f7cfb2b126bd2345b8a8df21d76eb2b3c5a0ab6d5b65ccce22bc76e741c80fc1bad7c1147d4cef5a48b7b1376f4c8f4c0e1daad76c6a6566b7504 -DIST opera-beta_95.0.4635.12_amd64.deb 101346084 BLAKE2B f4e46aaabd3f15c549d3f6865a2ee031fba924c71dd57be78f045323c23c8af8cfe5822b4240b268740a97e6a175539f61f1676c068bda958427cc5f6e3be0ed SHA512 0de16942d4bf5875e436f41fc8d4991290336f754761b8117f54fd8730462107dd91d4e53aae7df711bde4ef6dacd780c372a09fcf024ccf8593721da11143e3 -DIST opera-beta_95.0.4635.15_amd64.deb 101325556 BLAKE2B debdbd0bc69e7e350d2187f145ee701a62e83d3cc130d696ad04d640c5132f2650c806cb7721210e0215c9f584932565c8950305725a7cebf303278c83185bcc SHA512 828552b0f1fe20ad38834af2382ef4a05d790901367ab5967d172d8159b368f8b8ecf47990e724c941ff514c9e9b0dd5887611e03988b60f2c7b779ea9dbf8ac -DIST opera-ffmpeg-codecs-110.0.5464.2.tar.xz 1280752 BLAKE2B 9f17f85377d06c7c36729ca3a29d02aa2d7fff3bbbeb4cc26f60252e350c50c3a06eeb7e3c896154617ff7ee43d5881177b819618c13dc1254f7d3980bf0c363 SHA512 d9b4a52b29be287e5d20f6922c64e0e3cbfcd7eedd3109c12ff72c376ab14bce4c421be4dccea2ed1e4c899f11dcc8416545911ca84d8d6c994fe6ab87425ff3 +DIST opera-beta_110.0.5130.13_amd64.deb 110204952 BLAKE2B dedeac21ce18c3180bafa9a6ae167b8042f78b1f50500f3c03374a67a3472d728a4abb0a760cc8589dfaf38b97fc63736b55f7855b8a02520c56d765255c3f0d SHA512 412165e9d69da93d38da321b0bce6e09bc6b981c1716604208ea5d14dba68f836ceff2097a80222341b9d36fdac0689eb8fd12c0e4212867647b0221c36362f9 +DIST opera-beta_110.0.5130.17_amd64.deb 110223832 BLAKE2B 21a37802dd612a27db6555bda5767598f06c5e28cd754bcafb15418b74ef25ed4d9acc5adafe5e3e21a874118d0b10fc862e69b116616229bfe49e23275f3305 SHA512 555240c02a82a29a00460599ca8070d1b2d200d37ca3d58f8ddd76a748175168ed17aeee5afbf8569966e62fe5b21f1e87584a22b39ae8c2a74fca7f92e2535e +DIST opera-beta_110.0.5130.8_amd64.deb 110214708 BLAKE2B f2a96885a9449b0821499c871843941488aa89f3a30d1791b04741ddeecbe52dda9b304642e60985403dd3b2aaa0e247dd5884648a639a74b2d7109adae9fb71 SHA512 d3f156bec609f385a0183a8b1383e192c296f3ca67b276c86109107953e6f0a4d8b79fafff7fedc58752c4398d0b4bc2d366d15ed84117139229d55d285c15a3 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-95.0.4635.10.ebuild b/www-client/opera-beta/opera-beta-110.0.5130.13.ebuild index c1bd86836a82..cfafbce68c18 100644 --- a/www-client/opera-beta/opera-beta-95.0.4635.10.ebuild +++ b/www-client/opera-beta/opera-beta-110.0.5130.13.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 + CHROMIUM_LANGS=" bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi @@ -23,8 +24,6 @@ fi DESCRIPTION="A fast and secure web browser" HOMEPAGE="https://www.opera.com/" -LICENSE="OPERA-2018" -SLOT="0" SRC_URI_BASE=( "https://download1.operacdn.com/pub/${PN}" @@ -40,16 +39,17 @@ else MY_PN=${PN} fi -KEYWORDS="-* ~amd64" - -FFMPEG_VERSION="110.0.5464.2" - -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="124" +SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}" +S=${WORKDIR} -IUSE="+proprietary-codecs +suid qt5" +LICENSE="OPERA-2018" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6" RESTRICT="bindist mirror strip" RDEPEND=" @@ -79,15 +79,19 @@ 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] dev-qt/qtwidgets:5 ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) " QA_PREBUILT="*" -S=${WORKDIR} OPERA_HOME="opt/opera${PN#opera}" pkg_pretend() { @@ -151,12 +155,16 @@ 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 rm "${OPERA_HOME}/libqt5_shim.so" || die fi + if ! use qt6; then + rm "${OPERA_HOME}/libqt6_shim.so" || die + fi # pax mark opera, bug #562038 pax-mark m "${OPERA_HOME}/opera" diff --git a/www-client/opera-beta/opera-beta-95.0.4635.12.ebuild b/www-client/opera-beta/opera-beta-110.0.5130.17.ebuild index c1bd86836a82..cfafbce68c18 100644 --- a/www-client/opera-beta/opera-beta-95.0.4635.12.ebuild +++ b/www-client/opera-beta/opera-beta-110.0.5130.17.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 + CHROMIUM_LANGS=" bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi @@ -23,8 +24,6 @@ fi DESCRIPTION="A fast and secure web browser" HOMEPAGE="https://www.opera.com/" -LICENSE="OPERA-2018" -SLOT="0" SRC_URI_BASE=( "https://download1.operacdn.com/pub/${PN}" @@ -40,16 +39,17 @@ else MY_PN=${PN} fi -KEYWORDS="-* ~amd64" - -FFMPEG_VERSION="110.0.5464.2" - -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="124" +SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}" +S=${WORKDIR} -IUSE="+proprietary-codecs +suid qt5" +LICENSE="OPERA-2018" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6" RESTRICT="bindist mirror strip" RDEPEND=" @@ -79,15 +79,19 @@ 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] dev-qt/qtwidgets:5 ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) " QA_PREBUILT="*" -S=${WORKDIR} OPERA_HOME="opt/opera${PN#opera}" pkg_pretend() { @@ -151,12 +155,16 @@ 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 rm "${OPERA_HOME}/libqt5_shim.so" || die fi + if ! use qt6; then + rm "${OPERA_HOME}/libqt6_shim.so" || die + fi # pax mark opera, bug #562038 pax-mark m "${OPERA_HOME}/opera" diff --git a/www-client/opera-beta/opera-beta-95.0.4635.15.ebuild b/www-client/opera-beta/opera-beta-110.0.5130.8.ebuild index c1bd86836a82..cfafbce68c18 100644 --- a/www-client/opera-beta/opera-beta-95.0.4635.15.ebuild +++ b/www-client/opera-beta/opera-beta-110.0.5130.8.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 + CHROMIUM_LANGS=" bg bn ca cs da de el en-GB en-US es-419 es fil fi fr hi hr hu id it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi @@ -23,8 +24,6 @@ fi DESCRIPTION="A fast and secure web browser" HOMEPAGE="https://www.opera.com/" -LICENSE="OPERA-2018" -SLOT="0" SRC_URI_BASE=( "https://download1.operacdn.com/pub/${PN}" @@ -40,16 +39,17 @@ else MY_PN=${PN} fi -KEYWORDS="-* ~amd64" - -FFMPEG_VERSION="110.0.5464.2" - -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="124" +SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.${OPERA_ARCHIVE_EXT}}" +S=${WORKDIR} -IUSE="+proprietary-codecs +suid qt5" +LICENSE="OPERA-2018" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="+ffmpeg-chromium +proprietary-codecs +suid qt5 qt6" RESTRICT="bindist mirror strip" RDEPEND=" @@ -79,15 +79,19 @@ 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] dev-qt/qtwidgets:5 ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) " QA_PREBUILT="*" -S=${WORKDIR} OPERA_HOME="opt/opera${PN#opera}" pkg_pretend() { @@ -151,12 +155,16 @@ 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 rm "${OPERA_HOME}/libqt5_shim.so" || die fi + if ! use qt6; then + rm "${OPERA_HOME}/libqt6_shim.so" || die + fi # pax mark opera, bug #562038 pax-mark m "${OPERA_HOME}/opera" |