diff options
author | Tim Harder <radhermit@gentoo.org> | 2017-04-12 06:52:34 -0400 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2017-04-12 06:52:34 -0400 |
commit | abe3db8a5db4cc1a9c0a5d3a3f6355e84500ae76 (patch) | |
tree | 029f7a9220ace6660eeb89e6162789942c1fcc27 /media-libs/flac/files | |
parent | media-libs/libvorbis: remove old (diff) | |
download | gentoo-abe3db8a5db4cc1a9c0a5d3a3f6355e84500ae76.tar.gz gentoo-abe3db8a5db4cc1a9c0a5d3a3f6355e84500ae76.tar.bz2 gentoo-abe3db8a5db4cc1a9c0a5d3a3f6355e84500ae76.zip |
media-libs/flac: remove old
Diffstat (limited to 'media-libs/flac/files')
-rw-r--r-- | media-libs/flac/files/flac-1.3.0-asneeded.patch | 21 | ||||
-rw-r--r-- | media-libs/flac/files/flac-1.3.0-dontbuild-examples.patch | 30 | ||||
-rw-r--r-- | media-libs/flac/files/flac-1.3.1-cflags.patch | 23 | ||||
-rw-r--r-- | media-libs/flac/files/flac-1.3.1-x32.patch | 69 |
4 files changed, 0 insertions, 143 deletions
diff --git a/media-libs/flac/files/flac-1.3.0-asneeded.patch b/media-libs/flac/files/flac-1.3.0-asneeded.patch deleted file mode 100644 index a38b3202500a..000000000000 --- a/media-libs/flac/files/flac-1.3.0-asneeded.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- flac-1.3.0/src/flac/Makefile.am -+++ flac-1.3.0/src/flac/Makefile.am -@@ -51,7 +51,7 @@ - $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \ - $(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \ - $(top_builddir)/src/libFLAC/libFLAC.la \ -- @LIBICONV@ \ -+ @LTLIBICONV@ \ - -lm - - CLEANFILES = flac.exe ---- flac-1.3.0/src/metaflac/Makefile.am -+++ flac-1.3.0/src/metaflac/Makefile.am -@@ -48,6 +48,6 @@ - $(top_builddir)/src/share/getopt/libgetopt.la \ - $(top_builddir)/src/share/utf8/libutf8.la \ - $(top_builddir)/src/libFLAC/libFLAC.la \ -- @LIBICONV@ -+ @LTLIBICONV@ - - CLEANFILES = metaflac.exe diff --git a/media-libs/flac/files/flac-1.3.0-dontbuild-examples.patch b/media-libs/flac/files/flac-1.3.0-dontbuild-examples.patch deleted file mode 100644 index 5c25dd588f2b..000000000000 --- a/media-libs/flac/files/flac-1.3.0-dontbuild-examples.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- flac-1.3.0/configure.ac -+++ flac-1.3.0/configure.ac -@@ -319,6 +319,12 @@ - fi - 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.0/Makefile.am -+++ flac-1.3.0/Makefile.am -@@ -31,7 +31,11 @@ - - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = doc include m4 man src examples test build objs -+SUBDIRS = doc include m4 man src test build objs -+ -+if EXAMPLES -+SUBDIRS += examples -+endif - - EXTRA_DIST = \ - COPYING.FDL \ diff --git a/media-libs/flac/files/flac-1.3.1-cflags.patch b/media-libs/flac/files/flac-1.3.1-cflags.patch deleted file mode 100644 index 758e7b31c13a..000000000000 --- a/media-libs/flac/files/flac-1.3.1-cflags.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- flac-1.3.1/configure.ac -+++ flac-1.3.1/configure.ac -@@ -348,12 +348,8 @@ - - if test "x$debug" = xtrue; then - CPPFLAGS="-DDEBUG $CPPFLAGS" -- CFLAGS=$(echo "$CFLAGS" | sed 's/-g//') -- CFLAGS="-g $CFLAGS" - else - CPPFLAGS="-DNDEBUG $CPPFLAGS" -- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') -- CFLAGS="-O3 -funroll-loops $CFLAGS" - fi - - XIPH_GCC_VERSION -@@ -363,7 +359,6 @@ - CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef -Wunreachable-code " # -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.1-x32.patch b/media-libs/flac/files/flac-1.3.1-x32.patch deleted file mode 100644 index 2dc2d3b6cc26..000000000000 --- a/media-libs/flac/files/flac-1.3.1-x32.patch +++ /dev/null @@ -1,69 +0,0 @@ -https://bugs.gentoo.org/574984 - -fix from upstream - -From 7566d3d4c11c16801e1c98093c4db33589451c17 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo <erikd@mega-nerd.com> -Date: Wed, 11 Mar 2015 20:51:42 +1100 -Subject: [PATCH] configure.ac : Tweak for x32 architecture. - -The x32 architecture uses and ILP32 (32 bit ints, longs and pointers) -on an x86_64 CPU. Since the CPU is x86_64 we need to set FLAC__CPU_X86_64 -even though the pointer size is 32 bits. - -Patch-from: Stuart Shelton -Closes: https://sourceforge.net/p/flac/bugs/427/ ---- - configure.ac | 37 ++++++++++++++++++++++++------------- - 1 file changed, 24 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3b1c037e80f5..2dcc6987a03d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -105,19 +105,30 @@ AC_CHECK_SIZEOF(void*,1) - asm_optimisation=no - case "$host_cpu" in - x86_64) -- if test $ac_cv_sizeof_voidp = 4 ; then -- # This must be a 32 bit user space running on 64 bit kernel so treat -- # this as ia32. -- cpu_ia32=true -- AC_DEFINE(FLAC__CPU_IA32) -- AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386]) -- else -- # x86_64 user space and kernel. -- cpu_x86_64=true -- AC_DEFINE(FLAC__CPU_X86_64) -- AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for x86_64]) -- fi -- asm_optimisation=$asm_opt -+ case "$host" in -+ *gnux32) -+ # x32 user space and 64 bit kernel. -+ cpu_x86_64=true -+ AC_DEFINE(FLAC__CPU_X86_64) -+ AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for x86_64]) -+ asm_optimisation=$asm_opt -+ ;; -+ *) -+ if test $ac_cv_sizeof_voidp = 4 ; then -+ # This must be a 32 bit user space running on 64 bit kernel so treat -+ # this as ia32. -+ cpu_ia32=true -+ AC_DEFINE(FLAC__CPU_IA32) -+ AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386]) -+ else -+ # x86_64 user space and kernel. -+ cpu_x86_64=true -+ AC_DEFINE(FLAC__CPU_X86_64) -+ AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for x86_64]) -+ fi -+ asm_optimisation=$asm_opt -+ ;; -+ esac - ;; - i*86) - cpu_ia32=true --- -2.9.0 |