From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5554B15808B for ; Thu, 17 Feb 2022 01:06:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B707E0875; Thu, 17 Feb 2022 01:06:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B6F6E0875 for ; Thu, 17 Feb 2022 01:06:47 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4F96342F11 for ; Thu, 17 Feb 2022 01:06:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A3212A0 for ; Thu, 17 Feb 2022 01:06:44 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1645056950.e973ca1ee6ace19870ca8b15228050e016f071a2.ionen@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-9999.ebuild X-VCS-Directories: media-video/obs-studio/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: e973ca1ee6ace19870ca8b15228050e016f071a2 X-VCS-Branch: master Date: Thu, 17 Feb 2022 01:06:44 +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: 799096c7-1c69-4c82-a61c-8f5d4792de9f X-Archives-Hash: 012acadbe76926ac465c8d621578973a commit: e973ca1ee6ace19870ca8b15228050e016f071a2 Author: Jimi Huotari gentoo org> AuthorDate: Tue Feb 15 15:01:25 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Feb 17 00:15:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e973ca1e media-video/obs-studio: update CEF and deps/remove patch/workarounds PulseAudio detection during configure has been improved upon, and the Python issue should be gone as well. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jimi Huotari gentoo.org> Signed-off-by: Ionen Wolkens gentoo.org> media-video/obs-studio/Manifest | 1 + media-video/obs-studio/obs-studio-9999.ebuild | 25 ++++++++----------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 8e4776e01191..3136925c5622 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,4 +1,5 @@ DIST cef_binary_4280_linux64.tar.bz2 79740715 BLAKE2B c648a9a4205094450f9eae407e98cbc3da2b7cd81b3c19c4f52cfa3efcca01dce40528018996c65f026eb97520d78040165d1906b0d19236a86e76ec39c58c26 SHA512 060a5a8716a75b4b96dfb6ac28c132e22b93107915d680311c1b9d4fd12c7712a9e3497338eac6d2b9f4e74f2dc005a75d195c597bba049e4731fe3724f519ba +DIST cef_binary_4638_linux64.tar.bz2 104578246 BLAKE2B 13ee05d4a2fbf27290506297416b298c786954450c19183b493d13aa691db409c22b30870fbc55adf814ff30142a666eb8b172f16ccc48e6cf01135c72e5d6d6 SHA512 2eb01151e07adf332affce36a659c6e87da1fbc403c65db7e7c53472ff418df6cd04300a7c6ebc8789c094926429cc70d829e556e5de3127da230f8258fabe49 DIST obs-browser-aee43000bd994022cd73e32dc50938ab777d4a06.tar.gz 89603 BLAKE2B a51b92f829ecb7055dcf969d6d5bdc4632b51288f0bc7e2ab66fda087da608869ddffccda83aa925f049c79e745a6f67e70ec72303184b970f5009fe37b34054 SHA512 8159ca02b5c30d2733ce8e566f21d6b77d6b7beabd0a5898049ee83b0b4d720b967fc55fcf876cd772fdaa12ca08163a0f8cabf249a9b3b6eb56b7666d1192c7 DIST obs-browser-f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz 79259 BLAKE2B 28cfa46928de0b5e626b384673f7b92b3a48cb631066dda06288c51df78f06b913707a1295a5142d4521505b0678a6c639bfbb5b8a066d585fa12849578a382e SHA512 3ecab39bfb36774ac501de087ca70ecde12f408cfd54cdf12539a92e89d0cf531767a066ff77139389158c46beee423cf1848081ed187890b86241aa96f7b179 DIST obs-studio-27.0.1.tar.gz 15787807 BLAKE2B c2ea571f06a81b2e87ce5d9fd010610ea6cc2753223e6373025f0389972d4638a5f3ff1802f9f0af2c631d71ebcf4603e064da804e8c89eb032b1ad5743d1bd4 SHA512 c15dda62c1f212f623914e61a90c6b1e035720fb84d64726c14f43d77ae7569777a23d04221db34347ce610e7c3407c29e726ae36412e98e34ea2ddb2072b7f3 diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index 6e23d6b2b473..886f44b7284f 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,8 +9,8 @@ PYTHON_COMPAT=( python3_{8..10} ) inherit cmake lua-single python-single-r1 xdg -OBS_BROWSER_COMMIT="2a338b7c76d5dd0a6b23f1d49affefd40213b0e9" -CEF_DIR="cef_binary_4280_linux64" +OBS_BROWSER_COMMIT="b0d687937af876b52b69c46e276b4ab601b07f0e" +CEF_DIR="cef_binary_4638_linux64" if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -61,6 +61,7 @@ DEPEND=" media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus + sys-apps/pciutils sys-libs/zlib:= virtual/udev x11-libs/libX11 @@ -82,6 +83,7 @@ DEPEND=" media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups + x11-libs/cairo x11-libs/libdrm x11-libs/libXScrnSaver x11-libs/libXcursor @@ -112,17 +114,15 @@ RDEPEND="${DEPEND}" QA_PREBUILT=" usr/lib*/obs-plugins/chrome-sandbox + usr/lib*/obs-plugins/libcef.so usr/lib*/obs-plugins/libEGL.so usr/lib*/obs-plugins/libGLESv2.so - usr/lib*/obs-plugins/libcef.so + usr/lib*/obs-plugins/libvk_swiftshader.so + usr/lib*/obs-plugins/libvulkan.so.1 usr/lib*/obs-plugins/swiftshader/libEGL.so usr/lib*/obs-plugins/swiftshader/libGLESv2.so " -PATCHES=( - "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" -) - pkg_setup() { use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup @@ -153,7 +153,6 @@ src_configure() { -DDISABLE_LIBFDK=$(usex !fdk) -DENABLE_PIPEWIRE=$(usex pipewire) -DDISABLE_PULSEAUDIO=$(usex !pulseaudio) - $(cmake_use_find_package pulseaudio PulseAudio) -DDISABLE_SPEEXDSP=$(usex !speex) -DDISABLE_V4L2=$(usex !v4l) -DDISABLE_VLC=$(usex !vlc) @@ -203,12 +202,4 @@ pkg_postinst() { elog "be enabled." elog fi - - if use python; then - ewarn "This ebuild applies a patch that is not yet accepted upstream," - ewarn "and while it fixes Python support at least to some extent, it" - ewarn "may cause other issues." - ewarn "" - ewarn "Please report any such issues to the Gentoo maintainer." - fi }