packages: vlc/vlc.spec, vlc/vlc-libpng.patch (NEW) - rel 3; libpng fix

[arekm]

Author: arekm                        Date: Fri Jan 29 22:03:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; libpng fix

---- Files affected:
packages/vlc:
   vlc.spec (1.210 -> 1.211) , vlc-libpng.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.210 packages/vlc/vlc.spec:1.211
--- packages/vlc/vlc.spec:1.210	Fri Jan 29 21:49:51 2010
+++ packages/vlc/vlc.spec	Fri Jan 29 23:03:09 2010
@@ -37,7 +37,7 @@
 Summary(pl.UTF-8):	VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:		vlc
 Version:	1.0.4
-Release:	2
+Release:	3
 License:	GPL
 Group:		X11/Applications/Multimedia
 # use the bz2 src, its a 4mb difference
@@ -49,6 +49,7 @@
 Patch3:		%{name}-osdmenu_path.patch
 Patch4:		%{name}-rtp_segv.patch
 Patch5:		%{name}-system-minizip.patch
+Patch6:		%{name}-libpng.patch
 URL:		http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 %{?with_galaktos:BuildRequires:	OpenGL-GLU-devel}
@@ -261,6 +262,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -797,6 +799,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.211  2010/01/29 22:03:09  arekm
+- rel 3; libpng fix
+
 Revision 1.210  2010/01/29 20:49:51  arekm
 - release 2
 

================================================================
Index: packages/vlc/vlc-libpng.patch
diff -u /dev/null packages/vlc/vlc-libpng.patch:1.1
--- /dev/null	Fri Jan 29 23:03:18 2010
+++ packages/vlc/vlc-libpng.patch	Fri Jan 29 23:03:09 2010
@@ -0,0 +1,20 @@
+--- vlc-1.0.4/modules/codec/png.c~	2010-01-19 02:31:45.575326077 +0100
++++ vlc-1.0.4/modules/codec/png.c	2010-01-19 02:32:21.465321175 +0100
+@@ -155,7 +155,7 @@
+     p_info = png_create_info_struct( p_png );
+     if( p_info == NULL )
+     {
+-        png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL );
++        png_destroy_read_struct( &p_png, NULL, NULL );
+         block_Release( p_block ); *pp_block = NULL;
+         return NULL;
+     }
+@@ -163,7 +163,7 @@
+     p_end_info = png_create_info_struct( p_png );
+     if( p_end_info == NULL )
+     {
+-        png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL );
++        png_destroy_read_struct( &p_png, &p_info, NULL );
+         block_Release( p_block ); *pp_block = NULL;
+         return NULL;
+     }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.210&r2=1.211&f=u