oops, tab expansion is a bad thing on Makefile

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 819484627fbd14ce6f01ef3a27485e640429f5d7..6ee99c8aef41e8332478e978c1a0bc263dde8891 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -36,6 +36,7 @@ include ./packages.mak
 
 export PATH := $(PREFIX)/bin:$(EXTRA_PATH):$(PATH)
 export PKG_CONFIG_PATH
+export PKG_CONFIG_LIBDIR = $(PREFIX)/lib/pkgconfig
 export DYLD_LIBRARY_PATH = $(PREFIX)/lib
 # following is required for configure scripts that check dyld libraries
 # by building and running a test app 
@@ -90,16 +91,16 @@ endif
 #
 # cross compiling
 #
+HOSTCONF=--target=$(HOST) --host=$(HOST) --build=$(BUILD)
 ifneq ($(BUILD),$(HOST))
     #
     # Compiling for MinGW under Cygwin could be deemed as cross compiling
     # unfortunately there isn't a complete separate GCC toolchain for MinGW under Cygwin
     #
-    HOSTCONF=--host=$(HOST) --build=$(BUILD)
     ifeq ($(findstring cygwin,$(BUILD)),)
-       # We are REALLY cross compiling
-       FFMPEGCONF=--cross-prefix=$(HOST)-
-       X264CONF=--crosscompile=$(HOST)
+        # We are REALLY cross compiling
+        FFMPEGCONF=--cross-prefix=$(HOST)-
+        X264CONF=--crosscompile=$(HOST)
     endif
 endif
 
@@ -124,7 +125,6 @@ endif
 
 ifeq ($(HOST),i686-apple-darwin8)
 FFMPEGCONF += --enable-memalign-hack
-X264CONF += --extra-ldflags=-read_only_relocs suppress
 endif
 
 ifdef HAVE_DARWIN_OS
@@ -145,13 +145,10 @@ ifdef HAVE_DARWIN_OS
        .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
        .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
        .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
-        .libdca .tag
+        .libdca .tag .x264 .goom2k4
 # .expat .clinkcc don't work with SDK yet
 # .glib .libidl .gecko are required to build the mozilla plugin
 # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
-ifneq ($(HOST),i686-apple-darwin8)
-all: .goom2k4 .x264
-endif
 else
 
  ifdef HAVE_BEOS
@@ -161,14 +158,16 @@ else
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
        .dvdnav .dvbpsi .aclocal .libdca
+   #.speex seems
   else
 # Cross compiling: we already have the Linux tools, only build the
 # libraries now
    all: .iconv .intl .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-       .FLAC .speex .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \
+       .FLAC .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \
        .dvdnav .dvbpsi .aclocal .libdca
   endif
+  #.speex
  else
 
   ifdef HAVE_WIN32
@@ -382,15 +381,16 @@ DISTCLEAN_PKG += automake-$(AUTOMAKE_VERSION).tar.gz
 # pkgconfig
 # ***************************************************************************
 
-pkgconfig-$(PKGCFG_VERSION).tar.gz:
+pkg-config-$(PKGCFG_VERSION).tar.gz:
        $(WGET) $(PKGCFG_URL)
 
-pkgconfig: pkgconfig-$(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
 
 .pkgcfg: pkgconfig
-       (cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
+       (cd pkgconfig; autoconf && ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
        touch $@
 
 CLEAN_FILE += .pkgcfg
@@ -407,15 +407,14 @@ gettext-$(GETTEXT_VERSION).tar.gz:
 gettext: gettext-$(GETTEXT_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-       patch -p 0 < Patches/gettext-macosx.patch
-       (cd $@; ./autogen.sh)
+       patch -p 0 < Patches/gettext-macosx.patch 
 endif
 
 .intl: gettext .iconv
 ifdef HAVE_WIN32
-       ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX))
+       ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX) --disable-java --disable-native-java)
 else
-       ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) )
+       ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java)
 endif
 ifeq ($(BUILD),i586-pc-beos)
 # The ugliest kludge ever - so libtool correctly links shared libraries
