[109193] trunk/dports/science/gstlal-ugly

ram at macports.org ram at macports.org
Fri Aug 9 12:24:07 PDT 2013


Revision: 109193
          https://trac.macports.org/changeset/109193
Author:   ram at macports.org
Date:     2013-08-09 12:24:07 -0700 (Fri, 09 Aug 2013)
Log Message:
-----------
science/gstlal-ugly: apply upstream patch to fix build on SL

Modified Paths:
--------------
    trunk/dports/science/gstlal-ugly/Portfile

Added Paths:
-----------
    trunk/dports/science/gstlal-ugly/files/
    trunk/dports/science/gstlal-ugly/files/cb17aa02d56d013176d7916331027b133cb1d37f.patch

Modified: trunk/dports/science/gstlal-ugly/Portfile
===================================================================
--- trunk/dports/science/gstlal-ugly/Portfile	2013-08-09 17:09:51 UTC (rev 109192)
+++ trunk/dports/science/gstlal-ugly/Portfile	2013-08-09 19:24:07 UTC (rev 109193)
@@ -24,6 +24,9 @@
 checksums     rmd160 65bce5206dcba800ebbce988def2ff65f634204c \
               sha256 24475c077e3198d87bc84b8d680d4e8bebcfe8f8e5536b0705ed721821688533
 
+patch.pre_args -p2
+patchfiles    cb17aa02d56d013176d7916331027b133cb1d37f.patch
+
 depends_build port:pkgconfig
 
 depends_lib   port:gstlal \

Added: trunk/dports/science/gstlal-ugly/files/cb17aa02d56d013176d7916331027b133cb1d37f.patch
===================================================================
--- trunk/dports/science/gstlal-ugly/files/cb17aa02d56d013176d7916331027b133cb1d37f.patch	                        (rev 0)
+++ trunk/dports/science/gstlal-ugly/files/cb17aa02d56d013176d7916331027b133cb1d37f.patch	2013-08-09 19:24:07 UTC (rev 109193)
@@ -0,0 +1,53 @@
+From cb17aa02d56d013176d7916331027b133cb1d37f Mon Sep 17 00:00:00 2001
+From: Kipp Cannon <kipp.cannon at ligo.org>
+Date: Fri, 09 Aug 2013 17:31:33 +0000
+Subject: framecpp_channeldemux:  replace strndup() with g_strndup()
+
+apparently some Macs don't have strndup().
+---
+diff --git a/gstlal-ugly/gst/framecpp/framecpp_channeldemux.cc b/gstlal-ugly/gst/framecpp/framecpp_channeldemux.cc
+index fee1b3d..b4e5ce3 100644
+--- a/gstlal-ugly/gst/framecpp/framecpp_channeldemux.cc
++++ b/gstlal-ugly/gst/framecpp/framecpp_channeldemux.cc
+@@ -138,7 +138,7 @@ GST_BOILERPLATE_FULL(GstFrameCPPChannelDemux, framecpp_channeldemux, GstElement,
+  */
+ 
+ 
+-static int split_name(const char *name, char **instrument, char **channel)
++static int split_name(const char *name, gchar **instrument, gchar **channel)
+ {
+ 	const char *colon = strchr(name, ':');
+ 
+@@ -147,8 +147,8 @@ static int split_name(const char *name, char **instrument, char **channel)
+ 		return -1;
+ 	}
+ 
+-	*instrument = strndup(name, colon - name);
+-	*channel = strdup(colon + 1);
++	*instrument = g_strndup(name, colon - name);
++	*channel = g_strdup(colon + 1);
+ 
+ 	return 0;
+ }
+@@ -430,7 +430,7 @@ static void src_pad_new_tags_handler(GObject *object, GParamSpec *pspec, gpointe
+ static GstPad *add_src_pad(GstFrameCPPChannelDemux *element, const char *name)
+ {
+ 	GstFrPad *srcpad = NULL;
+-	char *instrument, *channel;
++	gchar *instrument, *channel;
+ 
+ 	/*
+ 	 * construct the pad
+@@ -453,8 +453,8 @@ static GstPad *add_src_pad(GstFrameCPPChannelDemux *element, const char *name)
+ 
+ 	split_name(name, &instrument, &channel);
+ 	g_object_set(srcpad, "instrument", instrument, "channel-name", channel, NULL);
+-	free(instrument);
+-	free(channel);
++	g_free(instrument);
++	g_free(channel);
+ 
+ 	/*
+ 	 * add pad to element.  must ref it because _add_pad()
+--
+cgit v0.9
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130809/04411973/attachment.html>


More information about the macports-changes mailing list