diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-09-14 14:29:37 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-09-14 14:29:37 +0000 |
commit | 2ecfb5cd9d6de54f3b27ef81b2fa03f1f7fc413a (patch) | |
tree | 918f5b38e945efaf8757083ce9ba18f3d480a4ab /pkgs/development/libraries/libtunepimp | |
parent | 163e453e10e0dccc7b4296caeb2d36ddb695a8b1 (diff) | |
download | nixlib-2ecfb5cd9d6de54f3b27ef81b2fa03f1f7fc413a.tar nixlib-2ecfb5cd9d6de54f3b27ef81b2fa03f1f7fc413a.tar.gz nixlib-2ecfb5cd9d6de54f3b27ef81b2fa03f1f7fc413a.tar.bz2 nixlib-2ecfb5cd9d6de54f3b27ef81b2fa03f1f7fc413a.tar.lz nixlib-2ecfb5cd9d6de54f3b27ef81b2fa03f1f7fc413a.tar.xz nixlib-2ecfb5cd9d6de54f3b27ef81b2fa03f1f7fc413a.tar.zst nixlib-2ecfb5cd9d6de54f3b27ef81b2fa03f1f7fc413a.zip |
Add libtunepimp
svn path=/nixpkgs/trunk/; revision=23796
Diffstat (limited to 'pkgs/development/libraries/libtunepimp')
-rw-r--r-- | pkgs/development/libraries/libtunepimp/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/libtunepimp/gcc-4.x.patch | 177 |
2 files changed, 193 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libtunepimp/default.nix b/pkgs/development/libraries/libtunepimp/default.nix new file mode 100644 index 000000000000..e1279a566675 --- /dev/null +++ b/pkgs/development/libraries/libtunepimp/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, zlib, expat, curl, libmusicbrainz2, taglib, libmpcdec, + libmad, libogg, libvorbis, flac, mp4v2, libofa, libtool }: + +stdenv.mkDerivation rec { + name = "libtunepimp-0.5.3"; + + propagatedBuildInputs = [ zlib expat curl libmusicbrainz2 taglib libmpcdec + libmad libogg libvorbis flac libofa libtool ]; + + patches = [ ./gcc-4.x.patch ]; + + src = fetchurl { + url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz"; + sha256 = "0s141zmsxv8xlivcgcmy6xhk9cyjjxmr1fy45xiqfqrqpsh485rl"; + }; +} diff --git a/pkgs/development/libraries/libtunepimp/gcc-4.x.patch b/pkgs/development/libraries/libtunepimp/gcc-4.x.patch new file mode 100644 index 000000000000..92219ea6f9ba --- /dev/null +++ b/pkgs/development/libraries/libtunepimp/gcc-4.x.patch @@ -0,0 +1,177 @@ +diff --git a/include/tunepimp-0.5/metadata.h b/include/tunepimp-0.5/metadata.h +index f9bab5d..ea08cf5 100644 +--- a/include/tunepimp-0.5/metadata.h ++++ b/include/tunepimp-0.5/metadata.h +@@ -29,6 +29,7 @@ + + #include <string> + #include <cstdio> ++#include <cstring> + + #include "defs.h" + #include "tp_c.h" +diff --git a/lib/c_wrapper.cpp b/lib/c_wrapper.cpp +index 760cc08..66c6111 100644 +--- a/lib/c_wrapper.cpp ++++ b/lib/c_wrapper.cpp +@@ -43,6 +43,7 @@ + if (obj == NULL) return; + + #include <deque> ++#include <cstdlib> + + class NotifyData + { +diff --git a/lib/fileio.cpp b/lib/fileio.cpp +index a1602da..abe2b24 100644 +--- a/lib/fileio.cpp ++++ b/lib/fileio.cpp +@@ -27,6 +27,8 @@ + + #include <assert.h> + #include <errno.h> ++#include <string.h> ++#include <stdlib.h> + #include <string> + #ifndef WIN32 + #include <unistd.h> +@@ -122,7 +124,8 @@ int taccess(const char *pathname, int mode, const char *encoding) + + void tmktempname(const char *path, char *newPath, int newPathLen) + { +- char *ptr, *temp; ++ char *temp; ++ const char *ptr; + + temp = (char *)malloc(strlen(path) + 32); + ptr = strrchr(path, dirSepChar); +diff --git a/lib/metadata.cpp b/lib/metadata.cpp +index 0a1a70a..dcd0aa1 100644 +--- a/lib/metadata.cpp ++++ b/lib/metadata.cpp +@@ -24,8 +24,9 @@ + $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $ + + ----------------------------------------------------------------------------*/ +-#include <math.h> +-#include <stdio.h> ++#include <cmath> ++#include <cstdio> ++#include <cstdlib> + #include "metadata.h" + #include "../config.h" + using namespace std; +diff --git a/lib/protocol.cpp b/lib/protocol.cpp +index 83e8b33..3436f80 100644 +--- a/lib/protocol.cpp ++++ b/lib/protocol.cpp +@@ -8,6 +8,7 @@ + -------------------------------------------------------------------*/ + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include <string> + #include <map> + #include <expat.h> +diff --git a/lib/readmeta.cpp b/lib/readmeta.cpp +index 7f325de..5e5513a 100644 +--- a/lib/readmeta.cpp ++++ b/lib/readmeta.cpp +@@ -30,7 +30,8 @@ + #endif + #endif + +-#include <stdio.h> ++#include <cstdio> ++#include <cstdlib> + #ifndef WIN32 + #include <unistd.h> + #endif +diff --git a/lib/tunepimp.cpp b/lib/tunepimp.cpp +index bf09383..f1b9b56 100644 +--- a/lib/tunepimp.cpp ++++ b/lib/tunepimp.cpp +@@ -30,7 +30,8 @@ + #endif + #endif + +-#include <stdio.h> ++#include <cstdio> ++#include <cstdlib> + #include <map> + using namespace std; + +diff --git a/lib/utf8/utf8util.cpp b/lib/utf8/utf8util.cpp +index a066956..6ea86e4 100644 +--- a/lib/utf8/utf8util.cpp ++++ b/lib/utf8/utf8util.cpp +@@ -26,6 +26,7 @@ + ----------------------------------------------------------------------------*/ + + #include <stdio.h> ++#include <stdlib.h> + #include "utf8util.h" + #include "utf8.h" + #ifdef WIN32 +diff --git a/plugins/mp3/id3_2_3_meta.cpp b/plugins/mp3/id3_2_3_meta.cpp +index fa9a7e0..efac1c9 100644 +--- a/plugins/mp3/id3_2_3_meta.cpp ++++ b/plugins/mp3/id3_2_3_meta.cpp +@@ -26,6 +26,7 @@ + ----------------------------------------------------------------------------*/ + + #include <stdio.h> ++#include <stdlib.h> + #include <assert.h> + #include <ctype.h> + #include <musicbrainz/mb_c.h> +diff --git a/plugins/mp3/id3_meta.cpp b/plugins/mp3/id3_meta.cpp +index d860bf6..804ca5c 100644 +--- a/plugins/mp3/id3_meta.cpp ++++ b/plugins/mp3/id3_meta.cpp +@@ -26,6 +26,7 @@ + ----------------------------------------------------------------------------*/ + + #include <stdio.h> ++#include <stdlib.h> + #include <time.h> + #include <ctype.h> + #include <musicbrainz/mb_c.h> +diff --git a/plugins/mp4/mp4.cpp b/plugins/mp4/mp4.cpp +index 9f741e3..dcc7ec9 100644 +--- a/plugins/mp4/mp4.cpp ++++ b/plugins/mp4/mp4.cpp +@@ -27,7 +27,8 @@ + + #include <string.h> + #include <stdio.h> +-#include <mp4.h> ++#include <stdlib.h> ++#include <mp4v2/mp4v2.h> + #include "metadata.h" + #include "plugin.h" + #ifndef WIN32 +diff --git a/plugins/wma/wma.cpp b/plugins/wma/wma.cpp +index 3d7a50a..a28901c 100644 +--- a/plugins/wma/wma.cpp ++++ b/plugins/wma/wma.cpp +@@ -27,6 +27,7 @@ + + #include <string.h> + #include <stdio.h> ++#include <stdlib.h> + #include <wmafile.h> + #include "metadata.h" + #include "plugin.h" +diff --git a/plugins/wma/wmafile.cpp b/plugins/wma/wmafile.cpp +index 1b38af8..31fa150 100644 +--- a/plugins/wma/wmafile.cpp ++++ b/plugins/wma/wmafile.cpp +@@ -19,6 +19,7 @@ + * USA * + ***************************************************************************/ + ++#include <string.h> + #include <tstring.h> + #include <wmafile.h> + #include <wmatag.h> |