cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

libshout: Update to 2.4.1. Create -nossl variant

Browse Source 
Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
Ted Hess
2017-01-13 16:38:50 -05:00
parent bf5c92a265
commit 1c2107e462
4 changed files with 86 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libshout/patches/100-add_with-openssl_option.patch
+27
View File
@@ -0,0 +1,27 @@
--- a/m4/xiph_openssl.m4
+++ b/m4/xiph_openssl.m4
@@ -29,14 +29,16 @@ else
fi
fi
-# Now try linking to openssl
-xt_save_CFLAGS="$CFLAGS"
-xt_save_LIBS="$LIBS"
-CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
-LIBS="$OPENSSL_LIBS $LIBS"
-AC_TRY_LINK([#include <openssl/ssl.h>], [void *a = SSL_new], [openssl_ok='yes'])
-CFLAGS="$xt_save_CFLAGS"
-LIBS="$xt_save_LIBS"
+if test "x$openssl_prefix" != "xno"; then
+ # Now try linking to openssl
+ xt_save_CFLAGS="$CFLAGS"
+ xt_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+ LIBS="$OPENSSL_LIBS $LIBS"
+ AC_TRY_LINK([#include <openssl/ssl.h>], [void *a = SSL_new], [openssl_ok='yes'])
+ CFLAGS="$xt_save_CFLAGS"
+ LIBS="$xt_save_LIBS"
+fi
if test "$openssl_ok" = "yes"; then
AC_DEFINE(HAVE_OPENSSL, 1, [Define if you have libopenssl.])
libs/libshout/patches/120-vorbis-c.patch
+3 -3
View File
@@ -1,5 +1,5 @@
--- a/src/vorbis.c
+++ b/src/vorbis.c
--- a/src/codec_vorbis.c
+++ b/src/codec_vorbis.c
@@ -28,7 +28,7 @@
#endif
#include <stdlib.h>
@@ -8,4 +8,4 @@
+#include <tremor/ivorbiscodec.h>
#include "shout_private.h"
#include "shout_ogg.h"
#include "format_ogg.h"
libs/libshout/patches/140-no_example_doc_win32.patch
+11 -9
View File
@@ -1,17 +1,19 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -288,12 +288,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,14 +3,14 @@
AUTOMAKE_OPTIONS = 1.6 foreign
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = include src examples debian doc win32
+SUBDIRS = include src debian
-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
m4/xiph_types.m4 libshout.ckport
docdir = $(datadir)/doc/$(PACKAGE)
-doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c
+doc_DATA = COPYING NEWS README
+doc_DATA = COPYING README
m4datadir = $(datadir)/aclocal
m4data_DATA = m4/shout.m4
@HAVE_PKGCONFIG_TRUE@pkgconfigdir = $(libdir)/pkgconfig