]> git.sesse.net Git - vlc/blobdiff - extras/contrib/src/Makefile
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Contribs: live555 remove patch applied upstream.
[vlc] / extras / contrib / src / Makefile
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d1efbb644fb0f4b5e606b10cf1d09834b31c14e2..e584a9b378511e96da42e4b7ba4d6c1905e86898 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -115,7 +115,7 @@ endif
 #
 ifdef HAVE_WIN32
 HOSTCONF+= --without-pic --disable-shared --enable-msw --disable-dependency-tracking
-FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack
+FFMPEGCONF+= --target-os=mingw32 --arch=x86 --enable-memalign-hack
 ifdef HAVE_WIN64
 FFMPEGCONF+= --cpu=athlon64 --arch=x86_64
 else
@@ -149,7 +149,11 @@ endif
 ifdef HAVE_DARWIN_OS
 X264CONF=--host=$(HOST)
 X264CONF += --enable-pic
+ifdef HAVE_DARWIN_32
+FFMPEGCONF += --cc=gcc-4.0
+else
 FFMPEGCONF += --cc=$(CC)
+endif
 FFMPEGCONF += --arch=$(ARCH)
 ifdef HAVE_DARWIN_64
 FFMPEGCONF += --cpu=core2
@@ -181,6 +185,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 +357,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,17 +464,18 @@ 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
        patch -p0 < Patches/fontconfig-noxml2.patch
-endif
        (cd $@; autoreconf -ivf)
+endif
 
 .fontconfig: fontconfig .xml .freetype
 ifdef HAVE_WIN32
   ifdef HAVE_CYGWIN
-       (cd $<;  ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+       (cd $<; ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
   else
        (cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --disable-libxml2 --disable-docs && make && make install)
   endif
@@ -845,19 +850,18 @@ endif
 FLAC_DISABLE_FLAGS = --disable-oggtest --disable-xmms-plugin --disable-cpplibs
 
 .flac: flac .ogg
-ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install)
-else
-ifdef HAVE_DARWIN_OS
 ifdef HAVE_DARWIN_OS_ON_INTEL
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm-optimizations && cd src && make -C libFLAC && make -C libFLAC install  && cd .. && make -C include install)
+       cd $< && \
+       $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm-optimizations $(FLAC_DISABLE_FLAGS)
 else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) && cd src && make -C libFLAC && make -C libFLAC install  && cd .. && make -C include install)
-endif
-else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  $(FLAC_DISABLE_FLAGS) && cd src && make -C libFLAC && make -C libFLAC install  && cd .. && make -C include install)
-endif
-endif
+       cd $< && \
+       $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  $(FLAC_DISABLE_FLAGS)
+endif
+       cd $</src && \
+       make -C libFLAC && \
+       echo 'Requires.private: ogg' >> libFLAC/flac.pc && \
+       make -C libFLAC install
+       cd $< && make -C include install
        $(INSTALL_NAME)
        touch $@
 
@@ -1036,14 +1040,6 @@ ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-uclibc.patch
        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
 endif
        (cd $@; patch -p1 < ../Patches/eac3_spectral.patch)
 else
@@ -1065,6 +1061,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
@@ -1099,33 +1096,33 @@ DISTCLEAN_PKG += ffmpeg-$(FFMPEG_VERSION).tar.gz
 # libdvdcss
 # ***************************************************************************
 
-libdvdcss-$(LIBDVDCSS_VERSION).tar.gz:
+libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2:
        $(WGET) $(LIBDVDCSS_URL)
 
-ifdef SVN
-libdvdcss:
-       $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss
-       cd $@ && sh bootstrap
-else
-libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
-       $(EXTRACT_GZ)
-endif
+# ifdef SVN
+# libdvdcss:
+#      $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss
+#      cd $@ && sh bootstrap
+# else
+libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+# endif
 
 .dvdcss: libdvdcss
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --disable-doc --prefix=$(PREFIX) && make && make install)
        $(INSTALL_NAME)
        touch $@
 
-ifdef SVN
-libdvdcss-source: libdvdcss
-       tar cv --exclude=.svn libdvdcss | bzip2 > libdvdcss-$(DATE).tar.bz2
-
-SOURCE += libdvdcss-source
-endif
+# ifdef SVN
+# libdvdcss-source: libdvdcss
+#      tar cv --exclude=.svn libdvdcss | bzip2 > libdvdcss-$(DATE).tar.bz2
+#
+# SOURCE += libdvdcss-source
+# endif
 
 CLEAN_FILE += .dvdcss
 CLEAN_PKG += libdvdcss
-DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
+DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
 
 # ***************************************************************************
 # dummy dvdread to trigger the INSTALL_NAME script
@@ -1141,7 +1138,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 +1226,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)%'  -e 's%c++%$(CXX)\ $(EXTRA_LDFLAGS)%' -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)
@@ -1240,12 +1238,16 @@ ifdef HAVE_UCLIBC
 ifdef HAVE_BIGENDIAN
        (cd $<; ./genMakefiles armeb-uclibc && make $(HOSTCC))
 endif
+else
+ifeq ($(ARCH)$(HAVE_MAEMO),armel)
+       (cd $<; ./genMakefiles armlinux && make $(HOSTCC))
 else
        (cd $<; sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux)
        (cd $<; ./genMakefiles linux && make $(HOSTCC))
 endif
 endif
 endif
+endif
 endif
        mkdir -p $(PREFIX)/lib $(PREFIX)/include
        cp $</groupsock/libgroupsock.a $(PREFIX)/lib
@@ -1349,7 +1351,6 @@ x264-$(X264_VERSION).tar.gz:
 ifdef GIT
 x264:
        $(GIT) clone git://git.videolan.org/x264.git
-       patch -p0 < Patches/x264-svn-info-threads.patch
 ifdef HAVE_WIN32
        (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
@@ -1655,7 +1656,7 @@ ifdef HAVE_WIN32
 endif
 
 .twolame: twolame
-       (cd twolame; $(HOSTCC) CFLAGS="${CFLAGS}  -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) &&  make && make install)
+       (cd twolame; $(HOSTCC) CFLAGS="${CFLAGS}  -DLIBTWOLAME_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX) &&  cd libtwolame && make && make install && cd .. && make install-data)
        $(INSTALL_NAME)
        touch $@
 
@@ -2377,7 +2378,18 @@ ifdef HAVE_WIN32
 endif
 
 .fluid: fluidsynth
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) \
+               --disable-ladspa \
+               --disable-oss-support \
+               --disable-alsa-support \
+               --disable-midishare \
+               --disable-jack-support \
+               --disable-coreaudio \
+               --disable-lash \
+               --disable-ladcca \
+               --without-readline
+       cd $< && make
+       cd $< && make install
        touch $@
 
 CLEAN_FILE += .fluid
@@ -2438,12 +2450,12 @@ DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz
 libass-$(ASS_VERSION).tar.bz2:
        $(WGET) $(ASS_URL)
 
-libass:
-       $(GIT) clone $(ASS_GIT)
+libass: libass-$(ASS_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
        (cd $@; autoreconf -ivf)
 
 .libass: libass .freetype
-       (cd $<; $(HOSTCC) ./configure --disable-png $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
+       (cd $<; $(HOSTCC) ./configure --disable-png --disable-shared $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
        touch $@
 
 CLEAN_FILE += .libass
@@ -2460,8 +2472,8 @@ Sparkle-$(SPARKLE_VERSION).zip:
 .Sparkle: Sparkle-$(SPARKLE_VERSION).zip
        rm -rf $@ || true
        unzip $<
-       rm -rf ../Sparkle
-       mv Sparkle ..
+       rm -rf $(PREFIX)/Sparkle
+       mv Sparkle $(PREFIX)
        touch $@
 
 CLEAN_FILE += .Sparkle
@@ -2504,7 +2516,7 @@ ifdef HAVE_DARWIN_OS
 endif
 
 .gsm: gsm
-       (cd $<; $(HOSTCC) make && cp inc/gsm.h $(PREFIX)/include && cp lib/libgsm.a  $(PREFIX)/lib)
+       (cd $<; $(HOSTCC) make && mkdir -p $(PREFIX)/include/gsm && cp inc/gsm.h $(PREFIX)/include/gsm && cp lib/libgsm.a  $(PREFIX)/lib)
        touch $@
 
 CLEAN_FILE += .gsm
@@ -2572,6 +2584,7 @@ libxcb: libxcb-$(XCB_VERSION).tar.bz2
 
 .xcb: libxcb
        cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) \
+               --disable-shared \
                --disable-composite \
                --disable-damage \
                --disable-dpms \
@@ -2595,6 +2608,8 @@ libxcb: libxcb-$(XCB_VERSION).tar.bz2
                --enable-xv \
                --disable-xvmc \
                --disable-build-docs
+       cd $< && make
+       cd $< && sed -i -e s,^Requires.private:,Requires:,g xcb.pc
        cd $< && make install
        touch $@
 
Unnamed repository; edit this file 'description' to name the repository.