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

tvheadend · Oct 13, 2014 · 12d73de · 12d73de
1 parent d7ad631
commit 12d73de
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 25 deletions.
diff --git 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
@@ -31,7 +31,7 @@ OPTIONS=(
   "avahi:auto"
   "zlib:auto"
   "libav:auto"
-  "libffmpeg_static:yes"
+  "libffmpeg_static:no"
   "inotify:auto"
   "epoll:auto"
   "uriparser:auto"