From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Sep 14 14:10:06 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBABE16A41F for ; Wed, 14 Sep 2005 14:10:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F84E43D45 for ; Wed, 14 Sep 2005 14:10:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j8EEA3Mk033282 for ; Wed, 14 Sep 2005 14:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j8EEA3CM033281; Wed, 14 Sep 2005 14:10:03 GMT (envelope-from gnats) Resent-Date: Wed, 14 Sep 2005 14:10:03 GMT Resent-Message-Id: <200509141410.j8EEA3CM033281@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A38D716A41F for ; Wed, 14 Sep 2005 14:01:12 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from hfep07.dion.ne.jp (hfep07.dion.ne.jp [203.181.105.73]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3BC143D45 for ; Wed, 14 Sep 2005 14:01:11 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([61.198.243.159]) by hfep07.dion.ne.jp with SMTP id <20050914140107156.MYLG@hfep07.dion.ne.jp> for ; Wed, 14 Sep 2005 23:01:07 +0900 Message-Id: <20050914230012.6fff157d.tkato432@yahoo.com> Date: Wed, 14 Sep 2005 23:00:12 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/86115: Update port: audio/libtunepimp X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Sep 2005 14:10:06 -0000 >Number: 86115 >Category: ports >Synopsis: Update port: audio/libtunepimp >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Sep 14 14:10:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p12 i386 >Organization: >Environment: >Description: - Fix build on 4-stable New file: files/patch-lib-metadata.cpp files/patch-lib-utf8-utf8util.cpp files/patch-plugins-flac-flac.cpp files/patch-plugins-mp3-mp3.cpp files/patch-plugins-vorbis-vorbis.cpp files/patch-plugins-wav-wav.cpp >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/libtunepimp/files/patch-lib-metadata.cpp audio/libtunepimp/files/patch-lib-metadata.cpp --- /usr/ports/audio/libtunepimp/files/patch-lib-metadata.cpp Thu Jan 1 09:00:00 1970 +++ audio/libtunepimp/files/patch-lib-metadata.cpp Wed Sep 14 17:26:16 2005 @@ -0,0 +1,17 @@ +--- lib/metadata.cpp.orig Wed Nov 10 17:37:26 2004 ++++ lib/metadata.cpp Wed Sep 14 17:25:59 2005 +@@ -34,6 +34,14 @@ + #include "astrcmp.h" + } + ++#ifndef min ++#define min(a,b) ((a) < (b) ? (a) : (b)) ++#endif ++ ++#ifndef max ++#define max(a,b) ((a) > (b) ? (a) : (b)) ++#endif ++ + const int numAlbumTypeStrings = 11; + const char *albumTypeStrings[] = + { diff -urN /usr/ports/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp --- /usr/ports/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp Thu Jan 1 09:00:00 1970 +++ audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp Wed Sep 14 17:19:59 2005 @@ -0,0 +1,20 @@ +--- lib/utf8/utf8util.cpp.orig Mon Jul 11 05:01:23 2005 ++++ lib/utf8/utf8util.cpp Wed Sep 14 17:19:42 2005 +@@ -38,7 +38,7 @@ + char *dest; + string to; + +- to.clear(); ++ to = ""; + ret = utf8_encode(from.c_str(), &dest); + if (ret >= 0) + { +@@ -54,7 +54,7 @@ + char *dest; + string to; + +- to.clear(); ++ to = ""; + ret = utf8_decode(from.c_str(), &dest); + if (ret >= 0) + { diff -urN /usr/ports/audio/libtunepimp/files/patch-plugins-flac-flac.cpp audio/libtunepimp/files/patch-plugins-flac-flac.cpp --- /usr/ports/audio/libtunepimp/files/patch-plugins-flac-flac.cpp Thu Jan 1 09:00:00 1970 +++ audio/libtunepimp/files/patch-plugins-flac-flac.cpp Wed Sep 14 17:37:08 2005 @@ -0,0 +1,13 @@ +--- plugins/flac/flac.cpp.orig Tue Jun 28 13:03:06 2005 ++++ plugins/flac/flac.cpp Wed Sep 14 17:35:23 2005 +@@ -33,7 +33,10 @@ + #ifdef WIN32 + #include + #else ++#include ++#include + #include ++#include + #include + #endif + diff -urN /usr/ports/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp --- /usr/ports/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp Thu Jan 1 09:00:00 1970 +++ audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp Wed Sep 14 17:32:53 2005 @@ -0,0 +1,13 @@ +--- plugins/mp3/mp3.cpp.orig Tue Jul 12 06:44:06 2005 ++++ plugins/mp3/mp3.cpp Wed Sep 14 17:32:42 2005 +@@ -33,7 +33,10 @@ + #ifdef WIN32 + #include + #else ++#include ++#include + #include ++#include + #include + #endif + diff -urN /usr/ports/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp --- /usr/ports/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp Thu Jan 1 09:00:00 1970 +++ audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp Wed Sep 14 17:34:25 2005 @@ -0,0 +1,13 @@ +--- plugins/vorbis/vorbis.cpp.orig Tue Jun 28 13:03:06 2005 ++++ plugins/vorbis/vorbis.cpp Wed Sep 14 17:34:12 2005 +@@ -33,7 +33,10 @@ + #ifdef WIN32 + #include + #else ++#include ++#include + #include ++#include + #include + #endif + diff -urN /usr/ports/audio/libtunepimp/files/patch-plugins-wav-wav.cpp audio/libtunepimp/files/patch-plugins-wav-wav.cpp --- /usr/ports/audio/libtunepimp/files/patch-plugins-wav-wav.cpp Thu Jan 1 09:00:00 1970 +++ audio/libtunepimp/files/patch-plugins-wav-wav.cpp Wed Sep 14 17:30:50 2005 @@ -0,0 +1,13 @@ +--- plugins/wav/wav.cpp.orig Wed Jun 15 06:15:18 2005 ++++ plugins/wav/wav.cpp Wed Sep 14 17:30:30 2005 +@@ -34,7 +34,10 @@ + #ifdef WIN32 + #include + #else ++#include ++#include + #include ++#include + #include + #endif + >Release-Note: >Audit-Trail: >Unformatted: