[Pkg-chromium-maint] Bug#589563: chromium-browser: debian/rules: cannot access /usr/lib/libavcodec.so.*

[Jonathan Nieder]

Source: chromium-browser
Version: 5.0.375.99~r51029-4
Severity: minor
Tags: patch

 $ debian/rules whatever
 ls: cannot access /usr/lib/libavcodec.so.*: No such file or directory
 basename: missing operand
 Try `basename --help' for more information.
 ls: cannot access /usr/lib/libavformat.so.*: No such file or directory
 basename: missing operand
 Try `basename --help' for more information.
 [...]

That is just a cosmetic thing; the build still works fine.  But maybe
it seems better to avoid such messages.

Thoughts welcome.

 debian/rules |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7bde408..425489a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,13 @@ 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)
+USE_SYSTEM_FFMPEG	:= 0
+
+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))
+endif
 
 # DEB_TAR_SRCDIR has to be 'src' as this is what gyp expects :(
 DEB_TAR_SRCDIR := src
@@ -233,7 +237,11 @@ TESTS ?= \
 endif
 
 # FFmpeg-mt
+ifeq (1,$(USE_SYSTEM_FFMPEG))
+GYP_DEFINES += build_ffmpegsumo=0
+else
 GYP_DEFINES += build_ffmpegsumo=1 ffmpeg_branding=Chrome
+endif
 
 USE_SYSTEM_SQLITE := $(shell pkg-config 'sqlite3 >= 3.6.1' && echo 1 || echo 0)
 USE_SYSTEM_SQLITE := 0
@@ -256,7 +264,7 @@ GYP_DEFINES += \
 	use_system_libevent=1 \
 	use_system_icu=1 \
 	use_system_yasm=1 \
-	use_system_ffmpeg=0 \
+	use_system_ffmpeg=$(USE_SYSTEM_FFMPEG) \
 	$(NULL)
 endif
 
@@ -428,13 +436,15 @@ ifneq (i386,$(DEB_HOST_ARCH_CPU))
 	# same for inspector
 	rm -rf $(CURDIR)/debian/tmp/$(LIB_DIR)/resources/inspector/*
 endif
+ifeq (1,$(USE_SYSTEM_FFMPEG))
 	# Install symlinks to system ffmpeg libs
-	#ln -sf "/usr/lib/$(LIBAVCODEC_BASENAME)" \
-	#	"$(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/$(LIBAVCODEC_BASENAME)"
-	#ln -sf "/usr/lib/$(LIBAVFORMAT_BASENAME)" \
-	#	"$(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/$(LIBAVFORMAT_BASENAME)"
-	#ln -sf "/usr/lib/$(LIBAVUTIL_BASENAME)" \
-	#	"$(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/$(LIBAVUTIL_BASENAME)"
+	ln -sf "/usr/lib/$(LIBAVCODEC_BASENAME)" \
+		"$(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/$(LIBAVCODEC_BASENAME)"
+	ln -sf "/usr/lib/$(LIBAVFORMAT_BASENAME)" \
+		"$(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/$(LIBAVFORMAT_BASENAME)"
+	ln -sf "/usr/lib/$(LIBAVUTIL_BASENAME)" \
+		"$(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/$(LIBAVUTIL_BASENAME)"
+endif
 
 binary-install/$(DEBIAN_NAME)-l10n::
 	rm $(CURDIR)/debian/$(DEBIAN_NAME)-l10n/$(LIB_DIR)/locales/en-US.pak
@@ -497,14 +507,16 @@ compare:
 
 binary-makedeb-IMPL/$(DEBIAN_NAME)::
 	dh_gencontrol -p$(DEBIAN_NAME)
+ifeq (1,$(USE_SYSTEM_FFMPEG))
 	# Manually insert ffmpeg libs shlib deps for chromium-browser since the
 	# libs are dlopened.
-	#sed "s/^Depends:.*$$/&, $$(sh debian/var_info LIBAVCODEC_DEPENDS)/" \
-	#	-i "debian/$(DEBIAN_NAME)/DEBIAN/control"
-	#sed "s/^Depends:.*$$/&, $$(sh debian/var_info LIBAVFORMAT_DEPENDS)/" \
-	#	-i "debian/$(DEBIAN_NAME)/DEBIAN/control"
-	#sed "s/^Depends:.*$$/&, $$(sh debian/var_info LIBAVUTIL_DEPENDS)/" \
-	#	-i "debian/$(DEBIAN_NAME)/DEBIAN/control"
+	sed "s/^Depends:.*$$/&, $$(sh debian/var_info LIBAVCODEC_DEPENDS)/" \
+		-i "debian/$(DEBIAN_NAME)/DEBIAN/control"
+	sed "s/^Depends:.*$$/&, $$(sh debian/var_info LIBAVFORMAT_DEPENDS)/" \
+		-i "debian/$(DEBIAN_NAME)/DEBIAN/control"
+	sed "s/^Depends:.*$$/&, $$(sh debian/var_info LIBAVUTIL_DEPENDS)/" \
+		-i "debian/$(DEBIAN_NAME)/DEBIAN/control"
+endif
 	dh_md5sums -p$(DEBIAN_NAME)
 	dh_builddeb -p$(DEBIAN_NAME)
 
-- 
1.7.2.rc2