GNOME.org
 

[gnome-media] Port to GTK+ 3.0

commit b5de28173045741ba81fb3d57d004a80c24d340f
Author: Frédéric Péters <fpeters 0d be>
Date:   Tue Jul 13 21:43:59 2010 +0200

    Port to GTK+ 3.0
    
    This includes a rename of the libgnome-media-profiles.so library (renamed to
    libgnome-media-profiles-3.0.so); but the issue of a shared gconf schema
    is not solved, and the fix will probably be in a GSettings port later.
    
    Also it depends on an unrealeased gladeui-3.0 library to register the profile
    widget in the glade3 catalog.

 configure.ac                                       |   29 ++++++++++---------
 grecord/src/Makefile.am                            |    2 +-
 profiles/Makefile.am                               |   18 ++++++------
 ...ofiles.pc.in => gnome-media-profiles-3.0.pc.in} |    6 ++--
 4 files changed, 28 insertions(+), 27 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6205efe..7622885 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,10 +69,10 @@ dnl=======================================================================
 
 PKG_CHECK_MODULES(SOUND_THEME,
         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-        gtk+-2.0 >= $GTK_REQUIRED_VERSION
+        gtk+-3.0 >= $GTK_REQUIRED_VERSION
         gio-2.0
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
-        libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION
+        libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
         libxml-2.0,
         have_soundtheme=yes,
         have_soundtheme=no)
@@ -111,10 +111,10 @@ if test "x$enable_pulseaudio" != "xno"; then
   if test "x$have_pulseaudio" = "xyes" ; then
     PKG_CHECK_MODULES(VOLUME_CONTROL,
             gobject-2.0 >= $GLIB_REQUIRED_VERSION
-            gtk+-2.0 >= $GTK_REQUIRED_VERSION
+            gtk+-3.0 >= $GTK_REQUIRED_VERSION
             gio-2.0
             gconf-2.0 >= $GCONF_REQUIRED_VERSION
-            libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION
+            libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
             unique-1.0
             libxml-2.0
     )
@@ -122,10 +122,10 @@ if test "x$enable_pulseaudio" != "xno"; then
     AC_SUBST(VOLUME_CONTROL_LIBS)
     PKG_CHECK_MODULES(VOLUME_PANEL,
             gobject-2.0 >= $GLIB_REQUIRED_VERSION
-            gtk+-2.0 >= $GTK_REQUIRED_VERSION
+            gtk+-3.0 >= $GTK_REQUIRED_VERSION
             gio-2.0
             gconf-2.0 >= $GCONF_REQUIRED_VERSION
-            libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION
+            libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
             libgnome-control-center
             libxml-2.0
     )
