From 3ecafd318108b7b712d4e9dc1d766e375fab392b Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 15 Aug 2011 21:08:32 +0000 Subject: Fix build on NetBSD-5.0 where NULL doesn't have enough parentheses. From Olaf 'Rhialto' Seibert on pkgsrc-users. --- multimedia/gst-plugins0.10-bad/distinfo | 3 +- .../patches/patch-gst_hls_gsthlsdemux.c | 41 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 multimedia/gst-plugins0.10-bad/patches/patch-gst_hls_gsthlsdemux.c (limited to 'multimedia') diff --git a/multimedia/gst-plugins0.10-bad/distinfo b/multimedia/gst-plugins0.10-bad/distinfo index a9b53d24418..888ae90c6a3 100644 --- a/multimedia/gst-plugins0.10-bad/distinfo +++ b/multimedia/gst-plugins0.10-bad/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.25 2011/05/18 09:39:57 drochner Exp $ +$NetBSD: distinfo,v 1.26 2011/08/15 21:08:32 wiz Exp $ SHA1 (gst-plugins-bad-0.10.22.tar.bz2) = 66f4b9c40eb2ea43f093802e673effabee600a9b RMD160 (gst-plugins-bad-0.10.22.tar.bz2) = a3cf707a42d49b4285a57adaa07dc87591f18403 Size (gst-plugins-bad-0.10.22.tar.bz2) = 3539722 bytes SHA1 (patch-ac) = f83a2eb523f0af4f3b63df425123394354b92c64 +SHA1 (patch-gst_hls_gsthlsdemux.c) = dc8db3544d743fca98dcc64a13ec91c0089c11e6 diff --git a/multimedia/gst-plugins0.10-bad/patches/patch-gst_hls_gsthlsdemux.c b/multimedia/gst-plugins0.10-bad/patches/patch-gst_hls_gsthlsdemux.c new file mode 100644 index 00000000000..6e6a5a9dd31 --- /dev/null +++ b/multimedia/gst-plugins0.10-bad/patches/patch-gst_hls_gsthlsdemux.c @@ -0,0 +1,41 @@ +$NetBSD: patch-gst_hls_gsthlsdemux.c,v 1.1 2011/08/15 21:08:32 wiz Exp $ + +Fix build on NetBSD-5.0 where NULL doesn't have enough parentheses. + +--- gst/hls/gsthlsdemux.c.orig 2011-05-03 13:30:13.000000000 +0000 ++++ gst/hls/gsthlsdemux.c +@@ -370,14 +370,14 @@ gst_hls_demux_sink_event (GstPad * pad, + /* In most cases, this will happen if we set a wrong url in the + * source element and we have received the 404 HTML response instead of + * the playlist */ +- GST_ELEMENT_ERROR (demux, STREAM, DECODE, ("Invalid playlist."), NULL); ++ GST_ELEMENT_ERROR (demux, STREAM, DECODE, ("Invalid playlist."), (NULL)); + return FALSE; + } + + if (!ret && gst_m3u8_client_is_live (demux->client)) { + GST_ELEMENT_ERROR (demux, RESOURCE, NOT_FOUND, + ("Failed querying the playlist uri, " +- "required for live sources."), NULL); ++ "required for live sources."), (NULL)); + return FALSE; + } + +@@ -605,7 +605,7 @@ end_of_playlist: + cache_error: + { + GST_ELEMENT_ERROR (demux, RESOURCE, NOT_FOUND, +- ("Could not cache the first fragments"), NULL); ++ ("Could not cache the first fragments"), (NULL)); + gst_hls_demux_stop (demux); + return; + } +@@ -868,7 +868,7 @@ uri_error: + state_change_error: + { + GST_ELEMENT_ERROR (demux, CORE, STATE_CHANGE, +- ("Error changing state of the fetcher element."), NULL); ++ ("Error changing state of the fetcher element."), (NULL)); + bret = FALSE; + goto quit; + } -- cgit v1.2.3