gtkui3 build support

3 files changed, 90 insertions, 18 deletions

diff --git a/configure.ac b/configure.ac
index 99b78310..7c286fc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,8 +74,9 @@ AC_ARG_ENABLE(nullout,  [AS_HELP_STRING([--disable-nullout ], [disable NULL outp
 AC_ARG_ENABLE(alsa,     [AS_HELP_STRING([--disable-alsa    ], [disable ALSA output plugin (default: enabled)])], [enable_alsa=$enableval], [enable_alsa=yes])
 AC_ARG_ENABLE(oss,      [AS_HELP_STRING([--disable-oss     ], [disable Open Sound System output plugin (default: enabled)])], [enable_oss=$enableval], [enable_oss=yes])
 AC_ARG_ENABLE(pulse,    [AS_HELP_STRING([--disable-pulse   ], [disable PulseAudio output plugin (default: enabled)])], [enable_pulse=$enableval], [enable_pulse=yes])
-AC_ARG_ENABLE(gtkui,    [AS_HELP_STRING([--disable-gtkui   ], [disable standard GTK2 user interface plugin (default: enabled)])], [enable_gtkui=$enableval], [enable_gtkui=yes])
-dnl AC_ARG_ENABLE(gtk3,     [AS_HELP_STRING([--enable-gtk3     ], [use GTK3 library (default: disabled)])], [enable_gtk3=$enableval], [enable_gtk3=no])
+AC_ARG_ENABLE(gtkui,    [AS_HELP_STRING([--disable-gtkui   ], [disable standard GTK+ user interface plugin (default: enabled)])], [enable_gtkui=$enableval], [enable_gtkui=yes])
+AC_ARG_ENABLE(gtk3,     [AS_HELP_STRING([--enable-gtk3     ], [build GTK3 version of gtkui plugin (default: disabled)])], [enable_gtk3=$enableval], [enable_gtk3=no])
+AC_ARG_ENABLE(gtk2,     [AS_HELP_STRING([--disable-gtk2     ], [build GTK2 version of gtkui plugin (default: enabled)])], [enable_gtk2=$enableval], [enable_gtk2=yes])
 AC_ARG_ENABLE(vfs_curl, [AS_HELP_STRING([--disable-vfs-curl], [disable HTTP streaming vfs plugin (default: enabled)])], [enable_vfs_curl=$enableval], [enable_vfs_curl=yes])
 AC_ARG_ENABLE(lfm,      [AS_HELP_STRING([--disable-lfm     ], [disable last.fm/libre.fm scrobbler plugin (default: enabled)])], [enable_lfm=$enableval], [enable_lfm=yes])
 AC_ARG_ENABLE(artwork,  [AS_HELP_STRING([--disable-artwork ], [disable album art loader plugin (default: enabled)])], [enable_artwork=$enableval], [enable_artwork=yes])
@@ -161,14 +162,16 @@ else
 fi
 AC_SUBST(ZIP_LIBS)
 
-if test "x$enable_gtkui" != "xno" ; then
-dnl    if test "x$enable_gtk3" == "xyes" ; then
-dnl        PKG_CHECK_MODULES(GTKUI_DEPS, gtk+-3.0 >= 2.90 gthread-2.0 glib-2.0, HAVE_GTK=yes, HAVE_GTK=no)
-dnl    else
-        PKG_CHECK_MODULES(GTKUI_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0, HAVE_GTK=yes, HAVE_GTK=no)
-dnl    fi
+if test "x$enable_gtk3" == "xyes" ; then
+    PKG_CHECK_MODULES(GTK3_DEPS, gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0, HAVE_GTK3=yes, HAVE_GTK3=no)
+else
+    HAVE_GTK3=no
+fi
+
+if test "x$enable_gtk2" == "xyes" ; then
+    PKG_CHECK_MODULES(GTK2_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0, HAVE_GTK2=yes, HAVE_GTK2=no)
 else
-    HAVE_GTK=no
+    HAVE_GTK2=no
 fi
 
 if test "x$enable_alsa" != "xno" ; then
@@ -333,7 +336,7 @@ fi
 
 dnl gtkui plugin
 if test "x$enable_gtkui" != "xno" ; then
-    if test "x$HAVE_GTK" = "xyes" ; then
+    if test "x$HAVE_GTK2" == "xyes" || test "x$HAVE_GTK3" == "xyes" ; then
         HAVE_GTKUI=yes
     fi
 fi
@@ -544,7 +547,7 @@ if test "x$enable_vfs_zip" != "xno" ; then
 fi
 
 if test "x$enable_converter" != "xno" ; then
-    if test "x$HAVE_GTK" = "xyes" ; then
+    if test "x$HAVE_GTK2" = "xyes" || test "x$HAVE_GTK3" = "xyes" ; then
         HAVE_CONVERTER=yes
     fi
 fi
@@ -557,6 +560,8 @@ AM_CONDITIONAL(HAVE_WAVPACK, test "x$HAVE_WAVPACKPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_SNDFILE, test "x$HAVE_SNDFILEPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_CDDA, test "x$HAVE_CDDAPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_GTKUI, test "x$HAVE_GTKUI" = "xyes")
+AM_CONDITIONAL(HAVE_GTK2, test "x$HAVE_GTK2" = "xyes")
+AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes")
 AM_CONDITIONAL(HAVE_ALSA, test "x$HAVE_ALSAPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_FFMPEG, test "x$HAVE_FFMPEGPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_PULSE, test "x$HAVE_PULSEPLUGIN" = "xyes")
@@ -634,7 +639,7 @@ PRINT_PLUGIN_INFO([vtx],[vtx file player (ay8910/12 emulation)],[test "x$HAVE_VT
 PRINT_PLUGIN_INFO([adplug],[adplug player (OPL2/OPL3 emulation)],[test "x$HAVE_ADPLUG" = "xyes"])
 PRINT_PLUGIN_INFO([vfs_curl],[http/ftp streaming support],[test "x$HAVE_VFS_CURL" = "xyes"])
 PRINT_PLUGIN_INFO([cdda],[cd audio player],[test "x$HAVE_CDDAPLUGIN" = "xyes"])
-PRINT_PLUGIN_INFO([gtkui],[GTK user interface],[test "x$HAVE_GTK" = "xyes"])
+PRINT_PLUGIN_INFO([gtkui],[GTK user interface],[test "x$HAVE_GTKUI" = "xyes"])
 PRINT_PLUGIN_INFO([hotkeys],[Global hotkeys support],[test "x$HAVE_HOTKEYS" = "xyes"])
 PRINT_PLUGIN_INFO([ffmpeg],[ffmpeg codecs],[test "x$HAVE_FFMPEGPLUGIN" = "xyes"])
 PRINT_PLUGIN_INFO([oss],[oss output plugin],[test "x$HAVE_OSS" = "xyes"])
diff --git a/plugins/converter/Makefile.am b/plugins/converter/Makefile.am
index 70ef9013..2fd222c1 100644
--- a/plugins/converter/Makefile.am
+++ b/plugins/converter/Makefile.am
@@ -29,8 +29,8 @@ converter_gtkui_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x1
 
 converter_gtkui_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
 else
-converter_gtkui_la_LIBADD = $(LDADD) $(GTKUI_DEPS_LIBS)
-converter_gtkui_la_CFLAGS = -std=c99 $(GTKUI_DEPS_CFLAGS)
+converter_gtkui_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
+converter_gtkui_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
 endif
 
 
diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am
index 329f14b2..0ba54a90 100644
--- a/plugins/gtkui/Makefile.am
+++ b/plugins/gtkui/Makefile.am
@@ -2,6 +2,10 @@ if HAVE_GTKUI
 gtkuidir = $(libdir)/$(PACKAGE)
 gtkui_VALASOURCES = ddbequalizer.vala ddbseekbar.vala ddbcellrenderertextmultiline.vala
 gtkui_VALABUILTSOURCES = $(gtkui_VALASOURCES:.vala=.c) ddbequalizer.h ddbseekbar.h ddbcellrenderertextmultiline.h
+
+###### build GTK2 version
+
+if HAVE_GTK2
 if MAINTAINER_MODE
 BUILT_SOURCES = vala.stamp
 vala.stamp: $(gtkui_VALASOURCES)
@@ -42,23 +46,86 @@ sdkdir = $(pkgincludedir)
 sdk_HEADERS = gtkui_api.h
 
 EXTRA_DIST = $(gtkui_VALASOURCES) deadbeef.glade
+endif
+
+###### build GTK3 version
+
+if HAVE_GTK3
+if MAINTAINER_MODE
+BUILT_SOURCES = vala_gtkui3.stamp
+vala_gtkui3.stamp: $(gtkui_VALASOURCES)
+	$(VALAC)  -C -H ddbcellrenderertextmultiline.h --library ddbcellrenderertextmultiline --pkg=gtk+-3.0 gdk-keysyms.vapi ddbcellrenderertextmultiline.vala
+	$(VALAC)  -C -H ddbequalizer.h --library ddbequalizer gtkui.vapi --pkg=gtk+-3.0 ddbequalizer.vala
+	$(VALAC)  -C -H ddbseekbar.h --library ddbseekbar gtkui.vapi --pkg=gtk+-3.0 ddbseekbar.vala
+	touch $@
+
+CLEANFILES =								\
+	$(BUILT_SOURCES)						\
+	$(gtkui_VALABUILTSOURCES)
+endif
+
+GTKUI_SOURCES =    gtkui.c gtkui.h\
+				   callbacks.c interface.c support.c callbacks.h interface.h support.h\
+				   ddblistview.c ddblistview.h\
+				   mainplaylist.c mainplaylist.h\
+				   drawing.h gdkdrawing.c\
+				   progress.c progress.h\
+				   search.c search.h\
+				   fileman.c\
+				   pluginconf.c\
+				   parser.c parser.h\
+				   ddbtabstrip.c ddbtabstrip.h\
+				   ddbvolumebar.c ddbvolumebar.h\
+				   trkproperties.c trkproperties.h\
+				   coverart.c coverart.h\
+				   plcommon.c plcommon.h\
+				   prefwin.c\
+				   eq.c eq.h\
+				   actions.c actions.h\
+				   dspconfig.c dspconfig.h\
+				   tagwritersettings.c tagwritersettings.h\
+				   wingeom.c wingeom.h\
+				   pluginconf.h
+
+sdkdir = $(pkgincludedir)
+sdk_HEADERS = gtkui_api.h
+
+EXTRA_DIST = $(gtkui_VALASOURCES) deadbeef.glade
+endif
 
 if STATICLINK
-pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la
+	pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la
+else
+if HAVE_GTK2
+if HAVE_GTK3
+	pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK3.la
 else
 pkglib_LTLIBRARIES = ddb_gui_GTK2.la
 endif
+else
+if HAVE_GTK3
+	pkglib_LTLIBRARIES = ddb_gui_GTK3.la
+endif
+endif
+endif
 
 # normal lib
+if HAVE_GTK2
 ddb_gui_GTK2_la_SOURCES = $(gtkui_VALABUILTSOURCES) $(GTKUI_SOURCES)
 ddb_gui_GTK2_la_LDFLAGS = -module
-ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTKUI_DEPS_LIBS)
-ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTKUI_DEPS_CFLAGS)
+ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
+ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
+endif
+if HAVE_GTK3
+ddb_gui_GTK3_la_SOURCES = $(gtkui_VALABUILTSOURCES) $(GTKUI_SOURCES)
+ddb_gui_GTK3_la_LDFLAGS = -module
+ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
+ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
+endif
 
 # fallback lib
 if STATICLINK
 GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
-#../../../deadbeef-deps/gtk-debian/usr
 
 ddb_gui_GTK2_fallback_la_SOURCES = $(gtkui_VALABUILTSOURCES) $(GTKUI_SOURCES)
 ddb_gui_GTK2_fallback_la_LDFLAGS = -module