Date: Wed, 22 Nov 2017 17:39:02 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454694 - in head/audio: gigedit libgig libgig/files linuxsampler linuxsampler/files qsampler Message-ID: <201711221739.vAMHd2o5095571@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Wed Nov 22 17:39:01 2017 New Revision: 454694 URL: https://svnweb.freebsd.org/changeset/ports/454694 Log: audio/libgig: Update to 4.0.0; audio/linuxsampler: Update to 2.0.0; Bumped PORTREVISIONs of audio/gigedit, audio/qsampler Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D13162 Added: head/audio/libgig/files/ head/audio/libgig/files/patch-src_Akai.h (contents, props changed) head/audio/libgig/files/patch-src_DLS.h (contents, props changed) head/audio/linuxsampler/files/patch-configure (contents, props changed) head/audio/linuxsampler/files/patch-src_Makefile.in (contents, props changed) Deleted: head/audio/linuxsampler/files/patch-src_common_Pool.h Modified: head/audio/gigedit/Makefile head/audio/libgig/Makefile head/audio/libgig/distinfo head/audio/libgig/pkg-plist head/audio/linuxsampler/Makefile head/audio/linuxsampler/distinfo head/audio/linuxsampler/files/patch-src_common_Mutex.cpp head/audio/linuxsampler/files/patch-src_common_atomic.h head/audio/linuxsampler/files/patch-src_drivers_audio_AudioChannel.cpp head/audio/linuxsampler/pkg-plist head/audio/qsampler/Makefile Modified: head/audio/gigedit/Makefile ============================================================================== --- head/audio/gigedit/Makefile Wed Nov 22 16:40:51 2017 (r454693) +++ head/audio/gigedit/Makefile Wed Nov 22 17:39:01 2017 (r454694) @@ -3,7 +3,7 @@ PORTNAME= gigedit PORTVERSION= 0.2.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= audio MASTER_SITES= http://download.linuxsampler.org/packages/ @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser LIB_DEPENDS= libgig.so:audio/libgig \ libgtkmm-2.4.so:x11-toolkits/gtkmm24 -RUN_DEPENDS= ${LOCALBASE}/lib/linuxsampler/liblinuxsampler.so.3:audio/linuxsampler +RUN_DEPENDS= ${LOCALBASE}/lib/linuxsampler/liblinuxsampler.so:audio/linuxsampler BUILD_DEPENDS:= ${RUN_DEPENDS} GNU_CONFIGURE= yes Modified: head/audio/libgig/Makefile ============================================================================== --- head/audio/libgig/Makefile Wed Nov 22 16:40:51 2017 (r454693) +++ head/audio/libgig/Makefile Wed Nov 22 17:39:01 2017 (r454694) @@ -2,28 +2,24 @@ # $FreeBSD$ PORTNAME= libgig -PORTVERSION= 3.3.0 -PORTREVISION= 4 +DISTVERSION= 4.0.0 CATEGORIES= audio MASTER_SITES= SF/qsampler/${PORTNAME}/${PORTVERSION} \ http://download.linuxsampler.org/packages/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= yuri@FreeBSD.org COMMENT= Gigasampler file loader library LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libFLAC.so:audio/flac \ - libsndfile.so:audio/libsndfile \ +LIB_DEPENDS= libsndfile.so:audio/libsndfile \ libuuid.so:misc/e2fsprogs-libuuid -USES= tar:bzip2 gmake pathfix pkgconfig libtool +USES= gmake libtool pathfix pkgconfig tar:bzip2 GNU_CONFIGURE= yes -USE_LDCONFIG= yes +USE_LDCONFIG= ${PREFIX}/lib/libgig INSTALL_TARGET= install-strip -MAKE_JOBS_UNSAFE=yes - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +MAKE_JOBS_UNSAFE= yes .include <bsd.port.mk> Modified: head/audio/libgig/distinfo ============================================================================== --- head/audio/libgig/distinfo Wed Nov 22 16:40:51 2017 (r454693) +++ head/audio/libgig/distinfo Wed Nov 22 17:39:01 2017 (r454694) @@ -1,2 +1,3 @@ -SHA256 (libgig-3.3.0.tar.bz2) = d22a3c7ba13d920c1d4b6c218107ad105622ae9d1236ffbce007b98547774425 -SIZE (libgig-3.3.0.tar.bz2) = 338119 +TIMESTAMP = 1511122871 +SHA256 (libgig-4.0.0.tar.bz2) = 5f4db3fbc4effe1b85dd1a2ff791fd3fc418afa6a79cd497f9de5e5c25af28f3 +SIZE (libgig-4.0.0.tar.bz2) = 700905 Added: head/audio/libgig/files/patch-src_Akai.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/libgig/files/patch-src_Akai.h Wed Nov 22 17:39:01 2017 (r454694) @@ -0,0 +1,20 @@ +--- src/Akai.h.orig 2017-11-19 20:27:40 UTC ++++ src/Akai.h +@@ -30,7 +30,7 @@ + # include <config.h> + #endif + +-#if !defined(_CARBON_) && !defined(__APPLE__) && !defined(WIN32) ++#if !defined(_CARBON_) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(WIN32) + # define LINUX 1 + #endif + +@@ -146,7 +146,7 @@ public: + protected: + #ifdef WIN32 + HANDLE mFile; +-#elif defined _CARBON_ || defined(__APPLE__) || LINUX ++#elif defined _CARBON_ || defined(__APPLE__) || defined(__FreeBSD__) || LINUX + int mFile; + #endif + bool mRegularFile; Added: head/audio/libgig/files/patch-src_DLS.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/libgig/files/patch-src_DLS.h Wed Nov 22 17:39:01 2017 (r454694) @@ -0,0 +1,13 @@ +--- src/DLS.h.orig 2017-11-19 20:25:36 UTC ++++ src/DLS.h +@@ -517,8 +517,10 @@ namespace DLS { + virtual ~File(); + protected: + typedef std::list<Sample*> SampleList; ++ public: // otherwise it breaks in build + typedef std::list<Instrument*> InstrumentList; + ++ protected: + RIFF::File* pRIFF; + std::list<RIFF::File*> ExtensionFiles; + SampleList* pSamples; Modified: head/audio/libgig/pkg-plist ============================================================================== --- head/audio/libgig/pkg-plist Wed Nov 22 16:40:51 2017 (r454693) +++ head/audio/libgig/pkg-plist Wed Nov 22 17:39:01 2017 (r454694) @@ -1,16 +1,42 @@ +bin/akaidump +bin/akaiextract bin/dlsdump +bin/gig2mono +bin/gig2stereo bin/gigdump bin/gigextract +bin/gigmerge +bin/korg2gig +bin/korgdump bin/rifftree -include/DLS.h -include/RIFF.h -include/gig.h -lib/libgig.a -lib/libgig.so -lib/libgig.so.6 -lib/libgig.so.6.4.0 +bin/sf2dump +bin/sf2extract +include/libgig/Akai.h +include/libgig/DLS.h +include/libgig/Korg.h +include/libgig/RIFF.h +include/libgig/SF.h +include/libgig/gig.h +lib/libgig/libakai.a +lib/libgig/libakai.so +lib/libgig/libakai.so.0 +lib/libgig/libakai.so.0.0.0 +lib/libgig/libgig.a +lib/libgig/libgig.so +lib/libgig/libgig.so.7 +lib/libgig/libgig.so.7.0.0 +libdata/pkgconfig/akai.pc libdata/pkgconfig/gig.pc +man/man1/akaidump.1.gz +man/man1/akaiextract.1.gz man/man1/dlsdump.1.gz +man/man1/gig2mono.1.gz +man/man1/gig2stereo.1.gz man/man1/gigdump.1.gz man/man1/gigextract.1.gz +man/man1/gigmerge.1.gz +man/man1/korg2gig.1.gz +man/man1/korgdump.1.gz man/man1/rifftree.1.gz +man/man1/sf2dump.1.gz +man/man1/sf2extract.1.gz Modified: head/audio/linuxsampler/Makefile ============================================================================== --- head/audio/linuxsampler/Makefile Wed Nov 22 16:40:51 2017 (r454693) +++ head/audio/linuxsampler/Makefile Wed Nov 22 17:39:01 2017 (r454694) @@ -2,36 +2,39 @@ # $FreeBSD$ PORTNAME= linuxsampler -PORTVERSION= 1.0.0 -PORTREVISION= 8 +DISTVERSION= 2.0.0 CATEGORIES= audio MASTER_SITES= http://download.linuxsampler.org/packages/ MAINTAINER= ports@FreeBSD.org COMMENT= Modular MIDI sampler -LIB_DEPENDS= libgig.so:audio/libgig +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -RESTRICTED= no commercial use - -ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= "not yet ported" +BUILD_DEPENDS= lv2>0:audio/lv2 +LIB_DEPENDS= libgig.so:audio/libgig \ + libsndfile.so:audio/libsndfile \ + libuuid.so:misc/e2fsprogs-libuuid + OPTIONS_DEFINE= JACK ALSA DSSI LV2 OPTIONS_DEFAULT= JACK DSSI_DESC= Enable DSSI support LV2_DESC= Enable LV2 support -USES= tar:bzip2 libtool gmake pathfix pkgconfig sqlite:3 +USES= bison gmake libtool pathfix pkgconfig sqlite:3 tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ENV= HAVE_UNIX98=1 -USE_LDCONFIG= yes +USE_LDCONFIG= ${PREFIX}/lib/linuxsampler INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+=--disable-arts-driver +CONFIGURE_ARGS+= --disable-arts-driver .include <bsd.port.options.mk> Modified: head/audio/linuxsampler/distinfo ============================================================================== --- head/audio/linuxsampler/distinfo Wed Nov 22 16:40:51 2017 (r454693) +++ head/audio/linuxsampler/distinfo Wed Nov 22 17:39:01 2017 (r454694) @@ -1,2 +1,3 @@ -SHA256 (linuxsampler-1.0.0.tar.bz2) = bf4f4f83b9ab706e8e8b017aafb560c363bb7663413aeae46d49f1f56110c9cf -SIZE (linuxsampler-1.0.0.tar.bz2) = 701591 +TIMESTAMP = 1511122817 +SHA256 (linuxsampler-2.0.0.tar.bz2) = 1943d05006d96a9fb49f74a6f38129a4585cb78cc0648885fca9f056529c5c28 +SIZE (linuxsampler-2.0.0.tar.bz2) = 1318939 Added: head/audio/linuxsampler/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/linuxsampler/files/patch-configure Wed Nov 22 17:39:01 2017 (r454694) @@ -0,0 +1,176 @@ +--- configure.orig 2015-07-15 20:30:20 UTC ++++ configure +@@ -10097,7 +10097,7 @@ $as_echo_n "checking whether the $compil + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no +- link_all_deplibs=unknown ++ link_all_deplibs=no + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= +@@ -10366,7 +10366,7 @@ _LT_EOF + wlarc= + else + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + fi + ;; + +@@ -10385,7 +10385,7 @@ _LT_EOF + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + else + ld_shlibs=no + fi +@@ -10414,7 +10414,7 @@ _LT_EOF + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + else + ld_shlibs=no + fi +@@ -10432,7 +10432,7 @@ _LT_EOF + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + else + ld_shlibs=no + fi +@@ -11020,7 +11020,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-version-script,$lib-ver' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else +@@ -11798,7 +11798,7 @@ freebsd* | dragonfly*) + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; +@@ -12882,7 +12882,7 @@ striplib= + old_striplib= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&6; } +-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +@@ -13130,7 +13130,7 @@ hardcode_automatic_CXX=no + inherit_rpath_CXX=no + module_cmds_CXX= + module_expsym_cmds_CXX= +-link_all_deplibs_CXX=unknown ++link_all_deplibs_CXX=no + old_archive_cmds_CXX=$old_archive_cmds + reload_flag_CXX=$reload_flag + reload_cmds_CXX=$reload_cmds +@@ -13348,7 +13348,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +@@ -13964,7 +13964,7 @@ fi + case `$CC -V 2>&1` in + *"Version 7."*) + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= +@@ -13972,7 +13972,7 @@ fi + ia64*) tmp_idyn=' -i_dynamic';; + esac + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' + ;; + esac + archive_cmds_need_lc_CXX=no +@@ -14004,7 +14004,7 @@ fi + ;; + *) # Version 6 and above use weak symbols + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-version-script ${wl}$lib-ver -o $lib' + ;; + esac + +@@ -14015,7 +14015,7 @@ fi + cxx*) + # Compaq C++ + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-version-script $wl$lib-ver' + + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_CXX='-rpath $libdir' +@@ -14049,7 +14049,7 @@ fi + # Sun C++ 5.9 + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-version-script ${wl}$lib-ver' + hardcode_libdir_flag_spec_CXX='-R$libdir' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object_CXX=yes +@@ -14122,7 +14122,7 @@ fi + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-version-script,$lib-ver -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi +@@ -15630,7 +15630,7 @@ freebsd* | dragonfly*) + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; +@@ -16768,9 +16768,9 @@ _ACEOF + CXX_CPU_SWITCH= + if ! echo "X $CXXFLAGS " | grep -q -- " \(-march=\|-mcpu=\|-mtune=\|-arch=\)" ; then + if test "$def_arch_x86" = 1 -a "$host_cpu" != "x86_64"; then +- CXX_CPU_SWITCH="-march=$host_cpu" ++ CXX_CPU_SWITCH= + elif test "$target_cpu" = "ppc"; then +- CXX_CPU_SWITCH="-arch=$host_cpu" ++ CXX_CPU_SWITCH= + fi + fi + +@@ -17482,7 +17482,7 @@ fi + # parser yacc tables. + if echo "$YACC" | grep -q bison; then + # NOTE: m4 removes [], that's why it needs to be escaped +- bison_version=`$YACC --version | head -n 1 | sed -e 's/[^0-9.]*\([-0-9.]\+\)$/\1/'` ++ bison_version=`$YACC --version | head -n 1 | sed -e 's/[^0-9.]*\([-0-9.]\+\)$/\1/' | sed -e 's/[[:alpha:][:space:]()]*//'` + bison_version_major=`echo $bison_version | cut -d. -f1` + bison_version_minor=`echo $bison_version | cut -d. -f2` + Added: head/audio/linuxsampler/files/patch-src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/linuxsampler/files/patch-src_Makefile.in Wed Nov 22 17:39:01 2017 (r454694) @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2017-11-19 23:18:33 UTC ++++ src/Makefile.in +@@ -428,7 +428,7 @@ top_srcdir = @top_srcdir@ + + # set the include path found by configure + AM_CPPFLAGS = $(all_includes) $(GIG_CFLAGS) $(SQLITE3_CFLAGS) +-@HAVE_WINDOWS_FALSE@system_libs = -lpthread -ldl ++@HAVE_WINDOWS_FALSE@system_libs = -lpthread + @HAVE_WINDOWS_TRUE@system_libs = + @HAVE_WINDOWS_FALSE@SHELL_SUBDIR = shell + @HAVE_WINDOWS_TRUE@SHELL_SUBDIR = Modified: head/audio/linuxsampler/files/patch-src_common_Mutex.cpp ============================================================================== --- head/audio/linuxsampler/files/patch-src_common_Mutex.cpp Wed Nov 22 16:40:51 2017 (r454693) +++ head/audio/linuxsampler/files/patch-src_common_Mutex.cpp Wed Nov 22 17:39:01 2017 (r454694) @@ -1,4 +1,4 @@ ---- src/common/Mutex.cpp.orig 2007-11-15 00:23:37 UTC +--- src/common/Mutex.cpp.orig 2007-11-14 23:42:15 UTC +++ src/common/Mutex.cpp @@ -36,7 +36,6 @@ #if !defined(WIN32) Modified: head/audio/linuxsampler/files/patch-src_common_atomic.h ============================================================================== --- head/audio/linuxsampler/files/patch-src_common_atomic.h Wed Nov 22 16:40:51 2017 (r454693) +++ head/audio/linuxsampler/files/patch-src_common_atomic.h Wed Nov 22 17:39:01 2017 (r454694) @@ -1,4 +1,4 @@ ---- src/common/atomic.h.orig 2009-03-29 18:43:39 UTC +--- src/common/atomic.h.orig 2009-03-29 18:43:40 UTC +++ src/common/atomic.h @@ -38,7 +38,7 @@ #define CONFIG_SMP /* ... the macro the kernel headers use */ Modified: head/audio/linuxsampler/files/patch-src_drivers_audio_AudioChannel.cpp ============================================================================== --- head/audio/linuxsampler/files/patch-src_drivers_audio_AudioChannel.cpp Wed Nov 22 16:40:51 2017 (r454693) +++ head/audio/linuxsampler/files/patch-src_drivers_audio_AudioChannel.cpp Wed Nov 22 17:39:01 2017 (r454694) @@ -1,4 +1,4 @@ ---- src/drivers/audio/AudioChannel.cpp.orig 2009-07-04 12:13:58 UTC +--- src/drivers/audio/AudioChannel.cpp.orig 2012-10-04 18:16:26 UTC +++ src/drivers/audio/AudioChannel.cpp @@ -26,7 +26,7 @@ #include "../../common/global_private.h" Modified: head/audio/linuxsampler/pkg-plist ============================================================================== --- head/audio/linuxsampler/pkg-plist Wed Nov 22 16:40:51 2017 (r454693) +++ head/audio/linuxsampler/pkg-plist Wed Nov 22 17:39:01 2017 (r454694) @@ -1,7 +1,10 @@ bin/linuxsampler +bin/ls_instr_script +bin/lscp include/linuxsampler/EventListeners.h include/linuxsampler/Sampler.h include/linuxsampler/common/Condition.h +include/linuxsampler/common/ConstCapacityArray.h include/linuxsampler/common/Exception.h include/linuxsampler/common/Mutex.h include/linuxsampler/common/SynchronizedConfig.h @@ -20,6 +23,9 @@ include/linuxsampler/drivers/midi/VirtualMidiDevice.h include/linuxsampler/drivers/midi/midi.h include/linuxsampler/effects/Effect.h include/linuxsampler/effects/EffectChain.h +include/linuxsampler/effects/EffectControl.h +include/linuxsampler/effects/EffectFactory.h +include/linuxsampler/effects/EffectInfo.h include/linuxsampler/engines/Engine.h include/linuxsampler/engines/EngineChannel.h include/linuxsampler/engines/FxSend.h @@ -30,8 +36,8 @@ include/linuxsampler/plugins/InstrumentEditorFactory.h %%DSSI%%lib/dssi/linuxsampler.so lib/linuxsampler/liblinuxsampler.a lib/linuxsampler/liblinuxsampler.so -lib/linuxsampler/liblinuxsampler.so.3 -lib/linuxsampler/liblinuxsampler.so.3.0.0 +lib/linuxsampler/liblinuxsampler.so.4 +lib/linuxsampler/liblinuxsampler.so.4.0.0 lib/linuxsampler/plugins/.keep_me %%LV2%%lib/lv2/linuxsampler.lv2/linuxsampler.a %%LV2%%lib/lv2/linuxsampler.lv2/linuxsampler.so @@ -39,6 +45,7 @@ lib/linuxsampler/plugins/.keep_me %%LV2%%lib/lv2/linuxsampler.lv2/manifest.ttl libdata/pkgconfig/linuxsampler.pc man/man1/linuxsampler.1.gz +man/man1/lscp.1.gz /var/lib/linuxsampler/instruments.db @dir /var/lib/linuxsampler @dir /var/lib Modified: head/audio/qsampler/Makefile ============================================================================== --- head/audio/qsampler/Makefile Wed Nov 22 16:40:51 2017 (r454693) +++ head/audio/qsampler/Makefile Wed Nov 22 17:39:01 2017 (r454694) @@ -3,6 +3,7 @@ PORTNAME= qsampler PORTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF \ http://download.linuxsampler.org/packages/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711221739.vAMHd2o5095571>