flac: bump version

media-libs/flac/flac-1.3.4.recipe

@@ -10,9 +10,9 @@ COPYRIGHT="2000-2007 Josh Coalson"
 LICENSE="GNU LGPL v2.1
 	GNU GPL v2
 	BSD (3-clause)"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://downloads.xiph.org/releases/flac/flac-$portVersion.tar.xz"
-CHECKSUM_SHA256="213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748"
+CHECKSUM_SHA256="8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737"
 PATCHES="flac-$portVersion.patchset"
 
 ARCHITECTURES="all"
@@ -31,8 +31,8 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -47,37 +47,36 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libiconv$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:find
-	cmd:gawk
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
-	cmd:gettext
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
 	cmd:nasm
-	cmd:perl
+	cmd:ninja
+	cmd:pkg_config$secondaryArchSuffix
+	"
+TEST_REQUIRES="
+	cmd:cmp
 	"
 
 BUILD()
 {
-	autoreconf -fi
-	runConfigure ./configure
-	make $jobArgs
+	cmake -S. -Bbuilddir -GNinja \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_SHARED_LIBS=ON \
+		-DWITH_STACK_PROTECTOR=OFF \
+		 $cmakeDirArgs
+	echo "#include <inttypes.h>" >> builddir/config.h
+	cmake --build builddir $jobArgs
 }
 
 INSTALL()
 {
-	make install
+	cmake --install builddir
 
-	# remove libtool library files
-	rm $libDir/libFLAC.la $libDir/libFLAC++.la
+	install -Dm 644 src/*/*.m4 -t $dataDir/aclocal
 
 	if [ -n "$secondaryArchSuffix" ]; then
 		rm -rf $binDir $documentationDir
@@ -87,19 +86,11 @@ INSTALL()
 
 	# devel package
 	packageEntries devel \
+		$dataDir \
 		$developDir
 }
 
 TEST()
 {
-	test_grabbag.sh
-	test_streams.sh
-	test_libFLAC.sh
-	test_wrapper.sh
-	test_bins.sh
-	test_libFLAC++.sh
-	test_compression.sh
-	test_metaflac.sh
-	test_flac.sh
-	test_seeking.sh
+	FLAC__TEST_LEVEL=0 cmake --build build --target test
 }

media-libs/flac/patches/flac-1.3.4.patchset

@@ -1,34 +1,27 @@
-From e1cc5af1855fc3f45b3750188657afb459bb5669 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Thu, 27 Nov 2014 17:02:30 +0000
-Subject: remove unrecognized gcc flags
-
-
-diff --git a/configure.ac b/configure.ac
-index 0228a12..c112687 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -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
--	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations -Winline " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Wconversion
--	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
-+	CFLAGS="$CFLAGS -Wall  -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations -Winline " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Wconversion
-+	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])
- 
--- 
-2.23.0
-
-
-From 8a709f0bbdf1f2fd890ca88d0de4737aef2c235f Mon Sep 17 00:00:00 2001
+From fe1b49262960882694b9da55d7b2054c4d4d4fdb Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 26 Aug 2017 11:50:31 +0200
 Subject: gcc2 fixes
 
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9bcb107..d20871a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,11 +33,11 @@ find_package(Iconv)
+ set(HAVE_ICONV ${Iconv_FOUND})
+ 
+ if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations -Winline")
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations -Winline")
+     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -funroll-loops")
+ endif()
+ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef")
+ endif()
+ 
+ include(CMakePackageConfigHelpers)
 diff --git a/include/FLAC++/decoder.h b/include/FLAC++/decoder.h
 index 6a2d901..56dd1c8 100644
 --- a/include/FLAC++/decoder.h
@@ -69,6 +62,19 @@ index ce8d80a..fd40f0b 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++/metadata.cpp b/src/libFLAC++/metadata.cpp
+index 374e5b3..169f5b8 100644
+--- a/src/libFLAC++/metadata.cpp
++++ b/src/libFLAC++/metadata.cpp
+@@ -827,7 +827,7 @@ namespace FLAC {
+ 			clear_field_name();
+ 			clear_field_value();
+ 
+-			const char *p = static_cast<const char *>(std::memchr(entry_.entry, '=', entry_.length));
++			const char *p = (const char *)(std::memchr(entry_.entry, '=', entry_.length));
+ 
+ 			if(0 == p)
+ 				p = reinterpret_cast<const char *>(entry_.entry) + entry_.length;
 -- 
-2.23.0
+2.30.2