kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update to 2.0.4

Browse source 
changes:
-minor feature additions
-buffixes
-build system updates
-switched to libmusicbrainz5
This commit is contained in:
drochner 2012-11-06 18:38:33 +00:00
parent 4b54954051
commit b40f32638a
9 changed files with 48 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
audio/flactag/Makefile
View file

@ -1,31 +1,33 @@
# $NetBSD: Makefile,v 1.12 2012/09/11 23:59:36 asau Exp $
# $NetBSD: Makefile,v 1.13 2012/11/06 18:38:33 drochner Exp $
#
DISTNAME= flactag-1.1
PKGREVISION= 8
DISTNAME= flactag-2.0.4
CATEGORIES= audio
MASTER_SITES= http://software.gently.org.uk/flactag-1.1/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flactag/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://software.gently.org.uk/flactag-1.1/
COMMENT= Tagger for flac album files
LICENSE= gnu-gpl-v2
USE_LANGUAGES= c++
USE_TOOLS= gmake
USE_LANGUAGES= c c++
USE_TOOLS= gmake pkg-config
GNU_CONFIGURE= yes
INSTALLATION_DIRS= bin
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
# "ripflag" doesn't work well, "discid" pollutes the namespace
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/flactag ${DESTDIR}${PREFIX}/bin
# the "discid" program doesn't do more, don't install for namespace sanity
${INSTALL_MAN} ${WRKSRC}/flactag.1 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../audio/flac/buildlink3.mk"
.include "../../audio/libdiscid/buildlink3.mk"
.include "../../www/neon/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../textproc/unac/buildlink3.mk"
.include "../../audio/libmusicbrainz/buildlink3.mk"
.include "../../audio/libmusicbrainz5/buildlink3.mk"
.include "../../devel/libslang2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

3
audio/flactag/PLIST
View file

@ -1,2 +1,3 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2009/07/27 13:51:12 drochner Exp $
@comment $NetBSD: PLIST,v 1.2 2012/11/06 18:38:33 drochner Exp $
bin/flactag
man/man1/flactag.1

18
audio/flactag/distinfo
View file

@ -1,12 +1,10 @@
$NetBSD: distinfo,v 1.5 2012/02/04 09:26:10 sbd Exp $
$NetBSD: distinfo,v 1.6 2012/11/06 18:38:33 drochner Exp $
SHA1 (flactag-1.1.tar.gz) = 8b0b65068b2659eceb36831694657bf2210ca36b
RMD160 (flactag-1.1.tar.gz) = 975091ad58b1c88e972e0b99ae800c068bc668d7
Size (flactag-1.1.tar.gz) = 110567 bytes
SHA1 (flactag-2.0.4.tar.gz) = eb62b3b8657fe26c6f838b0098fd4f176ccb454d
RMD160 (flactag-2.0.4.tar.gz) = 2eeece5d5da94a51e0e11fe425de3d0ec11b6639
Size (flactag-2.0.4.tar.gz) = 482150 bytes
SHA1 (patch-CommandLine.cc) = f677354989b98c26a613cfdf1f10ab8746ac6ec3
SHA1 (patch-ConfigFile.cc) = 3936aabe97b7660cbe5731e81317494782859877
SHA1 (patch-ErrorLog.cc) = 7ae1bbce462db4e7b776d976b14485be1a40d063
SHA1 (patch-FileNameBuilder.cc) = c7ba316bcf999670125c37573f29b7338804b15c
SHA1 (patch-aa) = 71425b556d64b828083f0738e61fb0b9ca15b1df
SHA1 (patch-ac) = cf71f4f68663ed9dc73662e32df55c0621fcaa14
SHA1 (patch-ad) = ff867a7acc08e08e3f109c63a235c13243a95cc6
SHA1 (patch-ConfigFile.cc) = 73ead20be34420b903eaa5ad61b7ba60f0aa03fe
SHA1 (patch-ErrorLog.cc) = d3557d5f19a571fbaeb9b6cfe574cf7b31afb1d1
SHA1 (patch-FileNameBuilder.cc) = 8daed0f95e479b22228bd4f62163f8f148107df8
SHA1 (patch-aa) = af23402361767ad79a2b0af006e2a89a25318d41

10
audio/flactag/patches/patch-ConfigFile.cc
View file

