[vlc-commits] contrib: fix ldl linking error of x265

[Gilles Sabourin]

vlc | branch: master | Gilles Sabourin <gilles.sabourin at free.fr> | Sun Jul 10 15:21:38 2016 +0200| [d513c74ea340416c321034e9481532ebdd41d40a] | committer: Jean-Baptiste Kempf

contrib: fix ldl linking error of x265

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d513c74ea340416c321034e9481532ebdd41d40a
---

 contrib/src/x265/rules.mak              |    1 +
 contrib/src/x265/x265-ldl-linking.patch |   11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/x265/rules.mak b/contrib/src/x265/rules.mak
index 05237e2..fd2f175 100644
--- a/contrib/src/x265/rules.mak
+++ b/contrib/src/x265/rules.mak
@@ -26,6 +26,7 @@ x265: x265-$(X265_VERSION).tar.bz2 .sum-x265
 	rm -Rf $@-$(X265_VERSION)
 	mkdir -p $@-$(X265_VERSION)
 	$(BZCAT) "$<" | (cd $@-$(X265_VERSION) && tar xv --strip-components=1)
+	$(APPLY) $(SRC)/x265/x265-ldl-linking.patch
 	$(call pkg_static,"source/x265.pc.in")
 	$(MOVE)
 
diff --git a/contrib/src/x265/x265-ldl-linking.patch b/contrib/src/x265/x265-ldl-linking.patch
new file mode 100644
index 0000000..2148b60
--- /dev/null
+++ b/contrib/src/x265/x265-ldl-linking.patch
@@ -0,0 +1,11 @@
+--- x265-1.9/source/CMakeLists.txt.orig	2016-01-25 06:16:50.000000000 +0100
++++ x265-1.9/source/CMakeLists.txt	2016-07-10 13:36:14.759323966 +0200
+@@ -566,7 +566,7 @@
+         if(WIN32 OR NOT ENABLE_SHARED OR INTEL_CXX)
+             # The CLI cannot link to the shared library on Windows, it
+             # requires internal APIs not exported from the DLL
+-            target_link_libraries(cli x265-static ${PLATFORM_LIBS})
++            target_link_libraries(cli x265-static ${PLATFORM_LIBS} ${CMAKE_DL_LIBS})
+         else()
+             target_link_libraries(cli x265-shared ${PLATFORM_LIBS})
+         endif()