- rel 3; libpng fix

Changed files:
    vlc-libpng.patch -> 1.1
    vlc.spec -> 1.211

diff --git a/vlc-libpng.patch b/vlc-libpng.patch
new file mode 100644 (file)
index 0000000..b0dba07
--- /dev/null
+++ b/vlc-libpng.patch
@@ -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;
+     }

diff --git a/vlc.spec b/vlc.spec
index 27939959d42adec135bcfa2df1129bf996c9b2f2..e8b1f0dab04b2f1886ee611bf967b5106b5b331e 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -36,7 +36,7 @@ Summary:      VLC - a multimedia player and stream server
 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
@@ -48,6 +48,7 @@ Patch2:               %{name}-real_codecs_path.patch
 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}
@@ -260,6 +261,7 @@ Wtyczka do przeglądarki internetowej Mozilla.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 cp -f /usr/share/automake/config.* .