From 6271920f59a861db69a1f1ba630b2aee002a2da5 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 23 Nov 2014 19:33:16 +0000 Subject: Update to 0.91: Important changes in 0.91 (2014-05-14) This is mainly bug fixes. Changes in this release: * Fixed a segfault caused by an overflow reading the list of available decoders. * A number of problems with the previous distribution tar are now fixed. * The output of `mp3fs --version` has been made more complete. Important changes in 0.9 (2014-04-06) This is a major new release, and brings us very close to a 1.0 release! Changes in this release: * All transcoding code has been completely rewritten. Encoding and decoding have been abstracted out into base classes defining interfaces that can be implemented by different codec classes, with just a FLAC decoder and MP3 encoder at the moment. * The build system has been modified as well to support this usage. * A number of small bugs or code inefficiencies have been fixed. Important changes in 0.32 (2012-06-18) This release has a lot of bug fixes and some code cleanup. Changes in this release: * The file size calculation should always be correct. * A crash affecting programs like scp that might try to access past the end of the file has been fixed. * Too many other little fixes were made to list here. See the ChangeLog for full details. Important changes in 0.31 (2011-12-04) This is a minor update, with bug fixes and a new feature. Changes in this release: * The ReplayGain support added earlier now can be configured through the command line. * Filename translation (from .flac to .mp3) is now fixed on filesystems such as XFS that do not populate dirent.d_type. * A couple other minor bugs fixes and changes were made. Important changes in 0.30 (2010-12-01) This is a major new release, and brings mp3fs much closer to an eventual 1.0 release. Changes in this release: * Support for additional metadata tags has been added. (From Gregor Zurowski) * Documentation improvements: the help message is more useful, and a man page has been added. * Choosing bitrate is now done with a command-line or mount option, rather than the old comma syntax. * A new option to select LAME encoding quality is now available. (From Gregor Zurowski) * Debug output can be enabled at runtime. * Old external libraries included in distribution (StringIO, talloc) have been removed and replaced. * Numerous bug fixes have been made. (Some from Gregor Zurowski) --- filesystems/fuse-mp3fs/Makefile | 13 +++--- filesystems/fuse-mp3fs/PLIST | 5 ++- filesystems/fuse-mp3fs/distinfo | 12 +++--- filesystems/fuse-mp3fs/patches/patch-aa | 51 ------------------------ filesystems/fuse-mp3fs/patches/patch-ab | 15 ------- filesystems/fuse-mp3fs/patches/patch-configure | 20 ++++++++++ filesystems/fuse-mp3fs/patches/patch-src_class.h | 44 -------------------- 7 files changed, 34 insertions(+), 126 deletions(-) delete mode 100644 filesystems/fuse-mp3fs/patches/patch-aa delete mode 100644 filesystems/fuse-mp3fs/patches/patch-ab create mode 100644 filesystems/fuse-mp3fs/patches/patch-configure delete mode 100644 filesystems/fuse-mp3fs/patches/patch-src_class.h diff --git a/filesystems/fuse-mp3fs/Makefile b/filesystems/fuse-mp3fs/Makefile index fd454e66770..a255164cc13 100644 --- a/filesystems/fuse-mp3fs/Makefile +++ b/filesystems/fuse-mp3fs/Makefile @@ -1,24 +1,23 @@ -# $NetBSD: Makefile,v 1.3 2012/10/03 16:08:32 asau Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/11/23 19:33:16 wiz Exp $ -DISTNAME= mp3fs-0.13 +DISTNAME= mp3fs-0.91 PKGNAME= fuse-${DISTNAME} -PKGREVISION= 1 CATEGORIES= filesystems -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mp3fs/} +MASTER_SITES= https://github.com/khenriks/mp3fs/releases/download/v${PKGVERSION_NOREV}/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://mp3fs.sourceforge.net/ +HOMEPAGE= http://khenriks.github.io/mp3fs/ COMMENT= MP3 transcoding FUSE file system LICENSE= gnu-gpl-v3 GNU_CONFIGURE= yes +USE_LANGUAGES= c c++ USE_TOOLS= pkg-config INSTALLATION_DIRS= share/doc/fuse-mp3fs post-install: - ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/fuse-mp3fs + ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/fuse-mp3fs .include "../../audio/flac/buildlink3.mk" .include "../../audio/lame/buildlink3.mk" diff --git a/filesystems/fuse-mp3fs/PLIST b/filesystems/fuse-mp3fs/PLIST index c667752d67a..f70f519a287 100644 --- a/filesystems/fuse-mp3fs/PLIST +++ b/filesystems/fuse-mp3fs/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/07/16 14:54:02 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/11/23 19:33:16 wiz Exp $ bin/mp3fs -share/doc/fuse-mp3fs/README +man/man1/mp3fs.1 +share/doc/fuse-mp3fs/README.md diff --git a/filesystems/fuse-mp3fs/distinfo b/filesystems/fuse-mp3fs/distinfo index 975da44e8e8..f2da7328681 100644 --- a/filesystems/fuse-mp3fs/distinfo +++ b/filesystems/fuse-mp3fs/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.5 2013/06/13 14:35:34 wiz Exp $ +$NetBSD: distinfo,v 1.6 2014/11/23 19:33:16 wiz Exp $ -SHA1 (mp3fs-0.13.tar.gz) = b246bd747a32256cb8364b7ac0cc8b7a4e1d3f74 -RMD160 (mp3fs-0.13.tar.gz) = 6ad1126ee22b35fe4987dd6addbc41a25c74a508 -Size (mp3fs-0.13.tar.gz) = 301642 bytes -SHA1 (patch-aa) = 0013f729158988403ea7ed7aa3a3102e9531ef91 -SHA1 (patch-ab) = 0e76e444566e2e0ff0c31a6aa64dcd82a931f397 -SHA1 (patch-src_class.h) = 2a0c03c20ffce50c1270d552215edb052f3ecf50 +SHA1 (mp3fs-0.91.tar.gz) = a9e65b8453f4444ec6faba045120e7efb18da20e +RMD160 (mp3fs-0.91.tar.gz) = 1992a61ba191dc8e73f5fcf29ef1a2aae040587c +Size (mp3fs-0.91.tar.gz) = 357098 bytes +SHA1 (patch-configure) = 8d62bab94726d9749b4172977216c005cd52c4c0 diff --git a/filesystems/fuse-mp3fs/patches/patch-aa b/filesystems/fuse-mp3fs/patches/patch-aa deleted file mode 100644 index 896be4b7915..00000000000 --- a/filesystems/fuse-mp3fs/patches/patch-aa +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2012/08/17 14:10:31 marino Exp $ - ---- src/mp3fs.c.orig 2008-12-14 06:17:35.000000000 +0100 -+++ src/mp3fs.c -@@ -30,7 +30,11 @@ - #include - #include - #include -+#if defined (__NetBSD__) || defined (__DragonFly__) -+#include -+#else - #include -+#endif - - #include "transcode.h" - #include "talloc.h" -@@ -195,7 +199,12 @@ static int mp3fs_read(const char *path, - return f->Read(f, buf, offset, size); - } - --static int mp3fs_statfs(const char *path, struct statfs *stbuf) { -+#if defined (__NetBSD__) || defined (__DragonFly__) -+static int mp3fs_statfs(const char *path, struct statvfs *stbuf) -+#else -+static int mp3fs_statfs(const char *path, struct statfs *stbuf) -+#endif -+{ - int res; - char name[256]; - -@@ -204,7 +213,11 @@ static int mp3fs_statfs(const char *path - strncpy(name, basepath, sizeof(name)); - strncat(name, path, sizeof(name) - strlen(name)); - -+#if defined (__NetBSD__) || defined (__DragonFly__) -+ res = statvfs(name, stbuf); -+#else - res = statfs(name, stbuf); -+#endif - if(res == -1) - return -errno; - -@@ -252,7 +265,7 @@ int main(int argc, char *argv[]) { - basepath = argv[1]; - bitrate = 0; - -- rate = strchr(basepath, ','); -+ rate = strrchr(basepath, ','); - if(rate) { - rate[0] = '\0'; - bitrate = atoi(rate + 1); diff --git a/filesystems/fuse-mp3fs/patches/patch-ab b/filesystems/fuse-mp3fs/patches/patch-ab deleted file mode 100644 index 421cdf5b4d0..00000000000 --- a/filesystems/fuse-mp3fs/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2013/06/13 14:35:34 wiz Exp $ - -Add inttypes.h for PRIu64. - ---- src/transcode.c.orig 2008-12-14 05:24:21.000000000 +0000 -+++ src/transcode.c -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - - #include - #ifdef LEGACY_FLAC diff --git a/filesystems/fuse-mp3fs/patches/patch-configure b/filesystems/fuse-mp3fs/patches/patch-configure new file mode 100644 index 00000000000..83fb1eedbf7 --- /dev/null +++ b/filesystems/fuse-mp3fs/patches/patch-configure @@ -0,0 +1,20 @@ +$NetBSD: patch-configure,v 1.1 2014/11/23 19:33:16 wiz Exp $ + +Fix unportable test(1) comparison operator. + +--- configure.orig 2014-05-14 19:48:57.000000000 +0000 ++++ configure +@@ -5259,11 +5259,11 @@ else + fi + + +-if test "$with_mp3" == no; then : ++if test "$with_mp3" = no; then : + as_fn_error $? "No encoders enabled. Ensure --with-mp3 is given." "$LINENO" 5 + fi + +-if test "$with_flac" == no; then : ++if test "$with_flac" = no; then : + as_fn_error $? "No decoders enabled. Ensure --with-flac is given." "$LINENO" 5 + fi + diff --git a/filesystems/fuse-mp3fs/patches/patch-src_class.h b/filesystems/fuse-mp3fs/patches/patch-src_class.h deleted file mode 100644 index db1a7dd2f2a..00000000000 --- a/filesystems/fuse-mp3fs/patches/patch-src_class.h +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-src_class.h,v 1.1 2012/03/29 11:40:19 wiz Exp $ - -Fix build with clang-3.1. - ---- src/class.h.orig 2007-11-15 05:34:32.000000000 +0000 -+++ src/class.h -@@ -171,7 +171,7 @@ super.add as well. - - #define CLASS(class,super_class) \ - typedef struct class *class; \ -- inline void class ## _init(void); \ -+ void class ## _init(void); \ - void class ## _Alloc(class this); \ - extern int __ ## class ## _initialised; \ - extern struct class __ ## class; \ -@@ -209,7 +209,7 @@ super.add as well. - - #define VIRTUAL(class,superclass) \ - struct class __ ## class; \ -- inline void class ## _init(void) { \ -+ void class ## _init(void) { \ - if(!__ ## class ## _initialised) { \ - class ## _Alloc(&__ ## class); \ - __ ## class ## _initialised = 1; \ -@@ -233,7 +233,7 @@ super.add as well. - - #define VIRTUAL(class,superclass) \ - struct class __ ## class; \ -- inline void class ## _init(void) { \ -+ void class ## _init(void) { \ - if(!__ ## class ## _initialised) { \ - class ## _Alloc(&__ ## class); \ - __ ## class ## _initialised = 1; \ -@@ -348,8 +348,8 @@ struct Object { - #define GET_CLASS(name) \ - &__ ## name - --inline void Object_init(void); --inline void Object_Alloc(Object this); -+void Object_init(void); -+void Object_Alloc(Object this); - - extern struct Object __Object; - -- cgit v1.2.3