diff options
| -rw-r--r-- | multimedia/dvdauthor/README | 4 | ||||
| -rw-r--r-- | multimedia/dvdauthor/dvdauthor.SlackBuild | 30 | ||||
| -rw-r--r-- | multimedia/dvdauthor/dvdauthor.info | 12 | ||||
| -rw-r--r-- | multimedia/dvdauthor/png14.patch | 20 | ||||
| -rw-r--r-- | multimedia/dvdauthor/slack-desc | 12 |
5 files changed, 52 insertions, 26 deletions
diff --git a/multimedia/dvdauthor/README b/multimedia/dvdauthor/README index 6b251414e4933..e2e4e08b5dc94 100644 --- a/multimedia/dvdauthor/README +++ b/multimedia/dvdauthor/README @@ -1,2 +1,2 @@ -dvdauthor is a program that will generate a DVD movie from a valid -mpeg2 stream; the movie should play when you put it in a DVD player. +dvdauthor is a program that will generate a DVD movie from a valid mpeg2 +stream. The movie should play when you put it in a standard DVD player. diff --git a/multimedia/dvdauthor/dvdauthor.SlackBuild b/multimedia/dvdauthor/dvdauthor.SlackBuild index 0cfaa81effafb..31dfa11ba6685 100644 --- a/multimedia/dvdauthor/dvdauthor.SlackBuild +++ b/multimedia/dvdauthor/dvdauthor.SlackBuild @@ -22,9 +22,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # 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 + PRGNAM=dvdauthor -VERSION=0.6.14 -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.6.18} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} # Automatically determine the architecture we're building on: @@ -58,15 +61,20 @@ else LIBDIRSUFFIX="" fi +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 -cd $PRGNAM-$VERSION +rm -rf $PRGNAM +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +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 \ @@ -75,19 +83,17 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - || exit 1 + --build=$ARCH-slackware-linux -make || exit 1 -make install-strip DESTDIR=$PKG || exit 1 +make +make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $PDOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/multimedia/dvdauthor/dvdauthor.info b/multimedia/dvdauthor/dvdauthor.info index 517b64511e930..66f3826e831fc 100644 --- a/multimedia/dvdauthor/dvdauthor.info +++ b/multimedia/dvdauthor/dvdauthor.info @@ -1,10 +1,10 @@ PRGNAM="dvdauthor" -VERSION="0.6.14" +VERSION="0.6.18" HOMEPAGE="http://dvdauthor.sf.net" -DOWNLOAD="http://downloads.sourceforge.net/dvdauthor/dvdauthor-0.6.14.tar.gz" -MD5SUM="bd646b47950c4091ffd781d43fd2c5e9" +DOWNLOAD="http://downloads.sourceforge.net/dvdauthor/dvdauthor-0.6.18.tar.gz" +MD5SUM="ded5373800ac6448ff044606f5047550" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -MAINTAINER="Brian Reichert" -EMAIL="rignes@pobox.com" -APPROVED="BP{k},rworkman,pprkut" +MAINTAINER="Niels Horn" +EMAIL="niels.horn@gmail.com" +APPROVED="rworkman" diff --git a/multimedia/dvdauthor/png14.patch b/multimedia/dvdauthor/png14.patch new file mode 100644 index 0000000000000..39dca8ddb8d39 --- /dev/null +++ b/multimedia/dvdauthor/png14.patch @@ -0,0 +1,20 @@ +--- 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; + } diff --git a/multimedia/dvdauthor/slack-desc b/multimedia/dvdauthor/slack-desc index fe949cca3ca81..8b399cae4987c 100644 --- a/multimedia/dvdauthor/slack-desc +++ b/multimedia/dvdauthor/slack-desc @@ -5,15 +5,15 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| dvdauthor: dvdauthor (A simple set of tools to help you author a DVD) dvdauthor: -dvdauthor: dvdauthor is a program that will generate a DVD movie from a -dvdauthor: valid mpeg2 stream. -dvdauthor: +dvdauthor: dvdauthor is a program that will generate a DVD movie from a valid +dvdauthor: mpeg2 stream. dvdauthor: The resulting movie should play in a standard DVD player. dvdauthor: dvdauthor: Homepage: http://dvdauthor.sf.net dvdauthor: -dvdauthor: -dvdauthor: +dvdauthor: +dvdauthor: +dvdauthor: |