[SCM] x265/master: Fix linking with dl

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 737b9aad9df0f865cdca9206bf92d520261b4818
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Oct 18 13:47:25 2015 +0200

    Fix linking with dl
    
    Closes: #802093

diff --git a/debian/patches/fix-linking-with-dl.patch b/debian/patches/fix-linking-with-dl.patch
new file mode 100644
index 0000000..11f9255
--- /dev/null
+++ b/debian/patches/fix-linking-with-dl.patch
@@ -0,0 +1,28 @@
+Description: Pass libs in proper order
+Author: Sebastian Ramacher <sramacher at debian.org>
+Bug-Debian: https://bugs.debian.org/802093
+Forwarded: https://bitbucket.org/multicoreware/x265/issues/202/library-not-linked-against-libdl-for
+Last-Update: 2015-10-18
+
+--- x265-1.8.orig/source/CMakeLists.txt
++++ x265-1.8/source/CMakeLists.txt
+@@ -457,6 +457,9 @@ option(ENABLE_SHARED "Build shared libra
+ if(ENABLE_SHARED)
+     add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" ${YASM_OBJS}
+                 ${X265_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common>)
++    if(EXTRA_LIB)
++        target_link_libraries(x265-shared ${EXTRA_LIB})
++    endif()
+     target_link_libraries(x265-shared ${PLATFORM_LIBS})
+     if(MSVC)
+         set_target_properties(x265-shared PROPERTIES OUTPUT_NAME libx265)
+@@ -482,9 +485,6 @@ if(ENABLE_SHARED)
+                 ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+                 RUNTIME DESTINATION ${BIN_INSTALL_DIR})
+     endif()
+-    if(EXTRA_LIB)
+-        target_link_libraries(x265-shared ${EXTRA_LIB})
+-    endif()
+     if(LINKER_OPTIONS)
+         # set_target_properties can't do list expansion
+         string(REPLACE ";" " " LINKER_OPTION_STR "${LINKER_OPTIONS}")
diff --git a/debian/patches/series b/debian/patches/series
index af01a27..5c8a444 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 compile-flags.patch
 fix-x32.patch
+fix-linking-with-dl.patch

-- 
x265 packaging