diff --git a/media-libs/libsndfile/libsndfile-1.0.25.recipe b/media-libs/libsndfile/libsndfile-1.0.25.recipe index c361b6648..a29838aa7 100644 --- a/media-libs/libsndfile/libsndfile-1.0.25.recipe +++ b/media-libs/libsndfile/libsndfile-1.0.25.recipe @@ -10,11 +10,11 @@ COPYRIGHT=" LICENSE="GNU LGPL v2.1" SRC_URI="http://www.mega-nerd.com/libsndfile/files/$portVersionedName.tar.gz" CHECKSUM_SHA256="59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882" -REVISION="1" +REVISION="2" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" -PATCHES="$portVersionedName.patchset" +PATCHES="libsndfile-$portVersion.patchset" PROVIDES=" libsndfile$secondaryArchSuffix = $portVersion compat >= 1 @@ -51,7 +51,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make - cmd:pkg_config + cmd:pkg_config$secondaryArchSuffix " BUILD() diff --git a/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset b/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset index d1203e9d4..988ce3ea4 100644 --- a/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset +++ b/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset @@ -1,4 +1,4 @@ -From c94a905e75ff6769bd4289d56f687d6c2a8f6ba4 Mon Sep 17 00:00:00 2001 +From df98cdcd4887d72c46f78e7e63f7328189427476 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 20 May 2014 16:43:24 +0000 Subject: haiku patch @@ -19,3 +19,28 @@ index 8926fc6..ef9636b 100644 -- 1.8.3.4 + +From aa846ae9c25ea6a88138edda20eec82e96639a3e Mon Sep 17 00:00:00 2001 +From: Kacper Kasper +Date: Sun, 8 Jun 2014 17:05:44 +0200 +Subject: Fix documentation path + + +diff --git a/configure.ac b/configure.ac +index 20ba55a..9604249 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -484,6 +484,10 @@ else + htmldocdir=$prefix/share/doc/libsndfile1-dev/html + fi + ++if test $host_os = "haiku" ; then ++ htmldocdir=$prefix/documentation/packages/libsndfile ++fi ++ + if test x$enable_bow_docs = "xyes" ; then + HTML_BGCOLOUR="white" + HTML_FGCOLOUR="black" +-- +1.8.3.4 +