diff options
| -rw-r--r-- | multimedia/stills2dv/libpng.patch | 57 | ||||
| -rw-r--r-- | multimedia/stills2dv/stills2dv.SlackBuild | 11 | ||||
| -rw-r--r-- | multimedia/stills2dv/stills2dv.info | 6 |
3 files changed, 67 insertions, 7 deletions
diff --git a/multimedia/stills2dv/libpng.patch b/multimedia/stills2dv/libpng.patch new file mode 100644 index 0000000000..98a070f86e --- /dev/null +++ b/multimedia/stills2dv/libpng.patch @@ -0,0 +1,57 @@ +--- stills2dv-alpha-0.602/s2d_png.c.orig 2016-02-13 22:37:33.318517038 +0700 ++++ stills2dv-alpha-0.602/s2d_png.c 2016-02-13 22:49:22.996228344 +0700 +@@ -75,8 +75,8 @@ + png_init_io(png_ptr, in); + png_set_sig_bytes(png_ptr, 8); + png_read_info(png_ptr, info_ptr); +- width = info_ptr->width; +- height = info_ptr->height; ++ width = png_get_image_width(png_ptr, info_ptr);; ++ height = png_get_image_height(png_ptr, info_ptr); + png_set_interlace_handling(png_ptr); + png_read_update_info(png_ptr, info_ptr); + if (setjmp(png_jmpbuf(png_ptr))) +@@ -91,7 +91,7 @@ + return NULL; + } + for (y=0; y<height; y++) +- if((row_pointers[y] = (unsigned char *) malloc(info_ptr->rowbytes))==NULL) ++ if((row_pointers[y] = (unsigned char *) malloc(png_get_rowbytes(png_ptr, info_ptr)))==NULL) + { + fprintf(stderr, "Out of memory allocating rows for png\n"); + while(y>1) +@@ -128,14 +128,14 @@ + free(img); + return NULL; + } +- if(info_ptr->color_type == PNG_COLOR_TYPE_RGB) ++ if(png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB) + { + + for (y=0;y<height;y++) + { + memcpy(&img->data[y*width*3], row_pointers[y], width*3); + } +- }else if (info_ptr->color_type == PNG_COLOR_TYPE_RGBA) ++ }else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGBA) + { + data=img->data; + for (y=0;y<height;y++) +@@ -149,7 +149,7 @@ + row++; + } + } +- }else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) ++ }else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) + { + data=img->data; + for (y=0;y<height;y++) +@@ -162,7 +162,7 @@ + *(data++)=*(row++); + } + } +- }else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ }else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) + { + data=img->data; + for (y=0;y<height;y++) diff --git a/multimedia/stills2dv/stills2dv.SlackBuild b/multimedia/stills2dv/stills2dv.SlackBuild index d8361d9415..431a56fbae 100644 --- a/multimedia/stills2dv/stills2dv.SlackBuild +++ b/multimedia/stills2dv/stills2dv.SlackBuild @@ -5,7 +5,7 @@ # This is hereby put in the public domain PRGNAM=stills2dv -VERSION=alpha_0.601 +VERSION=${VERSION:-alpha_0.602} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -51,7 +51,10 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Patch to convert to libpng16 +patch -p1 < $CWD/libpng.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -62,11 +65,11 @@ cp -f stills2dv $PKG/usr/bin chmod 755 $PKG/usr/bin/stills2dv chown root:root $PKG/usr/bin/stills2dv -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Makefile README.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.txt $PKG/usr/doc/$PRGNAM-$VERSION cp -a Documentation/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/multimedia/stills2dv/stills2dv.info b/multimedia/stills2dv/stills2dv.info index 40c379796e..ee77ce0a1c 100644 --- a/multimedia/stills2dv/stills2dv.info +++ b/multimedia/stills2dv/stills2dv.info @@ -1,8 +1,8 @@ PRGNAM="stills2dv" -VERSION="alpha_0.601" +VERSION="alpha_0.602" HOMEPAGE="http://www.deniscarl.com/stills2dv/" -DOWNLOAD="http://downloads.sourceforge.net/stills2dv/stills2dv-alpha-0.601.tgz" -MD5SUM="8ed69f48d5af651aa70940e64b39c854" +DOWNLOAD="http://downloads.sourceforge.net/stills2dv/stills2dv-alpha-0.602.tgz" +MD5SUM="fd12def0d42275245bf20d5b9384f7fb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libdv" |