Bump to 0.5.2.r2867.g278ba386a

Fix building with OpenSSL 1.1

Ref: https://github.com/gpac/gpac/issues/616

3 files changed, 22 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 656d5906fe10..eadc917f3480 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri Nov 25 14:48:11 UTC 2016
 pkgbase = gpac-git
 	pkgdesc = A multimedia framework based on the MPEG-4 Systems standard (git version)
-	pkgver = 0.5.2.r2397.gc77fdae
+	pkgver = 0.5.2.r2867.g278ba386a
 	pkgrel = 1
 	epoch = 1
 	url = http://gpac.sourceforge.net
@@ -20,6 +18,7 @@ pkgbase = gpac-git
 	depends = ffmpeg
 	depends = glu
 	depends = libxv
+	depends = openssl
 	optdepends = jack: for jack support
 	optdepends = a52dec: for A52 support
 	optdepends = faad2: for AAC support
@@ -30,8 +29,10 @@ pkgbase = gpac-git
 	options = !makeflags
 	source = git://github.com/gpac/gpac.git
 	source = ssl3.patch
+	source = openssl-1.1.patch
 	sha256sums = SKIP
 	sha256sums = f5391273c9b77283469362f02a31e65f8ce8c80343d80c5b0b0c019068831a41
+	sha256sums = 6048e519aebd9cb6293059042fb48a9d8531fc1aa70c2214892686877a6f594d
 
 pkgname = gpac-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6a0181ae9c35..3fa699d0f9f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 
 _pkgname=gpac
 pkgname=$_pkgname-git
-pkgver=0.5.2.r2397.gc77fdae
+pkgver=0.5.2.r2867.g278ba386a
 pkgrel=1
 epoch=1
 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard (git version)"
 arch=('i686' 'x86_64')
 url="http://gpac.sourceforge.net"
 license=('LGPL')
-depends=('ffmpeg' 'glu' 'libxv')
+depends=('ffmpeg' 'glu' 'libxv' 'openssl')
 makedepends=('git' 'jack' 'a52dec' 'freetype2' 'faad2' 'libmad' 'mesa' 'sdl2')
 optdepends=('jack: for jack support'
 	    'a52dec: for A52 support'
@@ -22,9 +22,11 @@ conflicts=('gpac')
 source=(
     git://github.com/gpac/gpac.git
     'ssl3.patch'
+    'openssl-1.1.patch'
 )
 sha256sums=('SKIP'
-            'f5391273c9b77283469362f02a31e65f8ce8c80343d80c5b0b0c019068831a41')
+            'f5391273c9b77283469362f02a31e65f8ce8c80343d80c5b0b0c019068831a41'
+            '6048e519aebd9cb6293059042fb48a9d8531fc1aa70c2214892686877a6f594d')
 
 pkgver() {
   cd "$_pkgname"
@@ -38,6 +40,7 @@ prepare() {
   cd ${_pkgname}
 
   patch -i ../ssl3.patch -Np1
+  patch -i ../openssl-1.1.patch -Np1
 }
 
 build() {
diff --git a/openssl-1.1.patch b/openssl-1.1.patch
new file mode 100644
index 000000000000..9a137fb8dda1
--- /dev/null
+++ b/openssl-1.1.patch
@@ -0,0 +1,12 @@
+diff --git a/src/utils/downloader.c b/src/utils/downloader.c
+index 64d509ac5..8bad6494d 100644
+--- a/src/utils/downloader.c
++++ b/src/utils/downloader.c
+@@ -394,7 +394,6 @@ static Bool init_ssl_lib() {
+ 	}
+ 	SSL_library_init();
+ 	SSL_load_error_strings();
+-	SSLeay_add_all_algorithms();
+ 	SSLeay_add_ssl_algorithms();
+ 	_ssl_is_initialized = GF_TRUE;
+ 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));