From: "Jimi Huotari" <chiitoo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/
Date: Mon, 02 Jun 2025 22:45:51 +0000 (UTC) [thread overview]
Message-ID: <1748904344.61d2a8e9e240c79f4dd7dfdbb33e84d1f3b4a469.chiitoo@gentoo> (raw)
commit: 61d2a8e9e240c79f4dd7dfdbb33e84d1f3b4a469
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 2 21:40:32 2025 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Jun 2 22:45:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d2a8e9
media-video/obs-studio: update arm64 CEF revision
Update the CEF binary revision for arm64, which should fix build with
USE="browser" there, while also tweaking the variables for handling those
so that the versions are allowed to differ.
Also drop 'CMAKE_REMOVE_MODULES_LIST=( FindFreetype )' which no longer
does anything here.
Closes: https://bugs.gentoo.org/955518
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
media-video/obs-studio/Manifest | 1 +
media-video/obs-studio/obs-studio-31.0.3-r2.ebuild | 14 +++++++-------
media-video/obs-studio/obs-studio-9999.ebuild | 14 +++++++-------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index d03f187e110a..c02cce5d5b04 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,5 +1,6 @@
DIST cef_binary_6533_linux_aarch64.tar.xz 337489544 BLAKE2B f82cf2e8c80413c62315abd82f8565bbe4d4d056d9c8306bb08c3e6e9ce2920994b729cc27ddbbca4a206c8edcd9c5768410d6bdbe4e1e8e4887fe6da40010e3 SHA512 210567db67eaaaa0a2ff8718778aee90666e1a43ab7cb46832eae953e847d5e837445ee37d44701a0a546ab703b5ae298494d52e67eafc061c9eacb389a51b09
DIST cef_binary_6533_linux_aarch64_v3.tar.xz 336702348 BLAKE2B 437c3e5aa19822b111c29b80c771009c5c5e05aaa1373d086eb2b0a9bd8c12790e3b3bb8c12e9e191d481a7c970a58d98165794d3b8786fdd380588ef0a1bffd SHA512 fef7387085f1c4e4b3ee7b179b637b34c1e5a68055ca17801e6c81bbb08edd9e14e493c4bb481afa3a7b0aac6a11d1412aab84c0adf47cd5e121f94c32e5de92
+DIST cef_binary_6533_linux_aarch64_v4.tar.xz 337381068 BLAKE2B 7faa2b3718453ee2e2efe16c3fb25412e8ce9fe21654b4cc1334d5efe5281f23c0624bbbd28017defdcd9b5c8c00c8bf633b00e61f17dcb9cc948e44d0ba99f1 SHA512 41d2728b98a03ba7a988004dcfaeaee5ef7d5b8a6817cdd787b04c5b63cec546486507c807283a062f41f1c3d6bae77239c62d20defa013678ab5fc8b2d7b104
DIST cef_binary_6533_linux_x86_64.tar.xz 325687240 BLAKE2B 5d34cac26cd35ebb1ce5c4f978cbc16766ad51696c800c1d2c999d50e9340420c580094e57dc9d06f0aa063708c0aef45cee2cdcaad5ba999c7b5c722423de90 SHA512 2539e3cd59b70511f438921348472298ad6cd55c20516b19fc6f200c44ab157b067ef557e2e8ba790635b7351ea553fed044abf979fc6bdf0220b210d95b883b
DIST cef_binary_6533_linux_x86_64_v3.tar.xz 325417284 BLAKE2B 57838fc1250d07139a656cca37e7d2e6bd99e08288af573e85fe1063b5cc5e04ff3c1a299f8464ee845ea0bc98199b939868b97605fcf351126bef6434f849b0 SHA512 bbf33b8aa0fac828388ec09b526ac6ee7680bdf7983a2d88ff85640903a1819db06bd3d1edae63616631e94d74315ac17956ac9cb2e186668771becea2afc34d
DIST obs-browser-b56fd78936761891475458447c1cc9058bb9c2d4.tar.gz 113837 BLAKE2B e25b5f187d1316922e0cc53aafd44df6c4b6e5cbfc1a89c6f821912460887f3c5c5f62d3ca5a1e2f354704a073e286af245bf1bd5c3ccdf220b1d896349d1d11 SHA512 0244885ca8b64fc06108c57091474c5498c5b18755439119ebe58a387ec9a9a13a48c11149c9e8bbb64e4bdf897fdf28d67fa46fe76d1429669d140531bbf968
diff --git a/media-video/obs-studio/obs-studio-31.0.3-r2.ebuild b/media-video/obs-studio/obs-studio-31.0.3-r2.ebuild
index e3eb0f217edf..9557c124c31c 100644
--- a/media-video/obs-studio/obs-studio-31.0.3-r2.ebuild
+++ b/media-video/obs-studio/obs-studio-31.0.3-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype FindMbedTLS )
+CMAKE_REMOVE_MODULES_LIST=( FindMbedTLS )
LUA_COMPAT=( luajit )
# For the time being upstream supports up to Python 3.12 only.
# Any issues found with 3.13+ should be reported as a Gentoo bug.
@@ -11,8 +11,8 @@ PYTHON_COMPAT=( python3_{11..14} )
inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
-CEF_VERSION="cef_binary_6533_linux"
-CEF_REVISION="_v3"
+CEF_AMD64="cef_binary_6533_linux_x86_64_v3"
+CEF_ARM64="cef_binary_6533_linux_aarch64_v4"
OBS_BROWSER_COMMIT="b56fd78936761891475458447c1cc9058bb9c2d4"
OBS_WEBSOCKET_COMMIT="c542622d7b6d41ce5875f54efdab1d4ac2967ef4"
@@ -40,8 +40,8 @@ fi
SRC_URI+="
browser? (
- amd64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}_x86_64${CEF_REVISION}.tar.xz )
- arm64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}_aarch64${CEF_REVISION}.tar.xz )
+ amd64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_AMD64}.tar.xz )
+ arm64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_ARM64}.tar.xz )
)
"
@@ -238,8 +238,8 @@ src_configure() {
fi
if use browser; then
- use amd64 && mycmakeargs+=( -DCEF_ROOT_DIR=../${CEF_VERSION}_x86_64 )
- use arm64 && mycmakeargs+=( -DCEF_ROOT_DIR=../${CEF_VERSION}_aarch64 )
+ use amd64 && mycmakeargs+=( -DCEF_ROOT_DIR=../cef_binary_6533_linux_x86_64 )
+ use arm64 && mycmakeargs+=( -DCEF_ROOT_DIR=../cef_binary_6533_linux_aarch64 )
mycmakeargs+=( -DENABLE_WHATSNEW=ON )
else
mycmakeargs+=( -DENABLE_WHATSNEW=OFF )
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index bd0a96c51ede..b7d999976f30 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype FindMbedTLS )
+CMAKE_REMOVE_MODULES_LIST=( FindMbedTLS )
LUA_COMPAT=( luajit )
# For the time being upstream supports up to Python 3.12 only.
# Any issues found with 3.13+ should be reported as a Gentoo bug.
@@ -11,8 +11,8 @@ PYTHON_COMPAT=( python3_{11..14} )
inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
-CEF_VERSION="cef_binary_6533_linux"
-CEF_REVISION="_v3"
+CEF_AMD64="cef_binary_6533_linux_x86_64_v3"
+CEF_ARM64="cef_binary_6533_linux_aarch64_v4"
OBS_BROWSER_COMMIT="b56fd78936761891475458447c1cc9058bb9c2d4"
OBS_WEBSOCKET_COMMIT="c542622d7b6d41ce5875f54efdab1d4ac2967ef4"
@@ -40,8 +40,8 @@ fi
SRC_URI+="
browser? (
- amd64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}_x86_64${CEF_REVISION}.tar.xz )
- arm64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_VERSION}_aarch64${CEF_REVISION}.tar.xz )
+ amd64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_AMD64}.tar.xz )
+ arm64? ( https://cdn-fastly.obsproject.com/downloads/${CEF_ARM64}.tar.xz )
)
"
@@ -234,8 +234,8 @@ src_configure() {
fi
if use browser; then
- use amd64 && mycmakeargs+=( -DCEF_ROOT_DIR=../${CEF_VERSION}_x86_64 )
- use arm64 && mycmakeargs+=( -DCEF_ROOT_DIR=../${CEF_VERSION}_aarch64 )
+ use amd64 && mycmakeargs+=( -DCEF_ROOT_DIR=../cef_binary_6533_linux_x86_64 )
+ use arm64 && mycmakeargs+=( -DCEF_ROOT_DIR=../cef_binary_6533_linux_aarch64 )
mycmakeargs+=( -DENABLE_WHATSNEW=ON )
else
mycmakeargs+=( -DENABLE_WHATSNEW=OFF )
next reply other threads:[~2025-06-02 22:45 UTC|newest]
Thread overview: 172+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-02 22:45 Jimi Huotari [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-28 11:56 [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/ Jimi Huotari
2025-06-28 11:56 Jimi Huotari
2025-06-02 22:45 Jimi Huotari
2025-05-28 22:06 Jimi Huotari
2025-05-05 20:26 Jimi Huotari
2025-04-03 15:58 Jimi Huotari
2025-03-29 13:05 Jimi Huotari
2025-03-29 13:05 Jimi Huotari
2025-03-08 0:38 Jimi Huotari
2025-03-08 0:38 Jimi Huotari
2025-02-11 20:25 Jimi Huotari
2025-02-11 20:25 Jimi Huotari
2025-01-16 23:05 Jimi Huotari
2025-01-16 22:12 Jimi Huotari
2025-01-07 19:54 Sam James
2024-12-30 17:38 Jimi Huotari
2024-12-13 22:06 Jimi Huotari
2024-12-13 22:06 Jimi Huotari
2024-12-07 13:40 Jimi Huotari
2024-12-07 13:40 Jimi Huotari
2024-08-28 18:36 Jimi Huotari
2024-08-22 6:50 Jimi Huotari
2024-08-22 5:58 Jimi Huotari
2024-08-22 5:58 Jimi Huotari
2024-07-23 14:59 Jimi Huotari
2024-07-13 11:38 Jimi Huotari
2024-07-13 11:38 Jimi Huotari
2024-07-13 0:05 Jimi Huotari
2024-06-22 15:39 Jimi Huotari
2024-06-22 15:39 Jimi Huotari
2024-06-22 15:39 Jimi Huotari
2024-04-04 19:55 Jimi Huotari
2024-04-04 19:55 Jimi Huotari
2024-04-04 19:44 Jimi Huotari
2024-03-20 21:30 Jimi Huotari
2024-03-07 19:55 Andrew Ammerlaan
2024-01-31 7:18 Joonas Niilola
2023-12-28 2:57 Sam James
2023-12-16 20:56 Jimi Huotari
2023-12-16 20:56 Jimi Huotari
2023-11-24 15:52 Jimi Huotari
2023-10-21 19:18 Jimi Huotari
2023-10-05 19:34 Mart Raudsepp
2023-07-26 17:41 Jimi Huotari
2023-07-26 17:41 Jimi Huotari
2023-07-25 14:53 Jimi Huotari
2023-07-17 21:45 Jimi Huotari
2023-07-17 21:45 Jimi Huotari
2023-06-19 14:05 Jimi Huotari
2023-06-19 14:05 Jimi Huotari
2023-06-19 14:05 Jimi Huotari
2023-05-29 18:08 Jimi Huotari
2023-05-29 18:08 Jimi Huotari
2023-05-29 18:08 Jimi Huotari
2023-05-09 19:08 Jimi Huotari
2023-05-09 19:08 Jimi Huotari
2023-05-06 11:00 Jimi Huotari
2023-05-06 11:00 Jimi Huotari
2023-05-06 11:00 Jimi Huotari
2023-02-06 4:21 Jimi Huotari
2023-02-06 4:21 Jimi Huotari
2023-01-11 13:04 Jimi Huotari
2023-01-11 13:04 Jimi Huotari
2023-01-10 21:28 Jimi Huotari
2023-01-10 21:28 Jimi Huotari
2022-11-23 1:45 Sam James
2022-11-12 6:14 Sam James
2022-11-08 16:20 Jimi Huotari
2022-11-08 16:20 Jimi Huotari
2022-11-08 16:20 Jimi Huotari
2022-04-25 20:19 Ionen Wolkens
2022-04-25 20:19 Ionen Wolkens
2022-04-25 20:19 Ionen Wolkens
2022-04-01 19:43 Ionen Wolkens
2022-03-13 11:43 David Seifert
2022-03-04 18:14 Ionen Wolkens
2022-03-04 18:14 Ionen Wolkens
2022-02-23 1:39 Ionen Wolkens
2022-02-23 1:39 Ionen Wolkens
2022-02-23 1:39 Ionen Wolkens
2022-02-17 1:06 Ionen Wolkens
2022-02-17 1:06 Ionen Wolkens
2022-02-17 1:06 Ionen Wolkens
2022-01-22 0:34 Ionen Wolkens
2021-10-26 22:02 Ionen Wolkens
2021-10-26 22:02 Ionen Wolkens
2021-10-08 2:29 Ionen Wolkens
2021-10-08 2:29 Ionen Wolkens
2021-10-02 23:58 Ionen Wolkens
2021-10-02 23:58 Ionen Wolkens
2021-09-25 19:08 Sam James
2021-07-01 16:57 Ionen Wolkens
2021-07-01 16:57 Ionen Wolkens
2021-07-01 16:57 Ionen Wolkens
2021-07-01 16:57 Ionen Wolkens
2021-05-07 21:23 Andreas Sturmlechner
2021-05-07 21:23 Andreas Sturmlechner
2021-01-31 15:16 Andreas Sturmlechner
2020-12-22 20:06 Rick Farina
2020-12-22 19:45 Rick Farina
2020-12-16 6:08 Sam James
2020-12-04 3:16 Rick Farina
2020-08-10 20:55 Lars Wendler
2020-07-27 16:40 Sam James
2020-05-19 18:11 Georgy Yakovlev
2020-05-19 18:11 Georgy Yakovlev
2020-05-14 15:57 Rick Farina
2020-05-10 11:42 Andreas Sturmlechner
2020-05-04 13:39 Rick Farina
2020-05-02 11:31 Andreas Sturmlechner
2020-05-02 11:31 Andreas Sturmlechner
2020-04-03 20:35 Andreas Sturmlechner
2020-04-03 20:35 Andreas Sturmlechner
2020-03-24 17:54 Rick Farina
2020-03-19 16:01 Rick Farina
2020-02-26 15:25 Ben Kohler
2019-12-26 21:11 Andreas Sturmlechner
2019-12-26 21:11 Andreas Sturmlechner
2019-11-03 17:19 Andreas Sturmlechner
2019-11-03 17:19 Andreas Sturmlechner
2019-11-03 17:19 Andreas Sturmlechner
2019-06-22 11:44 Andreas Sturmlechner
2019-05-08 22:56 Andreas Sturmlechner
2019-05-08 22:56 Andreas Sturmlechner
2019-04-06 20:34 Andreas Sturmlechner
2019-04-06 20:34 Andreas Sturmlechner
2019-04-06 20:34 Andreas Sturmlechner
2019-02-28 22:49 Patrice Clement
2019-02-28 22:49 Patrice Clement
2018-12-03 2:43 Jonathan Callen
2018-11-13 20:33 Craig Andrews
2018-10-09 10:02 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-07-13 9:36 Tony Vroon
2018-07-13 9:36 Tony Vroon
2018-07-13 9:36 Tony Vroon
2018-07-13 9:36 Tony Vroon
2018-07-13 9:36 Tony Vroon
2018-03-25 21:59 Patrice Clement
2018-02-18 17:16 Patrice Clement
2018-02-18 17:16 Patrice Clement
2018-01-06 2:14 Andreas Sturmlechner
2018-01-06 2:14 Andreas Sturmlechner
2017-10-27 21:02 Patrice Clement
2017-10-27 21:02 Patrice Clement
2017-10-19 21:37 Jonas Stein
2017-10-11 21:23 Patrice Clement
2017-08-15 7:54 Patrice Clement
2017-08-15 7:54 Patrice Clement
2017-05-23 19:49 Michał Górny
2017-05-23 19:49 Michał Górny
2017-05-07 18:33 Michał Górny
2017-05-07 18:33 Michał Górny
2017-03-02 10:03 Michael Palimaka
2017-01-26 22:57 David Seifert
2017-01-26 22:57 David Seifert
2016-12-29 12:25 Michael Palimaka
2016-12-29 12:25 Michael Palimaka
2016-12-29 12:25 Michael Palimaka
2016-10-03 19:30 Patrice Clement
2016-10-03 19:30 Patrice Clement
2016-10-03 19:30 Patrice Clement
2016-08-14 19:39 Michael Palimaka
2016-07-17 13:33 Patrice Clement
2016-07-03 13:09 Patrice Clement
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1748904344.61d2a8e9e240c79f4dd7dfdbb33e84d1f3b4a469.chiitoo@gentoo \
--to=chiitoo@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox