GNOME.org
 

[rhythmbox/gobject-introspection: 8/10] add gtk+3 autotoolery, drop obsolete n-c-b plugin

commit ae35493e7fd32154ebe38600407c32930ba8e70f
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Jul 22 11:51:41 2010 +1000

    add gtk+3 autotoolery, drop obsolete n-c-b plugin

 configure.ac                                      |   90 +-
 plugins/Makefile.am                               |    6 +-
 plugins/cd-recorder/Makefile.am                   |   70 -
 plugins/cd-recorder/cd-recorder.rb-plugin.in      |    8 -
 plugins/cd-recorder/rb-cd-recorder-plugin.c       |  489 ------
 plugins/cd-recorder/rb-playlist-source-recorder.c | 1654 ---------------------
 plugins/cd-recorder/rb-playlist-source-recorder.h |   90 --
 plugins/cd-recorder/rb-recorder-gst.c             | 1282 ----------------
 plugins/cd-recorder/rb-recorder.h                 |  139 --
 plugins/cd-recorder/recorder.ui                   |  198 ---
 10 files changed, 60 insertions(+), 3966 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a7fd3aa..c2896bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,17 +42,15 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
 AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(long)
 
+GTK3_REQS=2.90.6
+
 DBUS_MIN_REQS=0.35
 GST_0_10_REQS=0.10.20
-GTK_REQS=2.18.0
+GDK_PIXBUF_REQS=2.18.0
 GLIB_REQS=2.18.0
-GNOME_MEDIA_PROFILES_REQS=2.8
-LIBNOTIFY_REQS=0.4.1
 LIBGPOD_REQS=0.6
 MUSICBRAINZ_REQS=2.1.0
 MUSICBRAINZ3_REQS=3.0.2
-NCB_MIN_REQS=2.21.6
-BRASERO_MIN_REQS=0.9.1
 TOTEM_PLPARSER_REQS=2.26.0
 VALA_REQS=0.1.0
 AVAHI_REQS=0.6
@@ -60,9 +58,45 @@ LIBSOUP_REQS=2.26.0
 GUDEV_REQS=143
 LIBMTP_REQS=0.3.0
 PYGOBJECT_REQUIRED=2.15.4
-WEBKIT_MIN_REQS=1.1.17
 GLIB_GDBUS_REQS=2.25.6
 
+dnl gtk+ version
+AC_ARG_ENABLE(gtk3,
+  AS_HELP_STRING([--enable-gtk3=@<:@no/yes/auto@:>@],
+  [build with GTK+3]), ,
+  enable_gtk3=auto)
+PKG_CHECK_EXISTS(gtk+-3.0 >= $GTK3_REQS, [have_gtk3=yes], [have_gtk3=no])
+if test "x$enable_gtk3" = "xyes" -a "x$have_gtk3" = "xno"; then
+	AC_MSG_ERROR([Gtk+3 explicitly requested, but not available])
+elif test "x$enable_gtk3" != "xno" -a "x$have_gtk3" = "xyes"; then
+	GTK_MAJ_VER=3.0
+	GTK_REQS=$GTK3_REQS
+
+	dnl require GTK+3 compatible library versions
+	GNOME_MEDIA_PROFILES_PKG=gnome-media-profiles-3.0
+	GNOME_MEDIA_PROFILES_REQS=2.31.5
+	LIBNOTIFY_REQS=0.5.1
+	BRASERO_MIN_REQS=2.31.5
+	BRASERO_MAX_REQS=99999
+	dnl XXX webkit version unknown
+	WEBKIT_MIN_REQS=99999
+else
+	GTK_MAJ_VER=2.0
+	GTK_REQS=2.18.0
+
+	dnl somewhat more relaxed GTK+2 requirements
+	GNOME_MEDIA_PROFILES_PKG=gnome-media-profiles
+	GNOME_MEDIA_PROFILES_REQS=2.8
+	LIBNOTIFY_REQS=0.4.1
+	BRASERO_MIN_REQS=0.9.1
+	BRASERO_MAX_REQS=2.31.4
+	WEBKIT_MIN_REQS=1.1.17
+fi
+
+
+
+
+
 AC_MSG_CHECKING([for GNU extension fwrite_unlocked])
 AC_LINK_IFELSE(
 [AC_LANG_PROGRAM([[
@@ -89,11 +123,12 @@ PKG_CHECK_MODULES(RB_CLIENT, glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS gio-un
 
 dnl  note: gio-unix-2.0 is here for libmediaplayerid
 PKG_CHECK_MODULES(RHYTHMBOX,				\
-		  gtk+-2.0 >= $GTK_REQS			\
+		  gtk+-$GTK_MAJ_VER >= $GTK_REQS			\
+		  gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQS	\
 		  glib-2.0 >= $GLIB_REQS		\
 		  gio-2.0 >= $GLIB_REQS			\
 		  gio-unix-2.0 >= $GLIB_REQS		\
-		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
+		  $GNOME_MEDIA_PROFILES_PKG >= $GNOME_MEDIA_PROFILES_REQS \
 		  libsoup-2.4 >= $LIBSOUP_REQS		\
 		  libsoup-gnome-2.4 >= $LIBSOUP_REQS)
 
@@ -412,7 +447,12 @@ AC_ARG_WITH(libbrasero-media,
 	    		   [Build with libbrasero-media support]),,
 	    with_libbrasero_media=auto)
 if test x"$with_libbrasero_media" != "xno"; then
-    PKG_CHECK_MODULES(LIBBRASERO_MEDIA, [libbrasero-media >= $BRASERO_MIN_REQS] gtk+-x11-2.0, have_libbrasero_media=yes, have_libbrasero_media=no)
+    PKG_CHECK_MODULES(LIBBRASERO_MEDIA, [
+	libbrasero-media >= $BRASERO_MIN_REQS	\
+	libbrasero-media <= $BRASERO_MAX_REQS	\
+	gtk+-x11-$GTK_MAJ_VER],
+	have_libbrasero_media=yes,
+	have_libbrasero_media=no)
 fi
 if test "x$have_libbrasero_media" = "xyes"; then
     AC_DEFINE([HAVE_LIBBRASERO_MEDIA], 1, [Have libbrasero-media])
@@ -420,22 +460,6 @@ fi
 AM_CONDITIONAL(HAVE_LIBBRASERO_MEDIA, test x$have_libbrasero_media = xyes)
 AC_SUBST(HAVE_LIBBRASERO_MEDIA)
 
-dnl libnautilus-burn support
-have_libnautilus_burn=no
-AC_ARG_WITH(libnautilus-burn,
-	    AC_HELP_STRING([--with-libnautilus-burn],
-	    		   [Build with libnautilus-burn support]),,
-	    with_libnautilus_burn=auto)
-if test x"$have_libbrasero_media" = "xno" -a x"$with_libnautilus_burn" != "xno"; then
-    PKG_CHECK_MODULES(LIBNAUTILUS_BURN, [libnautilus-burn >= $NCB_MIN_REQS], have_libnautilus_burn=yes, have_libnautilus_burn=no)
-fi
-if test "x$have_libnautilus_burn" = "xyes"; then
-    AC_DEFINE([HAVE_NAUTILUS_BURN], 1, [Have nautilus-burn])
-fi
-AM_CONDITIONAL(HAVE_NAUTILUS_BURN, test x$have_libnautilus_burn = xyes)
-AC_SUBST(HAVE_NAUTILUS_BURN)
-
-
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 
@@ -506,11 +530,12 @@ fi
 AM_CONDITIONAL(WITH_LIRC, test x"$with_lirc" = xyes)
 
 dnl WebKit
+have_webkit=no
 AC_ARG_WITH(webkit,
 	    AC_HELP_STRING([--with-webkit],
 			   [Use WebKit to display HTML]),,
-	    with_webkit_gtk=auto)
-if test "x$with_webkit_gtk" != xno; then
+	    with_webkit=auto)
+if test "x$with_webkit" != xno; then
 	PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_MIN_REQS], have_webkit=yes, have_webkit=no)
 	if test "x$have_webkit" = "xno" -a "x$with_webkit" = "xyes"; then
 		AC_MSG_ERROR([WebKit support explicitly requested, but WebKit could not be found])
@@ -636,6 +661,7 @@ dnl ================================================================
 dnl Python plugins
 dnl ================================================================
 
+
 AC_MSG_CHECKING([whether Python plugin support is requested])
 AC_ARG_ENABLE([python],
 	AS_HELP_STRING([--enable-python],[Enable python support]),
@@ -860,7 +886,6 @@ plugins/audiocd/Makefile
 plugins/coherence/Makefile
 plugins/coherence/upnp_coherence/Makefile
 plugins/audioscrobbler/Makefile
-plugins/cd-recorder/Makefile
 plugins/brasero-disc-recorder/Makefile
 plugins/daap/Makefile
 plugins/fmradio/Makefile
@@ -908,6 +933,11 @@ remote/dbus/Makefile
 ])
 
 AC_MSG_NOTICE([Rhythmbox was configured with the following options:])
+if test "$GTK_MAJ_VER" = "3.0"; then
+	AC_MSG_NOTICE([** Using GTK+3])
+else
+	AC_MSG_NOTICE([** Using GTK+2])
+fi
 if test x"$with_database" = xtree; then
 	AC_MSG_NOTICE([** Tree database is enabled])
 else
@@ -945,9 +975,7 @@ else
 	AC_MSG_NOTICE([   MTP integration disabled])
 fi
 if test x"$have_libbrasero_media" != xno; then
-	AC_MSG_NOTICE([** CD burning support enabled (using Brasero)])
-elif test x"$have_libnautilus_burn" != xno; then
-	AC_MSG_NOTICE([** CD burning support enabled (using nautilus-cd-burner)])
+	AC_MSG_NOTICE([** CD burning support enabled])
 else
 	AC_MSG_NOTICE([   CD burning support disabled])
 fi
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 650aaa7..f94ac25 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -40,11 +40,7 @@ endif
 
 if HAVE_LIBBRASERO_MEDIA
 SUBDIRS += brasero-disc-recorder
-else
-if HAVE_NAUTILUS_BURN
-SUBDIRS += cd-recorder
-endif # HAVE_NAUTILUS_BURN
-endif # HAVE_LIBBRASERO_MEDIA
+endif
 
 if USE_LIBDMAPSHARING
 SUBDIRS += daap
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]