[77741] trunk/dports/gnome/gstreamer

[jeremyhu at macports.org]

Revision: 77741
          http://trac.macports.org/changeset/77741
Author:   jeremyhu at macports.org
Date:     2011-04-10 19:49:28 -0700 (Sun, 10 Apr 2011)
Log Message:
-----------
gstreamer: Make sure gst-plugin-scanner is executed as the same architecture as the caller (#23823)

Modified Paths:
--------------
    trunk/dports/gnome/gstreamer/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gstreamer/files/
    trunk/dports/gnome/gstreamer/files/fat.patch

Modified: trunk/dports/gnome/gstreamer/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer/Portfile	2011-04-11 01:35:57 UTC (rev 77740)
+++ trunk/dports/gnome/gstreamer/Portfile	2011-04-11 02:49:28 UTC (rev 77741)
@@ -5,7 +5,7 @@
 
 name                gstreamer
 version             0.10.32
-revision            1
+revision            2
 description \
     GStreamer is a development framework for creating multimedia applications.
 long_description \
@@ -42,6 +42,8 @@
 configure.cflags-append -funroll-loops -fstrict-aliasing -fno-common
 configure.args-append   --disable-introspection
 
+patchfiles fat.patch
+
 pre-build	{
     if {[file exists ${prefix}/lib/libcheck.dylib]} {
         ui_msg "Gstreamer will fail to build because the 'check' port is active. Deactivate"

Added: trunk/dports/gnome/gstreamer/files/fat.patch
===================================================================
--- trunk/dports/gnome/gstreamer/files/fat.patch	                        (rev 0)
+++ trunk/dports/gnome/gstreamer/files/fat.patch	2011-04-11 02:49:28 UTC (rev 77741)
@@ -0,0 +1,24 @@
+--- gst/gstpluginloader.c.orig	2011-01-06 09:15:31.000000000 -0800
++++ gst/gstpluginloader.c	2011-04-10 19:06:06.000000000 -0700
+@@ -353,7 +353,20 @@ plugin_loader_create_blacklist_plugin (G
+ static gboolean
+ gst_plugin_loader_try_helper (GstPluginLoader * loader, gchar * location)
+ {
+-  char *argv[] = { location, (char *) "-l", NULL };
++  char *argv[] = { 
++#ifdef __APPLE__
++#if defined(__x86_64__)
++      "/usr/bin/arch", "-x86_64",
++#elif defined(__i386__)
++      "/usr/bin/arch", "-i386",
++#elif defined(__ppc__)
++      "/usr/bin/arch", "-ppc",
++#elif defined(__ppc64__)
++      "/usr/bin/arch", "-ppc64",
++#endif
++#endif
++      location, (char *) "-l", NULL
++  };
+ 
+   GST_LOG ("Trying to spawn gst-plugin-scanner helper at %s", location);
+   if (!g_spawn_async_with_pipes (NULL, argv, NULL,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110410/025937c7/attachment.html>