[obs-studio] Actually define FFMPEG_MUX_FIXED (fixes 'command not found' when trying to record)

commit 1bf354c7d7f2a1b8825b75b36573daddf1fedc3f Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Fri Aug 26 14:34:11 2016 +0100 Actually define FFMPEG_MUX_FIXED (fixes 'command not found' when trying to record) obs-ffmpeg-mux.patch | 15 +++++++++++++-- obs-studio.spec | 8 +++++--- 2 files changed, 18 insertions(+), 5 deletions(-) --- diff --git a/obs-ffmpeg-mux.patch b/obs-ffmpeg-mux.patch index 9130c5f..d39443a 100644 --- a/obs-ffmpeg-mux.patch +++ b/obs-ffmpeg-mux.patch @@ -1,5 +1,5 @@ ---- plugins/obs-ffmpeg/obs-ffmpeg-mux.c 2016-05-01 17:56:21.000000000 -0600 -+++ obs-ffmpeg-mux-1.c 2016-05-03 01:06:09.810745024 -0600 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c @@ -174,8 +174,11 @@ aencoders[num_tracks] = aencoder; num_tracks++; @@ -13,3 +13,14 @@ dstr_insert_ch(cmd, 0, '\"'); dstr_cat(cmd, "\" \""); dstr_cat_dstr(cmd, &stream->path); +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,6 +7,7 @@ + include(ObsHelpers) + include(ObsCpack) + include(GNUInstallDirs) ++add_definitions(-DFFMPEG_MUX_FIXED=\"/usr/libexec/obs-plugins/obs-ffmpeg/ffmpeg-mux\") + + if(MSVC AND NOT EXISTS "${CMAKE_BINARY_DIR}/ALL_BUILD.vcxproj.user") + file(GENERATE + diff --git a/obs-studio.spec b/obs-studio.spec index b517a10..7c6dfbb 100644 --- a/obs-studio.spec +++ b/obs-studio.spec @@ -1,6 +1,6 @@ Name: obs-studio Version: 0.15.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Broadcaster Software Studio License: GPLv2+ @@ -55,14 +55,13 @@ Header files for Open Broadcaster Software %prep %setup -q -%patch0 -p0 +%patch0 -p1 # rpmlint reports E: hardcoded-library-path # replace OBS_MULTIARCH_SUFFIX by LIB_SUFFIX sed -i 's|OBS_MULTIARCH_SUFFIX|LIB_SUFFIX|g' cmake/Modules/ObsHelpers.cmake %build -export CPPFLAGS=-DFFMPEG_MUX_FIXED=\"%{_libexecdir}/obs-plugins/obs-ffmpeg/ffmpeg-mux\" %cmake -DOBS_VERSION_OVERRIDE=%{version} -DUNIX_STRUCTURE=1 %make_build @@ -115,6 +114,9 @@ fi %changelog +* Fri Aug 26 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 0.15.4-3 +- Actually define FFMPEG_MUX_FIXED (fixes 'command not found' when trying to record) + * Sat Aug 13 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 0.15.4-2 - Disable build for ARM (Arm gcc has no xmmintrin.h file)