Refresh the use-path-in-usr-lib patch and the exec name and location
Upstream has decided to now ship the ffmpeg-mux executable as a binary in /usr/bin. In order to keep the -plugins package Multiarch: Same, we still need to ship it in /usr/lib/x86_64, although we now use the new name to not diverge too much from upstream.
This commit is contained in:
parent
34aa2c5c96
commit
53176e97fa
2 changed files with 5 additions and 7 deletions
6
debian/rules
vendored
6
debian/rules
vendored
|
|
@ -4,7 +4,7 @@ include /usr/share/dpkg/architecture.mk
|
|||
include /usr/share/dpkg/pkg-info.mk
|
||||
|
||||
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\"
|
||||
export DEB_CPPFLAGS_MAINT_APPEND=-DFFMPEG_MUX_FIXED=\"/usr/lib/$(DEB_HOST_MULTIARCH)/obs-plugins/obs-ffmpeg/obs-ffmpeg-mux\"
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
|
@ -22,8 +22,8 @@ override_dh_auto_build:
|
|||
|
||||
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
|
||||
mv debian/tmp/usr/bin/obs-ffmpeg-mux \
|
||||
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/obs-plugins/obs-ffmpeg/obs-ffmpeg-mux
|
||||
dh_install
|
||||
rm -rf debian/obs-studio/usr/share/obs/obs-studio/license
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue