mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
libshout: Update to 2.4.3
Removed inactive maintainer. Rearranged Makefile for consistency between packages. Added --without-pic to avoid both -fPIC and -fpic. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/src/codec_vorbis.c
|
||||
+++ b/src/codec_vorbis.c
|
||||
@@ -28,7 +28,7 @@
|
||||
@@ -29,7 +29,7 @@
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -3,14 +3,14 @@
|
||||
AUTOMAKE_OPTIONS = 1.6 foreign
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
-SUBDIRS = include src examples doc win32
|
||||
+SUBDIRS = include src
|
||||
|
||||
EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \
|
||||
m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
|
||||
m4/xiph_types.m4 libshout.ckport
|
||||
|
||||
docdir = $(datadir)/doc/$(PACKAGE)
|
||||
-doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c
|
||||
+doc_DATA = COPYING README
|
||||
|
||||
m4datadir = $(datadir)/aclocal
|
||||
m4data_DATA = m4/shout.m4
|
||||
@@ -1,21 +0,0 @@
|
||||
diff --git a/src/tls.c b/src/tls.c
|
||||
index 4562c73..f946946 100644
|
||||
--- a/src/tls.c
|
||||
+++ b/src/tls.c
|
||||
@@ -63,12 +63,16 @@ static inline int tls_setup(shout_tls_t *tls)
|
||||
{
|
||||
SSL_METHOD *meth;
|
||||
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
SSL_library_init();
|
||||
SSL_load_error_strings();
|
||||
SSLeay_add_all_algorithms();
|
||||
SSLeay_add_ssl_algorithms();
|
||||
|
||||
meth = TLSv1_client_method();
|
||||
+#else
|
||||
+ meth = TLS_client_method();
|
||||
+#endif
|
||||
if (!meth)
|
||||
goto error;
|
||||
|
||||
Reference in New Issue
Block a user