Attachment 152950 Details for Bug 197574 – Updated patch

[patch] Updated patch

patch_cx88.txt (text/plain), 3.22 KB, created by jason.harmening on 2015-02-14 00:41:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jason.harmening

Created: 2015-02-14 00:41:01 UTC

Size: 3.22 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 378881)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	cx88
> PORTVERSION=	1.4.11
>+PORTREVISION=	1
> CATEGORIES=	multimedia
> MASTER_SITES=	ftp://corona.homeunix.net/ports/cx88/
> 
>@@ -17,7 +18,8 @@
> 
> MAKE_ARGS+=	LIBTUNER_LIB=${LOCALBASE}/lib/libtuner LIBTUNER_HEADER=${LOCALBASE}/include/libtuner KMODDIR=${KMODDIR} PREFIX=${STAGEDIR}${PREFIX}
> MAKE_JOBS_UNSAFE=	yes
>-USES=				kmod pkgconfig uidfix
>+USES=			kmod pkgconfig uidfix
>+USE_RC_SUBR=		cx88d
> 
> OPTIONS_DEFINE=	DEBUG LINUX_COMPAT HAL
> 
>Index: files/cx88d.in
>===================================================================
>--- files/cx88d.in	(revision 0)
>+++ files/cx88d.in	(working copy)
>@@ -0,0 +1,75 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+# PROVIDE: cx88d
>+# REQUIRE: LOGIN
>+# KEYWORD: shutdown
>+#
>+# Add the following line to /etc/rc.conf[.local] to enable cx88d
>+#
>+# cx88d_enable (bool):		Set to "NO" by default.
>+#				Set it to "YES" to enable cx88d.
>+# cx88d_args (str):		Extra arguments to be passed to all cx88 instances (default empty)
>+# cx88d_devs (str):		Whitespace-delimited list of devices on which
>+#				to enable DVB capture (e.g. cx88d_devs="cx88mpeg0 cx88mpeg2").
>+#				Defaults to all cx88mpeg devices under /dev.
>+# cx88d_{dev}_args (str)	Extra arguments to be passed to cx88 instance for specific device
>+#				(e.g. cx88d_cx88mpeg1_args="-u udp://127.0.0.1:8802") (default empty)
>+#
>+
>+. /etc/rc.subr
>+
>+name="cx88d"
>+rcvar=cx88d_enable
>+
>+load_rc_config $name
>+
>+: ${cx88d_enable:="NO"}
>+
>+procname="%%PREFIX%%/bin/cx88"
>+command="/usr/sbin/daemon"
>+_cx88_command="${procname} ${cx88d_args} -p 0 -q -h"
>+
>+cx88d_showports() {
>+   printf "PORT\tCMMMAND\n"
>+   sockstat -l -P tcp | grep cx88 | while read line; do
>+      command=""
>+      port=""
>+      for field in $line; do
>+         if [ `expr "$field" : "[0-9]*"` -gt 0 -a "$command" = "" ]; then
>+            command=`ps -o command= -p $field`
>+         elif [ `expr "$field" : "\*:[0-9]*"` -gt 2 -a "$port" = "" ]; then
>+            port=`echo $field | cut -c 3-`
>+         fi
>+      done
>+      printf "$port\t$command\n"
>+   done
>+}
>+
>+extra_commands="showports"
>+showports_cmd="${name}_showports"
>+
>+case $1 in
>+   *showports)
>+      run_rc_command "$1"
>+      ;;
>+   *rcvar)
>+      run_rc_command "$1"
>+      ;;
>+   *)
>+      if [ -z "${cx88d_devs}" ]; then
>+         cx88d_devs=`ls /dev/cx88mpeg* | cut -c 6-`
>+      fi
>+      for devnode in ${cx88d_devs}; do
>+         pidfile="/var/run/cx88d.${devnode}.pid"
>+         command_args="-fp ${pidfile} ${_cx88_command} -d /dev/${devnode}"
>+         eval cx88d_instance_flags=\$cx88d_${devnode}_args
>+         if [ `echo ${devnode} | cut -c -8` = "cx88mpeg" ]; then
>+            command_args="${command_args} ${cx88d_instance_flags} -u dvb://"
>+         fi
>+         run_rc_command "$1"
>+      done
>+      ;;
>+esac
>+
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 378881)
>+++ pkg-plist	(working copy)
>@@ -8,7 +8,6 @@
> %%EXAMPLESDIR%%/cx88_mpeg_client.cpp
> %%EXAMPLESDIR%%/hd3k_analog_kbuf.cpp
> %%EXAMPLESDIR%%/tuner_config
>-etc/rc.d/cx88d
> include/iicdev/iicdev_ioctl.h
> include/cx88/cx88_common_ioctl.h
> include/cx88/cx88_mpeg_ioctl.h

Actions: View | Diff

Attachments on bug 197574: 152908 | 152950 | 152955