[packages/gstreamer0.10-plugins-bad] - rel 28; fix build & openssl build
arekm
arekm at pld-linux.org
Sat Sep 22 18:22:31 CEST 2018
commit 7ee4c1da539b292ce166b7569baa465161304974
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Sep 22 18:22:24 2018 +0200
- rel 28; fix build & openssl build
doc.patch | 66 ++++++++++++++++++++++++++++++++++++++++++
gstreamer0.10-plugins-bad.spec | 7 ++++-
openssl.patch | 52 +++++++++++++++++++++++++++++++++
3 files changed, 124 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer0.10-plugins-bad.spec b/gstreamer0.10-plugins-bad.spec
index 8a15a20..894aac2 100644
--- a/gstreamer0.10-plugins-bad.spec
+++ b/gstreamer0.10-plugins-bad.spec
@@ -31,7 +31,7 @@ Summary: Bad GStreamer Streaming-media framework plugins
Summary(pl.UTF-8): Złe wtyczki do środowiska obróbki strumieni GStreamer
Name: gstreamer0.10-plugins-bad
Version: 0.10.23
-Release: 27
+Release: 28
License: LGPL v2+
Group: Libraries
Source0: http://gstreamer.freedesktop.org/src/gst-plugins-bad/%{gstname}-%{version}.tar.bz2
@@ -49,6 +49,8 @@ Patch9: gstreamer-plugins-bad-modplug.patch
Patch10: libvpx2.patch
Patch11: gstreamer-common-gtkdoc.patch
Patch12: gstreamer-plugins-bad-orc.patch
+Patch13: openssl.patch
+Patch14: doc.patch
URL: http://gstreamer.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.10
@@ -880,6 +882,9 @@ Wtyczka do GStreamera skanująca kody kreskowe.
%patch12 -p1
cd common
%patch11 -p1
+cd ..
+%patch13 -p1
+%patch14 -p1
%build
%{__libtoolize}
diff --git a/doc.patch b/doc.patch
new file mode 100644
index 0000000..b728ab3
--- /dev/null
+++ b/doc.patch
@@ -0,0 +1,66 @@
+diff -urN gst-plugins-bad-0.10.23.org/sys/directsound/gstdirectsoundsrc.c gst-plugins-bad-0.10.23/sys/directsound/gstdirectsoundsrc.c
+--- gst-plugins-bad-0.10.23.org/sys/directsound/gstdirectsoundsrc.c 2011-12-30 19:24:33.000000000 +0100
++++ gst-plugins-bad-0.10.23/sys/directsound/gstdirectsoundsrc.c 2018-09-22 18:19:07.658651138 +0200
+@@ -2,7 +2,7 @@
+ * GStreamer
+ * Copyright 2005 Thomas Vander Stichele <thomas at apestaart.org>
+ * Copyright 2005 Ronald S. Bultje <rbultje at ronald.bitfreak.net>
+- * Copyright 2005 S�bastien Moutte <sebastien at moutte.net>
++ * Copyright 2005 Sbastien Moutte <sebastien at moutte.net>
+ * Copyright 2006 Joni Valtanen <joni.valtanen at movial.fi>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+diff -urN gst-plugins-bad-0.10.23.org/sys/directsound/gstdirectsoundsrc.h gst-plugins-bad-0.10.23/sys/directsound/gstdirectsoundsrc.h
+--- gst-plugins-bad-0.10.23.org/sys/directsound/gstdirectsoundsrc.h 2011-12-11 19:49:14.000000000 +0100
++++ gst-plugins-bad-0.10.23/sys/directsound/gstdirectsoundsrc.h 2018-09-22 18:19:07.661984577 +0200
+@@ -2,7 +2,7 @@
+ * GStreamer
+ * Copyright 2005 Thomas Vander Stichele <thomas at apestaart.org>
+ * Copyright 2005 Ronald S. Bultje <rbultje at ronald.bitfreak.net>
+- * Copyright 2005 S�bastien Moutte <sebastien at moutte.net>
++ * Copyright 2005 Sbastien Moutte <sebastien at moutte.net>
+ * Copyright 2006 Joni Valtanen <joni.valtanen at movial.fi>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+diff -urN gst-plugins-bad-0.10.23.org/sys/winks/kshelpers.c gst-plugins-bad-0.10.23/sys/winks/kshelpers.c
+--- gst-plugins-bad-0.10.23.org/sys/winks/kshelpers.c 2011-12-11 19:49:15.000000000 +0100
++++ gst-plugins-bad-0.10.23/sys/winks/kshelpers.c 2018-09-22 18:19:07.618649875 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2008 Ole Andr� Vadla Ravn�s <ole.andre.ravnas at tandberg.com>
++ * Copyright (C) 2008 Ole Andr Vadla Ravns <ole.andre.ravnas at tandberg.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+diff -urN gst-plugins-bad-0.10.23.org/sys/winks/kshelpers.h gst-plugins-bad-0.10.23/sys/winks/kshelpers.h
+--- gst-plugins-bad-0.10.23.org/sys/winks/kshelpers.h 2011-12-11 19:49:15.000000000 +0100
++++ gst-plugins-bad-0.10.23/sys/winks/kshelpers.h 2018-09-22 18:19:07.611982998 +0200
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2008 Ole Andr� Vadla Ravn�s <ole.andre.ravnas at tandberg.com>
++ * Copyright (C) 2008 Ole Andr Vadla Ravns <ole.andre.ravnas at tandberg.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+diff -urN gst-plugins-bad-0.10.23.org/sys/winks/ksvideohelpers.c gst-plugins-bad-0.10.23/sys/winks/ksvideohelpers.c
+--- gst-plugins-bad-0.10.23.org/sys/winks/ksvideohelpers.c 2011-12-11 19:49:15.000000000 +0100
++++ gst-plugins-bad-0.10.23/sys/winks/ksvideohelpers.c 2018-09-22 18:19:07.601982682 +0200
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (C) 2007 Haakon Sporsheim <hakon.sporsheim at tandberg.com>
+- * 2008 Ole Andr� Vadla Ravn�s <ole.andre.ravnas at tandberg.com>
++ * 2008 Ole Andr Vadla Ravns <ole.andre.ravnas at tandberg.com>
+ * 2009 Knut Inge Hvidsten <knut.inge.hvidsten at tandberg.com>
+ *
+ * This library is free software; you can redistribute it and/or
+diff -urN gst-plugins-bad-0.10.23.org/sys/winks/ksvideohelpers.h gst-plugins-bad-0.10.23/sys/winks/ksvideohelpers.h
+--- gst-plugins-bad-0.10.23.org/sys/winks/ksvideohelpers.h 2011-12-11 19:49:15.000000000 +0100
++++ gst-plugins-bad-0.10.23/sys/winks/ksvideohelpers.h 2018-09-22 18:19:07.628650190 +0200
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (C) 2007 Haakon Sporsheim <hakon.sporsheim at tandberg.com>
+- * 2008 Ole Andr� Vadla Ravn�s <ole.andre.ravnas at tandberg.com>
++ * 2008 Ole Andr Vadla Ravns <ole.andre.ravnas at tandberg.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
diff --git a/openssl.patch b/openssl.patch
new file mode 100644
index 0000000..70009f5
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,52 @@
+--- gst-plugins-bad-0.10.23/ext/apexsink/gstapexraop.c~ 2018-09-22 17:27:06.000000000 +0200
++++ gst-plugins-bad-0.10.23/ext/apexsink/gstapexraop.c 2018-09-22 17:28:24.899555435 +0200
+@@ -676,7 +676,7 @@ gst_apexraop_write (GstApExRAOP * con, g
+ guchar *buffer, *frame_data;
+ gushort len;
+ gint bit_offset, byte_offset, i, out_len, res;
+- EVP_CIPHER_CTX aes_ctx;
++ EVP_CIPHER_CTX *aes_ctx;
+ _GstApExRAOP *conn = (_GstApExRAOP *) con;
+ const int frame_header_size = conn->generation == GST_APEX_GENERATION_ONE
+ ? GST_APEX_RAOP_FRAME_HEADER_SIZE : GST_APEX_RTP_FRAME_HEADER_SIZE;
+@@ -736,13 +736,13 @@ gst_apexraop_write (GstApExRAOP * con, g
+ &bit_offset, &byte_offset);
+ }
+
+- EVP_CIPHER_CTX_init (&aes_ctx);
+- EVP_CipherInit_ex (&aes_ctx, EVP_aes_128_cbc (), NULL, conn->aes_ky,
++ aes_ctx = EVP_CIPHER_CTX_new ();
++ EVP_CipherInit_ex (aes_ctx, EVP_aes_128_cbc (), NULL, conn->aes_ky,
+ conn->aes_iv, AES_ENCRYPT);
+- EVP_CipherUpdate (&aes_ctx, frame_data, &out_len, frame_data, /*( */
++ EVP_CipherUpdate (aes_ctx, frame_data, &out_len, frame_data, /*( */
+ GST_APEX_RAOP_ALAC_HEADER_SIZE +
+ length /*) / AES_BLOCK_SIZE * AES_BLOCK_SIZE */ );
+- EVP_CIPHER_CTX_cleanup (&aes_ctx);
++ EVP_CIPHER_CTX_free (aes_ctx);
+
+ res =
+ gst_apexraop_send (conn->data_sd, buffer,
+--- gst-plugins-bad-0.10.23/ext/apexsink/gstapexraop.c~ 2018-09-22 17:32:17.000000000 +0200
++++ gst-plugins-bad-0.10.23/ext/apexsink/gstapexraop.c 2018-09-22 17:41:22.253666922 +0200
+@@ -258,7 +258,7 @@ gst_apexraop_connect (GstApExRAOP * con)
+ } v;
+ guchar buf[4 + 8 + 16];
+ } randbuf;
+- gsize size;
++ gsize size, size2;
+ struct sockaddr_in ioaddr;
+ socklen_t iolen;
+ GstRTSPStatusCode res;
+@@ -292,9 +292,8 @@ gst_apexraop_connect (GstApExRAOP * con)
+
+ rsa = RSA_new ();
+ mod = g_base64_decode (GST_APEX_RAOP_RSA_PUBLIC_MOD, &size);
+- rsa->n = BN_bin2bn (mod, size, NULL);
+- exp = g_base64_decode (GST_APEX_RAOP_RSA_PUBLIC_EXP, &size);
+- rsa->e = BN_bin2bn (exp, size, NULL);
++ exp = g_base64_decode (GST_APEX_RAOP_RSA_PUBLIC_EXP, &size2);
++ RSA_set0_key(rsa, BN_bin2bn (mod, size, NULL), BN_bin2bn (exp, size2, NULL), NULL);
+ size =
+ RSA_public_encrypt (AES_BLOCK_SIZE, conn->aes_ky, rsakey, rsa,
+ RSA_PKCS1_OAEP_PADDING);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gstreamer0.10-plugins-bad.git/commitdiff/7ee4c1da539b292ce166b7569baa465161304974
More information about the pld-cvs-commit
mailing list