mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

Removing a patch not needed anymore, for vlc.

Browse source 
svn path=/nixpkgs/trunk/; revision=32856
This commit is contained in:
Lluís Batlle i Rossell 2012-03-07 20:36:42 +00:00
parent ce482ec155
commit 749df87304
2 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/video/vlc/default.nix
View file

@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
sha256 = "455fc04b5f7ce3d7294ed71a9dd172ff4eb97875cfc30b554ef4ce55ec6f5106";
};
patches = [ ./zlib.patch ];
buildInputs =
[ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt

35
pkgs/applications/video/vlc/zlib.patch
View file

@ -1,35 +0,0 @@
From https://401629.bugs.gentoo.org/attachment.cgi?id=300539
Fix building VLC against zlib 1.2.6.
http://bugs.gentoo.org/401629
http://trac.videolan.org/vlc/ticket/5964
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -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;
}