package/gerbera: fix static build with libmatroska
PATCH 1/1 package/gerbera: fix static build with libmatroska
Fixes:
- http://autobuild.buildroot.org/results/ee365f792feb0fe69ed765fda625afabc91ec769
Signed-off-by Fabrice Fontaine <[email protected]>
--- ...make-FindMatroska-fix-static-linking.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/gerbera/0003-cmake-FindMatroska-fix-static-linking.patch
package/gerbera/0003-cmake-FindMatroska-fix-static-linking.patch new file +37 -0
@@ -0,0 +1,37 @@ +From aab2eacbaad10759294f4fd74bbb5ecef3cf3a8d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +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 <[email protected]> +[Retrieved from: +https://github.com/gerbera/gerbera/commit/aab2eacbaad10759294f4fd74bbb5ecef3cf3a8d] +--- + 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(
Signature · 1 line
2.26.2
Thomas Petazzoni
AppliedPATCH 1/1 package/gerbera: fix static build with libmatroska
Quoted 8 lines · On Sat, 20 Jun 2020 18:04:37 +0200 Fabrice Fontaine…
Fixes:
- http://autobuild.buildroot.org/results/ee365f792feb0fe69ed765fda625afabc91ec769Signed-off-by Fabrice Fontaine <[email protected]>--- ...make-FindMatroska-fix-static-linking.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/gerbera/0003-cmake-FindMatroska-fix-static-linking.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/gerbera: fix static build with libmatroska
In reply to Fabrice FontaineQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Fixes:
- http://autobuild.buildroot.org/results/ee365f792feb0fe69ed765fda625afabc91ec769Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard