Update to 1.1.7

Changes:	https://github.com/gogglesmm/gogglesmm/compare/1.1.5...1.1.7

5 files changed, 59 insertions, 141 deletions

diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index f111ddbaf36f..acd4b16c5ee0 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gogglesmm
-PORTVERSION=	1.1.5
-PORTREVISION=	1
+PORTVERSION=	1.1.7
 CATEGORIES=	audio
 
 MAINTAINER=	jhale@FreeBSD.org
@@ -25,20 +24,27 @@ INSTALLS_ICONS=	yes
 
 PORTDOCS=	AUTHORS ChangeLog README
 
-OPTIONS_DEFINE=		ALSA DBUS DOCS FAAD FLAC GCRYPT MAD NLS \
-			OGG OPENGL OPUS PULSEAUDIO
-OPTIONS_RADIO=		VORBISDEC
+OPTIONS_DEFINE=		A52 ALSA DBUS DCA DOCS FAAD FLAC MAD NLS \
+			OGG OPENGL OPUS PULSEAUDIO 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 OPUS VORBIS
+OPTIONS_DEFAULT=	DBUS FAAD FLAC MAD OGG OPENGL OPENSSL OPUS VORBIS ZLIB
 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
 
@@ -46,15 +52,17 @@ FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CMAKE_BOOL=	WITH_FLAC
 FLAC_IMPLIES=		OGG
 
-GCRYPT_DESC=		Use libgcrypt for md5 calculation
+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_LDFLAGS=		-lintl
 NLS_CMAKE_BOOL=		WITH_NLS
 
 OGG_LIB_DEPENDS=	libogg.so:audio/libogg
@@ -64,6 +72,9 @@ OPENGL_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy
 OPENGL_USE=		GL=gl,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
@@ -79,6 +90,8 @@ VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CMAKE_BOOL=	WITH_VORBIS
 VORBIS_IMPLIES=		OGG
 
+ZLIB_CMAKE_BOOL=	WITH_ZLIB
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOGG} && !${PORT_OPTIONS:MTREMOR} && !${PORT_OPTIONS:MVORBIS}
diff --git a/audio/gogglesmm/distinfo b/audio/gogglesmm/distinfo
index 34b4380fe605..5a42833ae417 100644
--- a/audio/gogglesmm/distinfo
+++ b/audio/gogglesmm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483653900
-SHA256 (gogglesmm-gogglesmm-1.1.5_GH0.tar.gz) = 91edfd96d8d12b8dd55227788c0c90db8b8a88f34c81cfcdc48a04072c658d96
-SIZE (gogglesmm-gogglesmm-1.1.5_GH0.tar.gz) = 1411737
+TIMESTAMP = 1491505558
+SHA256 (gogglesmm-gogglesmm-1.1.7_GH0.tar.gz) = 20587b61adcd6d0a9f1cfc026157c963e1308a6d190749d8c4f384c48168985f
+SIZE (gogglesmm-gogglesmm-1.1.7_GH0.tar.gz) = 1419429
diff --git a/audio/gogglesmm/files/patch-gap_CMakeLists.txt b/audio/gogglesmm/files/patch-gap_CMakeLists.txt
index 7ba5ef6b3382..35f8b2c7aef5 100644
--- a/audio/gogglesmm/files/patch-gap_CMakeLists.txt
+++ b/audio/gogglesmm/files/patch-gap_CMakeLists.txt
@@ -1,112 +1,11 @@
---- gap/CMakeLists.txt.orig	2016-12-23 18:20:04 UTC
+--- gap/CMakeLists.txt.orig	2017-02-08 01:48:39 UTC
 +++ gap/CMakeLists.txt
-@@ -103,7 +103,18 @@ if(UNIX)
-     option(WITH_OSS "OSS Output Support" ON)
-     option(WITH_ALSA "ALSA Output Support" OFF)
+@@ -215,7 +215,7 @@ else()
    endif()
