- rel 8; fix build with new zlib

Changed files:
    vlc-zlib.patch -> 1.1
    vlc.spec -> 1.296

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

diff --git a/vlc.spec b/vlc.spec
index ede84f94c7f62be4aed5e4a0646ce7ee0ae67056..12c39d1a4170f2454ef6df4a004a9a8db55fcab4 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -58,7 +58,7 @@ Summary:      VLC - a multimedia player and stream server
 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
@@ -72,6 +72,7 @@ Patch4:               %{name}-upnp.patch
 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
@@ -335,6 +336,7 @@ Wtyczka do przeglądarki internetowej Mozilla.
 %if %{with noxmas}
 %patch7 -p1
 %endif
+%patch8 -p1
 
 %build
 cp -f /usr/share/automake/config.* .