use the packaged libsimde-dev
* debian/patches: - Use the SIMD Everywhere headers from libsimde-dev, instead of upstream's code copy * debian/control - Build-dep on libsimde-dev - Add "Built-Using: ${simde:Built-Using}" to all the binary packages to document the version of libsimde-dev used, as required to keep that version in the Debian archive, which is needed to fulfill the GPL * debian/copyright: - exclude libobs/util/simde/* as we will use the files from libsimde-dev * debian/rules: - Include the recommended flags for SIMDe, especially important for non-X86 architectures
This commit is contained in:
parent
5240f0b1eb
commit
103fad448f
6 changed files with 44 additions and 18 deletions
19
debian/changelog
vendored
19
debian/changelog
vendored
|
@ -1,3 +1,22 @@
|
|||
obs-studio (25.0.3+dfsg1-2.1) UNRELEASED; urgency=medium
|
||||
|
||||
* Non-maintainer upload.
|
||||
* debian/patches:
|
||||
- Use the SIMD Everywhere headers from libsimde-dev, instead of upstream's
|
||||
code copy
|
||||
* debian/control
|
||||
- Build-dep on libsimde-dev
|
||||
- Add "Built-Using: ${simde:Built-Using}" to all the binary packages to
|
||||
document the version of libsimde-dev used, as required to keep that
|
||||
version in the Debian archive, which is needed to fulfill the GPL
|
||||
* debian/copyright:
|
||||
- exclude libobs/util/simde/* as we will use the files from libsimde-dev
|
||||
* debian/rules:
|
||||
- Include the recommended flags for SIMDe, especially important for
|
||||
non-X86 architectures
|
||||
|
||||
-- Michael R. Crusoe <michael.crusoe@gmail.com> Fri, 24 Apr 2020 17:44:40 +0200
|
||||
|
||||
obs-studio (25.0.3+dfsg1-2) unstable; urgency=medium
|
||||
|
||||
* Upload to unstable
|
||||
|
|
5
debian/control
vendored
5
debian/control
vendored
|
@ -29,6 +29,7 @@ Build-Depends:
|
|||
libpulse-dev,
|
||||
libqt5svg5-dev,
|
||||
libqt5x11extras5-dev,
|
||||
libsimde-dev,
|
||||
libspeexdsp-dev,
|
||||
libswresample-dev,
|
||||
libswscale-dev,
|
||||
|
@ -58,6 +59,7 @@ Rules-Requires-Root: no
|
|||
|
||||
Package: obs-studio
|
||||
Architecture: any
|
||||
Built-Using: ${simde:Built-Using}
|
||||
Depends: obs-plugins (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}
|
||||
Description: recorder and streamer for live video content
|
||||
OBS Studio is designed for efficiently recording and streaming live video
|
||||
|
@ -74,6 +76,7 @@ Description: recorder and streamer for live video content
|
|||
|
||||
Package: obs-plugins
|
||||
Architecture: any
|
||||
Built-Using: ${simde:Built-Using}
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}
|
||||
Recommends: vlc
|
||||
Description: recorder and streamer for live video content (plugins)
|
||||
|
@ -86,6 +89,7 @@ Package: libobs0
|
|||
Multi-Arch: same
|
||||
Section: libs
|
||||
Architecture: any
|
||||
Built-Using: ${simde:Built-Using}
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends}
|
||||
Description: recorder and streamer for live video content (shared library)
|
||||
OBS Studio is designed for efficiently recording and streaming live video
|
||||
|
@ -96,6 +100,7 @@ Description: recorder and streamer for live video content (shared library)
|
|||
Package: libobs-dev
|
||||
Section: libdevel
|
||||
Architecture: any
|
||||
Built-Using: ${simde:Built-Using}
|
||||
Depends:
|
||||
libobs0 (= ${binary:Version}),
|
||||
${misc:Depends}
|
||||
|
|
19
debian/copyright
vendored
19
debian/copyright
vendored
|
@ -9,6 +9,7 @@ Files-Excluded:
|
|||
deps/lzma/*
|
||||
deps/libcaption/*
|
||||
plugins/obs-qsv11/*
|
||||
libobs/util/simde/*
|
||||
|
||||
Files: *
|
||||
Copyright: 2013-2017, Hugh Bailey <obs.jim@gmail.com>
|
||||
|
@ -87,24 +88,6 @@ Copyright: 1998, Ben Elliston
|
|||
1998-2001, Ross Johnson
|
||||
License: LGPL-2.1+
|
||||
|
||||
Files: libobs/util/simde/*
|
||||
Copyright: 2017-2018, Evan Nemerson <evan@nemerson.com>
|
||||
2015-2017, John W. Ratcliff <jratcliffscarab@gmail.com>
|
||||
2015, Brandon Rowlett <browlett@nvidia.com>
|
||||
2015, Ken Fast <kfast@gdeb.com>
|
||||
2017, Hasindu Gamaarachchi <hasindu@unsw.edu.au>
|
||||
2018, Jeff Daily <jeff.daily@amd.com>
|
||||
License: Expat
|
||||
|
||||
Files: libobs/util/simde/check.h
|
||||
libobs/util/simde/hedley.h
|
||||
libobs/util/simde/simde-arch.h
|
||||
libobs/util/simde/simde-common.h
|
||||
Copyright: 2017-2018, Evan Nemerson <evan@nemerson.com>
|
||||
License: CC0-1.0
|
||||
On Debian systems, the complete text of the Creative Commons 1.0 Universal
|
||||
License can be found in "/usr/share/common-licenses/CC0-1.0".
|
||||
|
||||
Files: plugins/decklink/linux/decklink-sdk/*
|
||||
plugins/decklink/mac/decklink-sdk/*
|
||||
plugins/decklink/win/decklink-sdk/*
|
||||
|
|
13
debian/patches/0009-use-libsimde-dev.patch
vendored
Normal file
13
debian/patches/0009-use-libsimde-dev.patch
vendored
Normal file
|
@ -0,0 +1,13 @@
|
|||
Author: Michael R. Crusoe <michael.crusoe@gmail.com>
|
||||
Subject: Use the simd everywhere headers from libsimde-dev
|
||||
--- obs-studio.orig/libobs/util/sse-intrin.h
|
||||
+++ obs-studio/libobs/util/sse-intrin.h
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#if NEEDS_SIMDE
|
||||
|
||||
-#include "simde/sse2.h"
|
||||
+#include <simde/x86/sse2.h>
|
||||
|
||||
#define __m128 simde__m128
|
||||
#define _mm_setzero_ps simde_mm_setzero_ps
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -6,3 +6,4 @@
|
|||
0006-Add-SONAME.patch
|
||||
0007-Do-not-build-with-SSE2-enabled-on-i386.patch
|
||||
0008-rmtp-services-Remove-executable-bits-from-json-files.patch
|
||||
0009-use-libsimde-dev.patch
|
||||
|
|
5
debian/rules
vendored
5
debian/rules
vendored
|
@ -5,6 +5,8 @@ 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/obs-ffmpeg-mux\"
|
||||
export DEB_CFLAGS_MAINT_APPEND+=-DSIMDE_ENABLE_OPENMP -fopenmp-simd -O3
|
||||
export DEB_CXXFLAGS_MAINT_APPEND+=-DSIMDE_ENABLE_OPENMP -fopenmp-simd -O3
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
@ -35,3 +37,6 @@ override_dh_shlibdeps:
|
|||
override_dh_python3:
|
||||
dh_python3 -p obs-plugins usr/share/obs/obs-plugins/frontend-tools/scripts
|
||||
dh_python3 -p obs-studio usr/lib/$(DEB_HOST_MULTIARCH)/obs-scripting
|
||||
|
||||
override_dh_gencontrol:
|
||||
dh_gencontrol -- -Vsimde:Built-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W "libsimde-dev")"
|
||||
|
|
Loading…
Reference in a new issue