packages: vlc/vlc.spec, vlc/vlc-zlib.patch (NEW) - rel 8; fix build with ne...

[arekm]

Author: arekm                        Date: Thu Feb  2 10:49:09 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 8; fix build with new zlib

---- Files affected:
packages/vlc:
   vlc.spec (1.295 -> 1.296) , vlc-zlib.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.295 packages/vlc/vlc.spec:1.296
--- packages/vlc/vlc.spec:1.295	Wed Feb  1 22:46:31 2012
+++ packages/vlc/vlc.spec	Thu Feb  2 11:49:04 2012
@@ -59,7 +59,7 @@
 Summary(pl.UTF-8):	VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:		vlc
 Version:	1.1.13
-Release:	7
+Release:	8
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 # use the bz2 src, its a 4mb difference
@@ -73,6 +73,7 @@
 Patch5:		%{name}-osdmenu_build.patch
 Patch6:		%{name}-firefox-npapi-mime.patch
 Patch7:		xmas-sucks.patch
+Patch8:		%{name}-zlib.patch
 URL:		http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	OpenGL-devel
@@ -336,6 +337,7 @@
 %if %{with noxmas}
 %patch7 -p1
 %endif
+%patch8 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -902,6 +904,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.296  2012/02/02 10:49:04  arekm
+- rel 8; fix build with new zlib
+
 Revision 1.295  2012/02/01 21:46:31  arekm
 - release 7
 

================================================================
Index: packages/vlc/vlc-zlib.patch
diff -u /dev/null packages/vlc/vlc-zlib.patch:1.1
--- /dev/null	Thu Feb  2 11:49:09 2012
+++ packages/vlc/vlc-zlib.patch	Thu Feb  2 11:49:04 2012
@@ -0,0 +1,29 @@
+--- vlc-1.1.13/modules/gui/skins2/src/theme_loader.cpp.org	2012-02-02 11:41:49.998266205 +0100
++++ vlc-1.1.13/modules/gui/skins2/src/theme_loader.cpp	2012-02-02 11:42:45.192830372 +0100
+@@ -768,7 +768,7 @@
+     {
+         void *toClose = currentGzVp;
+         currentGzVp = NULL;  currentGzFd = -1;
+-        return gzclose( toClose );
++        return gzclose( (gzFile) toClose );
+     }
+     return -1;
+ }
+@@ -777,7 +777,7 @@
+ {
+     if( currentGzVp != NULL && fd != -1 )
+     {
+-        return gzread( currentGzVp, p_buffer, i_length );
++        return gzread( (gzFile) currentGzVp, p_buffer, i_length );
+     }
+     return -1;
+ }
+@@ -786,7 +786,7 @@
+ {
+     if( currentGzVp != NULL && fd != -1 )
+     {
+-        return gzwrite( currentGzVp, const_cast<void*>(p_buffer), i_length );
++        return gzwrite( (gzFile) currentGzVp, const_cast<void*>(p_buffer), i_length );
+     }
+     return -1;
+ }
================================================================

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