From nobody Thu Nov 09 07:07:45 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SQtM60dvTz50MPB; Thu, 9 Nov 2023 07:07:46 +0000 (UTC) (envelope-from git@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 4SQtM60D3vz3D6c; Thu, 9 Nov 2023 07:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699513666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NcDpSFAu2+VIuuoWOvu2VIpBQhAFHmNOVi1XkOvfaLw=; b=oHa9RaKd7WanMAP/Njzl94FPKZydTkM+2k49fz0KnzwZb8zYWq9pcvLaR+FG0+iSI5zX4R PcT/tsnLIAAy7XAiHndE5SidSJA4yPLl6XXSdzyguwbzFGictFNROKNR37pbtGWo8+0q7t Ik1v3l/Be3G6qbuKs19cABam1crWXYJ7uDh8Nqk0L+GfhZfbKDYvQf1JQYJGLVGkdWyJcB npSgTDGTajgVM+ZY2rMwRAW9pDfnYSv6FIpmuCMFLqFQ3W0PZ6QcYbmHziambDLDT1jNAZ hlMnfRq4fWvGdOgCNJic7G5PcRFZmYT3ceSmJ5G3JKxRk5iyKWZSboEjze2+fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699513666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NcDpSFAu2+VIuuoWOvu2VIpBQhAFHmNOVi1XkOvfaLw=; b=YejDtFHyArZlCViwo2Vt4QipOzoPOf5Vv7LeS39uweKPomx0HQER24NuifXGWkmH461yPs DzWhxDLmu2cKWL6g4zW9tiW/YUA1SgtQPfcnLxiqM9QLt0Ub1mLoKaARXUObSRRx2YkSo5 VpdbBvRPTK8uE5fBoXkSl8dFmwKYHY9OGEQqA5zuKRJz9g9KLnmIuf+EgcjACHzh9xPsF+ n4XTnSTcqtBESL4ikuwVVLb74WVlNWSoJwN9Vk8cJRn1lkknQTSG42/yKe/kUTEb8BHq5C jhMCimWBmwEMYYDeKJpK2ihh6uV7Kh+mP2DF6GyAX4jJGo38zNAvs65KsJGyKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699513666; a=rsa-sha256; cv=none; b=Nv4e5jkAIOA+QZF+EDjv/yCtGPobkf64lK5vr8U6TXb/TbxmIr/+AQH9D7+pf12mut/v1E FCyOu/mRk8r15+t6otqkubRt1OrTlesALD6fn5EdlJApFOFnor3bhaxx8SnIEvcGhSdhJS dT9X6GsAa4JyXunvzsoX8/EwpUqCXHza/RGEmD//VOzkB084emUKFHU+VEtlEM0E9YtuYB lmSlSYHZ5BvreVgaQr7pS+v+ASJJREs1qJK166wkEOEHR/G/49onPEytDCQJKwTQyK5caK O2lw5CQvOS1UyQOlpXKxZ/XI2dTL2609Fx/mIgj7RdoYbdaVzDdxbhDhIFGcjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SQtM56Qkzz15mf; Thu, 9 Nov 2023 07:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A977jXF014411; Thu, 9 Nov 2023 07:07:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A977jSa014408; Thu, 9 Nov 2023 07:07:45 GMT (envelope-from git) Date: Thu, 9 Nov 2023 07:07:45 GMT Message-Id: <202311090707.3A977jSa014408@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 83aae14b34d8 - main - audio/guidolib: update 1.7.1 =?utf-8?Q?=E2=86=92?= 1.7.7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83aae14b34d8fadd199b0a8bf7deb6a6b569e68b Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=83aae14b34d8fadd199b0a8bf7deb6a6b569e68b commit 83aae14b34d8fadd199b0a8bf7deb6a6b569e68b Author: Yuri Victorovich AuthorDate: 2023-11-09 07:07:09 +0000 Commit: Yuri Victorovich CommitDate: 2023-11-09 07:07:42 +0000 audio/guidolib: update 1.7.1 → 1.7.7 --- audio/guidolib/Makefile | 10 ++++------ audio/guidolib/distinfo | 6 +++--- audio/guidolib/files/patch-build_CMakeLists.txt | 13 ++----------- .../files/patch-environments_Qt_libs_CMakeLists.txt | 20 ++++++++++++++++++++ audio/guidolib/pkg-plist | 2 +- 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/audio/guidolib/Makefile b/audio/guidolib/Makefile index 2faf190a82c0..87583890e0b4 100644 --- a/audio/guidolib/Makefile +++ b/audio/guidolib/Makefile @@ -1,5 +1,5 @@ PORTNAME= guidolib -PORTVERSION= 1.7.1 # https://guido.grame.fr/dox/api/ has version in the format N.N.N +DISTVERSION= 1.7.7 PORTEPOCH= 1 CATEGORIES= audio graphics print @@ -10,17 +10,15 @@ WWW= https://guido.grame.fr/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= gmake:devel/gmake LIB_DEPENDS= libmidisharelight.so:audio/midisharelight -USES= compiler:c++11-lang gl cmake gnome localbase:ldflags pkgconfig qt:5 xorg -USE_QT= core gui widgets printsupport xml buildtools:build qmake:build -USE_GL= gl +USES= compiler:c++17-lang cmake gnome localbase:ldflags pkgconfig USE_GNOME= cairo USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= grame-cncm -GH_TAGNAME= v${PORTVERSION:S/.//g} CMAKE_SOURCE_PATH= ${WRKSRC}/build @@ -31,7 +29,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES PORTDOCS= * PORTEXAMPLES= * -BINARY_ALIAS= qmake=${QMAKE} +PORTSCOUT= limit:^.*\..* # prevent tags like v171 post-extract: @${RM} -r ${WRKSRC}/src/midisharelight diff --git a/audio/guidolib/distinfo b/audio/guidolib/distinfo index 7449b5e9ed84..fcfbe6570966 100644 --- a/audio/guidolib/distinfo +++ b/audio/guidolib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635175125 -SHA256 (grame-cncm-guidolib-1.7.1-v171_GH0.tar.gz) = b923f012055af06fa28eae0012cf593464ad65070ddd4d26733a3dcfa9f3a32d -SIZE (grame-cncm-guidolib-1.7.1-v171_GH0.tar.gz) = 42459395 +TIMESTAMP = 1699426953 +SHA256 (grame-cncm-guidolib-1.7.7_GH0.tar.gz) = a9e38cd4e1edcb4e8cb36d5f599c788a85d135ca05ac25816b843ea5e549cdd9 +SIZE (grame-cncm-guidolib-1.7.7_GH0.tar.gz) = 42220978 diff --git a/audio/guidolib/files/patch-build_CMakeLists.txt b/audio/guidolib/files/patch-build_CMakeLists.txt index 33c4242291d7..93c714e7cd50 100644 --- a/audio/guidolib/files/patch-build_CMakeLists.txt +++ b/audio/guidolib/files/patch-build_CMakeLists.txt @@ -1,6 +1,6 @@ ---- build/CMakeLists.txt.orig 2021-10-25 09:44:31 UTC +--- build/CMakeLists.txt.orig 2023-11-03 09:52:40 UTC +++ build/CMakeLists.txt -@@ -256,7 +256,7 @@ else() +@@ -257,7 +257,7 @@ else() set (INSTALL_BIN ${CMAKE_INSTALL_PREFIX}/bin) set (INSTALL_LIB ${CMAKE_INSTALL_PREFIX}/lib) set (INSTALL_INC ${CMAKE_INSTALL_PREFIX}/include/guido) @@ -9,12 +9,3 @@ set (INSTALL_APPS ${CMAKE_INSTALL_PREFIX}/bin) set (INSTALL_DOC ${CMAKE_INSTALL_PREFIX}/share/guidolib/doc) set (INSTALL_INTERFACES ${CMAKE_INSTALL_PREFIX}/share/guidolib) -@@ -319,7 +319,7 @@ install ( - DIRECTORY ${GMN} DESTINATION ${INSTALL_SAMPLES} - FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- FILES_MATCHING PATTERN "*.gmn" -+ #FILES_MATCHING PATTERN "*.gmn" # workaround for https://github.com/grame-cncm/guidolib/issues/130 - PATTERN "SheetMusic" EXCLUDE - ) - diff --git a/audio/guidolib/files/patch-environments_Qt_libs_CMakeLists.txt b/audio/guidolib/files/patch-environments_Qt_libs_CMakeLists.txt new file mode 100644 index 000000000000..eb5fe571567e --- /dev/null +++ b/audio/guidolib/files/patch-environments_Qt_libs_CMakeLists.txt @@ -0,0 +1,20 @@ +--- environments/Qt/libs/CMakeLists.txt.orig 2023-11-03 09:52:40 UTC ++++ environments/Qt/libs/CMakeLists.txt +@@ -51,7 +51,7 @@ set (LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}) + + ####################################### + # add GuidoQt +-add_library(${guidoqt} STATIC ${GUIDOQT_SRC} ${GUIDOQT_HEADERS}) ++add_library(${guidoqt} SHARED ${GUIDOQT_SRC} ${GUIDOQT_HEADERS}) + target_include_directories (${guidoqt} PRIVATE ${GUIDOQT_INCLUDE_DIRS}) + if (DEFINED GUIDQOQT_DEFINITIONS) + target_compile_definitions (${guidoqt} PRIVATE ${GUIDQOQT_DEFINITIONS}) +@@ -68,7 +68,7 @@ set_target_properties (${guidoqt} PROPERTIES + #message ("GRAPHICSCENE_SRC ${GRAPHICSCENE_SRC}") + ####################################### + # add GraphicsSceneMainWindow +-add_library(${graphicscene} STATIC ${GRAPHICSCENE_SRC} ${GRAPHICSCENE_HEADERS}) ++add_library(${graphicscene} SHARED ${GRAPHICSCENE_SRC} ${GRAPHICSCENE_HEADERS}) + target_include_directories (${graphicscene} PRIVATE ${GRAPHICSCENE_INCLUDE_DIRS}) + if (DEFINED GRAPHICSCENE_DEFINITIONS) + target_compile_definitions (${graphicscene} PRIVATE ${GRAPHICSCENE_DEFINITIONS}) diff --git a/audio/guidolib/pkg-plist b/audio/guidolib/pkg-plist index d2d174e91a81..630295abaa66 100644 --- a/audio/guidolib/pkg-plist +++ b/audio/guidolib/pkg-plist @@ -43,7 +43,7 @@ include/guido/VGPen.h include/guido/VGSystem.h lib/libGUIDOEngine.so lib/libGUIDOEngine.so.1 -lib/libGUIDOEngine.so.1.7.1 +lib/libGUIDOEngine.so.1.7.7 share/fonts/guidolib/guido2.svg share/fonts/guidolib/guido2.ttf %%DATADIR%%/doc/GMNRefCard.pdf