[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/14.0.835.157_r99685-1-3-gac85d47

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit ac85d47009de9b7bfe58694ddca2011ca7764a11
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sat Sep 17 10:39:32 2011 +0200

    Use system ffmpeg and icu

diff --git a/debian/chromium.install b/debian/chromium.install
index a16c959..4e14be9 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -3,7 +3,7 @@ debian/tmp/usr/bin
 debian/tmp/usr/lib/chromium/chrom*
 debian/tmp/usr/lib/chromium/resources.pak
 debian/tmp/usr/lib/chromium/locales/*
-debian/tmp/usr/lib/chromium/ffmpegsumo_nolink
+#debian/tmp/usr/lib/chromium/ffmpegsumo_nolink
 debian/tmp/usr/lib/chromium/libppGoogleNaClPluginChrome.so
 debian/tmp/usr/lib/chromium/libffmpegsumo.so
 debian/tmp/usr/lib/chromium/ssl_false_start_blacklist_process
diff --git a/debian/control b/debian/control
index 0649fb7..537d434 100644
--- a/debian/control
+++ b/debian/control
@@ -67,7 +67,11 @@ Build-Depends: cdbs,
 	libwebp-dev,
 	autotools-dev,
 	libv8-dev (>= 3.4.14.13),
-	libpulse-dev
+	libpulse-dev,
+	libavcodec-dev (>= 4:0.7.1),
+	libavformat-dev (>= 4:0.7.1),
+	libavutil-dev (>= 4:0.7.1)
+	
 Standards-Version: 3.9.2
 
 Package: chromium-browser
diff --git a/debian/rules b/debian/rules
index 5155d54..add64fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ 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
+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))
@@ -296,7 +296,7 @@ GYP_DEFINES += \
 	use_system_libxslt=1 \
 	use_system_zlib=1 \
 	use_system_libevent=1 \
-	use_system_icu=0 \
+	use_system_icu=1 \
 	use_system_yasm=1 \
 	use_system_ffmpeg=$(USE_SYSTEM_FFMPEG) \
 	use_system_vpx=1 \

-- 
Git repository for pkg-chromium