From: Hugo Villeneuve Date: Sun, 17 Aug 2014 00:15:40 +0000 (-0400) Subject: Upgrade to easytag-2.2.3 X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=47b23eff793721903e93f18f2ca444ad52d1e305;p=hvlinux.git Upgrade to easytag-2.2.3 Add itstool as it is required by easytag. --- diff --git a/config/dependencies b/config/dependencies index daf1efb..3a24aa7 100644 --- a/config/dependencies +++ b/config/dependencies @@ -8,9 +8,9 @@ ${PHP}: ${CURL} # Audio utilities ${AUDACITY}: ${LIBID3TAG} ${WXGTK} # Easytag requiert id3lib pour les MP3 -${EASYTAG}: id3lib OR ${LIBID3TAG} +${EASYTAG}: ${ID3LIB} ${LIBID3TAG} ${ITSTOOL} ${AUDACIOUS}: taglib, libmowgli, mcs -${GRIP}: ${VTE} id3lib ${CDPARANOIA} ${GTK} +${GRIP}: ${VTE} ${ID3LIB} ${CDPARANOIA} ${GTK} ${GOFFICE}: ${LIBGSF} ${PCRE} ${PANGO} ${GNUMERIC}: ${GOFFICE} diff --git a/config/packages-list b/config/packages-list index 1bd0320..628824d 100644 --- a/config/packages-list +++ b/config/packages-list @@ -76,7 +76,7 @@ DVDFS="dvdfs-0.2" DVDRWTOOLS="dvd+rw-tools-7.1" E2FSPROGS="e2fsprogs-1.42.5" -EASYTAG="easytag-2.1.7" +EASYTAG="easytag-2.2.3" ECRYPTFS_UTILS="ecryptfs-utils_103" EGLIBC="eglibc-2.15-r17386" EGLIBC_PORTS="eglibc-ports-2.15-r17386" @@ -173,6 +173,7 @@ I2C_TOOLS="i2c-tools-3.1.1" IANA="iana-etc-2.30" ICON_NAMING_UTILS="icon-naming-utils-0.8.90" ICU="icu4c-49_1_2-src" +ID3LIB="id3lib-3.8.3" IMAGE_MAGICK="ImageMagick-6.7.9-6" IMLIB2="imlib-1.4.2" INDENT="indent-2.2.10" @@ -182,6 +183,7 @@ INTLTOOL="intltool-0.50.2" IPROUTE2="iproute2-3.3.0" IPTABLES="iptables-1.4.15" ISO_CODES="iso-codes-3.38" +ITSTOOL="itstool-2.0.2" JACK="jack-audio-connection-kit-0.121.3" JASPER="jasper-1.900.1" diff --git a/stage5/hv-install-1 b/stage5/hv-install-1 index 8dcd0b9..6b639d1 100755 --- a/stage5/hv-install-1 +++ b/stage5/hv-install-1 @@ -17,6 +17,8 @@ ipkg -m noac ${SPLIX} ipkg ${FOOMATIC_FILTERS} ipkg -m noac ${FOO2ZJS} +ipkg ${ITSTOOL} + ipkg ${GLIB_NETWORKING} "\ --libexecdir=/usr/lib/glib-networking \ --with-ca-certificates=/etc/ssl/ca-bundle.crt \ @@ -121,6 +123,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg ${VTE} "--libexecdir=/usr/lib/vte --disable-gtk-doc" ipkg -m acnb ${GRIP} "--disable-id3" ipkg -m acnb ${CDRDAO} + ipkg ${ID3LIB} ipkg -m acnb ${EASYTAG} ipkg -m acnb ${FONTFORGE} "--enable-double" diff --git a/stage5/packages-update b/stage5/packages-update index 3ac98f6..83f1a85 100755 --- a/stage5/packages-update +++ b/stage5/packages-update @@ -20,6 +20,8 @@ fpkg -m sf -e "tar.bz2" ${SPLIX} fpkg -e "tar.gz" ${FOOMATIC_FILTERS} "http://www.openprinting.org/download/foomatic/" fpkg -e "tar.gz" ${FOO2ZJS} "http://foo2zjs.rkkda.com" +fpkg ${ITSTOOL} "http://files.itstool.org/itstool" + fpkg -m gnome ${GLIB_NETWORKING} fpkg -m gnome ${LIBSIGCPP} @@ -102,7 +104,8 @@ fpkg -e "tar.gz" ${LIBOIL} "http://liboil.freedesktop.org/download" fpkg -m gnome ${VTE} fpkg -m sf ${GRIP} fpkg -m sf -e "tar.bz2" ${CDRDAO} -fpkg -m sf -e "tar.bz2" ${EASYTAG} +fpkg -m sf ${ID3LIB} +fpkg -e "tar.xz" ${EASYTAG} "https://download.gnome.org/sources/easytag/$(get_pkg_ver2 ${EASYTAG})" fpkg -m sf -e "tar.bz2" -s "fontforge/fontforge-source" ${FONTFORGE} fpkg -m gnu ${GUILE1} fpkg -e "tar.gz" ${LILYPOND} \ diff --git a/stage5/patches/common/id3lib-3.8.3-gcc4.patch b/stage5/patches/common/id3lib-3.8.3-gcc4.patch new file mode 100644 index 0000000..fc14fa1 --- /dev/null +++ b/stage5/patches/common/id3lib-3.8.3-gcc4.patch @@ -0,0 +1,102 @@ +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/stage5/patches/common/id3lib-3.8.3-utf8.patch b/stage5/patches/common/id3lib-3.8.3-utf8.patch new file mode 100644 index 0000000..b05d2cf --- /dev/null +++ b/stage5/patches/common/id3lib-3.8.3-utf8.patch @@ -0,0 +1,39 @@ +diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog +--- id3lib-3.8.3.orig/ChangeLog 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/ChangeLog 2006-02-22 00:33:59.946214472 +0100 +@@ -1,3 +1,8 @@ ++2006-02-17 Jerome Couderc ++ ++ * Patch from Spoon to fix UTF-16 writing bug ++ http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979 ++ + 2003-03-02 Sunday 17:38 Thijmen Klok + + * THANKS (1.20): added more people +diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp +--- id3lib-3.8.3.orig/src/io_helpers.cpp 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/src/io_helpers.cpp 2006-02-22 00:35:02.926639992 +0100 +@@ -363,11 +363,22 @@ + // Write the BOM: 0xFEFF + unicode_t BOM = 0xFEFF; + writer.writeChars((const unsigned char*) &BOM, 2); ++ // Patch from Spoon : 2004-08-25 14:17 ++ // http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979 ++ // Wrong code ++ //for (size_t i = 0; i < size; i += 2) ++ //{ ++ // unicode_t ch = (data[i] << 8) | data[i+1]; ++ // writer.writeChars((const unsigned char*) &ch, 2); ++ //} ++ // Right code ++ unsigned char *pdata = (unsigned char *) data.c_str(); + for (size_t i = 0; i < size; i += 2) + { +- unicode_t ch = (data[i] << 8) | data[i+1]; ++ unicode_t ch = (pdata[i] << 8) | pdata[i+1]; + writer.writeChars((const unsigned char*) &ch, 2); + } ++ // End patch + } + return writer.getCur() - beg; + }