cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

gerbera: enable matroska and ffmpeg

Browse Source 
The latter requires BUILD_PATENTED, as in master.

Backported linking patches for libebml and libmatroska.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2020-07-27 13:00:28 -07:00
parent f73b1da1a5
commit e8e290e0f8
3 changed files with 67 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/gerbera/patches/010-ebml.patch
+35
View File
@@ -0,0 +1,35 @@
From aab2eacbaad10759294f4fd74bbb5ecef3cf3a8d Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Tue, 24 Dec 2019 22:57:18 +0100
Subject: [PATCH] cmake/FindMatroska: fix static linking
Fix static linking with libmatrasoka by adding PC_EBM_LIBRARIES to
EBML_LIBRARIES and PC_MAT_LIBRARIES to MATROSKA_LIBRARIES
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
cmake/FindMatroska.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/FindMatroska.cmake b/cmake/FindMatroska.cmake
index 4b09a5ec..12ca593d 100644
--- a/cmake/FindMatroska.cmake
+++ b/cmake/FindMatroska.cmake
@@ -23,7 +23,7 @@ FIND_LIBRARY(EBML_LIBRARY ebml
FIND_PACKAGE_HANDLE_STANDARD_ARGS(EBML
REQUIRED_VARS EBML_LIBRARY EBML_INCLUDE_DIR)
if (EBML_FOUND)
- set (EBML_LIBRARIES ${EBML_LIBRARY})
+ set (EBML_LIBRARIES ${EBML_LIBRARY} ${PC_EBM_LIBRARIES})
set (EBML_INCLUDE_DIRS ${EBML_INCLUDE_DIR} )
endif ()
MARK_AS_ADVANCED(
@@ -41,7 +41,7 @@ find_library(MATROSKA_LIBRARY matroska
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MATROSKA
REQUIRED_VARS MATROSKA_LIBRARY MATROSKA_INCLUDE_DIR)
if (MATROSKA_FOUND)
- set (MATROSKA_LIBRARIES ${MATROSKA_LIBRARY})
+ set (MATROSKA_LIBRARIES ${MATROSKA_LIBRARY} ${PC_MAT_LIBRARIES})
set (MATROSKA_INCLUDE_DIRS ${MATROSKA_INCLUDE_DIR} )
endif ()
MARK_AS_ADVANCED(
multimedia/gerbera/patches/020-ebml.patch
+26
View File
@@ -0,0 +1,26 @@
From f53b80b6b1ede5b89e38219454e0411ee67a9b4b Mon Sep 17 00:00:00 2001
From: david <16252944+astylos@users.noreply.github.com>
Date: Thu, 27 Feb 2020 22:54:40 +0000
Subject: [PATCH] switch order of mastroska and ebml to fix linking issue
---
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index feffa637..62e43650 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -543,10 +543,10 @@ endif()
if(WITH_MATROSKA)
find_package (Matroska)
if (MATROSKA_FOUND AND EBML_FOUND)
- include_directories(${EBML_INCLUDE_DIRS})
- target_link_libraries (gerbera ${EBML_LIBRARIES})
include_directories(${MATROSKA_INCLUDE_DIRS})
target_link_libraries (gerbera ${MATROSKA_LIBRARIES})
+ include_directories(${EBML_INCLUDE_DIRS})
+ target_link_libraries (gerbera ${EBML_LIBRARIES})
add_definitions(-DHAVE_MATROSKA)
else()
message(FATAL_ERROR "Matroska not found")