diff options
author | rillig <rillig@pkgsrc.org> | 2005-06-14 07:47:17 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2005-06-14 07:47:17 +0000 |
commit | e6bc216fa0eaad1f1ea958930fa5f60db345b261 (patch) | |
tree | 226a4f92e75434cd7c5e11867df0500aa86df39c /multimedia | |
parent | 27f455d0d5fb1b0a7c1e49c0c5fb3aa12314ba51 (diff) | |
download | pkgsrc-e6bc216fa0eaad1f1ea958930fa5f60db345b261.tar.gz |
Added a patch that removes preprocessor directives out of the macro
expansion of another macro. Needed for at least gcc-2.95.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/gst-plugins/distinfo | 3 | ||||
-rw-r--r-- | multimedia/gst-plugins/patches/patch-ag | 30 |
2 files changed, 32 insertions, 1 deletions
diff --git a/multimedia/gst-plugins/distinfo b/multimedia/gst-plugins/distinfo index 404a0649b8b..aa600c122e4 100644 --- a/multimedia/gst-plugins/distinfo +++ b/multimedia/gst-plugins/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2005/06/14 05:20:05 rillig Exp $ +$NetBSD: distinfo,v 1.22 2005/06/14 07:47:17 rillig Exp $ SHA1 (gst-plugins-0.8.9.tar.bz2) = f73dd3b96e1e5c7e90fdb1bf2c72de8c8d035bb1 RMD160 (gst-plugins-0.8.9.tar.bz2) = 294b1873c8d54ac225bf94a2e5ba872f089fd605 @@ -7,3 +7,4 @@ SHA1 (patch-aa) = 49a78bc16c4bfc541ecb940a629c61dcacdadcb5 SHA1 (patch-ab) = ca6dd27984a020f5a01e14d785e425e8cd219e74 SHA1 (patch-ae) = 3509dd08d3e010e9eb85c71ae6c42e28f6f9ec2d SHA1 (patch-af) = 1a2562b3bff15c3ca3324428f8c2bd3e7ec1f4ca +SHA1 (patch-ag) = 89bd7a3f615af0c9e740c17efc640fa85948cda0 diff --git a/multimedia/gst-plugins/patches/patch-ag b/multimedia/gst-plugins/patches/patch-ag new file mode 100644 index 00000000000..08e3bbbfb71 --- /dev/null +++ b/multimedia/gst-plugins/patches/patch-ag @@ -0,0 +1,30 @@ +$NetBSD: patch-ag,v 1.1 2005/06/14 07:47:17 rillig Exp $ + +Removed the #define directive from the inside of a macro expansion. +Needed for gcc-2.95 and possibly others. + +--- sys/glsink/glimagesink.c.orig Tue May 17 10:41:52 2005 ++++ sys/glsink/glimagesink.c Tue Jun 14 09:36:08 2005 +@@ -51,15 +51,19 @@ GST_ELEMENT_DETAILS ("Video sink", + /* Default template - initiated with class struct to allow gst-register to work + without X running */ + static GstStaticPadTemplate gst_glimagesink_sink_template_factory = ++#ifdef ENABLE_YUV ++# define YUV_FOO ";" GST_VIDEO_CAPS_YUV ("{ UYVY, YUY2 }") ++#else ++# define YUV_FOO /* empty */ ++#endif + GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS (GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_BGRx +-#ifdef ENABLE_YUV +- ";" GST_VIDEO_CAPS_YUV ("{ UYVY, YUY2 }") +-#endif ++ YUV_FOO + ) + ); ++#undef YUV_FOO + + #if 0 + enum |