Makefile.ffmpeg: use distro specific libx264 library

diff --git a/.doozer.json b/.doozer.json
index 3e8853ecd161eb4a5d43dd5cca059b1dd2742124..7a30b7d7ec6ccf5d928b11597a0ef0f0507988aa 100644 (file)
--- 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
index f63350ddd3a1bf1a898807f7693c64c7f580743d..0a1b3cd5bde18c9fa5759c446a814d8d4fd956b4 100644 (file)
--- 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
index 44377282d8b47daef2ef8b9f0c88b59446c59879..e9fae84ef071353432f8c51656c82031015a3834 100644 (file)
--- 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)
 #