Attachment #260270 for bug #352040

View | Details | Raw Unified | Return to bug 352040
Collapse All | Expand All

Lines 35-41 Link Here

(-)a/backends/gstreamer/rb-encoder-gst.c (+6 lines)
35	#include <gst/gst.h>	35	#include <gst/gst.h>
36	#include <gst/tag/tag.h>	36	#include <gst/tag/tag.h>
37	#include <string.h>	37	#include <string.h>
		38
		39	#if defined(HAVE_LIBGNOME_MEDIA_PROFILES)
		40	#include <libgnome-media-profiles/gnome-media-profiles.h>
		41	#else
38	#include <profiles/gnome-media-profiles.h>	42	#include <profiles/gnome-media-profiles.h>
		43	#endif
		44
39	#include <gtk/gtk.h>	45	#include <gtk/gtk.h>
40	#include <gio/gio.h>	46	#include <gio/gio.h>
41	#include <gst/pbutils/missing-plugins.h>	47	#include <gst/pbutils/missing-plugins.h>




		  glib-2.0 >= $GLIB_REQS		\
		  gio-2.0 >= $GLIB_REQS			\
		  gio-unix-2.0 >= $GLIB_REQS		\
		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
		  libsoup-2.4 >= $LIBSOUP_REQS		\
		  libsoup-gnome-2.4 >= $LIBSOUP_REQS)

dnl check for gnome-media-profiles or libgnome-media-profiles-3.0
PKG_CHECK_MODULES(GNOME_MEDIA_PROFILES,
	gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS,
	have_gnome_media_profiles=yes, have_gnome_media_profiles=no)
if test "x$have_gnome_media_profiles" != "xyes"; then
	PKG_CHECK_MODULES(GNOME_MEDIA_PROFILES, libgnome-media-profiles-3.0 >= GNOME_MEDIA_PROFILES_REQS)
	AC_DEFINE(HAVE_LIBGNOME_MEDIA_PROFILES,1,[Define if you have libgnome-media-profiles installed])
fi
RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GNOME_MEDIA_PROFILES_LIBS"
RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $GNOME_MEDIA_PROFILES_CFLAGS"

PKG_CHECK_MODULES(TOTEM_PLPARSER, totem-plparser >= $TOTEM_PLPARSER_REQS, have_totem_plparser=yes, have_totem_plparser=no)
if test x$have_totem_plparser != xyes; then
   AC_MSG_ERROR([totem playlist parsing library not found or too old])

Lines 54-61 Link Here

(-)a/sources/rb-library-source.c (+6 lines)
54		54
55	#include "rb-track-transfer-batch.h"	55	#include "rb-track-transfer-batch.h"
56	#include "rb-track-transfer-queue.h"	56	#include "rb-track-transfer-queue.h"
		57
		58	#if defined(HAVE_LIBGNOME_MEDIA_PROFILES)
		59	#include <libgnome-media-profiles/gnome-media-profiles.h>
		60	#include <libgnome-media-profiles/audio-profile-choose.h>
		61	#else
57	#include <profiles/gnome-media-profiles.h>	62	#include <profiles/gnome-media-profiles.h>
58	#include <profiles/audio-profile-choose.h>	63	#include <profiles/audio-profile-choose.h>
		64	#endif
59		65
60	#include "rhythmdb.h"	66	#include "rhythmdb.h"
61	#include "rb-debug.h"	67	#include "rb-debug.h"

Return to bug 352040

Lines 91-100 PKG_CHECK_MODULES(RHYTHMBOX, \ Link Here

(-)a/configure.ac (-1 / +11 lines)
91	glib-2.0 >= $GLIB_REQS \	91	glib-2.0 >= $GLIB_REQS \
92	gio-2.0 >= $GLIB_REQS \	92	gio-2.0 >= $GLIB_REQS \
93	gio-unix-2.0 >= $GLIB_REQS \	93	gio-unix-2.0 >= $GLIB_REQS \
94	gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
95	libsoup-2.4 >= $LIBSOUP_REQS \	94	libsoup-2.4 >= $LIBSOUP_REQS \
96	libsoup-gnome-2.4 >= $LIBSOUP_REQS)	95	libsoup-gnome-2.4 >= $LIBSOUP_REQS)
97		96
		97	dnl check for gnome-media-profiles or libgnome-media-profiles-3.0
		98	PKG_CHECK_MODULES(GNOME_MEDIA_PROFILES,
		99	gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS,
		100	have_gnome_media_profiles=yes, have_gnome_media_profiles=no)
		101	if test "x$have_gnome_media_profiles" != "xyes"; then
		102	PKG_CHECK_MODULES(GNOME_MEDIA_PROFILES, libgnome-media-profiles-3.0 >= GNOME_MEDIA_PROFILES_REQS)
		103	AC_DEFINE(HAVE_LIBGNOME_MEDIA_PROFILES,1,[Define if you have libgnome-media-profiles installed])
		104	fi
		105	RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GNOME_MEDIA_PROFILES_LIBS"
		106	RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $GNOME_MEDIA_PROFILES_CFLAGS"
		107
98	PKG_CHECK_MODULES(TOTEM_PLPARSER, totem-plparser >= $TOTEM_PLPARSER_REQS, have_totem_plparser=yes, have_totem_plparser=no)	108	PKG_CHECK_MODULES(TOTEM_PLPARSER, totem-plparser >= $TOTEM_PLPARSER_REQS, have_totem_plparser=yes, have_totem_plparser=no)
99	if test x$have_totem_plparser != xyes; then	109	if test x$have_totem_plparser != xyes; then
100	AC_MSG_ERROR([totem playlist parsing library not found or too old])	110	AC_MSG_ERROR([totem playlist parsing library not found or too old])