- add patch to support external zlib
This commit is contained in:
Stephan Raue 2010-05-10 21:35:05 +02:00
parent 59a5f0cff2
commit 55576c5229

View File

@ -0,0 +1,65 @@
diff -Naur xbmc-29931/configure.in xbmc-29931.patch/configure.in
--- xbmc-29931/configure.in 2010-05-08 22:08:33.000000000 +0200
+++ xbmc-29931.patch/configure.in 2010-05-10 07:37:16.106645896 +0200
@@ -52,6 +52,8 @@
external_libdts_disabled="== Use of external libdts disabled. =="
external_libass_enabled="== Use of external libass enabled. =="
external_libass_disabled="== Use of external libass disabled. =="
+external_libz_enabled="== Use of external libz enabled. =="
+external_libz_disabled="== Use of external libz disabled. =="
external_python_enabled="== Use of external python enabled. =="
external_python_disabled="== Use of external python disabled. =="
ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
@@ -260,6 +262,12 @@
[use_external_libass=$enableval],
[use_external_libass=$use_external_libraries])
+AC_ARG_ENABLE([external-libz],
+ [AS_HELP_STRING([--enable-external-libz],
+ [enable use of external libz library (default is no)])],
+ [use_external_libz=$enableval],
+ [use_external_libz=no])
+
AC_ARG_ENABLE([external-python],
[AS_HELP_STRING([--enable-external-python],
[enable use of external python library (default is no) 'Linux only'])],
@@ -668,6 +676,18 @@
USE_EXTERNAL_LIBASS=0
fi
+# External libz
+if test "$use_external_libraries" = "yes" || test "$use_external_libz" = "yes"; then
+ AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADERS([zlib.h],, AC_MSG_ERROR([$missing_headers]))
+ AC_MSG_NOTICE($external_libz_enabled)
+ USE_EXTERNAL_LIBZ=1
+ AC_DEFINE([USE_EXTERNAL_LIBZ], [1], [Whether to use external libz library/zlib.])
+else
+ AC_MSG_NOTICE($external_libz_disabled)
+ USE_EXTERNAL_LIBZ=0
+fi
+
# External Python
if test "$use_external_python" = "yes"; then
AC_CHECK_LIB([python2.6], [main],
@@ -1096,6 +1116,11 @@
else
final_message="$final_message\n External libass:\tNo"
fi
+if test "$use_external_libz" = "yes"; then
+ final_message="$final_message\n External zlib:\tYes"
+else
+ final_message="$final_message\n External zlib:\tNo"
+fi
if test "$use_external_python" = "yes"; then
final_message="$final_message\n External Python:\tYes"
else
@@ -1489,7 +1514,7 @@
CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
./configure
fi
-], [0])
+], [$USE_EXTERNAL_LIBZ])
XB_CONFIG_MODULE([xbmc/lib/libass], [
if test "$host_vendor" = "apple" ; then