From 12d73de4efee35d29fcb5ae25226bffc72b7d352 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 13 Oct 2014 13:38:25 +0200 Subject: [PATCH] config: libffmpeg_static is not default, attempt to update doozer cfg --- .doozer.json | 32 ++++++++------------------------ configure | 2 +- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/.doozer.json b/.doozer.json index d990da831..3e8853ecd 100644 --- 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 a0dd0b376..05ec5ff8d 100755 --- 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" -- 2.47.3