From ffebd3679bab1ecf2528825cbe84f49cbc415778 Mon Sep 17 00:00:00 2001 From: Sebastian Ramacher Date: Wed, 24 Feb 2016 01:11:49 +0100 Subject: [PATCH] Install ffmpeg-mux in /usr/lib/... --- debian/obs-plugins.install | 4 ++-- debian/patches/0003-override-path.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + debian/rules | 13 +++++++------ 4 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 debian/patches/0003-override-path.patch diff --git a/debian/obs-plugins.install b/debian/obs-plugins.install index 6e3e120..56fb1f8 100644 --- a/debian/obs-plugins.install +++ b/debian/obs-plugins.install @@ -1,2 +1,2 @@ -/usr/lib/*/obs-plugins/* -/usr/share/obs/obs-plugins/* +/usr/lib/*/obs-plugins +/usr/share/obs/obs-plugins diff --git a/debian/patches/0003-override-path.patch b/debian/patches/0003-override-path.patch new file mode 100644 index 0000000..c5d065a --- /dev/null +++ b/debian/patches/0003-override-path.patch @@ -0,0 +1,19 @@ +Description: Override path for ffmpeg-mux +Author: Sebastian Ramacher +Forwarded: not-needed +Last-Update: 2016-02-24 + +--- a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c +@@ -175,7 +175,11 @@ + num_tracks++; + } + ++#ifdef FFMPEG_MUX_FIXED ++ dstr_init_copy(cmd, FFMPEG_MUX_FIXED); ++#else + dstr_init_move_array(cmd, obs_module_file(FFMPEG_MUX)); ++#endif + dstr_insert_ch(cmd, 0, '\"'); + dstr_cat(cmd, "\" \""); + dstr_cat_dstr(cmd, &stream->path); diff --git a/debian/patches/series b/debian/patches/series index 8e54059..3b3ce8d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-Use-common-license.patch 0002-Buildsystem.patch +0003-override-path.patch diff --git a/debian/rules b/debian/rules index 739ff19..d5f8f58 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,9 @@ #!/usr/bin/make -f -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/default.mk -include /usr/share/dpkg/architecture.mk - -# package maintainers to append LDFLAGS export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed +export DEB_CPPFLAGS_MAINT_APPEND=-DFFMPEG_MUX_FIXED=\"/usr/lib/$(DEB_HOST_MULTIARCH)/obs-plugins/obs-ffmpeg/ffmpeg-mux\" + +include /usr/share/dpkg/architecture.mk %: dh $@ --parallel @@ -16,5 +14,8 @@ override_dh_auto_configure: -DUNIX_STRUCTURE=1 override_dh_install: + mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/obs-plugins/obs-ffmpeg + mv debian/tmp/usr/share/obs/obs-plugins/obs-ffmpeg/ffmpeg-mux \ + debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/obs-plugins/obs-ffmpeg/ffmpeg-mux dh_install - rm -rf $(CURDIR)/debian/obs-studio/usr/share/obs/obs-studio/license + rm -rf debian/obs-studio/usr/share/obs/obs-studio/license