From f69bf5e55eac0b1615c4559a465a75d16de3d643 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 14 Nov 2018 12:58:51 -0800
Subject: [PATCH] gst1-plugins-bad: Update to 1.14.4
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
multimedia/gst1-plugins-bad/Makefile | 4 +-
.../patches/001-no-translations.patch | 32 ++++++-----
.../patches/002-no-tests.patch | 40 +++++++-------
.../patches/003-openssl-deprecated.patch | 53 +++++++++++++++++++
4 files changed, 89 insertions(+), 40 deletions(-)
create mode 100644 multimedia/gst1-plugins-bad/patches/003-openssl-deprecated.patch
diff --git a/multimedia/gst1-plugins-bad/Makefile b/multimedia/gst1-plugins-bad/Makefile
index 70b16e4fb..752ee51f0 100644
--- a/multimedia/gst1-plugins-bad/Makefile
+++ b/multimedia/gst1-plugins-bad/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gst1-plugins-bad
-PKG_VERSION:=1.14.2
+PKG_VERSION:=1.14.4
PKG_RELEASE:=1
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
@@ -20,7 +20,7 @@ PKG_LICENSE_FILES:=COPYING.LIB COPYING
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION)
PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/
-PKG_HASH:=34fab7da70994465a64468330b2168a4a0ed90a7de7e4c499b6d127c6c1b1eaf
+PKG_HASH:=910b4e0e2e897e8b6d06767af1779d70057c309f67292f485ff988d087aa0de5
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
diff --git a/multimedia/gst1-plugins-bad/patches/001-no-translations.patch b/multimedia/gst1-plugins-bad/patches/001-no-translations.patch
index 67371c5da..90489c726 100644
--- a/multimedia/gst1-plugins-bad/patches/001-no-translations.patch
+++ b/multimedia/gst1-plugins-bad/patches/001-no-translations.patch
@@ -1,18 +1,6 @@
-diff -u --recursive gst-plugins-bad-1.12.4-vanilla/configure.ac gst-plugins-bad-1.12.4/configure.ac
---- gst-plugins-bad-1.12.4-vanilla/configure.ac 2018-02-11 19:43:06.962320214 -0500
-+++ gst-plugins-bad-1.12.4/configure.ac 2018-02-11 19:43:48.643416395 -0500
-@@ -3717,7 +3717,6 @@
- ext/dtls/Makefile
- ext/webrtcdsp/Makefile
- ext/ttml/Makefile
--po/Makefile.in
- docs/Makefile
- docs/plugins/Makefile
- docs/libs/Makefile
-diff -u --recursive gst-plugins-bad-1.12.4-vanilla/Makefile.am gst-plugins-bad-1.12.4/Makefile.am
---- gst-plugins-bad-1.12.4-vanilla/Makefile.am 2018-02-11 19:43:06.987320271 -0500
-+++ gst-plugins-bad-1.12.4/Makefile.am 2018-02-11 19:43:55.023431118 -0500
-@@ -2,11 +2,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,11 +2,11 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
SUBDIRS = \
gst-libs gst sys ext pkgconfig \
@@ -24,5 +12,15 @@ diff -u --recursive gst-plugins-bad-1.12.4-vanilla/Makefile.am gst-plugins-bad-1
- m4 common docs tests po tools
+ m4 common docs tests tools
- # include before EXTRA_DIST for win32 assignment
- include $(top_srcdir)/common/win32.mak
+ EXTRA_DIST = \
+ depcomp \
+--- a/configure.ac
++++ b/configure.ac
+@@ -2686,7 +2686,6 @@ ext/dtls/Makefile
+ ext/webrtc/Makefile
+ ext/webrtcdsp/Makefile
+ ext/ttml/Makefile
+-po/Makefile.in
+ docs/Makefile
+ docs/plugins/Makefile
+ docs/libs/Makefile
diff --git a/multimedia/gst1-plugins-bad/patches/002-no-tests.patch b/multimedia/gst1-plugins-bad/patches/002-no-tests.patch
index ca8a9bd7b..38c57039c 100644
--- a/multimedia/gst1-plugins-bad/patches/002-no-tests.patch
+++ b/multimedia/gst1-plugins-bad/patches/002-no-tests.patch
@@ -1,7 +1,22 @@
-diff -u --recursive gst-plugins-bad-1.14.1-vanilla/configure.ac gst-plugins-bad-1.14.1/configure.ac
---- gst-plugins-bad-1.14.1-vanilla/configure.ac 2018-07-08 22:17:07.553492088 -0400
-+++ gst-plugins-bad-1.14.1/configure.ac 2018-07-08 22:17:38.866597074 -0400
-@@ -2600,24 +2600,6 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,11 +2,11 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+
+ SUBDIRS = \
+ gst-libs gst sys ext pkgconfig \
+- m4 common docs tests tools
++ m4 common docs tools
+
+ DIST_SUBDIRS = \
+ gst gst-libs sys ext pkgconfig \
+- m4 common docs tests tools
++ m4 common docs tools
+
+ EXTRA_DIST = \
+ depcomp \
+--- a/configure.ac
++++ b/configure.ac
+@@ -2600,24 +2600,6 @@ sys/vdpau/Makefile
sys/wasapi/Makefile
sys/winks/Makefile
sys/winscreencap/Makefile
@@ -26,20 +41,3 @@ diff -u --recursive gst-plugins-bad-1.14.1-vanilla/configure.ac gst-plugins-bad-
ext/voamrwbenc/Makefile
ext/voaacenc/Makefile
ext/assrender/Makefile
-diff -u --recursive gst-plugins-bad-1.14.1-vanilla/Makefile.am gst-plugins-bad-1.14.1/Makefile.am
---- gst-plugins-bad-1.14.1-vanilla/Makefile.am 2018-07-08 22:17:07.553492088 -0400
-+++ gst-plugins-bad-1.14.1/Makefile.am 2018-07-08 22:17:51.278638694 -0400
-@@ -2,11 +2,11 @@
-
- SUBDIRS = \
- gst-libs gst sys ext pkgconfig \
-- m4 common docs tests tools
-+ m4 common docs tools
-
- DIST_SUBDIRS = \
- gst gst-libs sys ext pkgconfig \
-- m4 common docs tests tools
-+ m4 common docs tools
-
- EXTRA_DIST = \
- depcomp \
diff --git a/multimedia/gst1-plugins-bad/patches/003-openssl-deprecated.patch b/multimedia/gst1-plugins-bad/patches/003-openssl-deprecated.patch
new file mode 100644
index 000000000..1df1f73a9
--- /dev/null
+++ b/multimedia/gst1-plugins-bad/patches/003-openssl-deprecated.patch
@@ -0,0 +1,53 @@
+--- a/ext/dtls/gstdtlsagent.c
++++ b/ext/dtls/gstdtlsagent.c
+@@ -124,11 +124,11 @@ _gst_dtls_init_openssl (void)
+ }
+
+ GST_INFO_OBJECT (NULL, "initializing openssl %lx", OPENSSL_VERSION_NUMBER);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ SSL_library_init ();
+ SSL_load_error_strings ();
+ ERR_load_BIO_strings ();
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ {
+ gint i;
+ gint num_locks;
+@@ -197,7 +197,7 @@ gst_dtls_agent_init (GstDtlsAgent * self)
+ SSL_CTX_set_cipher_list (priv->ssl_context,
+ "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
+ SSL_CTX_set_read_ahead (priv->ssl_context, 1);
+-#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
++#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && (OPENSSL_VERSION_NUMBER < 0x10100000L)
+ SSL_CTX_set_ecdh_auto (priv->ssl_context, 1);
+ #endif
+ }
+--- a/ext/dtls/gstdtlscertificate.c
++++ b/ext/dtls/gstdtlscertificate.c
+@@ -45,8 +45,15 @@
+ #endif
+ #endif
+
++#include <openssl/bn.h>
++#include <openssl/rsa.h>
+ #include <openssl/ssl.h>
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#define X509_getm_notBefore X509_get_notBefore
++#define X509_getm_notAfter X509_get_notAfter
++#endif
++
+ GST_DEBUG_CATEGORY_STATIC (gst_dtls_certificate_debug);
+ #define GST_CAT_DEFAULT gst_dtls_certificate_debug
+
+@@ -240,8 +247,8 @@ init_generated (GstDtlsCertificate * self)
+
+ X509_set_version (priv->x509, 2);
+ ASN1_INTEGER_set (X509_get_serialNumber (priv->x509), 0);
+- X509_gmtime_adj (X509_get_notBefore (priv->x509), 0);
+- X509_gmtime_adj (X509_get_notAfter (priv->x509), 31536000L); /* A year */
++ X509_gmtime_adj (X509_getm_notBefore (priv->x509), 0);
++ X509_gmtime_adj (X509_getm_notAfter (priv->x509), 31536000L); /* A year */
+ X509_set_pubkey (priv->x509, priv->private_key);
+
+ name = X509_get_subject_name (priv->x509);