Consistency for patches naming

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9d8c5dfaceaebc6f964e4772f97871a5fb26a753..97191d63eaa369b26d6057b9e3498fca7b85b1cf 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -116,12 +116,12 @@ endif
 #
 ifdef HAVE_WIN32
 HOSTCONF+= --without-pic --disable-shared --enable-msw --disable-dependency-tracking
-FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686 --disable-debug
+FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686
 endif
 
 ifdef HAVE_WINCE
 HOSTCONF+= --without-pic --disable-shared
-FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
+FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
 endif
 
 ifdef HAVE_UCLIBC
@@ -130,14 +130,14 @@ FFMPEGCONF+= --arch=armeb --enable-armv5te --enable-iwmmxt
 else
 FFMPEGCONF+= --arch=armv4l
 endif
-FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
+FFMPEGCONF+= --enable-small --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
 FFMPEGCONF+= --enable-libmp3lame --enable-libgsm
 endif
 
 ifdef HAVE_BEOS
-FFMPEGCONF+= --cpu=x86 --disable-debug --disable-audio-beos
+FFMPEGCONF+= --cpu=x86 --disable-audio-beos
 endif
 
 ifdef HAVE_DARWIN_OS_ON_INTEL
@@ -815,6 +815,9 @@ endif
 ifdef HAVE_DARWIN_10
 THEORACONF += --disable-asm
 endif
+ifdef HAVE_WIN64
+THEORACONF += --disable-asm
+endif
 
 .theora: libtheora .ogg
 ifdef HAVE_BEOS
@@ -965,6 +968,9 @@ libebml: libebml-$(LIBEBML_VERSION).tar.bz2
 ifdef HAVE_WIN32
        (cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch)
 endif
+ifdef HAVE_WIN64
+       patch -p0 < Patches/libebml-win64.patch
+endif
 
 .ebml: libebml
 ifdef HAVE_WIN32
@@ -1109,6 +1115,7 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
 endif
 
 FFMPEGCONF += \
+       --disable-debug \
        --enable-gpl \
        --enable-postproc \
        --disable-ffserver \
@@ -1272,6 +1279,9 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p0 < Patches/live-noapps.patch
        patch -p0 < Patches/live-uselocale.patch
+ifdef HAVE_WIN64
+       patch -p0 < Patches/live-win64.patch
+endif
 
 .live: live
 ifdef HAVE_WIN32
@@ -1317,9 +1327,6 @@ goom$(GOOM2k4_VERSION).tar.gz:
 
 goom: goom$(GOOM2k4_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_DARWIN_OS
-       patch -p0 < Patches/goom.patch
-endif
 ifdef HAVE_WIN32
        (cd $@; dos2unix configure.in)
        patch -p0 < Patches/goom2k4-0-win32.patch
@@ -1327,13 +1334,11 @@ else
        patch -p0 < Patches/goom2k4-0-mmx.patch
 endif
        patch -p0 < Patches/goom2k4-0-memleaks.patch
+       patch -p0 < Patches/goom2k4-autotools.patch
+       (cd $@; rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf)
 
 .goom2k4: goom
-ifdef HAVE_DARWIN_OS
-       (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
-else
-       (cd $< && rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
-endif
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
        touch $@
 
 CLEAN_FILE += .goom2k4
@@ -1606,7 +1611,7 @@ qt4_mac: qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .qt4_mac: qt4_mac
-       (cd qt4_mac; ./configure -prefix $(PREFIX) -release -fast -no-qt3support -nomake "examples demos" -sdk $(MACOSX_SDK) -no-framework && make && make install)
+       (cd qt4_mac; ./configure -prefix $(PREFIX) -release -fast -no-qt3support -nomake "examples demos" -sdk $(MACOSX_SDK) -no-framework -arch $(ARCH) && make && make install)
        touch $@
 
 CLEAN_FILE += .qt4_mac
@@ -2078,20 +2083,20 @@ DISTCLEAN_PKG += firefox-source-$(MOZILLA_VERSION).tar.bz2
 # libjpeg
 # ***************************************************************************
 
-jpeg-$(JPEG_VERSION).tar.gz:
+jpegsrc.v$(JPEG_VERSION).tar.gz:
        $(WGET) $(JPEG_URL)
 
-jpeg: jpeg-$(JPEG_VERSION).tar.gz
+jpeg-7: jpegsrc.v$(JPEG_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-.jpeg: jpeg
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install-lib)
+.jpeg: jpeg-7
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(HOSTCC) && make && make install)
        $(RANLIB) $(PREFIX)/lib/libjpeg.a
        touch $@
 
 CLEAN_FILE += .jpeg
-CLEAN_PKG += jpeg
-DISTCLEAN_PKG += jpeg-$(JPEG_VERSION).tar.gz
+CLEAN_PKG += jpeg-7
+DISTCLEAN_PKG += jpegsrc.v$(JPEG_VERSION).tar.gz
 
 # ***************************************************************************
 # tiff
@@ -2462,6 +2467,9 @@ liboil-$(OIL_VERSION).tar.gz:
 liboil: liboil-$(OIL_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -d liboil -p1 < Patches/liboil-noshared.patch
+       patch -d liboil -p1 < Patches/liboil-Xcompile.patch
+       patch -d liboil -p1 < Patches/liboil-win64.patch
+
 
 .liboil: liboil
 ifdef HAVE_DARWIN_OS
@@ -2523,10 +2531,10 @@ DISTCLEAN_PKG += libass-$(ASS_VERSION).tar.bz2
 # Sparkle
 # ***************************************************************************
 
-"Sparkle\ $(SPARKLE_VERSION).zip":
+"Sparkle-$(SPARKLE_VERSION).zip":
        $(WGET) $(SPARKLE_URL)
 
-Sparkle: "Sparkle\ $(SPARKLE_VERSION).zip"
+Sparkle: "Sparkle-$(SPARKLE_VERSION).zip"
        rm -rf $@ || true
        unzip $<
        touch $@
@@ -2540,7 +2548,7 @@ Sparkle: "Sparkle\ $(SPARKLE_VERSION).zip"
 
 CLEAN_FILE += .Sparkle
 CLEAN_PKG += Sparkle
-DISTCLEAN_PKG += Sparkle%20$(SPARKLE_VERSION).zip
+DISTCLEAN_PKG += Sparkle-$(SPARKLE_VERSION).zip
 
 # ***************************************************************************
 # UPNP library