commit: fc01d706a3af112dd64558ed731102c231f87f2c Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com> AuthorDate: Mon Dec 30 23:18:51 2024 +0000 Commit: Adel KARA SLIMANE <adel <AT> karaslimane <DOT> com> CommitDate: Mon Dec 30 23:20:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fc01d706
media-video/obs-multi-rtmp: update version 9999 Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com> media-video/obs-multi-rtmp/files/cmake.patch | 88 ++++++++++++++++++++++ .../obs-multi-rtmp/obs-multi-rtmp-9999.ebuild | 18 ++--- 2 files changed, 97 insertions(+), 9 deletions(-) diff --git a/media-video/obs-multi-rtmp/files/cmake.patch b/media-video/obs-multi-rtmp/files/cmake.patch new file mode 100644 index 000000000..0dfcb915a --- /dev/null +++ b/media-video/obs-multi-rtmp/files/cmake.patch @@ -0,0 +1,88 @@ +# Fix hard-coded install dirs with upstream template code from https://github.com/obsproject/obs-plugintemplate +# so we get things installed in proper folders +--- a/cmake/common/buildspec_common.cmake ++++ b/cmake/common/buildspec_common.cmake +@@ -87,7 +87,7 @@ function(_setup_obs_studio) + + message(STATUS "Build ${label} (${arch})") + execute_process( +- COMMAND "${CMAKE_COMMAND}" --build build_${arch} --target obs-frontend-api --config RelWithDebInfo --parallel ++ COMMAND "${CMAKE_COMMAND}" --build build_${arch} --target obs-frontend-api --config Debug --parallel + WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}" + RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY + OUTPUT_QUIET) +@@ -100,7 +100,7 @@ function(_setup_obs_studio) + set(_cmake_extra "") + endif() + execute_process( +- COMMAND "${CMAKE_COMMAND}" --install build_${arch} --component Development --config RelWithDebInfo --prefix ++ COMMAND "${CMAKE_COMMAND}" --install build_${arch} --component Development --config Debug --prefix + "${dependencies_dir}" ${_cmake_extra} + WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}" + RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY +diff --git a/cmake/linux/helpers.cmake b/cmake/linux/helpers.cmake +index 92974fd..191a827 100644 +--- a/cmake/linux/helpers.cmake ++++ b/cmake/linux/helpers.cmake +@@ -4,8 +4,6 @@ include_guard(GLOBAL) + + include(helpers_common) + +-set(PLUGIN_FOLDER ${CMAKE_PROJECT_NAME}) +- + # set_target_properties_plugin: Set target properties for use in obs-studio + function(set_target_properties_plugin target) + set(options "") +@@ -26,23 +24,10 @@ function(set_target_properties_plugin target) + SOVERSION ${PLUGIN_VERSION} + PREFIX "") + +- # install( +- # TARGETS ${target} +- # RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- # LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/obs-plugins) +- +- if (${CMAKE_SIZEOF_VOID_P} EQUAL 4) +- set(OBSARCHNAME "32bit") +- elseif (${CMAKE_SIZEOF_VOID_P} EQUAL 8) +- set(OBSARCHNAME "64bit") +- else () +- message(FATAL_ERROR "Unsupport architecture") +- endif() +- + install( + TARGETS ${target} +- RUNTIME DESTINATION dist/${PLUGIN_FOLDER}/bin/${OBSARCHNAME} +- LIBRARY DESTINATION dist/${PLUGIN_FOLDER}/bin/${OBSARCHNAME}) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/obs-plugins) + + if(TARGET plugin-support) + target_link_libraries(${target} PRIVATE plugin-support) +@@ -72,14 +57,9 @@ function(target_install_resources target) + source_group("Resources/${relative_path}" FILES "${data_file}") + endforeach() + +- # install( +- # DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data/" +- # DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/obs/obs-plugins/${target} +- # USE_SOURCE_PERMISSIONS) +- + install( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data/" +- DESTINATION dist/${PLUGIN_FOLDER}/data ++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/obs/obs-plugins/${target} + USE_SOURCE_PERMISSIONS) + endif() + endfunction() +@@ -88,9 +68,7 @@ endfunction() + function(target_add_resource target resource) + message(DEBUG "Add resource '${resource}' to target ${target} at destination '${target_destination}'...") + +- # install(FILES "${resource}" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/obs/obs-plugins/${target}) +- +- install(FILES "${resource}" DESTINATION dist/${PLUGIN_FOLDER}/data) ++ install(FILES "${resource}" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/obs/obs-plugins/${target}) + + source_group("Resources" FILES "${resource}") + endfunction() diff --git a/media-video/obs-multi-rtmp/obs-multi-rtmp-9999.ebuild b/media-video/obs-multi-rtmp/obs-multi-rtmp-9999.ebuild index 5fc90c428..8c8f8852c 100644 --- a/media-video/obs-multi-rtmp/obs-multi-rtmp-9999.ebuild +++ b/media-video/obs-multi-rtmp/obs-multi-rtmp-9999.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="OBS Simulcast support plugin" -HOMEPAGE="https://github.com/orayuki/obs-multi-rtmp"; +HOMEPAGE="https://github.com/sorayuki/obs-multi-rtmp"; if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/sorayuki/obs-multi-rtmp.git"; else - SRC_URI="https://github.com/orayuki/obs-multi-rtmp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/sorayuki/obs-multi-rtmp/archive/refs/tags/$PV.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" fi @@ -20,12 +20,16 @@ SLOT="0" IUSE="+obs-frontend-api +qt" DEPEND=" qt? ( dev-qt/qtbase:6 ) - media-video/obs-studio + >=media-video/obs-studio-31 " RDEPEND=" ${DEPEND} " +PATCHES=( + "${FILESDIR}/cmake.patch" +) + src_unpack() { default @@ -40,9 +44,5 @@ src_configure() { -DENABLE_QT=$(usex qt ON OFF) ) - # code base is not clean - # opened bug https://github.com/sorayuki/obs-multi-rtmp/issues/378 - append-cppflags -Wno-error=shadow -Wno-error=conversion -Wno-error=float-conversion -Wno-error=sign-compare - cmake_src_configure }
