diff options
| author |   Jimi Huotari <chiitoo@gentoo.org> | 2022-02-15 17:01:25 +0200 |
|---|---|---|
| committer |   Ionen Wolkens <ionen@gentoo.org> | 2022-02-16 19:15:50 -0500 |
| commit | e973ca1ee6ace19870ca8b15228050e016f071a2 (patch) | |
| tree | d5b6c62cfe3b6d48e31a5cecc91d16b571b21bc7 /media-video | |
| parent | dev-util/quilt: Version bump and minor fix (diff) | |
| download | gentoo-e973ca1ee6ace19870ca8b15228050e016f071a2.tar.gz gentoo-e973ca1ee6ace19870ca8b15228050e016f071a2.tar.bz2 gentoo-e973ca1ee6ace19870ca8b15228050e016f071a2.zip | |
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 <chiitoo@gentoo.org>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/obs-studio/Manifest | 1 | ||||
| -rw-r--r-- | 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 } |