From 7773a412e5fd072a4edb1e957f2857130ea07a3c Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 28 Feb 2017 13:04:53 +0100
Subject: Move opus, webp and ffmpeg to new configure system

Use the new configure system to control if we are using system opus,
webp and ffmpeg libraries.

Change-Id: I53db66ca1668fc939a51bf7811f967468456b924
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 configure.json | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index c91c2e6bf..ad9fd117c 100644
--- a/configure.json
+++ b/configure.json
@@ -10,6 +10,9 @@
         "options": {
             "alsa": "boolean",
             "embedded": "boolean",
+            "ffmpeg": { "type": "enum", "name": "system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
+            "opus": { "type": "enum", "name": "system-opus", "values": { "system": "yes", "qt": "no" } },
+            "webp": { "type": "enum", "name": "system-webp", "values": { "system": "yes", "qt": "no" } },
             "pepper-plugins": "boolean",
             "printing-and-pdf": "boolean",
             "proprietary-codecs": "boolean",
@@ -32,6 +35,24 @@
             "sources": [
                 { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" }
             ]
+        },
+        "ffmpeg": {
+            "label": "libavcodec libavformat libavutil",
+            "sources": [
+                { "type": "pkgConfig", "args": "libavcodec libavformat libavutil" }
+            ]
+        },
+        "opus": {
+            "label": "opus",
+            "sources": [
+                { "type": "pkgConfig", "args": "opus" }
+            ]
+        },
+        "webp": {
+            "label": "libwebp and libwebpdemux",
+            "sources": [
+                { "type": "pkgConfig", "args": "libwebp libwebpdemux" }
+            ]
         }
     },
 
@@ -99,6 +120,24 @@
             "purpose": "Enables WebRTC support",
             "output": [ "privateFeature" ]
         },
+        "system-webp": {
+            "label": "libwebp and libwebpdemux",
+            "autoDetect": "config.unix",
+            "condition": "libs.webp",
+            "output": [ "privateFeature" ]
+        },
+        "system-opus": {
+            "label": "Opus",
+            "autoDetect": "config.unix",
+            "condition": "libs.opus",
+            "output": [ "privateFeature" ]
+        },
+        "system-ffmpeg": {
+            "label": "ffmpeg",
+            "autoDetect": false,
+            "condition": "libs.ffmpeg && features.system-opus && features.system-webp",
+            "output": [ "privateFeature" ]
+        },
         "system-ninja": {
             "label": "Using system ninja",
             "condition": "tests.ninja",
@@ -132,6 +171,15 @@
                     "type": "feature",
                     "args": "pulseaudio",
                     "condition": "config.unix"
+                },
+                {
+                   "section": "System libraries",
+                   "condition": "config.unix",
+                   "entries": [
+                        "system-webp",
+                        "system-opus",
+                        "system-ffmpeg"
+                    ]
                 }
             ]
         }
-- 
cgit v1.2.3