Index: head/audio/ardour6/files/patch-wscript =================================================================== --- head/audio/ardour6/files/patch-wscript (revision 552097) +++ head/audio/ardour6/files/patch-wscript (nonexistent) @@ -1,25 +0,0 @@ ---- wscript.orig 2020-07-08 18:34:29 UTC -+++ wscript -@@ -502,7 +502,7 @@ int main() { return 0; }''', - c_flags.append("-Qunused-arguments") - cxx_flags.append("-Qunused-arguments") - -- if (re.search ("(i[0-9]86|x86_64|AMD64)", cpu) != None) and conf.env['build_target'] != 'none': -+ if (re.search ("(i[0-9]86|x86_64|amd64|AMD64)", cpu) != None) and conf.env['build_target'] != 'none': - - # - # ARCH_X86 means anything in the x86 family from i386 to x86_64 -@@ -534,6 +534,13 @@ int main() { return 0; }''', - compiler_flags.append ("-march=i586") - elif cpu == "i686": - compiler_flags.append ("-march=i686") -+ -+ else : -+ # and cpu == 'amd64' : -+ # this is 20yo tech and present in all 64bit cpus -+ build_host_supports_sse = True -+ compiler_flags.append ("-mmmx") -+ compiler_flags.append ("-m3dnow") - - if not is_clang and ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse: - compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'] ]) Property changes on: head/audio/ardour6/files/patch-wscript ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/ardour6/Makefile =================================================================== --- head/audio/ardour6/Makefile (revision 552097) +++ head/audio/ardour6/Makefile (revision 552098) @@ -1,119 +1,121 @@ # Created by: Michael Beer # $FreeBSD$ PORTNAME= ardour6 PORTVERSION= 6.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= https://github.com/beerml/ardour_releases/raw/master/ # The original master side points to the latest release only: # MASTER_SITES= https://community.ardour.org/srctar/ DISTNAME= Ardour-${PORTVERSION} MAINTAINER= beerml@sigma6audio.de COMMENT= Multichannel digital audio workstation LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_aarch64= fails to configure: Could not find the program gas,as,gcc BUILD_DEPENDS= lv2>=1.18.0:audio/lv2 \ itstool>2.0.0:textproc/itstool LIB_DEPENDS= libserd-0.so:devel/serd \ libsord-0.so:devel/sord \ libsratom-0.so:audio/sratom \ liblilv-0.so:audio/lilv \ libsuil-0.so:audio/suil \ libaubio.so:audio/aubio \ librubberband.so:audio/rubberband \ liblo.so:audio/liblo \ liblrdf.so:textproc/liblrdf \ libjack.so:audio/jack \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libboost_date_time.so:devel/boost-libs \ libvamp-hostsdk.so:audio/vamp-plugin-sdk \ libsamplerate.so:audio/libsamplerate \ libsndfile.so:audio/libsndfile \ libtag.so:audio/taglib \ libfftw3f.so:math/fftw3-float \ libcurl.so:ftp/curl \ libogg.so:audio/libogg \ libFLAC.so:audio/flac \ + libSoundTouch.so:audio/soundtouch \ libwebsockets.so:net/libwebsockets USES= compiler:c++11-lang desktop-file-utils gettext gnome \ libarchive pkgconfig python:3.7,build readline:port tar:bzip2 \ waf xorg USE_CXXSTD= c++11 USE_XORG= x11 USE_GNOME= atk cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 pango USE_LDCONFIG= yes INSTALLS_ICONS= yes BINARY_ALIAS+= gas=${CC} PLIST_SUB= ARDOURVERSION=${PORTVERSION} CONFIGURE_ARGS= --optimize --ptformat --freedesktop --no-phone-home \ --with-backends=jack,dummy --internal-shared-libs post-patch: @${REINPLACE_CMD} -e 's/obj\.use = '\''libsmf libpbd'\''/obj\.use = '\''libsmf_internal libpbd'\''/g' ${WRKSRC}/libs/evoral/wscript @${REINPLACE_CMD} -e 's/libsmf\.name = '\''libsmf'\''/libsmf\.name = '\''libsmf_internal'\''/g' ${WRKSRC}/libs/evoral/wscript @${REINPLACE_CMD} -e 's/libsmf\.target = '\''smf'\''/libsmf\.target = '\''smf_internal'\''/g' ${WRKSRC}/libs/evoral/wscript post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata @${MKDIR} ${STAGEDIR}${PREFIX}/share/applications @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/22x22/apps @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps @${CP} ${WRKSRC}/build/gtk2_ardour/${PORTNAME}.appdata.xml \ ${STAGEDIR}${PREFIX}/share/appdata/${PORTNAME}.appdata.xml @${CP} ${WRKSRC}/build/gtk2_ardour/${PORTNAME}.desktop \ ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop @${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_16px.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/${PORTNAME}.png @${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_22px.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/22x22/apps/${PORTNAME}.png @${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_32px.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png @${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_48px.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png @${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_256px.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/${PORTNAME}.png @${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_512px.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/${PORTNAME}.png @${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} \ -name '*.so*' -exec ${STRIP_CMD} {} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/sanityCheck @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-copy-mixer @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-export @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-fix_bbtppq @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-new_empty_session @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-new_session @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ardour-exec-wrapper @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ardour-vst-scanner @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ardour-${PORTVERSION} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/hardour-${PORTVERSION} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/luasession .include .if ${ARCH} == "i386" -WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse' --dist-target=i386 +# only support for i686 or better +WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse -march=i686 -DARCH_X86' --dist-target=i686 .elif ${ARCH} == "amd64" -WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse' --dist-target=x86_64 +WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse -DARCH_X86' --dist-target=x86_64 .elif ${ARCH:Mpowerpc*} LLD_UNSAFE= yes .endif .if defined(WITH_ARCH_FLAGS) CONFIGURE_ARGS+= ${WITH_ARCH_FLAGS} .endif .include