libsamplerate: various fixes.

* add missing provide.
* fixes lrint and lrintf detection.
* fixes documentation location.
This commit is contained in:
Jerome Duval
2015-05-25 18:18:58 +00:00
parent eadef7975c
commit 721a9ce064
2 changed files with 56 additions and 2 deletions

View File

@@ -12,14 +12,15 @@ COPYRIGHT="
LICENSE="GNU GPL v2"
SRC_URI="http://www.mega-nerd.com/SRC/libsamplerate-$portVersion.tar.gz"
CHECKSUM_SHA256="93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06"
REVISION="1"
REVISION="2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
#PATCHES="libsamplerate-1.5.12.patchset"
PATCHES="libsamplerate-$portVersion.patchset"
PROVIDES="
libsamplerate$secondaryArchSuffix = $portVersion compat >= 0
cmd:sndfile_resample$secondaryArchSuffix
lib:libsamplerate$secondaryArchSuffix = 15.12.0 compat >= 15
"
REQUIRES="
@@ -49,12 +50,15 @@ BUILD()
INSTALL()
{
make install
rm $libDir/libsamplerate.la
prepareInstalledDevelLibs libsamplerate
fixPkgconfig
# devel package
packageEntries devel \
$docDir \
$developDir
}

View File

@@ -0,0 +1,50 @@
From e4d5844b5a2993dd04e3fc784f035b97c09bef7f Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 25 May 2015 18:00:05 +0000
Subject: Haiku patch
diff --git a/M4/lrint.m4 b/M4/lrint.m4
index 3e3319e..bd8be74 100644
--- a/M4/lrint.m4
+++ b/M4/lrint.m4
@@ -15,7 +15,7 @@ AC_DEFUN([AC_C99_FUNC_LRINT],
ac_cv_c99_lrint,
[
lrint_save_CFLAGS=$CFLAGS
-CFLAGS="-lm"
+#CFLAGS="-lm"
AC_TRY_LINK([
#define _ISOC9X_SOURCE 1
#define _ISOC99_SOURCE 1
diff --git a/M4/lrintf.m4 b/M4/lrintf.m4
index f921e9e..d3fcf58 100644
--- a/M4/lrintf.m4
+++ b/M4/lrintf.m4
@@ -15,7 +15,7 @@ AC_DEFUN([AC_C99_FUNC_LRINTF],
ac_cv_c99_lrintf,
[
lrintf_save_CFLAGS=$CFLAGS
-CFLAGS="-lm"
+#CFLAGS="-lm"
AC_TRY_LINK([
#define _ISOC9X_SOURCE 1
#define _ISOC99_SOURCE 1
diff --git a/configure.ac b/configure.ac
index 4a718c5..35506a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,8 +267,8 @@ htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
if test $prefix = "NONE" ; then
htmldocdir=/usr/local/share/doc/libsamplerate0-dev/html
else
- htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
- fi
+ htmldocdir=$docdir/libsamplerate0-dev/html
+fi
#====================================================================================
# Now use the information from the checking stage.
--
1.8.3.4