diff --git a/audio/sooperlooper/Makefile b/audio/sooperlooper/Makefile index 841b1bb9265b..832fab6bd2a4 100644 --- a/audio/sooperlooper/Makefile +++ b/audio/sooperlooper/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sooperlooper -PORTVERSION= 1.7.0 -PORTREVISION= 1 +PORTVERSION= 1.7.2 CATEGORIES= audio MASTER_SITES= http://essej.net/sooperlooper/ @@ -16,7 +15,7 @@ BUILD_DEPENDS= ladspa>0:${PORTSDIR}/audio/ladspa LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack \ liblo.so:${PORTSDIR}/audio/liblo \ libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ - libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12 \ + libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \ libsndfile.so:${PORTSDIR}/audio/libsndfile \ librubberband.so:${PORTSDIR}/audio/rubberband \ libvamp-sdk.so:${PORTSDIR}/audio/vamp-plugin-sdk \ @@ -28,6 +27,7 @@ USE_GNOME= libxml2 GNU_CONFIGURE= yes USE_LDCONFIG= yes +CFLAGS+= -Wno-error=write-strings CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -37,7 +37,7 @@ OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib ALSA_CONFIGURE_ENV_OFF= ac_cv_header_alsa_asoundlib_h=no -WXGTK_USE= WX=2.6+ +WXGTK_USE= WX=3.0 WXGTK_CONFIGURE_ON= --with-wxconfig-path=${WX_CONFIG} WXGTK_CONFIGURE_OFF= --without-gui @@ -51,7 +51,10 @@ DESKTOP_ENTRIES="SooperLooper" "" "${DATADIR}/sl_logo.xpm" "slgui" \ post-patch: @${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|$$OPT_FLAGS||' + 's|$$OPT_FLAGS|$$CXXFLAGS| ; \ + /^CXXFLAGS/s|-g|$$CXXFLAGS| ; \ + s|-fo-merge-constants|| ; \ + s|-lpthread|-pthread|' post-install: .if ${PORT_OPTIONS:MWXGTK} diff --git a/audio/sooperlooper/distinfo b/audio/sooperlooper/distinfo index bde98374508a..30361ec689cc 100644 --- a/audio/sooperlooper/distinfo +++ b/audio/sooperlooper/distinfo @@ -1,2 +1,2 @@ -SHA256 (sooperlooper-1.7.0.tar.gz) = 99a2ed88b270183e090698ee354c484b971c77494547b5520afa6430e0eb571d -SIZE (sooperlooper-1.7.0.tar.gz) = 728999 +SHA256 (sooperlooper-1.7.2.tar.gz) = abf944e818f20f206025ae1e486baed0da3d9343fadba1de0d049651df713192 +SIZE (sooperlooper-1.7.2.tar.gz) = 732109 diff --git a/audio/sooperlooper/files/patch-libs-pbd-ftw.cc b/audio/sooperlooper/files/patch-libs-pbd-ftw.cc index ee873bf92d29..fc00fc0d3882 100644 --- a/audio/sooperlooper/files/patch-libs-pbd-ftw.cc +++ b/audio/sooperlooper/files/patch-libs-pbd-ftw.cc @@ -5,7 +5,7 @@ #include #include -#include -+#include ++#include #include /* We want strcpy */ diff --git a/audio/sooperlooper/files/patch-libs__pbd__pbd__stl_delete.h b/audio/sooperlooper/files/patch-libs__pbd__pbd__stl_delete.h deleted file mode 100644 index 77ed78616582..000000000000 --- a/audio/sooperlooper/files/patch-libs__pbd__pbd__stl_delete.h +++ /dev/null @@ -1,20 +0,0 @@ ---- libs/pbd/pbd/stl_delete.h.orig -+++ libs/pbd/pbd/stl_delete.h -@@ -24,7 +24,7 @@ - /* To actually use any of these deletion functions, you need to - first include the revelant container type header. - */ --#if defined(_CPP_VECTOR) || defined(_GLIBCXX_VECTOR) || defined(__SGI_STL_VECTOR) -+#if defined(_LIBCPP_VECTOR) || defined(_GLIBCXX_VECTOR) || defined(__SGI_STL_VECTOR) - template void vector_delete (std::vector *vec) - { - typename std::vector::iterator i; -@@ -34,7 +34,7 @@ - } - vec->clear (); - } --#endif // _CPP_VECTOR || _GLIBCXX_VECTOR || __SGI_STL_VECTOR -+#endif // _LIBCPP_VECTOR || _GLIBCXX_VECTOR || __SGI_STL_VECTOR - - #if defined(_CPP_MAP) || defined(_GLIBCXX_MAP) || defined(__SGI_STL_MAP) - template void map_delete (std::map *m)