Update packaging to 0.13.2
This commit is contained in:
parent
8238ecf399
commit
cc41a1a60e
14 changed files with 1566 additions and 1054 deletions
25
debian/patches/0001-Use-common-license.patch
vendored
Normal file
25
debian/patches/0001-Use-common-license.patch
vendored
Normal 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
84
debian/patches/0002-Buildsystem.patch
vendored
Normal 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
1
debian/patches/series
vendored
|
|
@ -1 +1,2 @@
|
|||
0001-Use-common-license.patch
|
||||
0002-Buildsystem.patch
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue