[SCM] x265/master: Look up 10bit library in correct path

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 83fd52b37a45856a7e32abb6b2f408c91a1d21c6
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu May 21 22:29:05 2015 +0200

    Look up 10bit library in correct path

diff --git a/debian/patches/highbit-depth-path.patch b/debian/patches/highbit-depth-path.patch
new file mode 100644
index 0000000..58f8a7c
--- /dev/null
+++ b/debian/patches/highbit-depth-path.patch
@@ -0,0 +1,28 @@
+Description: Pass correct path to dlopen
+Author: Sebastian Ramacher <sramacher at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-05-21
+
+--- a/source/encoder/api.cpp
++++ b/source/encoder/api.cpp
+@@ -288,7 +288,7 @@
+ #define ext ".dylib"
+ #else
+ #include <dlfcn.h>
+-#define ext ".so"
++#define ext ".so." xstr(X265_BUILD)
+ #endif
+ 
+ extern "C"
+@@ -302,9 +302,9 @@
+         if (bitDepth == 12)
+             libname = "libx265_main12" ext;
+         else if (bitDepth == 10)
+-            libname = "libx265_main10" ext;
++            libname = DEB_HOST_MULTIARCH "x265-10bit/libx265" ext;
+         else if (bitDepth == 8)
+-            libname = "libx265_main" ext;
++            libname = DEB_HOST_MULTIARCH "libx265" ext;
+         else
+             return NULL;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 63b1032..6120641 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 compile-flags.patch
+highbit-depth-path.patch
diff --git a/debian/rules b/debian/rules
index a063e6a..15b45c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,12 @@
 #! /usr/bin/make -f
 
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
-# LFS support
-export DEB_CPPFLAGS_MAINT_APPEND=$(shell getconf LFS_CFLAGS)
-
 DEB_HOST_MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
+# LFS support and multiarch path to look up 10bit library
+export DEB_CPPFLAGS_MAINT_APPEND=$(shell getconf LFS_CFLAGS) \
+	-DDEB_HOST_MULTIARCH=\"/usr/lib/$(DEB_HOST_MULTIARCH)/\"
+
 %:
 	dh $@ --parallel --buildsystem=cmake \
 		--sourcedirectory=source \

-- 
x265 packaging