libcoverart, fix build (#4884)

2026-04-22 11:40:06 +02:00 · 2020-04-25 17:28:18 +02:00
parent 55c1af2303
commit 657aeaaafc
2 changed files with 104 additions and 11 deletions
--- a/media-libs/libcoverart/libcoverart-1.0.0.recipe
+++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe
@@ -4,18 +4,19 @@ Development library geared towards developers who wish to add cover art \
 capabilites to their applications."
 HOMEPAGE="http://musicbrainz.org/doc/libcoverart"
 COPYRIGHT="2012 Andrew Hawkins"
-LICENSE="GNU LGPL v2"
-REVISION="1"
+LICENSE="GNU LGPL v2.1"
+REVISION="2"
 SOURCE_URI="https://github.com/downloads/metabrainz/libcoverart/libcoverart-1.0.0.tar.gz"
 CHECKSUM_SHA256="e4cb78939003a4b5e5c4db68e42e86fbbbea5e69d3166b43ca01a7065916a121"
 SOURCE_DIR="libcoverart-{PROJECT_VERSION}"
+PATCHES="libcoverart-$portVersion.patchset"

-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="!x86_gcc2 ?x86_64"
+SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	libcoverart$secondaryArchSuffix = $portVersion
-	lib:libcoverart$secondaryArchSuffix = $portVersion
+	lib:libcoverart$secondaryArchSuffix = 0.0.1 compat >= 0
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -25,7 +26,7 @@ REQUIRES="

 PROVIDES_devel="
 	libcoverart${secondaryArchSuffix}_devel = $portVersion
-	devel:libcoverart$secondaryArchSuffix = $portVersion
+	devel:libcoverart$secondaryArchSuffix = 0.0.1 compat >= 0
 	"
 REQUIRES_devel="
 	libcoverart$secondaryArchSuffix == $portVersion base
@@ -45,14 +46,21 @@ BUILD_PREREQUIRES="

 BUILD()
 {
-	cmake .
-	make
+	mkdir -p build && cd build
+	cmake .. -DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=$prefix \
+		-DCMAKE_INSTALL_BINDIR=$binDir \
+		-DCMAKE_INSTALL_LIBDIR=$libDir \
+		-DCMAKE_INSTALL_INCLUDEDIR=$includeDir -L
+	make $jobArgs
 }

 INSTALL()
 {
+	cd build
 	make install
-	prepareInstalledDevelLibs libcoverart
+
+	prepareInstalledDevelLib libcoverart
 	fixPkgconfig

 	packageEntries devel \
@@ -61,7 +69,7 @@ INSTALL()

 TEST()
 {
-	make test
-	cd tests
+	cd build/tests
 	./test
+	./ctest
 }
--- a/media-libs/libcoverart/patches/libcoverart-1.0.0.patchset
+++ b/media-libs/libcoverart/patches/libcoverart-1.0.0.patchset
@@ -0,0 +1,85 @@
+From 2d9528e3439dd010b7b08d76abfd6a756087a6de Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sat, 18 Apr 2020 14:10:18 +0000
+Subject: Don't use -Werror, fix install paths
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+old mode 100755
+new mode 100644
+index 30d4c0f..1b807eb
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -24,16 +24,16 @@ FIND_PACKAGE(Jansson REQUIRED)
+ 
+ SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+ SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE)
+-SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE)
+-SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH  "Installation prefix for object code libraries" FORCE)
+-SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE)
+SET(BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation prefix for user executables" FORCE)
+SET(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX} CACHE PATH  "Installation prefix for object code libraries" FORCE)
+SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation prefix for C header files" FORCE)
+ 
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libcoverart.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libcoverart.pc)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
+ 
+ FILE(GLOB headers ${CMAKE_CURRENT_SOURCE_DIR}/include/coverart/*.h)
+-INSTALL(FILES ${headers} include/coverart/caa_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/coverart)
+INSTALL(FILES ${headers} ${CMAKE_CURRENT_BINARY_DIR}/include/coverart/caa_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/coverart)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcoverart.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+ 
+ ADD_SUBDIRECTORY(src)
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index ec10201..f463c56 100644
+--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
+@@ -10,11 +10,11 @@ ADD_EXECUTABLE(example example.cc)
+ ADD_EXECUTABLE(example_c example_c.c)
+ 
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -pedantic-errors")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic-errors")
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ 
+ IF(CMAKE_COMPILER_IS_GNUCC)
+-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wextra -pedantic-errors")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic-errors")
+ 		set_source_files_properties(example.cc PROPERTIES COMPILE_FLAGS "-Wno-long-long")
+ ENDIF(CMAKE_COMPILER_IS_GNUCC)
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0c08530..d7aefcb 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -60,7 +60,7 @@ IF(WIN32)
+ ENDIF(WIN32)
+ 
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -pedantic-errors")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic-errors")
+ 		set_source_files_properties(mb4_c.cc PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
+ 		set_source_files_properties(ReleaseInfo.cc PROPERTIES COMPILE_FLAGS "-Wno-long-long")
+ 		set_source_files_properties(ImageList.cc PROPERTIES COMPILE_FLAGS "-Wno-long-long")
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index c765eeb..0573a78 100644
+--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
+@@ -7,11 +7,11 @@ ADD_EXECUTABLE(test test.cc)
+ ADD_EXECUTABLE(ctest ctest.c)
+ 
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -pedantic-errors")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic-errors")
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ 
+ IF(CMAKE_COMPILER_IS_GNUCC)
+-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wextra -pedantic-errors")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic-errors")
+ #		set_source_files_properties(ctest.c PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
+ 		set_source_files_properties(test.cc PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
+ ENDIF(CMAKE_COMPILER_IS_GNUCC)
+-- 
+2.26.0
+