@ -1,12 +1,12 @@
$NetBSD: patch-ConfigFile.cc,v 1.1 2012/02/04 09:26:11 sbd Exp $
$NetBSD: patch-ConfigFile.cc,v 1.2 2012/11/06 18:38:34 drochner Exp $
--- ConfigFile.cc.orig 2008-12-16 11:20:56.000000000 +0000
--- ConfigFile.cc.orig 2012-10-19 21:40:21.000000000 +0000
+++ ConfigFile.cc
@@ -25,6 +25,7 @@
@@ -27,6 +27,7 @@
----------------------------------------------------------------------------*/
#include "ConfigFile.h"
+#include <cstdio>
CConfigFile::CConfigFile()
{
#include <stdio.h>
#include <strings.h>

10
audio/flactag/patches/patch-ErrorLog.cc
View file

@ -1,12 +1,12 @@
$NetBSD: patch-ErrorLog.cc,v 1.1 2012/02/04 09:26:11 sbd Exp $
$NetBSD: patch-ErrorLog.cc,v 1.2 2012/11/06 18:38:34 drochner Exp $
--- ErrorLog.cc.orig 2008-12-16 11:20:56.000000000 +0000
--- ErrorLog.cc.orig 2012-10-19 21:40:21.000000000 +0000
+++ ErrorLog.cc
@@ -25,6 +25,7 @@
@@ -26,6 +26,7 @@
----------------------------------------------------------------------------*/
#include "ErrorLog.h"
+#include <cstdio>
const std::vector<std::string>::size_type CErrorLog::m_cMaxSize=100;
#include <stdio.h>

8
audio/flactag/patches/patch-FileNameBuilder.cc
View file

@ -1,10 +1,10 @@
$NetBSD: patch-FileNameBuilder.cc,v 1.1 2012/02/04 09:26:11 sbd Exp $
$NetBSD: patch-FileNameBuilder.cc,v 1.2 2012/11/06 18:38:34 drochner Exp $
--- FileNameBuilder.cc.orig 2012-02-04 08:44:33.120854935 +0000
--- FileNameBuilder.cc.orig 2012-10-19 21:40:21.000000000 +0000
+++ FileNameBuilder.cc
@@ -27,6 +27,7 @@
#include "FileNameBuilder.h"
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <cstdio>

21
audio/flactag/patches/patch-aa
View file

@ -1,24 +1,29 @@
$NetBSD: patch-aa,v 1.3 2012/02/04 09:26:11 sbd Exp $
$NetBSD: patch-aa,v 1.4 2012/11/06 18:38:34 drochner Exp $
--- UTF8Tag.cc.orig 2008-12-16 11:20:56.000000000 +0000
--- UTF8Tag.cc.orig 2012-06-19 12:40:34.000000000 +0000
+++ UTF8Tag.cc
@@ -32,6 +32,7 @@
#include <errno.h>
@@ -34,6 +34,7 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#include <cstdio>
#include <iconv.h>
@@ -71,7 +72,11 @@ void CUTF8Tag::Convert()
@@ -73,11 +74,15 @@ void CUTF8Tag::Convert()
memset(Out,0,m_UTF8Value.length()*4);
size_t OutLeft=m_UTF8Value.length()*4;
+#if defined(__DragonFly__) || (__linux__)
char *InBuff=In;
+#else
+ const char *InBuff=In;
+#endif
char *OutBuff=Out;
iconv_t Convert=iconv_open(Codeset,"UTF-8");
std::stringstream NewCodeset;
- NewCodeset << Codeset << "//TRANSLIT//IGNORE";
+ NewCodeset << Codeset;
iconv_t Convert=iconv_open(NewCodeset.str().c_str(),"UTF-8");
if ((iconv_t)-1!=Convert)

26
audio/flactag/patches/patch-ac
View file

@ -1,26 +0,0 @@
$NetBSD: patch-ac,v 1.1.1.1 2009/07/27 13:51:12 drochner Exp $
--- Makefile.orig 2008-12-16 12:20:56.000000000 +0100
+++ Makefile
@@ -15,7 +15,7 @@ DISCIDOBJS=discid.o DiscIDWrapper.o Cues
SRCS=$(FLACTAGOBJS:.o=.cc) $(DISCIDOBJS:.o=.cc)
-all: flactag discid flactag.html flactag.1
+all: flactag discid #flactag.html flactag.1
debian-orig: .phony
debuild clean
@@ -85,10 +85,10 @@ install-webpages: flactag-$(VERSION).tar
sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
flactag: $(FLACTAGOBJS)
- g++ `neon-config --libs` -o $@ -lslang -lmusicbrainz3 -ldiscid -lFLAC++ -lunac -ljpeg $^
+ g++ `neon-config --libs` -o $@ -lslang -lmusicbrainz3 -ldiscid -lFLAC++ -lunac -ljpeg $^ -Wl,-R${PREFIX}/lib
discid: $(DISCIDOBJS)
- g++ -o $@ -ldiscid $^
+ g++ -o $@ -ldiscid $^ -Wl,-R${PREFIX}/lib
include $(SRCS:.cc=.d)

13
audio/flactag/patches/patch-ad
View file

@ -1,13 +0,0 @@
$NetBSD: patch-ad,v 1.1 2009/08/03 10:02:35 drochner Exp $
--- flactag.cc.orig 2009-08-03 11:56:23.000000000 +0200
+++ flactag.cc
@@ -156,7 +156,7 @@ CFlacTag::CFlacTag(const CCommandLine& C
AlbumNum=count;
MatchFound=true;
- printf("%s: Album ID in album %d is a match\n",m_FlacFile.c_str(),count);
+ printf("%s: Album ID in album %d is a match\n",m_FlacFile.c_str(),(int)count);
}
}