X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=fb10c7dbd4dd69d8bb3b8aa34afc31751714e7a2;hb=a5052c2a8d25f982a12068cf62a4121b46e8440a;hp=d1efbb644fb0f4b5e606b10cf1d09834b31c14e2;hpb=870146382734486fc8af6d0d15b757874477a4ce;p=vlc

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d1efbb644f..fb10c7dbd4 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -181,6 +181,8 @@ ifdef HAVE_ISA_THUMB
 NOTHUMB ?= -mno-thumb
 endif
 
+X264CONF+= --disable-avs-input --disable-lavf-input --disable-ffms-input --disable-mp4-output
+
 DATE=`date +%Y-%m-%d`
 
 # ***************************************************************************
@@ -351,8 +353,6 @@ pkg-config-$(PKGCFG_VERSION).tar.gz:
 
 pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -d pkgconfig/glib-1.2.8 -p 1 < Patches/glib.patch
-	patch -d pkgconfig -p0 < Patches/pkgcfg.patch
 	(cd $@; autoconf)
 
 .pkgcfg: pkgconfig
@@ -460,6 +460,7 @@ fontconfig-$(FONTCONFIG_VERSION).tar.gz:
 
 fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch
 	$(EXTRACT_GZ)
+	patch -p0 < Patches/fontconfig-march.patch
 	patch -p0 < Patches/fontconfig-nodocs.patch
 ifdef HAVE_WIN32
 	patch -p0 < Patches/fontconfig.patch
@@ -1037,10 +1038,6 @@ ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
 	patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
-ifdef HAVE_WIN32
-	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-win32.patch)
-	(cd $@; patch -p0 < ../Patches/ffmpeg-dxva2.patch)
-endif
 ifdef NO_TEXT_RELOCATION
 	echo "Broken LD. Fix your tools."
 	exit -1
@@ -1065,6 +1062,7 @@ FFMPEGCONF += \
 	--disable-ffplay \
 	--disable-devices \
 	--disable-protocols \
+	--disable-filters \
 	--disable-network
 ifdef HAVE_WIN32
 FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs
@@ -1141,7 +1139,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 libdvdread:
 	$(SVN) co $(LIBDVDREAD_SVN)  libdvdread
-	(cd $@; patch  -p 0 < ../Patches/libdvdread.patch)
+	(cd $@; patch  -p 0 < ../Patches/libdvdread-dvdcss-static.patch)
 ifdef HAVE_WIN32
 	(cd $@; patch  -p 0 < ../Patches/libdvdread-win32.patch)
 endif
@@ -1229,10 +1227,11 @@ ifdef HAVE_WIN32
 	(cd $<;./genMakefiles mingw && make $(HOSTCC))
 else
 ifdef HAVE_WINCE
+	(cd $<; sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw)
 	(cd $<;./genMakefiles mingw && make $(HOSTCC))
 else
 ifdef HAVE_DARWIN_OS
-	(cd $<; sed -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%cc%$(CC)%'  -e 's%c++%$(CXX)%' -i.orig  config.macosx)
+	(cd $<; sed -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%cc%$(CC)\ $(EXTRA_LDFLAGS)%'  -e 's%c++%$(CXX)%' -i.orig  config.macosx)
 	(cd $<; ./genMakefiles macosx && make)
 else
 	(cd $<; sed -e 's/=/= EXTRA_CPPFLAGS/' -e 's%EXTRA_CPPFLAGS%-I/include%' -i.orig groupsock/Makefile.head)