From owner-svn-ports-all@freebsd.org Sun Jul 21 18:06:17 2019 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 90791B9B8C; Sun, 21 Jul 2019 18:06:17 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 73AD98AA92; Sun, 21 Jul 2019 18:06:17 +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 452E627222; Sun, 21 Jul 2019 18:06:17 +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 x6LI6Ht6059200; Sun, 21 Jul 2019 18:06:17 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6LI6Go9059194; Sun, 21 Jul 2019 18:06:16 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201907211806.x6LI6Go9059194@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 21 Jul 2019 18:06:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507059 - in head/audio/polyphone: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/audio/polyphone: . files X-SVN-Commit-Revision: 507059 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 73AD98AA92 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.966,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 21 Jul 2019 18:06:17 -0000 Author: yuri Date: Sun Jul 21 18:06:16 2019 New Revision: 507059 URL: https://svnweb.freebsd.org/changeset/ports/507059 Log: audio/polyphone: 1.9 -> 2.0.1.20190716 * Change to GitHub * Patching in post-patch moved to a static patch under files/ Reported by: repology Added: head/audio/polyphone/files/patch-core_input_sfark_sfarkextractor1.cpp - copied, changed from r507058, head/audio/polyphone/files/patch-sfark_sfarkextractor1.cpp head/audio/polyphone/files/patch-polyphone.pro (contents, props changed) Deleted: head/audio/polyphone/files/patch-sfark_sfarkextractor1.cpp Modified: head/audio/polyphone/Makefile head/audio/polyphone/distinfo Modified: head/audio/polyphone/Makefile ============================================================================== --- head/audio/polyphone/Makefile Sun Jul 21 18:02:35 2019 (r507058) +++ head/audio/polyphone/Makefile Sun Jul 21 18:06:16 2019 (r507059) @@ -1,52 +1,44 @@ # $FreeBSD$ PORTNAME= polyphone -DISTVERSION= 1.9 +DISTVERSION= 2.0.1.20190716 DISTVERSIONSUFFIX= -src -PORTREVISION= 5 CATEGORIES= audio -MASTER_SITES= http://polyphone-soundfonts.com/en/download/file/76-polyphone-1-8-src-zip/latest/download?ae95d968569b61bc77f7b8559a14db4d=1/ -PATCH_SITES= https://github.com/davy7125/polyphone/commit/ -PATCHFILES= 7d3e26b46cb5.patch:-p2 - MAINTAINER= yuri@FreeBSD.org COMMENT= Graphical user interface for editing soundfont (sf2 and sfz) files LICENSE= GPLv3 -LIB_DEPENDS= libjack.so:audio/jack \ +LIB_DEPENDS= libFLAC.so:audio/flac \ + libjack.so:audio/jack \ libogg.so:audio/libogg \ libportaudio.so:audio/portaudio \ librtmidi.so:audio/rtmidi \ libstk.so:audio/stk \ libvorbisfile.so:audio/libvorbis -USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake:outsource qt:5 shared-mime-info zip +USES= compiler:c++11-lang desktop-file-utils gl gnome pkgconfig qmake:outsource qt:5 shared-mime-info ssl +USE_GITHUB= yes +GH_ACCOUNT= davy7125 +GH_TAGNAME= d7459fa USE_GL= gl USE_QT= core concurrent gui network printsupport svg widgets buildtools_build qmake_build +USE_GNOME= glib20 USE_CXXSTD= c++11 QMAKE_ARGS= DEFINES=USE_LOCAL_QCUSTOMPLOT CXXFLAGS+= -D__UNIX_JACK__ -WRKSRC= ${WRKDIR}/trunk +WRKSRC_SUBDIR= sources PLIST_FILES= bin/polyphone \ share/applications/polyphone.desktop \ share/mime/packages/polyphone.xml \ share/pixmaps/polyphone.png -post-patch: - @${REINPLACE_CMD} -e ' \ - s| -mfpmath=387||g; \ - s|/usr/include|${LOCALBASE}/include|g; \ - s| alsa||g; \ - s|ExtraCompiler.commands = $$$${QMAKE_CXX} -fPIC|ExtraCompiler.commands = $$$${QMAKE_CXX} $$(CXXFLAGS) -fPIC|g' \ - ${WRKSRC}/polyphone.pro - do-install: - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/RELEASE/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/ressources/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/resources/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications @${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.xml ${STAGEDIR}${PREFIX}/share/mime/packages Modified: head/audio/polyphone/distinfo ============================================================================== --- head/audio/polyphone/distinfo Sun Jul 21 18:02:35 2019 (r507058) +++ head/audio/polyphone/distinfo Sun Jul 21 18:06:16 2019 (r507059) @@ -1,5 +1,5 @@ -TIMESTAMP = 1535706912 -SHA256 (polyphone-1.9-src.zip) = 2b0ba2887646208ae9953a336adfebe460133cd403e76f7fe795d3071827dfdd -SIZE (polyphone-1.9-src.zip) = 3699516 -SHA256 (7d3e26b46cb5.patch) = 177737f0df2107eb4f7cf8b2e5e2519fa4f0b1500190d7d3a6ab6e479d43f520 -SIZE (7d3e26b46cb5.patch) = 1433 +TIMESTAMP = 1563729073 +SHA256 (davy7125-polyphone-2.0.1.20190716-src-d7459fa_GH0.tar.gz) = 4d1cdd0cc360962081ac88ce96a4f1a53aedbd3d95199d5acc5a7d547eedbfad +SIZE (davy7125-polyphone-2.0.1.20190716-src-d7459fa_GH0.tar.gz) = 1964365 +SHA256 (7d3e26b46cb5.patch) = a53b6008960dc08112120c938f5442b3981474712a3741c9b62da4ab5760cd14 +SIZE (7d3e26b46cb5.patch) = 1435 Copied and modified: head/audio/polyphone/files/patch-core_input_sfark_sfarkextractor1.cpp (from r507058, head/audio/polyphone/files/patch-sfark_sfarkextractor1.cpp) ============================================================================== --- head/audio/polyphone/files/patch-sfark_sfarkextractor1.cpp Sun Jul 21 18:02:35 2019 (r507058, copy source) +++ head/audio/polyphone/files/patch-core_input_sfark_sfarkextractor1.cpp Sun Jul 21 18:06:16 2019 (r507059) @@ -1,11 +1,13 @@ ---- sfark/sfarkextractor1.cpp.orig 2017-08-10 19:26:54 UTC -+++ sfark/sfarkextractor1.cpp -@@ -30,6 +30,8 @@ +--- core/input/sfark/sfarkextractor1.cpp.orig 2019-07-16 14:22:06 UTC ++++ core/input/sfark/sfarkextractor1.cpp +@@ -30,8 +30,8 @@ #include "zlib.h" #include "stdint.h" +-#ifdef Q_OS_MAC +-#include "unistd.h" ++#if defined(Q_OS_MAC) || defined(__FreeBSD__) || defined(__DragonFly__) +#include -+ - static const char * SfArkId = ".sfArk"; + #endif - SfArkExtractor1::SfArkExtractor1(const char * fileName) : AbstractExtractor(), + static const char * SfArkId = ".sfArk"; Added: head/audio/polyphone/files/patch-polyphone.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/polyphone/files/patch-polyphone.pro Sun Jul 21 18:06:16 2019 (r507059) @@ -0,0 +1,45 @@ +--- polyphone.pro.orig 2019-07-16 14:22:06 UTC ++++ polyphone.pro +@@ -65,8 +65,9 @@ win32 { + unix:!macx { + DEFINES += __LINUX_ALSASEQ__ + CONFIG += link_pkgconfig +- PKGCONFIG += alsa jack portaudio-2.0 zlib ogg flac vorbis vorbisfile vorbisenc glib-2.0 openssl +- INCLUDEPATH += /usr/include/jack \ ++ PKGCONFIG += jack portaudio-2.0 zlib ogg flac vorbis vorbisfile vorbisenc glib-2.0 ++ LIBS += -lssl -lcrypto # on FreeBSD /etc/make.conf defines which ssl library is used ++ INCLUDEPATH += $$PREFIX/include/jack \ + lib/flac + isEmpty(PREFIX) { + PREFIX = /usr/local +@@ -125,7 +126,7 @@ contains(DEFINES, USE_LOCAL_STK) { + INCLUDEPATH += lib/stk + } else { + LIBS += -lstk +- INCLUDEPATH += /usr/include/stk ++ INCLUDEPATH += $$PREFIX/include/stk + } + + # Location of QCustomplot +@@ -135,7 +136,7 @@ contains(DEFINES, USE_LOCAL_QCUSTOMPLOT) { + INCLUDEPATH += lib/qcustomplot + } else { + LIBS += -lqcustomplot +- INCLUDEPATH += /usr/include/qcustomplot ++ INCLUDEPATH += $$PREFIX/include/qcustomplot + } + + INCLUDEPATH += mainwindow \ +@@ -862,10 +863,10 @@ win32 { + ExtraCompiler.commands = $${QMAKE_CXX} -D__LITTLE_ENDIAN__ -MD -arch:IA32 -D_CRT_SECURE_NO_WARNINGS $(INCPATH) -c ${QMAKE_FILE_IN} -Fo${QMAKE_FILE_OUT} + } + macx { +- ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -D__LITTLE_ENDIAN__ -mno-sse -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} ++ ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -D__LITTLE_ENDIAN__ -mno-sse $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + } + unix:!macx { +- ExtraCompiler.commands = $${QMAKE_CXX} -fPIC -D__LITTLE_ENDIAN__ -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} ++ ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -fPIC -D__LITTLE_ENDIAN__ $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + } + QMAKE_EXTRA_COMPILERS += ExtraCompiler +