Workaround broken NULL definition on NetBSD 5.0 and older.

2 files changed, 83 insertions, 1 deletions

diff --git a/multimedia/gst-plugins0.10-bad/distinfo b/multimedia/gst-plugins0.10-bad/distinfo
index 98df4b7dc24..b022c0c5bac 100644
--- a/multimedia/gst-plugins0.10-bad/distinfo
+++ b/multimedia/gst-plugins0.10-bad/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.19 2010/03/12 20:51:57 drochner Exp $
+$NetBSD: distinfo,v 1.20 2010/03/15 14:16:03 joerg Exp $
 
 SHA1 (gst-plugins-bad-0.10.18.tar.bz2) = 33853ed4f3be8d80c42a2a8dcce7052a08c1d64f
 RMD160 (gst-plugins-bad-0.10.18.tar.bz2) = 0a7bfd2b90dc863798f5a254248a1b087dcf8f5a
 Size (gst-plugins-bad-0.10.18.tar.bz2) = 3028412 bytes
 SHA1 (patch-aa) = 97edd8c227a2cdd7730670024e2afdf80967eb29
+SHA1 (patch-ab) = 3c0432d12366285d264760b728851da9b519de40
 SHA1 (patch-ac) = f83a2eb523f0af4f3b63df425123394354b92c64
diff --git a/multimedia/gst-plugins0.10-bad/patches/patch-ab b/multimedia/gst-plugins0.10-bad/patches/patch-ab
new file mode 100644
index 00000000000..c5d591ac287
--- /dev/null
+++ b/multimedia/gst-plugins0.10-bad/patches/patch-ab
@@ -0,0 +1,81 @@
+$NetBSD: patch-ab,v 1.6 2010/03/15 14:16:03 joerg Exp $
+
+Workaround broken NULL definition on NetBSD <= 5.0
+
+--- gst/qtmux/gstqtmoovrecover.c.orig	2010-03-15 14:08:25.000000000 +0000
++++ gst/qtmux/gstqtmoovrecover.c
+@@ -188,19 +188,19 @@ gst_qt_moov_recover_run (void *data)
+   if (qtmr->broken_input == NULL) {
+     GST_OBJECT_UNLOCK (qtmr);
+     GST_ELEMENT_ERROR (qtmr, RESOURCE, SETTINGS,
+-        ("Please set broken-input property"), NULL);
++        ("Please set broken-input property"), (NULL));
+     goto end;
+   }
+   if (qtmr->recovery_input == NULL) {
+     GST_OBJECT_UNLOCK (qtmr);
+     GST_ELEMENT_ERROR (qtmr, RESOURCE, SETTINGS,
+-        ("Please set recovery-input property"), NULL);
++        ("Please set recovery-input property"), (NULL));
+     goto end;
+   }
+   if (qtmr->fixed_output == NULL) {
+     GST_OBJECT_UNLOCK (qtmr);
+     GST_ELEMENT_ERROR (qtmr, RESOURCE, SETTINGS,
+-        ("Please set fixed-output property"), NULL);
++        ("Please set fixed-output property"), (NULL));
+     goto end;
+   }
+ 
+@@ -210,7 +210,7 @@ gst_qt_moov_recover_run (void *data)
+   if (moovrec == NULL) {
+     GST_OBJECT_UNLOCK (qtmr);
+     GST_ELEMENT_ERROR (qtmr, RESOURCE, OPEN_READ,
+-        ("Failed to open recovery-input file"), NULL);
++        ("Failed to open recovery-input file"), (NULL));
+     goto end;
+   }
+ 
+@@ -218,14 +218,14 @@ gst_qt_moov_recover_run (void *data)
+   if (mdatinput == NULL) {
+     GST_OBJECT_UNLOCK (qtmr);
+     GST_ELEMENT_ERROR (qtmr, RESOURCE, OPEN_READ,
+-        ("Failed to open broken-input file"), NULL);
++        ("Failed to open broken-input file"), (NULL));
+     goto end;
+   }
+   output = g_fopen (qtmr->fixed_output, "wb+");
+   if (output == NULL) {
+     GST_OBJECT_UNLOCK (qtmr);
+     GST_ELEMENT_ERROR (qtmr, RESOURCE, OPEN_READ_WRITE,
+-        ("Failed to open fixed-output file"), NULL);
++        ("Failed to open fixed-output file"), (NULL));
+     goto end;
+   }
+   GST_OBJECT_UNLOCK (qtmr);
+@@ -236,14 +236,14 @@ gst_qt_moov_recover_run (void *data)
+   mdatinput = NULL;
+   if (mdat_recov == NULL) {
+     GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED,
+-        ("Broken file could not be parsed correctly"), NULL);
++        ("Broken file could not be parsed correctly"), (NULL));
+     goto end;
+   }
+   moov_recov = moov_recov_file_create (moovrec, &err);
+   moovrec = NULL;
+   if (moov_recov == NULL) {
+     GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED,
+-        ("Recovery file could not be parsed correctly"), NULL);
++        ("Recovery file could not be parsed correctly"), (NULL));
+     goto end;
+   }
+ 
+@@ -265,7 +265,7 @@ gst_qt_moov_recover_run (void *data)
+ end:
+   GST_LOG_OBJECT (qtmr, "Finalizing task");
+   if (err) {
+-    GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED, (err->message), NULL);
++    GST_ELEMENT_ERROR (qtmr, RESOURCE, FAILED, (err->message), (NULL));
+     g_error_free (err);
+   }
+