3 files changed, 9 insertions, 34 deletions
diff --git a/multimedia/dvdauthor/dvdauthor.SlackBuild b/multimedia/dvdauthor/dvdauthor.SlackBuild
index 31dfa11ba6..6b60a41c32 100644
--- a/multimedia/dvdauthor/dvdauthor.SlackBuild
+++ b/multimedia/dvdauthor/dvdauthor.SlackBuild
@@ -23,19 +23,17 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Maintained as of version 0.6.18 by Niels Horn <niels.horn@gmail.com>
-# Revision date: 2010/06/21
+# Revision date: 2010/10/23
 
 PRGNAM=dvdauthor
-VERSION=${VERSION:-0.6.18}
+VERSION=${VERSION:-0.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -45,8 +43,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PDOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -72,9 +68,6 @@ cd $PRGNAM
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# Patch for new libpng
-patch -p1 < $CWD/png14.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -89,7 +82,9 @@ make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PDOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/multimedia/dvdauthor/dvdauthor.info b/multimedia/dvdauthor/dvdauthor.info
index 66f3826e83..238d2e900a 100644
--- a/multimedia/dvdauthor/dvdauthor.info
+++ b/multimedia/dvdauthor/dvdauthor.info
@@ -1,10 +1,10 @@
 PRGNAM="dvdauthor"
-VERSION="0.6.18"
+VERSION="0.7.0"
 HOMEPAGE="http://dvdauthor.sf.net"
-DOWNLOAD="http://downloads.sourceforge.net/dvdauthor/dvdauthor-0.6.18.tar.gz"
-MD5SUM="ded5373800ac6448ff044606f5047550"
+DOWNLOAD="http://downloads.sourceforge.net/dvdauthor/dvdauthor-0.7.0.tar.gz"
+MD5SUM="33a447fb98ab3293ac40f869eedc17ff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/multimedia/dvdauthor/png14.patch b/multimedia/dvdauthor/png14.patch
deleted file mode 100644
index 39dca8ddb8..0000000000
--- a/multimedia/dvdauthor/png14.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dvdauthor/src/subgen-image.c	2010-03-13 05:14:07.000000000 -0300
-+++ dvdauthor_patched/src/subgen-image.c	2010-06-11 08:10:04.000000000 -0300
-@@ -226,7 +226,7 @@
-     png_struct *ps;
-     png_info *pi;
-     png_byte **rowp;
--    unsigned long width,height;
-+    png_uint_32 width,height;
-     int bit_depth,color_type,channels,x,y;
- 
-     fp=fopen(s->fname,"rb");
-@@ -271,7 +271,7 @@
-     assert(bit_depth==8); // 8bpp, not 1, 2, 4, or 16
-     assert(!(color_type&PNG_COLOR_MASK_PALETTE)); // not a palette
-     if( width>MAXX || height>MAXY ) {
--        fprintf(stderr,"ERR: PNG %s is too big: %lux%lu\n",s->fname,width,height);
-+        fprintf(stderr,"ERR: PNG %s is too big: %lux%lu\n",s->fname,(long unsigned int)width,(long unsigned int)height);
-         png_destroy_read_struct(&ps,&pi,NULL);
-         return -1;
-     }