haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcoverart: bump to gitrev (#6288)

Browse Source
This commit is contained in:
extrowerk
2021-10-20 18:28:39 +02:00
committed by GitHub
parent f10dfec1f6
commit abfbbf8593
2 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
media-libs/libcoverart/libcoverart-1.0.0.recipe → media-libs/libcoverart/libcoverart-1.0.0~git.recipe
View File

@@ -5,36 +5,48 @@ capabilites to their applications."
HOMEPAGE="http://musicbrainz.org/doc/libcoverart"
COPYRIGHT="2012 Andrew Hawkins"
LICENSE="GNU LGPL v2.1"
REVISION="3"
SOURCE_URI="https://github.com/downloads/metabrainz/libcoverart/libcoverart-1.0.0.tar.gz"
CHECKSUM_SHA256="e4cb78939003a4b5e5c4db68e42e86fbbbea5e69d3166b43ca01a7065916a121"
SOURCE_DIR="libcoverart-{PROJECT_VERSION}"
REVISION="1"
srcGitRev="fe08928991c9a1aba86fdafc9057658b549dc2fb"
SOURCE_URI="https://github.com/metabrainz/libcoverart/archive/$srcGitRev.zip"
CHECKSUM_SHA256="1c72c7ae8a910632e501a29ce03ce58d688d2bf0148a6cdb385fd13086592623"
SOURCE_FILENAME="libcoverart-$srcGitRev.zip"
SOURCE_DIR="libcoverart-$srcGitRev"
PATCHES="libcoverart-$portVersion.patchset"
ARCHITECTURES="?all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersion="1.0.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
libcoverart$secondaryArchSuffix = $portVersion
lib:libcoverart$secondaryArchSuffix = 0.0.1 compat >= 0
lib:libcoverart$secondaryArchSuffix = $libVersionCompat
lib:libcoverartcc$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libjansson$secondaryArchSuffix
lib:libneon$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
"
PROVIDES_devel="
libcoverart${secondaryArchSuffix}_devel = $portVersion
devel:libcoverart$secondaryArchSuffix = 0.0.1 compat >= 0
devel:libcoverart$secondaryArchSuffix = $libVersionCompat
devel:libcoverartcc$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
libcoverart$secondaryArchSuffix == $portVersion base
devel:libjansson$secondaryArchSuffix
devel:libneon$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libjansson$secondaryArchSuffix
devel:libneon$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
@@ -44,6 +56,10 @@ BUILD_PREREQUIRES="
cmd:pkg_config$secondaryArchSuffix
"
defineDebugInfoPackage libcoverart$secondaryArchSuffix \
"$libDir"/libcoverart.so.$libVersion \
"$libDir"/libcoverartcc.so.$libVersion
BUILD()
{
mkdir -p build && cd build
@@ -60,7 +76,7 @@ INSTALL()
cd build
make install
prepareInstalledDevelLib libcoverart
prepareInstalledDevelLibs libcoverart libcoverartcc
fixPkgconfig
packageEntries devel \
@@ -70,6 +86,6 @@ INSTALL()
TEST()
{
cd build/tests
./test
./ctest
./cctest
}

36
media-libs/libcoverart/patches/libcoverart-1.0.0.patchset → media-libs/libcoverart/patches/libcoverart-1.0.0~git.patchset
View File

@@ -5,12 +5,10 @@ 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
index 7f73e1c..6da0c89 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,16 +24,16 @@ FIND_PACKAGE(Jansson REQUIRED)
@@ -38,9 +38,9 @@ ENDIF(NOT CMAKE_CROSSCOMPILING)
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)
@@ -21,22 +19,14 @@ index 30d4c0f..1b807eb
+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}/libcoverartcc.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libcoverartcc.pc)
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
index 32fdca6..4cb142e 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)
@@ -13,11 +13,11 @@ TARGET_LINK_LIBRARIES(example coverartcc ${NEON_LIBRARIES})
TARGET_LINK_LIBRARIES(example_c coverart ${NEON_LIBRARIES})
IF(CMAKE_COMPILER_IS_GNUCXX)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -pedantic-errors")
@@ -50,24 +40,24 @@ index ec10201..f463c56 100644
ENDIF(CMAKE_COMPILER_IS_GNUCC)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c08530..d7aefcb 100644
index 0334e8e..058584e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -60,7 +60,7 @@ IF(WIN32)
@@ -74,7 +74,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(ca_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
index 1d1a987..84ffc46 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,11 +7,11 @@ ADD_EXECUTABLE(test test.cc)
ADD_EXECUTABLE(ctest ctest.c)
@@ -9,11 +9,11 @@ TARGET_LINK_LIBRARIES(cctest coverartcc ${NEON_LIBRARIES})
TARGET_LINK_LIBRARIES(ctest coverart ${NEON_LIBRARIES})
IF(CMAKE_COMPILER_IS_GNUCXX)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -pedantic-errors")
@@ -81,5 +71,5 @@ index c765eeb..0573a78 100644
set_source_files_properties(test.cc PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
ENDIF(CMAKE_COMPILER_IS_GNUCC)
--
2.26.0
2.30.2