From a32c604de9d55eaf12f623969b9645bb07a598fa Mon Sep 17 00:00:00 2001 From: Dariusz Michaluk Date: Tue, 6 Aug 2019 15:24:44 +0200 Subject: [PATCH] Migrate to openssl 1.1 Change-Id: I41aefc8219d89ceb0afefaf4e07ed2ab97c365fe --- configure.ac | 6 +++--- meson.build | 2 +- packaging/gst-plugins-bad.spec | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 2bc75e3..cca422b 100644 --- a/configure.ac +++ b/configure.ac @@ -2492,7 +2492,7 @@ AG_GST_CHECK_FEATURE(SRTP, [srtp library], srtp, [ dnl *** dtls *** translit(dnm, m, l) AM_CONDITIONAL(USE_DTLS, true) AG_GST_CHECK_FEATURE(DTLS, [DTLS plugin], dtls, [ - PKG_CHECK_MODULES(DTLS, [ openssl >= 1.0.1 libcrypto ], [ + PKG_CHECK_MODULES(DTLS, [ openssl1.1 >= 1.0.1 libcrypto1.1 ], [ HAVE_DTLS="yes" AC_SUBST(DTLS_CFLAGS) AC_SUBST(DTLS_LIBS) @@ -3297,7 +3297,7 @@ AG_GST_CHECK_FEATURE(HLS, [http live streaming plugin], hls, [ ],[AC_MSG_ERROR([Could not find libgcrypt library])]) ], [openssl], [ - PKG_CHECK_MODULES(OPENSSL, openssl, [ + PKG_CHECK_MODULES(OPENSSL, openssl1.1, [ AC_DEFINE(HAVE_OPENSSL, 1, [Define if openssl is available]) HAVE_HLS="yes" ],[AC_MSG_ERROR([Could not find openssl library])]) @@ -3312,7 +3312,7 @@ AG_GST_CHECK_FEATURE(HLS, [http live streaming plugin], hls, [ AC_DEFINE(HAVE_LIBGCRYPT, 1, [Define if libgcrypt is available]) HAVE_HLS="yes" ],[ - PKG_CHECK_MODULES(OPENSSL, openssl, [ + PKG_CHECK_MODULES(OPENSSL, openssl1.1, [ AC_DEFINE(HAVE_OPENSSL, 1, [Define if openssl is available]) HAVE_HLS="yes" ],[ diff --git a/meson.build b/meson.build index 59f7ef5..14d7595 100644 --- a/meson.build +++ b/meson.build @@ -306,7 +306,7 @@ gmodule_dep = dependency('gmodule-2.0', version : glib_req) x11_dep = dependency('x11', required : false) # Used by dtls and hls -openssl_dep = dependency('openssl', version : '>= 1.0.1', required : false) +openssl_dep = dependency('openssl1.1', version : '>= 1.0.1', required : false) # Used by mpeg2enc and mplex # mjpegtools upstream breaks API constantly and doesn't export the version in diff --git a/packaging/gst-plugins-bad.spec b/packaging/gst-plugins-bad.spec index 8f88998..5eaf821 100644 --- a/packaging/gst-plugins-bad.spec +++ b/packaging/gst-plugins-bad.spec @@ -22,10 +22,9 @@ BuildRequires: python BuildRequires: xsltproc BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(gio-2.0) >= 2.25.0 -BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libcurl) >= 7.21.0 BuildRequires: pkgconfig(libexif) >= 0.6.16 -BuildRequires: pkgconfig(openssl) >= 0.9.5 +BuildRequires: pkgconfig(openssl1.1) BuildRequires: pkgconfig(sndfile) >= 1.0.16 BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(soundtouch) > 1.4 -- 2.7.4