svn commit: r399615 - head/audio/deadbeef

[Roman Bogorodskiy]

Author: novel
Date: Sun Oct 18 12:29:00 2015
New Revision: 399615
URL: https://svnweb.freebsd.org/changeset/ports/399615

Log:
  audio/deadbeef: add GTK3 option support
  
  This new option allows to choose between GTK2 and GTK3 for GUI.
  GTK2 remains default.
  
  PR:		202822
  Submitted by:	novel
  Approved by:	maintainer timeout (more than 2 weeks)

Modified:
  head/audio/deadbeef/Makefile
  head/audio/deadbeef/pkg-plist

Modified: head/audio/deadbeef/Makefile
==============================================================================
--- head/audio/deadbeef/Makefile	Sun Oct 18 11:55:40 2015	(r399614)
+++ head/audio/deadbeef/Makefile	Sun Oct 18 12:29:00 2015	(r399615)
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
 USES=		desktop-file-utils execinfo gettext gmake iconv libtool \
 		pkgconfig shebangfix tar:bzip2
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-alsa --disable-nullout --disable-gtk3 --disable-static
+CONFIGURE_ARGS=	--disable-alsa --disable-nullout --disable-static
 CPPFLAGS+=	-I../dumb/dumb-kode54/include -I../../plugins/libmp4ff \
 		-I../../plugins/gme/game-music-emu-0.6pre \
 		-I${LOCALBASE}/include
@@ -32,13 +32,13 @@ OPTIONS_DEFINE=	MAD PULSEAUDIO GUI VFS L
 		MUSEPACK WILDMIDI TTA DCA AAC MMS SHN AO SHELLEXEC NLS M3U \
 		PSF ADPLUG DSP MONO2STEREO CONVERTER VFS_ZIP ALAC PLTBROWSER \
 		WMA
-OPTIONS_DEFAULT=	MAD GUI VFS LASTFM ART SUPEREQ SID FFAP VTX HOSTKEYS \
+OPTIONS_DEFAULT=	MAD GTK2 VFS LASTFM ART SUPEREQ SID FFAP VTX HOSTKEYS \
 		OGG FLAC SNDFILE WAVPACK CDDA GME DUMB NOTIFY MUSEPACK \
 		WILDMIDI TTA DCA AAC MMS SHN AO SHELLEXEC M3U PSF ADPLUG DSP \
 		MONO2STEREO CONVERTER VFS_ZIP HOTKEYS ALAC PLTBROWSER WMA
 
 PULSEAUDIO_DESC=	PulseAudio output plugin (unsupported)
-GUI_DESC=		Standard GTK+2 user interface plugin
+GUI_DESC=		Standard GUI plugin
 VFS_DESC=		HTTP streaming VFS plugin
 LASTFM_DESC=		Last.fm/Libre.fm scrobbler plugin
 ART_DESC=		Cover artwork loader plugin
@@ -63,7 +63,10 @@ CONVERTER_DESC=		Plugin for converting f
 VFS_ZIP_DESC=		Play files directly from ZIP archives
 PLTBROWSER_DESC=	Playlist browser GUI plugin
 
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
+OPTIONS_RADIO+=		GUI
+OPTIONS_RADIO_GUI=	GTK2 GTK3
+GUI_IMPLIES=		CONVERTER
 
 MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
 MAD_CONFIGURE_OFF=	--disable-mad
@@ -71,9 +74,19 @@ MAD_CONFIGURE_OFF=	--disable-mad
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 
-GUI_USE=	gnome=gtk20,glib20
-GUI_CONFIGURE_OFF=	--disable-gtkui --disable-gtk3
-GUI_IMPLIES=		CONVERTER
+GTK2_USE=		gnome=gtk20,glib20
+GTK2_CONFIGURE_OFF=	--disable-gtk2
+GTK2_CONFIGURE_ON=	--enable-gtk2
+GTK2_VARS=		GTK_VER=2
+
+GTK3_USE=		gnome=gtk30
+GTK3_CONFIGURE_OFF=	--disable-gtk3
+GTK3_CONFIGURE_ON=	--enable-gtk3
+GTK3_VARS=		GTK_VER=3
+
+PLIST_SUB+=		GTK_VER=${GTK_VER}
+
+GUI_CONFIGURE_OFF=	--disable-gtk2 --disable-gtk3
 
 VFS_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 VFS_CONFIGURE_OFF=	--disable-vfs-curl

Modified: head/audio/deadbeef/pkg-plist
==============================================================================
--- head/audio/deadbeef/pkg-plist	Sun Oct 18 11:55:40 2015	(r399614)
+++ head/audio/deadbeef/pkg-plist	Sun Oct 18 12:29:00 2015	(r399615)
@@ -23,7 +23,7 @@ lib/deadbeef/oss.so
 %%MMS%%lib/deadbeef/mms.so
 %%SHN%%lib/deadbeef/ddb_shn.so
 %%SHELLEXEC%%lib/deadbeef/shellexec.so
-%%SHELLEXEC%%lib/deadbeef/shellexecui_gtk2.so
+%%SHELLEXEC%%lib/deadbeef/shellexecui_gtk%%GTK_VER%%.so
 %%LASTFM%%lib/deadbeef/lastfm.so
 %%ART%%lib/deadbeef/artwork.so
 %%SID%%lib/deadbeef/sid.so
@@ -44,13 +44,13 @@ share/applications/deadbeef.desktop
 %%DOCSDIR%%/translators.txt
 %%DOCSDIR%%/help.ru.txt
 %%DOCSDIR%%/help.pt_BR.txt
-%%GUI%%lib/deadbeef/ddb_gui_GTK2.so
+%%GUI%%lib/deadbeef/ddb_gui_GTK%%GTK_VER%%.so
 %%DSP%%lib/deadbeef/dsp_libsrc.so
 %%MONO2STEREO%%lib/deadbeef/ddb_mono2stereo.so
 %%M3U%%lib/deadbeef/m3u.so
 %%PSF%%lib/deadbeef/ddb_ao.so
 %%CONVERTER%%lib/deadbeef/converter.so
-%%CONVERTER%%lib/deadbeef/converter_gtk2.so
+%%CONVERTER%%lib/deadbeef/converter_gtk%%GTK_VER%%.so
 %%CONVERTER%%lib/deadbeef/convpresets/AAC_(Nero_FAAC).txt
 %%CONVERTER%%lib/deadbeef/convpresets/ALAC.txt
 %%CONVERTER%%lib/deadbeef/convpresets/FLAC_(compression_level_5).txt
@@ -65,7 +65,7 @@ share/applications/deadbeef.desktop
 %%CONVERTER%%lib/deadbeef/convpresets/WavPack.txt
 %%VFS_ZIP%%lib/deadbeef/vfs_zip.so
 %%ALAC%%lib/deadbeef/alac.so
-%%PLTBROWSER%%lib/deadbeef/pltbrowser_gtk2.so
+%%PLTBROWSER%%lib/deadbeef/pltbrowser_gtk%%GTK_VER%%.so
 %%WMA%%lib/deadbeef/wma.so
 %%NLS%%share/locale/be/LC_MESSAGES/deadbeef.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/deadbeef.mo