pkg/47844: Update audio/musicpd to support newer version of ffmpeg

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/47844: Update audio/musicpd to support newer version of ffmpeg
From: nakayama%netbsd.org@localhost
Date: Mon, 20 May 2013 20:50:01 +0000 (UTC)
>Number:         47844
>Category:       pkg
>Synopsis:       Update audio/musicpd to support newer version of ffmpeg
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon May 20 20:50:01 +0000 2013
>Originator:     Takeshi Nakayama
>Release:        pkgsrc current
>Organization:
>Environment:
System: NetBSD nyx 6.1 NetBSD 6.1 (NYX32) #3: Tue May 14 13:32:04 JST 2013
 takeshi@nyx:/usr/src/sys/arch/sparc64/compile/NYX32 sparc64
Architecture: sparc
Machine: sparc64
>Description:
        Build audio/musicpd with enabling ffmpeg option fails since
        current pkgsrc version of musicpd (0.16.6) does not support
        ffmpeg 1.0 and later.
>How-To-Repeat:
        cd $PKGSRCDIR/audio/musicpd
        make PKG_OPTIONS.musicpd=ffmpeg
>Fix:
        Update musidpd 0.16.7 or later.
        The following patches update latest version (0.17.4).

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/musicpd/Makefile,v
retrieving revision 1.69
diff -u -d -r1.69 Makefile
--- Makefile    9 May 2013 07:39:27 -0000       1.69
+++ Makefile    20 May 2013 18:44:20 -0000
@@ -1,11 +1,10 @@
 # $NetBSD: Makefile,v 1.69 2013/05/09 07:39:27 adam Exp $
 
-DISTNAME=              mpd-0.16.6
+DISTNAME=              mpd-0.17.4
 PKGNAME=               ${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=           12
 CATEGORIES=            audio
-#MASTER_SITES=         http://musicpd.org/uploads/files/
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=musicpd/}
+MASTER_SITES=          http://www.musicpd.org/download/mpd/0.17/
+#MASTER_SITES=         ${MASTER_SITE_SOURCEFORGE:=musicpd/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/musicpd/distinfo,v
retrieving revision 1.35
diff -u -d -r1.35 distinfo
--- distinfo    16 Jan 2012 20:57:32 -0000      1.35
+++ distinfo    20 May 2013 18:44:20 -0000
@@ -1,11 +1,8 @@
 $NetBSD: distinfo,v 1.35 2012/01/16 20:57:32 drochner Exp $
 
-SHA1 (mpd-0.16.6.tar.bz2) = 235e34a27cfa5fbf5849eb1be32e441d34c3a139
-RMD160 (mpd-0.16.6.tar.bz2) = 5a54c17f7fae46b7e30afefdcc68c1b23b23f511
-Size (mpd-0.16.6.tar.bz2) = 486442 bytes
-SHA1 (patch-aa) = 4ac387b87c793014f2001e4cc2ba8242eaaa05e5
-SHA1 (patch-ab) = b0879896541d220300c105a0b2a94b53d62203cc
-SHA1 (patch-ac) = 08cb6ce7a7ca6e2c56d19d9d5487944dbba66c91
-SHA1 (patch-ad) = 0a836d2ca10143eb1472560d97769c367e42aea6
-SHA1 (patch-ae) = dfc4ca455ef606baf56cb2513e5471f6c16385dc
-SHA1 (patch-src_decoder_audiofile__decoder__plugin.c) = 
1d87dace0d129e40849738f4f705c29688ce51a4
+SHA1 (mpd-0.17.4.tar.bz2) = e3a16b5d784c3699b151e72cfa58d0ea54a49b13
+RMD160 (mpd-0.17.4.tar.bz2) = bc54ccaccd91df3af9debc1b96848ed84c9badbd
+Size (mpd-0.17.4.tar.bz2) = 582579 bytes
+SHA1 (patch-aa) = 56504fa05ad51cebb32ffd3e16bbe35279be8821
+SHA1 (patch-ad) = d8019d526034b839671bbf87c603a5506a9f6f71
+SHA1 (patch-src_decoder_audiofile__decoder__plugin.c) = 
14ab61bae4dc6626177490cc47403870581bc4cd
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/audio/musicpd/patches/patch-aa,v
retrieving revision 1.11
diff -u -d -r1.11 patch-aa
--- patches/patch-aa    14 Apr 2011 17:55:43 -0000      1.11
+++ patches/patch-aa    20 May 2013 18:44:20 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-aa,v 1.11 2011/04/14 17:55:43 drochner Exp $
 
