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

diff --git a/.doozer.json b/.doozer.json
index e6fc8d3766b412f1343770b2c285d9d36c5282cd..681bd9dba111a80da36e1aaebd98c96ebb2f79ff 100644 (file)
--- 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 9dac791a1d3d59f72e0dd547008636e5173efdfc..ff598ad3fc8961bbbf352782122ecbb7eda05071 100644 (file)
--- 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 b497e1c7c7f822cb389f5c4745dfdc6a3570fddb..6ed87a71df8627f151cebdb6c955e87c5548a30b 100644 (file)
--- 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 53f02462670258f6d6878ebac9d0c4300dbfde7f..8ae12b59c6aa3e6815aa09728b6aeef667587dbd 100755 (executable)
--- 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"