[build] various package cleanups

5 files changed, 48 insertions, 24 deletions

diff --git a/packages/gst-plugins-base.py b/packages/gst-plugins-base.py
index acafcc9..57a45d6 100644
--- a/packages/gst-plugins-base.py
+++ b/packages/gst-plugins-base.py
@@ -1,3 +1,19 @@
+configure_flags = [
+	'--disable-gtk-doc',
+	'--disable-gio',
+	'--disable-gnome_vfs'
+]
+
+# FIXME: these should be passed on the Linux profile
+# when we do away with xvideo/xoverlay and replace
+# with Clutter and Cairo
+if profile['name'] == 'osx':
+	configure_flags.extend ([
+		'--disable-x',
+		'--disable-xvideo',
+		'--disable-xshm'
+	])
+
 package = {
 	'name':    'gst-plugins-base',
 	'version': '0.10.25',
@@ -5,13 +21,7 @@ package = {
 		'http://gstreamer.freedesktop.org/src/%{name}/%{name}-%{version}.tar.gz'
 	],
 	'build': [
-		'%{__configure}' \
-			' --disable-gtk-doc' \
-			' --disable-x' \
-			' --disable-xvideo' \
-			' --disable-xshm' \
-			' --disable-gio' \
-			' --disable-gnome_vfs',
+		'%{__configure} ' + ' '.join (configure_flags), 
 		'%{__make}'
 	]
 }
diff --git a/packages/gst-plugins-good.py b/packages/gst-plugins-good.py
index 184e2aa..4a05d7e 100644
--- a/packages/gst-plugins-good.py
+++ b/packages/gst-plugins-good.py
@@ -1,3 +1,22 @@
+configure_flags = [
+	'--disable-gtk-doc',
+	'--disable-gdk_pixbuf',
+	'--disable-cairo',
+	'--disable-jpeg',
+	'--disable-libpng',
+	'--disable-annodex'
+]
+
+# FIXME: these should be passed on the Linux profile
+# when we do away with xvideo/xoverlay and replace
+# with Clutter and Cairo
+if profile['name'] == 'osx':
+	configure_flags.extend ([
+		'--disable-x',
+		'--disable-xvideo',
+		'--disable-xshm'
+	])
+
 package = {
 	'name':    'gst-plugins-good',
 	'version': '0.10.17',
@@ -5,16 +24,7 @@ package = {
 		'http://gstreamer.freedesktop.org/src/%{name}/%{name}-%{version}.tar.gz'
 	],
 	'build': [
-		'%{__configure}' \
-			' --disable-gtk-doc' \
-			' --disable-x' \
-			' --disable-xvideo' \
-			' --disable-xshm' \
-			' --disable-gdk_pixbuf' \
-			' --disable-cairo' \
-			' --disable-jpeg' \
-			' --disable-libpng' \
-			' --disable-annodex',
+		'%{__configure} ' + ' '.join (configure_flags)
 		'%{__make}'
 	]
 }
diff --git a/packages/intltool.py b/packages/intltool.py
index e21b173..2fcfbde 100644
--- a/packages/intltool.py
+++ b/packages/intltool.py
@@ -1,7 +1,9 @@
 package = {
-	'name':    'intltool',
-	'version': '0.40.6',
+	'name':          'intltool',
+	'version_major': '0.40',
+	'version_minor': '6'
+	'version':       '%{version_major}.%{version_minor}',
 	'sources': [
-		'http://ftp.gnome.org/pub/gnome/sources/intltool/0.40/%{name}-%{version}.tar.bz2'
+		'http://ftp.gnome.org/pub/gnome/sources/intltool/%{version_major}/%{name}-%{version}.tar.bz2'
 	]
 }
diff --git a/packages/libsoup.py b/packages/libsoup.py
index 8fbd4b7..5e67aab 100644
--- a/packages/libsoup.py
+++ b/packages/libsoup.py
@@ -1,8 +1,10 @@
 package = {
-	'name':    'libsoup',
-	'version': '2.28.2',
+	'name':         'libsoup',
+	'version_major': '2.28',
+	'version_minor': '2'
+	'version':       '%{version_major}.%{version_minor}',
 	'sources': [
-		'http://ftp.gnome.org/pub/gnome/sources/libsoup/2.28/%{name}-%{version}.tar.bz2'
+		'http://ftp.gnome.org/pub/gnome/sources/libsoup/%{version_major}/%{name}-%{version}.tar.bz2'
 	],
 	'build': [
 		'%{__configure}' \
diff --git a/packages/taglib-sharp.py b/packages/taglib-sharp.py
index 78d6ce8..3bba2e2 100644
--- a/packages/taglib-sharp.py
+++ b/packages/taglib-sharp.py
@@ -2,7 +2,7 @@ package = {
 	'name':    'taglib-sharp',
 	'version': '2.0.3.3',
 	'sources': [
-		'http://download.banshee-project.org/taglib-sharp/%{version}/%{name}-%{version}.tar.gz'
+		'http://download.banshee-project.org/%{name}/%{version}/%{name}-%{version}.tar.gz'
 	],
 	'build': [
 		'%{__configure}' \