upgrade packages: libpano13 x264

3 files changed, 4 insertions, 106 deletions

diff --git a/src/libpano13-1-png.patch b/src/libpano13-1-png.patch
deleted file mode 100644
index 7ce0174..0000000
--- a/src/libpano13-1-png.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-https://bugs.launchpad.net/panotools/+bug/719076
-http://launchpadlibrarian.net/64361693/patch-png.c
-$NetBSD: patch-png.c,v 1.1 2011/02/07 01:03:35 wiz Exp $
-
-Fix build with png-1.5.
-
---- a/png.c	2008-01-02 14:46:28.000000000 +0000
-+++ b/png.c
-@@ -56,7 +56,7 @@ int writePNG( Image *im, fullPath *sfile
-    	}
- 
-   	/* set error handling */
--   	if (setjmp(png_ptr->jmpbuf))
-+   	if (setjmp(png_jmpbuf(png_ptr)))
-    	{
-       /* If we get here, we had a problem reading the file */
-       fclose(outfile);
-@@ -68,14 +68,15 @@ int writePNG( Image *im, fullPath *sfile
-    	png_init_io(png_ptr, outfile);
- 	
- 	FourToThreeBPP( im );
--	info_ptr->width 		= im->width;
--   	info_ptr->height 		= im->height;
--	info_ptr->bit_depth		= (im->bitsPerPixel > 32 ?  16 : 8);
--	info_ptr->color_type	= PNG_COLOR_TYPE_RGB;
-+	png_set_IHDR(png_ptr, info_ptr, im->width, im->height,
-+		     (im->bitsPerPixel > 32 ?  16 : 8), PNG_COLOR_TYPE_RGB,
-+		     0, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-+
-+#if 0
- 	info_ptr->channels		= (png_byte)(im->bitsPerPixel / info_ptr->bit_depth);
- 	info_ptr->pixel_depth	= (png_byte)(im->bitsPerPixel);
- 	info_ptr->rowbytes		= im->bytesPerLine;
--	info_ptr->interlace_type= 0;
-+#endif
- 
-   	png_write_info(png_ptr, info_ptr);
- 
-@@ -120,6 +121,7 @@ int readPNG	( Image *im, fullPath *sfile
- 	png_bytep *row_pointers;
- 	int row;
- 	unsigned long  dataSize;
-+	int color_type;
- 
- #ifdef __Mac__
- 	unsigned char the_pcUnixFilePath[256];//added by Kekus Digital
-@@ -165,7 +167,7 @@ int readPNG	( Image *im, fullPath *sfile
-    	}
- 
-    	/* set error handling if you are using the setjmp/longjmp method */
--   	if (setjmp(png_ptr->jmpbuf))
-+   	if (setjmp(png_jmpbuf(png_ptr)))
-    	{
-       	/* Free all of the memory associated with the png_ptr and info_ptr */
-       	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -182,9 +184,10 @@ int readPNG	( Image *im, fullPath *sfile
-    	/* read the file information */
-   	 png_read_info(png_ptr, info_ptr);
- 
--	if( info_ptr->color_type != PNG_COLOR_TYPE_RGB &&
--		info_ptr->color_type != PNG_COLOR_TYPE_PALETTE &&
--		info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA)
-+	color_type = png_get_color_type(png_ptr, info_ptr);
-+	if( color_type != PNG_COLOR_TYPE_RGB &&
-+		color_type != PNG_COLOR_TYPE_PALETTE &&
-+		color_type != PNG_COLOR_TYPE_RGB_ALPHA)
- 	{
- 		PrintError(" Only rgb images  supported");
-       	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -194,24 +197,17 @@ int readPNG	( Image *im, fullPath *sfile
- 
- 	 
- 	    /* expand paletted colors into true RGB triplets */
--   	if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+   	if (color_type == PNG_COLOR_TYPE_PALETTE)
-       png_set_expand(png_ptr);
- 
- 
- 	SetImageDefaults( im );
- 	
--	im->width 		= info_ptr->width;
--	im->height 		= info_ptr->height;
--	im->bytesPerLine	= info_ptr->rowbytes;
--	im->bitsPerPixel	= info_ptr->pixel_depth;
-+	im->width 		= png_get_image_width(png_ptr, info_ptr);
-+	im->height 		= png_get_image_height(png_ptr, info_ptr);
-+	im->bytesPerLine	= png_get_rowbytes(png_ptr, info_ptr);
- 	im->dataSize		= im->height * im->bytesPerLine;
--	if( im->bitsPerPixel == 24 )
--		dataSize = im->width * im->height *  4;
--	else if( im->bitsPerPixel == 48 )
--		dataSize = im->width * im->height *  8;
--	else
--		dataSize = im->width * im->height *  im->bitsPerPixel/8;
--	
-+	im->bitsPerPixel	= 8 * im->bytesPerLine / im->width;
- 
- 	im->data = (unsigned char**)mymalloc( (dataSize > im->dataSize ? dataSize : im->dataSize) );
- 	if( im->data == NULL ){
diff --git a/src/libpano13.mk b/src/libpano13.mk
index 9667a5b..c6dbea1 100644
--- a/src/libpano13.mk
+++ b/src/libpano13.mk
@@ -4,8 +4,8 @@
 # libpano13
 PKG             := libpano13
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.9.17
-$(PKG)_CHECKSUM := 418689985ea622bc234cd4eccec42180c12821b2
+$(PKG)_VERSION  := 2.9.18_rc2
+$(PKG)_CHECKSUM := 23849bdbdfc9176a2b53d157e58bd24aa0e7276e
 $(PKG)_SUBDIR   := $(PKG)-$(word 1,$(subst _, ,$($(PKG)_VERSION)))
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://panotools.sourceforge.net/
diff --git a/src/x264.mk b/src/x264.mk
index 5dbd74a..cc89fb7 100644
--- a/src/x264.mk
+++ b/src/x264.mk
@@ -4,8 +4,8 @@
 # x264
 PKG             := x264
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 20110227-2245
-$(PKG)_CHECKSUM := bed4017b162a6ac66e027112ab57fffd8aa15740
+$(PKG)_VERSION  := 20110312-2245
+$(PKG)_CHECKSUM := 22b06e8b090da9b35dba688575e5a61ce0985f2e
 $(PKG)_SUBDIR   := $(PKG)-snapshot-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.videolan.org/developers/x264.html