From d72f62ac7b73d3738a68abeb0cce54705f835038 Mon Sep 17 00:00:00 2001 From: rillig Date: Sun, 19 Nov 2006 22:36:20 +0000 Subject: Updated netlive to 2006.11.16a. Neither ChangeLog, nor NEWS, nor any other documentation is available. Patch provided in PR 35079 by Anthony Mallet. --- net/liblive/Makefile | 23 ++++++---- net/liblive/PLIST | 104 +++++++++++++++++++++++++++++++++---------- net/liblive/distinfo | 12 ++--- net/liblive/patches/patch-aa | 29 ------------ net/liblive/patches/patch-ab | 14 ------ net/liblive/patches/patch-ac | 14 ------ net/liblive/patches/patch-ad | 39 ---------------- 7 files changed, 98 insertions(+), 137 deletions(-) delete mode 100644 net/liblive/patches/patch-aa delete mode 100644 net/liblive/patches/patch-ab delete mode 100644 net/liblive/patches/patch-ac delete mode 100644 net/liblive/patches/patch-ad (limited to 'net/liblive') diff --git a/net/liblive/Makefile b/net/liblive/Makefile index 9ae9cf297e6..abd825d7364 100644 --- a/net/liblive/Makefile +++ b/net/liblive/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.13 2006/07/31 21:08:03 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2006/11/19 22:36:20 rillig Exp $ # -DISTNAME= live.2003.04.04 +DISTNAME= live.2006.11.16a PKGNAME= lib${DISTNAME:S/./-/} PKGREVISION= 1 CATEGORIES= net -MASTER_SITES= http://www.live.com/liveMedia/public/ +MASTER_SITES= http://www.live555.com/liveMedia/public/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.live.com/liveMedia/ +HOMEPAGE= http://www.live555.com/liveMedia/ COMMENT= Set of C++ libraries for multimedia streaming WRKSRC= ${WRKDIR}/live @@ -21,7 +21,6 @@ do-configure: ${CP} ${FILESDIR}/config.netbsd ${WRKSRC} ${CP} ${FILESDIR}/config.netbsd ${WRKSRC}/config.dragonfly cd ${WRKSRC} && ${SH} ./genMakefiles ${LOWER_OPSYS} - ${RM} -f ${WRKSRC}/testProgs/qtParse do-install: .for lib in BasicUsageEnvironment UsageEnvironment groupsock liveMedia @@ -34,11 +33,17 @@ do-install: ${INSTALL_DATA} $$i ${PREFIX}/include/liblive/${lib} ; \ done .endfor -.for bin in openRTSP playSIP qtParse sapWatch testMP3Receiver \ - testMP3Streamer testMPEGAudioVideoStreamer testMPEGSplitter \ - testMPEGVideoReceiver testMPEGVideoStreamer testRelay vobStreamer + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/liblive +.for bin in testMP3Streamer testMPEG1or2VideoStreamer \ + testMPEG1or2AudioVideoStreamer testMPEG2TransportStreamer \ + testMPEG4VideoStreamer testWAVAudioStreamer testAMRAudioStreamer\ + vobStreamer testMP3Receiver testMPEG1or2VideoReceiver sapWatch \ + testRelay testOnDemandRTSPServer testMPEG1or2AudioVideoToDarwin \ + testMPEG4VideoToDarwin openRTSP playSIP testMPEG1or2Splitter \ + testMPEG1or2ProgramToTransportStream cd ${WRKSRC}/testProgs && \ - ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${bin} ${PREFIX}/bin + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ + ${bin} ${PREFIX}/share/examples/liblive .endfor .include "../../mk/bsd.pkg.mk" diff --git a/net/liblive/PLIST b/net/liblive/PLIST index 14d4e82fe23..22cc57a5c9b 100644 --- a/net/liblive/PLIST +++ b/net/liblive/PLIST @@ -1,21 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:47 jlam Exp $ -bin/openRTSP -bin/playSIP -bin/qtParse -bin/sapWatch -bin/testMP3Receiver -bin/testMP3Streamer -bin/testMPEGAudioVideoStreamer -bin/testMPEGSplitter -bin/testMPEGVideoReceiver -bin/testMPEGVideoStreamer -bin/testRelay -bin/vobStreamer +@comment $NetBSD: PLIST,v 1.3 2006/11/19 22:36:20 rillig Exp $ include/liblive/BasicUsageEnvironment/BasicHashTable.hh include/liblive/BasicUsageEnvironment/BasicUsageEnvironment.hh +include/liblive/BasicUsageEnvironment/BasicUsageEnvironment0.hh include/liblive/BasicUsageEnvironment/BasicUsageEnvironment_version.hh include/liblive/BasicUsageEnvironment/DelayQueue.hh -include/liblive/BasicUsageEnvironment/Lock.hh +include/liblive/BasicUsageEnvironment/HandlerSet.hh include/liblive/UsageEnvironment/Boolean.hh include/liblive/UsageEnvironment/HashTable.hh include/liblive/UsageEnvironment/UsageEnvironment.hh @@ -33,39 +22,80 @@ include/liblive/groupsock/groupsock_version.hh include/liblive/liveMedia/AC3AudioRTPSink.hh include/liblive/liveMedia/AC3AudioRTPSource.hh include/liblive/liveMedia/AC3AudioStreamFramer.hh +include/liblive/liveMedia/ADTSAudioFileServerMediaSubsession.hh +include/liblive/liveMedia/ADTSAudioFileSource.hh +include/liblive/liveMedia/AMRAudioFileServerMediaSubsession.hh +include/liblive/liveMedia/AMRAudioFileSink.hh +include/liblive/liveMedia/AMRAudioFileSource.hh +include/liblive/liveMedia/AMRAudioRTPSink.hh +include/liblive/liveMedia/AMRAudioRTPSource.hh +include/liblive/liveMedia/AMRAudioSource.hh +include/liblive/liveMedia/AVIFileSink.hh +include/liblive/liveMedia/AudioInputDevice.hh +include/liblive/liveMedia/AudioRTPSink.hh +include/liblive/liveMedia/Base64.hh +include/liblive/liveMedia/BasicUDPSink.hh include/liblive/liveMedia/BasicUDPSource.hh include/liblive/liveMedia/ByteStreamFileSource.hh include/liblive/liveMedia/ByteStreamMultiFileSource.hh +include/liblive/liveMedia/DarwinInjector.hh include/liblive/liveMedia/DeviceSource.hh +include/liblive/liveMedia/DigestAuthentication.hh +include/liblive/liveMedia/FileServerMediaSubsession.hh include/liblive/liveMedia/FileSink.hh include/liblive/liveMedia/FramedFileSource.hh include/liblive/liveMedia/FramedFilter.hh include/liblive/liveMedia/FramedSource.hh include/liblive/liveMedia/GSMAudioRTPSink.hh include/liblive/liveMedia/H261VideoRTPSource.hh +include/liblive/liveMedia/H263plusVideoFileServerMediaSubsession.hh include/liblive/liveMedia/H263plusVideoRTPSink.hh include/liblive/liveMedia/H263plusVideoRTPSource.hh +include/liblive/liveMedia/H263plusVideoStreamFramer.hh +include/liblive/liveMedia/H264VideoRTPSink.hh +include/liblive/liveMedia/H264VideoRTPSource.hh +include/liblive/liveMedia/H264VideoStreamFramer.hh include/liblive/liveMedia/HTTPSink.hh +include/liblive/liveMedia/InputFile.hh +include/liblive/liveMedia/JPEGVideoRTPSink.hh include/liblive/liveMedia/JPEGVideoRTPSource.hh +include/liblive/liveMedia/JPEGVideoSource.hh include/liblive/liveMedia/MP3ADU.hh include/liblive/liveMedia/MP3ADURTPSink.hh include/liblive/liveMedia/MP3ADURTPSource.hh include/liblive/liveMedia/MP3ADUTranscoder.hh include/liblive/liveMedia/MP3ADUinterleaving.hh +include/liblive/liveMedia/MP3AudioFileServerMediaSubsession.hh include/liblive/liveMedia/MP3FileSource.hh include/liblive/liveMedia/MP3HTTPSource.hh include/liblive/liveMedia/MP3Transcoder.hh +include/liblive/liveMedia/MPEG1or2AudioRTPSink.hh +include/liblive/liveMedia/MPEG1or2AudioRTPSource.hh +include/liblive/liveMedia/MPEG1or2AudioStreamFramer.hh +include/liblive/liveMedia/MPEG1or2Demux.hh +include/liblive/liveMedia/MPEG1or2DemuxedElementaryStream.hh +include/liblive/liveMedia/MPEG1or2DemuxedServerMediaSubsession.hh +include/liblive/liveMedia/MPEG1or2FileServerDemux.hh +include/liblive/liveMedia/MPEG1or2VideoFileServerMediaSubsession.hh +include/liblive/liveMedia/MPEG1or2VideoHTTPSink.hh +include/liblive/liveMedia/MPEG1or2VideoRTPSink.hh +include/liblive/liveMedia/MPEG1or2VideoRTPSource.hh +include/liblive/liveMedia/MPEG1or2VideoStreamDiscreteFramer.hh +include/liblive/liveMedia/MPEG1or2VideoStreamFramer.hh +include/liblive/liveMedia/MPEG2TransportFileServerMediaSubsession.hh +include/liblive/liveMedia/MPEG2TransportStreamFramer.hh +include/liblive/liveMedia/MPEG2TransportStreamFromESSource.hh +include/liblive/liveMedia/MPEG2TransportStreamFromPESSource.hh +include/liblive/liveMedia/MPEG2TransportStreamMultiplexor.hh +include/liblive/liveMedia/MPEG4ESVideoRTPSink.hh include/liblive/liveMedia/MPEG4ESVideoRTPSource.hh +include/liblive/liveMedia/MPEG4GenericRTPSink.hh include/liblive/liveMedia/MPEG4GenericRTPSource.hh +include/liblive/liveMedia/MPEG4LATMAudioRTPSink.hh include/liblive/liveMedia/MPEG4LATMAudioRTPSource.hh -include/liblive/liveMedia/MPEGAudioRTPSink.hh -include/liblive/liveMedia/MPEGAudioRTPSource.hh -include/liblive/liveMedia/MPEGAudioStreamFramer.hh -include/liblive/liveMedia/MPEGDemux.hh -include/liblive/liveMedia/MPEGDemuxedElementaryStream.hh -include/liblive/liveMedia/MPEGVideoHTTPSink.hh -include/liblive/liveMedia/MPEGVideoRTPSink.hh -include/liblive/liveMedia/MPEGVideoRTPSource.hh +include/liblive/liveMedia/MPEG4VideoFileServerMediaSubsession.hh +include/liblive/liveMedia/MPEG4VideoStreamDiscreteFramer.hh +include/liblive/liveMedia/MPEG4VideoStreamFramer.hh include/liblive/liveMedia/MPEGVideoStreamFramer.hh include/liblive/liveMedia/Media.hh include/liblive/liveMedia/MediaSession.hh @@ -73,8 +103,9 @@ include/liblive/liveMedia/MediaSink.hh include/liblive/liveMedia/MediaSource.hh include/liblive/liveMedia/MultiFramedRTPSink.hh include/liblive/liveMedia/MultiFramedRTPSource.hh -include/liblive/liveMedia/PassiveServerMediaSession.hh -include/liblive/liveMedia/PrioritizedRTPStreamSelector.hh +include/liblive/liveMedia/OnDemandServerMediaSubsession.hh +include/liblive/liveMedia/OutputFile.hh +include/liblive/liveMedia/PassiveServerMediaSubsession.hh include/liblive/liveMedia/QCELPAudioRTPSource.hh include/liblive/liveMedia/QuickTimeFileSink.hh include/liblive/liveMedia/QuickTimeGenericRTPSource.hh @@ -83,17 +114,42 @@ include/liblive/liveMedia/RTPInterface.hh include/liblive/liveMedia/RTPSink.hh include/liblive/liveMedia/RTPSource.hh include/liblive/liveMedia/RTSPClient.hh +include/liblive/liveMedia/RTSPCommon.hh include/liblive/liveMedia/RTSPServer.hh include/liblive/liveMedia/SIPClient.hh include/liblive/liveMedia/ServerMediaSession.hh include/liblive/liveMedia/SimpleRTPSink.hh include/liblive/liveMedia/SimpleRTPSource.hh +include/liblive/liveMedia/VideoRTPSink.hh +include/liblive/liveMedia/WAVAudioFileServerMediaSubsession.hh +include/liblive/liveMedia/WAVAudioFileSource.hh include/liblive/liveMedia/liveMedia.hh include/liblive/liveMedia/liveMedia_version.hh +include/liblive/liveMedia/uLawAudioFilter.hh lib/libBasicUsageEnvironment.la lib/libUsageEnvironment.la lib/libgroupsock.la lib/libliveMedia.la +share/examples/liblive/openRTSP +share/examples/liblive/playSIP +share/examples/liblive/sapWatch +share/examples/liblive/testAMRAudioStreamer +share/examples/liblive/testMP3Receiver +share/examples/liblive/testMP3Streamer +share/examples/liblive/testMPEG1or2AudioVideoStreamer +share/examples/liblive/testMPEG1or2AudioVideoToDarwin +share/examples/liblive/testMPEG1or2ProgramToTransportStream +share/examples/liblive/testMPEG1or2Splitter +share/examples/liblive/testMPEG1or2VideoReceiver +share/examples/liblive/testMPEG1or2VideoStreamer +share/examples/liblive/testMPEG2TransportStreamer +share/examples/liblive/testMPEG4VideoStreamer +share/examples/liblive/testMPEG4VideoToDarwin +share/examples/liblive/testOnDemandRTSPServer +share/examples/liblive/testRelay +share/examples/liblive/testWAVAudioStreamer +share/examples/liblive/vobStreamer +@dirrm share/examples/liblive @dirrm include/liblive/liveMedia @dirrm include/liblive/groupsock @dirrm include/liblive/UsageEnvironment diff --git a/net/liblive/distinfo b/net/liblive/distinfo index 5751402f0e8..926128baaf4 100644 --- a/net/liblive/distinfo +++ b/net/liblive/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.4 2006/03/22 22:51:52 joerg Exp $ +$NetBSD: distinfo,v 1.5 2006/11/19 22:36:20 rillig Exp $ -SHA1 (live.2003.04.04.tar.gz) = f5c7cffd92f5811c004c30e2b1f889f817539afb -RMD160 (live.2003.04.04.tar.gz) = 645840b7c371609b4265005091d4d14e7bc995af -Size (live.2003.04.04.tar.gz) = 276978 bytes -SHA1 (patch-aa) = dd4a99f255200d89b3bc9c6e709c53d8e4817e5c -SHA1 (patch-ab) = c1db6185f37f61bf1645d122fbd480c2f9502c79 -SHA1 (patch-ac) = 61b890142c0d8870a245de0d50a3762266419e8c -SHA1 (patch-ad) = 791a7100cf383e9ad96445419157c9a8073be5a6 +SHA1 (live.2006.11.16a.tar.gz) = 605d0e288a8d09654ef0d2cc271f0bc0837c53f5 +RMD160 (live.2006.11.16a.tar.gz) = f43dfc069ca17008d96a6f217f80549747cf724a +Size (live.2006.11.16a.tar.gz) = 425773 bytes diff --git a/net/liblive/patches/patch-aa b/net/liblive/patches/patch-aa deleted file mode 100644 index 2fdffa3fe14..00000000000 --- a/net/liblive/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/04/04 22:37:34 rh Exp $ - ---- testProgs/Makefile.tail.orig Fri Apr 4 16:54:27 2003 -+++ testProgs/Makefile.tail -@@ -1,6 +1,6 @@ - ##### End of variables to change - --ALL = testMP3Streamer$(EXE) testMP3Receiver$(EXE) testRelay$(EXE) testMPEGSplitter$(EXE) testMPEGVideoStreamer$(EXE) testMPEGVideoReceiver$(EXE) testMPEGAudioVideoStreamer$(EXE) vobStreamer$(EXE) openRTSP$(EXE) playSIP$(EXE) sapWatch$(EXE) -+ALL = testMP3Streamer$(EXE) testMP3Receiver$(EXE) testRelay$(EXE) testMPEGSplitter$(EXE) testMPEGVideoStreamer$(EXE) testMPEGVideoReceiver$(EXE) testMPEGAudioVideoStreamer$(EXE) vobStreamer$(EXE) openRTSP$(EXE) playSIP$(EXE) sapWatch$(EXE) qtParse$(EXE) - all: $(ALL) - - misc: testMCT$(EXE) testGSMStreamer$(EXE) -@@ -22,6 +22,7 @@ VOB_STREAMER_OBJS = vobStreamer.$(OBJ) - OPEN_RTSP_OBJS = openRTSP.$(OBJ) playCommon.$(OBJ) - PLAY_SIP_OBJS = playSIP.$(OBJ) playCommon.$(OBJ) - SAP_WATCH_OBJS = sapWatch.$(OBJ) -+QT_PARSE_OBJS = qtParse.$(OBJ) - TEST_MCT_OBJS = testMCT.$(OBJ) - GSM_STREAMER_OBJS = testGSMStreamer.$(OBJ) testGSMEncoder.$(OBJ) - -@@ -61,6 +62,8 @@ openRTSP$(EXE): $(OPEN_RTSP_OBJS) $(LOCA - $(LINK)$@ $(CONSOLE_LINK_OPTS) $(OPEN_RTSP_OBJS) $(LIBS) - playSIP$(EXE): $(PLAY_SIP_OBJS) $(LOCAL_LIBS) - $(LINK)$@ $(CONSOLE_LINK_OPTS) $(PLAY_SIP_OBJS) $(LIBS) -+qtParse$(EXE): $(QT_PARSE_OBJS) $(LOCAL_LIBS) -+ $(LINK)$@ $(CONSOLE_LINK_OPTS) $(QT_PARSE_OBJS) $(LIBS) - sapWatch$(EXE): $(SAP_WATCH_OBJS) $(LOCAL_LIBS) - $(LINK)$@ $(CONSOLE_LINK_OPTS) $(SAP_WATCH_OBJS) $(LIBS) - testMCT$(EXE): $(TEST_MCT_OBJS) $(LOCAL_LIBS) diff --git a/net/liblive/patches/patch-ab b/net/liblive/patches/patch-ab deleted file mode 100644 index fd7a98b7acd..00000000000 --- a/net/liblive/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2004/04/12 21:39:41 snj Exp $ - ---- groupsock/Groupsock.cpp.orig 2004-04-12 14:32:16.000000000 -0700 -+++ groupsock/Groupsock.cpp 2004-04-12 14:35:25.000000000 -0700 -@@ -26,7 +26,8 @@ along with this library; if not, write t - #if defined(__WIN32__) || defined(_WIN32) - #include - #else --#include -+using namespace::std; -+#include - #endif - #include - diff --git a/net/liblive/patches/patch-ac b/net/liblive/patches/patch-ac deleted file mode 100644 index 0349d13374c..00000000000 --- a/net/liblive/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2004/04/12 21:39:41 snj Exp $ - ---- groupsock/NetInterface.cpp.orig 2004-04-12 14:35:56.000000000 -0700 -+++ groupsock/NetInterface.cpp 2004-04-12 14:36:08.000000000 -0700 -@@ -25,7 +25,8 @@ along with this library; if not, write t - #include - #define _close closesocket - #else --#include -+using namespace::std; -+#include - #define _close close - #endif - diff --git a/net/liblive/patches/patch-ad b/net/liblive/patches/patch-ad deleted file mode 100644 index 1a04296642f..00000000000 --- a/net/liblive/patches/patch-ad +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2006/03/22 22:51:52 joerg Exp $ - ---- BasicUsageEnvironment/include/BasicHashTable.hh.orig 2006-03-22 22:39:07.000000000 +0000 -+++ BasicUsageEnvironment/include/BasicHashTable.hh -@@ -33,8 +33,16 @@ class BasicHashTable: public HashTable { - public: - BasicHashTable(int keyType); - virtual ~BasicHashTable(); -- class TableEntry; // forward -- -+ -+private: -+ class TableEntry { -+ public: -+ TableEntry* fNext; -+ char const* key; -+ void* value; -+ }; -+ -+public: - // Used to iterate through the members of the table: - class Iterator: public HashTable::Iterator { - public: -@@ -57,14 +65,8 @@ private: // implementation of inherited - // Returns 0 if not found - virtual Boolean IsEmpty() const; - --private: -- class TableEntry { -- public: -- TableEntry* fNext; -- char const* key; -- void* value; -- }; - -+private: - TableEntry* lookupKey(char const* key, unsigned& index) const; - // returns entry matching "key", or NULL if none - Boolean keyMatches(char const* key1, char const* key2) const; -- cgit v1.2.3