[SCM] kodi/experimental: Stop building with OpenSSL

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Tue Oct 25 22:12:20 UTC 2016


The following commit has been merged in the experimental branch:
commit 8651acf5dbc083659d3ee12d8d0ab956d6606651
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Tue Oct 25 18:23:35 2016 +0200

    Stop building with OpenSSL

diff --git a/debian/patches/15-dont-use-openssl.patch b/debian/patches/15-dont-use-openssl.patch
new file mode 100644
index 0000000..cb2b97b
--- /dev/null
+++ b/debian/patches/15-dont-use-openssl.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1007,8 +1007,8 @@
+   AC_MSG_RESULT(no)
+ fi
+ 
+-PKG_CHECK_MODULES([OPENSSL], [openssl],
+-  [INCLUDES="$INCLUDES $OPENSSL_CFLAGS"; LIBS="$LIBS $OPENSSL_LIBS"; AC_DEFINE([HAVE_OPENSSL],[1],[Define if we have openssl])],)
++#PKG_CHECK_MODULES([OPENSSL], [openssl],
++#  [INCLUDES="$INCLUDES $OPENSSL_CFLAGS"; LIBS="$LIBS $OPENSSL_LIBS"; AC_DEFINE([HAVE_OPENSSL],[1],[Define if we have openssl])],)
+ AC_CHECK_HEADER([gcrypt.h], gcrypt_headers_available=yes,gcrypt_headers_available=no)
+ if test "$gcrypt_headers_available" = "yes"; then
+    # if we have the headers then we must have the lib
+@@ -1034,8 +1034,8 @@
+ fi
+ AC_CHECK_LIB([lzo2],        [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([z],           [main],, AC_MSG_ERROR($missing_library))
+-AC_CHECK_LIB([crypto],      [main],, AC_MSG_ERROR($missing_library))
+-AC_CHECK_LIB([ssl],         [main],, AC_MSG_ERROR($missing_library))
++#AC_CHECK_LIB([crypto],      [main],, AC_MSG_ERROR($missing_library))
++#AC_CHECK_LIB([ssl],         [main],, AC_MSG_ERROR($missing_library))
+ if test "$use_mysql" = "yes"; then
+   AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index 59f533f..fb462c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 12-build-cpluff-pic-only.patch
 13-fix-tests.patch
 14-ignore-test-results.patch
+15-dont-use-openssl.patch

-- 
kodi packaging



More information about the pkg-multimedia-commits mailing list