lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update packaging to 0.13.2

Browse source
This commit is contained in:
Sebastian Ramacher 2016-02-24 00:30:24 +01:00
parent 8238ecf399
commit cc41a1a60e
14 changed files with 1566 additions and 1054 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debian/changelog vendored
View file

@ -1,5 +1,5 @@
obs-studio (0.12.4-1) unstable; urgency=low obs-studio (0.13.2+dfsg1-1) UNRELEASED; urgency=medium
* Initial release (Closes: #774744) * Initial release (Closes: #774744)
-- Carl Fürstenberg <azatoth@gmail.com> Tue, 15 Dec 2015 00:19:33 +0100 -- Sebastian Ramacher <sramacher@debian.org> Tue, 23 Feb 2016 21:20:35 +0100

128
debian/control vendored
View file

@ -1,86 +1,110 @@
Source: obs-studio Source: obs-studio
Section: video Section: video
Priority: optional Priority: optional
Maintainer: Carl Fürstenberg <azatoth@gmail.com> Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
Uploaders:
Carl Fürstenberg <azatoth@gmail.com>,
Sebastian Ramacher <sramacher@debian.org>
Build-Depends: Build-Depends:
debhelper (>= 9),
cmake, cmake,
libavformat-dev, debhelper (>= 9),
libavcodec-dev, libavcodec-dev,
libavdevice-dev,
libavfilter-dev,
libavformat-dev,
libavutil-dev, libavutil-dev,
libcurl4-gnutls-dev | libcurl-dev,
libdbus-1-dev,
libfontconfig-dev,
libfreetype6-dev,
libgl1-mesa-dev | libgl-dev,
libjack-dev,
libjansson-dev (>= 2.5),
libpulse-dev,
libqt5x11extras5-dev,
libswresample-dev, libswresample-dev,
libswscale-dev, libswscale-dev,
libudev-dev,
libv4l-dev,
libx11-dev, libx11-dev,
libgl1-mesa-dev | libgl-dev, libx264-dev,
libpulse-dev, libxcb-shm0-dev,
libxcb-xinerama0-dev,
libxcomposite-dev, libxcomposite-dev,
libxinerama-dev, libxinerama-dev,
libv4l-dev, qtbase5-dev
libudev-dev, Standards-Version: 3.9.7
libfreetype6-dev, Homepage: https://obsproject.com
libfontconfig-dev, Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/obs-studio.git
qtbase5-dev, Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/obs-studio.git
libqt5x11extras5-dev,
libx264-dev,
libxcb-xinerama0-dev,
libxcb-shm0-dev
Standards-Version: 3.9.5
Homepage: https://obsproject.com/
#Vcs-Git: git://anonscm.debian.org/collab-maint/obs.git
#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/obs.git;a=summary
Package: obs-studio Package: obs-studio
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libobs0 (>= ${binary:Version}), obs-plugins (>= ${binary:Version}) Depends: obs-plugins (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: OBS Studio Description: recorder and streamer for live video content
a rewrite of what was formerly known as "Open Broadcaster OBS Studio is designed for efficiently recording and streaming live video
Software", software originally designed for recording and streaming live content. It supports live RTP streaming to various streaming sites.
video content, efficiently. .
Other features include:
* Encoding using H264 (x264) and AAC
* Unlimited number of scenes and sources
* File output to MP4 or FLV
* GPU-based game capture for high performance game streaming
* Bilinear or lanczos3 resampling
Package: obs-plugins Package: obs-plugins
Multi-Arch: same Multi-Arch: same
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libobs0 (>= ${binary:Version}) Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends} Description: recorder and streamer for live video content (plugins)
Description: OBS Studio Plugins OBS is designed for efficiently recording and streaming live video content. It
a rewrite of what was formerly known as "Open Broadcaster supports live RTP streaming to various streaming sites.
Software", software originally designed for recording and streaming live
video content, efficiently.
. .
This package contains various default plugins for obs-studio. This package contains the plugins.
Package: libobs0 Package: libobs0
Multi-Arch: same Multi-Arch: same
Section: libs Section: libs
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends} Description: recorder and streamer for live video content (shared library)
Description: OBS library OBS Studio is designed for efficiently recording and streaming live video
a rewrite of what was formerly known as "Open Broadcaster content. It supports live RTP streaming to various streaming sites.
Software", software originally designed for recording and streaming live
video content, efficiently.
. .
this package contains the libraries needed for obs-studio. This package contains the shared library libobs.
Package: libobs0-dbg Package: libobsglad0
Section: debug Multi-Arch: same
Priority: extra Section: libs
Architecture: any Architecture: any
Depends: ${misc:Depends}, libobs0 (= ${binary:Version}) Depends: ${misc:Depends}, ${shlibs:Depends}
Description: debugging symbols for OBS library Description: recorder and streamer for live video content (shared library)
a rewrite of what was formerly known as "Open Broadcaster OBS Studio is designed for efficiently recording and streaming live video
Software", software originally designed for recording and streaming live content. It supports live RTP streaming to various streaming sites.
video content, efficiently.
. .
This package contains the debugging symbols for libobs0. This package contains the shared library libobsglad.
Package: libobs-opengl0
Multi-Arch: same
Section: libs
Architecture: any
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
content. It supports live RTP streaming to various streaming sites.
.
This package contains the shared library libobs-opengl.
Package: libobs-dev Package: libobs-dev
Section: libdevel Section: libdevel
Architecture: any Architecture: any
Depends: ${misc:Depends}, libobs0 (= ${binary:Version}) Depends:
Description: OBS library development files libobs-opengl0 (= ${binary:Version}),
a rewrite of what was formerly known as "Open Broadcaster libobs0 (= ${binary:Version}),
Software", software originally designed for recording and streaming live libobsglad0 (= ${binary:Version}),
video content, efficiently. ${misc:Depends}
Description: recorder and streamer for live video content (development files)
OBS Studio is designed for efficiently recording and streaming live video
content. It supports live RTP streaming to various streaming sites.
. .
This package contains the development files for libobs0. This package contains the development files.

