From 7014a5a3ea0feffab9701fdd6b64cc7667a985af Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Jun 2019 17:36:28 +0100 Subject: gentoo resync : 30.06.2019 --- media-video/obs-studio/Manifest | 7 +- .../obs-studio-23.2.1-use-correct-libdir.patch | 50 ++++++++ media-video/obs-studio/obs-studio-23.0.1.ebuild | 129 -------------------- media-video/obs-studio/obs-studio-23.1.0-r1.ebuild | 130 -------------------- media-video/obs-studio/obs-studio-23.2.1.ebuild | 132 +++++++++++++++++++++ 5 files changed, 185 insertions(+), 263 deletions(-) create mode 100644 media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch delete mode 100644 media-video/obs-studio/obs-studio-23.0.1.ebuild delete mode 100644 media-video/obs-studio/obs-studio-23.1.0-r1.ebuild create mode 100644 media-video/obs-studio/obs-studio-23.2.1.ebuild (limited to 'media-video/obs-studio') diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 5d9198069b77..ce0e961af931 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,6 +1,5 @@ -DIST obs-studio-23.0.1.tar.gz 6223214 BLAKE2B c3b65ad9134aefc36a3fa33b8d185a1ee76f76c10edd30d5ad8a7af86605c4e7b3b8d83c5570203d926655131f7c20f4ef11dcbf55c7af745efc2b68d4933c54 SHA512 6877d4bf635a9769d634683a85075a5fe3a5de1fcc83882647dfbc379a897eee05b69c2159e290ff73f53aa7c03027ea4ea15e1169de57c2c50f4e504eff410f -DIST obs-studio-23.1.0.tar.gz 6192139 BLAKE2B 8c85d21f68b0dc799a8fdfce3ff94d837d0e02bfa55606eec9985d2c2d1c3d9ae78664ba8b17f393abb197f1595fa0f78f314fe474883a81166d9c6a0967682c SHA512 ab4f71430ae314774afbba8b8e39c4eb35ab147d49d6d33b188e7a820b1198ccbb6005fad111502834652b5261b88d07c075094a8303ea7294da3171e8e015bb -EBUILD obs-studio-23.0.1.ebuild 2999 BLAKE2B 967cca610af94878444107a34cad25854e8f1b6d15bf68e7d4390ac069a47beb2a21564a56cd3896f76f1d3314fefb50922915ec79fa074fa5850931e4bc74c3 SHA512 f119490d232ab884b2f7098522bd6c25a367f24c124f0ebca4ad24984dafe3b66d4c6df66f64e002f5f27516388a3d9d5dbaf1511607dbf5cae105fe3aaa30a8 -EBUILD obs-studio-23.1.0-r1.ebuild 3015 BLAKE2B e6eeeede23cea3713a2bbc98fd548cda2616906a67daf9ab38e1a364177219136c5362f9d2054506f7d3fffb5be270d72567a62b3cefaf81a09c3411a34da197 SHA512 f39b3e9ba7f67202294e29253f6a9817ddeed39b0ee2e270274fc8887129e7d948c756d220f4d16ca09528e74a01c21bacbe947d763a86466e3b1d672201ad50 +AUX obs-studio-23.2.1-use-correct-libdir.patch 1776 BLAKE2B 4b3bcc6a0b1c128b3b2e90ce65d8515847413fb7b879943cd42789b8597dd7cb7036916cc5c796fb860237235cfba464c2a51c7aa43fb607f21dd9b823e9b2ce SHA512 33396fdb59d0588b8cae14539742f65d4f257ad1b9fb85fefae68c636de31099d8878e4b5ffde2ca16575c4ebe642164a2a8a4b8e87ca7101cf5bb3474bcd367 +DIST obs-studio-23.2.1.tar.gz 6204515 BLAKE2B bd025a1ec2809e8a0b47fba79c6a3d40feb255a03a461725501a9c7cdbc40c04b75ff714fa4b3787f876a3f524f3371119a3ea9666c3aeb003184f1eb2a63123 SHA512 aabc23d825c2ca3f40274a8e2c4935939dab4955d929c44b28cebde114e808543c1c0dc05791bb6d9f2611effb0f2cb3e20c9a653154c30a9851ea94e74c8169 +EBUILD obs-studio-23.2.1.ebuild 3076 BLAKE2B 537845e1bb605bef3fb624912c2433dd52c350119a4ae6bb6a620b3bfa0de6a5170074b3b5c99521e7d54d255e27b32f4e8c117e545e06c9302e2560ab1d9fa6 SHA512 02fb36afdee9f05b98df9b21ae9c6fb449e8acb8be03aaf6b7e8533c3546fc3a72376fac4a2279a9eb96c73203c6cceb9658904e8226df1bd274acbb80c97c12 EBUILD obs-studio-9999.ebuild 2984 BLAKE2B c2421879062c3593fd6644086b51d6a8bd1f9077d252b406ce6505d5eb052bbc2dff3ac0acd73fd6fab7d627f9b95c9588b59c7084be802f52d3d2e832daa3c3 SHA512 7a95552fcd24e0404b5a6e724c8d0e9ddbfedae67867d9a0119c1a32c2bb1f99f7d779b3a12da8a252e24db9a6e6b80f80f5c6879d30ba9b8f708c2fe24e8805 MISC metadata.xml 1122 BLAKE2B 608bff24775bd69702b19d9b1db4260ed1e5bf7d932f917d3a27d284a791374211c7fec019bd3a742552cf11142df3d2a4877d81645244bc81a6df5e60ae9f71 SHA512 29291de223d1d70f78b419c05fec1cca18e8dcd52ed5619dff51a130f9e064369378e9e803f3dd5e7c86c9f505ae506917ec04e2c9adadfcc1a23c9aeb27192f diff --git a/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch b/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch new file mode 100644 index 000000000000..619c414d6b8a --- /dev/null +++ b/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch @@ -0,0 +1,50 @@ +From ab67b39257be83eaab87c4a938c4c58b5cccad7e Mon Sep 17 00:00:00 2001 +From: Jimi Huotari +Date: Fri, 21 Jun 2019 17:48:32 +0300 +Subject: [PATCH] cmake: Install 'libobs.pc' under the correct 'libdir' + +In 'libobs/CMakeLists.txt', use '${CMAKE_INSTALL_LIBDIR}' instead of +'${CMAKE_INSTALL_PREFIX}/lib', as the latter results into 'libobs.pc' +being installed under '/lib' when '/lib64' would be more appropriate. + +In 'libobs/libobs.pc.in', use '@CMAKE_INSTALL_FULL_LIBDIR@' for +'libdir', '@CMAKE_INSTALL_FULL_INCLUDEDIR@' for 'includedir', +and '@CMAKE_INSTALL_PREFIX@' for 'prefix'. + +Gentoo-Bug: https://bugs.gentoo.org/644538 +--- + libobs/CMakeLists.txt | 2 +- + libobs/libobs.pc.in | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt +index fed3e694..86811481 100644 +--- a/libobs/CMakeLists.txt ++++ b/libobs/CMakeLists.txt +@@ -454,7 +454,7 @@ if(UNIX AND NOT APPLE) + set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}") + endforeach() + CONFIGURE_FILE("libobs.pc.in" "libobs.pc" @ONLY) +- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + endif() + + set_target_properties(libobs PROPERTIES +diff --git a/libobs/libobs.pc.in b/libobs/libobs.pc.in +index 03fe4cdd..f6c471ba 100644 +--- a/libobs/libobs.pc.in ++++ b/libobs/libobs.pc.in +@@ -1,7 +1,7 @@ +-prefix=@DEST_DIR@ ++prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@OBS_LIBRARY_DESTINATION@ +-includedir=${prefix}/include ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: libobs + Description: OBS Studio Library +-- +2.22.0 + diff --git a/media-video/obs-studio/obs-studio-23.0.1.ebuild b/media-video/obs-studio/obs-studio-23.0.1.ebuild deleted file mode 100644 index 6ee58e5d0a11..000000000000 --- a/media-video/obs-studio/obs-studio-23.0.1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_5,3_6,3_7} ) - -inherit cmake-utils python-single-r1 xdg-utils - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git" - EGIT_SUBMODULES=() -else - SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Software for Recording and Streaming Live Video Content" -HOMEPAGE="https://obsproject.com" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND=" - luajit? ( dev-lang/swig ) - python? ( dev-lang/swig ) -" -DEPEND=" - >=dev-libs/jansson-2.5 - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtsql:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - media-video/ffmpeg:=[x264] - net-misc/curl - x11-libs/libXcomposite - x11-libs/libXinerama - x11-libs/libXrandr - alsa? ( media-libs/alsa-lib ) - fdk? ( media-libs/fdk-aac:= ) - imagemagick? ( media-gfx/imagemagick:= ) - jack? ( virtual/jack ) - luajit? ( dev-lang/luajit:2 ) - nvenc? ( - || ( - =media-video/ffmpeg-4[video_cards_nvidia] - ) - ) - pulseaudio? ( media-sound/pulseaudio ) - python? ( ${PYTHON_DEPS} ) - speex? ( media-libs/speexdsp ) - truetype? ( - media-libs/fontconfig - media-libs/freetype - ) - v4l? ( media-libs/libv4l ) -" -RDEPEND="${DEPEND}" - -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local libdir=$(get_libdir) - local mycmakeargs=( - -DDISABLE_ALSA=$(usex !alsa) - -DDISABLE_FREETYPE=$(usex !truetype) - -DDISABLE_JACK=$(usex !jack) - -DDISABLE_LIBFDK=$(usex !fdk) - -DDISABLE_PULSEAUDIO=$(usex !pulseaudio) - -DDISABLE_SPEEXDSP=$(usex !speex) - -DDISABLE_V4L2=$(usex !v4l) - -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick) - -DOBS_MULTIARCH_SUFFIX=${libdir#lib} - -DOBS_VERSION_OVERRIDE=${PV} - -DUNIX_STRUCTURE=1 - ) - - if use luajit || use python; then - mycmakeargs+=( - -DDISABLE_LUA=$(usex !luajit) - -DDISABLE_PYTHON=$(usex !python) - -DENABLE_SCRIPTING=yes - ) - else - mycmakeargs+=( -DENABLE_SCRIPTING=no ) - fi - - cmake-utils_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update - - if ! use alsa && ! use pulseaudio; then - elog - elog "For the audio capture features to be available," - elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to" - 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 -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/media-video/obs-studio/obs-studio-23.1.0-r1.ebuild b/media-video/obs-studio/obs-studio-23.1.0-r1.ebuild deleted file mode 100644 index cc23ee0bb08a..000000000000 --- a/media-video/obs-studio/obs-studio-23.1.0-r1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_5,3_6,3_7} ) - -inherit cmake-utils python-single-r1 xdg-utils - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git" - EGIT_SUBMODULES=() -else - SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Software for Recording and Streaming Live Video Content" -HOMEPAGE="https://obsproject.com" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND=" - luajit? ( dev-lang/swig ) - python? ( dev-lang/swig ) -" -DEPEND=" - >=dev-libs/jansson-2.5 - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - media-video/ffmpeg:=[x264] - net-misc/curl - x11-libs/libXcomposite - x11-libs/libXinerama - x11-libs/libXrandr - alsa? ( media-libs/alsa-lib ) - fdk? ( media-libs/fdk-aac:= ) - imagemagick? ( media-gfx/imagemagick:= ) - jack? ( virtual/jack ) - luajit? ( dev-lang/luajit:2 ) - nvenc? ( - || ( - =media-video/ffmpeg-4[video_cards_nvidia] - ) - ) - pulseaudio? ( media-sound/pulseaudio ) - python? ( ${PYTHON_DEPS} ) - speex? ( media-libs/speexdsp ) - truetype? ( - media-libs/fontconfig - media-libs/freetype - ) - v4l? ( media-libs/libv4l ) -" -RDEPEND="${DEPEND}" - -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local libdir=$(get_libdir) - local mycmakeargs=( - -DDISABLE_ALSA=$(usex !alsa) - -DDISABLE_FREETYPE=$(usex !truetype) - -DDISABLE_JACK=$(usex !jack) - -DDISABLE_LIBFDK=$(usex !fdk) - -DDISABLE_PULSEAUDIO=$(usex !pulseaudio) - -DDISABLE_SPEEXDSP=$(usex !speex) - -DDISABLE_V4L2=$(usex !v4l) - -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick) - -DOBS_MULTIARCH_SUFFIX=${libdir#lib} - -DOBS_VERSION_OVERRIDE=${PV} - -DUNIX_STRUCTURE=1 - ) - - if use luajit || use python; then - mycmakeargs+=( - -DDISABLE_LUA=$(usex !luajit) - -DDISABLE_PYTHON=$(usex !python) - -DENABLE_SCRIPTING=yes - ) - else - mycmakeargs+=( -DENABLE_SCRIPTING=no ) - fi - - cmake-utils_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update - - if ! use alsa && ! use pulseaudio; then - elog - elog "For the audio capture features to be available," - elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to" - 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 -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/media-video/obs-studio/obs-studio-23.2.1.ebuild b/media-video/obs-studio/obs-studio-23.2.1.ebuild new file mode 100644 index 000000000000..2b14f6e82721 --- /dev/null +++ b/media-video/obs-studio/obs-studio-23.2.1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_5,3_6,3_7} ) + +inherit cmake-utils python-single-r1 xdg-utils + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git" + EGIT_SUBMODULES=() +else + SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Software for Recording and Streaming Live Video Content" +HOMEPAGE="https://obsproject.com" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND=" + luajit? ( dev-lang/swig ) + python? ( dev-lang/swig ) +" +DEPEND=" + >=dev-libs/jansson-2.5 + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qttest:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + media-video/ffmpeg:=[x264] + net-misc/curl + x11-libs/libXcomposite + x11-libs/libXinerama + x11-libs/libXrandr + alsa? ( media-libs/alsa-lib ) + fdk? ( media-libs/fdk-aac:= ) + imagemagick? ( media-gfx/imagemagick:= ) + jack? ( virtual/jack ) + luajit? ( dev-lang/luajit:2 ) + nvenc? ( + || ( + =media-video/ffmpeg-4[video_cards_nvidia] + ) + ) + pulseaudio? ( media-sound/pulseaudio ) + python? ( ${PYTHON_DEPS} ) + speex? ( media-libs/speexdsp ) + truetype? ( + media-libs/fontconfig + media-libs/freetype + ) + v4l? ( media-libs/libv4l ) +" +RDEPEND="${DEPEND}" + +PATCHES="${FILESDIR}/${PN}-23.2.1-use-correct-libdir.patch" + +CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local libdir=$(get_libdir) + local mycmakeargs=( + -DDISABLE_ALSA=$(usex !alsa) + -DDISABLE_FREETYPE=$(usex !truetype) + -DDISABLE_JACK=$(usex !jack) + -DDISABLE_LIBFDK=$(usex !fdk) + -DDISABLE_PULSEAUDIO=$(usex !pulseaudio) + -DDISABLE_SPEEXDSP=$(usex !speex) + -DDISABLE_V4L2=$(usex !v4l) + -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick) + -DOBS_MULTIARCH_SUFFIX=${libdir#lib} + -DOBS_VERSION_OVERRIDE=${PV} + -DUNIX_STRUCTURE=1 + ) + + if use luajit || use python; then + mycmakeargs+=( + -DDISABLE_LUA=$(usex !luajit) + -DDISABLE_PYTHON=$(usex !python) + -DENABLE_SCRIPTING=yes + ) + else + mycmakeargs+=( -DENABLE_SCRIPTING=no ) + fi + + cmake-utils_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update + + if ! use alsa && ! use pulseaudio; then + elog + elog "For the audio capture features to be available," + elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to" + 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 +} + +pkg_postrm() { + xdg_icon_cache_update +} -- cgit v1.2.3