---- src/conf.c.orig    2011-03-19 00:41:52.000000000 +0000
+--- src/conf.c.orig    2012-08-13 14:55:06.000000000 +0900
 +++ src/conf.c
-@@ -283,7 +283,7 @@ config_read_block(FILE *fp, int *count, 
+@@ -317,7 +317,7 @@ config_read_block(FILE *fp, int *count, 
                                g_set_error(error_r, config_quark(), 0,
                                            "line %i: Unknown tokens after '}'",
                                            *count);
@@ -11,12 +11,3 @@
                        }
  
                        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;
-               }
-       }
- }
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/audio/musicpd/patches/patch-ab,v
retrieving revision 1.7
diff -u -d -r1.7 patch-ab
--- patches/patch-ab    14 Apr 2011 17:55:43 -0000      1.7
+++ patches/patch-ab    20 May 2013 18:44:20 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2011/04/14 17:55:43 drochner Exp $
-
---- 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
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/audio/musicpd/patches/patch-ac,v
retrieving revision 1.6
diff -u -d -r1.6 patch-ac
--- patches/patch-ac    14 Apr 2011 17:55:43 -0000      1.6
+++ patches/patch-ac    20 May 2013 18:44:20 -0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2011/04/14 17:55:43 drochner Exp $
-
---- 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
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/audio/musicpd/patches/patch-ad,v
retrieving revision 1.3
diff -u -d -r1.3 patch-ad
--- patches/patch-ad    14 Apr 2011 17:55:43 -0000      1.3
+++ patches/patch-ad    20 May 2013 18:44:20 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-ad,v 1.3 2011/04/14 17:55:43 drochner Exp $
 
---- src/song_update.c.orig     2011-03-19 00:41:54.000000000 +0000
+--- src/song_update.c.orig     2012-06-28 00:46:58.000000000 +0900
 +++ src/song_update.c
-@@ -182,7 +182,7 @@ song_file_update_inarchive(struct song *
+@@ -187,7 +187,7 @@ song_file_update_inarchive(struct song *
        if (suffix == NULL)
                return false;
  
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/audio/musicpd/patches/patch-ae,v
retrieving revision 1.1
diff -u -d -r1.1 patch-ae
--- patches/patch-ae    14 Apr 2011 17:55:43 -0000      1.1
+++ patches/patch-ae    20 May 2013 18:44:20 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2011/04/14 17:55:43 drochner Exp $
-
---- 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);
- 
Index: patches/patch-src_decoder_audiofile__decoder__plugin.c
===================================================================
RCS file: 
/cvsroot/pkgsrc/audio/musicpd/patches/patch-src_decoder_audiofile__decoder__plugin.c,v
retrieving revision 1.2
diff -u -d -r1.2 patch-src_decoder_audiofile__decoder__plugin.c
--- patches/patch-src_decoder_audiofile__decoder__plugin.c      16 Jan 2012 
20:57:32 -0000      1.2
+++ patches/patch-src_decoder_audiofile__decoder__plugin.c      20 May 2013 
18:44:20 -0000
@@ -2,9 +2,9 @@
 
 Include unistd.h for SEEK_CUR, SEEK_SET.
 
---- src/decoder/audiofile_decoder_plugin.c.orig        2011-12-01 
13:44:01.000000000 +0000
+--- src/decoder/audiofile_decoder_plugin.c.orig        2012-06-28 
00:46:58.000000000 +0900
 +++ src/decoder/audiofile_decoder_plugin.c
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
  #include <assert.h>
  #include <glib.h>
  #include <stdio.h>
Prev by Date: pkg/47843: update mail/opendkim to latest version (2.8.3)
Next by Date: Re: pkg/47843 (update mail/opendkim to latest version (2.8.3))
Previous by Thread: pkg/47843: update mail/opendkim to latest version (2.8.3)
Next by Thread: Re: pkg/47843 (update mail/opendkim to latest version (2.8.3))
Indexes:
Home | Main Index | Thread Index | Old Index