ports/166916: net/liveMedia: update to 2012.04.04
Ruslan Mahmatkhanov
rm at FreeBSD.org
Fri Apr 13 17:10:10 UTC 2012
>Number: 166916
>Category: ports
>Synopsis: net/liveMedia: update to 2012.04.04
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 13 17:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Ruslan Mahmatkhanov
>Release: 10.0-CURRENT
>Organization:
>Environment:
10.0-CURRENT amd64
>Description:
This update is a required prerequisite for vlc 2.x.
- update to 2012.04.04
- actualize/sort pkg-plist (installed files from liveMedia/include)
- drop LICENCE_FILE that isn't neccessary for GPLv2
- change `YES' with `yes' in couple of knobs
- whitespace fixes
- set XLOCALE_NOT_USED for xlocale.h-less FreeBSD versions to fix build on this
systems. Notably on FreeBSD < 1000010. This value should be corrected if/when
xlocale stuff will be MFCed sometime.
buildlog:
http://people.freebsd.org/~rm/liveMedia-2012.04.04%2c1.log
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/liveMedia/Makefile,v
retrieving revision 1.307
diff -u -r1.307 Makefile
--- Makefile 24 Jun 2011 16:32:54 -0000 1.307
+++ Makefile 13 Apr 2012 16:51:07 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= liveMedia
-PORTVERSION= 2011.06.16
-PORTREVISION= 0
+PORTVERSION= 2012.04.04
PORTEPOCH= 1
CATEGORIES= net devel
MASTER_SITES= http://www.live555.com/liveMedia/public/
@@ -19,15 +18,14 @@
COMMENT= LIVE.COM Streaming Media
LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
NO_CDROM= 'dated material'
WRKSRC= ${WRKDIR}/live
PLIST= ${WRKDIR}/pkg-plist
-HAS_CONFIGURE= YES
-MAKE_JOBS_SAFE= YES
+HAS_CONFIGURE= yes
+MAKE_JOBS_SAFE= yes
CONFIGURE_SCRIPT= genMakefiles
CONFIGURE_ARGS= fixed-${OPSYS:L}
@@ -80,14 +78,15 @@
liveMedia/include/BasicUDPSink.hh \
liveMedia/include/BasicUDPSource.hh \
liveMedia/include/ByteStreamFileSource.hh \
+ liveMedia/include/ByteStreamMemoryBufferSource.hh \
liveMedia/include/ByteStreamMultiFileSource.hh \
- liveMedia/include/DarwinInjector.hh \
- liveMedia/include/DeviceSource.hh \
- liveMedia/include/DigestAuthentication.hh \
liveMedia/include/DVVideoFileServerMediaSubsession.hh \
liveMedia/include/DVVideoRTPSink.hh \
liveMedia/include/DVVideoRTPSource.hh \
liveMedia/include/DVVideoStreamFramer.hh \
+ liveMedia/include/DarwinInjector.hh \
+ liveMedia/include/DeviceSource.hh \
+ liveMedia/include/DigestAuthentication.hh \
liveMedia/include/FileServerMediaSubsession.hh \
liveMedia/include/FileSink.hh \
liveMedia/include/FramedFileSource.hh \
@@ -105,7 +104,6 @@
liveMedia/include/H264VideoRTPSource.hh \
liveMedia/include/H264VideoStreamDiscreteFramer.hh \
liveMedia/include/H264VideoStreamFramer.hh \
- liveMedia/include/HTTPSink.hh \
liveMedia/include/InputFile.hh \
liveMedia/include/JPEGVideoRTPSink.hh \
liveMedia/include/JPEGVideoRTPSource.hh \
@@ -128,7 +126,6 @@
liveMedia/include/MPEG1or2DemuxedServerMediaSubsession.hh \
liveMedia/include/MPEG1or2FileServerDemux.hh \
liveMedia/include/MPEG1or2VideoFileServerMediaSubsession.hh \
- liveMedia/include/MPEG1or2VideoHTTPSink.hh \
liveMedia/include/MPEG1or2VideoRTPSink.hh \
liveMedia/include/MPEG1or2VideoRTPSource.hh \
liveMedia/include/MPEG1or2VideoStreamDiscreteFramer.hh \
@@ -141,6 +138,7 @@
liveMedia/include/MPEG2TransportStreamIndexFile.hh \
liveMedia/include/MPEG2TransportStreamMultiplexor.hh \
liveMedia/include/MPEG2TransportStreamTrickModeFilter.hh \
+ liveMedia/include/MPEG2TransportUDPServerMediaSubsession.hh \
liveMedia/include/MPEG4ESVideoRTPSink.hh \
liveMedia/include/MPEG4ESVideoRTPSource.hh \
liveMedia/include/MPEG4GenericRTPSink.hh \
@@ -151,6 +149,8 @@
liveMedia/include/MPEG4VideoStreamDiscreteFramer.hh \
liveMedia/include/MPEG4VideoStreamFramer.hh \
liveMedia/include/MPEGVideoStreamFramer.hh \
+ liveMedia/include/MatroskaFile.hh \
+ liveMedia/include/MatroskaFileServerDemux.hh \
liveMedia/include/Media.hh \
liveMedia/include/MediaSession.hh \
liveMedia/include/MediaSink.hh \
@@ -170,11 +170,20 @@
liveMedia/include/RTSPClient.hh \
liveMedia/include/RTSPCommon.hh \
liveMedia/include/RTSPServer.hh \
+ liveMedia/include/RTSPServerSupportingHTTPStreaming.hh \
liveMedia/include/SIPClient.hh \
liveMedia/include/ServerMediaSession.hh \
liveMedia/include/SimpleRTPSink.hh \
liveMedia/include/SimpleRTPSource.hh \
+ liveMedia/include/StreamReplicator.hh \
+ liveMedia/include/T140TextRTPSink.hh \
+ liveMedia/include/TCPStreamSink.hh \
+ liveMedia/include/TextRTPSink.hh \
+ liveMedia/include/VP8VideoRTPSink.hh \
+ liveMedia/include/VP8VideoRTPSource.hh \
liveMedia/include/VideoRTPSink.hh \
+ liveMedia/include/VorbisAudioRTPSink.hh \
+ liveMedia/include/VorbisAudioRTPSource.hh \
liveMedia/include/WAVAudioFileServerMediaSubsession.hh \
liveMedia/include/WAVAudioFileSource.hh \
liveMedia/include/liveMedia.hh \
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/net/liveMedia/distinfo,v
retrieving revision 1.289
diff -u -r1.289 distinfo
--- distinfo 24 Jun 2011 16:32:54 -0000 1.289
+++ distinfo 13 Apr 2012 16:51:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (live.2011.06.16.tar.gz) = 08b776a28c0a385d83556d5ce3910bf8a32acf67d20022feade0a24d9033bac4
-SIZE (live.2011.06.16.tar.gz) = 477340
+SHA256 (live.2012.04.04.tar.gz) = 673ec5b14157a4ba4fed2dd49b2c3c0a63378439df1b9cc392eaf2bdad892412
+SIZE (live.2012.04.04.tar.gz) = 541301
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/net/liveMedia/pkg-descr,v
retrieving revision 1.3
diff -u -r1.3 pkg-descr
--- pkg-descr 25 Sep 2005 02:27:41 -0000 1.3
+++ pkg-descr 13 Apr 2012 16:51:07 -0000
@@ -11,4 +11,4 @@
used to add streaming support to existing media player applications,
such as "mplayer".
-WWW: http://www.live555.com/liveMedia/
+WWW: http://www.live555.com/liveMedia/
Index: files/patch-liveMedia-include_Locale.hh
===================================================================
RCS file: files/patch-liveMedia-include_Locale.hh
diff -N files/patch-liveMedia-include_Locale.hh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-liveMedia-include_Locale.hh 13 Apr 2012 16:51:07 -0000
@@ -0,0 +1,19 @@
+--- ./liveMedia/include/Locale.hh.orig 2012-04-04 05:07:24.000000000 +0400
++++ ./liveMedia/include/Locale.hh 2012-04-13 20:40:10.000000000 +0400
+@@ -32,11 +32,15 @@
+ // (or their development environments) don't have "newlocale()". If, however, your Windows system *does* have "newlocale()",
+ // then you can override this by defining "XLOCALE_USED" before #including this file.
+
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #ifdef XLOCALE_USED
+ #undef LOCALE_NOT_USED
+ #undef XLOCALE_NOT_USED
+ #else
+-#if defined(__WIN32__) || defined(_WIN32)
++#if defined(__WIN32__) || defined(_WIN32) || (__FreeBSD_version < 1000010)
+ #define XLOCALE_NOT_USED 1
+ #endif
+ #endif
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list