diff -Nru naspro-bridges-0.2.91/aclocal.m4 naspro-bridges-0.3.1/aclocal.m4
--- naspro-bridges-0.2.91/aclocal.m4 2011-05-29 15:51:38.000000000 +0000
+++ naspro-bridges-0.3.1/aclocal.m4 2011-12-09 23:18:47.000000000 +0000
@@ -22,8 +22,8 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -32,8 +32,8 @@
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -167,6 +167,8 @@
AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
@@ -652,7 +654,7 @@
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
@@ -816,6 +818,7 @@
m4_case([$1],
[C], [_LT_LANG(C)],
[C++], [_LT_LANG(CXX)],
+ [Go], [_LT_LANG(GO)],
[Java], [_LT_LANG(GCJ)],
[Fortran 77], [_LT_LANG(F77)],
[Fortran], [_LT_LANG(FC)],
@@ -837,6 +840,29 @@
])# _LT_LANG
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into #
+# GNU Autoconf as AC_PROG_GO. When it is available in #
+# a released version of Autoconf we should remove this #
+# macro and use it instead. #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC], [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+ if test -n "$ac_tool_prefix"; then
+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+ fi
+fi
+if test -z "$GOC"; then
+ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
# _LT_LANG_DEFAULT_CONFIG
# -----------------------
m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -867,6 +893,10 @@
m4_ifdef([LT_PROG_GCJ],
[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+ [LT_LANG(GO)],
+ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
AC_PROVIDE_IFELSE([LT_PROG_RC],
[LT_LANG(RC)],
[m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -969,7 +999,13 @@
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
_lt_result=$?
- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ # If there is a non-empty error log, and "single_module"
+ # appears in it, assume the flag caused a linker warning
+ if test -s conftest.err && $GREP single_module conftest.err; then
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ # Otherwise, if the output was created with a 0 exit code from
+ # the compiler, it worked.
+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -977,6 +1013,7 @@
rm -rf libconftest.dylib*
rm -f conftest.*
fi])
+
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
[lt_cv_ld_exported_symbols_list],
[lt_cv_ld_exported_symbols_list=no
@@ -988,6 +1025,7 @@
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
+
AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
[lt_cv_ld_force_load=no
cat > conftest.c << _LT_EOF
@@ -1005,7 +1043,9 @@
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
_lt_result=$?
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1050,8 +1090,8 @@
])
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
# Checks for linker and compiler features on darwin
m4_defun([_LT_DARWIN_LINKER_FEATURES],
[
@@ -1062,6 +1102,8 @@
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
if test "$lt_cv_ld_force_load" = "yes"; then
_LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=''
fi
@@ -1345,14 +1387,27 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
-sparc*-*solaris*)
+*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ yes*)
+ case $host in
+ i?86-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+ LD="${LD-ld}_sol2"
+ fi
+ ;;
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64"
@@ -1429,13 +1484,13 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
fi
case $host_os in
@@ -1615,6 +1670,11 @@
lt_cv_sys_max_cmd_len=196608
;;
+ os2*)
+ # The test takes a long time on OS/2.
+ lt_cv_sys_max_cmd_len=8192
+ ;;
+
osf*)
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1654,7 +1714,7 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
@@ -2200,7 +2260,7 @@
case $host_os in
aix3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
@@ -2209,7 +2269,7 @@
;;
aix[[4-9]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
@@ -2274,7 +2334,7 @@
;;
bsdi[[45]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -2413,7 +2473,7 @@
;;
dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2421,10 +2481,6 @@
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
- dynamic_linker=no
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -2432,7 +2488,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[23]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -2450,7 +2506,7 @@
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2470,17 +2526,18 @@
;;
gnu*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
haiku*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
@@ -2541,7 +2598,7 @@
;;
interix[[3-9]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2557,7 +2614,7 @@
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
fi ;;
@@ -2594,9 +2651,9 @@
dynamic_linker=no
;;
-# This must be Linux ELF.
+# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2659,7 +2716,7 @@
;;
newsos6)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -2728,7 +2785,7 @@
;;
solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2753,7 +2810,7 @@
;;
sysv4 | sysv4.3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -2777,7 +2834,7 @@
sysv4*MP*)
if test -d /usr/nec ;then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
soname_spec='$libname${shared_ext}.$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -2808,7 +2865,7 @@
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2818,7 +2875,7 @@
;;
uts4*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -3240,7 +3297,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-# This must be Linux ELF.
+# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3660,6 +3717,7 @@
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK ['"\
" {last_section=section; section=\$ 3};"\
+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4244,7 +4302,9 @@
case $cc_basename in
nvcc*) # Cuda Compiler Driver 2.2
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+ fi
;;
esac
else
@@ -4336,18 +4396,33 @@
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
# Sun Fortran 8.3 passes all unrecognized flags to the linker
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_TAGVAR(lt_prog_compiler_wl, $1)=''
;;
+ *Sun\ F* | *Sun*Fortran*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
*Sun\ C*)
# Sun C 5.9
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
+ *Intel*\ [[CF]]*Compiler*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ *Portland\ Group*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
esac
;;
esac
@@ -4507,7 +4582,9 @@
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
- cl*) ;;
+ cl*)
+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
_LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4532,7 +4609,6 @@
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4783,8 +4859,7 @@
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5079,6 +5154,7 @@
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5125,10 +5201,6 @@
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- freebsd1*)
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
# support. Future versions do this automatically, but an explicit c++rt0.o
# does not break anything, and helps significantly (at the cost of a little
@@ -5141,7 +5213,7 @@
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5180,7 +5252,6 @@
fi
if test "$with_gnu_ld" = no; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5622,9 +5693,6 @@
_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
[Flag to hardcode $libdir into a binary during linking.
This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
- [[If ld is used when linking, flag to hardcode $libdir into a binary
- during linking. This must work even if $libdir does not exist]])
_LT_TAGDECL([], [hardcode_libdir_separator], [1],
[Whether we need a single "-rpath" flag with a separated argument])
_LT_TAGDECL([], [hardcode_direct], [0],
@@ -5778,7 +5846,6 @@
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6148,7 +6215,7 @@
esac
;;
- freebsd[[12]]*)
+ freebsd2.*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -6909,12 +6976,18 @@
}
};
_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
])
_lt_libdeps_save_CFLAGS=$CFLAGS
case "$CC $CFLAGS " in #(
*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
esac
dnl Parse the compiler output and extract the necessary
@@ -7111,7 +7184,6 @@
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7244,7 +7316,6 @@
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7427,6 +7498,73 @@
])# _LT_LANG_GCJ_CONFIG
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+ _LT_COMPILER_NO_RTTI($1)
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+
+ _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
# _LT_LANG_RC_CONFIG([TAG])
# -------------------------
# Ensure that the configuration variables for the Windows resource compiler
@@ -7496,6 +7634,13 @@
dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
# LT_PROG_RC
# ----------
AC_DEFUN([LT_PROG_RC],
@@ -8160,9 +8305,24 @@
# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
m4_define([_LT_WITH_PIC],
[AC_ARG_WITH([pic],
- [AS_HELP_STRING([--with-pic],
+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [pic_mode="$withval"],
+ [lt_p=${PACKAGE-default}
+ case $withval in
+ yes|no) pic_mode=$withval ;;
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for lt_pkg in $withval; do
+ IFS="$lt_save_ifs"
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac],
[pic_mode=default])
test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -8334,15 +8494,15 @@
# @configure_input@
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
@@ -8474,7 +8634,8 @@
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -8520,7 +8681,8 @@
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
[pkg_failed=yes])
else
pkg_failed=untried
@@ -8568,9 +8730,9 @@
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -8594,7 +8756,7 @@
_PKG_TEXT
-To get pkg-config, see .])dnl
+To get pkg-config, see .])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff -Nru naspro-bridges-0.2.91/ChangeLog naspro-bridges-0.3.1/ChangeLog
--- naspro-bridges-0.2.91/ChangeLog 2011-05-29 15:14:05.000000000 +0000
+++ naspro-bridges-0.3.1/ChangeLog 2011-12-09 23:15:11.000000000 +0000
@@ -1,3 +1,17 @@
+0.3.1
+-----
+ * Fixed LV2 Dynamic Manifest header inclusion.
+ * Synced documentation between website and text files.
+
+0.3.0
+------
+ * Adapted to changes in NASPRO core 0.3.0 and NASPRO Bridge it 0.3.0.
+ * Changed dynamic manifest URIs to
+ http://naspro.atheme.org/plugins/naspro-bridges/
+ * Added DSSI programs to LV2 presets translation.
+ * Fixed default port values.
+ * Fixed typo in COPYING file.
+
0.2.91
------
diff -Nru naspro-bridges-0.2.91/config.h.in naspro-bridges-0.3.1/config.h.in
--- naspro-bridges-0.2.91/config.h.in 2011-05-29 15:52:55.000000000 +0000
+++ naspro-bridges-0.3.1/config.h.in 2011-12-09 23:18:47.000000000 +0000
@@ -1,8 +1,14 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 to enable bridging of DSSI programs as LV2 presets. */
+#undef ENABLE_DSSI_PRESETS
+
/* Define to 1 if you have the header file. */
#undef HAVE_DLFCN_H
+/* Define to 1 if you have LV2 Dynamic Manifest >= 1.2. */
+#undef HAVE_DYNMANIFEST_H
+
/* Define to 1 if you have the header file. */
#undef HAVE_INTTYPES_H
diff -Nru naspro-bridges-0.2.91/configure naspro-bridges-0.3.1/configure
--- naspro-bridges-0.2.91/configure 2011-05-29 15:51:39.000000000 +0000
+++ naspro-bridges-0.3.1/configure 2011-12-09 23:18:48.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for NASPRO bridges 0.2.91.
+# Generated by GNU Autoconf 2.68 for NASPRO bridges 0.3.1.
#
# Report bugs to .
#
@@ -572,8 +572,8 @@
# Identity of this package.
PACKAGE_NAME='NASPRO bridges'
PACKAGE_TARNAME='naspro-bridges'
-PACKAGE_VERSION='0.2.91'
-PACKAGE_STRING='NASPRO bridges 0.2.91'
+PACKAGE_VERSION='0.3.1'
+PACKAGE_STRING='NASPRO bridges 0.3.1'
PACKAGE_BUGREPORT='zanga.mail@gmail.com'
PACKAGE_URL=''
@@ -756,6 +756,7 @@
with_sysroot
enable_libtool_lock
enable_lrdf_bundles
+enable_dssi_presets
'
ac_precious_vars='build_alias
host_alias
@@ -1317,7 +1318,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures NASPRO bridges 0.2.91 to adapt to many kinds of systems.
+\`configure' configures NASPRO bridges 0.3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1387,7 +1388,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of NASPRO bridges 0.2.91:";;
+ short | recursive ) echo "Configuration of NASPRO bridges 0.3.1:";;
esac
cat <<\_ACEOF
@@ -1403,12 +1404,13 @@
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-lrdf-bundles install LRDF-equivalent LV2 bundles [default=no]
+ --enable-dssi-presets bridge DSSI programs as LV2 presets [default=no]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-lv2dir=DIR where to put LV2 bundles [LIBDIR/lv2]
- --with-pic try to use only PIC/non-PIC objects [default=use
+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot=DIR Search for dependent libraries within DIR
@@ -1502,7 +1504,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-NASPRO bridges configure 0.2.91
+NASPRO bridges configure 0.3.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1873,7 +1875,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by NASPRO bridges $as_me 0.2.91, which was
+It was created by NASPRO bridges $as_me 0.3.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2695,7 +2697,7 @@
# Define the identity of the package.
PACKAGE='naspro-bridges'
- VERSION='0.2.91'
+ VERSION='0.3.1'
cat >>confdefs.h <<_ACEOF
@@ -4321,8 +4323,8 @@
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
@@ -5096,6 +5098,11 @@
lt_cv_sys_max_cmd_len=196608
;;
+ os2*)
+ # The test takes a long time on OS/2.
+ lt_cv_sys_max_cmd_len=8192
+ ;;
+
osf*)
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -5135,7 +5142,7 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
@@ -5561,7 +5568,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-# This must be Linux ELF.
+# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -6199,13 +6206,13 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
fi
case $host_os in
@@ -6352,6 +6359,7 @@
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK '"\
" {last_section=section; section=\$ 3};"\
+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -6740,7 +6748,7 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
-sparc*-*solaris*)
+*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -6751,7 +6759,20 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ yes*)
+ case $host in
+ i?86-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+ LD="${LD-ld}_sol2"
+ fi
+ ;;
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64"
@@ -7391,7 +7412,13 @@
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
_lt_result=$?
- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ # If there is a non-empty error log, and "single_module"
+ # appears in it, assume the flag caused a linker warning
+ if test -s conftest.err && $GREP single_module conftest.err; then
+ cat conftest.err >&5
+ # Otherwise, if the output was created with a 0 exit code from
+ # the compiler, it worked.
+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&5
@@ -7402,6 +7429,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -7434,6 +7462,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
$as_echo_n "checking for -force_load linker flag... " >&6; }
if ${lt_cv_ld_force_load+:} false; then :
@@ -7455,7 +7484,9 @@
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
_lt_result=$?
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&5
+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&5
@@ -7828,7 +7859,22 @@
# Check whether --with-pic was given.
if test "${with_pic+set}" = set; then :
- withval=$with_pic; pic_mode="$withval"
+ withval=$with_pic; lt_p=${PACKAGE-default}
+ case $withval in
+ yes|no) pic_mode=$withval ;;
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for lt_pkg in $withval; do
+ IFS="$lt_save_ifs"
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
else
pic_mode=default
fi
@@ -7906,6 +7952,10 @@
+
+
+
+
test -z "$LN_S" && LN_S="ln -s"
@@ -8361,7 +8411,9 @@
case $cc_basename in
nvcc*) # Cuda Compiler Driver 2.2
lt_prog_compiler_wl='-Xlinker '
- lt_prog_compiler_pic='-Xcompiler -fPIC'
+ if test -n "$lt_prog_compiler_pic"; then
+ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+ fi
;;
esac
else
@@ -8452,18 +8504,33 @@
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
# Sun Fortran 8.3 passes all unrecognized flags to the linker
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
lt_prog_compiler_wl=''
;;
+ *Sun\ F* | *Sun*Fortran*)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl='-Qoption ld '
+ ;;
*Sun\ C*)
# Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
lt_prog_compiler_wl='-Wl,'
;;
+ *Intel*\ [CF]*Compiler*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
+ *Portland\ Group*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fpic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
esac
;;
esac
@@ -8825,7 +8892,6 @@
hardcode_direct=no
hardcode_direct_absolute=no
hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld=
hardcode_libdir_separator=
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
@@ -9075,8 +9141,7 @@
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -9455,6 +9520,7 @@
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
enable_shared_with_static_runtimes=yes
+ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
# Don't use ranlib
old_postinstall_cmds='chmod 644 $oldlib'
@@ -9500,6 +9566,7 @@
hardcode_shlibpath_var=unsupported
if test "$lt_cv_ld_force_load" = "yes"; then
whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
else
whole_archive_flag_spec=''
fi
@@ -9528,10 +9595,6 @@
hardcode_shlibpath_var=no
;;
- freebsd1*)
- ld_shlibs=no
- ;;
-
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
# support. Future versions do this automatically, but an explicit c++rt0.o
# does not break anything, and helps significantly (at the cost of a little
@@ -9544,7 +9607,7 @@
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
@@ -9583,7 +9646,6 @@
fi
if test "$with_gnu_ld" = no; then
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_flag_spec_ld='+b $libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
hardcode_direct_absolute=yes
@@ -10207,11 +10269,6 @@
-
-
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
@@ -10301,7 +10358,7 @@
case $host_os in
aix3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
@@ -10310,7 +10367,7 @@
;;
aix[4-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
@@ -10375,7 +10432,7 @@
;;
bsdi[45]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -10514,7 +10571,7 @@
;;
dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -10522,10 +10579,6 @@
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
- dynamic_linker=no
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -10533,7 +10586,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -10551,7 +10604,7 @@
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10571,17 +10624,18 @@
;;
gnu*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
haiku*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
@@ -10642,7 +10696,7 @@
;;
interix[3-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -10658,7 +10712,7 @@
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
fi ;;
@@ -10695,9 +10749,9 @@
dynamic_linker=no
;;
-# This must be Linux ELF.
+# This must be glibc/ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10779,7 +10833,7 @@
;;
newsos6)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
@@ -10848,7 +10902,7 @@
;;
solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10873,7 +10927,7 @@
;;
sysv4 | sysv4.3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -10897,7 +10951,7 @@
sysv4*MP*)
if test -d /usr/nec ;then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
soname_spec='$libname${shared_ext}.$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -10928,7 +10982,7 @@
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10938,7 +10992,7 @@
;;
uts4*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -11720,6 +11774,8 @@
+
+
ac_config_commands="$ac_config_commands libtool"
@@ -11736,6 +11792,7 @@
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -11858,12 +11915,13 @@
pkg_cv_NABRIT_CFLAGS="$NABRIT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nabrit-1 >= 0.2.90\""; } >&5
- ($PKG_CONFIG --exists --print-errors "nabrit-1 >= 0.2.90") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nabrit-2 >= 0.3.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "nabrit-2 >= 0.3.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NABRIT_CFLAGS=`$PKG_CONFIG --cflags "nabrit-1 >= 0.2.90" 2>/dev/null`
+ pkg_cv_NABRIT_CFLAGS=`$PKG_CONFIG --cflags "nabrit-2 >= 0.3.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -11874,12 +11932,13 @@
pkg_cv_NABRIT_LIBS="$NABRIT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nabrit-1 >= 0.2.90\""; } >&5
- ($PKG_CONFIG --exists --print-errors "nabrit-1 >= 0.2.90") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nabrit-2 >= 0.3.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "nabrit-2 >= 0.3.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NABRIT_LIBS=`$PKG_CONFIG --libs "nabrit-1 >= 0.2.90" 2>/dev/null`
+ pkg_cv_NABRIT_LIBS=`$PKG_CONFIG --libs "nabrit-2 >= 0.3.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -11899,14 +11958,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NABRIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nabrit-1 >= 0.2.90" 2>&1`
+ NABRIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nabrit-2 >= 0.3.0" 2>&1`
else
- NABRIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "nabrit-1 >= 0.2.90" 2>&1`
+ NABRIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nabrit-2 >= 0.3.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NABRIT_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (nabrit-1 >= 0.2.90) were not met:
+ as_fn_error $? "Package requirements (nabrit-2 >= 0.3.0) were not met:
$NABRIT_PKG_ERRORS
@@ -11940,7 +11999,13 @@
fi
# Checks for header files.
-ac_fn_c_check_header_mongrel "$LINENO" "lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h" "ac_cv_header_lv2_lv2plug_in_ns_ext_dyn_manifest_dyn_manifest_h" "$ac_includes_default"
+ac_fn_c_check_header_mongrel "$LINENO" "lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h" "ac_cv_header_lv2_lv2plug_in_ns_ext_dynmanifest_dynmanifest_h" "$ac_includes_default"
+if test "x$ac_cv_header_lv2_lv2plug_in_ns_ext_dynmanifest_dynmanifest_h" = xyes; then :
+
+$as_echo "#define HAVE_DYNMANIFEST_H 1" >>confdefs.h
+
+else
+ ac_fn_c_check_header_mongrel "$LINENO" "lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h" "ac_cv_header_lv2_lv2plug_in_ns_ext_dyn_manifest_dyn_manifest_h" "$ac_includes_default"
if test "x$ac_cv_header_lv2_lv2plug_in_ns_ext_dyn_manifest_dyn_manifest_h" = xyes; then :
else
@@ -11948,6 +12013,9 @@
fi
+fi
+
+
ac_fn_c_check_header_mongrel "$LINENO" "ladspa.h" "ac_cv_header_ladspa_h" "$ac_includes_default"
if test "x$ac_cv_header_ladspa_h" = xyes; then :
@@ -12006,6 +12074,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_DSSI_CFLAGS=`$PKG_CONFIG --cflags "dssi >= 1.0.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12022,6 +12091,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_DSSI_LIBS=`$PKG_CONFIG --libs "dssi >= 1.0.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12041,9 +12111,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DSSI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dssi >= 1.0.0" 2>&1`
+ DSSI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dssi >= 1.0.0" 2>&1`
else
- DSSI_PKG_ERRORS=`$PKG_CONFIG --print-errors "dssi >= 1.0.0" 2>&1`
+ DSSI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dssi >= 1.0.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DSSI_PKG_ERRORS" >&5
@@ -12076,6 +12146,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12092,6 +12163,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12111,9 +12183,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa" 2>&1`
+ ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "alsa" 2>&1`
else
- ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa" 2>&1`
+ ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "alsa" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$ALSA_PKG_ERRORS" >&5
@@ -12133,6 +12205,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "libdssialsacompat" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12149,6 +12222,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "libdssialsacompat" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12168,9 +12242,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdssialsacompat" 2>&1`
+ ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdssialsacompat" 2>&1`
else
- ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdssialsacompat" 2>&1`
+ ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdssialsacompat" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$ALSA_PKG_ERRORS" >&5
@@ -12205,6 +12279,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "libdssialsacompat" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12221,6 +12296,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "libdssialsacompat" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12240,9 +12316,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdssialsacompat" 2>&1`
+ ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdssialsacompat" 2>&1`
else
- ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdssialsacompat" 2>&1`
+ ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdssialsacompat" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$ALSA_PKG_ERRORS" >&5
@@ -12285,6 +12361,27 @@
done
fi
+dssi_presets=no
+if test $build_dssi = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable bridging of DSSI programs as LV2 presets" >&5
+$as_echo_n "checking whether to enable bridging of DSSI programs as LV2 presets... " >&6; }
+ # Check whether --enable-dssi-presets was given.
+if test "${enable_dssi_presets+set}" = set; then :
+ enableval=$enable_dssi_presets; dssi_presets="${enableval}"
+else
+ dssi_presets=no
+fi
+
+ if test "$dssi_presets" != yes; then
+ dssi_presets=no
+ else
+
+$as_echo "#define ENABLE_DSSI_PRESETS 1" >>confdefs.h
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dssi_presets" >&5
+$as_echo "$dssi_presets" >&6; }
+fi
if test $build_dssi = yes; then
BUILD_DSSI_TRUE=
BUILD_DSSI_FALSE='#'
@@ -12858,7 +12955,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by NASPRO bridges $as_me 0.2.91, which was
+This file was extended by NASPRO bridges $as_me 0.3.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12924,7 +13021,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-NASPRO bridges config.status 0.2.91
+NASPRO bridges config.status 0.3.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -13064,6 +13161,7 @@
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -13144,7 +13242,6 @@
allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -13203,6 +13300,7 @@
OBJDUMP \
SHELL \
ECHO \
+PATH_SEPARATOR \
SED \
GREP \
EGREP \
@@ -13251,7 +13349,6 @@
allow_undefined_flag \
no_undefined_flag \
hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
hardcode_libdir_separator \
exclude_expsyms \
include_expsyms \
@@ -14052,8 +14149,8 @@
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -14116,6 +14213,9 @@
# An echo program that protects backslashes.
ECHO=$lt_ECHO
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
# The host system.
host_alias=$host_alias
host=$host
@@ -14411,10 +14511,6 @@
# This must work even if \$libdir does not exist
hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking. This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator
@@ -14705,8 +14801,9 @@
echo
-echo " LADSPA bridge: $build_ladspa"
-echo " LRDF-equivalent bundles: $lrdfinst"
+echo " LADSPA bridge: $build_ladspa"
+echo " LRDF-equivalent bundles: $lrdfinst"
echo
-echo " DSSI bridge: $build_dssi"
+echo " DSSI bridge: $build_dssi"
+echo " DSSI programs as LV2 presets: $dssi_presets"
echo
diff -Nru naspro-bridges-0.2.91/configure.ac naspro-bridges-0.3.1/configure.ac
--- naspro-bridges-0.2.91/configure.ac 2011-05-29 15:51:21.000000000 +0000
+++ naspro-bridges-0.3.1/configure.ac 2011-12-09 23:18:40.000000000 +0000
@@ -9,7 +9,7 @@
AC_PREREQ([2.61])
-AC_INIT([NASPRO bridges], [0.2.91], [zanga.mail@gmail.com])
+AC_INIT([NASPRO bridges], [0.3.1], [zanga.mail@gmail.com])
AC_COPYRIGHT([Copyright (C) 2007-2011 NASPRO bridges development team])
AC_CONFIG_SRCDIR([ladspa/internal.h])
@@ -34,11 +34,14 @@
AC_PROG_LIBTOOL
# Checks for libraries.
-PKG_CHECK_MODULES([NABRIT], [nabrit-1 >= 0.2.90])
+PKG_CHECK_MODULES([NABRIT], [nabrit-2 >= 0.3.0])
# Checks for header files.
-AC_CHECK_HEADER([lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h], ,
- [AC_MSG_ERROR([LV2 Dynamic Manifest header not found.])])
+AC_CHECK_HEADER([lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h],
+ [AC_DEFINE([HAVE_DYNMANIFEST_H], [1],
+ [Define to 1 if you have LV2 Dynamic Manifest >= 1.2.])],
+ [AC_CHECK_HEADER([lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h], ,
+ [AC_MSG_ERROR([LV2 Dynamic Manifest header not found.])])])
AC_CHECK_HEADER([ladspa.h], [build_ladspa=yes], [build_ladspa=no])
lrdfinst=no
@@ -67,6 +70,21 @@
lv2/lv2plug.in/ns/ext/uri-map/uri-map.h],
[], [build_dssi=no])
fi
+dssi_presets=no
+if test $build_dssi = yes; then
+ AC_MSG_CHECKING([whether to enable bridging of DSSI programs as LV2 presets])
+ AC_ARG_ENABLE([dssi-presets],
+ AS_HELP_STRING([--enable-dssi-presets],
+ [bridge DSSI programs as LV2 presets @<:@default=no@:>@]),
+ [dssi_presets="${enableval}"], [dssi_presets=no])
+ if test "$dssi_presets" != yes; then
+ dssi_presets=no
+ else
+ AC_DEFINE([ENABLE_DSSI_PRESETS], [1],
+ [Define to 1 to enable bridging of DSSI programs as LV2 presets.])
+ fi
+ AC_MSG_RESULT([$dssi_presets])
+fi
AM_CONDITIONAL([BUILD_DSSI], [test $build_dssi = yes])
# Checks for typedefs, structures, and compiler characteristics.
@@ -87,8 +105,9 @@
AC_OUTPUT
echo
-echo " LADSPA bridge: $build_ladspa"
-echo " LRDF-equivalent bundles: $lrdfinst"
+echo " LADSPA bridge: $build_ladspa"
+echo " LRDF-equivalent bundles: $lrdfinst"
echo
-echo " DSSI bridge: $build_dssi"
+echo " DSSI bridge: $build_dssi"
+echo " DSSI programs as LV2 presets: $dssi_presets"
echo
diff -Nru naspro-bridges-0.2.91/COPYING naspro-bridges-0.3.1/COPYING
--- naspro-bridges-0.2.91/COPYING 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/COPYING 2011-12-09 22:34:18.000000000 +0000
@@ -1,10 +1,9 @@
-NASPRO bridges 0.2.91, A collection of bridges to LV2
+NASPRO bridges 0.3.1, A collection of bridges to LV2
Copyright (C) 2007-2011 NASPRO bridges development team
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License.
+License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
diff -Nru naspro-bridges-0.2.91/debian/changelog naspro-bridges-0.3.1/debian/changelog
--- naspro-bridges-0.2.91/debian/changelog 2011-12-20 18:55:31.000000000 +0000
+++ naspro-bridges-0.3.1/debian/changelog 2011-12-27 08:15:14.000000000 +0000
@@ -1,9 +1,16 @@
-naspro-bridges (0.2.91-1ubuntu1) precise; urgency=low
+naspro-bridges (0.3.1-2) unstable; urgency=low
- * Name and location of dyn-manifest.h have changed. Remove hardcoded paths
- and detect correct location with pkg-config.
+ * Upload to unstable.
- -- Ilya Barygin Tue, 20 Dec 2011 22:54:31 +0400
+ -- Alessio Treglia Tue, 27 Dec 2011 09:15:06 +0100
+
+naspro-bridges (0.3.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Update debian/copyright.
+ * Build against new NASPRO's platform version.
+
+ -- Alessio Treglia Fri, 23 Dec 2011 02:08:41 +0100
naspro-bridges (0.2.91-1) unstable; urgency=low
diff -Nru naspro-bridges-0.2.91/debian/control naspro-bridges-0.3.1/debian/control
--- naspro-bridges-0.2.91/debian/control 2011-12-20 18:37:27.000000000 +0000
+++ naspro-bridges-0.3.1/debian/control 2011-12-27 08:14:55.000000000 +0000
@@ -1,16 +1,15 @@
Source: naspro-bridges
Section: libs
Priority: optional
-Maintainer: Ubuntu Developers
-XSBC-Original-Maintainer: Debian Multimedia Maintainers
+Maintainer: Debian Multimedia Maintainers
Uploaders: Alessio Treglia
Build-Depends: debhelper (>= 7.0.50~),
dh-autoreconf,
dssi-dev,
ladspa-sdk,
libasound2-dev,
- libnabrit-dev,
- libnacore-dev (>> 0.2.90~),
+ libnabrit-dev (>> 0.3.0),
+ libnacore-dev (>> 0.3.0),
librdf0-dev,
lv2core,
lv2-extensions-good,
diff -Nru naspro-bridges-0.2.91/debian/copyright naspro-bridges-0.3.1/debian/copyright
--- naspro-bridges-0.2.91/debian/copyright 2011-12-20 18:37:13.000000000 +0000
+++ naspro-bridges-0.3.1/debian/copyright 2011-12-27 08:14:55.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=204
Upstream-Name: NASPRO bridges
Upstream-Contact: Stefano D'Angelo
Source: https://sourceforge.net/projects/naspro/files/
diff -Nru naspro-bridges-0.2.91/debian/patches/dynmanifest-location.patch naspro-bridges-0.3.1/debian/patches/dynmanifest-location.patch
--- naspro-bridges-0.2.91/debian/patches/dynmanifest-location.patch 2011-12-20 18:54:22.000000000 +0000
+++ naspro-bridges-0.3.1/debian/patches/dynmanifest-location.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-Description: name and location of dyn-manifest.h have changed
- Remove hardcoded path from configure script and source files. Necessary
- build flags will be provided from debian/rules.
-Author: Ilya Barygin
-
---- naspro-bridges-0.2.91.orig/configure.ac
-+++ naspro-bridges-0.2.91/configure.ac
-@@ -37,7 +37,7 @@ AC_PROG_LIBTOOL
- PKG_CHECK_MODULES([NABRIT], [nabrit-1 >= 0.2.90])
-
- # Checks for header files.
--AC_CHECK_HEADER([lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h], ,
-+AC_CHECK_HEADER([dynmanifest.h], ,
- [AC_MSG_ERROR([LV2 Dynamic Manifest header not found.])])
-
- AC_CHECK_HEADER([ladspa.h], [build_ladspa=yes], [build_ladspa=no])
---- naspro-bridges-0.2.91.orig/ladspa/internal.h
-+++ naspro-bridges-0.2.91/ladspa/internal.h
-@@ -18,7 +18,7 @@
-
- #include
-
--#include "lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h"
-+#include "dynmanifest.h"
-
- #include
-
---- naspro-bridges-0.2.91.orig/dssi/internal.h
-+++ naspro-bridges-0.2.91/dssi/internal.h
-@@ -20,7 +20,7 @@
-
- #include
-
--#include "lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h"
-+#include "dynmanifest.h"
- #include "lv2/lv2plug.in/ns/ext/event/event.h"
- #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
-
diff -Nru naspro-bridges-0.2.91/debian/patches/series naspro-bridges-0.3.1/debian/patches/series
--- naspro-bridges-0.2.91/debian/patches/series 2011-12-20 18:57:30.000000000 +0000
+++ naspro-bridges-0.3.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-dynmanifest-location.patch
diff -Nru naspro-bridges-0.2.91/debian/rules naspro-bridges-0.3.1/debian/rules
--- naspro-bridges-0.2.91/debian/rules 2011-12-20 18:50:32.000000000 +0000
+++ naspro-bridges-0.3.1/debian/rules 2011-05-31 08:06:32.000000000 +0000
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-CFLAGS += $(shell pkg-config --cflags lv2-lv2plug.in-ns-ext-dynmanifest)
-
%:
dh $@ --parallel --with autoreconf
diff -Nru naspro-bridges-0.2.91/dssi/bridge.c naspro-bridges-0.3.1/dssi/bridge.c
--- naspro-bridges-0.2.91/dssi/bridge.c 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/dssi/bridge.c 2011-12-04 07:07:24.000000000 +0000
@@ -27,8 +27,7 @@
err = nabrit_util_load_all_in_env_path(bridge, "DSSI_PATH",
nabrit_util_filter_by_suffix,
- MODULE_EXT, pluglib_load, NULL,
- NULL, NULL);
+ MODULE_EXT, pluglib_load, NULL);
if (err == ENOENT)
{
#ifdef _WIN32
@@ -41,7 +40,7 @@
dir = nacore_env_get("AppData");
if (dir != NULL)
{
- nacore_asprintf(&path, "%s\\DSSI Plugins", dir);
+ nacore_asprintf_nl(&path, "%s\\DSSI Plugins", dir);
nacore_env_free(dir);
if (path == NULL)
return ENOMEM;
@@ -50,7 +49,7 @@
dir = nacore_env_get("ProgramFiles");
if (dir != NULL)
{
- nacore_asprintf(&path2, "%s\\DSSI Plugins", dir);
+ nacore_asprintf_nl(&path2, "%s\\DSSI Plugins", dir);
nacore_env_free(dir);
if (path2 == NULL)
{
@@ -62,14 +61,14 @@
nabrit_util_load_all_in_env_path(bridge, "LADSPA_PATH",
nabrit_util_filter_by_suffix,
- MODULE_EXT, pluglib_load, NULL,
- NULL, NULL);
+ MODULE_EXT, pluglib_load,
+ NULL);
if (path != NULL)
{
nabrit_util_load_all_in_dir(bridge, path,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path);
}
@@ -77,7 +76,7 @@
{
nabrit_util_load_all_in_dir(bridge, path2,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path2);
}
#elif defined(__HAIKU__)
@@ -86,11 +85,10 @@
if (find_directory(B_USER_ADDONS_DIRECTORY, NULL, false, dir,
B_PATH_NAME_LENGTH) == B_OK)
{
- nacore_asprintf(&path, "%s/dssi", dir);
+ nacore_asprintf_nl(&path, "%s/dssi", dir);
if (path == NULL)
{
- nabrit_bridge_free(bridge, NULL, NULL, NULL,
- NULL);
+ nabrit_bridge_free(bridge, NULL, NULL);
return ENOMEM;
}
}
@@ -98,27 +96,26 @@
if (find_directory(B_COMMON_ADDONS_DIRECTORY, NULL, false, dir,
B_PATH_NAME_LENGTH) == B_OK)
{
- nacore_asprintf(&path2, "%s/dssi", dir);
+ nacore_asprintf_nl(&path2, "%s/dssi", dir);
if (path2 == NULL)
{
if (path != NULL)
free(path);
- nabrit_bridge_free(bridge, NULL, NULL, NULL,
- NULL);
+ nabrit_bridge_free(bridge, NULL, NULL);
return ENOMEM;
}
}
nabrit_util_load_all_in_env_path(bridge, "LADSPA_PATH",
nabrit_util_filter_by_suffix,
- MODULE_EXT, pluglib_load, NULL,
- NULL, NULL);
+ MODULE_EXT, pluglib_load,
+ NULL);
if (path != NULL)
{
nabrit_util_load_all_in_dir(bridge, path,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path);
}
@@ -126,7 +123,7 @@
{
nabrit_util_load_all_in_dir(bridge, path2,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path2);
}
#else
@@ -136,36 +133,33 @@
if (home != NULL)
{
# ifdef __APPLE__
- nacore_asprintf(&path,
- "%s/Library/Audio/Plug-Ins/DSSI",
- home);
+ nacore_asprintf_nl(&path,
+ "%s/Library/Audio/Plug-Ins/DSSI",
+ home);
if (path == NULL)
{
- nabrit_bridge_free(bridge, NULL, NULL, NULL,
- NULL);
+ nabrit_bridge_free(bridge, NULL, NULL);
nacore_env_free(home);
return ENOMEM;
}
- nacore_asprintf(&path2, "%s/.dssi", home);
+ nacore_asprintf_nl(&path2, "%s/.dssi", home);
if (path2 == NULL)
{
- nabrit_bridge_free(bridge, NULL, NULL, NULL,
- NULL);
+ nabrit_bridge_free(bridge, NULL, NULL);
free(path);
nacore_env_free(home);
return ENOMEM;
}
# else
# ifdef __SYLLABLE__
- nacore_asprintf(&path, "%s/extensions/dssi", home);
+ nacore_asprintf_nl(&path, "%s/extensions/dssi", home);
# else
- nacore_asprintf(&path, "%s/.dssi", home);
+ nacore_asprintf_nl(&path, "%s/.dssi", home);
# endif
if (path == NULL)
{
- nabrit_bridge_free(bridge, NULL, NULL, NULL,
- NULL);
+ nabrit_bridge_free(bridge, NULL, NULL);
nacore_env_free(home);
return ENOMEM;
}
@@ -176,14 +170,14 @@
nabrit_util_load_all_in_env_path(bridge, "LADSPA_PATH",
nabrit_util_filter_by_suffix,
- MODULE_EXT, pluglib_load, NULL,
- NULL, NULL);
+ MODULE_EXT, pluglib_load,
+ NULL);
if (path != NULL)
{
nabrit_util_load_all_in_dir(bridge, path,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path);
}
@@ -191,29 +185,29 @@
{
nabrit_util_load_all_in_dir(bridge, path2,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path2);
}
# ifdef __SYLLABLE__
nabrit_util_load_all_in_dir(bridge, "/system/extensions/dssi",
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
# else
# ifdef __APPLE__
nabrit_util_load_all_in_dir(bridge,
"/Library/Audio/Plug-Ins/DSSI",
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
# endif
nabrit_util_load_all_in_dir(bridge, "/usr/local/lib/dssi",
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
nabrit_util_load_all_in_dir(bridge, "/usr/lib/dssi",
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
# endif
return 0;
@@ -221,7 +215,7 @@
}
else if (err != 0)
{
- nabrit_bridge_free(bridge, NULL, NULL, NULL, NULL);
+ nabrit_bridge_free(bridge, NULL, NULL);
return err;
}
@@ -231,5 +225,5 @@
NACORE_PRIVATE void
bridge_unload_all()
{
- nabrit_bridge_free(bridge, pluglib_unload, NULL, NULL, NULL);
+ nabrit_bridge_free(bridge, pluglib_unload, NULL);
}
diff -Nru naspro-bridges-0.2.91/dssi/internal.h naspro-bridges-0.3.1/dssi/internal.h
--- naspro-bridges-0.2.91/dssi/internal.h 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/dssi/internal.h 2011-12-09 23:23:19.000000000 +0000
@@ -11,6 +11,8 @@
#include
#include
+#include
+
#ifdef __HAIKU__
#include
#include
@@ -20,16 +22,20 @@
#include
-#include "lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h"
-#include "lv2/lv2plug.in/ns/ext/event/event.h"
-#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h"
-
#include
#define API NACORE_PUBLIC NACORE_EXPORT
#include "config.h"
+#ifdef HAVE_DYNMANIFEST_H
+# include
+#else
+# include
+#endif
+#include
+#include
+
#include "bridge.h"
#include "pluglib.h"
#include "plugin.h"
diff -Nru naspro-bridges-0.2.91/dssi/manifest.ttl.in naspro-bridges-0.3.1/dssi/manifest.ttl.in
--- naspro-bridges-0.2.91/dssi/manifest.ttl.in 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/dssi/manifest.ttl.in 2011-12-04 19:33:04.000000000 +0000
@@ -1,5 +1,5 @@
@prefix lv2: .
@prefix dman: .
- a dman:DynManifest ;
+ a dman:DynManifest ;
lv2:binary .
diff -Nru naspro-bridges-0.2.91/dssi/plugin.c naspro-bridges-0.3.1/dssi/plugin.c
--- naspro-bridges-0.2.91/dssi/plugin.c 2011-05-29 13:35:58.000000000 +0000
+++ naspro-bridges-0.3.1/dssi/plugin.c 2011-12-10 00:33:57.000000000 +0000
@@ -29,20 +29,16 @@
LV2_Descriptor lv2desc;
nabrit_plugin plugin;
nabrit_port ports[desc->LADSPA_Plugin->PortCount + 1];
-#if 0
- float values[desc->LADSPA_Plugin->PortCount];
-#endif
char *port_symbol;
const char *filename, *basename, *tmp;
-#if 0
+ size_t sep_len;
+ unsigned long i;
+#if ENABLE_DSSI_PRESETS
+ float values[desc->LADSPA_Plugin->PortCount];
LADSPA_Handle *instance;
const DSSI_Program_Descriptor *prog;
nabrit_preset preset;
char *buf;
-#endif
- size_t sep_len;
- unsigned long i;
-#if 0
unsigned long j;
#endif
@@ -63,9 +59,9 @@
tmp = strstr(basename + sep_len, nacore_fs_dir_sep)) ;
basename += sep_len;
- nacore_asprintf((char **)&lv2desc.URI, "urn:dssi:%.*s:%s",
- (int)(strlen(basename) - sizeof(MODULE_EXT) + 1),
- basename, desc->LADSPA_Plugin->Label);
+ nacore_asprintf_nl((char **)&lv2desc.URI, "urn:dssi:%.*s:%s",
+ (int)(strlen(basename) - sizeof(MODULE_EXT) + 1),
+ basename, desc->LADSPA_Plugin->Label);
if (lv2desc.URI == NULL)
return;
@@ -98,7 +94,7 @@
for (i = 0; i < desc->LADSPA_Plugin->PortCount; i++)
{
- nacore_asprintf(&port_symbol, "port%lu", i);
+ nacore_asprintf_nl(&port_symbol, "port%lu", i);
if (port_symbol == NULL)
{
nabrit_plugin_free_ports(plugin, port_free, NULL);
@@ -157,70 +153,74 @@
continue;
if (LADSPA_IS_HINT_DEFAULT_MINIMUM(
+ desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor)
+ && !LADSPA_IS_HINT_SAMPLE_RATE(
desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(ports[i],
+ nabrit_port_set_deflt(ports[i],
desc->LADSPA_Plugin->PortRangeHints[i].LowerBound);
else if (LADSPA_IS_HINT_DEFAULT_LOW(
+ desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor)
+ && !LADSPA_IS_HINT_SAMPLE_RATE(
desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor))
{
if (LADSPA_IS_HINT_LOGARITHMIC(
desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(ports[i],
+ nabrit_port_set_deflt(ports[i],
exp(0.75 * log(desc->LADSPA_Plugin->PortRangeHints[i].LowerBound)
+ 0.25 * log(desc->LADSPA_Plugin->PortRangeHints[i].UpperBound)));
else
- nabrit_port_set_def(ports[i],
+ nabrit_port_set_deflt(ports[i],
0.75 * desc->LADSPA_Plugin->PortRangeHints[i].LowerBound
+ 0.25 * desc->LADSPA_Plugin->PortRangeHints[i].UpperBound);
}
else if (LADSPA_IS_HINT_DEFAULT_MIDDLE(
+ desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor)
+ && !LADSPA_IS_HINT_SAMPLE_RATE(
desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor))
{
if (LADSPA_IS_HINT_LOGARITHMIC(
desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(ports[i],
+ nabrit_port_set_deflt(ports[i],
exp(0.5 * (log(desc->LADSPA_Plugin->PortRangeHints[i].LowerBound)
+ log(desc->LADSPA_Plugin->PortRangeHints[i].UpperBound))));
else
- nabrit_port_set_def(ports[i],
+ nabrit_port_set_deflt(ports[i],
0.5 * desc->LADSPA_Plugin->PortRangeHints[i].LowerBound
+ 0.5 * desc->LADSPA_Plugin->PortRangeHints[i].UpperBound);
}
else if (LADSPA_IS_HINT_DEFAULT_HIGH(
+ desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor)
+ && !LADSPA_IS_HINT_SAMPLE_RATE(
desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor))
{
if (LADSPA_IS_HINT_LOGARITHMIC(
desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(ports[i],
+ nabrit_port_set_deflt(ports[i],
exp(0.25 * log(desc->LADSPA_Plugin->PortRangeHints[i].LowerBound)
+ 0.75 * log(desc->LADSPA_Plugin->PortRangeHints[i].UpperBound)));
else
- nabrit_port_set_def(ports[i],
+ nabrit_port_set_deflt(ports[i],
0.25 * desc->LADSPA_Plugin->PortRangeHints[i].LowerBound
+ 0.75 * desc->LADSPA_Plugin->PortRangeHints[i].UpperBound);
}
else if (LADSPA_IS_HINT_DEFAULT_MAXIMUM(
+ desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor)
+ && !LADSPA_IS_HINT_SAMPLE_RATE(
desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(ports[i],
+ nabrit_port_set_deflt(ports[i],
desc->LADSPA_Plugin->PortRangeHints[i].UpperBound);
else if (LADSPA_IS_HINT_DEFAULT_0(
desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(ports[i], 0);
+ nabrit_port_set_deflt(ports[i], 0.0);
else if (LADSPA_IS_HINT_DEFAULT_1(
desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(ports[i], 1);
+ nabrit_port_set_deflt(ports[i], 1.0);
else if (LADSPA_IS_HINT_DEFAULT_100(
desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(ports[i], 100);
+ nabrit_port_set_deflt(ports[i], 100.0);
else if (LADSPA_IS_HINT_DEFAULT_440(
desc->LADSPA_Plugin->PortRangeHints[i].HintDescriptor))
- {
- if ((desc->LADSPA_Plugin->PortRangeHints[i].LowerBound
- <= 440) &&
- (desc->LADSPA_Plugin->PortRangeHints[i].LowerBound
- >= 440))
- nabrit_port_set_def(ports[i], 440);
- }
+ nabrit_port_set_deflt(ports[i], 440.0);
}
if (desc->run_synth != NULL)
@@ -241,7 +241,7 @@
if (desc->get_program == NULL)
return;
-#if 0
+#if ENABLE_DSSI_PRESETS
/* Let's try to steal MIDI programs as presets... */
instance = desc->LADSPA_Plugin->instantiate(desc->LADSPA_Plugin,
@@ -251,7 +251,7 @@
for (i = 0; (prog = desc->get_program(instance, i)) != NULL; i++)
{
- buf = nacore_astrcpy(prog->Name, NULL);
+ buf = nacore_strdup(prog->Name, NULL);
if (buf == NULL)
break;
@@ -272,7 +272,9 @@
desc->select_program(instance, prog->Bank, prog->Program);
for (j = 0; j < desc->LADSPA_Plugin->PortCount; j++)
- if (!isnan(values[j]))
+ if (!isnan(values[j])
+ && !LADSPA_IS_HINT_SAMPLE_RATE(
+ desc->LADSPA_Plugin->PortRangeHints[j].HintDescriptor))
nabrit_preset_add_value(preset, ports[j],
values[j]);
}
@@ -281,7 +283,7 @@
#endif
}
-#if 0
+#if ENABLE_DSSI_PRESETS
static void
preset_free(void *value, void *opaque)
{
@@ -290,8 +292,7 @@
#endif
NACORE_PRIVATE void
-plugin_unload(void *value, nacore_msg_context msg_context, void *msg_opaque,
- void *opaque)
+plugin_unload(void *value, void *opaque)
{
nabrit_plugin plugin;
LV2_Descriptor *desc;
@@ -299,7 +300,7 @@
plugin = (nabrit_plugin)value;
nabrit_plugin_free_ports(plugin, port_free, NULL);
-#if 0
+#if ENABLE_DSSI_PRESETS
nabrit_plugin_free_presets(plugin, preset_free, NULL);
#endif
diff -Nru naspro-bridges-0.2.91/dssi/plugin.h naspro-bridges-0.3.1/dssi/plugin.h
--- naspro-bridges-0.2.91/dssi/plugin.h 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/dssi/plugin.h 2011-12-04 07:08:02.000000000 +0000
@@ -12,5 +12,4 @@
plugin_load(nabrit_pluglib pluglib, const DSSI_Descriptor *desc);
NACORE_PRIVATE void
-plugin_unload(void *value, nacore_msg_context msg_context, void *msg_opaque,
- void *opaque);
+plugin_unload(void *value, void *opaque);
diff -Nru naspro-bridges-0.2.91/dssi/pluglib.c naspro-bridges-0.3.1/dssi/pluglib.c
--- naspro-bridges-0.2.91/dssi/pluglib.c 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/dssi/pluglib.c 2011-12-04 07:08:37.000000000 +0000
@@ -11,8 +11,7 @@
#include "internal.h"
NACORE_PRIVATE void
-pluglib_load(void *value, nacore_msg_context msg_context, void *msg_opaque,
- void *opaque)
+pluglib_load(void *value, void *opaque)
{
const char *filename;
nacore_dl_handle handle;
@@ -51,16 +50,14 @@
}
NACORE_PRIVATE void
-pluglib_unload(void *value, nacore_msg_context msg_context, void *msg_opaque,
- void *opaque)
+pluglib_unload(void *value, void *opaque)
{
nabrit_pluglib pluglib;
const char *filename;
pluglib = (nabrit_pluglib)value;
- nabrit_pluglib_free_plugins(bridge, pluglib, plugin_unload, NULL, NULL,
- NULL);
+ nabrit_pluglib_free_plugins(bridge, pluglib, plugin_unload, NULL);
filename = nabrit_pluglib_get_filename(pluglib);
free((void *)filename);
diff -Nru naspro-bridges-0.2.91/dssi/pluglib.h naspro-bridges-0.3.1/dssi/pluglib.h
--- naspro-bridges-0.2.91/dssi/pluglib.h 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/dssi/pluglib.h 2011-12-04 07:07:39.000000000 +0000
@@ -9,9 +9,7 @@
*/
NACORE_PRIVATE void
-pluglib_load(void *value, nacore_msg_context msg_context, void *msg_opaque,
- void *opaque);
+pluglib_load(void *value, void *opaque);
NACORE_PRIVATE void
-pluglib_unload(void *value, nacore_msg_context msg_context, void *msg_opaque,
- void *opaque);
+pluglib_unload(void *value, void *opaque);
diff -Nru naspro-bridges-0.2.91/ladspa/bridge.c naspro-bridges-0.3.1/ladspa/bridge.c
--- naspro-bridges-0.2.91/ladspa/bridge.c 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/ladspa/bridge.c 2011-12-04 06:58:29.000000000 +0000
@@ -24,8 +24,7 @@
err = nabrit_util_load_all_in_env_path(bridge, "LADSPA_PATH",
nabrit_util_filter_by_suffix,
- MODULE_EXT, pluglib_load, NULL,
- NULL, NULL);
+ MODULE_EXT, pluglib_load, NULL);
if (err == ENOENT)
{
#ifdef _WIN32
@@ -39,7 +38,7 @@
dir = nacore_env_get("AppData");
if (dir != NULL)
{
- nacore_asprintf(&path, "%s\\LADSPA Plugins", dir);
+ nacore_asprintf_nl(&path, "%s\\LADSPA Plugins", dir);
nacore_env_free(dir);
if (path == NULL)
return ENOMEM;
@@ -48,7 +47,7 @@
dir = nacore_env_get("ProgramFiles");
if (dir != NULL)
{
- nacore_asprintf(&path2, "%s\\LADSPA Plugins", dir);
+ nacore_asprintf_nl(&path2, "%s\\LADSPA Plugins", dir);
if (path2 == NULL)
{
nacore_env_free(dir);
@@ -57,7 +56,8 @@
return ENOMEM;
}
- nacore_asprintf(&path3, "%s\\Audacity\\Plug-Ins", dir);
+ nacore_asprintf_nl(&path3, "%s\\Audacity\\Plug-Ins",
+ dir);
nacore_env_free(dir);
if (path3 == NULL)
{
@@ -72,7 +72,7 @@
{
nabrit_util_load_all_in_dir(bridge, path,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path);
}
@@ -80,7 +80,7 @@
{
nabrit_util_load_all_in_dir(bridge, path2,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path2);
}
@@ -88,7 +88,7 @@
{
nabrit_util_load_all_in_dir(bridge, path3,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path3);
}
#elif defined(__HAIKU__)
@@ -101,11 +101,10 @@
if (find_directory(B_USER_ADDONS_DIRECTORY, NULL, false, dir,
B_PATH_NAME_LENGTH) == B_OK)
{
- nacore_asprintf(&path, "%s/ladspa", dir);
+ nacore_asprintf_nl(&path, "%s/ladspa", dir);
if (path == NULL)
{
- nabrit_bridge_free(bridge, NULL, NULL, NULL,
- NULL);
+ nabrit_bridge_free(bridge, NULL, NULL);
return ENOMEM;
}
}
@@ -113,13 +112,12 @@
if (find_directory(B_COMMON_ADDONS_DIRECTORY, NULL, false, dir,
B_PATH_NAME_LENGTH) == B_OK)
{
- nacore_asprintf(&path2, "%s/ladspa", dir);
+ nacore_asprintf_nl(&path2, "%s/ladspa", dir);
if (path2 == NULL)
{
if (path != NULL)
free(path);
- nabrit_bridge_free(bridge, NULL, NULL, NULL,
- NULL);
+ nabrit_bridge_free(bridge, NULL, NULL);
return ENOMEM;
}
}
@@ -128,7 +126,7 @@
{
nabrit_util_load_all_in_dir(bridge, path,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path);
}
@@ -136,7 +134,7 @@
{
nabrit_util_load_all_in_dir(bridge, path2,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path2);
}
#else
@@ -148,22 +146,20 @@
# ifdef __APPLE__
char *path2;
- nacore_asprintf(&path,
- "%s/Library/Audio/Plug-Ins/LADSPA",
- home);
+ nacore_asprintf_nl(&path,
+ "%s/Library/Audio/Plug-Ins/LADSPA",
+ home);
if (path == NULL)
{
- nabrit_bridge_free(bridge, NULL, NULL, NULL,
- NULL);
+ nabrit_bridge_free(bridge, NULL, NULL);
nacore_env_free(home);
return ENOMEM;
}
- nacore_asprintf(&path2, "%s/.ladspa", home);
+ nacore_asprintf_nl(&path2, "%s/.ladspa", home);
if (path2 == NULL)
{
- nabrit_bridge_free(bridge, NULL, NULL, NULL,
- NULL);
+ nabrit_bridge_free(bridge, NULL, NULL);
free(path);
nacore_env_free(home);
return ENOMEM;
@@ -171,24 +167,23 @@
nabrit_util_load_all_in_dir(bridge, path,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
nabrit_util_load_all_in_dir(bridge, path2,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path2);
free(path);
# else
# ifdef __SYLLABLE__
- nacore_asprintf(&path, "%s/extensions/ladspa", home);
+ nacore_asprintf_nl(&path, "%s/extensions/ladspa", home);
# else
- nacore_asprintf(&path, "%s/.ladspa", home);
+ nacore_asprintf_nl(&path, "%s/.ladspa", home);
# endif
if (path == NULL)
{
- nabrit_bridge_free(bridge, NULL, NULL, NULL,
- NULL);
+ nabrit_bridge_free(bridge, NULL, NULL);
nacore_env_free(home);
return ENOMEM;
}
@@ -198,7 +193,7 @@
nabrit_util_load_all_in_dir(bridge, path,
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
free(path);
}
@@ -206,29 +201,29 @@
# ifdef __SYLLABLE__
nabrit_util_load_all_in_dir(bridge, "/system/extensions/ladspa",
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
# else
# ifdef __APPLE__
nabrit_util_load_all_in_dir(bridge,
"/Library/Audio/Plug-Ins/LADSPA",
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
# endif
nabrit_util_load_all_in_dir(bridge, "/usr/local/lib/ladspa",
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
nabrit_util_load_all_in_dir(bridge, "/usr/lib/ladspa",
nabrit_util_filter_by_suffix, MODULE_EXT,
- pluglib_load, NULL, NULL, NULL);
+ pluglib_load, NULL);
# endif
#endif
return 0;
}
else if (err != 0)
{
- nabrit_bridge_free(bridge, NULL, NULL, NULL, NULL);
+ nabrit_bridge_free(bridge, NULL, NULL);
return err;
}
@@ -238,5 +233,5 @@
NACORE_PRIVATE void
bridge_unload_all()
{
- nabrit_bridge_free(bridge, pluglib_unload, NULL, NULL, NULL);
+ nabrit_bridge_free(bridge, pluglib_unload, NULL);
}
diff -Nru naspro-bridges-0.2.91/ladspa/internal.h naspro-bridges-0.3.1/ladspa/internal.h
--- naspro-bridges-0.2.91/ladspa/internal.h 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/ladspa/internal.h 2011-12-09 23:22:50.000000000 +0000
@@ -11,6 +11,8 @@
#include
#include
+#include
+
#ifdef __HAIKU__
#include
#include
@@ -18,14 +20,18 @@
#include
-#include "lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h"
-
#include
#define API NACORE_PUBLIC NACORE_EXPORT
#include "config.h"
+#ifdef HAVE_DYNMANIFEST_H
+# include
+#else
+# include
+#endif
+
#include "bridge.h"
#include "pluglib.h"
#include "plugin.h"
diff -Nru naspro-bridges-0.2.91/ladspa/manifest.ttl.in naspro-bridges-0.3.1/ladspa/manifest.ttl.in
--- naspro-bridges-0.2.91/ladspa/manifest.ttl.in 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/ladspa/manifest.ttl.in 2011-12-04 19:33:15.000000000 +0000
@@ -1,5 +1,5 @@
@prefix lv2: .
@prefix dman: .
- a dman:DynManifest ;
+ a dman:DynManifest ;
lv2:binary .
diff -Nru naspro-bridges-0.2.91/ladspa/plugin.c naspro-bridges-0.3.1/ladspa/plugin.c
--- naspro-bridges-0.2.91/ladspa/plugin.c 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/ladspa/plugin.c 2011-12-04 14:45:14.000000000 +0000
@@ -31,8 +31,8 @@
lv2desc = stub_desc;
- nacore_asprintf((char **)&lv2desc.URI, "urn:ladspa:%lu",
- desc->UniqueID);
+ nacore_asprintf_nl((char **)&lv2desc.URI, "urn:ladspa:%lu",
+ desc->UniqueID);
if (lv2desc.URI == NULL)
return;
@@ -63,7 +63,7 @@
for (i = 0; i < desc->PortCount; i++)
{
- nacore_asprintf(&port_symbol, "port%lu", i);
+ nacore_asprintf_nl(&port_symbol, "port%lu", i);
if (port_symbol == NULL)
{
nabrit_plugin_free_ports(plugin, port_free, NULL);
@@ -119,80 +119,85 @@
continue;
if (LADSPA_IS_HINT_DEFAULT_MINIMUM(
+ desc->PortRangeHints[i].HintDescriptor)
+ && !LADSPA_IS_HINT_SAMPLE_RATE(
desc->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(port,
+ nabrit_port_set_deflt(port,
desc->PortRangeHints[i].LowerBound);
else if (LADSPA_IS_HINT_DEFAULT_LOW(
+ desc->PortRangeHints[i].HintDescriptor)
+ && !LADSPA_IS_HINT_SAMPLE_RATE(
desc->PortRangeHints[i].HintDescriptor))
{
if (LADSPA_IS_HINT_LOGARITHMIC(
desc->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(port,
+ nabrit_port_set_deflt(port,
exp(0.75
* log(desc->PortRangeHints[i].LowerBound)
+ 0.25
* log(desc->PortRangeHints[i].UpperBound)));
else
- nabrit_port_set_def(port,
+ nabrit_port_set_deflt(port,
0.75 * desc->PortRangeHints[i].LowerBound
+ 0.25 * desc->PortRangeHints[i].UpperBound);
}
else if (LADSPA_IS_HINT_DEFAULT_MIDDLE(
+ desc->PortRangeHints[i].HintDescriptor)
+ && !LADSPA_IS_HINT_SAMPLE_RATE(
desc->PortRangeHints[i].HintDescriptor))
{
if (LADSPA_IS_HINT_LOGARITHMIC(
desc->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(port,
+ nabrit_port_set_deflt(port,
exp(0.5
* (log(desc->PortRangeHints[i].LowerBound)
+ log(desc->PortRangeHints[i].UpperBound)
)));
else
- nabrit_port_set_def(port,
+ nabrit_port_set_deflt(port,
0.5 * desc->PortRangeHints[i].LowerBound
+ 0.5 * desc->PortRangeHints[i].UpperBound);
}
else if (LADSPA_IS_HINT_DEFAULT_HIGH(
+ desc->PortRangeHints[i].HintDescriptor)
+ && !LADSPA_IS_HINT_SAMPLE_RATE(
desc->PortRangeHints[i].HintDescriptor))
{
if (LADSPA_IS_HINT_LOGARITHMIC(
desc->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(port,
+ nabrit_port_set_deflt(port,
exp(0.25
* log(desc->PortRangeHints[i].LowerBound)
+ 0.75
* log(desc->PortRangeHints[i].UpperBound)));
else
- nabrit_port_set_def(port,
+ nabrit_port_set_deflt(port,
0.25 * desc->PortRangeHints[i].LowerBound
+ 0.75 * desc->PortRangeHints[i].UpperBound);
}
else if (LADSPA_IS_HINT_DEFAULT_MAXIMUM(
+ desc->PortRangeHints[i].HintDescriptor)
+ && !LADSPA_IS_HINT_SAMPLE_RATE(
desc->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(port,
+ nabrit_port_set_deflt(port,
desc->PortRangeHints[i].UpperBound);
else if (LADSPA_IS_HINT_DEFAULT_0(
desc->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(port, 0);
+ nabrit_port_set_deflt(port, 0.0);
else if (LADSPA_IS_HINT_DEFAULT_1(
desc->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(port, 1);
+ nabrit_port_set_deflt(port, 1.0);
else if (LADSPA_IS_HINT_DEFAULT_100(
desc->PortRangeHints[i].HintDescriptor))
- nabrit_port_set_def(port, 100);
+ nabrit_port_set_deflt(port, 100.0);
else if (LADSPA_IS_HINT_DEFAULT_440(
desc->PortRangeHints[i].HintDescriptor))
- {
- if ((desc->PortRangeHints[i].LowerBound <= 440) &&
- (desc->PortRangeHints[i].LowerBound >= 440))
- nabrit_port_set_def(port, 440);
- }
+ nabrit_port_set_deflt(port, 440.0);
}
}
NACORE_PRIVATE void
-plugin_unload(void *value, nacore_msg_context msg_context, void *msg_opaque,
- void *opaque)
+plugin_unload(void *value, void *opaque)
{
nabrit_plugin plugin;
LV2_Descriptor *desc;
diff -Nru naspro-bridges-0.2.91/ladspa/plugin.h naspro-bridges-0.3.1/ladspa/plugin.h
--- naspro-bridges-0.2.91/ladspa/plugin.h 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/ladspa/plugin.h 2011-12-04 07:00:22.000000000 +0000
@@ -12,5 +12,4 @@
plugin_load(nabrit_pluglib pluglib, const LADSPA_Descriptor *desc);
NACORE_PRIVATE void
-plugin_unload(void *value, nacore_msg_context msg_context, void *msg_opaque,
- void *opaque);
+plugin_unload(void *value, void *opaque);
diff -Nru naspro-bridges-0.2.91/ladspa/pluglib.c naspro-bridges-0.3.1/ladspa/pluglib.c
--- naspro-bridges-0.2.91/ladspa/pluglib.c 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/ladspa/pluglib.c 2011-12-04 06:59:56.000000000 +0000
@@ -11,8 +11,7 @@
#include "internal.h"
NACORE_PRIVATE void
-pluglib_load(void *value, nacore_msg_context msg_context, void *msg_opaque,
- void *opaque)
+pluglib_load(void *value, void *opaque)
{
const char *filename;
nacore_dl_handle handle;
@@ -51,16 +50,14 @@
}
NACORE_PRIVATE void
-pluglib_unload(void *value, nacore_msg_context msg_context, void *msg_opaque,
- void *opaque)
+pluglib_unload(void *value, void *opaque)
{
nabrit_pluglib pluglib;
const char *filename;
pluglib = (nabrit_pluglib)value;
- nabrit_pluglib_free_plugins(bridge, pluglib, plugin_unload, NULL, NULL,
- NULL);
+ nabrit_pluglib_free_plugins(bridge, pluglib, plugin_unload, NULL);
filename = nabrit_pluglib_get_filename(pluglib);
free((void *)filename);
diff -Nru naspro-bridges-0.2.91/ladspa/pluglib.h naspro-bridges-0.3.1/ladspa/pluglib.h
--- naspro-bridges-0.2.91/ladspa/pluglib.h 2011-04-12 23:06:19.000000000 +0000
+++ naspro-bridges-0.3.1/ladspa/pluglib.h 2011-12-04 06:59:15.000000000 +0000
@@ -9,9 +9,7 @@
*/
NACORE_PRIVATE void
-pluglib_load(void *value, nacore_msg_context msg_context, void *msg_opaque,
- void *opaque);
+pluglib_load(void *value, void *opaque);
NACORE_PRIVATE void
-pluglib_unload(void *value, nacore_msg_context msg_context, void *msg_opaque,
- void *opaque);
+pluglib_unload(void *value, void *opaque);
diff -Nru naspro-bridges-0.2.91/ltmain.sh naspro-bridges-0.3.1/ltmain.sh
--- naspro-bridges-0.2.91/ltmain.sh 2011-04-13 06:29:20.000000000 +0000
+++ naspro-bridges-0.3.1/ltmain.sh 2011-11-23 18:32:43.000000000 +0000
@@ -1,9 +1,9 @@
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
# Written by Gordon Matzigkeit , 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -41,6 +41,7 @@
# --quiet, --silent don't print informational messages
# --no-quiet, --no-silent
# print informational messages (default)
+# --no-warn don't display warning messages
# --tag=TAG use configuration variables from tag TAG
# -v, --verbose print more informational messages than default
# --no-verbose don't print the extra informational messages
@@ -69,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4
+# $progname: (GNU libtool) 2.4.2
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -79,9 +80,9 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
: ${CP="cp -f"}
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
-: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -387,7 +383,7 @@
;;
*)
save_IFS="$IFS"
- IFS=:
+ IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
IFS="$save_IFS"
test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
s*\$LTCFLAGS*'"$LTCFLAGS"'*
s*\$LD*'"$LD"'*
s/\$with_gnu_ld/'"$with_gnu_ld"'/
- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
p
d
}
@@ -1052,6 +1048,7 @@
opt_help=false
opt_help_all=false
opt_silent=:
+opt_warning=:
opt_verbose=:
opt_silent=false
opt_verbose=false
@@ -1120,6 +1117,10 @@
opt_silent=false
func_append preserve_args " $opt"
;;
+ --no-warning|--no-warn)
+ opt_warning=false
+func_append preserve_args " $opt"
+ ;;
--no-verbose)
opt_verbose=false
func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -3201,11 +3202,13 @@
# Set up the ranlib parameters.
oldlib="$destdir/$name"
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
if test -n "$stripme" && test -n "$old_striplib"; then
- func_show_eval "$old_striplib $oldlib" 'exit $?'
+ func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
fi
# Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
@@ -3982,14 +3985,17 @@
# launches target application with the remaining arguments.
func_exec_program ()
{
- for lt_wr_arg
- do
- case \$lt_wr_arg in
- --lt-*) ;;
- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
- esac
- shift
- done
+ case \" \$* \" in
+ *\\ --lt-*)
+ for lt_wr_arg
+ do
+ case \$lt_wr_arg in
+ --lt-*) ;;
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+ esac
+ shift
+ done ;;
+ esac
func_exec_program_core \${1+\"\$@\"}
}
@@ -5057,9 +5063,15 @@
{
EOF
func_emit_wrapper yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
-
+ $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/ fputs ("\1", f);/p
+g
+D'
cat <<"EOF"
}
EOF
@@ -5643,7 +5655,8 @@
continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -6147,7 +6160,8 @@
lib=
found=no
case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
@@ -6831,7 +6845,7 @@
test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$dir"
+ add_dir="-L$absdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -7316,6 +7330,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
+ # correct linux to gnu/linux during the next big refactor
darwin|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
@@ -7432,7 +7447,7 @@
versuffix="$major.$revision"
;;
- linux)
+ linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
versuffix="$major.$age.$revision"
@@ -8020,6 +8035,11 @@
# Test again, we may have decided not to build it any more
if test "$build_libtool_libs" = yes; then
+ # Remove ${wl} instances when linking with ld.
+ # FIXME: should test the right _cmds variable.
+ case $archive_cmds in
+ *\$LD\ *) wl= ;;
+ esac
if test "$hardcode_into_libs" = yes; then
# Hardcode the library paths
hardcode_libdirs=
@@ -8050,7 +8070,7 @@
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_apped perm_rpath " $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
done
@@ -8058,11 +8078,7 @@
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
- if test -n "$hardcode_libdir_flag_spec_ld"; then
- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
- else
- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
- fi
+ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
# We should set the runpath_var.
@@ -9152,6 +9168,8 @@
esac
done
fi
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
eval cmds=\"$old_archive_cmds\"
func_len " $cmds"
@@ -9261,7 +9279,8 @@
*.la)
func_basename "$deplib"
name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ func_resolve_sysroot "$deplib"
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff -Nru naspro-bridges-0.2.91/NEWS naspro-bridges-0.3.1/NEWS
--- naspro-bridges-0.2.91/NEWS 2011-05-29 15:25:52.000000000 +0000
+++ naspro-bridges-0.3.1/NEWS 2011-12-09 23:15:20.000000000 +0000
@@ -1,3 +1,17 @@
+0.3.1
+-----
+ * Fixed LV2 Dynamic Manifest header inclusion.
+ * Synced documentation between website and text files.
+
+0.3.0
+-----
+ * Adapted to changes in NASPRO core 0.3.0 and NASPRO Bridge it 0.3.0.
+ * Changed dynamic manifest URIs to
+ http://naspro.atheme.org/plugins/naspro-bridges/
+ * Added DSSI programs to LV2 presets translation.
+ * Fixed default port values.
+ * Fixed typo in COPYING file.
+
0.2.91
------
* Officially unsupported port to Win32/64.
diff -Nru naspro-bridges-0.2.91/README naspro-bridges-0.3.1/README
--- naspro-bridges-0.2.91/README 2011-05-29 15:59:45.000000000 +0000
+++ naspro-bridges-0.3.1/README 2011-12-09 22:37:45.000000000 +0000
@@ -1,24 +1,28 @@
NASPRO bridges
==============
- http://naspro.atheme.org/naspro-bridges/
+ http://naspro.atheme.org/plugins/naspro-bridges/
- Version: 0.2.91
+ Version: 0.3.1
About
-----
- A collection of bridges to LV2 that, once installed, allow you to use plugins
+ NASPRO bridges (http://naspro.atheme.org/plugins/naspro-bridges/) is a
+ collection of bridges to LV2 that, once installed, allow you to use plugins
developed for other plugin standards in LV2 hosts.
As of now, it contains two bridges: a LADSPA (http://www.ladspa.org/) 1.1
bridge and a DSSI (http://dssi.sourceforge.net/) 1.0.0/1.1.0 bridge.
+ The code is released under the LGPL 2.1
+ (http://www.gnu.org/licenses/lgpl-2.1.html).
+
Supported platforms
-------------------
* Linux (tested);
- * Windows (tested only with MinGW32/Wine);
+ * Windows >= XP, 32 and 64 bit (both not tested);
* FreeBSD (not tested);
* Mac OS X (not tested);
* Haiku (not tested);
@@ -27,22 +31,22 @@
Runtime dependencies
--------------------
- * NASPRO Bridge it (http://naspro.atheme.org/naspro-bridge-it/) >= 0.2.91.
+ * NASPRO Bridge it (http://naspro.atheme.org/libraries/naspro-bridge-it/) >=
+ 0.3.0.
* (optional) ALSA (http://www.alsa-project.org/) or libdssialsacompat
- (http://www.smbolton.com/linux.html) for the DSSI bridge to work.
+ (http://www.smbolton.com/linux.html) for the DSSI bridge.
-Extra build-time dependencies
------------------------------
+Build-time dependencies
+-----------------------
* pkg-config (http://pkg-config.freedesktop.org/);
* an environment capable of running Autotools-based build systems;
- * LV2 Dynamic Manifest (http://lv2plug.in/ns/ext/dyn-manifest/) revision 1.0;
+ * LV2 Dynamic Manifest (http://lv2plug.in/ns/ext/dynmanifest/) >= 1.0;
* (optional) LADSPA SDK (http://www.ladspa.org/) for building the LADSPA
bridge;
* (optional) DSSI (http://dssi.sourceforge.net/) >= 1.0.0, LV2 Events
- (http://lv2plug.in/ns/ext/event/) revision 1.0 and LV2 URI Map
- (http://lv2plug.in/ns/ext/uri-map/) revision 1.0 for building the DSSI
- bridge;
+ (http://lv2plug.in/ns/ext/event) >= 1.0 and LV2 URI Map
+ (http://lv2plug.in/ns/ext/uri-map) >= 1.0 for building the DSSI bridge;
* (optional) GNU Autoconf (http://www.gnu.org/software/autoconf/) >= 2.61, GNU
Automake (http://www.gnu.org/software/automake/) and GNU Libtool
(http://www.gnu.org/software/libtool/) to regenerate the build system.
@@ -52,22 +56,28 @@
LADSPA bridge:
+ * run_adding() and set_run_adding_gain() are not supported;
+ * default port values are not exported for ports with sample rate hint;
* LRDF is not directly supported, a bunch of handcrafted data bundles is
- supplied instead in order to replace it, but its installation is disabled
+ supplied instead in order to replace it, but their installation is disabled
by default - you can enable it using the --enable-lrdf-bundles option at
./configure time (BEWARE: this breaks zynjacku <= 6 and is not supported
- by lilv <= 0.4.2 ---> patch for zynjacku 6 available on the NASPRO
- website);
- * run_adding() and set_run_adding_gain() are not supported.
+ by Lilv <= 0.4.2 ---> patch for zynjacku 6 available on the NASPRO
+ website).
DSSI bridge:
* GUIs are not supported;
- * MIDI banks/programs are not supported;
* there is a maximum number of events per run_synth() call (it is 4096,
should be enough in most cases);
* run_synth_adding(), run_multiple_synths() and run_multiple_synths_adding()
- are not supported.
+ are not supported;
+ * default port values are not exported for ports with sample rate hint;
+ * MIDI programs are not directly supported, but they are translated to LV2
+ presets if the --enable-dssi-presets option is used at ./configure time -
+ as of now this is *HIGLY DISCOURAGED* since it can make all of your
+ Lilv-based LV2 hosts unusable, and however preset values are not exported
+ for ports with sample rate hint.
Usage
-----
@@ -77,8 +87,22 @@
variable), they should Just Work(TM) without user intervention.
The host must support the LV2 Dynamic Manifest specification (e.g., zynjacku
- >= 5.1 or host using lilv > 0.4.2 or lilv = 0.4.2 with a patch you can find on
+ >= 5.1 or host using Lilv > 0.4.2 or Lilv = 0.4.2 with a patch you can find on
the NASPRO website, both built with dynamic manifest support enabled).
You can use LADSPA_PATH and DSSI_PATH environment variables to provide plugin
discovery locations as you like.
+
+Installation
+------------
+
+ As usual:
+
+ $ ./configure && make && make install
+
+ Extra ./configure options
+ -------------------------
+
+ --with-lv2dir=DIR where to put LV2 bundles [LIBDIR/lv2]
+ --enable-lrdf-bundles install LRDF-equivalent LV2 bundles [default=no]
+ --enable-dssi-presets bridge DSSI programs as LV2 presets [default=no]
diff -Nru naspro-bridges-0.2.91/THANKS naspro-bridges-0.3.1/THANKS
--- naspro-bridges-0.2.91/THANKS 2011-05-29 15:27:57.000000000 +0000
+++ naspro-bridges-0.3.1/THANKS 2011-12-10 01:27:16.000000000 +0000
@@ -1,3 +1,15 @@
+NASPRO 0.3.1
+------------
+
+ * David Robillard for pointing out (yet another) header inclusion problem
+ (this time it's only build system-related).
+
+NASPRO 0.3.0
+------------
+
+ * Dave Robillard for spotting out a bug in NASPRO core headers.
+ * Nedko Arnaudov for spotting out other bugs in headers.
+
NASPRO 0.2.91
-------------