| 1 |
ssuominen 10/05/10 16:27:24 |
| 2 |
|
| 3 |
Added: gst-plugins-gl-0.10.1-libpng14.patch |
| 4 |
Log: |
| 5 |
Fix building with libpng14 wrt #319159 by Xavier Parizet. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-plugins/gst-plugins-gl/files/gst-plugins-gl-0.10.1-libpng14.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-gl/files/gst-plugins-gl-0.10.1-libpng14.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-gl/files/gst-plugins-gl-0.10.1-libpng14.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gst-plugins-gl-0.10.1-libpng14.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur gst-plugins-gl-0.10.1.orig/gst/gl/gstglbumper.c gst-plugins-gl-0.10.1/gst/gl/gstglbumper.c |
| 17 |
--- gst-plugins-gl-0.10.1.orig/gst/gl/gstglbumper.c 2009-07-13 12:50:06.000000000 +0300 |
| 18 |
+++ gst-plugins-gl-0.10.1/gst/gl/gstglbumper.c 2010-05-10 19:27:25.000000000 +0300 |
| 19 |
@@ -189,7 +189,7 @@ |
| 20 |
info_ptr = png_create_info_struct (png_ptr); |
| 21 |
if (info_ptr == NULL) { |
| 22 |
fclose (fp); |
| 23 |
- png_destroy_read_struct (&png_ptr, png_infopp_NULL, png_infopp_NULL); |
| 24 |
+ png_destroy_read_struct (&png_ptr, NULL, NULL); |
| 25 |
LOAD_ERROR ("failed to initialize the memory for image information"); |
| 26 |
} |
| 27 |
|
| 28 |
@@ -200,11 +200,11 @@ |
| 29 |
png_read_info (png_ptr, info_ptr); |
| 30 |
|
| 31 |
png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, |
| 32 |
- &interlace_type, int_p_NULL, int_p_NULL); |
| 33 |
+ &interlace_type, NULL, NULL); |
| 34 |
|
| 35 |
if (color_type != PNG_COLOR_TYPE_RGB) { |
| 36 |
fclose (fp); |
| 37 |
- png_destroy_read_struct (&png_ptr, png_infopp_NULL, png_infopp_NULL); |
| 38 |
+ png_destroy_read_struct (&png_ptr, NULL, NULL); |
| 39 |
LOAD_ERROR ("color type is not rgb"); |
| 40 |
} |
| 41 |
|
| 42 |
@@ -220,7 +220,7 @@ |
| 43 |
free (rows); |
| 44 |
|
| 45 |
png_read_end (png_ptr, info_ptr); |
| 46 |
- png_destroy_read_struct (&png_ptr, &info_ptr, png_infopp_NULL); |
| 47 |
+ png_destroy_read_struct (&png_ptr, &info_ptr, NULL); |
| 48 |
fclose (fp); |
| 49 |
|
| 50 |
/* END load png image file */ |
| 51 |
diff -ur gst-plugins-gl-0.10.1.orig/gst/gl/gstgldifferencematte.c gst-plugins-gl-0.10.1/gst/gl/gstgldifferencematte.c |
| 52 |
--- gst-plugins-gl-0.10.1.orig/gst/gl/gstgldifferencematte.c 2009-07-13 12:50:06.000000000 +0300 |
| 53 |
+++ gst-plugins-gl-0.10.1/gst/gl/gstgldifferencematte.c 2010-05-10 19:27:25.000000000 +0300 |
| 54 |
@@ -562,7 +562,7 @@ |
| 55 |
info_ptr = png_create_info_struct (png_ptr); |
| 56 |
if (info_ptr == NULL) { |
| 57 |
fclose (fp); |
| 58 |
- png_destroy_read_struct (&png_ptr, png_infopp_NULL, png_infopp_NULL); |
| 59 |
+ png_destroy_read_struct (&png_ptr, NULL, NULL); |
| 60 |
LOAD_ERROR ("failed to initialize the memory for image information"); |
| 61 |
} |
| 62 |
|
| 63 |
@@ -573,11 +573,11 @@ |
| 64 |
png_read_info (png_ptr, info_ptr); |
| 65 |
|
| 66 |
png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, |
| 67 |
- &interlace_type, int_p_NULL, int_p_NULL); |
| 68 |
+ &interlace_type, NULL, NULL); |
| 69 |
|
| 70 |
if (color_type != PNG_COLOR_TYPE_RGB_ALPHA) { |
| 71 |
fclose (fp); |
| 72 |
- png_destroy_read_struct (&png_ptr, png_infopp_NULL, png_infopp_NULL); |
| 73 |
+ png_destroy_read_struct (&png_ptr, NULL, NULL); |
| 74 |
LOAD_ERROR ("color type is not rgb"); |
| 75 |
} |
| 76 |
|
| 77 |
@@ -597,7 +597,7 @@ |
| 78 |
free (rows); |
| 79 |
|
| 80 |
png_read_end (png_ptr, info_ptr); |
| 81 |
- png_destroy_read_struct (&png_ptr, &info_ptr, png_infopp_NULL); |
| 82 |
+ png_destroy_read_struct (&png_ptr, &info_ptr, NULL); |
| 83 |
fclose (fp); |
| 84 |
|
| 85 |
return TRUE; |
| 86 |
diff -ur gst-plugins-gl-0.10.1.orig/gst/gl/gstgloverlay.c gst-plugins-gl-0.10.1/gst/gl/gstgloverlay.c |
| 87 |
--- gst-plugins-gl-0.10.1.orig/gst/gl/gstgloverlay.c 2009-07-13 12:50:06.000000000 +0300 |
| 88 |
+++ gst-plugins-gl-0.10.1/gst/gl/gstgloverlay.c 2010-05-10 19:27:25.000000000 +0300 |
| 89 |
@@ -390,7 +390,7 @@ |
| 90 |
info_ptr = png_create_info_struct (png_ptr); |
| 91 |
if (info_ptr == NULL) { |
| 92 |
fclose (fp); |
| 93 |
- png_destroy_read_struct (&png_ptr, png_infopp_NULL, png_infopp_NULL); |
| 94 |
+ png_destroy_read_struct (&png_ptr, NULL, NULL); |
| 95 |
LOAD_ERROR ("failed to initialize the memory for image information"); |
| 96 |
} |
| 97 |
|
| 98 |
@@ -401,11 +401,11 @@ |
| 99 |
png_read_info (png_ptr, info_ptr); |
| 100 |
|
| 101 |
png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, |
| 102 |
- &interlace_type, int_p_NULL, int_p_NULL); |
| 103 |
+ &interlace_type, NULL, NULL); |
| 104 |
|
| 105 |
if (color_type != PNG_COLOR_TYPE_RGB_ALPHA) { |
| 106 |
fclose (fp); |
| 107 |
- png_destroy_read_struct (&png_ptr, png_infopp_NULL, png_infopp_NULL); |
| 108 |
+ png_destroy_read_struct (&png_ptr, NULL, NULL); |
| 109 |
LOAD_ERROR ("color type is not rgb"); |
| 110 |
} |
| 111 |
|
| 112 |
@@ -424,7 +424,7 @@ |
| 113 |
free (rows); |
| 114 |
|
| 115 |
png_read_end (png_ptr, info_ptr); |
| 116 |
- png_destroy_read_struct (&png_ptr, &info_ptr, png_infopp_NULL); |
| 117 |
+ png_destroy_read_struct (&png_ptr, &info_ptr, NULL); |
| 118 |
fclose (fp); |
| 119 |
|
| 120 |
return TRUE; |
Archives