summaryrefslogtreecommitdiffstats
path: root/libraries/live555
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/live555')
-rw-r--r--libraries/live555/README13
-rw-r--r--libraries/live555/live555.SlackBuild37
-rw-r--r--libraries/live555/live555.info10
-rw-r--r--libraries/live555/slack-desc2
4 files changed, 41 insertions, 21 deletions
diff --git a/libraries/live555/README b/libraries/live555/README
index 8cc7c6574d..6a7c610d81 100644
--- a/libraries/live555/README
+++ b/libraries/live555/README
@@ -1,10 +1,13 @@
-This code forms a set of C++ libraries for multimedia streaming, using open
-standard protocols (RTP/RTCP, RTSP, SIP). These libraries can be used to
-build streaming applications.
+This code forms a set of C++ libraries for multimedia streaming, using
+open standard protocols (RTP/RTCP, RTSP, SIP). These libraries can be
+used to build streaming applications.
Since version 2014.08.26, library and include files are arranged to be
easily discoverable by configuration stage when building vlc.
Since version 2014.11.02, source tarballs from archive at
-sourceforge.net are used, only the very latest tarball being available from
-http://www.live555.com/liveMedia/public/.
+sourceforge.net are used, only the very latest tarball being available
+from http://www.live555.com/liveMedia/public/.
+
+Until vlc (which depends on live555) is updated to accommodate changed
+API in live555-2021.01.13, live555 will be held at version 2020.08.19
diff --git a/libraries/live555/live555.SlackBuild b/libraries/live555/live555.SlackBuild
index 59132b8128..511b18b4e5 100644
--- a/libraries/live555/live555.SlackBuild
+++ b/libraries/live555/live555.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for live555
-# Copyright 2014-2020 Christoph Willing, Brisbane, Australia
+# Copyright 2014-2021 Christoph Willing, Brisbane, Australia
+# Copyright 2022 Bill Kirkpatrick, Bay City, Texas, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,16 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20230630 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install shared libs with +x permission.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=live555
-VERSION=${VERSION:-2020.03.06}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2020.08.19}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
SRCNAM=live
@@ -37,7 +44,11 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -58,20 +69,26 @@ cd $SRCNAM
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} + -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+# This header isn't shipped in glibc >= 2.26 anymore
+# https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
+sed -i 's/#include <xlocale.h>.*/#include <locale.h>/' liveMedia/include/Locale.hh
for f in $(find . -type f |xargs grep -l "PREFIX =") ; do echo $f; sed -i -e "/PREFIX =/c\PREFIX = \/usr" $f ; done
for f in $(find . -type f |xargs grep -l "LIBDIR =") ; do echo $f; sed -i -e "/LIBDIR =/c\LIBDIR = \$(PREFIX)\/lib$LIBDIRSUFFIX" $f ; done
./genMakefiles linux-with-shared-libraries
-# -j1 to avoid make race
-make -j1 install DESTDIR=$PKG
+# Deal with intermittent parallel make failures
+make || make -j1
+make install DESTDIR=$PKG
mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
sed -e "s/%VERSION%/$VERSION/" -e "s/%LIBDIRSUFFIX%/$LIBDIRSUFFIX/" -e "s/%PREFIX%/\/usr/" $CWD/live555.pc.in >$PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/live555.pc
chmod 0644 $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/live555.pc
+chmod 0755 $PKG/usr/lib*/lib*.so.*.*.*
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -84,4 +101,4 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/libraries/live555/live555.info b/libraries/live555/live555.info
index 6b0c3e8270..985f29c435 100644
--- a/libraries/live555/live555.info
+++ b/libraries/live555/live555.info
@@ -1,10 +1,10 @@
PRGNAM="live555"
-VERSION="2020.03.06"
+VERSION="2020.08.19"
HOMEPAGE="http://www.live555.com/"
-DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/live555/live.2020.03.06.tar.gz"
-MD5SUM="cfca528bda964d2167260b3ab6ee294e"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/live555/live.2020.08.19.tar.gz"
+MD5SUM="4645d2a0c865505c85b48af5317bcb4a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@linux.com"
+MAINTAINER="Bill Kirkpatrick"
+EMAIL="bkirkp@gmail.com"
diff --git a/libraries/live555/slack-desc b/libraries/live555/slack-desc
index e9226470f4..0dc000bed0 100644
--- a/libraries/live555/slack-desc
+++ b/libraries/live555/slack-desc
@@ -13,7 +13,7 @@ live555: using open standard protocols (RTP/RTCP, RTSP, SIP). These libraries
live555: can be used to build streaming applications.
live555:
live555:
-live555:
+live555: Homepage: http://www.live555.com/
live555:
live555:
live555: