From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 24 Mar 2015 09:58:28 +0000 (+0100)
Subject: configure: add --disable-libffmpeg_static_x264 to satisfy i386 debian builds
X-Git-Tag: v4.1~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b941aedf93d95e4c01de65a4afb93cb6020e86de;p=thirdparty%2Ftvheadend.git

configure: add --disable-libffmpeg_static_x264 to satisfy i386 debian builds
---

diff --git a/.doozer.json b/.doozer.json
index e6fc8d376..681bd9dba 100644
--- a/.doozer.json
+++ b/.doozer.json
@@ -39,7 +39,7 @@
       ],
 
       "buildcmd": [
-        "./configure --disable-dvbscan --enable-libffmpeg_static --enable-hdhomerun_static",
+        "./configure --disable-dvbscan --enable-libffmpeg_static --disable-libffmpeg_static_x264 --enable-hdhomerun_static",
         "make -j ${PARALLEL}"
       ]
     },
@@ -82,7 +82,7 @@
       ],
 
       "buildcmd": [
-        "./configure --disable-dvbscan --enable-libffmpeg_static --enable-hdhomerun_static",
+        "./configure --disable-dvbscan --enable-libffmpeg_static --disable-libffmpeg_static_x264 --enable-hdhomerun_static",
         "make -j ${PARALLEL}"
       ]
     }
diff --git a/Makefile b/Makefile
index 9dac791a1..ff598ad3f 100644
--- a/Makefile
+++ b/Makefile
@@ -470,7 +470,8 @@ ${BUILDDIR}/libffmpeg_stamp: ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec
 	@touch $@
 
 ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a:
-	$(MAKE) -f Makefile.ffmpeg build
+	CONFIG_LIBFFMPEG_STATIC_X264=$(CONFIG_LIBFFMPEG_STATIC_X264) \
+	  $(MAKE) -f Makefile.ffmpeg build
 
 # Static HDHOMERUN library
 
diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index b497e1c7c..6ed87a71d 100644
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -150,12 +150,10 @@ $(LIBAVDIR)/$(LIBVORBIS)/.tvh_build: \
 # libx264
 #
 
-ARCH = $(shell $(CC) -dumpmachine | cut -d '-' -f 1)
-
-ifneq (,$(filter i386 i486 i586 i686 pentium,$(ARCH)))
+ifneq (yes,$(CONFIG_LIBFFMPEG_STATIC_X264))
 
 $(LIBAVDIR)/$(LIBX264)/.tvh_download:
-	@echo "***** PLEASE FIX !!!! libx264 build for i386 *****"
+	@echo "***** LIBX264 STATIC BUILD IS DISABLED, USING INSTALLED PACKAGE *****"
 	@mkdir -p $(LIBAVDIR)/$(LIBX264)
 	@touch $@
 
diff --git a/configure b/configure
index 53f024626..8ae12b59c 100755
--- a/configure
+++ b/configure
@@ -34,6 +34,7 @@ OPTIONS=(
   "zlib:auto"
   "libav:auto"
   "libffmpeg_static:no"
+  "libffmpeg_static_x264:yes"
   "inotify:auto"
   "epoll:auto"
   "uriparser:auto"