@@ -157,7 +157,7 @@ AC_ARG_ENABLE([profiles],
 
 if test "x$enable_profiles" = "xyes"; then
   PKG_CHECK_MODULES(GMP, [
-    gtk+-2.0 >= $GTK_REQUIRED_VERSION
+    gtk+-3.0 >= $GTK_REQUIRED_VERSION
     gstreamer-0.10
     gconf-2.0
     gio-2.0],
@@ -170,15 +170,16 @@ AM_CONDITIONAL(HAVE_GMP, [test x$have_profiles = xyes])
 dnl Profiles glade ui: needed to edit .ui files with glade3
 have_gladeui=no
 
-PKG_CHECK_MODULES(GLADEUI, [gladeui-1.0], have_gladeui=yes, have_gladeui=no)
+# gladeui-3.0 is hypothetical
+PKG_CHECK_MODULES(GLADEUI, [gladeui-3.0], have_gladeui=yes, have_gladeui=no)
 AC_SUBST(GLADEUI_CFLAGS)
 AC_SUBST(GLADEUI_LIBS)
 AM_CONDITIONAL(HAVE_GLADEUI, [test x$have_gladeui = xyes])
 
-GLADEUI_CATALOG_DIR="`$PKG_CONFIG --variable=catalogdir gladeui-1.0`"
+GLADEUI_CATALOG_DIR="`$PKG_CONFIG --variable=catalogdir gladeui-3.0`"
 AC_SUBST(GLADEUI_CATALOG_DIR)
 
-GLADEUI_MODULE_DIR="`$PKG_CONFIG --variable=moduledir gladeui-1.0`"
+GLADEUI_MODULE_DIR="`$PKG_CONFIG --variable=moduledir gladeui-3.0`"
 AC_SUBST(GLADEUI_MODULE_DIR)
 
 dnl=======================================================================
@@ -199,7 +200,7 @@ have_gst=no
 PKG_CHECK_MODULES(GSR, [
   gstreamer-$GST_MAJORMINOR >= $GST_REQ
   gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ
-  gtk+-2.0 >= 2.6.0
+  gtk+-3.0 >= 2.6.0
   gio-2.0
   gconf-2.0],
   have_gst=yes,
@@ -274,7 +275,7 @@ if test "x$have_gst" = "xyes" && test "x$enable_gstprops" = "xyes";
 then
   PKG_CHECK_MODULES(GSTPROPS, [
     glib-2.0
-    gtk+-2.0 >= $GTK_REQUIRED_VERSION
+    gtk+-3.0 >= $GTK_REQUIRED_VERSION
     gconf-2.0
     gstreamer-$GST_MAJORMINOR
     gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ
@@ -312,7 +313,7 @@ fi
 if test "x$have_gst" = "xyes" && test "x$enable_gstmix" = "xyes";
 then
   PKG_CHECK_MODULES(GSTMIXER, [
-    gtk+-2.0
+    gtk+-3.0
     gconf-2.0
     gstreamer-$GST_MAJORMINOR
     gstreamer-plugins-base-$GST_MAJORMINOR
@@ -444,7 +445,7 @@ gst-mixer/pixmaps/Makefile
 gst-mixer/doc/Makefile
 profiles/Makefile
 profiles/gnome-audio-profiles.schemas.in
-profiles/gnome-media-profiles.pc
+profiles/gnome-media-profiles-3.0.pc
 profiles/glade/Makefile
 profiles/help/Makefile
 grecord/gnome-sound-recorder.desktop.in
diff --git a/grecord/src/Makefile.am b/grecord/src/Makefile.am
index 313da42..19e7d1b 100644
--- a/grecord/src/Makefile.am
+++ b/grecord/src/Makefile.am
@@ -25,6 +25,6 @@ EXTRA_DIST = $(ui_DATA)
 gnome_sound_recorder_LDADD =					\
 	-lm							\
 	$(GSR_LIBS) -lgstinterfaces- GST_MAJORMINOR@		\
-	$(top_builddir)/profiles/libgnome-media-profiles.la
+	$(top_builddir)/profiles/libgnome-media-profiles-3.0.la
 
 -include $(top_srcdir)/git.mk
diff --git a/profiles/Makefile.am b/profiles/Makefile.am
index 2708463..bb1b34b 100644
--- a/profiles/Makefile.am
+++ b/profiles/Makefile.am
@@ -12,10 +12,10 @@ if HAVE_GSTREAMER
 noinst_PROGRAMS += gnome-audio-profiles-test
 gnome_audio_profiles_test_SOURCES = gnome-audio-profiles-test.c
 gnome_audio_profiles_test_CFLAGS = $(GMP_CFLAGS) $(GSR_CFLAGS) $(defines) -I$(top_srcdir)
-gnome_audio_profiles_test_LDADD = libgnome-media-profiles.la $(GMP_LIBS) $(GSR_LIBS)
+gnome_audio_profiles_test_LDADD = libgnome-media-profiles-3.0.la $(GMP_LIBS) $(GSR_LIBS)
 endif
 
-lib_LTLIBRARIES = libgnome-media-profiles.la
+lib_LTLIBRARIES = libgnome-media-profiles-3.0.la
 
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
@@ -25,9 +25,9 @@ ui_DATA = gnome-audio-profile-new.ui gnome-audio-profile-edit.ui
 
 gnome_audio_profiles_properties_SOURCES = gnome-audio-profiles-properties.c
 gnome_audio_profiles_properties_CFLAGS = $(GMP_CFLAGS) $(defines) -I$(top_srcdir)
-gnome_audio_profiles_properties_LDADD = libgnome-media-profiles.la $(GMP_LIBS)
+gnome_audio_profiles_properties_LDADD = libgnome-media-profiles-3.0.la $(GMP_LIBS)
 
-libgnome_media_profiles_la_SOURCES = \
+libgnome_media_profiles_3_0_la_SOURCES = \
 	audio-profile.c \
 	audio-profiles-edit.c \
 	audio-profile-edit.c \
@@ -41,7 +41,7 @@ noinst_HEADERS = \
 	gmp-util.h
 
 
-gmpincludedir = $(includedir)/gnome-media/profiles
+gmpincludedir = $(includedir)/gnome-media-3.0/profiles
 gmpinclude_HEADERS = \
 	audio-profile.h \
 	audio-profile-choose.h \
@@ -49,9 +49,9 @@ gmpinclude_HEADERS = \
 	audio-profiles-edit.h \
 	gnome-media-profiles.h
 
-libgnome_media_profiles_la_CFLAGS = $(GMP_CFLAGS) $(defines) -I$(top_srcdir)
-libgnome_media_profiles_la_LIBADD = $(GMP_LIBS)
-libgnome_media_profiles_la_LDFLAGS = -no-undefined
+libgnome_media_profiles_3_0_la_CFLAGS = $(GMP_CFLAGS) $(defines) -I$(top_srcdir)
+libgnome_media_profiles_3_0_la_LIBADD = $(GMP_LIBS)
+libgnome_media_profiles_3_0_la_LDFLAGS = -no-undefined
 
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = gnome-audio-profiles.schemas
@@ -66,7 +66,7 @@ install-data-local:
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnome-media-profiles.pc
+pkgconfig_DATA = gnome-media-profiles-3.0.pc
 EXTRA_DIST = $(ui_DATA) $(schema_DATA) $(pkgconfig_DATA)
 
 CLEANFILES = $(schema_DATA)
diff --git a/profiles/gnome-media-profiles.pc.in b/profiles/gnome-media-profiles-3.0.pc.in
similarity index 66%
rename from profiles/gnome-media-profiles.pc.in
rename to profiles/gnome-media-profiles-3.0.pc.in
index 24b2b41..be494e9 100644
--- a/profiles/gnome-media-profiles.pc.in
+++ b/profiles/gnome-media-profiles-3.0.pc.in
@@ -1,13 +1,13 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
-includedir= includedir@/gnome-media
+includedir= includedir@/gnome-media-3.0
 toolsdir=${exec_prefix}/bin
 
 Name: GNOME Media Profiles
 Description: Media Profiles describing audio codec settings for output
-Requires: gconf-2.0, gtk+-2.0
+Requires: gconf-2.0, gtk+-3.0
 Version: @VERSION@
-Libs: -L${libdir} -lgnome-media-profiles
+Libs: -L${libdir} -lgnome-media-profiles-3.0
 Cflags: -I${includedir}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]