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

changed the recipe to use configure instead of cmake, this way it compiles for both x86_ggc2 and x86

Browse Source
This commit is contained in:
Begasus
2014-08-15 14:42:16 +02:00
committed by François Revol
parent 0eae317a36
commit 5c11676c35
2 changed files with 95 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
media-sound/fluidsynth/fluidsynth-1.1.6.recipe
View File

@@ -10,47 +10,83 @@ LICENSE="GNU LGPL v2.1"
COPYRIGHT="2007-2012 Josh Green, Pedro Lopez-Cabanillas, David Henningsson"
REVISION="1"
ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?x86_64"
PATCHES="fluidsynth-1.1.6-configure.patch"
PROVIDES="
fluidsynth$secondaryArchSuffix = $portVersion
lib:libfluidsynth$secondaryArchSuffix
cmd:fluidsynth
fluidsynth
libfluidsynth${secondaryArchSuffix} = 1.1.6 compat >= 1.0
lib:libfluidsynth${secondaryArchSuffix} = 1.1.6 compat >= 1.0
cmd:fluidsynth${secondaryArchSuffix}
"
REQUIRES="
haiku$secondayArchSuffix >= $haikuVersion
haiku${secondaryArchSuffix} >= $haikuVersion
lib:libflac$secondaryArchSuffix
glib2$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
lib:libreadline$secondaryArchSuffix
lib:libsndfile$secondaryArchSuffix
lib:libreadline
lib:libglib_2.0
lib:libgthread_2.0
lib:libintl
lib:libvorbis$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libglib_2.0
devel:libreadline
devel:libflac$secondaryArchSuffix
devel:libgthread_2.0$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libncurses$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
devel:libreadline$secondaryArchSuffix
devel:libsndfile$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:libtoolize
cmd:pkg_config$secondaryArchSuffix
cmd:make
cmd:awk
cmd:aclocal
cmd:autoconf
cmd:find
"
PATCHES="fluidsynth-$portVersion.patchset"
BUILD()
{
cmake . -DCMAKE_INSTALL_PREFIX=$prefix \
-DINCLUDE_INSTALL_DIR=$relativeIncludeDir \
-DMAN_INSTALL_DIR=$relativeManDir
libtoolize -fci
aclocal
autoconf
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLib libfluidsynth
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libfluidsynth${secondaryArchSuffix}_devel = $portVersion compat >= 1
devel:libfluidsynth$secondaryArchSuffix = $portVersion compat >= 1
"
REQUIRES_devel="
libfluidsynth$secondaryArchSuffix == $portVersion base
"

41
media-sound/fluidsynth/patches/fluidsynth-1.1.6-configure.patch Normal file
View File

@@ -0,0 +1,41 @@
--- fluidsynth-1.1.6/src/utils/fluid_sys.h
+++ fluidsynth-1.1.6/src/utils/fluid_sys.h
@@ -335,7 +335,7 @@ extern fluid_profile_data_t fluid_profile_data[];
sample data.
*/
-#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__)
+#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) && !defined(__HAIKU__)
#define fluid_mlock(_p,_n) mlock(_p, _n)
#define fluid_munlock(_p,_n) munlock(_p,_n)
#else
--
1.8.3.4
--- fluidsynth-1.1.6/configure.ac.org 2012-08-16 06:01:13.000000000 +0200
+++ fluidsynth-1.1.6/configure.ac 2014-07-21 20:22:51.415760384 +0200
@@ -35,7 +35,7 @@
LT_VERSION_INFO="lt_current:lt_revision:lt_age"
AC_SUBST(LT_VERSION_INFO)
-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADER(src/config.h)
AC_CONFIG_MACRO_DIR([m4])
CFLAGS="$CFLAGS"
--- fluidsynth-1.1.6/configure.ac.org 2014-07-26 14:02:31.369360896 +0200
+++ fluidsynth-1.1.6/configure.ac 2014-07-26 13:59:47.159383552 +0200
@@ -147,10 +147,10 @@
# Those are only valid for GCC
if test "$GCC" = yes; then
if test "$ENABLE_DEBUG" = "yes"; then
- CFLAGS="${CFLAGS} ${FCCFLAGS} -g -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-unused-parameter -Wno-cast-qual"
+ CFLAGS="${CFLAGS} ${FCCFLAGS} -g -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-cast-qual"
AC_DEFINE(DEBUG, 1, [Define to activate debugging message])
else
- CFLAGS="${CFLAGS} ${FCCFLAGS} -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Winline -Wno-unused-parameter -Wno-cast-qual"
+ CFLAGS="${CFLAGS} ${FCCFLAGS} -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Winline -Wno-cast-qual"
AC_DEFINE(DEBUG, 0, [Define to activate debugging message])
fi
fi