banshee r4702 - in trunk/banshee: . build/m4/banshee build/osx

[abock svn gnome org]

Author: abock
Date: Sun Oct 19 05:38:35 2008
New Revision: 4702
URL: http://svn.gnome.org/viewvc/banshee?rev=4702&view=rev

Log:
2008-10-19  Aaron Bockover  <abock gnome org>

    * build/m4/banshee/libbanshee.m4: Require either the x11 or quartz backend
    in GDK depending on the target from GTK (based on Eoin's patch)

    * configure.ac: Show what graphics backend we'll be building against

    * build/osx/autogen.sh: Pass --disable-boo, and always restore the orignal
    configure.ac after the script runs

    * build/osx/build-deps.sh: Pull in ndesk-dbus, ndesk-dbus-glib, taglib-sharp
    and mono-addins as bundle dependencies



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/m4/banshee/libbanshee.m4
   trunk/banshee/build/osx/   (props changed)
   trunk/banshee/build/osx/README
   trunk/banshee/build/osx/autogen.sh
   trunk/banshee/build/osx/build-deps.sh
   trunk/banshee/configure.ac

Modified: trunk/banshee/build/m4/banshee/libbanshee.m4
==============================================================================
--- trunk/banshee/build/m4/banshee/libbanshee.m4	(original)
+++ trunk/banshee/build/m4/banshee/libbanshee.m4	Sun Oct 19 05:38:35 2008
@@ -10,9 +10,22 @@
 	LIBBANSHEE_LIBS=""
 	LIBBANSHEE_CFLAGS=""
 
-	PKG_CHECK_MODULES(GDK_X11, gdk-x11-2.0 >= 2.8)
-	SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GDK_X11)	
-	
+	GRAPHICS_SUBSYSTEM="Unknown"
+
+	if test x$(pkg-config --variable=target gtk+-2.0) = xx11; then
+		PKG_CHECK_MODULES(GDK_X11, gdk-x11-2.0 >= 2.8)
+		SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GDK_X11)
+		GRAPHICS_SUBSYSTEM="X11"
+	elif test x$(pkg-config --variable=target gtk+-2.0) = xquartz; then
+		PKG_CHECK_MODULES(GDK_QUARTZ, gdk-quartz-2.0 >= 2.14)
+		SHAMROCK_CONCAT_MODULE(LIBBANSHEE, GDK_QUARTZ)
+		GRAPHICS_SUBSYSTEM="Quartz"
+	fi
+
+	AM_CONDITIONAL(HAVE_X11, test "x$GRAPHICS_SUBSYSTEM" = "xX11")
+	AM_CONDITIONAL(HAVE_QUARTZ, test "x$GRAPHICS_SUBSYSTEM" = "xQuartz")
+
+	AC_SUBST(GRAPHICS_SUBSYSTEM)
 	AC_SUBST(LIBBANSHEE_CFLAGS)
 	AC_SUBST(LIBBANSHEE_LIBS)
 ])

Modified: trunk/banshee/build/osx/README
==============================================================================
--- trunk/banshee/build/osx/README	(original)
+++ trunk/banshee/build/osx/README	Sun Oct 19 05:38:35 2008
@@ -65,6 +65,7 @@
 
   Once the build environment and the bundled dependencies are built,
   as described in the four sections above, building Banshee is as
-  easy as running the build-banshee.sh script in this directory.
+  easy as running the autogen.osx.sh script in the top of the Banshee
+  checkout.
 
 

Modified: trunk/banshee/build/osx/autogen.sh
==============================================================================
--- trunk/banshee/build/osx/autogen.sh	(original)
+++ trunk/banshee/build/osx/autogen.sh	Sun Oct 19 05:38:35 2008
@@ -27,8 +27,11 @@
 	--disable-mtp \
 	--disable-daap \
 	--disable-ipod \
-	--disable-docs \
-	--disable-gnome
+	--disable-boo \
+	--disable-gnome \
+	--disable-docs
+
+mv configure.ac.orig configure.ac
 
 popd &>/dev/null
 popd &>/dev/null

Modified: trunk/banshee/build/osx/build-deps.sh
==============================================================================
--- trunk/banshee/build/osx/build-deps.sh	(original)
+++ trunk/banshee/build/osx/build-deps.sh	Sun Oct 19 05:38:35 2008
@@ -3,12 +3,18 @@
 GST_DOWNLOAD_URI="http://gstreamer.freedesktop.org/src/%n/%f";
 GST_CONFIGURE_ARGS="--disable-gtk-doc"
 
+NDBUS_DOWNLOAD_URI="http://www.ndesk.org/archive/dbus-sharp/%f";
+
 TARGETS=(
-    # name (%n)        version (%v)  dir (%d)  file (%f)  download uri          configure args
-	"liboil            0.3.15        %n-%v     %d.tar.gz  http://liboil.freedesktop.org/download/%f  ${GST_CONFIGURE_ARGS}"
-	"gstreamer         0.10.19       %n-%v     %d.tar.gz  ${GST_DOWNLOAD_URI}  ${GST_CONFIGURE_ARGS}"
-	"gst-plugins-base  0.10.19       %n-%v     %d.tar.gz  ${GST_DOWNLOAD_URI}  ${GST_CONFIGURE_ARGS}"
-	"gst-plugins-good  0.10.7        %n-%v     %d.tar.gz  ${GST_DOWNLOAD_URI}  ${GST_CONFIGURE_ARGS}"
+    # name (%n)        version (%v)  dir (%d)  file (%f)   download uri          configure args
+	"liboil            0.3.15        %n-%v     %d.tar.gz   http://liboil.freedesktop.org/download/%f  ${GST_CONFIGURE_ARGS}"
+	"gstreamer         0.10.19       %n-%v     %d.tar.gz   ${GST_DOWNLOAD_URI}                        ${GST_CONFIGURE_ARGS}"
+	"gst-plugins-base  0.10.19       %n-%v     %d.tar.gz   ${GST_DOWNLOAD_URI}                        ${GST_CONFIGURE_ARGS}"
+	"gst-plugins-good  0.10.7        %n-%v     %d.tar.gz   ${GST_DOWNLOAD_URI}                        ${GST_CONFIGURE_ARGS}"
+	"ndesk-dbus        0.6.0         %n-%v     %d.tar.gz   ${NDBUS_DOWNLOAD_URI}"
+	"ndesk-dbus-glib   0.4.1         %n-%v     %d.tar.gz   ${NDBUS_DOWNLOAD_URI}"
+	"taglib-sharp      2.0.3.0       %n-%v     %d.tar.gz   http://www.taglib-sharp.com/Download/%f    --disable-docs"
+	"mono-addins       0.3.1         %n-%v     %d.tar.bz2  http://go-mono.com/sources/mono-addins/%f  --disable-docs"
 )
 
 # There's probably no need to modify anything below
@@ -66,7 +72,7 @@
 
 which wget &>/dev/null || bail "You need to install wget (sudo port install wget)"
 
-SOURCES_ROOT=sources
+SOURCES_ROOT=bundle-deps-src
 mkdir -p $SOURCES_ROOT
 pushd $SOURCES_ROOT &>/dev/null
 

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Sun Oct 19 05:38:35 2008
@@ -246,6 +246,7 @@
     Boo Scripting:     ${enable_boo}
     X11 Video Support: ${have_xvidmode}
     GNOME Support:     ${enable_gnome}
+    Graphics System:   ${GRAPHICS_SUBSYSTEM}
 
     Unit Tests:        ${do_tests}	(requires nunit >= ${NUNIT_REQUIRED})
 "