[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/27.0.1453.110-1-1-g9759890

Shawn Landden shawnlandden at gmail.com
Tue Jun 11 20:58:26 UTC 2013


The following commit has been merged in the master branch:
commit 9759890332b1a962505342f9b6445a58dab6a112
Author: Shawn Landden <shawnlandden at gmail.com>
Date:   Thu May 30 13:21:48 2013 -0700

    rules: build with system libwebp when version >= 0.3.0
    
    currently available in experimental

diff --git a/debian/rules b/debian/rules
index 4f4f1f8..1c14540 100755
--- a/debian/rules
+++ b/debian/rules
@@ -343,6 +343,9 @@ endif
 USE_SYSTEM_SQLITE := $(shell pkg-config 'sqlite3 >= 3.6.1' && echo 1 || echo 0)
 USE_SYSTEM_SQLITE := 0
 
+USE_SYSTEM_LIBWEBP := $(shell pkg-config 'libwebp >= 0.3.0' && echo 1 || echo 0)
+USE_SYSTEM_LIBWEBP := 0
+
 ifneq (,$(filter 8.10 9.04,$(DEBIAN_DIST)))
 # Don't build with system zlib on Intrepid/Jaunty. See http://crbug.com/38073
 GYP_DEFINES += use_system_zlib=0
@@ -365,7 +368,7 @@ GYP_DEFINES += \
 	use_system_libvpx=0 \
 	use_system_xdg_utils=1 \
 	use_system_flac=1 \
-	use_system_libwebp=0 \
+	use_system_libwebp=$(USE_SYSTEM_LIBWEBP) \
 	use_system_speex=1 \
 	linux_link_libspeechd=1 \
 	$(NULL)

-- 
Git repository for pkg-chromium



More information about the Pkg-chromium-commit mailing list