From 65e7754f51f4fde4100d49e2291e5c05daa0b8a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 29 Aug 2010 15:53:42 +0000 Subject: [PATCH] Allowing abcde to make mp3. I had to add id3v2, and fix the id3lib build. svn path=/nixpkgs/trunk/; revision=23513 --- pkgs/applications/audio/abcde/default.nix | 6 +- pkgs/development/libraries/id3lib/default.nix | 2 + .../id3lib/id3lib-3.8.3-gcc43-1.patch | 104 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 2b581f7e532..e7da594e4bc 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools +{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame , makeWrapper }: let version = "2.3.99.6"; @@ -40,7 +40,7 @@ in --replace '#!/bin/bash' '#!${bash}/bin/bash' wrapProgram "$out/bin/abcde" --prefix PATH ":" \ - "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin" + "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${lame}/bin" wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \ "${wget}/bin" @@ -58,4 +58,4 @@ in format, and tags them, all in one go. ''; }; - } \ No newline at end of file + } diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index edbf23d516e..df8add774a1 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -2,6 +2,8 @@ stdenv.mkDerivation { name = "id3lib-3.8.3"; + + patches = [ ./id3lib-3.8.3-gcc43-1.patch ]; src = fetchurl { url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz; diff --git a/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch b/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch new file mode 100644 index 00000000000..2b7457d54c7 --- /dev/null +++ b/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch @@ -0,0 +1,104 @@ +http://www.linuxfromscratch.org/patches/downloads/id3lib/id3lib-3.8.3-gcc43-1.patch + +Submitted By: Ken Moffat +Date: 2008-11-21 +Initial Package Version: 3.8.3 +Upstream Status: unknown +Origin: fedora +Description: Allows it to compile with gcc-4.3. + +diff -up id3lib-3.8.3/include/id3/id3lib_strings.h~ id3lib-3.8.3/include/id3/id3lib_strings.h +--- id3lib-3.8.3/include/id3/id3lib_strings.h~ 2003-03-02 02:23:00.000000000 +0200 ++++ id3lib-3.8.3/include/id3/id3lib_strings.h 2008-01-04 01:30:52.000000000 +0200 +@@ -29,6 +29,7 @@ + #ifndef _ID3LIB_STRINGS_H_ + #define _ID3LIB_STRINGS_H_ + ++#include + #include + + #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) +diff -up id3lib-3.8.3/configure.in~ id3lib-3.8.3/configure.in +--- id3lib-3.8.3/configure.in~ 2008-01-04 11:39:01.000000000 +0100 ++++ id3lib-3.8.3/configure.in 2008-01-04 11:39:01.000000000 +0100 +@@ -227,7 +227,6 @@ AC_CHECK_HEADERS(fstream iostream iomani + ) + AC_CHECK_HEADERS( \ + string \ +- iomanip.h \ + ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) + ) + +diff -up id3lib-3.8.3/configure~ id3lib-3.8.3/configure +--- id3lib-3.8.3/configure~ 2008-01-04 11:39:10.000000000 +0100 ++++ id3lib-3.8.3/configure 2008-01-04 11:39:10.000000000 +0100 +@@ -22976,7 +22976,6 @@ done + + for ac_header in \ + string \ +- iomanip.h \ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +diff -up id3lib-3.8.3/include/id3/writers.h~ id3lib-3.8.3/include/id3/writers.h +--- id3lib-3.8.3/include/id3/writers.h~ 2008-01-04 11:59:39.000000000 +0100 ++++ id3lib-3.8.3/include/id3/writers.h 2008-01-04 11:59:39.000000000 +0100 +@@ -28,9 +28,9 @@ + #ifndef _ID3LIB_WRITERS_H_ + #define _ID3LIB_WRITERS_H_ + ++#include + #include "id3/writer.h" + #include "id3/id3lib_streams.h" +-//#include + + class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer + { +diff -up id3lib-3.8.3/examples/demo_info.cpp~ id3lib-3.8.3/examples/demo_info.cpp +--- id3lib-3.8.3/examples/demo_info.cpp~ 2008-01-04 12:00:56.000000000 +0100 ++++ id3lib-3.8.3/examples/demo_info.cpp 2008-01-04 12:00:56.000000000 +0100 +@@ -309,7 +309,7 @@ void PrintInformation(const ID3_Tag &myT + + #define DEBUG + +-int main( unsigned int argc, char * const argv[]) ++int main(int argc, char * const argv[]) + { + ID3D_INIT_DOUT(); + +diff -up id3lib-3.8.3/examples/demo_copy.cpp~ id3lib-3.8.3/examples/demo_copy.cpp +--- id3lib-3.8.3/examples/demo_copy.cpp~ 2008-01-04 12:01:26.000000000 +0100 ++++ id3lib-3.8.3/examples/demo_copy.cpp 2008-01-04 12:01:26.000000000 +0100 +@@ -81,7 +81,7 @@ void DisplayTags(ostream &os, luint nTag + } + } + +-int main( unsigned int argc, char * const argv[]) ++int main(int argc, char * const argv[]) + { + int ulFlag = ID3TT_ID3; + ID3D_INIT_DOUT(); +diff -up id3lib-3.8.3/examples/demo_convert.cpp~ id3lib-3.8.3/examples/demo_convert.cpp +--- id3lib-3.8.3/examples/demo_convert.cpp~ 2008-01-04 12:01:20.000000000 +0100 ++++ id3lib-3.8.3/examples/demo_convert.cpp 2008-01-04 12:01:20.000000000 +0100 +@@ -84,7 +84,7 @@ void DisplayTags(ostream &os, luint nTag + } + } + +-int main( unsigned int argc, char * const argv[]) ++int main(int argc, char * const argv[]) + { + flags_t ulFlag = ID3TT_ALL; + gengetopt_args_info args; +diff -up id3lib-3.8.3/examples/demo_tag.cpp~ id3lib-3.8.3/examples/demo_tag.cpp +--- id3lib-3.8.3/examples/demo_tag.cpp~ 2008-01-04 12:01:41.000000000 +0100 ++++ id3lib-3.8.3/examples/demo_tag.cpp 2008-01-04 12:01:41.000000000 +0100 +@@ -46,7 +46,7 @@ void DisplayTags(ostream &os, luint nTag + os << "v2"; + } + +-int main( unsigned int argc, char * const argv[]) ++int main(int argc, char * const argv[]) + { + int ulFlag = ID3TT_ID3; + ID3D_INIT_DOUT(); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c0eaf14382..83050c5455d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5686,6 +5686,8 @@ let icewm = callPackage ../applications/window-managers/icewm { }; + id3v2 = callPackage ../applications/audio/id3v2 { }; + ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext