Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
475671ea
Commit
475671ea
authored
Dec 06, 2015
by
Sean McGovern
Committed by
Jean-Baptiste Kempf
Dec 08, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib/shout: disable openssl functionality
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
ff403e89
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
1 deletion
+23
-1
contrib/src/shout/fix-xiph_openssl.patch
contrib/src/shout/fix-xiph_openssl.patch
+20
-0
contrib/src/shout/rules.mak
contrib/src/shout/rules.mak
+3
-1
No files found.
contrib/src/shout/fix-xiph_openssl.patch
0 → 100644
View file @
475671ea
diff --git a/m4/xiph_openssl.m4 b/m4/xiph_openssl.m4
index f62a524..dcc8202 100644
--- a/m4/xiph_openssl.m4
+++ b/m4/xiph_openssl.m4
@@ -30,6 +30,7 @@
else
fi
# Now try linking to openssl
+if test x$with_openssl != xno; then
xt_save_CFLAGS="$CFLAGS"
xt_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
@@ -37,6 +38,7 @@
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.])
contrib/src/shout/rules.mak
View file @
475671ea
...
@@ -22,6 +22,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
...
@@ -22,6 +22,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(UNPACK)
$(UNPACK)
$(APPLY)
$(SRC)
/shout/bsd.patch
$(APPLY)
$(SRC)
/shout/bsd.patch
$(APPLY)
$(SRC)
/shout/libshout-arpa.patch
$(APPLY)
$(SRC)
/shout/libshout-arpa.patch
$(APPLY)
$(SRC)
/shout/fix-xiph_openssl.patch
$(UPDATE_AUTOCONFIG)
$(UPDATE_AUTOCONFIG)
$(MOVE)
$(MOVE)
...
@@ -35,6 +36,7 @@ SHOUT_CONF += "--disable-thread"
...
@@ -35,6 +36,7 @@ SHOUT_CONF += "--disable-thread"
endif
endif
.shout
:
libshout
.shout
:
libshout
cd
$<
&&
$(HOSTVARS)
./configure
$(SHOUT_CONF)
$(HOSTCONF)
$(RECONF)
cd
$<
&&
$(HOSTVARS)
./configure
--without-openssl
$(SHOUT_CONF)
$(HOSTCONF)
cd
$<
&&
$(MAKE)
install
cd
$<
&&
$(MAKE)
install
touch
$@
touch
$@
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment