libsndfile: revert bump for gcc2.

This commit is contained in:
Jerome Duval
2015-12-01 23:07:27 +00:00
parent 226f7c55d6
commit 315b6d487b
3 changed files with 150 additions and 2 deletions

View File

@@ -0,0 +1,102 @@
SUMMARY="C library for reading and writing of sampled sound"
DESCRIPTION="libsndfile is a library of C routines for reading and writing \
files containing sampled audio data."
HOMEPAGE="http://www.mega-nerd.com/libsndfile"
COPYRIGHT="1999-2011 Erik de Castro Lopo"
LICENSE="GNU LGPL v2.1"
REVISION="3"
SOURCE_URI="http://www.mega-nerd.com/libsndfile/files/libsndfile-$portVersion.tar.gz"
CHECKSUM_SHA256="59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882"
PATCHES="libsndfile-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libsndfile$secondaryArchSuffix = $portVersion compat >= 1
cmd:sndfile_cmp$secondaryArchSuffix
cmd:sndfile_concat$secondaryArchSuffix
cmd:sndfile_convert$secondaryArchSuffix
cmd:sndfile_deinterleave$secondaryArchSuffix
cmd:sndfile_info$secondaryArchSuffix
cmd:sndfile_interleave$secondaryArchSuffix
cmd:sndfile_metadata_get$secondaryArchSuffix
cmd:sndfile_metadata_set$secondaryArchSuffix
cmd:sndfile_play$secondaryArchSuffix
cmd:sndfile_regtest$secondaryArchSuffix
cmd:sndfile_salvage$secondaryArchSuffix
lib:libsndfile$secondaryArchSuffix = $portVersion compat >= 1
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libflac$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
"
PROVIDES_devel="
libsndfile${secondaryArchSuffix}_devel = $portVersion compat >= 1
devel:libsndfile$secondaryArchSuffix = $portVersion compat >= 1
"
REQUIRES_devel="
libsndfile$secondaryArchSuffix == $portVersion base
devel:libflac$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libflac$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:find
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
libtoolize --force --copy --install
aclocal -I M4
autoconf
automake
if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
export CFLAGS=-O1
fi
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
# remove libtool library files
rm $libDir/libsndfile.la
prepareInstalledDevelLibs libsndfile
fixPkgconfig
# The pkgconfig files reference other libraries using the wrong paths, which
# creates a lot of confusion. Fix them so correct paths are used.
local develPackageName="${portName}_devel-$portFullVersion"
local packageLinksDir=$(dirname $portPackageLinksDir)
local linksDir="$packageLinksDir/${develPackageName}/devel~libflac$secondaryArchSuffix/$relativeDevelopLibDir"
sed -i -e "s,^\(Libs.private.*\)-L.* \(-lFLAC.*\)$,\1-L$linksDir \2," \
$developLibDir/pkgconfig/sndfile.pc
linksDir="$packageLinksDir/${develPackageName}/devel~libvorbis$secondaryArchSuffix/$relativeDevelopLibDir"
sed -i -e "s,^\(Libs.private.* -lFLAC .*\) -L.* \(-lvorbis.*\)$,\1-L$linksDir \2," \
$developLibDir/pkgconfig/sndfile.pc
# devel package
packageEntries devel \
$developDir
}

View File

@@ -9,8 +9,8 @@ SOURCE_URI="http://www.mega-nerd.com/libsndfile/files/libsndfile-$portVersion.ta
CHECKSUM_SHA256="cd6520ec763d1a45573885ecb1f8e4e42505ac12180268482a44b28484a25092"
PATCHES="libsndfile-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
PROVIDES="
libsndfile$secondaryArchSuffix = $portVersion compat >= 1

View File

@@ -0,0 +1,46 @@
From df98cdcd4887d72c46f78e7e63f7328189427476 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 20 May 2014 16:43:24 +0000
Subject: haiku patch
diff --git a/src/sndfile.h.in b/src/sndfile.h.in
index 8926fc6..ef9636b 100644
--- a/src/sndfile.h.in
+++ b/src/sndfile.h.in
@@ -29,6 +29,7 @@
/* This is the version 1.0.X header file. */
#define SNDFILE_1
+#include <stdint.h>
#include <stdio.h>
#include <sys/types.h>
--
1.8.3.4
From aa846ae9c25ea6a88138edda20eec82e96639a3e Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
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