Bump to 0.5.2.r3092.ge64a7d229

OpenSSL 1.1.x support landed upstream

Ref: https://github.com/gpac/gpac/issues/616#issuecomment-335183641

4 files changed, 5 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eadc917f3480..e325d03e8f06 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = gpac-git
 	pkgdesc = A multimedia framework based on the MPEG-4 Systems standard (git version)
-	pkgver = 0.5.2.r2867.g278ba386a
+	pkgver = 0.5.2.r3092.ge64a7d229
 	pkgrel = 1
 	epoch = 1
-	url = http://gpac.sourceforge.net
+	url = https://gpac.wp.imt.fr/
 	arch = i686
 	arch = x86_64
 	license = LGPL
@@ -28,11 +28,7 @@ pkgbase = gpac-git
 	options = staticlibs
 	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 3fa699d0f9f0..5b81a550c6d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 
 _pkgname=gpac
 pkgname=$_pkgname-git
-pkgver=0.5.2.r2867.g278ba386a
+pkgver=0.5.2.r3092.ge64a7d229
 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"
+url="https://gpac.wp.imt.fr/"
 license=('LGPL')
 depends=('ffmpeg' 'glu' 'libxv' 'openssl')
 makedepends=('git' 'jack' 'a52dec' 'freetype2' 'faad2' 'libmad' 'mesa' 'sdl2')
@@ -21,12 +21,8 @@ options=('staticlibs' '!makeflags')
 conflicts=('gpac')
 source=(
     git://github.com/gpac/gpac.git
-    'ssl3.patch'
-    'openssl-1.1.patch'
 )
-sha256sums=('SKIP'
-            'f5391273c9b77283469362f02a31e65f8ce8c80343d80c5b0b0c019068831a41'
-            '6048e519aebd9cb6293059042fb48a9d8531fc1aa70c2214892686877a6f594d')
+sha256sums=('SKIP')
 
 pkgver() {
   cd "$_pkgname"
@@ -36,13 +32,6 @@ pkgver() {
   )
 }
 
-prepare() {
-  cd ${_pkgname}
-
-  patch -i ../ssl3.patch -Np1
-  patch -i ../openssl-1.1.patch -Np1
-}
-
 build() {
   cd ${_pkgname}
   ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
diff --git a/openssl-1.1.patch b/openssl-1.1.patch
deleted file mode 100644
index 9a137fb8dda1..000000000000
--- a/openssl-1.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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"));
diff --git a/ssl3.patch b/ssl3.patch
deleted file mode 100644
index 357d960c7a17..000000000000
--- a/ssl3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/utils/downloader.c b/src/utils/downloader.c
-index 729cb51..54caf7e 100644
---- a/src/utils/downloader.c
-+++ b/src/utils/downloader.c
-@@ -426,9 +426,11 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
- 		meth = SSLv2_client_method();
- 		break;
- #endif
-+#ifndef OPENSSL_NO_SSL3_METHOD
- 	case 2:
- 		meth = SSLv3_client_method();
- 		break;
-+#endif
- 	case 3:
- 		meth = TLSv1_client_method();
- 		break;