[gentoo-commits] gentoo commit in src/patchsets/vlc/1.1-git: 360_all_zlib126.patch series

[Alexis Ballier (aballier)]

aballier    12/02/01 13:50:46

  Modified:             series
  Added:                360_all_zlib126.patch
  Log:
  backport upstream patch to fix build with latest zlib, bug #401629

Revision  Changes    Path
1.7                  src/patchsets/vlc/1.1-git/series

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1-git/series?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1-git/series?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1-git/series?r1=1.6&r2=1.7

Index: series
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/1.1-git/series,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- series	21 Dec 2011 11:58:30 -0000	1.6
+++ series	1 Feb 2012 13:50:46 -0000	1.7
@@ -3,3 +3,4 @@
 300_all_pic.patch
 320_all_cachegen.patch
 350_all_pulseaudio_automagic.patch
+360_all_zlib126.patch



1.1                  src/patchsets/vlc/1.1-git/360_all_zlib126.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1-git/360_all_zlib126.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1-git/360_all_zlib126.patch?rev=1.1&content-type=text/plain

Index: 360_all_zlib126.patch
===================================================================
commit 18173044cdaa1fce6652614b893054d792f4e258
Author: Jean-Baptiste Kempf <jb@××××××××.org>
Date:   Tue Jan 31 12:53:38 2012 +0100

    Skins: fix compilation with zlib 1.2.6
    
    Close #5964

Index: vlc-1.1/modules/gui/skins2/src/theme_loader.cpp
===================================================================
--- vlc-1.1.orig/modules/gui/skins2/src/theme_loader.cpp
+++ vlc-1.1/modules/gui/skins2/src/theme_loader.cpp
@@ -768,7 +768,7 @@ int gzclose_frontend( int fd )
     {
         void *toClose = currentGzVp;
         currentGzVp = NULL;  currentGzFd = -1;
-        return gzclose( toClose );
+        return gzclose( (gzFile) toClose );
     }
     return -1;
 }
@@ -777,7 +777,7 @@ int gzread_frontend( int fd, void *p_buf
 {
     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 @@ int gzwrite_frontend( int fd, const void
 {
     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;
 }