Date: Fri, 26 Jan 2018 22:16:11 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460055 - in head: audio/ardour audio/ardour/files devel/guikachu Message-ID: <201801262216.w0QMGBJN035998@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Jan 26 22:16:11 2018 New Revision: 460055 URL: https://svnweb.freebsd.org/changeset/ports/460055 Log: Attempt to unbreak and undeprecate (chase libsigc++20 update) Modified: head/audio/ardour/Makefile head/audio/ardour/files/patch-SConstruct head/devel/guikachu/Makefile Modified: head/audio/ardour/Makefile ============================================================================== --- head/audio/ardour/Makefile Fri Jan 26 21:56:10 2018 (r460054) +++ head/audio/ardour/Makefile Fri Jan 26 22:16:11 2018 (r460055) @@ -13,10 +13,6 @@ COMMENT= Multichannel digital audio workstation LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2018-01-27 - LIB_DEPENDS= liblo.so:audio/liblo \ liblrdf.so:textproc/liblrdf \ libjack.so:audio/jack \ @@ -73,6 +69,17 @@ post-patch: @${REINPLACE_CMD} -e 's|alsa_pcm|oss|g' ${WRKSRC}/templates/*.template @${REINPLACE_CMD} -e 's|std::pair<double|std::pair<const double|' \ ${WRKSRC}/gtk2_ardour/tempo_lines.h + @${REINPLACE_CMD} -e '/sigc++\/class_slot\.h/d' \ + ${WRKSRC}/libs/ardour/audioregion.cc \ + ${WRKSRC}/libs/ardour/region.cc + @${REINPLACE_CMD} -e 's|time_t|& *|' \ + ${WRKSRC}/libs/ardour/audiosource.cc + @${REINPLACE_CMD} -e '/sigc++\/retype\.h/d' \ + ${WRKSRC}/libs/ardour/audio_track.cc \ + ${WRKSRC}/gtk2_ardour/editor_markers.cc \ + ${WRKSRC}/libs/ardour/session.cc \ + ${WRKSRC}/libs/ardour/session_transport.cc \ + ${WRKSRC}/libs/ardour/track.cc post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/ardour2/templates Modified: head/audio/ardour/files/patch-SConstruct ============================================================================== --- head/audio/ardour/files/patch-SConstruct Fri Jan 26 21:56:10 2018 (r460054) +++ head/audio/ardour/files/patch-SConstruct Fri Jan 26 22:16:11 2018 (r460055) @@ -1,4 +1,4 @@ ---- SConstruct.orig +--- SConstruct.orig 2012-12-02 19:19:45 UTC +++ SConstruct @@ -784,10 +784,7 @@ if env['FPU_OPTIMIZATION']: # handle x86/x86_64 libdir properly @@ -27,15 +27,24 @@ if env['DEBUG'] == 1: env.Append(CCFLAGS=" ".join (debug_flags)) -@@ -954,6 +945,7 @@ conf.Finish() +@@ -866,7 +857,7 @@ if env['UNIVERSAL'] == 1: + # + env.Append(CCFLAGS="-Wall") +-env.Append(CXXFLAGS="-Woverloaded-virtual") ++env.Append(CXXFLAGS="-Woverloaded-virtual -std=c++11") + + if env['EXTRA_WARN']: + env.Append(CCFLAGS="-Wextra -pedantic -ansi") +@@ -955,6 +946,7 @@ conf.Finish() + libraries['usb'] = LibraryInfo () prep_libcheck(env, libraries['usb']) +libraries['usb'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib") conf = Configure (libraries['usb']) if conf.CheckLib ('usb', 'usb_interrupt_write'): -@@ -1005,6 +997,7 @@ libraries['boost'] = conf.Finish () +@@ -1006,6 +998,7 @@ libraries['boost'] = conf.Finish () libraries['dmalloc'] = LibraryInfo () prep_libcheck(env, libraries['dmalloc']) @@ -43,7 +52,7 @@ # # look for the threaded version -@@ -1062,8 +1055,10 @@ elif conf.CheckCHeader('/System/Library/ +@@ -1063,8 +1056,10 @@ elif conf.CheckCHeader('/System/Library/Frameworks/Cor subst_dict['%MIDITAG%'] = "ardour" subst_dict['%MIDITYPE%'] = "coremidi" else: @@ -56,7 +65,7 @@ pname = env['PROGRAM_NAME'] subst_dict['%MIDI_DEVICE_NAME%'] = pname.lower() -@@ -1349,8 +1344,8 @@ if conf.CheckCHeader('/System/Library/Fr +@@ -1352,8 +1347,8 @@ if conf.CheckCHeader('/System/Library/Frameworks/CoreA subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in" subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out" else: Modified: head/devel/guikachu/Makefile ============================================================================== --- head/devel/guikachu/Makefile Fri Jan 26 21:56:10 2018 (r460054) +++ head/devel/guikachu/Makefile Fri Jan 26 22:16:11 2018 (r460055) @@ -9,16 +9,14 @@ CATEGORIES= devel palm gnome MASTER_SITES= http://cactus.rulez.org/projects/guikachu/download/ MAINTAINER= ports@FreeBSD.org -COMMENT= Resource editor for PalmOS(tm) systems +COMMENT= Resource editor for PalmOS systems LIB_DEPENDS= libgnomeuimm-2.6.so:x11-toolkits/libgnomeuimm26 \ libgnomevfsmm-2.6.so:devel/gnome-vfsmm -BROKEN= fails to build: ustring.h: expected ';' at end of declaration list -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2018-01-27 - -USES= gmake pathfix pkgconfig shared-mime-info desktop-file-utils +USES= compiler:c++11-lang gmake pathfix pkgconfig \ + shared-mime-info desktop-file-utils +USE_CXXSTD= c++11 USE_GNOME= gnomeprefix intlhack libgnomeui GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_UPDATE_MIME="no"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801262216.w0QMGBJN035998>