Date: Mon, 21 Nov 2016 21:43:41 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426760 - in head/audio/gogglesmm: . files Message-ID: <201611212143.uALLhfKU071021@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Mon Nov 21 21:43:41 2016 New Revision: 426760 URL: https://svnweb.freebsd.org/changeset/ports/426760 Log: Update to 1.1.3 Build system converted to CMake Take maintainership Added: head/audio/gogglesmm/files/ head/audio/gogglesmm/files/patch-CMakeLists.txt (contents, props changed) head/audio/gogglesmm/files/patch-gap_CMakeLists.txt (contents, props changed) head/audio/gogglesmm/files/patch-src_CMakeLists.txt (contents, props changed) head/audio/gogglesmm/files/patch-src_GMPlayerManager.cpp (contents, props changed) head/audio/gogglesmm/files/patch-src_GMTrayIcon.cpp (contents, props changed) Modified: head/audio/gogglesmm/Makefile head/audio/gogglesmm/distinfo head/audio/gogglesmm/pkg-plist Modified: head/audio/gogglesmm/Makefile ============================================================================== --- head/audio/gogglesmm/Makefile Mon Nov 21 21:26:58 2016 (r426759) +++ head/audio/gogglesmm/Makefile Mon Nov 21 21:43:41 2016 (r426760) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= gogglesmm -PORTVERSION= 1.0.12 -PORTREVISION= 1 +PORTVERSION= 1.1.3 CATEGORIES= audio -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Music collection manager and player LICENSE= GPLv3+ @@ -18,100 +17,83 @@ LIB_DEPENDS= libtag.so:audio/taglib \ USE_GITHUB= yes -USES= compiler:c++11-lang desktop-file-utils gmake pkgconfig sqlite -USE_GL= glew -HAS_CONFIGURE= yes -CONFIGURE_ENV= LINK="${CXX}" \ - OPT_CFLAGS="${CXXFLAGS}" \ - OPT_LDFLAGS="${LDFLAGS}" \ - RESWRAP="${LOCALBASE}/bin/fox-1.7/reswrap" -CONFIGURE_ARGS= --prefix=${PREFIX} \ - --libdir=${PREFIX}/lib \ - --fox-prefix=${LOCALBASE} \ - --without-rsound +USES= cmake compiler:c++11-lib desktop-file-utils \ + localbase:ldflags pkgconfig sqlite +USE_XORG= ice sm x11 INSTALLS_ICONS= yes -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -pthread - -OPTIONS_DEFINE= ALSA CDIO DBUS DOCS FAAD FFMPEG FLAC GCRYPT JACK \ - MAD MMS NLS OGG OPUS PULSEAUDIO SAMPLERATE SMB WAVPACK +OPTIONS_DEFINE= ALSA DBUS DOCS FAAD FLAC GCRYPT MAD NLS \ + OGG OPENGL OPUS PULSEAUDIO OPTIONS_RADIO= VORBISDEC +VORBISDEC_DESC= Vorbis decoder library OPTIONS_RADIO_VORBISDEC= TREMOR VORBIS -OPTIONS_DEFAULT= CDIO DBUS FAAD FLAC MAD OGG OPUS SAMPLERATE SMB \ - VORBIS WAVPACK +OPTIONS_DEFAULT= DBUS FAAD FLAC MAD OGG OPENGL OPUS VORBIS OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CONFIGURE_OFF= --without-alsa -CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio -CDIO_CONFIGURE_OFF= --without-cdda +ALSA_CMAKE_ON= -DWITH_ALSA:BOOL=ON +ALSA_CMAKE_OFF= -DWITH_ALSA:BOOL=OFF + DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus -DBUS_CONFIGURE_OFF= --without-dbus +DBUS_CMAKE_ON= -DWITH_DBUS:BOOL=ON +DBUS_CMAKE_OFF= -DWITH_DBUS:BOOL=OFF + FAAD_LIB_DEPENDS= libfaad.so:audio/faad -FAAD_CONFIGURE_ON= --faad-prefix=${LOCALBASE} -FAAD_CONFIGURE_OFF= --without-faad -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg -FFMPEG_CONFIGURE_ON= --with-avcodec +FAAD_CMAKE_ON= -DWITH_FAAD:BOOL=ON +FAAD_CMAKE_OFF= -DWITH_FAAD:BOOL=OFF + FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CONFIGURE_OFF= --without-flac +FLAC_CMAKE_ON= -DWITH_FLAC:BOOL=ON +FLAC_CMAKE_OFF= -DWITH_FLAC:BOOL=OFF +FLAC_IMPLIES= OGG + GCRYPT_DESC= Use libgcrypt for md5 calculation GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt -GCRYPT_CONFIGURE_ON= --with-md5=gcrypt -GCRYPT_CONFIGURE_OFF= --with-md5=internal -JACK_LIB_DEPENDS= libjack.so:audio/jack -JACK_CONFIGURE_OFF= --without-jack +GCRYPT_CMAKE_ON= -DWITH_GCRYPT:BOOL=ON +GCRYPT_CMAKE_OFF= -DWITH_GCRYPT:BOOL=OFF + MAD_LIB_DEPENDS= libmad.so:audio/libmad -MAD_CONFIGURE_ON= --mad-prefix=${LOCALBASE} -MAD_CONFIGURE_OFF= --without-mad -MMS_LIB_DEPENDS= libmms.so:net/libmms -MMS_CONFIGURE_OFF= --without-mms +MAD_CMAKE_ON= -DWITH_MAD:BOOL=ON +MAD_CMAKE_OFF= -DWITH_MAD:BOOL=OFF + NLS_USES= gettext -NLS_LIBS= -lintl -NLS_CONFIGURE_OFF= --without-nls +NLS_LDFLAGS= -lintl +NLS_CMAKE_ON= -DWITH_NLS:BOOL=ON +NLS_CMAKE_OFF= -DWITH_NLS:BOOL=OFF + OGG_LIB_DEPENDS= libogg.so:audio/libogg -OGG_CONFIGURE_OFF= --without-ogg +OGG_CMAKE_ON= -DWITH_OGG:BOOL=ON +OGG_CMAKE_OFF= -DWITH_OGG:BOOL=OFF + +OPENGL_LIB_DEPENDS= libepoxy.so:graphics/libepoxy +OPENGL_USE= GL=gl,glu +OPENGL_CMAKE_ON= -DWITH_OPENGL:BOOL=ON +OPENGL_CMAKE_OFF= -DWITH_OPENGL:BOOL=OFF + OPUS_LIB_DEPENDS= libopus.so:audio/opus -OPUS_CONFIGURE_OFF= --without-opus +OPUS_CMAKE_ON= -DWITH_OPUS:BOOL=ON +OPUS_CMAKE_OFF= -DWITH_OPUS:BOOL=OFF +OPUS_IMPLIES= OGG + PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_CONFIGURE_OFF= --without-pulse -SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate -SAMPLERATE_CONFIGURE_OFF= --without-samplerate -SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient -SMB_CONFIGURE_ON= --smb-prefix=${LOCALBASE} -SMB_CONFIGURE_OFF= --without-smb +PULSEAUDIO_CMAKE_ON= -DWITH_PULSE:BOOL=ON +PULSEAUDIO_CMAKE_OFF= -DWITH_PULSE:BOOL=OFF + TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor -TREMOR_CONFIGURE_ON= --with-tremor +TREMOR_CMAKE_ON= -DWITH_TREMOR:BOOL=ON +TREMOR_CMAKE_OFF= -DWITH_TREMOR:BOOL=OFF TREMOR_IMPLIES= OGG + VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis -VORBIS_CONFIGURE_OFF= --without-vorbis +VORBIS_CMAKE_ON= -DWITH_VORBIS:BOOL=ON +VORBIS_CMAKE_OFF= -DWITH_VORBIS:BOOL=OFF VORBIS_IMPLIES= OGG -VORBISDEC_DESC= Vorbis decoder library -WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack -WAVPACK_CONFIGURE_OFF= --without-wavpack -post-patch: - @${REINPLACE_CMD} -e \ - 's|share/man|man|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e \ - 's|$$(sharedir)/man|$$(installdir)/man| ; \ - /INSTALL/s|-D|-c| ; \ - s|@$$(CXX)|$$(CXX)|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e \ - 's|@$$(LINK)|$$(LINK)|' ${WRKSRC}/build/*.mk - -pre-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gogglesmm - @${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata - @${MKDIR} ${STAGEDIR}${DATADIR}/utils -.for i in 16 22 24 32 48 - @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps -.endfor - @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gogglesmm - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gogglesmm/libgap_*.so +.include <bsd.port.options.mk> + +.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} Modified: head/audio/gogglesmm/distinfo ============================================================================== --- head/audio/gogglesmm/distinfo Mon Nov 21 21:26:58 2016 (r426759) +++ head/audio/gogglesmm/distinfo Mon Nov 21 21:43:41 2016 (r426760) @@ -1,2 +1,3 @@ -SHA256 (gogglesmm-gogglesmm-1.0.12_GH0.tar.gz) = 68488e9efd431b5b32d4c6df4d050625e0ef29db011ac6d02839485ecdd63f3c -SIZE (gogglesmm-gogglesmm-1.0.12_GH0.tar.gz) = 1385312 +TIMESTAMP = 1479598736 +SHA256 (gogglesmm-gogglesmm-1.1.3_GH0.tar.gz) = 99907fe988429e88c051eef557143e3e07fedd64fe67c2d7a26e4de556055d37 +SIZE (gogglesmm-gogglesmm-1.1.3_GH0.tar.gz) = 1394950 Added: head/audio/gogglesmm/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gogglesmm/files/patch-CMakeLists.txt Mon Nov 21 21:43:41 2016 (r426760) @@ -0,0 +1,23 @@ +--- CMakeLists.txt.orig 2016-10-22 17:13:46 UTC ++++ CMakeLists.txt +@@ -57,6 +57,11 @@ if(HAS_CXX_OPTIMIZE_DEBUG AND CMAKE_BUIL + 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) +@@ -96,7 +101,7 @@ install(FILES extra/gogglesmm_64.png DES + install(FILES extra/gogglesmm.svg DESTINATION share/icons/hicolor/scalable/apps RENAME gogglesmm.svg) + install(FILES extra/gogglesmm.appdata.xml DESTINATION share/appdata) + install(FILES extra/gogglesmm.desktop DESTINATION share/applications) +-install(FILES extra/gogglesmm.1 DESTINATION share/man/man1) ++install(FILES extra/gogglesmm.1 DESTINATION man/man1) + + # Install translations when native language support has been enabled + if(WITH_NLS) Added: head/audio/gogglesmm/files/patch-gap_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gogglesmm/files/patch-gap_CMakeLists.txt Mon Nov 21 21:43:41 2016 (r426760) @@ -0,0 +1,108 @@ +--- gap/CMakeLists.txt.orig 2016-10-22 17:13:46 UTC ++++ gap/CMakeLists.txt +@@ -103,7 +103,17 @@ if(UNIX) + option(WITH_OSS "OSS Output Support" ON) + option(WITH_ALSA "ALSA Output Support" OFF) + endif() ++ option(WITH_CDDA "CDDA Support" OFF) ++ option(WITH_JACK "JACK Sound Server Support" OFF) ++ option(WITH_FAAD "FAAD Support" OFF) ++ option(WITH_FLAC "FLAC Support" OFF) ++ option(WITH_MAD "MAD Support" OFF) ++ option(WITH_OGG "OGG Support" OFF) ++ option(WITH_OPUS "OPUS Support" OFF) ++ option(WITH_PULSE "PulseAudio Support" OFF) ++ option(WITH_SAMPLERATE "Samplerate Support" OFF) + option(WITH_TREMOR "Tremor Support" OFF) ++ option(WITH_VORBIS "Vorbis Support" OFF) + endif() + + # Endiannes +@@ -256,7 +266,7 @@ if(BUILD_GAP_SHARED_LIB) + endif() + + +-if(FLAC_FOUND) ++if(FLAC_FOUND AND WITH_FLAC) + LIST(APPEND PLUGIN_SOURCES plugins/ap_flac.cpp) + LIST(APPEND LIBRARIES ${FLAC_LIBRARIES}) + set(HAVE_FLAC 1) +@@ -268,52 +278,52 @@ if(TREMOR_FOUND AND OGG_FOUND AND WITH_T + set(HAVE_TREMOR 1) + endif() + +-if(VORBIS_FOUND AND OGG_FOUND AND NOT WITH_TREMOR) ++if(VORBIS_FOUND AND WITH_VORBIS AND OGG_FOUND AND NOT WITH_TREMOR) + LIST(APPEND PLUGIN_SOURCES plugins/ap_vorbis.cpp) + LIST(APPEND LIBRARIES ${VORBIS_LIBRARIES}) + set(HAVE_VORBIS 1) + endif() + + +-if(OGG_FOUND AND (FLAC_FOUND OR OPUS_FOUND OR VORBIS_FOUND OR TREMOR_FOUND)) ++if(OGG_FOUND AND WITH_OGG AND (FLAC_FOUND OR OPUS_FOUND OR VORBIS_FOUND OR TREMOR_FOUND)) + LIST(APPEND PLUGIN_SOURCES plugins/ap_ogg.cpp plugins/ap_ogg_decoder.cpp) + LIST(APPEND LIBRARIES ${OGG_LIBRARIES}) + set(HAVE_OGG 1) + endif() + + +-if(OPUS_FOUND AND OGG_FOUND) ++if(OPUS_FOUND AND OGG_FOUND AND WITH_OPUS) + LIST(APPEND PLUGIN_SOURCES plugins/ap_opus.cpp) + LIST(APPEND LIBRARIES ${OPUS_LIBRARIES}) + set(HAVE_OPUS 1) + endif() + +-if(MAD_FOUND) ++if(MAD_FOUND AND WITH_MAD) + LIST(APPEND PLUGIN_SOURCES plugins/ap_mad.cpp) + LIST(APPEND LIBRARIES ${MAD_LIBRARIES}) + set(HAVE_MAD 1) + endif() + + +-if(FAAD_FOUND) ++if(FAAD_FOUND AND WITH_FAAD) + LIST(APPEND PLUGIN_SOURCES plugins/ap_aac.cpp) + LIST(APPEND LIBRARIES ${FAAD_LIBRARIES}) + set(HAVE_FAAD 1) + endif() + +-if(CDDA_FOUND) ++if(CDDA_FOUND AND WITH_CDDA) + LIST(APPEND PLUGIN_SOURCES plugins/ap_cdda.cpp) + LIST(APPEND LIBRARIES ${CDDA_LIBRARIES}) + set(HAVE_CDDA 1) + endif() + +-if(SMB_FOUND) ++if(SMB_FOUND AND WITH_SMB) + LIST(APPEND PLUGIN_SOURCES plugins/ap_smb.cpp) + LIST(APPEND LIBRARIES ${SMB_LIBRARIES}) + set(HAVE_SMB 1) + endif() + +-if(SAMPLERATE_FOUND) ++if(SAMPLERATE_FOUND AND WITH_SAMPLERATE) + LIST(APPEND LIBRARIES ${SAMPLERATE_LIBRARIES}) + set(HAVE_SAMPLERATE 1) + endif() +@@ -360,7 +370,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windo + endif() + + # Pulse Output +- if (PULSE_FOUND) ++ if (PULSE_FOUND AND WITH_PULSE) + add_library(gap_pulse MODULE plugins/ap_pulse.cpp) + target_link_libraries(gap_pulse ${PULSE_LIBRARIES}) + target_include_directories(gap_pulse PRIVATE ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${FOX_INCLUDE_DIRS}) +@@ -369,7 +379,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windo + endif() + + # Jack Output +- if (JACK_FOUND) ++ if (JACK_FOUND AND WITH_JACK) + add_library(gap_jack MODULE plugins/ap_jack.cpp) + target_link_libraries(gap_jack ${PULSE_LIBRARIES}) + target_include_directories(gap_jack PRIVATE ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${FOX_INCLUDE_DIRS}) Added: head/audio/gogglesmm/files/patch-src_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gogglesmm/files/patch-src_CMakeLists.txt Mon Nov 21 21:43:41 2016 (r426760) @@ -0,0 +1,31 @@ +--- src/CMakeLists.txt.orig 2016-10-22 17:13:46 UTC ++++ src/CMakeLists.txt +@@ -10,6 +10,7 @@ project(GOGGLESMM VERSION 1.1.3) + option(WITH_OPENGL "Enable OpenGL Features" ON) + option(WITH_DBUS "Enable DBUS Features" ON) + option(WITH_NLS "Enable Native Language Support" ON) ++option(WITH_GCRYPT "Enable GCrypt Support" ON) + + # Translation Files to share/locale + set(LOCALE_PATH ${CMAKE_INSTALL_PREFIX}/share/locale) +@@ -62,6 +63,7 @@ if(SM_FOUND AND ICE_FOUND) + endif() + + # libgrypt ++if(WITH_GCRYPT) + check_include_files(gcrypt.h HAVE_GCRYPT_H) + if (HAVE_GCRYPT_H) + find_library(LIBGCRYPT_LIBRARIES NAMES gcrypt ) +@@ -69,10 +71,11 @@ if (HAVE_GCRYPT_H) + set(HAVE_GCRYPT TRUE) + endif() + endif() ++endif() + + + # Detects reswrap version +-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) Added: head/audio/gogglesmm/files/patch-src_GMPlayerManager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gogglesmm/files/patch-src_GMPlayerManager.cpp Mon Nov 21 21:43:41 2016 (r426760) @@ -0,0 +1,14 @@ +Re-enable tray icon for KDE4 until KDE5 is in the ports tree. Mpris plugin +works, but tray icon might be wanted to minimize app in the time being. + +--- src/GMPlayerManager.cpp.orig 2016-10-22 17:13:46 UTC ++++ src/GMPlayerManager.cpp +@@ -741,7 +741,7 @@ FXint GMPlayerManager::run(int& argc,cha + // KDE5 comes with mpris plugin on the toolbar, no need for + // tray icon + if (gm_desktop_session()==DESKTOP_SESSION_KDE_PLASMA) { +- preferences.gui_tray_icon_disabled=true; ++ preferences.gui_tray_icon_disabled=false; + } + + /// Grab Media Player Keys Added: head/audio/gogglesmm/files/patch-src_GMTrayIcon.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gogglesmm/files/patch-src_GMTrayIcon.cpp Mon Nov 21 21:43:41 2016 (r426760) @@ -0,0 +1,61 @@ +Add pseudo transparency to the tray icon + +--- src/GMTrayIcon.cpp.orig 2016-10-22 17:13:46 UTC ++++ src/GMTrayIcon.cpp +@@ -81,17 +81,17 @@ void GMTrayIcon::updateIcon() { + + /// Update + if (size<=16) { +- icon = new FXPNGIcon(getApp(),gogglesmm_16_png,0,opaque ? IMAGE_OPAQUE : 0); ++ icon = new FXPNGIcon(getApp(),gogglesmm_16_png,0,IMAGE_ALPHAGUESS); + icon->setVisual(getVisual()); + if (size!=16) icon->scale(size,size,FOX_SCALE_BEST); + } + else { +- icon = new FXPNGIcon(getApp(),gogglesmm_32_png,0,opaque ? IMAGE_OPAQUE : 0); ++ icon = new FXPNGIcon(getApp(),gogglesmm_32_png,0,IMAGE_ALPHAGUESS); + icon->setVisual(getVisual()); + if (size!=32) icon->scale(size,size,FOX_SCALE_BEST); + } + +- icon->blend(GMPlayerManager::instance()->getPreferences().gui_tray_color); ++ //icon->blend(GMPlayerManager::instance()->getPreferences().gui_tray_color); + icon->create(); + + // Mark Dirty +@@ -230,13 +230,8 @@ void GMTrayIcon::create(){ + + void GMTrayIcon::dock() { + if (findSystemTray()){ +- FXuint trayid = getTrayVisual(); +- if (trayid) { +- if (trayid!=XVisualIDFromVisual((Visual*)getVisual()->getVisual())) +- opaque=true; +- else +- opaque=false; +- } ++ ++ opaque=false; + + if (!opaque) { + /// Don't draw the background +@@ -276,16 +271,16 @@ long GMTrayIcon::onConfigure(FXObject*,F + + if (icon==nullptr) { + if (size<=16) { +- icon = new FXPNGIcon(getApp(),gogglesmm_16_png,0,opaque ? IMAGE_OPAQUE : 0); ++ icon = new FXPNGIcon(getApp(),gogglesmm_16_png,0,IMAGE_ALPHAGUESS); + icon->setVisual(getVisual()); + if (size!=16) icon->scale(size,size,FOX_SCALE_BEST); + } + else { +- icon = new FXPNGIcon(getApp(),gogglesmm_32_png,0,opaque ? IMAGE_OPAQUE : 0); ++ icon = new FXPNGIcon(getApp(),gogglesmm_32_png,0,IMAGE_ALPHAGUESS); + icon->setVisual(getVisual()); + if (size!=32) icon->scale(size,size,FOX_SCALE_BEST); + } +- icon->blend(GMPlayerManager::instance()->getPreferences().gui_tray_color); ++ //icon->blend(GMPlayerManager::instance()->getPreferences().gui_tray_color); + icon->create(); + } + return 1; Modified: head/audio/gogglesmm/pkg-plist ============================================================================== --- head/audio/gogglesmm/pkg-plist Mon Nov 21 21:26:58 2016 (r426759) +++ head/audio/gogglesmm/pkg-plist Mon Nov 21 21:43:41 2016 (r426760) @@ -9,14 +9,15 @@ share/applications/gogglesmm.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README -%%DATADIR%%/utils/import_banshee_stats.py -%%DATADIR%%/utils/import_gogglesmm12.py -%%DATADIR%%/utils/import_gogglesmm12_stats.py +%%DATADIR%%/import_banshee_stats.py +%%DATADIR%%/import_gogglesmm12.py +%%DATADIR%%/import_gogglesmm12_stats.py share/icons/hicolor/16x16/apps/gogglesmm.png share/icons/hicolor/22x22/apps/gogglesmm.png share/icons/hicolor/24x24/apps/gogglesmm.png share/icons/hicolor/32x32/apps/gogglesmm.png share/icons/hicolor/48x48/apps/gogglesmm.png +share/icons/hicolor/64x64/apps/gogglesmm.png share/icons/hicolor/scalable/apps/gogglesmm.svg %%NLS%%share/locale/de/LC_MESSAGES/gogglesmm.mo %%NLS%%share/locale/es/LC_MESSAGES/gogglesmm.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611212143.uALLhfKU071021>