GNOME.org
 

banshee r4714 - in trunk/banshee: . build/m4/shamrock build/osx

Author: abock
Date: Wed Oct 22 04:17:52 2008
New Revision: 4714
URL: http://svn.gnome.org/viewvc/banshee?rev=4714&view=rev

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

    This commit fixes a number of OS X build issues and eliminates all 
    dependencies on macports. It is now possible to build Banshee simply by
    installing Xcode and the Mono 2.0 SDK

    * build/osx/build.env: No longer require macports to bootstrap the 
    bundle dependencies

    * build/osx/oss-00-base-libs.targets: New targets, including intltool and
    gettext so we can fully host the dependency build environment; no longer
    do we require pieces from macports 

    * build/osx/build-deps.sh: Use curl instead of wget (provided by macports)

    * build/m4/shamrock/i18n.m4:
    * configure.ac:
    * autogen.sh: Use only intltool, not a mix of gettext and intltool, which
    we've used for quite some time and I'm not sure why



Added:
   trunk/banshee/build/osx/oss-00-base-libs.targets
   trunk/banshee/build/osx/oss-05-xiph-libs.targets
      - copied unchanged from r4713, /trunk/banshee/build/osx/oss-00-xiph-libs.targets
Removed:
   trunk/banshee/build/osx/oss-00-xiph-libs.targets
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/autogen.sh
   trunk/banshee/build/m4/shamrock/i18n.m4
   trunk/banshee/build/osx/build-deps.sh
   trunk/banshee/build/osx/build.env
   trunk/banshee/build/osx/gst-plugins-base-docs-fix.patch
   trunk/banshee/build/osx/gstreamer-docs-fix.patch
   trunk/banshee/build/osx/oss-10-extra-libs.targets
   trunk/banshee/configure.ac

Modified: trunk/banshee/autogen.sh
==============================================================================
--- trunk/banshee/autogen.sh	(original)
+++ trunk/banshee/autogen.sh	Wed Oct 22 04:17:52 2008
@@ -57,11 +57,10 @@
 check_autotool_version automake 1.9
 check_autotool_version autoconf 2.53
 check_autotool_version $LIBTOOLIZE 1.4.3
-check_autotool_version glib-gettextize 2.0.0
-check_autotool_version intltoolize 0.21.0
+check_autotool_version intltoolize 0.35.0
 check_autotool_version pkg-config 0.14.0
 
-run glib-gettextize --force --copy
+run intltoolize --force --copy
 run $LIBTOOLIZE --force --copy --automake
 run aclocal -I build/m4/banshee -I build/m4/shamrock $ACLOCAL_FLAGS
 run autoconf

Modified: trunk/banshee/build/m4/shamrock/i18n.m4
==============================================================================
--- trunk/banshee/build/m4/shamrock/i18n.m4	(original)
+++ trunk/banshee/build/m4/shamrock/i18n.m4	Wed Oct 22 04:17:52 2008
@@ -1,13 +1,9 @@
 AC_DEFUN([SHAMROCK_CONFIGURE_I18N],
 [
-	#IT_PROG_INTLTOOL([0.35.0])
-	#AC_PROG_INTLTOOL([0.21])
-
 	ALL_LINGUAS=`grep -v '^#' $srcdir/po/LINGUAS | sed -r ':a;N;$!ba;s/\n/ /g; s/[ ]+/ /g'`
 	GETTEXT_PACKAGE=$1
 	AC_SUBST(GETTEXT_PACKAGE)
 	AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
-	AM_GLIB_GNU_GETTEXT
 	AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
 ])
 

Modified: trunk/banshee/build/osx/build-deps.sh
==============================================================================
--- trunk/banshee/build/osx/build-deps.sh	(original)
+++ trunk/banshee/build/osx/build-deps.sh	Wed Oct 22 04:17:52 2008
@@ -71,8 +71,6 @@
 	done
 fi
 
-which wget &>/dev/null || bail "You need to install wget (sudo port install wget)"
-
 SOURCES_ROOT=bundle-deps-src
 mkdir -p $SOURCES_ROOT
 pushd $SOURCES_ROOT &>/dev/null
