diff options
Diffstat (limited to 'media-video/obs-studio')
| -rw-r--r-- | media-video/obs-studio/Manifest | 13 | ||||
| -rw-r--r-- | media-video/obs-studio/metadata.xml | 1 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-27.1.3-r2.ebuild (renamed from media-video/obs-studio/obs-studio-27.1.3-r1.ebuild) | 3 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-27.2.3-r1.ebuild (renamed from media-video/obs-studio/obs-studio-27.0.1-r1.ebuild) | 48 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-9999.ebuild | 28 |
5 files changed, 34 insertions, 59 deletions
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 2010835711bf..941c26b56e0a 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,11 +1,12 @@ AUX obs-studio-26.1.2-python-3.8.patch 653 BLAKE2B 6fbafacb2b2a7dc7dbb15f63eea9463e7c26744caab9399146bd404227d6b7e4119cbeb8f93b4b5c81399d342f02b002d79ad72d2a8dde3317d8f5a67f163dc9 SHA512 598701d227feab450d2f8db40d18b7380dcbedb13b6586deb481b7164c33e12e04b1d5babdadbe073d5af0ac899d783f7a2a2d2ed020f19edb6146cfd00798af AUX obs-studio-27.1.3-ffmpeg-5.0.patch 11768 BLAKE2B 35bf91bf2921ea1a8007a6eb973f60724de5b53485d429199af5ea63b290313066367f83bd2f2b8cbd5a31a0186d9c2cce0b1ba9f98cc346209ae50a0bae955a SHA512 04332aab35aed3ced4bab6a5b9e267224a816ba4fea190272e3516358ff96714dc1fe087d0092bcad753f87b62c500cac62398fc93f9ae04fd2de742ec1a6413 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-915761778ec1eae99e740ad4bf63b40db3142ee2.tar.gz 100021 BLAKE2B d72df588aaeaf199c6ea5a7e419bb4792ef8b4c4237e700f75064d96caaec83ed2be2ea4ab34ba31e30a87ec6cbf1f267dd7b100c3a6cfec36e46b2eca8c4b2e SHA512 3ab6118a9509054ea4e8aed14dade7f374495ba25fcb5295a3ef7ed29e6e3305b0ae2f12ba2c0d27fcd6886822c98ab44a48fa9a4b66ae0507ab2bf1001157cb 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 DIST obs-studio-27.1.3.tar.gz 15994678 BLAKE2B 5544a1ecdb04dca7f6422936ea5499a206b4beb8e5332605c18cd72a91ce73aa74ff06c49a106931822c1c413ee94d383942f173a71f2b21168a00495b4e301f SHA512 04c11c79e3b091aa9ea8fc6674c9fbcaa1c924fe049f68e9be63f63724c31305d6e4fb33aecdd4d0095d20013e2ee188983f6938b175257368d2260681c2fb39 -EBUILD obs-studio-27.0.1-r1.ebuild 5401 BLAKE2B 33a0bde9d9e7ca353f7b14ace507eefaca53dc9ba52ee079c02032789dc851060386d114a5d9f0d5936e6f8bce8d7c535e99ad10a5b2778bbdff0aa6ee41a2a9 SHA512 e95c75cb4c6f08794a12501941660b7a8a2f75bcb4e26315101c67d5e34bdd66b62213f707f176a146531cb314ed9931603df0c3c60f6c52076a8dc4e6e7de34 -EBUILD obs-studio-27.1.3-r1.ebuild 5279 BLAKE2B 7636a5ef254693b7f1608e6f3540dece35cce32806a13100556be6e2065be9b583f80c616c6c23b3ecc703d06ace8ca40109ff237b7524eed92394242c8a54e0 SHA512 11a8ae601952cf07ecd9ab3ac83acd678c15b5214ab786443e958b066d7383459d114c1f28e64c029358888a84c46ab56dde11636a11fab6eb6634e01f2c2fcf -EBUILD obs-studio-9999.ebuild 5234 BLAKE2B e89b74d8a6bf22634981acc3c6dfbbc6dbb1c9bd00356ee87afbe45c182014779bd54cc3666c06dfd7c888ada0b467d2bb471cdcd00edb44e326422e52750283 SHA512 1dde6de38391affd8d3b4c20e6ee8902f88dcdf53c9e134e43d658f28ee6470d05b346aa9b44611c9e0936dd8d431760043080567e65698be69e306974e28dbb -MISC metadata.xml 1503 BLAKE2B 38225fe9539f6afe086377e5bbdd88b918aebe921e293617ba1bd142507be63394c9e861f34f85ee5adb8760eca7e44209175716a4f47ede40f0c0e2c69f3f69 SHA512 157a2bcf17d7330d6a93ab9935cd05fd6c4b303074df781daa2b38ed4ab16714e273bde07345ac1040404dc9276e763e0681852272f38e180e2d171ed32c3e8b +DIST obs-studio-27.2.3.tar.gz 16383685 BLAKE2B 76802ba67dcebccabd9b2a1f09f505a4aea83887b445093c51a2c7a49fbaa064549b6212bd1b2f3200674a78349b2de4bfa54d14871c76be248cd62139d98a56 SHA512 c34e850e1a83e55aed952611257446a39d7ba4456b94f74d91c85d09d77361af2f76848f7d3f3d8ba7ae76c926129adad555e2f54d632658832596d0f2696a3c +EBUILD obs-studio-27.1.3-r2.ebuild 5231 BLAKE2B af7ad6d47fae292e9907ca5f28898e83f512358ca27a14b8ac320e78371cf28492dc95df283dc562a685bf38f90cf703fac0b83cec5d540de7f6a7c7bf55b8aa SHA512 846279f7d20195924e8a3d7c8ecdd4ec4e1573c2c93d36648b2cdec8543cb82e232e996b6f707cc20be99eacb9b5ecf36d14f2c81444270d10e1a978502640d3 +EBUILD obs-studio-27.2.3-r1.ebuild 4912 BLAKE2B 60d4bd7ab7e3f24796d5353dceb428855493847cbd480e82bc8b39ab9c745ebbe665849048b29f5614b624c9ccc9fd87ec3dd1742215ed527d64581d3933ac1a SHA512 1bd27589d22bc5d6cf17e37340e1c48bacfed68e1ce94c33f5213ae99594bf3ee75e7fdab1c1084f89e0381d57aceb10db2d26222d4b10033f0de69e843e9552 +EBUILD obs-studio-9999.ebuild 4912 BLAKE2B 60d4bd7ab7e3f24796d5353dceb428855493847cbd480e82bc8b39ab9c745ebbe665849048b29f5614b624c9ccc9fd87ec3dd1742215ed527d64581d3933ac1a SHA512 1bd27589d22bc5d6cf17e37340e1c48bacfed68e1ce94c33f5213ae99594bf3ee75e7fdab1c1084f89e0381d57aceb10db2d26222d4b10033f0de69e843e9552 +MISC metadata.xml 1415 BLAKE2B 0dda0116d11846076fba50dbb159af34dd1c8cf1f77dadeab5b280d5190b99dae3d73a20bbd5ef52d63d96958a078c0d2ae61f5e8b32a64126a579a47e5cbd5e SHA512 7327bd2d7ecff1db9fbd721fc34e41fcafbde30b898381406da9ee3837410c05f95d64f124a7b616ec7b96d7b2d450dd5fdae6df0b1afb30837ef55864c329b0 diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml index a68f46af24b8..0945dd8d23e2 100644 --- a/media-video/obs-studio/metadata.xml +++ b/media-video/obs-studio/metadata.xml @@ -19,7 +19,6 @@ <flag name="browser">Enable browser source support via (precompiled) CEF.</flag> <flag name="decklink">Build the Decklink plugin.</flag> <flag name="fdk">Build with LibFDK AAC support.</flag> - <flag name="nvenc">Build with NVENC encoding support for nVidia video cards.</flag> <flag name="pipewire">Build with PipeWire support.</flag> <flag name="python">Build with scripting support for Python 3.</flag> <flag name="speex">Build with Speex noise suppression filter support.</flag> diff --git a/media-video/obs-studio/obs-studio-27.1.3-r1.ebuild b/media-video/obs-studio/obs-studio-27.1.3-r2.ebuild index 34b197508564..a018ce0e7966 100644 --- a/media-video/obs-studio/obs-studio-27.1.3-r1.ebuild +++ b/media-video/obs-studio/obs-studio-27.1.3-r2.ebuild @@ -58,7 +58,7 @@ DEPEND=" dev-qt/qtxml:5 media-libs/libglvnd media-libs/x264:= - media-video/ffmpeg:=[x264] + media-video/ffmpeg:=[nvenc?,x264] net-misc/curl sys-apps/dbus sys-libs/zlib:= @@ -94,7 +94,6 @@ DEPEND=" fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( ${LUA_DEPS} ) - nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-sound/pulseaudio ) python? ( ${PYTHON_DEPS} ) diff --git a/media-video/obs-studio/obs-studio-27.0.1-r1.ebuild b/media-video/obs-studio/obs-studio-27.2.3-r1.ebuild index 4c9f4cd3f3a8..b9550e6de3df 100644 --- a/media-video/obs-studio/obs-studio-27.0.1-r1.ebuild +++ b/media-video/obs-studio/obs-studio-27.2.3-r1.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) LUA_COMPAT=( luajit ) PYTHON_COMPAT=( python3_{8..10} ) -inherit xdg cmake lua-single python-single-r1 +inherit cmake lua-single python-single-r1 xdg -OBS_BROWSER_COMMIT="f1a61c5a2579e5673765c31a47c2053d4b502d4b" -CEF_DIR="cef_binary_4280_linux64" +OBS_BROWSER_COMMIT="915761778ec1eae99e740ad4bf63b40db3142ee2" +CEF_DIR="cef_binary_4638_linux64" if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -43,6 +43,7 @@ BDEPEND=" python? ( dev-lang/swig ) " DEPEND=" + dev-libs/glib:2 dev-libs/jansson:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -55,10 +56,12 @@ DEPEND=" dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 + media-libs/libglvnd media-libs/x264:= - media-video/ffmpeg:=[x264] + media-video/ffmpeg:=[nvenc?,x264] net-misc/curl sys-apps/dbus + sys-apps/pciutils sys-libs/zlib:= virtual/udev x11-libs/libX11 @@ -70,6 +73,7 @@ DEPEND=" alsa? ( media-libs/alsa-lib ) browser? ( app-accessibility/at-spi2-atk + app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib @@ -77,7 +81,10 @@ DEPEND=" dev-libs/nss media-libs/alsa-lib media-libs/fontconfig + media-libs/mesa[gbm(+)] net-print/cups + x11-libs/cairo + x11-libs/libdrm x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXdamage @@ -89,7 +96,6 @@ DEPEND=" fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( ${LUA_DEPS} ) - nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-sound/pulseaudio ) python? ( ${PYTHON_DEPS} ) @@ -107,17 +113,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 @@ -137,7 +141,7 @@ src_unpack() { src_configure() { local libdir=$(get_libdir) local mycmakeargs=( - $(usex browser -DCEF_ROOT_DIR=../${CEF_DIR} '') + $(usev browser -DCEF_ROOT_DIR=../${CEF_DIR}) -DBUILD_BROWSER=$(usex browser) -DBUILD_VST=no -DENABLE_WAYLAND=$(usex wayland) @@ -197,22 +201,4 @@ pkg_postinst() { elog "be enabled." elog fi - - if ! has_version "sys-apps/dbus"; then - elog - elog "The 'sys-apps/dbus' package is not installed, but" - elog "could be used for disabling hibernating, screensaving," - elog "and sleeping. Where it is not installed," - elog "'xdg-screensaver reset' is used instead" - elog "(if 'x11-misc/xdg-utils' is installed)." - 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 } diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index 6e23d6b2b473..b9550e6de3df 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="915761778ec1eae99e740ad4bf63b40db3142ee2" +CEF_DIR="cef_binary_4638_linux64" if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -58,9 +58,10 @@ DEPEND=" dev-qt/qtxml:5 media-libs/libglvnd media-libs/x264:= - media-video/ffmpeg:=[x264] + media-video/ffmpeg:=[nvenc?,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 @@ -94,7 +96,6 @@ DEPEND=" fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( ${LUA_DEPS} ) - nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-sound/pulseaudio ) python? ( ${PYTHON_DEPS} ) @@ -112,17 +113,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 +152,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 +201,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 } |