[vlc-devel] [PATCH] Zip Module - Use the system minizip
jpeg at videolan.org
Wed Jan 28 20:31:07 CET 2009
Le mercredi 28 janvier 2009 à 07:19:08, Nicolas Chauvet (kwizart) a écrit :
> - Avoid namespace issue when zip.h from minizip is present
> (renaming zip module zip.h -> to zip_accessdemux.h)
> - Detect minizip presence with pkgconfig
> - Move the zlib.h detection in one place (after pkgconfig macro)
> minizip in bundled within zlib in some distro
> - Prevent the compilation of libs/unzip if minizip is available
> (it shound't prevent this directory to be bundled with the sources)
> - Fix the zip_accessdemux.h (old zip.h) presence in the related Modules.am
Tested with and without libminizip on my box.
On my platform it does not take into account that libminizip is present
(the .pc for pkg-config is not present). So it uses libs/unzip instead
2 small points: zip_accessdemux.h is a bad name, as this is neither a
demux nor an access_demux (yes, my fault on the ZIP_ACCESSDEMUX_H macro).
And we check at least 3 times for the header zlib.h, we should check only
once and then use HAVE_ZLIB (see one of Remi's previous mails).
Jean-Philippe André (jpeg)
More information about the vlc-devel