From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 88D831580E0 for ; Mon, 02 Jun 2025 22:45:57 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 6E83F34305E for ; Mon, 02 Jun 2025 22:45:57 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 2A62A1103C1; Mon, 02 Jun 2025 22:45:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id 1F8031103C1 for ; Mon, 02 Jun 2025 22:45:53 +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 C0AD6343006 for ; Mon, 02 Jun 2025 22:45:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5AD37275F for ; Mon, 02 Jun 2025 22:45:51 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1748904344.61d2a8e9e240c79f4dd7dfdbb33e84d1f3b4a469.chiitoo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/obs-studio/Manifest media-video/obs-studio/obs-studio-31.0.3-r2.ebuild media-video/obs-studio/obs-studio-9999.ebuild X-VCS-Directories: media-video/obs-studio/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: 61d2a8e9e240c79f4dd7dfdbb33e84d1f3b4a469 X-VCS-Branch: master Date: Mon, 02 Jun 2025 22:45:51 +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: 18fcfdac-3d72-4a3c-b37b-5fc3ef8bf628 X-Archives-Hash: 04925964eb7ce1668945079324b59079 commit: 61d2a8e9e240c79f4dd7dfdbb33e84d1f3b4a469 Author: Jimi Huotari gentoo org> AuthorDate: Mon Jun 2 21:40:32 2025 +0000 Commit: Jimi Huotari gentoo 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 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 )