[banshee] [build] fix banshee and mono packages for linux



commit 91422a34a84d28c7ff8bece9372d147720a5b26c
Author: Aaron Bockover <abockover novell com>
Date:   Tue Jan 5 19:12:08 2010 -0500

    [build] fix banshee and mono packages for linux
    
    These packages now build properly on both osx and linux.
    Update the linux build profile to check for ALSA since
    we'll take a system-wide dep on that.

 build/bundle/packages/banshee.py |   21 ++++-----------------
 build/bundle/packages/mono.py    |    8 ++++++--
 build/bundle/profile.linux.py    |    7 ++++---
 3 files changed, 14 insertions(+), 22 deletions(-)
---
diff --git a/build/bundle/packages/banshee.py b/build/bundle/packages/banshee.py
index bb02e85..19f6f8a 100644
--- a/build/bundle/packages/banshee.py
+++ b/build/bundle/packages/banshee.py
@@ -4,10 +4,12 @@ configure_flags = [
 	'--disable-ipod',
 	'--disable-boo',
 	'--disable-gnome',
-	'--disable-docs',
-	'--enable-osx'
+	'--disable-docs'
 ]
 
+if profile['name'] == 'osx':
+	configure_flags.append ('--enable-osx')
+
 def change_to_gitdir (*args):
 	last_pwd = ''
 	while not os.path.isdir ('.git'):
@@ -16,17 +18,6 @@ def change_to_gitdir (*args):
 			break
 		last_pwd = os.getcwd ()
 
-def overwrite_launcher_script (package):
-	install_bin_path = os.path.join (package['_prefix'], 'bin')
-	install_lib_path = os.path.join (package['_prefix'], 'lib')
-
-	fp = open (os.path.join (install_bin_path, 'banshee-1'), 'w')
-	fp.write ('#!/usr/bin/env bash\n')
-	fp.write ('export LD_LIBRARY_PATH="%s"\n' % install_lib_path)
-	fp.write ('%s %s' % (os.path.join (install_bin_path, 'mono'),
-		os.path.join (install_lib_path, 'banshee-1', 'Nereid.exe')))
-	fp.close ()
-
 package = {
 	'name':    'banshee-1',
 	'version': '1.5.2',
@@ -37,9 +28,5 @@ package = {
 	'build': [
 		'./autogen.sh --prefix=%{_prefix} ' + ' '.join (configure_flags),
 		'%{__make}'
-	],
-	'install': [
-		'%{__makeinstall}',
-		overwrite_launcher_script
 	]
 }
diff --git a/build/bundle/packages/mono.py b/build/bundle/packages/mono.py
index f136601..9fd4a3e 100644
--- a/build/bundle/packages/mono.py
+++ b/build/bundle/packages/mono.py
@@ -17,7 +17,11 @@ package = {
 		'%{__make}'
 	],
 	'install': [
-		'%{__makeinstall}',
-		'sed -ie "s/libcairo.so.2/libcairo.2.dylib/" "%{_prefix}/etc/mono/config"'
+		'%{__makeinstall}'
 	]
 }
+
+if profile['name'] == 'osx':
+	package['install'].extend ([
+		'sed -ie "s/libcairo.so.2/libcairo.2.dylib/" "%{_prefix}/etc/mono/config"'
+	])
diff --git a/build/bundle/profile.linux.py b/build/bundle/profile.linux.py
index 30540f8..8bc441e 100644
--- a/build/bundle/profile.linux.py
+++ b/build/bundle/profile.linux.py
@@ -4,6 +4,9 @@ profile = {
 	'prefix':       '%{build_root}/_install'
 }
 
+if not os.path.isdir ('/usr/include/alsa'):
+	sys.exit ('You must have the ALSA headers installed. (/usr/include/alsa)')
+
 # gcc_arch_flags = [ '-m32', '-arch i386' ]
 gcc_arch_flags = []
 gcc_flags = [
@@ -76,8 +79,6 @@ profile['packages'] = [
 	'packages/gstreamer.py',
 	'packages/gst-plugins-base.py',
 	'packages/gst-plugins-good.py',
-	'packages/gst-plugins-bad.py',
-	'packages/gst-plugins-ugly.py',
 
 	# Managed Deps
 	'packages/gtk-sharp.py',
@@ -86,5 +87,5 @@ profile['packages'] = [
 	'packages/ndesk-dbus-glib.py',
 	'packages/taglib-sharp.py',
 
-	# 'packages/banshee.py'
+	'packages/banshee.py'
 ]



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]