Install ffmpeg-mux in /usr/lib/...
This commit is contained in:
parent
345b2e1806
commit
ffebd3679b
4 changed files with 29 additions and 8 deletions
4
debian/obs-plugins.install
vendored
4
debian/obs-plugins.install
vendored
|
@ -1,2 +1,2 @@
|
||||||
/usr/lib/*/obs-plugins/*
|
/usr/lib/*/obs-plugins
|
||||||
/usr/share/obs/obs-plugins/*
|
/usr/share/obs/obs-plugins
|
||||||
|
|
19
debian/patches/0003-override-path.patch
vendored
Normal file
19
debian/patches/0003-override-path.patch
vendored
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
Description: Override path for ffmpeg-mux
|
||||||
|
Author: Sebastian Ramacher <sramacher@debian.org>
|
||||||
|
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);
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -1,2 +1,3 @@
|
||||||
0001-Use-common-license.patch
|
0001-Use-common-license.patch
|
||||||
0002-Buildsystem.patch
|
0002-Buildsystem.patch
|
||||||
|
0003-override-path.patch
|
||||||
|
|
13
debian/rules
vendored
13
debian/rules
vendored
|
@ -1,11 +1,9 @@
|
||||||
#!/usr/bin/make -f
|
#!/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_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
|
dh $@ --parallel
|
||||||
|
@ -16,5 +14,8 @@ override_dh_auto_configure:
|
||||||
-DUNIX_STRUCTURE=1
|
-DUNIX_STRUCTURE=1
|
||||||
|
|
||||||
override_dh_install:
|
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
|
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
|
||||||
|
|
Loading…
Reference in a new issue