Fix statvfs support on NetBSD and Solaris (block counts are in units
of f_frsize, not f_bsize). Also add DragonFly support from the old tunepimp package (untested). Package uses c++ and libtool so say so in Makefile. Bump PKGREVISION.
This commit is contained in:
markd
parent
cf0eac1ec9
commit
7ce59e1319
5 changed files with 64 additions and 9 deletions
|
|
@ -1,7 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.2 2006/04/13 06:14:25 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2006/04/16 22:10:25 markd Exp $
|
||||
#
|
||||
|
||||
DISTNAME= libtunepimp-0.4.2
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
|
||||
http://ftp.musicbrainz.org/pub/musicbrainz/ \
|
||||
|
|
@ -13,7 +14,16 @@ HOMEPAGE= http://musicbrainz.org/products/tunepimp/index.html
|
|||
COMMENT= Library to support MusicBrainz enabled tagging
|
||||
|
||||
GNU_CONFIGURE= YES
|
||||
CONFLICTS+= tunepimp-[0-9]*
|
||||
USE_LANGUAGES= c c++
|
||||
USE_LIBTOOL= YES
|
||||
CONFLICTS+= tunepimp-[0-9]* trm-[0-9]*
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
.if ${OPSYS} == "SunOS"
|
||||
pre-configure:
|
||||
${ECHO} "#define HAVE_STATVFS 1" >> ${WRKSRC}/config.h.in
|
||||
.endif
|
||||
|
||||
.include "../../audio/flac/buildlink3.mk"
|
||||
.include "../../audio/musicbrainz/buildlink3.mk"
|
||||
|
|
@ -24,4 +34,5 @@ CONFLICTS+= tunepimp-[0-9]*
|
|||
.include "../../devel/ncurses/buildlink3.mk"
|
||||
.include "../../devel/readline/buildlink3.mk"
|
||||
.include "../../multimedia/mpeg4ip/buildlink3.mk"
|
||||
.include "../../mk/pthread.buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
$NetBSD: distinfo,v 1.2 2006/04/13 12:43:45 adam Exp $
|
||||
$NetBSD: distinfo,v 1.3 2006/04/16 22:10:25 markd Exp $
|
||||
|
||||
SHA1 (libtunepimp-0.4.2.tar.gz) = deb7ac22e451b7512006e6f090333e14d4cbc78f
|
||||
RMD160 (libtunepimp-0.4.2.tar.gz) = f4c7ebeb505c6b8b1dff284aebf6c9e249192765
|
||||
Size (libtunepimp-0.4.2.tar.gz) = 1019995 bytes
|
||||
SHA1 (patch-aa) = 96a06f82115c6bbb5e4b4c4e65e2d2cba48ae55d
|
||||
SHA1 (patch-aa) = 1c0e484dbe02309ab09ce153dcad710590aedcd1
|
||||
SHA1 (patch-ab) = d72634d99a70925ee180108db4a95c10124b7de0
|
||||
SHA1 (patch-ac) = bebb5ac1358007098704052888a98f9d97376b6a
|
||||
SHA1 (patch-ad) = cdd662177cf90a9e926881d25eb40d674ca21456
|
||||
|
|
|
|||
|
|
@ -1,14 +1,30 @@
|
|||
$NetBSD: patch-aa,v 1.1.1.1 2006/04/12 21:41:58 wiz Exp $
|
||||
$NetBSD: patch-aa,v 1.2 2006/04/16 22:10:25 markd Exp $
|
||||
|
||||
--- lib/write.cpp.orig 2006-01-19 21:05:11.000000000 +0000
|
||||
--- lib/write.cpp.orig 2006-01-20 10:05:11.000000000 +1300
|
||||
+++ lib/write.cpp
|
||||
@@ -38,6 +38,9 @@
|
||||
# if defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
@@ -35,9 +35,12 @@
|
||||
# include <sys/stat.h>
|
||||
# include <sys/types.h>
|
||||
# include <fcntl.h>
|
||||
-# if defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
+# if defined(__APPLE__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
|
||||
# include <sys/param.h>
|
||||
# include <sys/mount.h>
|
||||
+# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900)
|
||||
+# define statfs statvfs
|
||||
+# define HAVE_STATVFS 1
|
||||
+# endif
|
||||
# else
|
||||
# include <sys/vfs.h>
|
||||
# endif
|
||||
@@ -54,6 +57,11 @@
|
||||
#include "fileio.h"
|
||||
#include "utf8/utf8util.h"
|
||||
|
||||
+#if defined(HAVE_STATVFS)
|
||||
+# define statfs statvfs
|
||||
+# define f_bsize f_frsize
|
||||
+#endif
|
||||
+
|
||||
#ifdef WIN32
|
||||
const char *dirSep = "\\";
|
||||
const char dirSepChar = '\\';
|
||||
|
|
|
|||
13
audio/libtunepimp/patches/patch-ac
Normal file
13
audio/libtunepimp/patches/patch-ac
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-ac,v 1.1 2006/04/16 22:10:25 markd Exp $
|
||||
|
||||
--- lib/threads/posix/Makefile.in.orig 2006-04-17 09:21:22.000000000 +1200
|
||||
+++ lib/threads/posix/Makefile.in
|
||||
@@ -211,7 +211,7 @@ target_alias = @target_alias@
|
||||
INCLUDES = -I$(top_srcdir)/include/tunepimp
|
||||
noinst_LTLIBRARIES = libtpthread.la
|
||||
libtpthread_la_SOURCES = mutex.cpp mutex.h thread.cpp thread.h semaphore.cpp semaphore.h
|
||||
-@FREEBSD_FALSE@libtpthread_la_LIBADD = -lpthread
|
||||
+@FREEBSD_FALSE@libtpthread_la_LIBADD = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
|
||||
@FREEBSD_TRUE@libtpthread_la_LIBADD = -lthr
|
||||
all: all-am
|
||||
|
||||
13
audio/libtunepimp/patches/patch-ad
Normal file
13
audio/libtunepimp/patches/patch-ad
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-ad,v 1.1 2006/04/16 22:10:25 markd Exp $
|
||||
|
||||
--- lib/Makefile.in.orig 2006-04-17 09:23:47.000000000 +1200
|
||||
+++ lib/Makefile.in
|
||||
@@ -262,7 +262,7 @@ libtunepimp_la_SOURCES = tunepimp.cpp fi
|
||||
# 1:0:0 - TunePimp implementation for version 0.2.x
|
||||
# 2:0:0 - TunePimp implementation for version 0.3.x
|
||||
# 3:0:0 - TunePimp implementation for version 0.4.x
|
||||
-libtunepimp_la_LDFLAGS = -version-info 3:0:0
|
||||
+libtunepimp_la_LDFLAGS = -version-info 3:0:0 ${PTHREAD_LDFLAGS}
|
||||
libtunepimp_la_LIBADD = threads/posix/libtpthread.la utf8/libutf8.la -lmusicbrainz -lz $(LIBLTDL) -lm
|
||||
noinst_LTLIBRARIES = libpluginsupport.la
|
||||
libpluginsupport_la_SOURCES = metadata.cpp fileio.cpp
|
||||
Loading…
Reference in a new issue