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

… builds
tvheadend · Mar 24, 2015 · 4ebb23a · 4ebb23a
1 parent 27382c2
commit 4ebb23a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git 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.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
@@ -34,6 +34,7 @@ OPTIONS=(
   "zlib:auto"
   "libav:auto"
   "libffmpeg_static:no"
+  "libffmpeg_static_x264:yes"
   "inotify:auto"
   "epoll:auto"
   "uriparser:auto"