audio/musicpd and multimedia/ffmpeg or multimedia/libvpx broken on Darwin/x86_64 + partial fixes

["Pouya D. Tafti" <pouya%san-serriffe.org@localhost>]

audio/musicpd does not compile on Darwin/x86_64 (OS X Snow Leopard
10.6.7).   The attached patches fix this.

Also, multimedia/ffmpeg compiles but links
/usr/pkg/lib/libavformat.dylib against
/usr/pkgsrc/multimedia/libvpx/work/.destdir/usr/pkg/lib/libvpx.0.dylib,
which is clearly wrong (I have no clue why this happens).  ffmpeg
links properly with the libvpx option disabled.

In addition to a fix for the above problem, which I couldn't figure
out, multimedia/libvpx probably needs the other attached patch too.

$NetBSD$

--- src/conf.c.orig     2011-03-19 00:41:52.000000000 +0000
+++ src/conf.c
@@ -283,7 +283,7 @@ config_read_block(FILE *fp, int *count, 
                                g_set_error(error_r, config_quark(), 0,
                                            "line %i: Unknown tokens after '}'",
                                            *count);
-                               return false;
+                               return NULL;
                        }
 
                        return ret;
@@ -325,7 +325,7 @@ config_read_block(FILE *fp, int *count, 
                                                 error_r);
                if (!success) {
                        config_param_free(ret);
-                       return false;
+                       return NULL;
                }
        }
 }

$NetBSD$

--- src/input_stream.c.orig     2011-03-19 00:41:53.000000000 +0000
+++ src/input_stream.c
@@ -64,7 +64,7 @@ input_stream_open(const char *url, GErro
        }
 
        g_set_error(error_r, input_quark(), 0, "Unrecognized URI");
-       return false;
+       return NULL;
 }
 
 bool

$NetBSD$

--- src/input/file_input_plugin.c.orig  2011-03-19 00:41:53.000000000 +0000
+++ src/input/file_input_plugin.c
@@ -52,7 +52,7 @@ input_file_open(const char *filename, GE
        struct file_input_stream *fis;
 
        if (!g_path_is_absolute(filename))
-               return false;
+               return NULL;
 
        fd = open_cloexec(filename, O_RDONLY|O_BINARY, 0);
        if (fd < 0) {
@@ -60,7 +60,7 @@ input_file_open(const char *filename, GE
                        g_set_error(error_r, file_quark(), errno,
                                    "Failed to open \"%s\": %s",
                                    filename, g_strerror(errno));
-               return false;
+               return NULL;
        }
 
        ret = fstat(fd, &st);
@@ -69,14 +69,14 @@ input_file_open(const char *filename, GE
                            "Failed to stat \"%s\": %s",
                            filename, g_strerror(errno));
                close(fd);
-               return false;
+               return NULL;
        }
 
        if (!S_ISREG(st.st_mode)) {
                g_set_error(error_r, file_quark(), 0,
                            "Not a regular file: %s", filename);
                close(fd);
-               return false;
+               return NULL;
        }
 
 #ifdef POSIX_FADV_SEQUENTIAL

$NetBSD$

--- src/song_update.c.orig      2011-03-19 00:41:54.000000000 +0000
+++ src/song_update.c
@@ -182,7 +182,7 @@ song_file_update_inarchive(struct song *
        if (suffix == NULL)
                return false;
 
-       plugin = decoder_plugin_from_suffix(suffix, false);
+       plugin = decoder_plugin_from_suffix(suffix, NULL);
        if (plugin == NULL)
                return false;
 

$NetBSD$

--- src/update_walk.c.orig      2011-03-19 00:41:54.000000000 +0000
+++ src/update_walk.c
@@ -590,7 +590,7 @@ update_regular_file(struct directory *di
        if (suffix == NULL)
                return;
 
-       if ((plugin = decoder_plugin_from_suffix(suffix, false)) != NULL)
+       if ((plugin = decoder_plugin_from_suffix(suffix, NULL)) != NULL)
        {
                struct song* song = songvec_find(&directory->songs, name);

Attachment: patch-multimedia-libvpx-Makefile
Description: Binary data