libebur128: bump to 1.2.3, fix build on 2nd arch, call fixPkgconfig.

BTW, libebur128 does NOT try to use libspeexdsp, added in #2437.
This commit is contained in:
fbrosson
2018-04-23 08:56:18 +00:00
parent 08443f999b
commit 3983b6329a
2 changed files with 16 additions and 10 deletions

View File

@@ -6,16 +6,19 @@ COPYRIGHT="2011 Jan Kokemüller"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="https://github.com/jiixyj/libebur128/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="1d0d7e855da04010a2432e11fbc596502caf11b61c3b571ccbcb10095fe44b43"
SOURCE_FILENAME="$portVersionedName.tar.gz"
CHECKSUM_SHA256="13776667743cf6e3df36bcf4f8c7ac828859ce02c9988514e3fdddc3efba98f7"
SOURCE_FILENAME="libebur128-$portVersion.tar.gz"
PATCHES="libebur128-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
libVersion="$portVersion"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
libebur128$secondaryArchSuffix = $portVersion
lib:libebur128$secondaryArchSuffix = 1.1.0 compat >= 1
lib:libebur128$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -24,7 +27,7 @@ REQUIRES="
PROVIDES_devel="
libebur128${secondaryArchSuffix}_devel = $portVersion
devel:libebur128$secondaryArchSuffix = 1.1.0 compat >= 1
devel:libebur128$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
libebur128$secondaryArchSuffix == $portVersion
@@ -47,7 +50,12 @@ BUILD()
rm -Rf build
mkdir build
cd build
cmake -DENABLE_INTERNAL_QUEUE_H=1 -DCMAKE_INSTALL_PREFIX:PATH=$prefix ..
cmake .. \
-DENABLE_INTERNAL_QUEUE_H=1 \
-DCMAKE_INSTALL_PREFIX:PATH="$prefix" \
-DCMAKE_INSTALL_LIBDIR:PATH="$libDir" \
-DCMAKE_INSTALL_INCLUDEDIR:PATH="$includeDir" \
make $jobArgs VERBOSE=1
}
@@ -56,10 +64,8 @@ INSTALL()
cd build
make install
mkdir -p $(dirname $includeDir)
mv $prefix/include $includeDir
prepareInstalledDevelLib libebur128
fixPkgconfig
# devel package
packageEntries devel \

View File

@@ -5,7 +5,7 @@ Subject: Haiku patch
diff --git a/ebur128/CMakeLists.txt b/ebur128/CMakeLists.txt
index af09ebb..0bb07b1 100644
index 2876aab..df68dc4 100644
--- a/ebur128/CMakeLists.txt
+++ b/ebur128/CMakeLists.txt
@@ -47,7 +47,7 @@ set_target_properties(ebur128 PROPERTIES
@@ -18,5 +18,5 @@ index af09ebb..0bb07b1 100644
endif()
--
2.13.1
2.17.0