summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/flac/Makefile12
-rw-r--r--package/flac/patches/patch-configure12
-rw-r--r--package/flac/patches/patch-ltmain_sh11
-rw-r--r--package/flac/patches/patch-src_Makefile_in20
-rw-r--r--package/flac/patches/patch-src_libFLAC_Makefile_in12
-rw-r--r--package/flac/patches/patch-src_libFLAC_lpc_c13
6 files changed, 6 insertions, 74 deletions
diff --git a/package/flac/Makefile b/package/flac/Makefile
index 0195cb6..23dc252 100644
--- a/package/flac/Makefile
+++ b/package/flac/Makefile
@@ -4,13 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= flac
-PKG_VERSION:= 1.2.1
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 153c8b15a54da428d1f0fadc756c22c7
-PKG_DESCR:= Free Lossless Audio Codec library
+PKG_VERSION:= 1.3.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 13b5c214cee8373464d3d65dee362cdd
+PKG_DESCR:= free lossless audio codec library
PKG_SECTION:= libs
PKG_URL:= http://flac.sourceforge.net
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=flac/}
+PKG_SITES:= http://downloads.xiph.org/releases/flac/
PKG_LIBNAME:= libflac
PKG_OPTS:= dev
@@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-CONFIGURE_ARGS+= --disable-asm-optimizations \
+CONFIGURE_ARGS+= --enable-asm-optimizations \
--disable-xmms-plugin \
--disable-cpplibs \
--disable-ogg
diff --git a/package/flac/patches/patch-configure b/package/flac/patches/patch-configure
deleted file mode 100644
index 830c774..0000000
--- a/package/flac/patches/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id$
---- flac-1.2.1.orig/configure 2007-09-16 22:05:33.000000000 +0200
-+++ flac-1.2.1/configure 2008-08-21 14:57:46.000000000 +0200
-@@ -23490,7 +23490,7 @@ else
- CPPFLAGS="-DNDEBUG $CPPFLAGS"
- if test "x$GCC" = xyes; then
- CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
-- CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
-+ CFLAGS="-finline-functions -Wall -W -Winline $CFLAGS"
- fi
- fi
-
diff --git a/package/flac/patches/patch-ltmain_sh b/package/flac/patches/patch-ltmain_sh
deleted file mode 100644
index ded69d5..0000000
--- a/package/flac/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- flac-1.2.1.orig/ltmain.sh 2005-04-26 20:23:39.000000000 +0200
-+++ flac-1.2.1/ltmain.sh 2011-01-15 11:22:29.000000000 +0100
-@@ -1533,7 +1533,7 @@ EOF
- # +DA*, +DD* enable 64-bit mode on the HP compiler
- # -q* pass through compiler args for the IBM compiler
- # -m* pass through architecture-specific compiler args for GCC
-- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
-+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-fstack-protector*|-flto)
-
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
diff --git a/package/flac/patches/patch-src_Makefile_in b/package/flac/patches/patch-src_Makefile_in
deleted file mode 100644
index 026228d..0000000
--- a/package/flac/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- flac-1.2.1.orig/src/Makefile.in 2007-09-16 22:05:09.000000000 +0200
-+++ flac-1.2.1/src/Makefile.in 2010-01-06 21:10:24.984375000 +0100
-@@ -226,8 +226,6 @@ target_alias = @target_alias@
- SUBDIRS = \
- libFLAC \
- share \
-- flac \
-- metaflac \
- monkeys_audio_utilities \
- $(XMMS_DIRS) \
- plugin_winamp2 \
-@@ -255,7 +253,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive
- DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = libFLAC share flac metaflac monkeys_audio_utilities \
-+DIST_SUBDIRS = libFLAC share monkeys_audio_utilities \
- plugin_common plugin_xmms plugin_winamp2 test_grabbag \
- test_libs_common test_libFLAC test_seeking test_streams \
- libFLAC++ test_libFLAC++
diff --git a/package/flac/patches/patch-src_libFLAC_Makefile_in b/package/flac/patches/patch-src_libFLAC_Makefile_in
deleted file mode 100644
index 83c1eea..0000000
--- a/package/flac/patches/patch-src_libFLAC_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id$
---- flac-1.2.1.orig/src/libFLAC/Makefile.in 2007-09-16 22:05:12.000000000 +0200
-+++ flac-1.2.1/src/libFLAC/Makefile.in 2008-08-21 14:54:37.000000000 +0200
-@@ -295,8 +295,6 @@ libFLAC_la_SOURCES = \
- metadata_iterators.c \
- metadata_object.c \
- stream_decoder.c \
-- stream_encoder.c \
-- stream_encoder_framing.c \
- window.c \
- $(extra_ogg_sources)
-
diff --git a/package/flac/patches/patch-src_libFLAC_lpc_c b/package/flac/patches/patch-src_libFLAC_lpc_c
deleted file mode 100644
index 3bacaba..0000000
--- a/package/flac/patches/patch-src_libFLAC_lpc_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id$
---- flac-1.2.1.orig/src/libFLAC/lpc.c 2007-09-04 20:15:03.000000000 +0200
-+++ flac-1.2.1/src/libFLAC/lpc.c 2008-08-20 15:45:13.000000000 +0200
-@@ -38,9 +38,7 @@
- #include "FLAC/format.h"
- #include "private/bitmath.h"
- #include "private/lpc.h"
--#if defined DEBUG || defined FLAC__OVERFLOW_DETECT || defined FLAC__OVERFLOW_DETECT_VERBOSE
- #include <stdio.h>
--#endif
-
- #ifndef FLAC__INTEGER_ONLY_LIBRARY
-