Contribs - FLAC: update to v1.2.1. Mingw32 patch is unneeded (upstream merge). A...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ad144956f2e984747b08ea48dd686a1c6ccd9d13..46628a7f8c593b01866106226a0dbe7558bf6ff9 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -803,25 +803,25 @@ flac-$(FLAC_VERSION).tar.gz:
 
 flac: flac-$(FLAC_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_WIN32
-       patch -p0 < Patches/flac-mingw32.patch
-endif
 ifneq ($(HOST),$(BUILD))
-       (patch -p0 < Patches/flac-cross.patch && cd $@ && autoconf)
+       (patch -p0 < Patches/flac-cross.patch)
 endif
+       cd $@ && autoconf
+
+FLAC_DISABLE_FLAGS = --disable-oggtest --disable-xmms-plugin --disable-cpplibs
 
 .flac: flac .ogg 
 ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src&& make -C libFLAC&& make -C libFLAC install  && cd .. && make -C include install)
+       (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 $<; autoconf && $(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 && cd src && make -C libFLAC && make -C libFLAC install  && cd .. && make -C include install)
 else
-       (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd src && make -C libFLAC && make -C libFLAC install  && cd .. && make -C include install)
+       (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 $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src && make -C libFLAC && make -C libFLAC install  && cd .. && make -C include install)
+       (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
        $(INSTALL_NAME)

diff --git a/extras/contrib/src/Patches/flac-mingw32.patch b/extras/contrib/src/Patches/flac-mingw32.patch
deleted file mode 100644 (file)
index 1fc7bcd..0000000
--- a/extras/contrib/src/Patches/flac-mingw32.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN flac.old/src/libFLAC/bitreader.c flac/src/libFLAC/bitreader.c
---- flac.old/src/libFLAC/bitreader.c   2007-02-17 04:34:31.000000000 +0100
-+++ flac/src/libFLAC/bitreader.c       2007-02-17 04:35:31.000000000 +0100
-@@ -37,6 +37,8 @@
- #include <string.h> /* for memcpy(), memset() */
- #if defined(_MSC_VER) && _MSC_VER <= 1200
- #include <winsock.h> /* for ntohl() */
-+#elif defined(__MINGW32__)
-+#include <winsock.h> /* for ntohl() */
- #elif defined FLAC__SYS_DARWIN
- #include <machine/endian.h> /* for ntohl() */
- #else
-diff -ruN flac.old/src/libFLAC/bitwriter.c flac/src/libFLAC/bitwriter.c
---- flac.old/src/libFLAC/bitwriter.c   2007-02-17 04:34:31.000000000 +0100
-+++ flac/src/libFLAC/bitwriter.c       2007-02-17 04:35:39.000000000 +0100
-@@ -37,6 +37,8 @@
- #include <string.h> /* for memcpy(), memset() */
- #if defined(_MSC_VER) && _MSC_VER <= 1200
- #include <winsock.h> /* for ntohl() */
-+#elif defined(__MINGW32__)
-+#include <winsock.h> /* for ntohl() */
- #elif defined FLAC__SYS_DARWIN
- #include <machine/endian.h> /* for ntohl() */
- #else

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index e538fb09dd59a7a9c3ffeddffef24a4b442b420c..a9d0e4b9743a6625f865c570d81234c23b03d0de 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -70,7 +70,7 @@ VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION)
 THEORA_VERSION=1.0beta1
 THEORA_URL=http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.bz2
 #THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2
-FLAC_VERSION=1.2.0
+FLAC_VERSION=1.2.1
 FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz
 SPEEX_VERSION=1.2beta2
 SPEEX_URL=http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz