From 103fad448f70222728e28f68831eb2a98060d985 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Fri, 24 Apr 2020 20:12:29 +0200 Subject: [PATCH] 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 --- debian/changelog | 19 +++++++++++++++++++ debian/control | 5 +++++ debian/copyright | 19 +------------------ debian/patches/0009-use-libsimde-dev.patch | 13 +++++++++++++ debian/patches/series | 1 + debian/rules | 5 +++++ 6 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 debian/patches/0009-use-libsimde-dev.patch diff --git a/debian/changelog b/debian/changelog index fff5115..2cbdf64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 24 Apr 2020 17:44:40 +0200 + obs-studio (25.0.3+dfsg1-2) unstable; urgency=medium * Upload to unstable diff --git a/debian/control b/debian/control index 35a73bd..7c9f97d 100644 --- a/debian/control +++ b/debian/control @@ -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} diff --git a/debian/copyright b/debian/copyright index 74b14f3..70e0939 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,6 +9,7 @@ Files-Excluded: deps/lzma/* deps/libcaption/* plugins/obs-qsv11/* + libobs/util/simde/* Files: * Copyright: 2013-2017, Hugh Bailey @@ -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 - 2015-2017, John W. Ratcliff - 2015, Brandon Rowlett - 2015, Ken Fast - 2017, Hasindu Gamaarachchi - 2018, Jeff Daily -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 -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/* diff --git a/debian/patches/0009-use-libsimde-dev.patch b/debian/patches/0009-use-libsimde-dev.patch new file mode 100644 index 0000000..4414e8b --- /dev/null +++ b/debian/patches/0009-use-libsimde-dev.patch @@ -0,0 +1,13 @@ +Author: Michael R. Crusoe +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 + + #define __m128 simde__m128 + #define _mm_setzero_ps simde_mm_setzero_ps diff --git a/debian/patches/series b/debian/patches/series index 2590633..5588b63 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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 diff --git a/debian/rules b/debian/rules index cce7748..cc3fa4f 100755 --- a/debian/rules +++ b/debian/rules @@ -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")"