From owner-svn-ports-all@freebsd.org Fri Mar 26 08:42:58 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A89045B7BBB; Fri, 26 Mar 2021 08:42:58 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F6Fq64PTQz3vNB; Fri, 26 Mar 2021 08:42:58 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 89FBF172B2; Fri, 26 Mar 2021 08:42:58 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12Q8gw1L006603; Fri, 26 Mar 2021 08:42:58 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12Q8gvJp006600; Fri, 26 Mar 2021 08:42:57 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202103260842.12Q8gvJp006600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Fri, 26 Mar 2021 08:42:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569249 - head/devel/juce X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/devel/juce X-SVN-Commit-Revision: 569249 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2021 08:42:58 -0000 Author: yuri Date: Fri Mar 26 08:42:57 2021 New Revision: 569249 URL: https://svnweb.freebsd.org/changeset/ports/569249 Log: devel/juce: Add more BSD patches; Add DEMOS option Modified: head/devel/juce/Makefile head/devel/juce/distinfo head/devel/juce/pkg-message Modified: head/devel/juce/Makefile ============================================================================== --- head/devel/juce/Makefile Fri Mar 26 08:15:42 2021 (r569248) +++ head/devel/juce/Makefile Fri Mar 26 08:42:57 2021 (r569249) @@ -2,6 +2,7 @@ PORTNAME= juce DISTVERSION= 6.0.8 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -22,11 +23,11 @@ USE_GL= gl USE_XORG= x11 xcomposite xcursor xext xinerama xorgproto xrandr USE_GITHUB= yes -GH_ACCOUNT= yurivict # juce-framework +GH_ACCOUNT= yurivict # juce-framework + BSD patches GH_PROJECT= JUCE -GH_TAGNAME= 107cc92 +GH_TAGNAME= f37e9a1 -CMAKE_ON= JUCE_BUILD_EXTRAS # JUCE_BUILD_EXAMPLES +CMAKE_ON= JUCE_BUILD_EXTRAS CXXFLAGS+= -I${LOCALBASE}/include/freetype2 LDFLAGS+= -pthread -lfreetype @@ -34,18 +35,38 @@ LDFLAGS+= -lGL # while building NetworkGraphicsDemo ld LDFLAGS+= -lasound # while building AudioPerformanceTest ld: error: undefined symbol: snd_seq_system_info_sizeof LDFLAGS+= -lsysinfo # while building Projucer ld: error: undefined symbol: sysinfo -CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lsysinfo -lexecinfo" # for the step 'Building juceaide' during configure phase: https://github.com/juce-framework/JUCE/issues/877 +CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lexecinfo" # for the step 'Building juceaide' during configure phase: https://github.com/juce-framework/JUCE/issues/877 PLIST_SUB+= VERSION=${PORTVERSION} +OPTIONS_DEFINE= DEMOS + +DEMOS_DESC= Build and install demo programs +DEMOS_USES= gnome pkgconfig +DEMOS_CMAKE_BOOL= JUCE_BUILD_EXAMPLES +DEMOS_LDFLAGS= -lexecinfo +DEMOS_USE= GNOME=atk,cairo,gdkpixbuf2,gtk30,pango +DEMOS_LIB_DEPENDS= libcurl.so:ftp/curl \ + libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ + libsoup-2.4.so:devel/libsoup +DEMO_FILES= \ + AnalyticsCollectionDemo AnimationAppDemo AnimationDemo AudioAppDemo AudioLatencyDemo AudioPlaybackDemo AudioPluginDemo AudioRecordingDemo AudioSettingsDemo AudioSynthesiserDemo \ + BlocksDrawingDemo BlocksMonitorDemo BlocksSynthDemo BouncingBallWavetableDemo Box2DDemo ChildProcessDemo CodeEditorDemo ComponentDemo ComponentTransformsDemo ConvolutionDemo \ + CryptographyDemo DSPModulePluginDemo DialogsDemo FIRFilterDemo FlexBoxDemo FontsDemo GainDemo GraphicsDemo GridDemo HelloWorldDemo \ + IIRFilterDemo ImagesDemo InAppPurchasesDemo JavaScriptDemo KeyMappingsDemo LiveConstantDemo LookAndFeelDemo MDIDemo MPEDemo MenusDemo \ + MidiDemo MultiTouchDemo MultithreadingDemo NetworkingDemo OSCDemo OpenGLAppDemo OpenGLDemo OscillatorDemo OverdriveDemo PluckedStringsDemo \ + PropertiesDemo SIMDRegisterDemo SimpleFFTDemo StateVariableFilterDemo SystemInfoDemo TimersAndEventsDemo UnitTestsDemo ValueTreesDemo WaveShaperTanhDemo WebBrowserDemo \ + WidgetsDemo WindowsDemo XMLandJSONDemo +DEMOS_PLIST_FILES= ${DEMO_FILES:S/^/bin\/${PORTNAME}-/} + post-patch: # fix fonts.conf path - @${REINPLACE_CMD} -e ' \ + @${REINPLACE_CMD} -i '' -e ' \ s|"/etc/fonts/fonts.conf"|"${PREFIX}/etc/fonts/fonts.conf"| ; \ s|"/usr/share/fonts/fonts.conf"|"${PREFIX}/share/fonts/fonts.conf"| \ ' ${WRKSRC}/modules/juce_graphics/native/juce_linux_Fonts.cpp # fix JUCE modules path (but it still complains about the path) - @${REINPLACE_CMD} -e ' \ + @${REINPLACE_CMD} -i '' -e ' \ s|"~/JUCE|"${PREFIX}/include/JUCE-${PORTVERSION}| \ ' ${WRKSRC}/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp @@ -57,5 +78,10 @@ post-install: # fix path and strip juceaide cd ${STAGEDIR}${PREFIX} && ${MV} bin/JUCE-${PORTVERSION}/juceaide bin/ && ${RMDIR} bin/JUCE-${PORTVERSION} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/juceaide + +do-install-DEMOS-on: +.for e in ${DEMO_FILES} + ${INSTALL_PROGRAM} `${FIND} ${BUILD_WRKSRC} -name ${e}` ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${e} +.endfor .include Modified: head/devel/juce/distinfo ============================================================================== --- head/devel/juce/distinfo Fri Mar 26 08:15:42 2021 (r569248) +++ head/devel/juce/distinfo Fri Mar 26 08:42:57 2021 (r569249) @@ -1,3 +1,3 @@ -TIMESTAMP = 1616695479 -SHA256 (yurivict-JUCE-6.0.8-107cc92_GH0.tar.gz) = c2701575857b7ef96898b20811801cb3144d2d7fba89babba888bf7497b4c055 -SIZE (yurivict-JUCE-6.0.8-107cc92_GH0.tar.gz) = 14055294 +TIMESTAMP = 1616748092 +SHA256 (yurivict-JUCE-6.0.8-f37e9a1_GH0.tar.gz) = fb29c3d96d94234898fb0c0881a17e7ecb869e77cfdd8b561e63412cd5346b89 +SIZE (yurivict-JUCE-6.0.8-f37e9a1_GH0.tar.gz) = 14055337 Modified: head/devel/juce/pkg-message ============================================================================== --- head/devel/juce/pkg-message Fri Mar 26 08:15:42 2021 (r569248) +++ head/devel/juce/pkg-message Fri Mar 26 08:42:57 2021 (r569249) @@ -1,7 +1,7 @@ [ { type: install message: <