1110
debian/copyright vendored
View file

File diff suppressed because it is too large Load diff

1
debian/libobs-opengl0.install vendored Normal file
View file

@ -0,0 +1 @@
usr/lib/*/libobs-opengl.so.*

2
debian/libobs0.install vendored
View file

@ -1,2 +1,2 @@
usr/lib/*/lib*.so.* usr/lib/*/libobs.so.*
usr/share/obs/libobs/* usr/share/obs/libobs/*

1225
debian/libobs0.symbols vendored Normal file
View file

File diff suppressed because it is too large Load diff

1
debian/libobsglad0.install vendored Normal file
View file

@ -0,0 +1 @@
usr/lib/*/libobsglad.so.*

2
debian/obs-plugins.install vendored
View file

@ -1,2 +1,2 @@
/usr/share/obs/obs-plugins/*
/usr/lib/*/obs-plugins/* /usr/lib/*/obs-plugins/*
/usr/share/obs/obs-plugins/*

6
debian/obs-studio.install vendored
View file

@ -1,6 +1,4 @@
usr/bin/obs usr/bin/obs
usr/share/obs/obs-studio/*
usr/share/icons/hicolor/256x256/apps/obs.png
usr/share/applications/obs.desktop usr/share/applications/obs.desktop
usr/share/icons/hicolor/256x256/apps/obs.png
usr/share/obs/obs-studio/*

25
debian/patches/0001-Use-common-license.patch vendored Normal file
View file

@ -0,0 +1,25 @@
From: =?utf-8?q?Carl_F=C3=BCrstenberg?= <azatoth@gmail.com>
Date: Tue, 6 Jan 2015 23:12:30 +0100
Subject: Use common license
use common license at /usr/share/common-licenses instead of the shipped
copy
---
obs/window-license-agreement.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/obs/window-license-agreement.cpp b/obs/window-license-agreement.cpp
index a7a5f3b..60cad40 100644
--- a/obs/window-license-agreement.cpp
+++ b/obs/window-license-agreement.cpp
@@ -13,9 +13,7 @@ OBSLicenseAgreement::OBSLicenseAgreement(QWidget *parent)
{
ui->setupUi(this);
- string path;
- if (!GetDataFilePath("license/gplv2.txt", path))
- throw "Could not find license file";
+ string path("/usr/share/common-licenses/GPL-2");
BPtr<char> licenseText = os_quick_read_utf8_file(path.c_str());
if (!licenseText || !*licenseText || strlen(licenseText) < 1000)

84
debian/patches/0002-Buildsystem.patch vendored Normal file
View file

@ -0,0 +1,84 @@
Description: Various build system fixes
This fixes issues with underlinking and build libobs with -fvisibility=hidden
to hide internal symbols.
Author: Sebastian Ramacher <sramacher@debian.org>
Last-Update: 2016-02-24
--- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt
@@ -13,6 +13,8 @@
if(UNIX)
find_package(DBus QUIET)
+ find_package(XCB COMPONENTS XCB REQUIRED)
+ find_package(X11)
else()
set(HAVE_DBUS "0")
endif()
@@ -125,6 +127,23 @@
${DBUS_LIBRARIES})
endif()
+ include_directories(
+ ${XCB_INCLUDE_DIRS}
+ ${X11_XCB_INCLUDE_DIRS}
+ ${X11_X11_INCLUDE_PATH})
+
+ add_definitions(
+ ${XCB_DEFINITIONS}
+ ${X11_XCB_DEFINITIONS})
+
+ set(libobs_PLATFORM_DEPS
+ ${libobs_PLATFORM_DEPS}
+ ${XCB_LIBRARIES}
+ ${X11_XCB_LIBRARIES}
+ ${X11_X11_LIB}
+ m
+ dl)
+
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
# use the sysinfo compatibility library on bsd
find_package(Libsysinfo REQUIRED)
@@ -354,6 +373,10 @@
-msse2)
endif()
+if(UNIX)
+ set_source_files_properties(${libobs_SOURCES} PROPERTIES
+ COMPILE_FLAGS "-fvisibility=hidden")
+endif()
target_compile_options(libobs
PUBLIC
--- a/obs/CMakeLists.txt
+++ b/obs/CMakeLists.txt
@@ -81,16 +81,13 @@
find_package(XCB COMPONENTS XCB REQUIRED RANDR REQUIRED XINERAMA REQUIRED)
include_directories(
- ${XCB_INCLUDE_DIRS}
- ${X11_XCB_INCLUDE_DIRS})
+ ${XCB_INCLUDE_DIRS})
add_definitions(
- ${XCB_DEFINITIONS}
- ${X11_XCB_DEFINITIONS})
+ ${XCB_DEFINITIONS})
set(obs_PLATFORM_LIBRARIES
${XCB_LIBRARIES}
- ${X11_XCB_LIBRARIES}
Qt5::X11Extras)
endif()
--- a/libobs/util/c99defs.h
+++ b/libobs/util/c99defs.h
@@ -50,7 +50,7 @@
#define EXPORT __declspec(dllexport)
#else
-#define EXPORT
+#define EXPORT __attribute__((visibility("default")))
#endif
#if _MSC_VER && _MSC_VER < 0x0708

1
debian/patches/series vendored
View file

@ -1 +1,2 @@
0001-Use-common-license.patch 0001-Use-common-license.patch
0002-Buildsystem.patch

22
debian/rules vendored
View file

@ -1,36 +1,20 @@
#!/usr/bin/make -f #!/usr/bin/make -f
# See debhelper(7) (uncomment to enable)
# output every command that modifies files on the build system.
#DH_VERBOSE = 1
# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
DPKG_EXPORT_BUILDFLAGS = 1 DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk include /usr/share/dpkg/default.mk
include /usr/share/dpkg/architecture.mk
# see FEATURE AREAS in dpkg-buildflags(1)
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
# see ENVIRONMENT in dpkg-buildflags(1)
# package maintainers to append CFLAGS
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
# package maintainers to append LDFLAGS # package maintainers to append LDFLAGS
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
# main packaging script based on dh7 syntax
%: %:
dh $@ dh $@ --parallel
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- \ dh_auto_configure -- \
-DOBS_MULTIARCH_SUFFIX=/$(DEB_HOST_MULTIARCH) \ -DOBS_MULTIARCH_SUFFIX=/$(DEB_HOST_MULTIARCH) \
-DUNIX_STRUCTURE=1 -DUNIX_STRUCTURE=1
override_dh_strip:
dh_strip --dbg-package=libobs0-dbg
override_dh_install: override_dh_install:
dh_install dh_install
rm -rf $(CURDIR)/debian/obs-studio/usr/share/obs/obs-studio/license rm -rf $(CURDIR)/debian/obs-studio/usr/share/obs/obs-studio/license
.PHONY: override_dh_strip override_dh_auto_configure override_dh_install

3
debian/watch vendored Normal file
View file

@ -0,0 +1,3 @@
version=4
opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%obs-studio-$1.tar.gz%,dversionmangle=s%\+dfsg\d*$%%,repacksuffix=+dfsg1" \
https://github.com/jp9000/obs-studio/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz