From 15d7dfcbe90fe459ca84f1af2a92310c566e8684 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sun, 13 Nov 2016 22:49:47 +0000 Subject: Update liveMedia 2016-11-06 Remove useless patches Add videolan mirrors which keeps distfiles around for a while --- net/liveMedia/Makefile | 7 ++- net/liveMedia/distinfo | 5 +- .../patch-BasicUsageEnvironment-Makefile.tail | 11 ----- net/liveMedia/files/patch-Makefile.tail | 55 ---------------------- .../files/patch-UsageEnvironment-Makefile.tail | 11 ----- net/liveMedia/files/patch-groupsock-Makefile.tail | 11 ----- net/liveMedia/files/patch-liveMedia-Makefile.tail | 11 ----- .../files/patch-mediaServer_Makefile.tail | 10 ---- .../files/patch-proxyServer_Makefile.tail | 10 ---- net/liveMedia/files/patch-testProgs_Makefile.tail | 10 ---- net/liveMedia/pkg-plist | 4 +- 11 files changed, 9 insertions(+), 136 deletions(-) delete mode 100644 net/liveMedia/files/patch-BasicUsageEnvironment-Makefile.tail delete mode 100644 net/liveMedia/files/patch-Makefile.tail delete mode 100644 net/liveMedia/files/patch-UsageEnvironment-Makefile.tail delete mode 100644 net/liveMedia/files/patch-groupsock-Makefile.tail delete mode 100644 net/liveMedia/files/patch-liveMedia-Makefile.tail delete mode 100644 net/liveMedia/files/patch-mediaServer_Makefile.tail delete mode 100644 net/liveMedia/files/patch-proxyServer_Makefile.tail delete mode 100644 net/liveMedia/files/patch-testProgs_Makefile.tail diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile index 2fc02747fa10..ca3bc1f889d6 100644 --- a/net/liveMedia/Makefile +++ b/net/liveMedia/Makefile @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= liveMedia -PORTVERSION= 2014.12.17 -PORTREVISION= 1 +PORTVERSION= 2016.11.06 PORTEPOCH= 2 CATEGORIES= net devel -MASTER_SITES= LOCAL/wg \ - http://www.live555.com/liveMedia/public/ +MASTER_SITES= http://www.live555.com/liveMedia/public/ \ + https://download.videolan.org/contrib/live555/ DISTNAME= live.${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org diff --git a/net/liveMedia/distinfo b/net/liveMedia/distinfo index 51c7dd43836c..bbccb3a45522 100644 --- a/net/liveMedia/distinfo +++ b/net/liveMedia/distinfo @@ -1,2 +1,3 @@ -SHA256 (live.2014.12.17.tar.gz) = 33892797fb3a01d453f09c25be4408435211c6996e84c69e7d5b82031e1955af -SIZE (live.2014.12.17.tar.gz) = 629688 +TIMESTAMP = 1479076347 +SHA256 (live.2016.11.06.tar.gz) = 55089fd4ce45ee659f848a5b7e4d548be568929c1236b9b808d4b9f5086ba8ba +SIZE (live.2016.11.06.tar.gz) = 626754 diff --git a/net/liveMedia/files/patch-BasicUsageEnvironment-Makefile.tail b/net/liveMedia/files/patch-BasicUsageEnvironment-Makefile.tail deleted file mode 100644 index 297ae96dd86a..000000000000 --- a/net/liveMedia/files/patch-BasicUsageEnvironment-Makefile.tail +++ /dev/null @@ -1,11 +0,0 @@ ---- BasicUsageEnvironment/Makefile.tail.orig 2009-09-21 10:42:12.000000000 +0900 -+++ BasicUsageEnvironment/Makefile.tail 2009-09-28 23:51:46.405510187 +0900 -@@ -9,7 +9,7 @@ - DelayQueue.$(OBJ) BasicHashTable.$(OBJ) - - libBasicUsageEnvironment.$(LIB_SUFFIX): $(OBJS) -- $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ -+ $(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) \ - $(OBJS) - - .$(C).$(OBJ): diff --git a/net/liveMedia/files/patch-Makefile.tail b/net/liveMedia/files/patch-Makefile.tail deleted file mode 100644 index d4afa2d3bce6..000000000000 --- a/net/liveMedia/files/patch-Makefile.tail +++ /dev/null @@ -1,55 +0,0 @@ ---- Makefile.tail.old 2013-03-17 01:21:21.000000000 +0000 -+++ Makefile.tail 2013-03-17 01:25:08.000000000 +0000 -@@ -12,31 +12,31 @@ - PROXY_SERVER_DIR = proxyServer - - all: -- cd $(LIVEMEDIA_DIR) ; $(MAKE) -- cd $(GROUPSOCK_DIR) ; $(MAKE) -- cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) -- cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) -- cd $(TESTPROGS_DIR) ; $(MAKE) -- cd $(MEDIA_SERVER_DIR) ; $(MAKE) -- cd $(PROXY_SERVER_DIR) ; $(MAKE) -+ (cd $(LIVEMEDIA_DIR) ; $(MAKE)) -+ (cd $(GROUPSOCK_DIR) ; $(MAKE)) -+ (cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)) -+ (cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)) -+ (cd $(TESTPROGS_DIR) ; $(MAKE)) -+ (cd $(MEDIA_SERVER_DIR) ; $(MAKE)) -+ (cd $(PROXY_SERVER_DIR) ; $(MAKE)) - - install: -- cd $(LIVEMEDIA_DIR) ; $(MAKE) install -- cd $(GROUPSOCK_DIR) ; $(MAKE) install -- cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) install -- cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) install -- cd $(TESTPROGS_DIR) ; $(MAKE) install -- cd $(MEDIA_SERVER_DIR) ; $(MAKE) install -- cd $(PROXY_SERVER_DIR) ; $(MAKE) install -+ (cd $(LIVEMEDIA_DIR) ; $(MAKE) install) -+ (cd $(GROUPSOCK_DIR) ; $(MAKE) install) -+ (cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) install) -+ (cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) install) -+ (cd $(TESTPROGS_DIR) ; $(MAKE) install) -+ (cd $(MEDIA_SERVER_DIR) ; $(MAKE) install) -+ (cd $(PROXY_SERVER_DIR) ; $(MAKE) install) - - clean: -- cd $(LIVEMEDIA_DIR) ; $(MAKE) clean -- cd $(GROUPSOCK_DIR) ; $(MAKE) clean -- cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean -- cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean -- cd $(TESTPROGS_DIR) ; $(MAKE) clean -- cd $(MEDIA_SERVER_DIR) ; $(MAKE) clean -- cd $(PROXY_SERVER_DIR) ; $(MAKE) clean -+ (cd $(LIVEMEDIA_DIR) ; $(MAKE) clean) -+ (cd $(GROUPSOCK_DIR) ; $(MAKE) clean) -+ (cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean) -+ (cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean) -+ (cd $(TESTPROGS_DIR) ; $(MAKE) clean) -+ (cd $(MEDIA_SERVER_DIR) ; $(MAKE) clean) -+ (cd $(PROXY_SERVER_DIR) ; $(MAKE) clean) - - distclean: clean - -rm -f $(LIVEMEDIA_DIR)/Makefile $(GROUPSOCK_DIR)/Makefile \ diff --git a/net/liveMedia/files/patch-UsageEnvironment-Makefile.tail b/net/liveMedia/files/patch-UsageEnvironment-Makefile.tail deleted file mode 100644 index d51aa8f4f7dc..000000000000 --- a/net/liveMedia/files/patch-UsageEnvironment-Makefile.tail +++ /dev/null @@ -1,11 +0,0 @@ ---- UsageEnvironment/Makefile.tail.orig 2009-09-21 10:42:12.000000000 +0900 -+++ UsageEnvironment/Makefile.tail 2009-09-28 23:50:57.387554379 +0900 -@@ -7,7 +7,7 @@ - OBJS = UsageEnvironment.$(OBJ) HashTable.$(OBJ) strDup.$(OBJ) - - $(USAGE_ENVIRONMENT_LIB): $(OBJS) -- $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) $(OBJS) -+ $(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) $(OBJS) - - .$(C).$(OBJ): - $(C_COMPILER) -c $(C_FLAGS) $< diff --git a/net/liveMedia/files/patch-groupsock-Makefile.tail b/net/liveMedia/files/patch-groupsock-Makefile.tail deleted file mode 100644 index b7f22767b771..000000000000 --- a/net/liveMedia/files/patch-groupsock-Makefile.tail +++ /dev/null @@ -1,11 +0,0 @@ ---- groupsock/Makefile.tail.orig 2009-09-21 10:42:12.000000000 +0900 -+++ groupsock/Makefile.tail 2009-09-28 23:49:03.130995435 +0900 -@@ -27,7 +27,7 @@ - - libgroupsock.$(LIB_SUFFIX): $(GROUPSOCK_LIB_OBJS) \ - $(PLATFORM_SPECIFIC_LIB_OBJS) -- $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ -+ $(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) \ - $(GROUPSOCK_LIB_OBJS) - - clean: diff --git a/net/liveMedia/files/patch-liveMedia-Makefile.tail b/net/liveMedia/files/patch-liveMedia-Makefile.tail deleted file mode 100644 index 902ae8f1444c..000000000000 --- a/net/liveMedia/files/patch-liveMedia-Makefile.tail +++ /dev/null @@ -1,11 +0,0 @@ ---- liveMedia/Makefile.tail.orig 2009-09-21 10:42:12.000000000 +0900 -+++ liveMedia/Makefile.tail 2009-09-28 23:46:58.992036507 +0900 -@@ -47,7 +47,7 @@ - - $(LIVEMEDIA_LIB): $(LIVEMEDIA_LIB_OBJS) \ - $(PLATFORM_SPECIFIC_LIB_OBJS) -- $(LIBRARY_LINK)$@ $(LIBRARY_LINK_OPTS) \ -+ $(LIBRARY_LINK) $@ $(LIBRARY_LINK_OPTS) \ - $(LIVEMEDIA_LIB_OBJS) - - Media.$(CPP): include/Media.hh diff --git a/net/liveMedia/files/patch-mediaServer_Makefile.tail b/net/liveMedia/files/patch-mediaServer_Makefile.tail deleted file mode 100644 index 5d7b2ece367c..000000000000 --- a/net/liveMedia/files/patch-mediaServer_Makefile.tail +++ /dev/null @@ -1,10 +0,0 @@ ---- mediaServer/Makefile.tail.orig 2013-11-10 06:24:08.000000000 +0100 -+++ mediaServer/Makefile.tail 2013-11-13 23:36:14.000000000 +0100 -@@ -36,6 +36,6 @@ - - install: $(MEDIA_SERVER) - install -d $(DESTDIR)$(PREFIX)/bin -- install -m 755 $(MEDIA_SERVER) $(DESTDIR)$(PREFIX)/bin -+ install -s -m 755 $(MEDIA_SERVER) $(DESTDIR)$(PREFIX)/bin - - ##### Any additional, platform-specific rules come here: diff --git a/net/liveMedia/files/patch-proxyServer_Makefile.tail b/net/liveMedia/files/patch-proxyServer_Makefile.tail deleted file mode 100644 index e3008e914ec5..000000000000 --- a/net/liveMedia/files/patch-proxyServer_Makefile.tail +++ /dev/null @@ -1,10 +0,0 @@ ---- proxyServer/Makefile.tail.orig 2013-11-10 06:24:08.000000000 +0100 -+++ proxyServer/Makefile.tail 2013-11-13 23:35:11.000000000 +0100 -@@ -33,6 +33,6 @@ - - install: $(PROXY_SERVER) - install -d $(DESTDIR)$(PREFIX)/bin -- install -m 755 $(PROXY_SERVER) $(DESTDIR)$(PREFIX)/bin -+ install -s -m 755 $(PROXY_SERVER) $(DESTDIR)$(PREFIX)/bin - - ##### Any additional, platform-specific rules come here: diff --git a/net/liveMedia/files/patch-testProgs_Makefile.tail b/net/liveMedia/files/patch-testProgs_Makefile.tail deleted file mode 100644 index 5967a1d343d1..000000000000 --- a/net/liveMedia/files/patch-testProgs_Makefile.tail +++ /dev/null @@ -1,10 +0,0 @@ ---- testProgs/Makefile.tail.orig 2013-11-10 06:24:08.000000000 +0100 -+++ testProgs/Makefile.tail 2013-11-13 23:31:11.000000000 +0100 -@@ -134,6 +134,6 @@ - - install: $(ALL) - install -d $(DESTDIR)$(PREFIX)/bin -- install -m 755 $(ALL) $(DESTDIR)$(PREFIX)/bin -+ install -s -m 755 $(ALL) $(DESTDIR)$(PREFIX)/bin - - ##### Any additional, platform-specific rules come here: diff --git a/net/liveMedia/pkg-plist b/net/liveMedia/pkg-plist index f8389b93e719..6f688635f37e 100644 --- a/net/liveMedia/pkg-plist +++ b/net/liveMedia/pkg-plist @@ -76,7 +76,6 @@ include/liveMedia/DVVideoFileServerMediaSubsession.hh include/liveMedia/DVVideoRTPSink.hh include/liveMedia/DVVideoRTPSource.hh include/liveMedia/DVVideoStreamFramer.hh -include/liveMedia/DarwinInjector.hh include/liveMedia/DeviceSource.hh include/liveMedia/DigestAuthentication.hh include/liveMedia/FileServerMediaSubsession.hh @@ -85,6 +84,7 @@ include/liveMedia/FramedFileSource.hh include/liveMedia/FramedFilter.hh include/liveMedia/FramedSource.hh include/liveMedia/GSMAudioRTPSink.hh +include/liveMedia/GenericMediaServer.hh include/liveMedia/H261VideoRTPSource.hh include/liveMedia/H263plusVideoFileServerMediaSubsession.hh include/liveMedia/H263plusVideoRTPSink.hh @@ -133,6 +133,7 @@ include/liveMedia/MPEG1or2VideoStreamDiscreteFramer.hh include/liveMedia/MPEG1or2VideoStreamFramer.hh include/liveMedia/MPEG2IndexFromTransportStream.hh include/liveMedia/MPEG2TransportFileServerMediaSubsession.hh +include/liveMedia/MPEG2TransportStreamAccumulator.hh include/liveMedia/MPEG2TransportStreamFramer.hh include/liveMedia/MPEG2TransportStreamFromESSource.hh include/liveMedia/MPEG2TransportStreamFromPESSource.hh @@ -156,6 +157,7 @@ include/liveMedia/Media.hh include/liveMedia/MediaSession.hh include/liveMedia/MediaSink.hh include/liveMedia/MediaSource.hh +include/liveMedia/MediaTranscodingTable.hh include/liveMedia/MultiFramedRTPSink.hh include/liveMedia/MultiFramedRTPSource.hh include/liveMedia/OggFile.hh -- cgit v1.2.3