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

Cleanup fluidsynth recipe and patches

Browse Source 
- merge both patches and add proper history

- run autogen.sh to avoid hardcoding stuff
- add a configure case for haiku although it doesn't seem
to have any effect
- still run libtoolize -fci just in case.
This commit is contained in:
François Revol
2014-08-15 16:56:28 +02:00
parent 5c11676c35
commit 769271f081
3 changed files with 93 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ REVISION="1"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?x86_64"
PATCHES="fluidsynth-1.1.6-configure.patch"
PATCHES="fluidsynth-1.1.6.patchset"
PROVIDES="
fluidsynth
@@ -61,8 +61,9 @@ BUILD_PREREQUIRES="
BUILD()
{
libtoolize -fci
aclocal
autoconf
./autogen.sh
runConfigure ./configure
make $jobArgs

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

@@ -1,41 +0,0 @@
--- 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

89
media-sound/fluidsynth/patches/fluidsynth-1.1.6.patchset
View File

@@ -55,3 +55,92 @@ index 7cfb7a9..6ac460e 100644
--
1.8.3.4
From 168e9fa215ab0a97c823aac7cc815d2d8542287d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 15 Aug 2014 16:10:40 +0200
Subject: [PATCH] configure: Haiku: drop libm, add libnetwork
Haiku doesn't have libm proper, it's embedded in libroot.
Also, we use libnetwork for socket() and friends.
Somehow all this doesn't seem to change anything though!?
---
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configure.ac b/configure.ac
index 2641597..c621cd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,10 @@ os2*)
solaris*)
LDFLAGS="$LDFLAGS -lnsl -lsocket"
;;
+haiku*)
+ LIBFLUID_LIBS=""
+ LDFLAGS="$LDFLAGS -lnetwork"
+ ;;
esac
AC_SUBST(LIBFLUID_LIBS)
--
1.8.3.4
From 71dedb016726d4732b8527eb487e901fe0ed7452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 15 Aug 2014 16:37:55 +0200
Subject: [PATCH 1/2] configure: AM_CONFIG_HEADER is deprecated
Use AC_CONFIG_HEADER instead.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index d0e1cfe..e88cba6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ m4_define([lt_age], [5])
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"
--
1.8.3.4
From 0057f67ec395e9053b1c235d2fe904aa25800bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 15 Aug 2014 16:41:10 +0200
Subject: [PATCH 2/2] configure: Drop -Wno-unused-parameter (gcc2 doesn't know
this)
Haiku requires buiding with gcc2 for some parts...
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index e88cba6..36d37c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,10 +151,10 @@ AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],
# 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
--
1.8.3.4