diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2017-01-02 11:08:20 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2017-01-02 11:27:50 +0100 |
| commit | 32d9af62ee97eb977b752b5f507a6cda897de5a2 (patch) | |
| tree | 0134d64b01f4f0bc93632f134c6faa5dc3678a9e /media-libs/flac/files | |
| parent | app-crypt/signing-party: cleanup (diff) | |
| download | gentoo-32d9af62ee97eb977b752b5f507a6cda897de5a2.tar.gz gentoo-32d9af62ee97eb977b752b5f507a6cda897de5a2.tar.bz2 gentoo-32d9af62ee97eb977b752b5f507a6cda897de5a2.zip | |
media-libs/flac: Bump to version 1.3.2
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'media-libs/flac/files')
| -rw-r--r-- | media-libs/flac/files/flac-1.3.2-asneeded.patch | 21 | ||||
| -rw-r--r-- | media-libs/flac/files/flac-1.3.2-cflags.patch | 26 | ||||
| -rw-r--r-- | media-libs/flac/files/flac-1.3.2-dontbuild-examples.patch | 30 |
3 files changed, 77 insertions, 0 deletions
diff --git a/media-libs/flac/files/flac-1.3.2-asneeded.patch b/media-libs/flac/files/flac-1.3.2-asneeded.patch new file mode 100644 index 000000000000..e4a4af75838c --- /dev/null +++ b/media-libs/flac/files/flac-1.3.2-asneeded.patch @@ -0,0 +1,21 @@ +--- flac-1.3.2/src/flac/Makefile.am ++++ flac-1.3.2/src/flac/Makefile.am +@@ -60,7 +60,7 @@ + $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \ + $(top_builddir)/src/libFLAC/libFLAC.la \ + $(win_utf8_lib) \ +- @LIBICONV@ \ ++ @LTLIBICONV@ \ + -lm + + CLEANFILES = flac.exe +--- flac-1.3.2/src/metaflac/Makefile.am ++++ flac-1.3.2/src/metaflac/Makefile.am +@@ -55,6 +55,6 @@ + $(top_builddir)/src/share/utf8/libutf8.la \ + $(top_builddir)/src/libFLAC/libFLAC.la \ + $(win_utf8_lib) \ +- @LIBICONV@ ++ @LTLIBICONV@ + + CLEANFILES = metaflac.exe diff --git a/media-libs/flac/files/flac-1.3.2-cflags.patch b/media-libs/flac/files/flac-1.3.2-cflags.patch new file mode 100644 index 000000000000..fd1334d93de7 --- /dev/null +++ b/media-libs/flac/files/flac-1.3.2-cflags.patch @@ -0,0 +1,26 @@ +--- flac-1.3.2/configure.ac ++++ flac-1.3.2/configure.ac +@@ -384,14 +384,7 @@ + AH_TEMPLATE(FLAC__HAS_NASM, [define if you are compiling for x86 and have the NASM assembler]) + fi + +-if test "x$debug" = xtrue; then +- CPPFLAGS="-DDEBUG $CPPFLAGS" +- CFLAGS="-g $CFLAGS" +-else +- CPPFLAGS="-DNDEBUG $CPPFLAGS" +- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//') +- CFLAGS="-O3 -funroll-loops $CFLAGS" +-fi ++CPPFLAGS="-DDEBUG $CPPFLAGS" + + XIPH_GCC_VERSION + +@@ -400,7 +393,6 @@ + CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations + + XIPH_ADD_CFLAGS([-Wdeclaration-after-statement]) +- XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2]) + + AC_LANG_PUSH([C++]) + XIPH_ADD_CXXFLAGS([-Weffc++]) diff --git a/media-libs/flac/files/flac-1.3.2-dontbuild-examples.patch b/media-libs/flac/files/flac-1.3.2-dontbuild-examples.patch new file mode 100644 index 000000000000..c71099369b48 --- /dev/null +++ b/media-libs/flac/files/flac-1.3.2-dontbuild-examples.patch @@ -0,0 +1,30 @@ +--- flac-1.3.2/configure.ac ++++ flac-1.3.2/configure.ac +@@ -359,6 +359,12 @@ + AC_SUBST(FLAC__HAS_OGG) + AC_SUBST(OGG_PACKAGE) + ++dnl Build examples? ++AC_ARG_ENABLE(examples, ++ AS_HELP_STRING([--disable-examples], [Don't build examples during make]),, ++ enable_examples="yes") ++AM_CONDITIONAL(EXAMPLES, [test "$enable_examples" = "yes"]) ++ + dnl check for i18n(internationalization); these are from libiconv/gettext + AM_ICONV + AM_LANGINFO_CODESET +--- flac-1.3.2/Makefile.am ++++ flac-1.3.2/Makefile.am +@@ -31,7 +31,11 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = doc include m4 man src examples test build objs microbench ++SUBDIRS = doc include m4 man src test build objs microbench ++ ++if EXAMPLES ++SUBDIRS += examples ++endif + + EXTRA_DIST = \ + COPYING.FDL \ |