@@ -431,7 +430,7 @@ else
 endif
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32
-       (cd ../include; sed -i.orig '283 c #if !1' libintl.h)
+       (cd ../include; sed -i.orig '311 c #if !1' libintl.h)
 endif
        $(INSTALL_NAME)
        touch $@
@@ -536,17 +535,16 @@ DISTCLEAN_PKG += a52dec-$(A52DEC_VERSION).tar.gz
 #      cvs -d $(MPEG2DEC_CVSROOT) co mpeg2dec
 #      (cd $@; ./bootstrap)
 
-#mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
-#      $(WGET) $(MPEG2DEC_URL)
+mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
+       $(WGET) $(MPEG2DEC_URL)
 
 # It is easier to use bootstrapped versions...
-mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
-       $(WGET) $(MPEG2DEC_SNAPSHOT)
-       mv mpeg2dec-$(MPEG2DEC_DATE).tar.gz $@
+#mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
+#      $(WGET) $(MPEG2DEC_SNAPSHOT)
+#      mv mpeg2dec-$(MPEG2DEC_DATE).tar.gz $@
 
 mpeg2dec: mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p 0 < Patches/mpeg2dec.patch
 
 .mpeg2: mpeg2dec
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-x --disable-sdl && cd libmpeg2 && make && make install && cd ../include && make && make install)
@@ -931,6 +929,9 @@ endif
 ifdef HAVE_WINCE
        patch -p 1 < Patches/ffmpeg-svn-wince.patch
 endif
+ifdef HAVE_WIN32
+       (cd $@; patch -p 0 < ../Patches/ffmpeg-alignment.patch)
+endif
 
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
        $(WGET) $(FFMPEG_URL)
@@ -944,7 +945,7 @@ ifdef HAVE_WINCE
 else
 .ffmpeg: ffmpeg .faac .lame
 endif
-       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-a52 --disable-ffplay && make install-libs install-headers)
+       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-a52 --disable-ffplay --enable-swscaler && make install-libs install-headers)
        touch $@
 
 CLEAN_FILE += .ffmpeg
@@ -1127,10 +1128,9 @@ ifdef HAVE_DARWIN_OS
 endif
 ifdef HAVE_WIN32
        (cd $@; dos2unix configure.in)
-       patch -p 0 <Patches/goom2k4-0-win32.patch
-endif
-ifndef HAVE_DARWIN_OS
-       (cd goom; patch -p 0 <../Patches/goom2k4-0-nommx.patch; cd -)
+       patch -p 0 < Patches/goom2k4-0-win32.patch
+else
+       patch -p 0 < Patches/goom2k4-0-mmx.patch
 endif
 
 .goom2k4: goom
@@ -1289,7 +1289,7 @@ libcdio: libcdio-$(CDIO_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .cdio: libcdio
-       (cd $<; ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install)
+       (cd $<; sed -e 's%@ENABLE_CPP_TRUE@SUBDIRS = C++%@ENABLE_CPP_TRUE@SUBDIRS = %' -i.orig example/Makefile.in && ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install)
        touch $@
 
 CLEAN_FILE += .cdio
@@ -1327,7 +1327,7 @@ wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 #      (cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch)
 
 .wxwidgets: wxwidgets
-       (cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib  --without-libpng --without-libjpeg --without-libtiff --without-regex  --disable-zipstream --disable-fs_zip --enable-no_rtti  --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl  --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets --disable-precomp-headers && make && make install)
+       (cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --enable-unicode --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib  --without-libpng --without-libjpeg --without-libtiff --without-regex  --disable-zipstream --disable-fs_zip --enable-no_rtti  --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl  --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets --disable-precomp-headers && make && make install)
        $(INSTALL_NAME)
        touch $@
 
@@ -1540,7 +1540,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
 
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
-       (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) --program-prefix="" CFLAGS="$(CFLAGS)" && make && make install)
+       (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) --program-prefix="" CFLAGS="$(CFLAGS)" && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install)
 else
 ifeq ($(HOST),i686-apple-darwin8)
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" && make && make install)