Sat Sep 19 17:14:21 2009 UTC ()
do previous differently. id3lib_strings.h is where memmove is used, so
pull in string.h there instead.


(tnn)
diff -r1.9 -r1.10 pkgsrc/audio/taglib/distinfo
diff -r1.4 -r1.5 pkgsrc/audio/taglib/files/id3lib_strings.h
diff -r1.2 -r1.3 pkgsrc/audio/taglib/patches/patch-aa

cvs diff -r1.9 -r1.10 pkgsrc/audio/taglib/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/taglib/distinfo 2009/09/19 17:00:39 1.9
+++ pkgsrc/audio/taglib/distinfo 2009/09/19 17:14:21 1.10
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.9 2009/09/19 17:00:39 tnn Exp $ 1$NetBSD: distinfo,v 1.10 2009/09/19 17:14:21 tnn Exp $
2 2
3SHA1 (taglib-1.6.tar.gz) = 2cb5309fa658c695b4ee28a72f85b4d892b63045 3SHA1 (taglib-1.6.tar.gz) = 2cb5309fa658c695b4ee28a72f85b4d892b63045
4RMD160 (taglib-1.6.tar.gz) = 895788b1f6e6d84f749cd545c107afb174edc4a2 4RMD160 (taglib-1.6.tar.gz) = 895788b1f6e6d84f749cd545c107afb174edc4a2
5Size (taglib-1.6.tar.gz) = 1098674 bytes 5Size (taglib-1.6.tar.gz) = 1098674 bytes
6SHA1 (patch-aa) = 4022eefdebe1ede4727f8f07dec6743bdc265b04 6SHA1 (patch-aa) = f1b1dd6686140cf64e59badc4601488b94c9f290

cvs diff -r1.4 -r1.5 pkgsrc/audio/taglib/files/Attic/id3lib_strings.h (expand / switch to unified diff)

--- pkgsrc/audio/taglib/files/Attic/id3lib_strings.h 2006/09/23 13:26:24 1.4
+++ pkgsrc/audio/taglib/files/Attic/id3lib_strings.h 2009/09/19 17:14:21 1.5
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1// -*- C++ -*- 1// -*- C++ -*-
2// $Id: id3lib_strings.h,v 1.4 2006/09/23 13:26:24 wiz Exp $ 2// $Id: id3lib_strings.h,v 1.5 2009/09/19 17:14:21 tnn Exp $
3 3
4// id3lib: a software library for creating and manipulating id3v1/v2 tags 4// id3lib: a software library for creating and manipulating id3v1/v2 tags
5// Copyright 1999, 2000 Scott Thomas Haug 5// Copyright 1999, 2000 Scott Thomas Haug
6// Copyright 2002 Thijmen Klok (thijmen@id3lib.org) 6// Copyright 2002 Thijmen Klok (thijmen@id3lib.org)
7 7
8// This library is free software; you can redistribute it and/or modify it 8// This library is free software; you can redistribute it and/or modify it
9// under the terms of the GNU Library General Public License as published by 9// under the terms of the GNU Library General Public License as published by
10// the Free Software Foundation; either version 2 of the License, or (at your 10// the Free Software Foundation; either version 2 of the License, or (at your
11// option) any later version. 11// option) any later version.
12// 12//
13// This library is distributed in the hope that it will be useful, but WITHOUT 13// This library is distributed in the hope that it will be useful, but WITHOUT
14// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 14// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
15// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public 15// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
@@ -20,26 +20,27 @@ @@ -20,26 +20,27 @@
20// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 20// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21 21
22// The id3lib authors encourage improvements and optimisations to be sent to 22// The id3lib authors encourage improvements and optimisations to be sent to
23// the id3lib coordinator. Please see the README file for details on where to 23// the id3lib coordinator. Please see the README file for details on where to
24// send such submissions. See the AUTHORS file for a list of people who have 24// send such submissions. See the AUTHORS file for a list of people who have
25// contributed to id3lib. See the ChangeLog file for a list of changes to 25// contributed to id3lib. See the ChangeLog file for a list of changes to
26// id3lib. These files are distributed with id3lib at 26// id3lib. These files are distributed with id3lib at
27// http://download.sourceforge.net/id3lib/ 27// http://download.sourceforge.net/id3lib/
28 28
29#ifndef _ID3LIB_STRINGS_H_ 29#ifndef _ID3LIB_STRINGS_H_
30#define _ID3LIB_STRINGS_H_ 30#define _ID3LIB_STRINGS_H_
31 31
32#include <string> 32#include <string>
 33#include <string.h>
33 34
34#if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) 35#if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
35namespace std 36namespace std
36{ 37{
37 template<> 38 template<>
38 struct char_traits<unsigned char> 39 struct char_traits<unsigned char>
39 { 40 {
40 typedef unsigned char char_type; 41 typedef unsigned char char_type;
41 // Unsigned as wint_t in unsigned. 42 // Unsigned as wint_t in unsigned.
42 typedef unsigned long int_type; 43 typedef unsigned long int_type;
43 typedef streampos pos_type; 44 typedef streampos pos_type;
44 typedef streamoff off_type; 45 typedef streamoff off_type;
45 typedef mbstate_t state_type; 46 typedef mbstate_t state_type;

cvs diff -r1.2 -r1.3 pkgsrc/audio/taglib/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/taglib/patches/Attic/patch-aa 2009/09/19 17:00:39 1.2
+++ pkgsrc/audio/taglib/patches/Attic/patch-aa 2009/09/19 17:14:21 1.3
@@ -1,22 +1,18 @@ @@ -1,22 +1,18 @@
1$NetBSD: patch-aa,v 1.2 2009/09/19 17:00:39 tnn Exp $ 1$NetBSD: patch-aa,v 1.3 2009/09/19 17:14:21 tnn Exp $
2 2
3--- taglib/toolkit/taglib.h.orig 2009-09-03 20:05:58.000000000 +0200 3--- taglib/toolkit/taglib.h.orig 2009-09-03 20:05:58.000000000 +0200
4+++ taglib/toolkit/taglib.h 4+++ taglib/toolkit/taglib.h
5@@ -37,9 +37,17 @@ 5@@ -40,6 +40,13 @@
6 #endif 
7  
8 #include <string> 
9+#include <string.h> 
10  6
11 //! A namespace for all TagLib related classes and functions 7 //! A namespace for all TagLib related classes and functions
12  8
13+/* 9+/*
14+ * not all C++ compilers provide char_traits for wchar 10+ * not all C++ compilers provide char_traits for wchar
15+ * so we borrow a file from id3lib as it has the relevant bits 11+ * so we borrow a file from id3lib as it has the relevant bits
16+ */ 12+ */
17+#define ID3_NEED_WCHAR_TEMPLATE 1 13+#define ID3_NEED_WCHAR_TEMPLATE 1
18+#include "id3lib_strings.h" 14+#include "id3lib_strings.h"
19+ 15+
20 /*! 16 /*!
21 * This namespace contains everything in TagLib. For projects working with 17 * This namespace contains everything in TagLib. For projects working with
22 * TagLib extensively it may be conveniten to add a 18 * TagLib extensively it may be conveniten to add a