diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile index 7d9b6de21829..acb49a388e89 100644 --- a/audio/gogglesmm/Makefile +++ b/audio/gogglesmm/Makefile @@ -1,110 +1,93 @@ PORTNAME= gogglesmm -PORTVERSION= 1.2.5 -PORTREVISION= 8 +DISTVERSION= 1.3.1 CATEGORIES= audio +MASTER_SITES= https://github.com/gogglesmm/gogglesmm/releases/download/${DISTVERSION}/ +DISTNAME= ${PORTNAME}-full-${DISTVERSION} MAINTAINER= jhale@FreeBSD.org COMMENT= Music collection manager and player WWW= https://gogglesmm.github.io/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_powerpc64= fails to compile: ap_mad.cpp:358:2: \#error fixme - LIB_DEPENDS= libtag.so:audio/taglib \ libexpat.so:textproc/expat2 \ libFOX-1.7.so:x11-toolkits/fox17 USES= cmake compiler:c++11-lib desktop-file-utils gnome \ - localbase:ldflags pkgconfig sqlite xorg -USE_GITHUB= yes -USE_XORG= ice sm x11 + pkgconfig sqlite xorg +USE_XORG= ice sm x11 xext -CMAKE_OFF= WITH_CFOX +CMAKE_ON= FOX_USE_EXTERNAL \ + WITH_ZLIB PORTDOCS= AUTHORS ChangeLog README OPTIONS_DEFINE= A52 ALSA DBUS DCA DOCS FAAD FLAC MAD NLS \ - OGG OPENGL OPUS PULSEAUDIO SNDIO ZLIB -OPTIONS_RADIO= SSL VORBISDEC -OPTIONS_RADIO_SSL= GCRYPT GNUTLS OPENSSL -VORBISDEC_DESC= Vorbis decoder library -OPTIONS_RADIO_VORBISDEC= TREMOR VORBIS -OPTIONS_DEFAULT= DBUS FAAD FLAC MAD OGG OPENGL OPENSSL OPUS VORBIS ZLIB + OGG OPENGL OPUS PULSEAUDIO SNDIO VORBIS +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= GNUTLS OPENSSL +OPTIONS_DEFAULT= DBUS FAAD FLAC MAD OGG OPENGL OPENSSL OPUS VORBIS OPTIONS_SUB= yes A52_LIB_DEPENDS= liba52.so:audio/liba52 A52_CMAKE_BOOL= WITH_A52 ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= WITH_ALSA DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CMAKE_BOOL= WITH_DBUS DCA_LIB_DEPENDS= libdca.so:multimedia/libdca DCA_CMAKE_BOOL= WITH_DCA FAAD_LIB_DEPENDS= libfaad.so:audio/faad FAAD_CMAKE_BOOL= WITH_FAAD FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CMAKE_BOOL= WITH_FLAC FLAC_IMPLIES= OGG -GCRYPT_DESC= MD5 calculation via libgcrypt (no https) -GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt -GCRYPT_CMAKE_BOOL= WITH_GCRYPT - GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CMAKE_BOOL= WITH_GNUTLS MAD_LIB_DEPENDS= libmad.so:audio/libmad MAD_CMAKE_BOOL= WITH_MAD NLS_USES= gettext NLS_CMAKE_BOOL= WITH_NLS OGG_LIB_DEPENDS= libogg.so:audio/libogg OGG_CMAKE_BOOL= WITH_OGG OPENGL_LIB_DEPENDS= libepoxy.so:graphics/libepoxy OPENGL_USES= gl OPENGL_USE= GL=opengl,glu OPENGL_CMAKE_BOOL= WITH_OPENGL OPENSSL_USES= ssl OPENSSL_CMAKE_BOOL= WITH_OPENSSL OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CMAKE_BOOL= WITH_OPUS OPUS_IMPLIES= OGG PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= WITH_PULSE SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CMAKE_BOOL= WITH_SNDIO -TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor -TREMOR_CMAKE_BOOL= WITH_TREMOR -TREMOR_IMPLIES= OGG - VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis VORBIS_CMAKE_BOOL= WITH_VORBIS VORBIS_IMPLIES= OGG -ZLIB_CMAKE_BOOL= WITH_ZLIB - .include -.if ${PORT_OPTIONS:MOGG} && !${PORT_OPTIONS:MTREMOR} && !${PORT_OPTIONS:MVORBIS} -IGNORE= you have selected an option that requires a Vorbis decoder. Run 'make config' and select one -.endif - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include diff --git a/audio/gogglesmm/distinfo b/audio/gogglesmm/distinfo index 816403a48143..99ca51ec2f65 100644 --- a/audio/gogglesmm/distinfo +++ b/audio/gogglesmm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707004496 -SHA256 (gogglesmm-gogglesmm-1.2.5_GH0.tar.gz) = fb6a33457a815ad650a81f7bad5233f983647977e401c57c6d396f0de4414283 -SIZE (gogglesmm-gogglesmm-1.2.5_GH0.tar.gz) = 3174015 +TIMESTAMP = 1786851519 +SHA256 (gogglesmm-full-1.3.1.tar.gz) = 375053cd1c32c13c3e05c71a619465966b6bc825c68a3f2a25384ee2c74c3665 +SIZE (gogglesmm-full-1.3.1.tar.gz) = 3330940 diff --git a/audio/gogglesmm/files/patch-CMakeLists.txt b/audio/gogglesmm/files/patch-CMakeLists.txt deleted file mode 100644 index 6ca5cb382909..000000000000 --- a/audio/gogglesmm/files/patch-CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- CMakeLists.txt.orig 2023-04-23 15:13:49 UTC -+++ CMakeLists.txt -@@ -69,6 +69,11 @@ endif() - add_compile_options(-Og) - endif() - -+CHECK_CXX_COMPILER_FLAG(-Wno-inconsistent-missing-override HAS_CXX_NOOVERRIDE) -+if(HAS_CXX_NOOVERRIDE AND NOT CMAKE_BUILD_TYPE MATCHES Debug) -+ add_compile_options(-Wno-inconsistent-missing-override) -+endif() -+ - # FIXME Doesn't work on all platforms. - #CHECK_CXX_COMPILER_FLAG(-flto HAS_CXX_OPTIMIZE_LINKTIME) - if(HAS_CXX_OPTIMIZE_LINKTIME AND NOT CMAKE_BUILD_TYPE MATCHES Debug) diff --git a/audio/gogglesmm/files/patch-cmake_FindFox.cmake b/audio/gogglesmm/files/patch-cmake_FindFox.cmake new file mode 100644 index 000000000000..dd73c803f018 --- /dev/null +++ b/audio/gogglesmm/files/patch-cmake_FindFox.cmake @@ -0,0 +1,13 @@ +FreeBSD installs reswrap as ${LOCALBASE}/fox-1.7/reswrap + +--- cmake/FindFox.cmake.orig 2026-07-27 00:47:06 UTC ++++ cmake/FindFox.cmake +@@ -153,7 +153,7 @@ if(FOX_USE_EXTERNAL) + find_program(FOX_RESWRAP + NAMES reswrap reswrap-1.7 reswrap-1.6 + HINTS ${FOX_PREFIX}/bin +- PATH_SUFFIXES bin ++ PATH_SUFFIXES bin fox-1.7 + ) + + if(FOX_RESWRAP) diff --git a/audio/gogglesmm/files/patch-gap_CMakeLists.txt b/audio/gogglesmm/files/patch-gap_CMakeLists.txt deleted file mode 100644 index d295beae7774..000000000000 --- a/audio/gogglesmm/files/patch-gap_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- gap/CMakeLists.txt.orig 2020-12-27 21:40:54 UTC -+++ gap/CMakeLists.txt -@@ -242,7 +242,7 @@ else() - endif() - - if(WITH_OPENSSL) -- pkg_check_modules(OPENSSL openssl>=1.0.1) -+ find_package(OpenSSL 1.0.1) - elseif(WITH_GNUTLS) - pkg_check_modules(GNUTLS gnutls>=3.4.0) - elseif(WITH_GCRYPT) diff --git a/audio/gogglesmm/files/patch-src_CMakeLists.txt b/audio/gogglesmm/files/patch-src_CMakeLists.txt deleted file mode 100644 index 4cbca02111dd..000000000000 --- a/audio/gogglesmm/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ ---- src/CMakeLists.txt.orig 2023-04-23 15:13:49 UTC -+++ src/CMakeLists.txt -@@ -71,7 +71,7 @@ else() - set(RESWRAP_CPP ${RESWRAP} --keep-ext --source --extern) - set(RESWRAP_TEXT ${RESWRAP} --keep-ext -t) - else() -- find_program(RESWRAP NAMES reswrap-1.7 reswrap fox-reswrap) -+ find_program(RESWRAP NAMES reswrap-1.7 reswrap fox-reswrap PATH_SUFFIXES fox-1.7) - if(RESWRAP) - message(STATUS "Found reswrap: ${RESWRAP}") - execute_process(COMMAND ${RESWRAP} -v OUTPUT_VARIABLE RESWRAP_OUTPUT) -@@ -362,4 +362,4 @@ target_link_libraries(gogglesmm PRIVATE gap ${CFOX} - ${ICE_LIBRARIES} - ${Intl_LIBRARIES}) - --install(TARGETS gogglesmm RUNTIME DESTINATION bin) -\ No newline at end of file -+install(TARGETS gogglesmm RUNTIME DESTINATION bin) diff --git a/audio/gogglesmm/files/patch-src_GMImportDialog.cpp b/audio/gogglesmm/files/patch-src_GMImportDialog.cpp new file mode 100644 index 000000000000..97cdff23c79c --- /dev/null +++ b/audio/gogglesmm/files/patch-src_GMImportDialog.cpp @@ -0,0 +1,18 @@ +Fix incompatible pointer assignment for GMPathBox in GMFileSelector. + +GMFileSelector previously relied on FXFileSelector::dirbox (FXDirBox*). +Explicitly declare dirbox as GMPathBox* when FOXVERSION >= 1.7.87 to match +the GMPathBox instantiation. + +--- src/GMImportDialog.cpp.orig 2026-07-27 00:47:06 UTC ++++ src/GMImportDialog.cpp +@@ -182,6 +182,9 @@ FXDECLARE(GMFileSelector) (protected) + FXDECLARE(GMFileSelector) + protected: + GMFileAssociations * fileassoc = nullptr; ++#if FOXVERSION >= FXVERSION(1, 7, 87) ++ GMPathBox * dirbox = nullptr; ++#endif + protected: + GMFileSelector(){} + private: