Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
2b58c542
Commit
2b58c542
authored
Feb 11, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "ZIP Module - Use the system minizip when available"
This reverts commit
35fa551f
. Conflicts: configure.ac
parent
e52f15b9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
32 deletions
+29
-32
Makefile.am
Makefile.am
+0
-2
configure.ac
configure.ac
+29
-29
modules/access/zip/Modules.am
modules/access/zip/Modules.am
+0
-1
No files found.
Makefile.am
View file @
2b58c542
...
...
@@ -21,10 +21,8 @@ if HAVE_LIBGCRYPT
SUBDIRS
+=
libs/srtp
endif
if
HAVE_ZLIB
if
!HAVE_MINIZIP
SUBDIRS
+=
libs/unzip
endif
endif
if
BUILD_VLC
SUBDIRS
+=
bin
endif
...
...
configure.ac
View file @
2b58c542
...
...
@@ -550,6 +550,9 @@ AC_CHECK_FUNCS(send,,[
])
])
AC_CHECK_HEADERS(zlib.h, [
VLC_ADD_LIBS([access_http],[-lz])
])
dnl Check for socklen_t
AH_TEMPLATE(socklen_t, [Define to `int' if <sys/socket.h> does not define.])
...
...
@@ -874,33 +877,6 @@ AC_ARG_VAR(PKG_CONFIG_PATH,
[Paths where to find .pc not at the default location])
PKG_PROG_PKG_CONFIG()
dnl
dnl Check for zlib.h and -lz along with system -lminizip if available
dnl
AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ])
AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ])
if test "${have_zlib}" = "yes"
then
VLC_ADD_LIBS([access_http gme mp4 skins2 sap mkv unzip zip],[-lz])
PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [
AC_CHECK_HEADERS([unzip.h], [
have_minizip=yes
MINIZIP_LIBS="-lminizip -lz"
], [
have_minizip=no
MINIZIP_CFLAGS="-I\$(top_builddir)/libs/unzip"
MINIZIP_LIBS="\$(top_builddir)/libs/unzip/libunzip.la"
])
])
AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
VLC_ADD_CPPFLAGS([skins2],[$MINIZIP_CFLAGS])
VLC_ADD_CFLAGS([zip],[$MINIZIP_CFLAGS])
VLC_ADD_LIBS([skins2 zip],[$MINIZIP_LIBS])
VLC_ADD_PLUGIN([unzip])
VLC_ADD_PLUGIN([zip])
fi
dnl Check for hal
AC_ARG_ENABLE(hal,
[ --enable-hal Linux HAL services discovery (default enabled)])
...
...
@@ -3001,10 +2977,10 @@ AC_ARG_ENABLE( id3tag,
[ --disable-id3tag id3tag metadata reader plugin (default disabled)])
AS_IF([test "${enable_id3tag}" = "yes"], [
AC_CHECK_HEADERS(id3tag.h, [
if test "${have_zlib}" = "yes"
AC_CHECK_HEADERS(zlib.h, [
VLC_ADD_LIBS([id3tag],[-lid3tag -lz])
VLC_ADD_PLUGIN([id3tag])
fi
])
])
])
...
...
@@ -3281,6 +3257,15 @@ if test "${enable_realrtsp}" = "yes"; then
VLC_ADD_PLUGIN([access_realrtsp])
fi
dnl
dnl MP4 module
dnl
AC_CHECK_HEADERS(zlib.h, [
VLC_ADD_LIBS([mp4 skins2 sap mkv gme],[-lz])
VLC_ADD_CPPFLAGS([skins2],[-I../../../@top_srcdir@/libs/unzip])
VLC_ADD_LIBS([skins2],[../../../libs/unzip/libunzip.la])
] )
AC_ARG_ENABLE(libsysfs,
[ --enable-libsysfs Get user key from firewire connected iPod via libsysfs (default enabled)])
...
...
@@ -5426,6 +5411,21 @@ then
fi
dnl
dnl ZIP files demuxer
dnl
AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ])
AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ])
if test "${have_zlib}" = "yes"
then
VLC_ADD_PLUGIN([unzip])
VLC_ADD_LIBS([zip],[-lz])
VLC_ADD_PLUGIN([zip])
VLC_ADD_CFLAGS([zip],[-I../../../@top_srcdir@/libs/unzip])
VLC_ADD_LIBS([zip],[../../../libs/unzip/libunzip.la])
fi
dnl
dnl Endianness check
dnl
...
...
modules/access/zip/Modules.am
View file @
2b58c542
if HAVE_ZLIB
SOURCES_zip = \
zip.h \
zipstream.c \
zipaccess.c \
$(NULL)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment