aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--community/live-media/0005-Build-without-OpenSSL.patch30
-rw-r--r--community/live-media/APKBUILD11
2 files changed, 4 insertions, 37 deletions
diff --git a/community/live-media/0005-Build-without-OpenSSL.patch b/community/live-media/0005-Build-without-OpenSSL.patch
deleted file mode 100644
index 1b931475ffd..00000000000
--- a/community/live-media/0005-Build-without-OpenSSL.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Sebastian Ramacher <sramacher@debian.org>
-Date: Sun, 19 Jan 2020 11:24:59 +0100
-Subject: Build without OpenSSL
-
----
- config.linux-with-shared-libraries | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config.linux-with-shared-libraries b/config.linux-with-shared-libraries
-index 2ae04ef..041da7f 100644
---- a/config.linux-with-shared-libraries
-+++ b/config.linux-with-shared-libraries
-@@ -24,7 +24,7 @@ libgroupsock_VERSION_AGE=2
- libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION)
- #####
-
--COMPILE_OPTS = $(INCLUDES) -I/usr/local/include -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC
-+COMPILE_OPTS = $(INCLUDES) -I/usr/include -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNO_OPENSSL=1 -fPIC
- C = c
- C_COMPILER = $(CC)
- C_FLAGS = $(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
-@@ -39,7 +39,7 @@ LIBRARY_LINK = $(CXX) -o
- SHORT_LIB_SUFFIX = so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE))
- LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
- LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(CPPFLAGS) $(LDFLAGS)
--LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto
-+LIBS_FOR_CONSOLE_APPLICATION =
- LIBS_FOR_GUI_APPLICATION =
- EXE =
- INSTALL2 = install_shared_libraries
diff --git a/community/live-media/APKBUILD b/community/live-media/APKBUILD
index 50b47860a74..46638116ff7 100644
--- a/community/live-media/APKBUILD
+++ b/community/live-media/APKBUILD
@@ -1,19 +1,18 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=live-media
-pkgver=2020.04.06
+pkgver=2020.04.12
pkgrel=0
pkgdesc="A set of C++ libraries for multimedia streaming"
url="http://live555.com/liveMedia"
arch="all"
license="LGPL-3.0-or-later"
+makedepends="openssl-dev"
subpackages="$pkgname-dev $pkgname-utils"
options="!check"
source="http://live555.com/liveMedia/public/live.$pkgver.tar.gz
0001-Add-a-pkg-config-file-for-the-shared-libraries.patch
0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch
- 0004-Reduce-number-of-unresolved-symbols-by-linking-libra.patch
- 0005-Build-without-OpenSSL.patch
"
builddir="$srcdir"/live
@@ -54,8 +53,6 @@ utils() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="f9016a3c5bbbe990da5a012a425b3869951e211327bb66c8b6c368e30d01366789a9eec5dba7802d85bd7383870956dd42680e09063a3be3251eb8be7b9906ad live.2020.04.06.tar.gz
+sha512sums="f65f2d67935b576c9e0950215f2d436b6f7d0a86a2799249e246b4e0f3f4ff6bfede1d09fd8fd312364e321ac53533fb11d9909b3263c0137d09f6dbc219a317 live.2020.04.12.tar.gz
d542668dfe9386dc31389db6dfe9ed20a8395ede5d1dabfee40f49ad0db67d0b3665c8dcd59d48e4761ba00beeecc3197b2d25cb3a04ef40988f949269e7c9ef 0001-Add-a-pkg-config-file-for-the-shared-libraries.patch
-5cf4a6159531e126bee83f981bd8583a1cef68cde2129f0d255b2f2d73055a21b7bf2bbcc822aa0265f1df7c32add6b95c57f59c5e08060750567fc268643612 0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch
-d5be57357d3c04356aac41804ee3d13434f754c7f86936e24a39c5e966a902628d9570afb37aa96a7c33a45fa5787182bec0441394d114e59d5a1f25250ea0c5 0004-Reduce-number-of-unresolved-symbols-by-linking-libra.patch
-cb737f55844773a0ad13bb17c1ab236c880a3eebe9ac11cef30bccd949cc7a144cc73a9b81ead6b011c8664c2863f57e1b8255790fe6652146a1b094f879761a 0005-Build-without-OpenSSL.patch"
+5cf4a6159531e126bee83f981bd8583a1cef68cde2129f0d255b2f2d73055a21b7bf2bbcc822aa0265f1df7c32add6b95c57f59c5e08060750567fc268643612 0003-Link-shared-libraries-with-g-instead-of-gcc-to-fix-b.patch"