@@ -99,7 +97,7 @@
 		# Download the tarball
 		if [ ! -a $TARGET_FILE ]; then
 			echo "--> Downloading ${TARGET_FILE}..."
-			wget -q $TARGET_URI || bail "Failed to download: ${TARGET_NAME}" $?
+			curl -Lsf -O $TARGET_URI || bail "Failed to download: ${TARGET_NAME}" $?
 		fi
 
 		# Extract the tarball
@@ -114,11 +112,6 @@
 	fi
 
 	pushd $TARGET_DIR &>/dev/null
-		CONFIGURE=./configure
-		if [ -f ./autogen.sh ]; then
-			CONFIGURE=./autogen.sh
-		fi
-
 		if [ ! -f patched ]; then
 			patches=$(find ../.. -maxdepth 1 -name ${TARGET_NAME}\*.patch)
 			for patch in $patches; do
@@ -127,6 +120,11 @@
 				touch patched
 			done
 		fi
+		
+		CONFIGURE=./configure
+		if [ -f ../../${TARGET_NAME}-autogen.sh ]; then
+			CONFIGURE=../../${TARGET_NAME}-autogen.sh
+		fi
 
 		run $CONFIGURE --prefix=$BUILD_PREFIX $TARGET_CONFIGURE_ARGS
 		run make clean
@@ -137,9 +135,12 @@
 
 popd &>/dev/null
 
+echo "Collecting dependencies for bundle..."
 ./collect-deps.sh
 
 popd &>/dev/null
 
 test -f $BUILD_LOG && rm $BUILD_LOG
 
+echo "Success! Done."
+

Modified: trunk/banshee/build/osx/build.env
==============================================================================
--- trunk/banshee/build/osx/build.env	(original)
+++ trunk/banshee/build/osx/build.env	Wed Oct 22 04:17:52 2008
@@ -2,7 +2,7 @@
 # the XCode, Mono 2.0, and MacPorts installations
 MAC_SDK_PATH="/Developer/SDKs/MacOSX10.4u.sdk"
 MONO_SDK_PATH="/Library/Frameworks/Mono.framework/Versions/Current/"
-MACPORTS_SDK_PATH="/opt/local/bin"
+#MACPORTS_SDK_PATH="/opt/local/bin"
 
 # Where GStreamer and other Banshee dependencies that will
 # end up being bundled should be installed for the build.
@@ -13,9 +13,13 @@
 # TODO: This really needs trimming and verifying. I think we are 
 #       pulling in way too much stuff here, criss crossing environments
 
-export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$MONO_SDK_PATH/lib/pkgconfig:$MONO_SDK_PATH/share/pkgconfig:$BUILD_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"
-export PATH="$MACPORTS_SDK_PATH:$MONO_SDK_PATH/bin:$PATH"
-export LDFLAGS="-L$MONO_SDK_PATH/lib $LDFLAGS"
-export CFLAGS="-I$BUILD_PREFIX/inlcude -isysroot $MAC_SDK_PATH -mmacosx-version-min=10.4 -I$MONO_SDK_PATH/include $CFLAGS"
-export LD_LIBRARY_PATH="$MONO_SDK_PATH/lib:$LD_LIBRARY_PATH"
-export ACLOCAL_FLAGS="-I $MONO_SDK_PATH/share/aclocal -I /opt/local/share/aclocal"
+export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig:$MONO_SDK_PATH/lib/pkgconfig:$MONO_SDK_PATH/share/pkgconfig"
+export PATH="$BUILD_PREFIX/bin:$MONO_SDK_PATH/bin:/usr/bin:/bin"
+export LDFLAGS="-L$BUILD_PREFIX/lib -L$MONO_SDK_PATH/lib $LDFLAGS"
+export CFLAGS="-I$BUILD_PREFIX/inlcude -I$MONO_SDK_PATH/include -isysroot $MAC_SDK_PATH -mmacosx-version-min=10.4 $CFLAGS"
+export LD_LIBRARY_PATH="$BUILD_PREFIX/lib:$MONO_SDK_PATH/lib:$LD_LIBRARY_PATH"
+export ACLOCAL_FLAGS="-I $BUILD_PREFIX/share/aclocal -I $MONO_SDK_PATH/share/aclocal"
+
+#rm -f /tmp/install
+#ln -s /Library/Frameworks/Mono.framework/Versions/Current /tmp/install
+

