[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/14.0.835.163_r101024-1-2-gd7d8b22

[Michael Gilbert]

The following commit has been merged in the master branch:
commit d7d8b227573de0fe9fbbb1a1681bb3b3f68a8a62
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sat Sep 24 17:53:37 2011 -0400

    Support libav's transition to multiarch

diff --git a/debian/rules b/debian/rules
index 92a05ed..08846c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,12 @@ DEBIAN_REVISION		:= $(shell echo $(DEBIAN_VERSION) | sed 's/^.*r\([^-]*\)-.*/\1/
 DEBIAN_DIST		:= $(shell lsb_release -ds | tr -d '()')
 DEBIAN_DIST_NAME	:= $(shell lsb_release -si)
 DEBIAN_DIST_VERSION	:= $(shell lsb_release -sr)
+MULTIARCH		:= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
 USE_SYSTEM_FFMPEG	:= 1
 ifeq (1,$(USE_SYSTEM_FFMPEG))
-LIBAVCODEC_BASENAME	:= $(shell basename $$(ls -x /usr/lib/libavcodec.so.* | cut -d ' ' -f 1))
-LIBAVFORMAT_BASENAME	:= $(shell basename $$(ls -x /usr/lib/libavformat.so.* | cut -d ' ' -f 1))
-LIBAVUTIL_BASENAME	:= $(shell basename $$(ls -x /usr/lib/libavutil.so.* | cut -d ' ' -f 1))
+LIBAVCODEC_BASENAME	:= $(shell basename $$(ls -x /usr/lib/$(MULTIARCH)/libavcodec.so.* | cut -d ' ' -f 1))
+LIBAVFORMAT_BASENAME	:= $(shell basename $$(ls -x /usr/lib/$(MULTIARCH)/libavformat.so.* | cut -d ' ' -f 1))
+LIBAVUTIL_BASENAME	:= $(shell basename $$(ls -x /usr/lib/$(MULTIARCH)/libavutil.so.* | cut -d ' ' -f 1))
 endif
 
 # DEB_TAR_SRCDIR has to be 'src' as this is what gyp expects :(
@@ -488,11 +489,11 @@ ifneq (i386,$(DEB_HOST_ARCH_CPU))
 endif
 ifeq (1,$(USE_SYSTEM_FFMPEG))
 	# Install symlinks to system ffmpeg libs
-	ln -sf "/usr/lib/$(LIBAVCODEC_BASENAME)" \
+	ln -sf "/usr/lib/$(MULTIARCH)/$(LIBAVCODEC_BASENAME)" \
 		"$(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/$(LIBAVCODEC_BASENAME)"
-	ln -sf "/usr/lib/$(LIBAVFORMAT_BASENAME)" \
+	ln -sf "/usr/lib/$(MULTIARCH)/$(LIBAVFORMAT_BASENAME)" \
 		"$(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/$(LIBAVFORMAT_BASENAME)"
-	ln -sf "/usr/lib/$(LIBAVUTIL_BASENAME)" \
+	ln -sf "/usr/lib/$(MULTIARCH)/$(LIBAVUTIL_BASENAME)" \
 		"$(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/$(LIBAVUTIL_BASENAME)"
 endif
 

-- 
Git repository for pkg-chromium