diff --git a/audio/guidolib/Makefile b/audio/guidolib/Makefile index 2faf190a82c0..87583890e0b4 100644 --- a/audio/guidolib/Makefile +++ b/audio/guidolib/Makefile @@ -1,48 +1,46 @@ 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 MAINTAINER= yuri@FreeBSD.org COMMENT= Library for graphic rendering of music scores 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 LDFLAGS+= -lmidisharelight OPTIONS_DEFINE= DOCS EXAMPLES PORTDOCS= * PORTEXAMPLES= * -BINARY_ALIAS= qmake=${QMAKE} +PORTSCOUT= limit:^.*\..* # prevent tags like v171 post-extract: @${RM} -r ${WRKSRC}/src/midisharelight post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libGUIDOEngine.so.* ${RM} -r ${STAGEDIR}${DATADIR}/python do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/package/doc/*.pdf ${STAGEDIR}${DOCSDIR} ${CP} -r ${WRKSRC}/package/doc/html ${STAGEDIR}${DOCSDIR} .include 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,20 +1,11 @@ ---- 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) - set (INSTALL_SAMPLES ${CMAKE_INSTALL_PREFIX}/share/guidolib/examples) + set (INSTALL_SAMPLES share/examples/guidolib) 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 @@ -1,100 +1,100 @@ bin/guido2abstract bin/guido2midi bin/guido2proll bin/guido2rproportional bin/guido2svg bin/guido2svgmap bin/guidoar2gr bin/guidodraw bin/guidogetmeters bin/guidogetpagecount bin/guidogetpagemap bin/guidogetstaffmap bin/guidogetsystemmap bin/guidogettempi bin/guidogettimemap bin/guidogetversion bin/guidogetvoicecount bin/guidogetvoicemap bin/guidoparse bin/midi2proll include/guido/CairoDevice.h include/guido/CairoFont.h include/guido/CairoSystem.h include/guido/Colors.h include/guido/GUIDO2Midi.h include/guido/GUIDOEngine.h include/guido/GUIDOEngineAdapter.h include/guido/GUIDOExport.h include/guido/GUIDOFactory.h include/guido/GUIDOFactoryAdapter.h include/guido/GUIDOParse.h include/guido/GUIDOPianoRoll.h include/guido/GUIDOPianoRollAdapter.h include/guido/GUIDOReducedProportional.h include/guido/GUIDOReducedProportionalAdapter.h include/guido/GUIDOScoreMap.h include/guido/GUIDOScoreMapAdapter.h include/guido/TRect.h include/guido/VGColor.h include/guido/VGDevice.h include/guido/VGFont.h 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 %%DATADIR%%/doc/GUIDO-Music-Notation-Format.pdf %%DATADIR%%/doc/GUIDO_Additional_Specifications_1.3.8.pdf %%DATADIR%%/doc/GUIDO_Additional_Specifications_1.5.1.pdf %%DATADIR%%/doc/GUIDO_Additional_Specifications_1.5.2.pdf %%DATADIR%%/doc/GUIDO_Additional_Specifications_1.5.4.pdf %%DATADIR%%/doc/RefCardsParams.pdf %%DATADIR%%/doc/RefCardsTags.pdf %%DATADIR%%/doc/html/GUIDO-Music-Notation-Format.html %%DATADIR%%/doc/html/GUIDO_Additional_Specifications_1.3.8.html %%DATADIR%%/doc/html/GUIDO_Additional_Specifications_1.5.1.html %%DATADIR%%/doc/html/GUIDO_Additional_Specifications_1.5.2.html %%DATADIR%%/doc/html/GUIDO_Additional_Specifications_1.5.4.html %%DATADIR%%/doc/html/guido.gif %%DATADIR%%/doc/html/imgs/accelRit.png %%DATADIR%%/doc/html/imgs/accol.png %%DATADIR%%/doc/html/imgs/bar1.PNG %%DATADIR%%/doc/html/imgs/bar2.PNG %%DATADIR%%/doc/html/imgs/cluster.jpg %%DATADIR%%/doc/html/imgs/combinedBeams.jpg %%DATADIR%%/doc/html/imgs/crescendo.png %%DATADIR%%/doc/html/imgs/decrescendo.png %%DATADIR%%/doc/html/imgs/fBeam1.jpg %%DATADIR%%/doc/html/imgs/fBeam2.jpg %%DATADIR%%/doc/html/imgs/fermata.jpg %%DATADIR%%/doc/html/imgs/glissandoAccidentals.jpg %%DATADIR%%/doc/html/imgs/glissandoChords.jpg %%DATADIR%%/doc/html/imgs/glissandoNoteFormat.jpg %%DATADIR%%/doc/html/imgs/harmonic.jpg %%DATADIR%%/doc/html/imgs/marcato.png %%DATADIR%%/doc/html/imgs/meter1.png %%DATADIR%%/doc/html/imgs/meter2.png %%DATADIR%%/doc/html/imgs/meter3.png %%DATADIR%%/doc/html/imgs/mordent.jpg %%DATADIR%%/doc/html/imgs/noteFormat.jpg %%DATADIR%%/doc/html/imgs/noteFormat2.jpg %%DATADIR%%/doc/html/imgs/pizz.jpg %%DATADIR%%/doc/html/imgs/staccato.jpg %%DATADIR%%/doc/html/imgs/staffFormat1.PNG %%DATADIR%%/doc/html/imgs/staffFormat2.PNG %%DATADIR%%/doc/html/imgs/staffFormat3.PNG %%DATADIR%%/doc/html/imgs/staffOff.jpg %%DATADIR%%/doc/html/imgs/staffOff2.jpg %%DATADIR%%/doc/html/imgs/symbol1.jpg %%DATADIR%%/doc/html/imgs/symbol2.png %%DATADIR%%/doc/html/imgs/trill.jpg %%DATADIR%%/doc/html/imgs/trillAnchorAndTr.jpg %%DATADIR%%/doc/html/imgs/trillAndTies.jpg %%DATADIR%%/doc/html/imgs/tuplet1.png %%DATADIR%%/doc/html/imgs/tuplet2.png %%DATADIR%%/doc/html/imgs/turn.jpg %%DATADIR%%/doc/readme.md