Bug 1294490 - Part 5. Add --with-system-webp switch to build. r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D8118

config/external/moz.build

@@ -42,6 +42,9 @@ if CONFIG['MOZ_AV1']:
 if not CONFIG['MOZ_SYSTEM_PNG']:
     external_dirs += ['media/libpng']
 
+if not CONFIG['MOZ_SYSTEM_WEBP']:
+    external_dirs += ['media/libwebp']
+
 if CONFIG['CPU_ARCH'] == 'arm':
     external_dirs += ['media/openmax_dl/dl']
 
@@ -57,7 +60,6 @@ external_dirs += [
     'media/libtheora',
     'media/libspeex_resampler',
     'media/libsoundtouch',
-    'media/libwebp',
     'media/mp4parse-rust',
     'media/psshparser'
 ]

config/system-headers.mozbuild

@@ -1255,6 +1255,14 @@ if CONFIG['MOZ_SYSTEM_PNG']:
         'png.h',
     ]
 
+if CONFIG['MOZ_SYSTEM_WEBP']:
+    system_headers += [
+        'webp/decode.h',
+        'webp/demux.h',
+        'webp/mux_types.h',
+        'webp/types.h',
+    ]
+
 if CONFIG['MOZ_SYSTEM_ZLIB']:
     system_headers += [
         'zlib.h',

toolkit/library/moz.build

@@ -223,6 +223,9 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
 if CONFIG['MOZ_SYSTEM_PNG']:
     OS_LIBS += CONFIG['MOZ_PNG_LIBS']
 
+if CONFIG['MOZ_SYSTEM_WEBP']:
+    OS_LIBS += CONFIG['MOZ_WEBP_LIBS']
+
 if CONFIG['MOZ_SYSTEM_LIBEVENT']:
     OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
 

toolkit/moz.configure

@@ -828,6 +828,14 @@ def skia_includes(skia):
 
 set_config('SKIA_INCLUDES', skia_includes)
 
+option('--with-system-webp',
+       help='Use system libwebp (located with pkgconfig)')
+
+system_webp = pkg_check_modules('MOZ_WEBP', 'libwebp >= 1.0.0 libwebpdemux >= 1.0.0',
+                                when='--with-system-webp')
+
+set_config('MOZ_SYSTEM_WEBP', depends(when=system_webp)(lambda: True))
+
 # Build Freetype in the tree
 # ==============================================================
 @depends(target, skia_pdf)