config: libffmpeg_static is not default, attempt to update doozer cfg

diff --git a/.doozer.json b/.doozer.json
index d990da83185040a0889be8118c27e7462860ca14..3e8853ecd161eb4a5d43dd5cca059b1dd2742124 100644 (file)
--- a/.doozer.json
+++ b/.doozer.json
@@ -12,16 +12,12 @@
         "zlib1g-dev",
         "wget",
         "bzip2",
-        "libcurl4-gnutls-dev",
         "git-core",
-        "liburiparser-dev",
-        "libavformat-dev",
-        "libswscale-dev",
-        "libavcodec-dev"
+        "liburiparser-dev"
       ],
 
       "buildcmd": [
-        "./configure --disable-dvbscan",
+        "./configure --disable-dvbscan --enable-libffmpeg_static",
         "make -j ${PARALLEL}"
       ]
     },
@@ -37,16 +33,12 @@
         "zlib1g-dev",
         "wget",
         "bzip2",
-        "libcurl4-gnutls-dev",
         "git-core",
-        "liburiparser-dev",
-        "libavformat-dev",
-        "libswscale-dev",
-        "libavcodec-dev"
+        "liburiparser-dev"
       ],
 
       "buildcmd": [
-        "./configure --disable-dvbscan",
+        "./configure --disable-dvbscan --enable-libffmpeg_static",
         "make -j ${PARALLEL}"
       ]
     },
@@ -62,16 +54,12 @@
         "zlib1g-dev",
         "wget",
         "bzip2",
-        "libcurl4-gnutls-dev",
         "git-core",
-        "liburiparser-dev",
-        "libavformat-dev",
-        "libswscale-dev",
-        "libavcodec-dev"
+        "liburiparser-dev"
       ],
 
       "buildcmd": [
-        "./configure --disable-dvbscan",
+        "./configure --disable-dvbscan --enable-libffmpeg_static",
         "make -j ${PARALLEL}"
       ]
     },
@@ -87,16 +75,12 @@
         "zlib1g-dev",
         "wget",
         "bzip2",
-        "libcurl4-gnutls-dev",
         "git-core",
-        "liburiparser-dev",
-        "libavformat-dev",
-        "libswscale-dev",
-        "libavcodec-dev"
+        "liburiparser-dev"
       ],
 
       "buildcmd": [
-        "./configure --disable-dvbscan",
+        "./configure --disable-dvbscan --enable-libffmpeg_static",
         "make -j ${PARALLEL}"
       ]
     }

diff --git a/configure b/configure
index a0dd0b3768a434d2cbc5a2749f1b23a0fedacf5d..05ec5ff8d866014d6d9bbb6909593d34dac101ad 100755 (executable)
--- a/configure
+++ b/configure
@@ -31,7 +31,7 @@ OPTIONS=(
   "avahi:auto"
   "zlib:auto"
   "libav:auto"
-  "libffmpeg_static:yes"
+  "libffmpeg_static:no"
   "inotify:auto"
   "epoll:auto"
   "uriparser:auto"