bump version flac-1.4.2

diff --git a/archive-patches/flac-1.2.1-accept-also-linux-uclibcgnu.diff b/archive-patches/flac-1.2.1-accept-also-linux-uclibcgnu.diff
deleted file mode 100644 (file)
index 6ecf88a..0000000
--- a/archive-patches/flac-1.2.1-accept-also-linux-uclibcgnu.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config.sub       2005-04-26 20:23:39.000000000 +0200
-+++ b/config.sub       2013-08-03 11:48:12.000000000 +0200
-@@ -118,7 +118,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-+  nto-qnx* | linux-gnu* | linux-uclibc* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;

diff --git a/archive-patches/flac-1.2.1-noencoder.diff b/archive-patches/flac-1.2.1-noencoder.diff
deleted file mode 100644 (file)
index 0710044..0000000
--- a/archive-patches/flac-1.2.1-noencoder.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- flac-1.2.0/src/libFLAC/Makefile.am.orig    2007-07-11 06:13:09.000000000 +0200
-+++ flac-1.2.0/src/libFLAC/Makefile.am 2007-09-24 22:52:43.000000000 +0200
-@@ -112,7 +112,5 @@
-       metadata_iterators.c \
-       metadata_object.c \
-       stream_decoder.c \
--      stream_encoder.c \
--      stream_encoder_framing.c \
-       window.c \
-       $(extra_ogg_sources)
---- flac-1.2.0/src/libFLAC/Makefile.in.orig    2007-07-24 05:03:53.000000000 +0200
-+++ flac-1.2.0/src/libFLAC/Makefile.in 2007-09-24 23:01:33.000000000 +0200
-@@ -292,8 +292,6 @@
-       metadata_iterators.c \
-       metadata_object.c \
-       stream_decoder.c \
--      stream_encoder.c \
--      stream_encoder_framing.c \
-       window.c \
-       $(extra_ogg_sources)
- 
-@@ -391,16 +389,14 @@
- am__libFLAC_la_SOURCES_DIST = bitmath.c bitreader.c bitwriter.c cpu.c \
-       crc.c fixed.c float.c format.c lpc.c md5.c memory.c \
-       metadata_iterators.c metadata_object.c stream_decoder.c \
--      stream_encoder.c stream_encoder_framing.c window.c \
--      ogg_decoder_aspect.c ogg_encoder_aspect.c ogg_helper.c \
--      ogg_mapping.c
-+      window.c
- @FLaC__HAS_OGG_TRUE@am__objects_1 = ogg_decoder_aspect.lo \
- @FLaC__HAS_OGG_TRUE@  ogg_encoder_aspect.lo ogg_helper.lo \
- @FLaC__HAS_OGG_TRUE@  ogg_mapping.lo
- am_libFLAC_la_OBJECTS = bitmath.lo bitreader.lo bitwriter.lo cpu.lo \
-       crc.lo fixed.lo float.lo format.lo lpc.lo md5.lo memory.lo \
-       metadata_iterators.lo metadata_object.lo stream_decoder.lo \
--      stream_encoder.lo stream_encoder_framing.lo window.lo \
-+      window.lo \
-       $(am__objects_1)
- libFLAC_la_OBJECTS = $(am_libFLAC_la_OBJECTS)
- 

diff --git a/archive-patches/flac-1.3.0-noencoder.diff b/archive-patches/flac-1.3.0-noencoder.diff
deleted file mode 100644 (file)
index 5965c43..0000000
--- a/archive-patches/flac-1.3.0-noencoder.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- flac-1.3.0/src/libFLAC/Makefile.am.orig    2007-07-11 06:13:09.000000000 +0200
-+++ flac-1.3.0/src/libFLAC/Makefile.am 2007-09-24 22:52:43.000000000 +0200
-@@ -130,7 +130,5 @@
-       metadata_iterators.c \
-       metadata_object.c \
-       stream_decoder.c \
--      stream_encoder.c \
--      stream_encoder_framing.c \
-       window.c \
-       $(extra_ogg_sources)
---- flac-1.3.0/src/libFLAC/Makefile.in.orig    2007-07-24 05:03:53.000000000 +0200
-+++ flac-1.3.0/src/libFLAC/Makefile.in 2007-09-24 23:01:33.000000000 +0200
-@@ -146,7 +146,7 @@
- am__objects_2 = bitmath.lo bitreader.lo bitwriter.lo cpu.lo crc.lo \
-       fixed.lo float.lo format.lo lpc.lo md5.lo memory.lo \
-       metadata_iterators.lo metadata_object.lo stream_decoder.lo \
--      stream_encoder.lo stream_encoder_framing.lo window.lo \
-+      window.lo \
-       $(am__objects_1)
- am_libFLAC_static_la_OBJECTS = $(am__objects_2)
- libFLAC_static_la_OBJECTS = $(am_libFLAC_static_la_OBJECTS)
-@@ -157,9 +157,7 @@
- am__libFLAC_la_SOURCES_DIST = bitmath.c bitreader.c bitwriter.c cpu.c \
-       crc.c fixed.c float.c format.c lpc.c md5.c memory.c \
-       metadata_iterators.c metadata_object.c stream_decoder.c \
--      stream_encoder.c stream_encoder_framing.c window.c \
--      ogg_decoder_aspect.c ogg_encoder_aspect.c ogg_helper.c \
--      ogg_mapping.c
-+      window.c
- am_libFLAC_la_OBJECTS = $(am__objects_2)
- libFLAC_la_OBJECTS = $(am_libFLAC_la_OBJECTS)
- libFLAC_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -456,7 +456,5 @@
-       metadata_iterators.c \
-       metadata_object.c \
-       stream_decoder.c \
--      stream_encoder.c \
--      stream_encoder_framing.c \
-       window.c \
-       $(extra_ogg_sources)

