diff --git a/media-libs/flac/flac-1.3.2.recipe b/media-libs/flac/flac-1.3.3.recipe similarity index 96% rename from media-libs/flac/flac-1.3.2.recipe rename to media-libs/flac/flac-1.3.3.recipe index b74088012..b8fc950ef 100644 --- a/media-libs/flac/flac-1.3.2.recipe +++ b/media-libs/flac/flac-1.3.3.recipe @@ -10,9 +10,9 @@ COPYRIGHT="2000-2007 Josh Coalson" LICENSE="GNU LGPL v2.1 GNU GPL v2 BSD (3-clause)" -REVISION="3" +REVISION="1" SOURCE_URI="http://downloads.xiph.org/releases/flac/flac-$portVersion.tar.xz" -CHECKSUM_SHA256="91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f" +CHECKSUM_SHA256="213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748" PATCHES="flac-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/media-libs/flac/patches/flac-1.3.2.patchset b/media-libs/flac/patches/flac-1.3.3.patchset similarity index 75% rename from media-libs/flac/patches/flac-1.3.2.patchset rename to media-libs/flac/patches/flac-1.3.3.patchset index 4da6b8ada..7981ed987 100644 --- a/media-libs/flac/patches/flac-1.3.2.patchset +++ b/media-libs/flac/patches/flac-1.3.3.patchset @@ -1,14 +1,14 @@ -From 46090c80c97bef8acd7df98d96be6860e1b73648 Mon Sep 17 00:00:00 2001 +From e1cc5af1855fc3f45b3750188657afb459bb5669 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 27 Nov 2014 17:02:30 +0000 Subject: remove unrecognized gcc flags diff --git a/configure.ac b/configure.ac -index 070ab35..c438589 100644 +index 0228a12..c112687 100644 --- a/configure.ac +++ b/configure.ac -@@ -396,8 +396,8 @@ fi +@@ -434,8 +434,8 @@ AS_IF([test "x${ax_enable_debug}" = "xno" && test "x${enable_flags_setting}" = " XIPH_GCC_VERSION if test x$ac_cv_c_compiler_gnu = xyes ; then @@ -18,19 +18,19 @@ index 070ab35..c438589 100644 + CXXFLAGS="$CXXFLAGS -Wall -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]) + -- -2.7.0 +2.23.0 -From ccd459faf2ea8541d3020a9a8a57a345a259f32f Mon Sep 17 00:00:00 2001 +From 8a709f0bbdf1f2fd890ca88d0de4737aef2c235f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 26 Aug 2017 11:50:31 +0200 Subject: gcc2 fixes diff --git a/include/FLAC++/decoder.h b/include/FLAC++/decoder.h -index 0b93906..ed8bd91 100644 +index 6a2d901..56dd1c8 100644 --- a/include/FLAC++/decoder.h +++ b/include/FLAC++/decoder.h @@ -225,11 +225,15 @@ namespace FLAC { @@ -50,7 +50,7 @@ index 0b93906..ed8bd91 100644 virtual ::FLAC__StreamDecoderInitStatus init_ogg(const char *filename); ///< See FLAC__stream_decoder_init_ogg_file() virtual ::FLAC__StreamDecoderInitStatus init_ogg(const std::string &filename); ///< See FLAC__stream_decoder_init_ogg_file() diff --git a/include/FLAC++/encoder.h b/include/FLAC++/encoder.h -index b01a545..491a1ff 100644 +index ce8d80a..fd40f0b 100644 --- a/include/FLAC++/encoder.h +++ b/include/FLAC++/encoder.h @@ -235,11 +235,15 @@ namespace FLAC { @@ -69,26 +69,6 @@ index b01a545..491a1ff 100644 virtual ::FLAC__StreamEncoderInitStatus init_ogg(FILE *file); ///< See FLAC__stream_encoder_init_ogg_FILE() virtual ::FLAC__StreamEncoderInitStatus init_ogg(const char *filename); ///< See FLAC__stream_encoder_init_ogg_file() virtual ::FLAC__StreamEncoderInitStatus init_ogg(const std::string &filename); ///< See FLAC__stream_encoder_init_ogg_file() -diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c -index b9df19a..ee3fc7e 100644 ---- a/src/libFLAC/cpu.c -+++ b/src/libFLAC/cpu.c -@@ -65,7 +65,6 @@ static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE = 0x02000000; - static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE2 = 0x04000000; - #endif - --#if FLAC__HAS_X86INTRIN || FLAC__AVX_SUPPORTED - /* these are flags in ECX of CPUID AX=00000001 */ - static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE3 = 0x00000001; - static const unsigned FLAC__CPUINFO_IA32_CPUID_SSSE3 = 0x00000200; -@@ -78,7 +77,6 @@ static const unsigned FLAC__CPUINFO_IA32_CPUID_AVX = 0x10000000; - static const unsigned FLAC__CPUINFO_IA32_CPUID_FMA = 0x00001000; - /* these are flags in EBX of CPUID AX=00000007 */ - static const unsigned FLAC__CPUINFO_IA32_CPUID_AVX2 = 0x00000020; --#endif - - #if defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64 - static uint32_t -- -2.7.0 +2.23.0