commit: 4906ebc5a0e9377426f0f73b83a539bdc4c9c753 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Tue Dec 22 16:42:14 2020 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Tue Dec 22 17:32:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4906ebc5
media-video/obs-studio: migrate to lua-single.eclass Based on the work of Gergely Nagy <ngg <AT> ngg.hu> from https://github.com/gentoo/gentoo/pull/18156, however browser source support has been removed (according to the PR comments chiitoo has not decided yet which of the competing implementations he prefers) and IUSE=luajit has been renamed to just "lua" (as done elsewhere, in order to avoid confusion between luajit and lua_single_target_luajit). Closes: https://bugs.gentoo.org/752768 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> ...o-9999.ebuild => obs-studio-25.0.8-r100.ebuild} | 27 ++++++++++++++-------- media-video/obs-studio/obs-studio-9999.ebuild | 25 ++++++++++++-------- profiles/package.mask | 1 + 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-25.0.8-r100.ebuild similarity index 85% copy from media-video/obs-studio/obs-studio-9999.ebuild copy to media-video/obs-studio/obs-studio-25.0.8-r100.ebuild index c8ccd0308e5..4651e60274e 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-25.0.8-r100.ebuild @@ -4,9 +4,10 @@ EAPI=7 CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) +LUA_COMPAT=( luajit ) PYTHON_COMPAT=( python3_{6,7} ) -inherit cmake-utils python-single-r1 xdg-utils +inherit cmake lua-single python-single-r1 xdg-utils if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -22,11 +23,14 @@ HOMEPAGE="https://obsproject.com"; LICENSE="GPL-2" SLOT="0" -IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="+alsa fdk imagemagick jack lua nvenc pulseaudio python speex +ssl truetype v4l vlc" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) +" BDEPEND=" - luajit? ( dev-lang/swig ) + lua? ( dev-lang/swig ) python? ( dev-lang/swig ) " DEPEND=" @@ -58,7 +62,7 @@ DEPEND=" fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) - luajit? ( dev-lang/luajit:2 ) + lua? ( ${LUA_DEPS} ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pulseaudio? ( media-sound/pulseaudio ) python? ( ${PYTHON_DEPS} ) @@ -73,7 +77,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-25.0.8-gcc-10-build.patch" ) + pkg_setup() { + use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup } @@ -94,15 +101,15 @@ src_configure() { -DWITH_RTMPS=$(usex ssl) ) - if [ "${PV}" != "9999" ]; then + if [[ ${PV} != *9999 ]]; then mycmakeargs+=( -DOBS_VERSION_OVERRIDE=${PV} ) fi - if use luajit || use python; then + if use lua || use python; then mycmakeargs+=( - -DDISABLE_LUA=$(usex !luajit) + -DDISABLE_LUA=$(usex !lua) -DDISABLE_PYTHON=$(usex !python) -DENABLE_SCRIPTING=yes ) @@ -110,11 +117,11 @@ src_configure() { mycmakeargs+=( -DENABLE_SCRIPTING=no ) fi - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install #external plugins may need some things not installed by default, install them here insinto /usr/include/obs/UI/obs-frontend-api doins UI/obs-frontend-api/obs-frontend-api.h diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index c8ccd0308e5..47cfd612079 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -4,9 +4,10 @@ EAPI=7 CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) +LUA_COMPAT=( luajit ) PYTHON_COMPAT=( python3_{6,7} ) -inherit cmake-utils python-single-r1 xdg-utils +inherit cmake lua-single python-single-r1 xdg-utils if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -22,11 +23,14 @@ HOMEPAGE="https://obsproject.com"; LICENSE="GPL-2" SLOT="0" -IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="+alsa fdk imagemagick jack lua nvenc pulseaudio python speex +ssl truetype v4l vlc" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) +" BDEPEND=" - luajit? ( dev-lang/swig ) + lua? ( dev-lang/swig ) python? ( dev-lang/swig ) " DEPEND=" @@ -58,7 +62,7 @@ DEPEND=" fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) - luajit? ( dev-lang/luajit:2 ) + lua? ( ${LUA_DEPS} ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pulseaudio? ( media-sound/pulseaudio ) python? ( ${PYTHON_DEPS} ) @@ -74,6 +78,7 @@ DEPEND=" RDEPEND="${DEPEND}" pkg_setup() { + use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup } @@ -94,15 +99,15 @@ src_configure() { -DWITH_RTMPS=$(usex ssl) ) - if [ "${PV}" != "9999" ]; then + if [[ ${PV} != *9999 ]]; then mycmakeargs+=( -DOBS_VERSION_OVERRIDE=${PV} ) fi - if use luajit || use python; then + if use lua || use python; then mycmakeargs+=( - -DDISABLE_LUA=$(usex !luajit) + -DDISABLE_LUA=$(usex !lua) -DDISABLE_PYTHON=$(usex !python) -DENABLE_SCRIPTING=yes ) @@ -110,11 +115,11 @@ src_configure() { mycmakeargs+=( -DENABLE_SCRIPTING=no ) fi - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install #external plugins may need some things not installed by default, install them here insinto /usr/include/obs/UI/obs-frontend-api doins UI/obs-frontend-api/obs-frontend-api.h diff --git a/profiles/package.mask b/profiles/package.mask index c8e8f1f5600..600c1a10d85 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -542,6 +542,7 @@ kde-apps/kdebase-meta:5 >=media-libs/mlt-6.22.1-r100 >=media-sound/aqualung-1.1-r100 >=media-video/aegisub-3.2.2_p20160518-r100 +>=media-video/obs-studio-25.0.8-r100 >=media-video/vlc-3.0.11.1-r100 >=net-analyzer/rrdtool-1.7.2-r100 >=net-analyzer/snort-2.9.16-r100
