Fri Jun 8 19:37:17 UTC 2012

13 files changed, 0 insertions, 938 deletions

diff --git a/community/amsn/amsn-0.98.4-libpng15.patch b/community/amsn/amsn-0.98.4-libpng15.patch
deleted file mode 100644
index 24f875d02..000000000
--- a/community/amsn/amsn-0.98.4-libpng15.patch
+++ /dev/null
@@ -1,471 +0,0 @@
---- utils/TkCximage/src/CxImage/ximapng.cpp
-+++ utils/TkCximage/src/CxImage/ximapng.cpp
-@@ -15,7 +15,7 @@
- void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
- {
- 	strcpy(info.szLastError,message);
--	longjmp(png_ptr->jmpbuf, 1);
-+	longjmp(png_jmpbuf(png_ptr), 1);
- }
- ////////////////////////////////////////////////////////////////////////////////
- #if CXIMAGE_SUPPORT_DECODE
-@@ -62,7 +62,7 @@
-     /* Set error handling if you are using the setjmp/longjmp method (this is
-     * the normal method of doing things with libpng).  REQUIRED unless you
-     * set up your own error handlers in the png_create_read_struct() earlier. */
--	if (setjmp(png_ptr->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		delete [] row_pointers;
- 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -77,15 +77,15 @@
- 	png_read_info(png_ptr, info_ptr);
- 
- 	if (info.nEscape == -1){
--		head.biWidth = info_ptr->width;
--		head.biHeight= info_ptr->height;
-+		head.biWidth = png_get_image_width(png_ptr, info_ptr);
-+		head.biHeight= png_get_image_height(png_ptr, info_ptr);
- 		info.dwType = CXIMAGE_FORMAT_PNG;
--		longjmp(png_ptr->jmpbuf, 1);
-+		longjmp(png_jmpbuf(png_ptr), 1);
- 	}
- 
- 	/* calculate new number of channels */
- 	int channels=0;
--	switch(info_ptr->color_type){
-+	switch(png_get_color_type(png_ptr, info_ptr)){
- 	case PNG_COLOR_TYPE_GRAY:
- 	case PNG_COLOR_TYPE_PALETTE:
- 		channels = 1;
-@@ -101,71 +101,76 @@
- 		break;
- 	default:
- 		strcpy(info.szLastError,"unknown PNG color type");
--		longjmp(png_ptr->jmpbuf, 1);
-+		longjmp(png_jmpbuf(png_ptr), 1);
- 	}
- 
- 	//find the right pixel depth used for cximage
--	int pixel_depth = info_ptr->pixel_depth;
-+#if MIGHT_BE_BUGGY
-+	int pixel_depth = png_get_pixel_depth(png_ptr, info_ptr);
- 	if (channels == 1 && pixel_depth>8) pixel_depth=8;
-+#endif
-+	int pixel_depth;
-+	if (channels == 1) pixel_depth=8;
- 	if (channels == 2) pixel_depth=8;
- 	if (channels >= 3) pixel_depth=24;
- 
--	if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
--		longjmp(png_ptr->jmpbuf, 1);
-+	if (!Create(png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr), pixel_depth, CXIMAGE_FORMAT_PNG)){
-+		longjmp(png_jmpbuf(png_ptr), 1);
- 	}
- 
- 	/* get metrics */
--	switch (info_ptr->phys_unit_type)
-+	png_uint_32 res_x, res_y;
-+	int unit_type;
-+	png_get_pHYs_dpi(png_ptr, info_ptr, &res_x, &res_y, &unit_type);
-+	switch (unit_type)
- 	{
- 	case PNG_RESOLUTION_UNKNOWN:
--		SetXDPI(info_ptr->x_pixels_per_unit);
--		SetYDPI(info_ptr->y_pixels_per_unit);
-+		SetXDPI(res_x);
-+		SetYDPI(res_y);
- 		break;
- 	case PNG_RESOLUTION_METER:
--		SetXDPI((long)floor(info_ptr->x_pixels_per_unit * 254.0 / 10000.0 + 0.5));
--		SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
-+		SetXDPI((long)floor(res_x * 254.0 / 10000.0 + 0.5));
-+		SetYDPI((long)floor(res_y * 254.0 / 10000.0 + 0.5));
- 		break;
- 	}
- 
--	if (info_ptr->num_palette>0){
--		SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette);
--		SetClrImportant(info_ptr->num_palette);
--	} else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
-+	png_colorp palette;
-+	int num_palette;
-+	png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
-+	if (num_palette>0){
-+		SetPalette((rgb_color*)palette,num_palette);
-+		SetClrImportant(num_palette);
-+	} else if (png_get_bit_depth(png_ptr, info_ptr) ==2) { //<DP> needed for 2 bpp grayscale PNGs
- 		SetPaletteColor(0,0,0,0);
- 		SetPaletteColor(1,85,85,85);
- 		SetPaletteColor(2,170,170,170);
- 		SetPaletteColor(3,255,255,255);
- 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs
- 	
--	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
-+	int nshift = max(0,(png_get_bit_depth(png_ptr, info_ptr)>>3)-1)<<3;
- 
--	if (info_ptr->num_trans!=0){ //palette transparency
--		if (info_ptr->num_trans==1){
--			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
--#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
--				info.nBkgndIndex = info_ptr->trans_color.index;
--#else
--				info.nBkgndIndex = info_ptr->trans_values.index;
--#endif
-+png_uint_32    png_get_tRNS   (png_const_structp   png_ptr,   png_infop
-+info_ptr,  png_bytep  *trans_alpha,   int   *num_trans,   png_color_16p
-+*trans_color);
-+	png_bytep trans_alpha;
-+	int num_trans;
-+	png_color_16p trans_color;
-+	png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
-+	if (num_trans!=0){ //palette transparency
-+		if (num_trans==1){
-+			if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE){
-+				info.nBkgndIndex = trans_color->index;
- 			} else{
--#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
--				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
--#else
--				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
--#endif
-+				info.nBkgndIndex = trans_color->gray>>nshift;
- 			}
- 		}
--		if (info_ptr->num_trans>1){
-+		if (num_trans>1){
- 			RGBQUAD* pal=GetPalette();
- 			if (pal){
- 				DWORD ip;
--				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
--#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
--					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
--#else
--					pal[ip].rgbReserved=info_ptr->trans[ip];
--#endif
--				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
-+				for (ip=0;ip<min(head.biClrUsed,(unsigned long)num_trans);ip++)
-+					pal[ip].rgbReserved=trans_alpha[ip];
-+				for (ip=num_trans;ip<head.biClrUsed;ip++){
- 					pal[ip].rgbReserved=255;
- 				}
- 				info.bAlphaPaletteEnabled=true;
-@@ -178,15 +183,9 @@
- 		int num_trans;
- 		png_color_16 *image_background;
- 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
--#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
--			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
--			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
--			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);
--#else
--			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);
--			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
--			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
--#endif
-+			info.nBkgndColor.rgbRed   = (BYTE)(trans_color->red>>nshift);
-+			info.nBkgndColor.rgbGreen = (BYTE)(trans_color->green>>nshift);
-+			info.nBkgndColor.rgbBlue  = (BYTE)(trans_color->blue>>nshift);
- 			info.nBkgndColor.rgbReserved = 0;
- 			info.nBkgndIndex = 0;
- 		}
-@@ -202,15 +201,15 @@
- 	}
- 
- 	// <vho> - flip the RGB pixels to BGR (or RGBA to BGRA)
--	if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){
-+	if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR){
- 		png_set_bgr(png_ptr);
- 	}
- 
- 	// <vho> - handle cancel
--	if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
-+	if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
- 
- 	// row_bytes is the width x number of channels x (bit-depth / 8)
--	row_pointers = new BYTE[info_ptr->rowbytes + 8];
-+	row_pointers = new BYTE[png_get_rowbytes(png_ptr, info_ptr) + 8];
- 
- 	// turn on interlace handling
- 	int number_passes = png_set_interlace_handling(png_ptr);
-@@ -221,8 +220,10 @@
- 		SetCodecOption(0);
- 	}
- 
--	int chan_offset = info_ptr->bit_depth >> 3;
--	int pixel_offset = info_ptr->pixel_depth >> 3;
-+	int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
-+	int chan_offset = bit_depth >> 3;
-+	//int pixel_offset = info_ptr->pixel_depth >> 3;
-+	int pixel_offset = (bit_depth * channels) >> 3;
- 
- 	for (int pass=0; pass < number_passes; pass++) {
- 		iter.Upset();
-@@ -230,7 +231,7 @@
- 		do	{
- 
- 			// <vho> - handle cancel
--			if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
-+			if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
- 
- #if CXIMAGE_SUPPORT_ALPHA	// <vho>
- 			if (AlphaIsValid()) {
-@@ -241,7 +242,7 @@
- 				BYTE* prow= iter.GetRow(ay);
- 
- 				//recover data from previous scan
--				if (info_ptr->interlace_type && pass>0 && pass!=7){
-+				if (png_get_interlace_type(png_ptr, info_ptr) && pass>0 && pass!=7){
- 					for(ax=0;ax<head.biWidth;ax++){
- 						long px = ax * pixel_offset;
- 						if (channels == 2){
-@@ -278,10 +279,10 @@
- #endif // CXIMAGE_SUPPORT_ALPHA		// vho
- 			{
- 				//recover data from previous scan
--				if (info_ptr->interlace_type && pass>0){
--					iter.GetRow(row_pointers, info_ptr->rowbytes);
-+				if (png_get_interlace_type(png_ptr, info_ptr) && pass>0){
-+					iter.GetRow(row_pointers, png_get_rowbytes(png_ptr, info_ptr));
- 					//re-expand buffer for images with bit depth > 8
--					if (info_ptr->bit_depth > 8){
-+					if (png_get_bit_depth(png_ptr, info_ptr) > 8){
- 						for(long ax=(head.biWidth*channels-1);ax>=0;ax--)
- 							row_pointers[ax*chan_offset] = row_pointers[ax];
- 					}
-@@ -291,15 +292,15 @@
- 				png_read_row(png_ptr, row_pointers, NULL);
- 
- 				//shrink 16 bit depth images down to 8 bits
--				if (info_ptr->bit_depth > 8){
-+				if (png_get_bit_depth(png_ptr, info_ptr) > 8){
- 					for(long ax=0;ax<(head.biWidth*channels);ax++)
- 						row_pointers[ax] = row_pointers[ax*chan_offset];
- 				}
- 
- 				//copy the pixels
--				iter.SetRow(row_pointers, info_ptr->rowbytes);
-+				iter.SetRow(row_pointers, png_get_rowbytes(png_ptr, info_ptr));
- 				//<DP> expand 2 bpp images only in the last pass
--				if (info_ptr->bit_depth==2 && pass==(number_passes-1))
-+				if (png_get_bit_depth(png_ptr, info_ptr)==2 && pass==(number_passes-1))
- 					expand2to4bpp(iter.GetRow());
- 
- 				//go on
-@@ -340,6 +341,11 @@
- 	BYTE trans[256];	//for transparency (don't move)
- 	png_struct *png_ptr;
- 	png_info *info_ptr;
-+	png_uint_32 width, height;
-+	png_byte bit_depth;
-+	png_byte color_type;
-+	png_byte interlace_type;
-+	BYTE channels;
- 
-   cx_try
-   {
-@@ -362,9 +368,8 @@
-    /* Set error handling.  REQUIRED if you aren't supplying your own
-     * error hadnling functions in the png_create_write_struct() call.
-     */
--	if (setjmp(png_ptr->jmpbuf)){
-+	if (setjmp(png_jmpbuf(png_ptr))){
- 		/* If we get here, we had a problem reading the file */
--		if (info_ptr->palette) free(info_ptr->palette);
- 		png_destroy_write_struct(&png_ptr,  (png_infopp)&info_ptr);
- 		cx_throw("Error saving PNG file");
- 	}
-@@ -376,20 +381,18 @@
-     png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
- 
- 	/* set the file information here */
--	info_ptr->width = GetWidth();
--	info_ptr->height = GetHeight();
--	info_ptr->pixel_depth = (BYTE)GetBpp();
--	info_ptr->channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
--	info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels);
--	info_ptr->compression_type = info_ptr->filter_type = 0;
--	info_ptr->valid = 0;
-+	width = GetWidth();
-+	height = GetHeight();
-+	//pixel_depth = (BYTE)GetBpp();
-+	channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
-+	bit_depth = (BYTE)(GetBpp()/channels);
- 
- 	switch(GetCodecOption(CXIMAGE_FORMAT_PNG)){
- 	case 1:
--		info_ptr->interlace_type = PNG_INTERLACE_ADAM7;
-+		interlace_type = PNG_INTERLACE_ADAM7;
- 		break;
- 	default:
--		info_ptr->interlace_type = PNG_INTERLACE_NONE;
-+		interlace_type = PNG_INTERLACE_NONE;
- 	}
- 
- 	/* set compression level */
-@@ -399,19 +402,19 @@
- 
- 	if (GetNumColors()){
- 		if (bGrayScale){
--			info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
-+			color_type = PNG_COLOR_TYPE_GRAY;
- 		} else {
--			info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-+			color_type = PNG_COLOR_TYPE_PALETTE;
- 		}
- 	} else {
--		info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+		color_type = PNG_COLOR_TYPE_RGB;
- 	}
- #if CXIMAGE_SUPPORT_ALPHA
- 	if (AlphaIsValid()){
--		info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
--		info_ptr->channels++;
--		info_ptr->bit_depth = 8;
--		info_ptr->pixel_depth += 8;
-+		color_type |= PNG_COLOR_MASK_ALPHA;
-+		channels++;
-+		bit_depth = 8;
-+		//pixel_depth += 8;
- 	}
- #endif
- 
-@@ -428,29 +431,21 @@
- 	/* set metrics */
- 	png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER);
- 
--	png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth,
--				info_ptr->color_type, info_ptr->interlace_type,
-+	png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
-+				color_type, interlace_type,
- 				PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
- 
- 	//<DP> simple transparency
- 	if (info.nBkgndIndex >= 0){
--		info_ptr->num_trans = 1;
--		info_ptr->valid |= PNG_INFO_tRNS;
--#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
--		info_ptr->trans_alpha = trans;
--		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
--		info_ptr->trans_color.red   = tc.rgbRed;
--		info_ptr->trans_color.green = tc.rgbGreen;
--		info_ptr->trans_color.blue  = tc.rgbBlue;
--		info_ptr->trans_color.gray  = info_ptr->trans_color.index;
--#else
--		info_ptr->trans = trans;
--		info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
--		info_ptr->trans_values.red   = tc.rgbRed;
--		info_ptr->trans_values.green = tc.rgbGreen;
--		info_ptr->trans_values.blue  = tc.rgbBlue;
--		info_ptr->trans_values.gray  = info_ptr->trans_values.index;
--#endif
-+		png_color_16 trans_color;
-+
-+		trans_color.index = (BYTE)info.nBkgndIndex;
-+		trans_color.red   = tc.rgbRed;
-+		trans_color.green = tc.rgbGreen;
-+		trans_color.blue  = tc.rgbBlue;
-+		trans_color.gray  = (BYTE)info.nBkgndIndex;
-+
-+		png_set_tRNS(png_ptr, info_ptr, trans, 1, &trans_color);
- 
- 		// the transparency indexes start from 0 for non grayscale palette
- 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
-@@ -459,30 +454,27 @@
- 
- 	/* set the palette if there is one */
- 	if (GetPalette()){
--		if (!bGrayScale){
--			info_ptr->valid |= PNG_INFO_PLTE;
--		}
--
- 		int nc = GetClrImportant();
- 		if (nc==0) nc = GetNumColors();
- 
- 		if (info.bAlphaPaletteEnabled){
- 			for(WORD ip=0; ip<nc;ip++)
- 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
--			info_ptr->num_trans = (WORD)nc;
--			info_ptr->valid |= PNG_INFO_tRNS;
--#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
--			info_ptr->trans_alpha = trans;
--#else
--			info_ptr->trans = trans;
--#endif
-+			png_set_tRNS(png_ptr, info_ptr, trans, (WORD)nc, NULL);
- 		}
- 
- 		// copy the palette colors
--		info_ptr->palette = new png_color[nc];
--		info_ptr->num_palette = (png_uint_16) nc;
--		for (int i=0; i<nc; i++)
--			GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
-+		if (!bGrayScale) {
-+			png_color *palette;
-+
-+			palette = (png_color *)png_malloc(png_ptr, nc*sizeof(palette[0]));
-+			for (int i=0; i<nc; i++)
-+				GetPaletteColor(i, &palette[i].red, &palette[i].green, &palette[i].blue);
-+			png_set_PLTE(png_ptr, info_ptr, palette, nc);
-+			png_data_freer(png_ptr, info_ptr,
-+				       PNG_DESTROY_WILL_FREE_DATA,
-+				       PNG_FREE_PLTE);
-+		}
- 	}  
- 
- #if CXIMAGE_SUPPORT_ALPHA	// <vho>
-@@ -496,8 +488,8 @@
- 	}	}	}
- #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>
- 
--	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
--	info_ptr->rowbytes = row_size;
-+	int row_size = max(info.dwEffWidth, png_get_rowbytes(png_ptr, info_ptr));
-+	//info_ptr->rowbytes = row_size;
- 	BYTE *row_pointers = new BYTE[row_size];
- 
- 	/* write the file information */
-@@ -515,7 +507,7 @@
- 			if (AlphaIsValid()){
- 				for (long ax=head.biWidth-1; ax>=0;ax--){
- 					c = BlindGetPixelColor(ax,ay);
--					int px = ax * info_ptr->channels;
-+					int px = ax * png_get_channels(png_ptr, info_ptr);
- 					if (!bGrayScale){
- 						row_pointers[px++]=c.rgbRed;
- 						row_pointers[px++]=c.rgbGreen;
-@@ -530,7 +522,7 @@
- #endif //CXIMAGE_SUPPORT_ALPHA	// <vho>
- 			{
- 				iter.GetRow(row_pointers, row_size);
--				if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
-+				if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB) //HACK BY OP
- 					RGBtoBGR(row_pointers, row_size);
- 				png_write_row(png_ptr, row_pointers);
- 			}
-@@ -547,12 +539,6 @@
- 	/* It is REQUIRED to call this to finish writing the rest of the file */
- 	png_write_end(png_ptr, info_ptr);
- 
--	/* if you malloced the palette, free it here */
--	if (info_ptr->palette){
--		delete [] (info_ptr->palette);
--		info_ptr->palette = NULL;
--	}
--
- 	/* clean up after the write, and free any memory allocated */
- 	png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr);
- 
---- utils/TkCximage/src/CxImage/ximapng.h
-+++ utils/TkCximage/src/CxImage/ximapng.h
-@@ -64,8 +64,8 @@
- 
-     static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
- 	{
--		strncpy((char*)png_ptr->error_ptr,error_msg,255);
--		longjmp(png_ptr->jmpbuf, 1);
-+		strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);
-+		longjmp(png_jmpbuf(png_ptr), 1);
- 	}
- };
- 
diff --git a/community/amsn/amsn-0.98.4-v4l2.patch b/community/amsn/amsn-0.98.4-v4l2.patch
deleted file mode 100644
index 815a6ad19..000000000
--- a/community/amsn/amsn-0.98.4-v4l2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Add support for v4l2 on Linux so it can compile against modern
-kernel headers. #363201
-
-Patch by Kevin McCarthy <signals@gentoo.org>
-
---- configure.ac
-+++ configure.ac
-@@ -382,6 +382,10 @@
- 	AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
- fi
- 
-+if test "$FOUND_OS" = "linux"; then
-+    AC_CHECK_HEADERS(linux/videodev2.h)
-+fi
-+
- #---------------------------------------------------------------------------------------------
- 
- dnl ---------------------------------------------------------------------
---- utils/linux/capture/capture.h
-+++ utils/linux/capture/capture.h
-@@ -33,7 +33,11 @@
- #ifdef HAVE_SYS_VIDEODEV2_H
- #   include <sys/videodev2.h>
- #else
--#   include <linux/videodev.h>
-+	#ifdef HAVE_LINUX_VIDEODEV2_H
-+		#include <linux/videodev2.h>
-+	#else
-+		#include <linux/videodev.h>
-+	#endif
- #endif
- 
- #include "grab-ng.h"
diff --git a/community/amsn/amsn-jpeg7.patch b/community/amsn/amsn-jpeg7.patch
deleted file mode 100644
index d9c9f103d..000000000
--- a/community/amsn/amsn-jpeg7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/TkCximage/src/CxImage/ximajpg.cpp.orig	2009-07-18 05:29:43.000000000 -0300
-+++ utils/TkCximage/src/CxImage/ximajpg.cpp	2009-07-18 05:30:31.000000000 -0300
-@@ -142,6 +142,7 @@
-  */ //</DP>
- 
- 	// Set the scale <ignacio>
-+        SetJpegScale(8); // Set an initial value (FIX for jpeg-7)
- 	cinfo.scale_denom = GetJpegScale();
- 
- 	// Borrowed the idea from GIF implementation <ignacio>
diff --git a/community/amsn/amsn-libpng14.patch b/community/amsn/amsn-libpng14.patch
deleted file mode 100644
index 8b6e8a05d..000000000
--- a/community/amsn/amsn-libpng14.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- utils/TkCximage/src/CxImage/ximapng.cpp	2008-03-07 20:14:37.000000000 +0100
-+++ utils/TkCximage/src/CxImage/ximapng.cpp_fixed	2010-01-28 23:08:13.000000000 +0100
-@@ -142,9 +142,9 @@
- 	if (info_ptr->num_trans!=0){ //palette transparency
- 		if (info_ptr->num_trans==1){
- 			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
--				info.nBkgndIndex = info_ptr->trans_values.index;
-+				info.nBkgndIndex = info_ptr->trans_color.index;
- 			} else{
--				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
-+				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
- 			}
- 		}
- 		if (info_ptr->num_trans>1){
-@@ -152,7 +152,7 @@
- 			if (pal){
- 				DWORD ip;
- 				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
--					pal[ip].rgbReserved=info_ptr->trans[ip];
-+					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
- 				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
- 					pal[ip].rgbReserved=255;
- 				}
-@@ -166,9 +166,9 @@
- 		int num_trans;
- 		png_color_16 *image_background;
- 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
--			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);
--			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
--			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
-+			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
-+			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
-+			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);
- 			info.nBkgndColor.rgbReserved = 0;
- 			info.nBkgndIndex = 0;
- 		}
-@@ -417,12 +417,12 @@
- 	if (info.nBkgndIndex >= 0){
- 		info_ptr->num_trans = 1;
- 		info_ptr->valid |= PNG_INFO_tRNS;
--		info_ptr->trans = trans;
--		info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
--		info_ptr->trans_values.red   = tc.rgbRed;
--		info_ptr->trans_values.green = tc.rgbGreen;
--		info_ptr->trans_values.blue  = tc.rgbBlue;
--		info_ptr->trans_values.gray  = info_ptr->trans_values.index;
-+		info_ptr->trans_alpha = trans;
-+		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
-+		info_ptr->trans_color.red   = tc.rgbRed;
-+		info_ptr->trans_color.green = tc.rgbGreen;
-+		info_ptr->trans_color.blue  = tc.rgbBlue;
-+		info_ptr->trans_color.gray  = info_ptr->trans_color.index;
- 
- 		// the transparency indexes start from 0 for non grayscale palette
- 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
-@@ -443,7 +443,7 @@
- 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
- 			info_ptr->num_trans = (WORD)nc;
- 			info_ptr->valid |= PNG_INFO_tRNS;
--			info_ptr->trans = trans;
-+			info_ptr->trans_alpha = trans;
- 		}
- 
- 		// copy the palette colors
diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD
deleted file mode 100644
index a7a8a958b..000000000
--- a/community/cherokee/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 64315 2012-02-11 23:19:41Z allan $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=cherokee
-pkgver=1.2.101
-pkgrel=3
-pkgdesc="A very fast, flexible and easy to configure Web Server"
-arch=('i686' 'x86_64')
-url="http://www.cherokee-project.com/"
-license=('GPL2')
-depends=('openssl' 'pcre')
-makedepends=('python2' 'gettext' 'libldap' 'pam' 'libmysqlclient'
-             'ffmpeg' 'geoip')
-optdepends=('python2: cherokee-admin (administrative web interface)'
-            'libldap: ldap validator'
-            'pam: pam validator'
-            'libmysqlclient: mysql validator'
-            'ffmpeg: Audio/Video streaming handler'
-            'geoip: GeoIP rule module'
-            'rrdtool: RRDtool based information collector')
-backup=('etc/cherokee/cherokee.conf'
-        'etc/logrotate.d/cherokee'
-        'etc/pam.d/cherokee')
-options=('!libtool')
-source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz
-        cherokee.rc
-        cherokee.logrotate
-        fix-ctk-path-handler-match.patch)
-sha256sums=('ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8'
-            '4c06cebfab8b68edd4967c020bfb41b077cfff10d76596d1ed192d0b6cedbd86'
-            '20e26d633f8c1cd90eb21f41dd163b73a83846e405b1ce995e072c4efefc522e'
-            '2bd05e0181024c9bd02d828e8329d4d96a779e4870b1fc4f18aa8667d8c6a630')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Fix path matching bug in CTK apps (e.g. market)
-  patch -Np1 -i "$srcdir/fix-ctk-path-handler-match.patch"
-
-  # Use subdirectory for logs
-  sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
-
-  # Use Python 2 in cherokee-admin
-  sed -i 's/"python"/"python2"/' cherokee/main_admin.c
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-static \
-    --with-wwwroot=/srv/http \
-    --with-wwwuser=http \
-    --with-wwwgroup=http \
-    --with-python=python2 \
-    --enable-os-string="Arch Linux"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make -j1 DESTDIR="$pkgdir" install
-
-  # PAM configuration file for cherokee
-  install -D -m644 pam.d_cherokee "$pkgdir/etc/pam.d/$pkgname"
-
-  # Fix ownership of /var/lib/cherokee/graphs
-  chown -R http:http "$pkgdir/var/lib/$pkgname/graphs"
-
-  # Use Python 2
-  sed -i 's/env python$/&2/' \
-    "$pkgdir/usr/share/cherokee/admin/"{server,upgrade_config}.py \
-    "$pkgdir/usr/bin/"{CTK-run,cherokee-{admin-launcher,tweak}}
-  sed -i -r "s/['\"]python/&2/g" \
-    "$pkgdir/usr/share/cherokee/admin/wizards/django.py"
-
-  # Compile Python scripts
-  python2 -m compileall "$pkgdir"
-  python2 -O -m compileall "$pkgdir"
-
-  install -d -o http -g http "$pkgdir/var/log/$pkgname"
-  install -D "$srcdir/$pkgname.rc" "$pkgdir/etc/rc.d/$pkgname"
-  install -Dm644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
-
-  # Cleanup
-  rm -rf "$pkgdir/srv"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/cherokee/cherokee.logrotate b/community/cherokee/cherokee.logrotate
deleted file mode 100644
index 19207fd02..000000000
--- a/community/cherokee/cherokee.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/cherokee/*.error /var/log/cherokee/*.access {
-   daily
-   rotate 14
-   compress
-   sharedscripts
-   postrotate
-      /bin/kill -HUP `cat /var/run/cherokee.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/community/cherokee/cherokee.rc b/community/cherokee/cherokee.rc
deleted file mode 100755
index 2d413dc13..000000000
--- a/community/cherokee/cherokee.rc
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-daemon_name=cherokee
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-    if [ ! -f /var/run/$daemon_name.pid ] && $daemon_name -d &>/dev/null; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
-    if kill $PID &>/dev/null; then
-      rm_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  reload)
-    stat_busy "Reloading $daemon_name daemon"
-    [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
-    if kill -HUP $PID &>/dev/null; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    stat_busy "Restarting $daemon_name daemon"
-    [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
-    if kill -USR1 $PID &>/dev/null; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/community/cherokee/fix-ctk-path-handler-match.patch b/community/cherokee/fix-ctk-path-handler-match.patch
deleted file mode 100644
index abd20c5ef..000000000
--- a/community/cherokee/fix-ctk-path-handler-match.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -upr cherokee-1.2.99.orig/admin/CTK/CTK/Server.py cherokee-1.2.99/admin/CTK/CTK/Server.py
---- cherokee-1.2.99.orig/admin/CTK/CTK/Server.py	2011-06-06 14:17:35.000000000 +0300
-+++ cherokee-1.2.99/admin/CTK/CTK/Server.py	2011-09-16 03:31:06.000000000 +0300
-@@ -121,8 +121,11 @@ class ServerHandler (pyscgi.SCGIHandler)
-         my_thread.scgi_conn   = self
-         my_thread.request_url = url
- 
-+        # Drop the query string before matching against the handlers
-+        path = url.split('?', 1)[0]
-+
-         for published in server._web_paths:
--            if re.match (published._regex, url):
-+            if re.match (published._regex, path):
-                 # POST
-                 if published._method == 'POST':
-                     post = self._process_post()
diff --git a/community/exim/ChangeLog b/community/exim/ChangeLog
deleted file mode 100644
index 80a101472..000000000
--- a/community/exim/ChangeLog
+++ /dev/null
@@ -1,29 +0,0 @@
-2011-10-10 Angel Velasquez <angvp@archlinux.org>
-	* Updated to 4.77
-
-2011-07-15 Angel Velasquez <angvp@archlinux.org>
-	* Rebuilt without tcp_wrappers
-	* Fixing logrotate issue FS#25094
-	* ChangeLog file changed name from exim.changelog to ChangeLog
-
-2011-06-16 Angel Velasquez <angvp@archlinux.org>
-    * Rebuilt against db 5.2.28
-
-2010-05-09 Angel Velasquez <angvp@archlinux.org>
-    * Updated to 4.76
-    * Removed previous patch since is no longer needed
-    * Removed newaliases script FS#22744
-    * Removed sudo dependency
-
-2010-05-07 Angel Velasquez <angvp@archlinux.org>
-    * Adding patch for security issue see: http://goo.gl/QBict
-
-2010-05-06 Angel Velasquez <angvp@archlinux.org>
-    * Setting sticky id to deliver mail. Closes FS#24109 
-
-2010-04-30 Angel Velasquez <angvp@archlinux.org>
-    * exim 4.75
-    * Config updated with the aliases path. Closes FS#22743
-    * Removed sed hackings and added a exim.Makefile . Closes FS#22744
-    * Replaced creation of the user at build time. Closes FS#22745
-
diff --git a/community/paraview/ffmpeg-0.8.diff b/community/paraview/ffmpeg-0.8.diff
deleted file mode 100644
index 523919d6f..000000000
--- a/community/paraview/ffmpeg-0.8.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Upstream changes introduced in version 5.6.1-6.1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- vtk (5.6.1-6.1) unstable; urgency=low
- .
-   [ Michael Schutte ]
-   * Non-maintainer upload.
-   * Remove absolute paths to required libraries from
-     /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
-     #506992.  Due to the multiarch transition, the original behavior
-     frequently causes reverse build-deps to FTBFS.  This change should
-     probably be reverted once all required libraries are multiarched.
- .
-   [ Steve M. Robbins ]
-   * Override lintian diagnostic about embedded libraries ftgl and sqlite.
-   * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
-     0.7.
- .
- The person named in the Author field signed this changelog entry.
-Author: Steve M. Robbins <smr@debian.org>
-Bug-Debian: http://bugs.debian.org/506992
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
-+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx
-@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
-     }
- 
-   //choose avi media file format
--  this->avOutputFormat = guess_format("avi", NULL, NULL);
-+  this->avOutputFormat = av_guess_format("avi", NULL, NULL);
-   if (!this->avOutputFormat) 
-     {
-     vtkGenericWarningMacro (<< "Could not open the avi media file format.");
-@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
-   //Set up the codec.
-   AVCodecContext *c = this->avStream->codec;
-   c->codec_id = (CodecID)this->avOutputFormat->video_codec;
--  c->codec_type = CODEC_TYPE_VIDEO;
-+  c->codec_type = AVMEDIA_TYPE_VIDEO;
-   c->width = this->Dim[0];
-   c->height = this->Dim[1];
-   c->pix_fmt = PIX_FMT_YUVJ420P;
-@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
-     pkt.stream_index = this->avStream->index;
-     if (cc->coded_frame->key_frame) //treat keyframes well
-       {
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
-       }
-     pkt.duration = 0; //presentation duration in time_base units or 0 if NA
-     pkt.pos = -1; //byte position in stream or -1 if NA
diff --git a/community/paraview/fix-build-with-zlib-1.2.6.diff b/community/paraview/fix-build-with-zlib-1.2.6.diff
deleted file mode 100644
index 6540de045..000000000
--- a/community/paraview/fix-build-with-zlib-1.2.6.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- Utilities/VisItBridge/databases/BOV/avtBOVFileFormat.C.original	2012-02-09 16:22:56.420371795 +0000
-+++ Utilities/VisItBridge/databases/BOV/avtBOVFileFormat.C	2012-02-09 16:25:59.652228526 +0000
-@@ -703,10 +703,10 @@
-     {
-         // Read past the specified offset.
-         if(byteOffset > 0)
--            gzseek(gz_handle, byteOffset, SEEK_SET);
-+            gzseek((gzFile)gz_handle, byteOffset, SEEK_SET);
- 
-         // Read the whole dataset
--        gzread(gz_handle, whole_buff, whole_nelem * unit_size);
-+        gzread((gzFile)gz_handle, whole_buff, whole_nelem * unit_size);
-     }
-     else
-     {
-@@ -1046,9 +1046,9 @@
-         {
-             // Read past the specified offset.
-             if(byteOffset > 0)
--                gzseek(gz_handle, byteOffset, SEEK_SET);
-+                gzseek((gzFile)gz_handle, byteOffset, SEEK_SET);
- 
--            gzread(gz_handle, rv->GetVoidPointer(0),
-+            gzread((gzFile)gz_handle, rv->GetVoidPointer(0),
-                    nvals * dataNumComponents * unit_size);
-         }
-         else
-@@ -1192,7 +1192,7 @@
-     // Close the file descriptors.
-     //
-     if (gzipped)
--        gzclose(gz_handle);
-+        gzclose((gzFile)gz_handle);
-     else
-         fclose(file_handle);
- 
diff --git a/community/picard/typeheader.patch b/community/picard/typeheader.patch
deleted file mode 100644
index b34852673..000000000
--- a/community/picard/typeheader.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur old/picard/webservice.py new/picard/webservice.py
---- old/picard/webservice.py	2011-10-23 19:15:29.000000000 +0200
-+++ new/picard/webservice.py	2012-04-28 17:43:17.562422696 +0200
-@@ -149,8 +149,11 @@
-             url.setPassword(self.config.setting["password"])
-         request = QtNetwork.QNetworkRequest(url)
-         request.setRawHeader("User-Agent", "MusicBrainz-Picard/%s" % version_string)
--        if method == "POST" and host == self.config.setting["server_host"]:
--            request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/xml; charset=utf-8")
-+        if data is not None:
-+            if method == "POST" and host == self.config.setting["server_host"]:
-+                request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/xml; charset=utf-8")
-+            else:
-+                request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/x-www-form-urlencoded")
-         send = self._request_methods[method]
-         reply = send(request, data) if data is not None else send(request)
-         key = (host, port)
-@@ -370,6 +373,7 @@
-     def _encode_acoustid_args(self, args):
-         filters = []
-         args['client'] = ACOUSTID_KEY
-+        args['clientversion'] = version_string
-         args['format'] = 'xml'
-         for name, value in args.items():
-             value = str(QUrl.toPercentEncoding(value))
diff --git a/community/tilda/fix.patch b/community/tilda/fix.patch
deleted file mode 100644
index 058af6a36..000000000
--- a/community/tilda/fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- tilda-0.9.6/src/key_grabber.c	2008-04-08 01:12:31.000000000 +0300
-+++ tilda-0.9.6/src/key_grabber.c	2009-10-16 17:39:16.399679408 +0300
-@@ -190,7 +190,7 @@
-          * Overriding the user time here seems to work a lot better than calling
-          * gtk_window_present_with_time() here, or at the end of the function. I have
-          * no idea why, they should do the same thing. */
--        gdk_x11_window_set_user_time (GTK_WIDGET(tw->window)->window,
-+        gdk_x11_window_set_user_time (GTK_WIDGET(tw->window),
-                                       tomboy_keybinder_get_current_event_time());
-         gtk_window_move (GTK_WINDOW(tw->window), config_getint ("x_pos"), config_getint ("y_pos"));
-         gtk_widget_show (GTK_WIDGET(tw->window));
-
---- tilda-0.9.6/tilda.desktop.in	2007-03-16 04:53:34.000000000 +0100
-+++ tilda-0.9.6/tilda.desktop.in	2011-08-28 19:08:53.000000000 +0200
-@@ -2 +1,0 @@
--Encoding=UTF-8
-@@ -4,2 +3,2 @@
--Exec=@BINDIR@/tilda
--Icon=@PIXMAPSDIR@/tilda.png
-+Exec=tilda
-+Icon=tilda
-@@ -8 +7 @@
--Categories=GNOME;GTK;Application;Utility;TerminalEmulator;
-+Categories=GNOME;GTK;Utility;TerminalEmulator;System;