[SCM] gerbera/master: Add patch to build duktape during the build

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Sat Sep 23 17:48:16 UTC 2017


The following commit has been merged in the master branch:
commit c01cdec52af52c27d321a9eb8a308e4c179c0838
Author: James Cowgill <jcowgill at debian.org>
Date:   Tue Sep 12 09:24:25 2017 +0100

    Add patch to build duktape during the build

diff --git a/debian/patches/0011_duktape-nolib.patch b/debian/patches/0011_duktape-nolib.patch
new file mode 100644
index 0000000..1860d4d
--- /dev/null
+++ b/debian/patches/0011_duktape-nolib.patch
@@ -0,0 +1,40 @@
+Description: Adjust FindDuktape.cmake to handle Debian's duktape-dev
+ Upstream gerbera expects duktape to be shipped as a shared library, but in
+ Debian the sources are shipped directly. Arrange for the source to be compiled
+ into a static library in the FindDuktape.cmake script.
+Author: James Cowgill <jcowgill at debian.org>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/cmake/FindDuktape.cmake
++++ b/cmake/FindDuktape.cmake
+@@ -7,23 +7,18 @@
+ #  DUKTAPE_DEFINITIONS - Compiler switches required for using Duktape
+ #
+ 
+-find_package(PkgConfig QUIET)
+-pkg_check_modules(PC_DUK QUIET duktape libduktape)
++set(DUKTAPE_INCLUDE_DIR "/usr/share/duktape" CACHE PATH "DukTape Include Directory")
++set(DUKTAPE_LIBRARY duktape CACHE STRING "DukTape Library")
+ 
+-find_path(DUKTAPE_INCLUDE_DIR duktape.h
+-    HINTS ${PC_DUK_INCLUDEDIR} ${PC_DUK_INCLUDE_DIRS}
+-    PATH_SUFFIXES duktape)
+-
+-find_library(DUKTAPE_LIBARY
+-    NAMES duktape libduktape
+-    HINTS ${PC_DUK_LIBDIR} ${PC_DUK_LIBRARY_DIRS})
++add_library(duktape STATIC "/usr/share/duktape/duktape.c")
++target_include_directories(duktape PUBLIC ${DUKTAPE_INCLUDE_DIR})
+ 
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Duktape
+-        REQUIRED_VARS DUKTAPE_LIBARY DUKTAPE_INCLUDE_DIR)
++	REQUIRED_VARS DUKTAPE_LIBRARY DUKTAPE_INCLUDE_DIR)
+ 
+ if (DUKTAPE_FOUND)
+-    set (DUKTAPE_LIBRARIES ${DUKTAPE_LIBARY})
++    set (DUKTAPE_LIBRARIES ${DUKTAPE_LIBRARY})
+     set (DUKTAPE_INCLUDE_DIRS ${DUKTAPE_INCLUDE_DIR} )
+ endif ()
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8bba6f1..fcbdde5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0008_symlinks.patch
 0009_CMake-Improve-compat-with-libupnp-1.8.2.patch
 0010_Unqualify-libupnp-includes.patch
+0011_duktape-nolib.patch

-- 
gerbera packaging



More information about the pkg-multimedia-commits mailing list