Makefile.ffmpeg: use distro specific libx264 library

tvheadend · Oct 13, 2014 · 84947ed · 84947ed
1 parent f6e0f50
commit 84947ed
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/.doozer.json b/.doozer.json
@@ -34,7 +34,8 @@
         "wget",
         "bzip2",
         "git-core",
-        "liburiparser-dev"
+        "liburiparser-dev",
+	"libx264-dev"
       ],
 
       "buildcmd": [
@@ -76,7 +77,8 @@
         "wget",
         "bzip2",
         "git-core",
-        "liburiparser-dev"
+        "liburiparser-dev",
+	"libx264-dev"
       ],
 
       "buildcmd": [

diff --git a/Makefile b/Makefile
@@ -434,7 +434,6 @@ ${SRCS_LIBAV}: ${BUILDDIR}/libffmpeg_stamp
 endif
 
 ${BUILDDIR}/libffmpeg_stamp: ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a
-	echo "$(DEPS)"
 	@touch $@
 
 ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a:

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
@@ -132,6 +132,20 @@ $(LIBAVDIR)/$(LIBVORBIS)/.tvh_build: \
 # libx264
 #
 
+ARCH = $(shell arch)
+
+ifeq ($(ARCH),i386)
+
+$(LIBAVDIR)/$(LIBX264)/.tvh_download:
+	@echo "***** PLEASE FIX !!!! libx264 build for i386 *****"
+	@touch $@
+
+$(LIBAVDIR)/$(LIBX264)/.tvh_build:
+	@echo "***** PLEASE FIX !!!! libx264 build for i386 *****"
+	@touch $@
+
+else
+
 $(LIBAVDIR)/$(LIBX264)/.tvh_download:
 	$(call DOWNLOAD,$(LIBX264_URL),$(LIBAVDIR)/$(LIBX264_TB))
 	#rm -rf $(LIBAVDIR)/x264-snapshot-*
@@ -156,6 +170,8 @@ $(LIBAVDIR)/$(LIBX264)/.tvh_build: \
 		make -C $(LIBAVDIR)/$(LIBX264) install
 	@touch $@
 
+endif
+
 #
 # libvpx (VP8)
 #