From 32e6240b5cca9b3b2b66344b6b2f6ac12f9f717b Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 18 Feb 2017 20:46:35 -0800 Subject: [PATCH] libflac: update to 1.3.2, refresh patches No mention of sigemptyset seen in source code; dropped patch Signed-off-by: Ian Leonard --- libs/flac/Makefile | 7 ++++--- libs/flac/patches/001-no-docs-and-examples.patch | 2 +- libs/flac/patches/002-no-utility.patch | 2 +- libs/flac/patches/005-gcc_debug_options.patch | 5 ++--- libs/flac/patches/020-fix-musl-sigemptyset-x86.patch | 11 ----------- 5 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 libs/flac/patches/020-fix-musl-sigemptyset-x86.patch diff --git a/libs/flac/Makefile b/libs/flac/Makefile index 01d7d646e3..136e03b9cf 100644 --- a/libs/flac/Makefile +++ b/libs/flac/Makefile @@ -8,12 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=flac -PKG_VERSION:=1.3.1 -PKG_RELEASE:=3 +PKG_VERSION:=1.3.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://downloads.xiph.org/releases/flac/ -PKG_MD5SUM:=b9922c9a0378c88d3e901b234f852698 +PKG_MD5SUM:=454f1bfa3f93cc708098d7890d0499bd +PKG_HASH:=91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f PKG_MAINTAINER:=Ted Hess PKG_INSTALL:=1 diff --git a/libs/flac/patches/001-no-docs-and-examples.patch b/libs/flac/patches/001-no-docs-and-examples.patch index 72b26310e3..7c34288c30 100644 --- a/libs/flac/patches/001-no-docs-and-examples.patch +++ b/libs/flac/patches/001-no-docs-and-examples.patch @@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = doc include m4 man src examples test build objs +-SUBDIRS = doc include m4 man src examples test build objs microbench +SUBDIRS = include m4 src build objs EXTRA_DIST = \ diff --git a/libs/flac/patches/002-no-utility.patch b/libs/flac/patches/002-no-utility.patch index f74460259c..17aaf7392e 100644 --- a/libs/flac/patches/002-no-utility.patch +++ b/libs/flac/patches/002-no-utility.patch @@ -2,8 +2,8 @@ +++ b/src/Makefile.am @@ -27,10 +27,7 @@ endif SUBDIRS = \ - share \ libFLAC \ + share \ - flac \ - metaflac \ $(XMMS_DIRS) \ diff --git a/libs/flac/patches/005-gcc_debug_options.patch b/libs/flac/patches/005-gcc_debug_options.patch index 80ffff1a68..ea7db8e148 100644 --- a/libs/flac/patches/005-gcc_debug_options.patch +++ b/libs/flac/patches/005-gcc_debug_options.patch @@ -1,16 +1,15 @@ --- a/configure.ac +++ b/configure.ac -@@ -348,11 +348,11 @@ fi +@@ -386,10 +386,11 @@ fi if test "x$debug" = xtrue; then CPPFLAGS="-DDEBUG $CPPFLAGS" -- CFLAGS=$(echo "$CFLAGS" | sed 's/-g//') - CFLAGS="-g $CFLAGS" + CFLAGS=$(echo "$CFLAGS" | sed 's/-g[0-9]*//') + CFLAGS="-g3 $CFLAGS" else CPPFLAGS="-DNDEBUG $CPPFLAGS" -- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') +- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//') + CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g[0-9]*//') CFLAGS="-O3 -funroll-loops $CFLAGS" fi diff --git a/libs/flac/patches/020-fix-musl-sigemptyset-x86.patch b/libs/flac/patches/020-fix-musl-sigemptyset-x86.patch deleted file mode 100644 index 0ee3ce5941..0000000000 --- a/libs/flac/patches/020-fix-musl-sigemptyset-x86.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/libFLAC/cpu.c -+++ b/src/libFLAC/cpu.c -@@ -243,7 +243,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info) - struct sigaction sigill_save; - struct sigaction sigill_sse; - sigill_sse.sa_sigaction = sigill_handler_sse_os; -- __sigemptyset(&sigill_sse.sa_mask); -+ sigemptyset(&sigill_sse.sa_mask); - sigill_sse.sa_flags = SA_SIGINFO | SA_RESETHAND; /* SA_RESETHAND just in case our SIGILL return jump breaks, so we don't get stuck in a loop */ - if(0 == sigaction(SIGILL, &sigill_sse, &sigill_save)) - { -- 2.30.2