mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Update to 5.5.3
o rcNGfy o Compile on amd64 [1] NOTE: DSS will support on amd64, because there are many fix which I heard:-) in cvs repository. In this time, however, Apple doesn't release DSS supported on amd64:-(. Submitted by: Javier Martin Rueda <jmrueda@diatel.upm.es> [1]
This commit is contained in:
parent
b865c22488
commit
78825e7169
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=170446
14 changed files with 162 additions and 97 deletions
|
@ -6,12 +6,12 @@
|
|||
#
|
||||
|
||||
PORTNAME= DarwinStreamingServer
|
||||
PORTVERSION= 5.5
|
||||
PORTVERSION= 5.5.3
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= #http://developer.apple.com/darwin/projects/streaming/source/
|
||||
# You must accept APSL (Apple Public Source License), and get
|
||||
# DarwinStreamingSrvr5.5-Source.tar.
|
||||
# DarwinStreamingSrvr5.5.3-Source.tar.
|
||||
DISTNAME= DarwinStreamingSrvr${PORTVERSION}-Source
|
||||
EXTRACT_SUFX= .tar
|
||||
|
||||
|
@ -24,6 +24,8 @@ RESTRICTED= "See http://www.opensource.apple.com/apsl/"
|
|||
NO_CDROM= ${RESTRICTED}
|
||||
NO_PACKAGE= ${RESTRICTED}
|
||||
|
||||
USE_RC_SUBR= streamingadminserver.sh darwin_streaming_server.sh
|
||||
|
||||
.if defined(BATCH) || defined(PACKAGE_BUILDING)
|
||||
IGNORE= ${RESTRICTED}
|
||||
.endif
|
||||
|
@ -135,10 +137,6 @@ pre-install:
|
|||
|
||||
do-install:
|
||||
@(cd ${WRKSRC}/${OPSYS}; ${SETENV} ${MAKE_ENV} ./Install)
|
||||
|
||||
post-install:
|
||||
${INSTALL_SCRIPT} ${FILESDIR}/streamingadminserver.sh ${PREFIX}/etc/rc.d/
|
||||
${INSTALL_SCRIPT} ${FILESDIR}/darwin_streaming_server.sh ${PREFIX}/etc/rc.d/
|
||||
@${CAT} ${PKGMESSAGE}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
MD5 (DarwinStreamingSrvr5.5-Source.tar) = 9bafc371f6d1b2c2326f985d8bce4d05
|
||||
SIZE (DarwinStreamingSrvr5.5-Source.tar) = 32225280
|
||||
MD5 (DarwinStreamingSrvr5.5.3-Source.tar) = e96da2a5893a3031138cb8e3cd3c92ef
|
||||
SHA256 (DarwinStreamingSrvr5.5.3-Source.tar) = 2dfa3b7a7831d84a82650ee997816540ffaf0bfc11d21d991752570b81e80bb7
|
||||
SIZE (DarwinStreamingSrvr5.5.3-Source.tar) = 32798720
|
||||
|
|
|
@ -1,39 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${0##*/}\$"); then
|
||||
echo "$0: Cannot determine the PREFIX" >&2
|
||||
exit 64
|
||||
fi
|
||||
|
||||
if [ -r /etc/defaults/rc.conf ]; then
|
||||
. /etc/defaults/rc.conf
|
||||
source_rc_confs
|
||||
elif [ -r /etc/rc.conf ]; then
|
||||
. /etc/rc.conf
|
||||
fi
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
case ${darwin_streaming_server_enable} in
|
||||
[Yy][Ee][Ss])
|
||||
/usr/bin/nice -5 ${darwin_streaming_server_program:-${PREFIX}/sbin/DarwinStreamingServer} ${darwin_streaming_server_flags} && \
|
||||
echo -n ' DarwinStreamingServer'
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
stop)
|
||||
case ${darwin_streaming_server_enable} in
|
||||
[Yy][Ee][Ss])
|
||||
if [ -f /var/run/DarwinStreamingServer.pid ]; then
|
||||
/bin/kill `/bin/cat /var/run/DarwinStreamingServer.pid`
|
||||
echo -n ' DarwinStreamingServer'
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
echo "Usage: `basename $0` {start|stop}" >&2
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
|
@ -0,0 +1,26 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
# PROVIDE: darwin_streaming_server
|
||||
# REQUIRE: streamingadminserver
|
||||
#
|
||||
darwin_streaming_server_enable=${darwin_streaming_server_enable-"NO"}
|
||||
|
||||
. %%RC_SUBR%%
|
||||
|
||||
name=darwin_streaming_server
|
||||
rcvar=`set_rcvar`
|
||||
command=%%PREFIX%%/sbin/DarwinStreamingServer
|
||||
|
||||
load_rc_config ${name}
|
||||
|
||||
case "$streamingadminserver_enable" in
|
||||
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
|
||||
darwin_streaming_server_enable="NO"
|
||||
;;
|
||||
esac
|
||||
|
||||
pidfile=/var/run/DarwinStreamingServer.pid
|
||||
|
||||
run_rc_command "$1"
|
|
@ -1,6 +1,6 @@
|
|||
--- Buildit.orig Tue May 31 19:54:23 2005
|
||||
+++ Buildit Sun Jul 10 15:22:41 2005
|
||||
@@ -93,20 +93,20 @@
|
||||
--- Buildit.orig Fri Jul 14 18:36:35 2006
|
||||
+++ Buildit Sat Aug 12 23:51:46 2006
|
||||
@@ -100,20 +100,20 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
|||
- COMPILER_FLAGS=
|
||||
- INCLUDE_FLAG="-include"
|
||||
+ COMPILER_FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
|
||||
+ INCLUDE_FLAG="-include"
|
||||
+ INCLUDE_FLAG="-include"
|
||||
|
||||
- CORE_LINK_LIBS="-pthread -lm -lcrypt"
|
||||
+ CORE_LINK_LIBS="${PTHREAD_LIBS} -lm -lcrypt"
|
||||
|
|
|
@ -0,0 +1,49 @@
|
|||
--- CommonUtilitiesLib/OSHeaders.h.orig Wed May 18 17:01:14 2005
|
||||
+++ CommonUtilitiesLib/OSHeaders.h Sun Aug 13 00:34:52 2006
|
||||
@@ -27,11 +27,20 @@
|
||||
#define OSHeaders_H
|
||||
#include <limits.h>
|
||||
|
||||
+#ifdef __amd64__
|
||||
+#define CPU_64BIT
|
||||
+#endif
|
||||
+
|
||||
#define kSInt16_Max USHRT_MAX
|
||||
#define kUInt16_Max USHRT_MAX
|
||||
|
||||
+#ifdef CPU_64BIT
|
||||
+#define kSInt32_Max INT_MAX
|
||||
+#define kUInt32_Max UINT_MAX
|
||||
+#else
|
||||
#define kSInt32_Max LONG_MAX
|
||||
#define kUInt32_Max ULONG_MAX
|
||||
+#endif
|
||||
|
||||
#define kSInt64_Max LONG_LONG_MAX
|
||||
#define kUInt64_Max ULONG_LONG_MAX
|
||||
@@ -72,8 +81,13 @@
|
||||
typedef signed char SInt8;
|
||||
typedef unsigned short UInt16;
|
||||
typedef signed short SInt16;
|
||||
+#ifdef CPU_64BIT
|
||||
+ typedef unsigned int UInt32;
|
||||
+ typedef signed int SInt32;
|
||||
+#else
|
||||
typedef unsigned long UInt32;
|
||||
typedef signed long SInt32;
|
||||
+#endif
|
||||
typedef signed long long SInt64;
|
||||
typedef unsigned long long UInt64;
|
||||
typedef float Float32;
|
||||
@@ -81,7 +95,11 @@
|
||||
typedef UInt16 Bool16;
|
||||
typedef UInt8 Bool8;
|
||||
|
||||
+#ifdef CPU_64BIT
|
||||
+ typedef unsigned int FourCharCode;
|
||||
+#else
|
||||
typedef unsigned long FourCharCode;
|
||||
+#endif
|
||||
typedef FourCharCode OSType;
|
||||
|
||||
#ifdef FOUR_CHARS_TO_INT
|
15
net/DarwinStreamingServer/files/patch-DSS_MakeRoot
Normal file
15
net/DarwinStreamingServer/files/patch-DSS_MakeRoot
Normal file
|
@ -0,0 +1,15 @@
|
|||
--- DSS_MakeRoot.orig Fri May 27 18:54:45 2005
|
||||
+++ DSS_MakeRoot Sun Aug 13 00:33:59 2006
|
||||
@@ -5,10 +5,10 @@
|
||||
# source release
|
||||
|
||||
DSS=0
|
||||
-if [ $1 = "-f" ]; then
|
||||
+if [ x"$1" = x"-f" ]; then
|
||||
FLATTEN=1
|
||||
INSTALLROOT=$2
|
||||
- if [ $3 = "dss" ]; then
|
||||
+ if [ x"$3" = x"dss" ]; then
|
||||
DSS=1
|
||||
fi
|
||||
else
|
|
@ -0,0 +1,11 @@
|
|||
--- MP3Broadcaster/BroadcasterMain.cpp.orig Sat Mar 12 08:24:54 2005
|
||||
+++ MP3Broadcaster/BroadcasterMain.cpp Sun Aug 13 00:37:12 2006
|
||||
@@ -216,7 +216,7 @@
|
||||
|
||||
struct sigaction act;
|
||||
|
||||
-#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__)
|
||||
+#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) || defined(__amd64__)
|
||||
sigemptyset(&act.sa_mask);
|
||||
act.sa_flags = 0;
|
||||
act.sa_handler = (void(*)(int))&SignalEventHandler;
|
|
@ -0,0 +1,11 @@
|
|||
--- PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp.orig Sat Mar 12 08:24:54 2005
|
||||
+++ PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp Sun Aug 13 00:38:20 2006
|
||||
@@ -2077,7 +2077,7 @@
|
||||
|
||||
struct sigaction act;
|
||||
|
||||
-#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__powerpc__) || defined (__sgi_cc__) || defined(__osf__) || defined(__hpux__)
|
||||
+#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__powerpc__) || defined (__sgi_cc__) || defined(__osf__) || defined(__hpux__) || defined(__amd64__)
|
||||
sigemptyset(&act.sa_mask);
|
||||
act.sa_flags = 0;
|
||||
act.sa_handler = (void(*)(int))&SignalEventHandler;
|
11
net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp
Normal file
11
net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- Server.tproj/main.cpp.orig Wed Apr 27 21:21:14 2005
|
||||
+++ Server.tproj/main.cpp Sun Aug 13 00:39:07 2006
|
||||
@@ -212,7 +212,7 @@
|
||||
//(void) ::signal(SIGPIPE, SIG_IGN);
|
||||
struct sigaction act;
|
||||
|
||||
-#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__)
|
||||
+#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__) || defined(__amd64__)
|
||||
sigemptyset(&act.sa_mask);
|
||||
act.sa_flags = 0;
|
||||
act.sa_handler = (void(*)(int))&sigcatcher;
|
|
@ -1,39 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${0##*/}\$"); then
|
||||
echo "$0: Cannot determine the PREFIX" >&2
|
||||
exit 64
|
||||
fi
|
||||
|
||||
if [ -r /etc/defaults/rc.conf ]; then
|
||||
. /etc/defaults/rc.conf
|
||||
source_rc_confs
|
||||
elif [ -r /etc/rc.conf ]; then
|
||||
. /etc/rc.conf
|
||||
fi
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
case ${streamingadminserver_enable} in
|
||||
[Yy][Ee][Ss])
|
||||
${streamingadminserver_program:-${PREFIX}/sbin/streamingadminserver.pl} ${streamingadminserver_flags} && \
|
||||
echo -n ' StreamingAdminServer'
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
stop)
|
||||
case ${streamingadminserver_enable} in
|
||||
[Yy][Ee][Ss])
|
||||
if [ -f /var/run/streamingadminserver.pid ]; then
|
||||
/bin/kill `/bin/cat /var/run/streamingadminserver.pid`
|
||||
echo -n ' StreamingAdminServer'
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
echo "Usage: `basename $0` {start|stop}" >&2
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
20
net/DarwinStreamingServer/files/streamingadminserver.sh.in
Normal file
20
net/DarwinStreamingServer/files/streamingadminserver.sh.in
Normal file
|
@ -0,0 +1,20 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
# PROVIDE: streamingadminserver
|
||||
# REQUIRE: login
|
||||
#
|
||||
streamingadminserver_enable=${streamingadminserver_enable-"NO"}
|
||||
|
||||
. %%RC_SUBR%%
|
||||
|
||||
name=streamingadminserver
|
||||
rcvar=`set_rcvar`
|
||||
command=%%PREFIX%%/sbin/${name}.pl
|
||||
|
||||
load_rc_config ${name}
|
||||
|
||||
pidfile=/var/run/streamingadminserver.pid
|
||||
|
||||
run_rc_command "$1"
|
|
@ -26,10 +26,12 @@ o Boot DSS Administration Tool
|
|||
# echo 'streamingadminserver_enable="YES"' >> /etc/rc.conf
|
||||
# cd /; env - %%PREFIX%%/etc/rc.d/streamingadminserver.sh start
|
||||
|
||||
(*NOTE*)Darwin Streaming Server will run together.
|
||||
|
||||
o Set up DSS Administration Tool with MSIE(Microsoft Internet Explorer)
|
||||
|
||||
Mozilla, Netscape4/7 are not useful. DSS Administration Tool requires
|
||||
MSIE(4.5 or later) J-Script feature.
|
||||
Mozilla, Netscape4/7 and Opera etc... are not useful. DSS Administration
|
||||
Tool requires MSIE(4.5 and later) J-Script feature.
|
||||
|
||||
http://YOUR.STREAMING.SERVER:1220/
|
||||
|
||||
|
@ -49,13 +51,14 @@ Related directories
|
|||
|
||||
===============================================================================
|
||||
|
||||
If you want to invoke Darwin Streaming Server from start-up, put following
|
||||
lines into /etc/rc.conf.
|
||||
If you want to invoke only Darwin Streaming Server from start-up, put
|
||||
following lines into /etc/rc.conf.
|
||||
|
||||
darwin_streaming_server_enable="YES"
|
||||
darwin_streaming_server_flags=""
|
||||
|
||||
If you want to invoke DSS Administration Tool from start-up, do too.
|
||||
If you want to invoke DSS Administration Tool and Darwin Streaming
|
||||
Server from start-up, do too.
|
||||
|
||||
streamingadminserver_enable="YES"
|
||||
streamingadminserver_flags=""
|
||||
|
|
|
@ -139,8 +139,6 @@ libexec/StreamingServerModules/QTSSHomeDirectoryModule
|
|||
%%DATADIR%%/movies/sample_h264_100kbit.mp4
|
||||
%%DATADIR%%/movies/sample_h264_1mbit.mp4
|
||||
%%DATADIR%%/movies/sample_h264_300kbit.mp4
|
||||
etc/rc.d/streamingadminserver.sh
|
||||
etc/rc.d/darwin_streaming_server.sh
|
||||
etc/streaming/qtusers-dist
|
||||
etc/streaming/qtgroups-dist
|
||||
@unexec if cmp -s %D/etc/streaming/relayconfig.xml %D/etc/streaming/relayconfig.xml-dist; then rm -f %D/etc/streaming/relayconfig.xml; fi
|
||||
|
|
Loading…
Add table
Reference in a new issue