-+  option(WITH_A52 "ATSC A/52 Stream Decoder Support" OFF)
-+  option(WITH_DCA "DTS Coherent Acoustics Decoder 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
-@@ -278,7 +289,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)
-@@ -291,7 +302,7 @@ 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 PLUGIN_HEADERS plugins/ap_vorbis.h)
-   LIST(APPEND LIBRARIES ${VORBIS_LIBRARIES})
-@@ -299,7 +310,7 @@ if(VORBIS_FOUND AND OGG_FOUND AND NOT WI
- 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 PLUGIN_HEADERS plugins/ap_ogg_decoder.h)
-   LIST(APPEND LIBRARIES ${OGG_LIBRARIES})
-@@ -307,39 +318,39 @@ if(OGG_FOUND AND (FLAC_FOUND OR OPUS_FOU
- 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 PLUGIN_HEADERS plugins/ap_opus.h)
-   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(DCA_FOUND)
-+if(DCA_FOUND AND WITH_DCA)
-   LIST(APPEND PLUGIN_SOURCES plugins/ap_dca.cpp)
-   LIST(APPEND LIBRARIES ${DCA_LIBRARIES})
-   set(HAVE_DCA 1)
- endif()
- 
--if(A52_FOUND)
-+if(A52_FOUND AND WITH_A52)
-   LIST(APPEND PLUGIN_SOURCES plugins/ap_a52.cpp)
-   LIST(APPEND LIBRARIES ${A52_LIBRARIES})
-   set(HAVE_A52 1)
- endif()
- 
--if(SAMPLERATE_FOUND)
-+if(SAMPLERATE_FOUND AND WITH_SAMPLERATE)
-   LIST(APPEND LIBRARIES ${SAMPLERATE_LIBRARIES})
-   set(HAVE_SAMPLERATE 1)
- endif()
-@@ -380,7 +391,7 @@ if(NOT WIN32)
-   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})
-@@ -389,7 +400,7 @@ if(NOT WIN32)
-   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})
+   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
index 986cfc01a7e1..c7dddd0fad1b 100644
--- a/audio/gogglesmm/files/patch-src_CMakeLists.txt
+++ b/audio/gogglesmm/files/patch-src_CMakeLists.txt
@@ -1,26 +1,13 @@
---- src/CMakeLists.txt.orig	2016-10-22 17:13:46 UTC
+--- src/CMakeLists.txt.orig	2017-02-08 01:48:39 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)
+@@ -55,13 +55,14 @@ if(WITH_OPENGL)
  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()
+ if(WITH_NLS)
++  find_package(Intl REQUIRED)
+   set(HAVE_NLS 1)
  endif()
-+endif()
+ 
  
  
  # Detects reswrap version
@@ -29,3 +16,13 @@
  if(RESWRAP)
    message(STATUS "Found reswrap: ${RESWRAP}")
    execute_process(COMMAND ${RESWRAP} -v OUTPUT_VARIABLE RESWRAP_OUTPUT)
+@@ -339,6 +340,7 @@ target_link_libraries(gogglesmm PRIVATE 
+                       ${EPOXY_LIBRARIES}
+                       ${X11_LIBRARIES}
+                       ${SM_LIBRARIES}
+-                      ${ICE_LIBRARIES})
++                      ${ICE_LIBRARIES}
++                      ${Intl_LIBRARY})
+ 
+ install(TARGETS gogglesmm RUNTIME DESTINATION bin)
+\ No newline at end of file
diff --git a/audio/gogglesmm/files/patch-src_GMPlayerManager.cpp b/audio/gogglesmm/files/patch-src_GMPlayerManager.cpp
index ca7e6dc45834..afd483084fac 100644
--- a/audio/gogglesmm/files/patch-src_GMPlayerManager.cpp
+++ b/audio/gogglesmm/files/patch-src_GMPlayerManager.cpp
@@ -1,9 +1,18 @@
 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.orig	2017-02-08 01:48:39 UTC
 +++ src/GMPlayerManager.cpp
-@@ -741,7 +741,7 @@ FXint GMPlayerManager::run(int& argc,cha
+@@ -294,7 +294,7 @@ GMPlayerManager::~GMPlayerManager() {
+ 
+   myself=nullptr;
+ 
+-#ifdef HAVE_SSSION
++#ifdef HAVE_SESSION
+   delete session;
+ #endif
+   delete application;
+@@ -747,7 +747,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) {