From a4e196804b255462af7c3034762ac0f0bac11e6a Mon Sep 17 00:00:00 2001
From: Paul Wisehart <wise@lupulin.net>
Date: Thu, 13 May 2010 00:21:19 +0200
Subject: audio/id3v2: Updated for version 0.1.11

---
 audio/id3v2/README                               |  2 +-
 audio/id3v2/id3v2-0.1.11-fixup_Makefile.patch    | 15 +++++++++++++++
 audio/id3v2/id3v2-0.1.11-track_no-segfault.patch | 12 ++++++++++++
 audio/id3v2/id3v2-track_no-segfault.patch        | 12 ------------
 audio/id3v2/id3v2.SlackBuild                     | 13 ++++++++++---
 audio/id3v2/id3v2.info                           |  4 +++-
 6 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 audio/id3v2/id3v2-0.1.11-fixup_Makefile.patch
 create mode 100644 audio/id3v2/id3v2-0.1.11-track_no-segfault.patch
 delete mode 100644 audio/id3v2/id3v2-track_no-segfault.patch

(limited to 'audio/id3v2')

diff --git a/audio/id3v2/README b/audio/id3v2/README
index f284a85d03..902648dd5a 100644
--- a/audio/id3v2/README
+++ b/audio/id3v2/README
@@ -1,3 +1,3 @@
 id3v2 is a command line editor for id3v2 tags.
 
-This requires id3lib, which is also available from SlackBuilds.org.
+This requires id3lib.
diff --git a/audio/id3v2/id3v2-0.1.11-fixup_Makefile.patch b/audio/id3v2/id3v2-0.1.11-fixup_Makefile.patch
new file mode 100644
index 0000000000..d5534e7867
--- /dev/null
+++ b/audio/id3v2/id3v2-0.1.11-fixup_Makefile.patch
@@ -0,0 +1,15 @@
+diff -Nur id3v2-0.1.11.orig/Makefile id3v2-0.1.11/Makefile
+--- id3v2-0.1.11.orig/Makefile	2004-05-04 13:33:53.000000000 -0500
++++ id3v2-0.1.11/Makefile	2009-07-29 00:36:39.438041437 -0500
+@@ -2,8 +2,10 @@
+ 
+ VERSION=0.1.11
+ 
++OPT=	-O2
++
+ PREFIX=	/usr/local
+-CXXFLAGS+=	-I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
++CXXFLAGS+=	$(OPT) -I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
+ LDFLAGS+=	-L${PREFIX}/lib/ 
+ 
+ id3v2:	convert.o list.o id3v2.o genre.o
diff --git a/audio/id3v2/id3v2-0.1.11-track_no-segfault.patch b/audio/id3v2/id3v2-0.1.11-track_no-segfault.patch
new file mode 100644
index 0000000000..6a6a61e17a
--- /dev/null
+++ b/audio/id3v2/id3v2-0.1.11-track_no-segfault.patch
@@ -0,0 +1,12 @@
+diff -uN id3v2-0.1.11/id3v2.cpp id3v2-0.1.11-patched/id3v2.cpp
+--- id3v2-0.1.11/id3v2.cpp	2004-05-04 19:30:15.000000000 +0100
++++ id3v2-0.1.11-patched/id3v2.cpp	2008-02-16 19:11:27.000000000 +0000
+@@ -423,7 +423,7 @@
+         {
+           // check if there is a total track number and if we only have 
+           // the track number for this file.  In this case combine them.
+-          char *currentTrackNum, *newTrackNum;
++          char *currentTrackNum, *newTrackNum = NULL;
+ 
+           if (pFrame != NULL) 
+           {
diff --git a/audio/id3v2/id3v2-track_no-segfault.patch b/audio/id3v2/id3v2-track_no-segfault.patch
deleted file mode 100644
index 6a6a61e17a..0000000000
--- a/audio/id3v2/id3v2-track_no-segfault.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uN id3v2-0.1.11/id3v2.cpp id3v2-0.1.11-patched/id3v2.cpp
---- id3v2-0.1.11/id3v2.cpp	2004-05-04 19:30:15.000000000 +0100
-+++ id3v2-0.1.11-patched/id3v2.cpp	2008-02-16 19:11:27.000000000 +0000
-@@ -423,7 +423,7 @@
-         {
-           // check if there is a total track number and if we only have 
-           // the track number for this file.  In this case combine them.
--          char *currentTrackNum, *newTrackNum;
-+          char *currentTrackNum, *newTrackNum = NULL;
- 
-           if (pFrame != NULL) 
-           {
diff --git a/audio/id3v2/id3v2.SlackBuild b/audio/id3v2/id3v2.SlackBuild
index d7dd15c879..e02929d1c0 100644
--- a/audio/id3v2/id3v2.SlackBuild
+++ b/audio/id3v2/id3v2.SlackBuild
@@ -17,8 +17,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
@@ -29,7 +34,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-patch -p1 < $CWD/id3v2-track_no-segfault.patch
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -37,12 +41,15 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/id3v2-0.1.11-fixup_Makefile.patch
+patch -p1 < $CWD/id3v2-0.1.11-track_no-segfault.patch
+
 # The Makefile doesnt use DESTDIR, but the program is just an 
 # executable and a man page (there's no apparent path-info compiled 
 # into the binary).  So we can fake it be using PREFIX and manually 
 # creating the direcories needed in $PKG
 mkdir -p $PKG/usr/{bin,man/man1}
-make
+make OPT="$SLKCFLAGS"
 make install PREFIX=$PKG/usr
 
 strip --strip-unneeded $PKG/usr/bin/id3v2
@@ -60,4 +67,4 @@ 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/id3v2/id3v2.info b/audio/id3v2/id3v2.info
index 909e9f2451..6df1af04ba 100644
--- a/audio/id3v2/id3v2.info
+++ b/audio/id3v2/id3v2.info
@@ -3,6 +3,8 @@ VERSION="0.1.11"
 HOMEPAGE="http://id3v2.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/id3v2/id3v2-0.1.11.tar.gz"
 MD5SUM="68afc3827cf01501dfb22949f901f1d8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="paul wisehart"
 EMAIL="wise@lupulin.net"
-APPROVED="David Somero"
\ No newline at end of file
+APPROVED="dsomero"
-- 
cgit v1.2.3