Modified: trunk/banshee/build/osx/gst-plugins-base-docs-fix.patch
==============================================================================
--- trunk/banshee/build/osx/gst-plugins-base-docs-fix.patch	(original)
+++ trunk/banshee/build/osx/gst-plugins-base-docs-fix.patch	Wed Oct 22 04:17:52 2008
@@ -1,6 +1,6 @@
---- Makefile.am.orig	2008-10-20 22:39:29.000000000 -0400
-+++ Makefile.am	2008-10-20 22:39:54.000000000 -0400
-@@ -11,7 +11,6 @@
+--- Makefile.in.orig	2008-10-21 22:48:47.000000000 -0400
++++ Makefile.in	2008-10-21 22:48:58.000000000 -0400
+@@ -360,7 +360,6 @@
  	gst sys $(SUBDIRS_EXT) 	\
  	tools 			\
  	tests 			\

Modified: trunk/banshee/build/osx/gstreamer-docs-fix.patch
==============================================================================
--- trunk/banshee/build/osx/gstreamer-docs-fix.patch	(original)
+++ trunk/banshee/build/osx/gstreamer-docs-fix.patch	Wed Oct 22 04:17:52 2008
@@ -1,7 +1,7 @@
---- Makefile.am.orig	2008-10-20 21:39:07.000000000 -0400
-+++ Makefile.am	2008-10-20 21:39:26.000000000 -0400
-@@ -12,7 +12,6 @@
- 
+--- Makefile.in.orig	2008-10-21 22:44:22.000000000 -0400
++++ Makefile.in	2008-10-21 22:44:37.000000000 -0400
+@@ -359,7 +359,6 @@
+ aclocal_DATA = gst-element-check- GST_MAJORMINOR@.m4
  SUBDIRS = \
  	gst libs plugins tools tests \
 -	docs \

Added: trunk/banshee/build/osx/oss-00-base-libs.targets
==============================================================================
--- (empty file)
+++ trunk/banshee/build/osx/oss-00-base-libs.targets	Wed Oct 22 04:17:52 2008
@@ -0,0 +1,7 @@
+TARGETS=(
+    # name (%n)        version (%v)  dir (%d)  file (%f)   download uri                    configure args
+#    "libxml2           2.6.30        %n-%v     %d.tar.bz2  http://ftp.gnome.org/pub/gnome/sources/libxml2/2.6/%f";
+	"gettext           0.17          %n-%v     %d.tar.gz   http://ftp.gnu.org/pub/gnu/gettext/%f  --without-emacs --disable-java"
+#	"intltool          0.40.5        %n-%v     %d.tar.bz2  http://ftp.gnome.org/pub/gnome/sources/intltool/0.40/%f";
+#	"libsoup           2.24.1        %n-%v     %d.tar.bz2  http://ftp.gnome.org/pub/gnome/sources/libsoup/2.24/%f  --disable-gtk-doc"
+)

Modified: trunk/banshee/build/osx/oss-10-extra-libs.targets
==============================================================================
--- trunk/banshee/build/osx/oss-10-extra-libs.targets	(original)
+++ trunk/banshee/build/osx/oss-10-extra-libs.targets	Wed Oct 22 04:17:52 2008
@@ -2,5 +2,4 @@
     # name (%n)        version (%v)  dir (%d)  file (%f)   download uri                    configure args
     "wavpack           4.50.1        %n-%v     %d.tar.bz2  http://www.wavpack.com/%f";
     "taglib            1.5           %n-%v     %d.tar.gz   http://developer.kde.org/~wheeler/files/src/%f";
-    "libsoup           2.24.1        %n-%v     %d.tar.bz2  http://ftp.acc.umu.se/pub/gnome/sources/libsoup/2.24/%f";
 )

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Wed Oct 22 04:17:52 2008
@@ -16,7 +16,7 @@
 
 dnl Pieces needed by autogen; can't be parsed from macros
 AM_CONFIG_HEADER(config.h)
-AC_PROG_INTLTOOL([0.21])
+IT_PROG_INTLTOOL([0.35.0])
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]