Unverified Commit d01b5ff5 authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

obs-multi-rtmp: 0.2.8.1-OBS28 -> 0.6.0.1 (#339925)

parents a50558ec 9542411d
Loading
Loading
Loading
Loading
+14 −5
Original line number Diff line number Diff line
@@ -2,25 +2,34 @@

stdenv.mkDerivation rec {
  pname = "obs-multi-rtmp";
  version = "0.2.8.1-OBS28";
  version = "0.6.0.1";

  src = fetchFromGitHub {
    owner = "sorayuki";
    repo = "obs-multi-rtmp";
    rev = version;
    sha256 = "sha256-1W+c8Y0AmtKQmCIg8IDAaYYStQzDpZRuqw3vZEY5ncU=";
    sha256 = "sha256-MRBQY9m6rj8HVdn58mK/Vh07FSm0EglRUaP20P3FFO4=";
  };

  nativeBuildInputs = [ cmake ];
  buildInputs = [ obs-studio qtbase ];

  patches = [
    # Patch cmake file to link against the obs build output, instead of its sources
    ./fix-build.patch
  cmakeFlags = [
    (lib.cmakeBool "ENABLE_QT" true)
    (lib.cmakeBool "ENABLE_FRONTEND_API" true)
    (lib.cmakeBool "CMAKE_COMPILE_WARNING_AS_ERROR" false)
  ];

  dontWrapQtApps = true;

  # install dirs changed after 0.5.0.3-OBS30
  postInstall = ''
    mkdir -p $out/{lib,share/obs/obs-plugins/}
    mv $out/dist/obs-multi-rtmp/data $out/share/obs/obs-plugins/obs-multi-rtmp
    mv $out/dist/obs-multi-rtmp/bin/64bit $out/lib/obs-plugins
    rm -rf $out/dist
  '';

  meta = with lib; {
    homepage = "https://github.com/sorayuki/obs-multi-rtmp/";
    changelog = "https://github.com/sorayuki/obs-multi-rtmp/releases/tag/${version}";
+0 −54
Original line number Diff line number Diff line
From 72aeddb52c2b656bfec918097ad07a0ff092008b Mon Sep 17 00:00:00 2001
From: Raphael Robatsch <raphael-git@tapesoftware.net>
Date: Thu, 13 Oct 2022 21:34:21 +0200
Subject: [PATCH] Link against OBS public interface instead of sources

---
 CMakeLists.txt | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27e20f8..8725c5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,15 +65,9 @@ if (WIN32)
         "/def:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.def"
         "/out:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.lib"
     )
-elseif (APPLE)
-    # macOS
-    find_library(_LIB_OBS "${LIB_OBS}.0.dylib" PATHS ${OBS_BIN_DIR} REQUIRED)
-    set(LIB_OBS "${_LIB_OBS}")
-elseif (UNIX)
-    # Linux
-    find_package(LibObs REQUIRED)
 else ()
-    message(FATAL_ERROR "Unsupported OS!")
+    find_package(libobs REQUIRED)
+    find_package(obs-frontend-api REQUIRED)
 endif ()


@@ -96,18 +90,10 @@ if (WIN32)
         "${CMAKE_CURRENT_BINARY_DIR}/version.rc"
     )
 endif ()
-target_include_directories(obs-multi-rtmp PRIVATE
-    "${OBS_SRC_DIR}/libobs"
-    "${OBS_SRC_DIR}/UI/obs-frontend-api"
-)
-target_link_directories(obs-multi-rtmp PRIVATE
-    "${CMAKE_CURRENT_BINARY_DIR}"
-    ${OBS_BIN_DIR}
-)
 target_link_libraries(obs-multi-rtmp PRIVATE
     Qt6::Widgets
-    ${LIB_OBS}
-    obs-frontend-api
+    OBS::libobs
+    OBS::obs-frontend-api
 )

 if (WIN32)
-- 
2.37.3