commit 74275a1f7b84d950877ede9751aaeee9c2d98cc1
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Sun Dec 19 16:28:49 2010 +0000
Configuration fixes
* configure.in
* Improve conditionals on available library components so that filetype
plugins are only compiled if dependencies are present
* Check for gstreamer-interfaces as well as gstreamer since we use
xoverlay for displaying videos
* details.c
* Fix deprecation for GtkNotebookPage
* default.profile
* Since ogg file type is optional then the plugin cannot be specified as
mandatory
* gp_private.h
* Give anonymous enums names
configure.in | 46 +++++++++++++++++--------------------
data/default.profile | 7 -----
libgtkpod/gp_private.h | 16 +++++++++----
plugins/details_editor/details.c | 2 +-
plugins/filetype_flac/Makefile.am | 6 ++--
plugins/filetype_m4a/Makefile.am | 8 +++---
plugins/filetype_mp4/Makefile.am | 8 +++---
plugins/filetype_ogg/Makefile.am | 8 +++---
8 files changed, 48 insertions(+), 53 deletions(-)
---
diff --git a/configure.in b/configure.in
index 946f68c..eb074d1 100644
--- a/configure.in
+++ b/configure.in
@@ -175,7 +175,7 @@ else
[coverweb="no"])
fi
-AM_CONDITIONAL(HAVE_PLUGIN_COVERWEB, [test x$coverweb = xyes])
+AM_CONDITIONAL(HAVE_PLUGIN_COVERWEB, [test "x$coverweb" = "xyes"])
dnl Check for gstreamer
dnl -------------------------------------------------------------
@@ -197,9 +197,14 @@ else
[gstreamer-0.10 >= 0.10.25],
[media_player="yes"],
[media_player="no"])
+
+ PKG_CHECK_MODULES(GSTREAMER_INTERFACES,
+ [gstreamer-interfaces-0.10 >= 0.10.25],
+ [media_player="yes"],
+ [media_player="no"])
fi
-AM_CONDITIONAL(HAVE_PLUGIN_MEDIA_PLAYER, [test x$media_player = xyes])
+AM_CONDITIONAL(HAVE_PLUGIN_MEDIA_PLAYER, [test "x$media_player" = "xyes"])
dnl Check for libvorbisfile and libvorbis
AC_ARG_WITH(ogg, AC_HELP_STRING([--without-ogg], [Disable Ogg/Vorbis support]))
@@ -222,13 +227,11 @@ if test "x$with_ogg" != "xno"; then
AC_MSG_ERROR([Ogg/Vorbis support explicitly requested but ogg/vorbis
libs couldn't be found])
fi
fi
-AM_CONDITIONAL(HAVE_LIBVORBISFILE, test "x$have_ogg" = "xyes")
+
if test "x$have_ogg" = "xyes"; then
- have_ogg="yes -- will build with ogg support"
AC_DEFINE(HAVE_LIBVORBISFILE, 1, [Define if you have the ogg/vorbis
library])
-else
- have_ogg="*no -- will build without ogg support"
fi
+AM_CONDITIONAL(HAVE_LIBVORBISFILE, test "x$have_ogg" = "xyes")
dnl Check for FLAC
AC_ARG_WITH(flac, AC_HELP_STRING([--without-flac], [Disable FLAC support]))
@@ -243,22 +246,21 @@ if test "x$with_flac" != "xno"; then
AC_MSG_ERROR([FLAC support explicitly requested but flac libs couldn't
be found])
fi
fi
-AM_CONDITIONAL(HAVE_FLAC, test "x$have_flac" = "xyes")
+
if test "x$have_flac" = "xyes"; then
- have_flac="yes -- will build with FLAC support"
AC_DEFINE(HAVE_FLAC, 1, [Define if you have the flac library])
-else
- have_flac="*no -- will build without FLAC support"
fi
+AM_CONDITIONAL(HAVE_FLAC, test "x$have_flac" = "xyes")
dnl Check for MP4 Headers
-AC_CHECK_HEADERS([mp4v2/platform.h])
+AC_CHECK_HEADERS([mp4v2/platform.h], have_mp4=yes, have_mp4=no)
AC_CHECK_HEADERS([mp4v2/itmf_tags.h], [], [],
[#ifdef HAVE_MP4V2_PLATFORM_H
# include <mp4v2/platform.h>
#endif
typedef void* MP4FileHandle;
])
+AM_CONDITIONAL(HAVE_MP4, test "x$have_mp4" = "xyes")
dnl Additional libs maybe needed when compiling under solaris
AC_SEARCH_LIBS(bind, ["socket" "nsl" "socket -lnsl"])
@@ -459,9 +461,6 @@ Core Configuration for $PACKAGE $VERSION :
GTK2 version .........: `$PKG_CONFIG gtk+-2.0 --modversion`
GLib2/GThread version : `$PKG_CONFIG gthread-2.0 --modversion`
libgpod version ......: $libgpod_version
- libcurl ..............: $have_curl
- vorbisfile ...........: $have_ogg
- FLAC .................: $have_flac
Preprocessor .........: $CC $CPPFLAGS
Compiler .............: $CC $CFLAGS
Linker ...............: $CC $LDFLAGS $LIBS
@@ -470,17 +469,14 @@ Core Configuration for $PACKAGE $VERSION :
echo "
Plugin Configuration :
---------------------------------"
-if [ $HAVE_PLUGIN_COVERWEB ]; then
- echo " CoverWeb Browser .....: Yes"
-else
- echo " CoverWeb Browser .....: No"
-fi
-
-if [ $HAVE_PLUGIN_MEDIA_PLAYER ]; then
- echo " Media Player .....: Yes"
-else
- echo " Media Player .....: No"
-fi
+echo " CoverWeb Browser .....: $coverweb"
+echo " Media Player .....: $media_player"
+echo " MP4 File Type .....: $have_mp4"
+echo " M4A File Type .....: $have_mp4"
+echo " Flac File Type .....: $have_flac"
+echo " Ogg File Type .....: $have_ogg"
+
+echo " Support for cover download .....: $have_curl"
echo "
Now type 'make' to build $PACKAGE $VERSION,
diff --git a/data/default.profile b/data/default.profile
index 19f647d..d18248e 100644
--- a/data/default.profile
+++ b/data/default.profile
@@ -7,13 +7,6 @@
attribute="Location"
value="filetype_mp3:MP3FileTypePlugin"/>
</plugin>
- <plugin name="OGG File Type Plugin"
- url="http://www.gtkpod.org/plugins/";
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Location"
- value="filetype_ogg:OGGFileTypePlugin"/>
- </plugin>
<plugin name="Sorttab Display Plugin"
url="http://www.gtkpod.org/plugins/";
mandatory="yes">
diff --git a/libgtkpod/gp_private.h b/libgtkpod/gp_private.h
index 07751aa..b60182c 100644
--- a/libgtkpod/gp_private.h
+++ b/libgtkpod/gp_private.h
@@ -47,14 +47,20 @@
#define DND_GTKPOD_PLAYLISTLIST_TYPE "application/gtkpod-playlistlist"
/* Drag and drop types */
-enum {
- DND_GTKPOD_TRACKLIST = 1000, DND_GTKPOD_TM_PATHLIST,
DND_GTKPOD_PLAYLISTLIST, DND_TEXT_URI_LIST, DND_TEXT_PLAIN, DND_IMAGE_JPEG
+enum GtkPodDndTypes {
+ DND_GTKPOD_TRACKLIST = 1000,
+ DND_GTKPOD_TM_PATHLIST,
+ DND_GTKPOD_PLAYLISTLIST,
+ DND_TEXT_URI_LIST,
+ DND_TEXT_PLAIN,
+ DND_IMAGE_JPEG
};
/* types for sort */
-enum {
- SORT_ASCENDING = GTK_SORT_ASCENDING, SORT_DESCENDING =
GTK_SORT_DESCENDING, SORT_NONE = 10 * (GTK_SORT_ASCENDING
- + GTK_SORT_DESCENDING),
+enum GtkPodSortTypes {
+ SORT_ASCENDING = GTK_SORT_ASCENDING,
+ SORT_DESCENDING = GTK_SORT_DESCENDING,
+ SORT_NONE = 10 * (GTK_SORT_ASCENDING + GTK_SORT_DESCENDING)
};
/* print some timing info for tuning purposes */
diff --git a/plugins/details_editor/details.c b/plugins/details_editor/details.c
index 20ec315..073259b 100644
--- a/plugins/details_editor/details.c
+++ b/plugins/details_editor/details.c
@@ -191,7 +191,7 @@ static void details_writethrough_toggled(GtkCheckButton
*button) {
details_update_buttons();
}
-static void details_notebook_page_changed(GtkNotebook *notebook,
GtkNotebookPage *page, guint page_num, gpointer user_data) {
+static void details_notebook_page_changed(GtkNotebook *notebook, GtkWidget
*page, guint page_num, gpointer user_data) {
prefs_set_int(DETAILS_WINDOW_NOTEBOOK_PAGE, page_num);
}
diff --git a/plugins/filetype_flac/Makefile.am
b/plugins/filetype_flac/Makefile.am
index 59cb147..272b12d 100644
--- a/plugins/filetype_flac/Makefile.am
+++ b/plugins/filetype_flac/Makefile.am
@@ -1,4 +1,4 @@
-#ifdef HAVE_FLAC
+if HAVE_FLAC
plugin_name = filetype_flac
plugin_lib = lib$(plugin_name).so
@@ -37,11 +37,11 @@ libfiletype_flac_la_LIBADD = \
$(LIBGTKPOD_LIBS) \
$(LIBANJUTA_LIBS)
+endif
+
EXTRA_DIST = \
$(plugin_in_files) \
$(filetype_flac_plugin_DATA) \
$(filetype_flac_ui_DATA) \
$(filetype_flac_glade_DATA) \
$(filetype_flac_pixmaps_DATA)
-
-#endif
\ No newline at end of file
diff --git a/plugins/filetype_m4a/Makefile.am b/plugins/filetype_m4a/Makefile.am
index 2f47653..2624bdc 100644
--- a/plugins/filetype_m4a/Makefile.am
+++ b/plugins/filetype_m4a/Makefile.am
@@ -1,4 +1,4 @@
-#ifdef HAVE_LIBMP4V2
+if HAVE_MP4
plugin_name = filetype_m4a
plugin_lib = lib$(plugin_name).so
@@ -38,11 +38,11 @@ libfiletype_m4a_la_LIBADD = \
$(LIBGTKPOD_LIBS) \
$(LIBANJUTA_LIBS)
+endif
+
EXTRA_DIST = \
$(plugin_in_files) \
$(filetype_m4a_plugin_DATA) \
$(filetype_m4a_ui_DATA) \
$(filetype_m4a_glade_DATA) \
- $(filetype_m4a_pixmaps_DATA)
-
-#endif
\ No newline at end of file
+ $(filetype_m4a_pixmaps_DATA)
\ No newline at end of file
diff --git a/plugins/filetype_mp4/Makefile.am b/plugins/filetype_mp4/Makefile.am
index f7b0385..30e62e6 100644
--- a/plugins/filetype_mp4/Makefile.am
+++ b/plugins/filetype_mp4/Makefile.am
@@ -1,4 +1,4 @@
-#ifdef HAVE_LIBMP4V2
+if HAVE_MP4
plugin_name = filetype_mp4
plugin_lib = lib$(plugin_name).so
@@ -37,11 +37,11 @@ libfiletype_mp4_la_LIBADD = \
$(LIBGTKPOD_LIBS) \
$(LIBANJUTA_LIBS)
+endif
+
EXTRA_DIST = \
$(plugin_in_files) \
$(filetype_mp4_plugin_DATA) \
$(filetype_mp4_ui_DATA) \
$(filetype_mp4_glade_DATA) \
- $(filetype_mp4_pixmaps_DATA)
-
-#endif
\ No newline at end of file
+ $(filetype_mp4_pixmaps_DATA)
\ No newline at end of file
diff --git a/plugins/filetype_ogg/Makefile.am b/plugins/filetype_ogg/Makefile.am
index 6d7ca3d..160daa9 100644
--- a/plugins/filetype_ogg/Makefile.am
+++ b/plugins/filetype_ogg/Makefile.am
@@ -1,4 +1,4 @@
-#ifdef HAVE_LIBVORBISFILE
+if HAVE_LIBVORBISFILE
plugin_name = filetype_ogg
plugin_lib = lib$(plugin_name).so
@@ -37,11 +37,11 @@ libfiletype_ogg_la_LIBADD = \
$(LIBGTKPOD_LIBS) \
$(LIBANJUTA_LIBS)
+endif
+
EXTRA_DIST = \
$(plugin_in_files) \
$(filetype_ogg_plugin_DATA) \
$(filetype_ogg_ui_DATA) \
$(filetype_ogg_glade_DATA) \
- $(filetype_ogg_pixmaps_DATA)
-
-#endif
\ No newline at end of file
+ $(filetype_ogg_pixmaps_DATA)
\ No newline at end of file
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
