Date: Thu, 1 Feb 2007 20:46:30 +0100 From: "usleepless" <usleepless@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/108667: [PATCH] multimedia/mythtv: fixes frontend<->backend communication Message-ID: <20070201201311.BD68413C428@mx1.freebsd.org> Resent-Message-ID: <200702012020.l11KKJ7D019807@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 108667
>Category: ports
>Synopsis: [PATCH] multimedia/mythtv: fixes frontend<->backend communication
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 01 20:20:19 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: usleep
>Release: FreeBSD 6.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD x.y.z 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 22 17:37:30 CET 2006 usleepless@x.y.z:/usr/obj/usr/src/sys/FBSD6 i386
>Description:
>How-To-Repeat:
>Fix:
--- mythtv-patches.shar begins here ---
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# patch-videodev_myth.h
# patch-mpegrecorder.cpp
# patch-mainserver.cpp
#
echo x - patch-videodev_myth.h
sed 's/^X//' >patch-videodev_myth.h << 'END-of-patch-videodev_myth.h'
X--- ./libs/libmythtv/videodev_myth.h.orig Wed Jan 31 22:16:51 2007
X+++ ./libs/libmythtv/videodev_myth.h Wed Jan 31 22:28:06 2007
X@@ -5,12 +5,12 @@
X
X #if defined(__FreeBSD__) || defined(CONFIG_DARWIN)
X #include <sys/types.h>
X-typedef unsigned long __u32;
X-typedef unsigned short __u16;
X-typedef int __s32;
X-typedef unsigned char __u8;
X-typedef unsigned long long __u64;
X-typedef long long __s64;
X+typedef uint32_t __u32;
X+typedef uint16_t __u16;
X+typedef int32_t __s32;
X+typedef uint8_t __u8;
X+typedef uint32_t __u64;
X+typedef int32_t __s64;
X #else
X #include <linux/types.h>
X #include <linux/version.h>
END-of-patch-videodev_myth.h
echo x - patch-mpegrecorder.cpp
sed 's/^X//' >patch-mpegrecorder.cpp << 'END-of-patch-mpegrecorder.cpp'
X--- libs/libmythtv/mpegrecorder.cpp.orig Wed Jan 31 22:18:54 2007
X+++ libs/libmythtv/mpegrecorder.cpp Wed Jan 31 16:16:27 2007
X@@ -603,7 +603,7 @@
X tv.tv_usec = 0;
X FD_ZERO(&rdset);
X FD_SET(readfd, &rdset);
X-
X+#ifdef _nuniet_
X switch (select(readfd + 1, &rdset, NULL, NULL, &tv))
X {
X case -1:
X@@ -627,6 +627,7 @@
X
X default: break;
X }
X+#endif
X
X ret = read(readfd, buffer, bufferSize);
X
END-of-patch-mpegrecorder.cpp
echo x - patch-mainserver.cpp
sed 's/^X//' >patch-mainserver.cpp << 'END-of-patch-mainserver.cpp'
X--- programs/mythbackend/mainserver.cpp.orig Wed Jan 31 22:16:22 2007
X+++ programs/mythbackend/mainserver.cpp Wed Jan 31 16:16:00 2007
X@@ -238,9 +238,9 @@
X return;
X }
X
X- readReadyLock.lock();
X+ // readReadyLock.lock();
X
X- sock->Lock();
X+ // sock->Lock();
X
X //if (socket->IsInProcess())
X //{
X@@ -287,7 +287,7 @@
X
X prt->setup(sock);
X
X- readReadyLock.unlock();
X+ //readReadyLock.unlock();
X }
X
X void MainServer::ProcessRequest(MythSocket *sock)
X@@ -301,7 +301,7 @@
X ProcessRequestWork(sock);
X }
X
X- sock->Unlock();
X+ //sock->Unlock();
X //sock->SetInProcess(false);
X }
X
END-of-patch-mainserver.cpp
exit
--- mythtv-patches.shar ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070201201311.BD68413C428>