From 9a1f74fbed1611c11bc17f8d70f1dd2bc8a52930 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 1 Apr 2014 01:38:34 +0200 Subject: [PATCH] flac: update to flac-1.3.0 Signed-off-by: Stephan Raue --- packages/audio/flac/package.mk | 16 +++++++++---- .../patches/flac-1.2.1-automake_1.13.patch | 12 ---------- .../flac/patches/flac-1.2.1-configure.patch | 24 ------------------- .../flac/patches/flac-1.2.1-cxxflags.patch | 17 ------------- .../flac/patches/flac-1.2.1-gcc_4.3.patch | 11 --------- 5 files changed, 11 insertions(+), 69 deletions(-) delete mode 100644 packages/audio/flac/patches/flac-1.2.1-automake_1.13.patch delete mode 100644 packages/audio/flac/patches/flac-1.2.1-configure.patch delete mode 100644 packages/audio/flac/patches/flac-1.2.1-cxxflags.patch delete mode 100644 packages/audio/flac/patches/flac-1.2.1-gcc_4.3.patch diff --git a/packages/audio/flac/package.mk b/packages/audio/flac/package.mk index 371584a148..acc7a5a75e 100644 --- a/packages/audio/flac/package.mk +++ b/packages/audio/flac/package.mk @@ -17,12 +17,12 @@ ################################################################################ PKG_NAME="flac" -PKG_VERSION="1.2.1" +PKG_VERSION="1.3.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://flac.sourceforge.net/" -PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_TARGET="toolchain libogg" PKG_PRIORITY="optional" PKG_SECTION="audio" @@ -43,9 +43,15 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-rpath \ --with-ogg=$SYSROOT_PREFIX/usr \ --with-gnu-ld" -pre_make_target() { - # hack - cp -R ../doc/* ./doc +if [ $TARGET_ARCH = "i386" -o $TARGET_ARCH = "x86_64" ]; then + PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-sse" +else + PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-sse" +fi + +pre_configure_target() { +# flac-1.3.0 fails to build with LTO support + strip_lto } post_makeinstall_target() { diff --git a/packages/audio/flac/patches/flac-1.2.1-automake_1.13.patch b/packages/audio/flac/patches/flac-1.2.1-automake_1.13.patch deleted file mode 100644 index e71f3b4006..0000000000 --- a/packages/audio/flac/patches/flac-1.2.1-automake_1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur flac-1.2.1-old/configure.in flac-1.2.1-new/configure.in ---- flac-1.2.1-old/configure.in 2007-09-13 08:48:42.000000000 -0700 -+++ flac-1.2.1-new/configure.in 2013-01-03 19:54:10.000000000 -0800 -@@ -44,7 +44,7 @@ - AC_CHECK_SIZEOF(void*,0) - - #@@@ new name is AC_CONFIG_HEADERS --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_C_BIGENDIAN - diff --git a/packages/audio/flac/patches/flac-1.2.1-configure.patch b/packages/audio/flac/patches/flac-1.2.1-configure.patch deleted file mode 100644 index 16fc3e51dc..0000000000 --- a/packages/audio/flac/patches/flac-1.2.1-configure.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur flac-1.2.1-old/configure.in flac-1.2.1-new/configure.in ---- flac-1.2.1-old/configure.in 2007-09-13 08:48:42.000000000 -0700 -+++ flac-1.2.1-new/configure.in 2010-08-17 20:51:01.000000000 -0700 -@@ -21,6 +21,8 @@ - AC_INIT(src/flac/main.c) - AM_INIT_AUTOMAKE(flac, 1.2.1) - -+AC_CONFIG_MACRO_DIR([m4]) -+ - # Don't automagically regenerate autoconf/automake generated files unless - # explicitly requested. Eases autobuilding -mdz - AM_MAINTAINER_MODE -diff -Naur flac-1.2.1-old/Makefile.am flac-1.2.1-new/Makefile.am ---- flac-1.2.1-old/Makefile.am 2007-09-16 12:29:29.000000000 -0700 -+++ flac-1.2.1-new/Makefile.am 2010-08-17 20:51:27.000000000 -0700 -@@ -30,6 +30,8 @@ - - AUTOMAKE_OPTIONS = foreign 1.7 - -+ACLOCAL_AMFLAGS = -I m4 -+ - SUBDIRS = doc include m4 man src examples test build obj - - DISTCLEANFILES = libtool-disable-static diff --git a/packages/audio/flac/patches/flac-1.2.1-cxxflags.patch b/packages/audio/flac/patches/flac-1.2.1-cxxflags.patch deleted file mode 100644 index bf600b25b5..0000000000 --- a/packages/audio/flac/patches/flac-1.2.1-cxxflags.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur flac-1.2.1-old/configure.in flac-1.2.1-new/configure.in ---- flac-1.2.1-old/configure.in 2007-09-13 08:48:42.000000000 -0700 -+++ flac-1.2.1-new/configure.in 2010-07-04 17:16:02.000000000 -0700 -@@ -297,11 +297,13 @@ - if test "x$debug" = xtrue; then - CPPFLAGS="-DDEBUG $CPPFLAGS" - CFLAGS="-g $CFLAGS" -+ CXXFLAGS="-g $CXXFLAGS" - 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" -+ CXXFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CXXFLAGS" - fi - fi - diff --git a/packages/audio/flac/patches/flac-1.2.1-gcc_4.3.patch b/packages/audio/flac/patches/flac-1.2.1-gcc_4.3.patch deleted file mode 100644 index d372647ef4..0000000000 --- a/packages/audio/flac/patches/flac-1.2.1-gcc_4.3.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur flac-1.2.1-old/examples/cpp/encode/file/main.cpp flac-1.2.1-new/examples/cpp/encode/file/main.cpp ---- flac-1.2.1-old/examples/cpp/encode/file/main.cpp 2007-09-13 08:58:03.000000000 -0700 -+++ flac-1.2.1-new/examples/cpp/encode/file/main.cpp 2008-01-08 17:25:20.000000000 -0800 -@@ -30,6 +30,7 @@ - - #include - #include -+#include - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" -