diff --git a/archive-patches/flac-1.3.2.patch b/archive-patches/flac-1.3.2.patch
deleted file mode 100644 (file)
index 503420d..0000000
--- a/archive-patches/flac-1.3.2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -31,7 +31,7 @@
- 
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS = doc include m4 man src examples test build objs microbench
-+SUBDIRS = doc include m4 src build objs microbench
- 
- EXTRA_DIST = \
-       COPYING.FDL \
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -27,15 +27,7 @@
- SUBDIRS = \
-       libFLAC \
-       share \
--      flac \
--      metaflac \
-       $(XMMS_DIRS) \
--      test_grabbag \
--      test_libs_common \
--      test_libFLAC \
--      test_seeking \
--      test_streams \
--      utils \
-       $(CPPLIBS_DIRS)
- 
- EXTRA_DIST = \
---- a/configure.ac
-+++ b/configure.ac
-@@ -186,7 +186,7 @@ esac
- AM_CONDITIONAL(OS_IS_WINDOWS, test "x$os_is_windows" = xyes)
- 
- case "$host" in
--      *-pc-linux-gnu)
-+      *-linux-*)
-               sys_linux=true
-               AC_DEFINE(FLAC__SYS_LINUX)
-               AH_TEMPLATE(FLAC__SYS_LINUX, [define if building for Linux])

diff --git a/make/libraries.mk b/make/libraries.mk
index bf6006b66b23dd6d1511ea3183424c25d133cacc..a9d6d8679d43fe4099ff84914bb188e97ba5ba30 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -1005,18 +1005,20 @@ $(D)/flac: $(ARCHIVE)/flac-$(FLAC_VER).tar.xz | $(TARGETPREFIX)
        $(START_BUILD)
        $(UNTAR)/flac-$(FLAC_VER).tar.xz
        pushd $(BUILD_TMP)/flac-$(FLAC_VER); \
-               $(PATCH)/flac-$(FLAC_VER).patch; \
-               touch NEWS AUTHORS ChangeLog; \
                autoreconf -fi; \
                $(CONFIGURE) \
                        --prefix= \
                        --mandir=/.remove \
                        --datarootdir=/.remove \
                        --disable-cpplibs \
+                       --enable-shared \
+                       --disable-static \
+                       --disable-cpplibs \
                        --disable-debug \
                        --disable-asm-optimizations \
                        --disable-sse \
                        --disable-altivec \
+                       --disable-vsx \
                        --disable-doxygen-docs \
                        --disable-thorough-tests \
                        --disable-exhaustive-tests \
@@ -1025,6 +1027,8 @@ $(D)/flac: $(ARCHIVE)/flac-$(FLAC_VER).tar.xz | $(TARGETPREFIX)
                        --disable-oggtest \
                        --disable-local-xmms-plugin \
                        --disable-xmms-plugin \
+                       --disable-examples \
+                       --disable-rpath \
                ; \
                $(MAKE); \
                $(MAKE) install DESTDIR=$(TARGETPREFIX) docdir=/.remove

diff --git a/make/versions.mk b/make/versions.mk
index 775db1e54250d767eda23d1c96a473f4d03c93b3..2d161e6c4028c659c1c8455321c346978e53cb44 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -81,7 +81,7 @@ FFMPEG_GIT = 2ba896f
 endif
 
 # FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality
-FLAC_VER = 1.3.2
+FLAC_VER = 1.4.2
 
 # FLEX (the fast lexical analyser)
 FLEX_VER=2.5.35