diff options
author | lofi <lofi@FreeBSD.org> | 2005-09-15 00:50:07 +0800 |
---|---|---|
committer | lofi <lofi@FreeBSD.org> | 2005-09-15 00:50:07 +0800 |
commit | 1f6d7795225bcc2852ea9910729fafbd2e37927e (patch) | |
tree | d5c85ab82b64dfb0fcae7cedd83d9424512e5a14 /audio/libtunepimp | |
parent | 34c0475b6b76c7f2810436ac50bcea03dce903df (diff) | |
download | freebsd-ports-gnome-1f6d7795225bcc2852ea9910729fafbd2e37927e.tar.gz freebsd-ports-gnome-1f6d7795225bcc2852ea9910729fafbd2e37927e.tar.zst freebsd-ports-gnome-1f6d7795225bcc2852ea9910729fafbd2e37927e.zip |
Fix build on 4-STABLE.
PR: ports/86115
Submitted by: KATO Tsuguru <tkato432@yahoo.com>
Approved by: Maintainer
Diffstat (limited to 'audio/libtunepimp')
-rw-r--r-- | audio/libtunepimp/files/patch-lib-metadata.cpp | 17 | ||||
-rw-r--r-- | audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp | 20 | ||||
-rw-r--r-- | audio/libtunepimp/files/patch-plugins-flac-flac.cpp | 13 | ||||
-rw-r--r-- | audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp | 13 | ||||
-rw-r--r-- | audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp | 13 | ||||
-rw-r--r-- | audio/libtunepimp/files/patch-plugins-wav-wav.cpp | 13 |
6 files changed, 89 insertions, 0 deletions
diff --git a/audio/libtunepimp/files/patch-lib-metadata.cpp b/audio/libtunepimp/files/patch-lib-metadata.cpp new file mode 100644 index 000000000000..018363898587 --- /dev/null +++ b/audio/libtunepimp/files/patch-lib-metadata.cpp @@ -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 --git a/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp b/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp new file mode 100644 index 000000000000..a3a5cabb78e8 --- /dev/null +++ b/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp @@ -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 --git a/audio/libtunepimp/files/patch-plugins-flac-flac.cpp b/audio/libtunepimp/files/patch-plugins-flac-flac.cpp new file mode 100644 index 000000000000..5d590d59034b --- /dev/null +++ b/audio/libtunepimp/files/patch-plugins-flac-flac.cpp @@ -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 <winsock.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <sys/param.h> + #endif + diff --git a/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp b/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp new file mode 100644 index 000000000000..8b8e8fd87acd --- /dev/null +++ b/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp @@ -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 <winsock.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <sys/param.h> + #endif + diff --git a/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp b/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp new file mode 100644 index 000000000000..2ab8c472b45e --- /dev/null +++ b/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp @@ -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 <winsock.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <sys/param.h> + #endif + diff --git a/audio/libtunepimp/files/patch-plugins-wav-wav.cpp b/audio/libtunepimp/files/patch-plugins-wav-wav.cpp new file mode 100644 index 000000000000..34bf7b46d4c3 --- /dev/null +++ b/audio/libtunepimp/files/patch-plugins-wav-wav.cpp @@ -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 <winsock.h> + #else ++#include <sys/types.h> ++#include <sys/socket.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <sys/param.h> + #endif +
\ No newline at end of file |