diff options
| -rw-r--r-- | audio/id3/README | 2 | ||||
| -rw-r--r-- | audio/id3/id3-0.78-include_string_h.diff | 32 | ||||
| -rw-r--r-- | audio/id3/id3.SlackBuild | 19 | ||||
| -rw-r--r-- | audio/id3/id3.info | 2 | ||||
| -rw-r--r-- | audio/id3/slack-desc | 2 |
5 files changed, 47 insertions, 10 deletions
diff --git a/audio/id3/README b/audio/id3/README index 35c2f63b9e..fad06d17bf 100644 --- a/audio/id3/README +++ b/audio/id3/README @@ -5,5 +5,3 @@ variables, and/or rename files, using an intuitive syntax. id3 currently supports the old-style ID3 format with track-number extension (ID3 v1.1), as well as the more complicated ID3v2 (ID3 v2.2.0, v2.3.0) format. - -The program uses non standard licence. diff --git a/audio/id3/id3-0.78-include_string_h.diff b/audio/id3/id3-0.78-include_string_h.diff new file mode 100644 index 0000000000..e0b0403373 --- /dev/null +++ b/audio/id3/id3-0.78-include_string_h.diff @@ -0,0 +1,32 @@ +diff -Nur id3-0.78.orig/charconv.cpp id3-0.78/charconv.cpp +--- id3-0.78.orig/charconv.cpp 2006-02-14 15:44:58.000000000 -0600 ++++ id3-0.78/charconv.cpp 2009-07-29 00:23:24.555116104 -0500 +@@ -5,6 +5,7 @@ + #include <cstdlib> + #include <clocale> + #include <climits> ++#include <string.h> + #if defined(__STDC_ISO_10646__) || defined(__WIN32__) + # include <wchar.h> + # define fallback(call) (0) +diff -Nur id3-0.78.orig/getid3v2.cpp id3-0.78/getid3v2.cpp +--- id3-0.78.orig/getid3v2.cpp 2006-02-10 21:23:14.000000000 -0600 ++++ id3-0.78/getid3v2.cpp 2009-07-29 00:23:38.549842736 -0500 +@@ -1,5 +1,6 @@ + #include <vector> + #include <cstdio> ++#include <string.h> + #include "char_ucs.h" + #include "id3v2.h" + #include "getid3v2.h" +diff -Nur id3-0.78.orig/setfname.cpp id3-0.78/setfname.cpp +--- id3-0.78.orig/setfname.cpp 2006-03-19 05:13:36.000000000 -0600 ++++ id3-0.78/setfname.cpp 2009-07-29 00:24:04.691291911 -0500 +@@ -3,6 +3,7 @@ + #include <ctime> // borland needs this + #include <sys/stat.h> + #include <utime.h> ++#include <string.h> + #if defined(__WIN32__) + # include <io.h> + # define F_OK 0 diff --git a/audio/id3/id3.SlackBuild b/audio/id3/id3.SlackBuild index fcbac13347..3c9bf35bb2 100644 --- a/audio/id3/id3.SlackBuild +++ b/audio/id3/id3.SlackBuild @@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -31,7 +34,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM -tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -40,8 +43,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -make +# Fixup some includes +patch -p1 < $CWD/id3-0.78-include_string_h.diff + +make CFLAGS="$SLKCFLAGS" # Copying executable and manual to the correct location mkdir -p $PKG/usr/bin @@ -63,13 +68,13 @@ cp -a id3.man $PKG/usr/man/man1/id3.1 ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES COPYING INSTALL README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + CHANGES COPYING INSTALL README \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz - +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/id3/id3.info b/audio/id3/id3.info index b99c8ed84f..8643e7786d 100644 --- a/audio/id3/id3.info +++ b/audio/id3/id3.info @@ -3,6 +3,8 @@ VERSION="0.78" HOMEPAGE="http://home.wanadoo.nl/squell/id3.html" DOWNLOAD="http://home.wanadoo.nl/squell/files/id3-0.78.tar.gz" MD5SUM="bbc2a5d8022006330e6bb51034fafb43" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Cezary M. Kruk" EMAIL="c.kruk@bigfoot.com" APPROVED="dsomero" diff --git a/audio/id3/slack-desc b/audio/id3/slack-desc index 3c8964941b..a56a9950f6 100644 --- a/audio/id3/slack-desc +++ b/audio/id3/slack-desc @@ -16,4 +16,4 @@ id3: id3 currently supports the old-style ID3 format with track-number id3: extension (ID3 v1.1), as well as the more complicated ID3v2 (ID3 id3: v2.2.0, v2.3.0) format. id3: -id3: The program uses non standard licence. +id3: |