aboutsummaryrefslogtreecommitdiff
path: root/multimedia/mythtv/files
diff options
context:
space:
mode:
authorGreg Lehey <grog@FreeBSD.org>2007-04-15 09:33:30 +0000
committerGreg Lehey <grog@FreeBSD.org>2007-04-15 09:33:30 +0000
commit65effc873656f45202998919c204fa65cc323d89 (patch)
treede3f523dca6236c71c819ffdb77f19c64bfc9733 /multimedia/mythtv/files
parentb845a4f62ea72b27e10ea599179f3e00a7a461e8 (diff)
Notes
Diffstat (limited to 'multimedia/mythtv/files')
-rw-r--r--multimedia/mythtv/files/patch-configure32
-rw-r--r--multimedia/mythtv/files/patch-httprequest.cpp33
-rw-r--r--multimedia/mythtv/files/patch-libs-libmythtvfreemheg-Programs.cpp18
3 files changed, 64 insertions, 19 deletions
diff --git a/multimedia/mythtv/files/patch-configure b/multimedia/mythtv/files/patch-configure
index 479594a17bbf..7f299b12bfd1 100644
--- a/multimedia/mythtv/files/patch-configure
+++ b/multimedia/mythtv/files/patch-configure
@@ -1,6 +1,24 @@
---- configure.orig Tue Aug 29 01:48:08 2006
-+++ configure Sun Nov 12 13:25:22 2006
-@@ -712,7 +712,7 @@
+--- configure.really-orig Fri Mar 16 18:11:46 2007
++++ configure Thu Mar 29 16:18:29 2007
+@@ -463,6 +463,17 @@
+ fi
+ fi
+
++# BSD.
++if uname -s | grep BSD > 0; then
++ dmesg=/var/run/dmesg.boot
++ if test -f $dmesg ; then
++ processor=`grep ^CPU: $dmesg`
++# processor_flags is used only to determine whether the processor
++# supports MMX. The script expexts lower-case 'mmx'. Give it to it.
++ processor_flags=`grep '^ Features=' $dmesg | tr "[:upper:]" "[:lower:]"`
++ fi
++fi
++
+ # These have to be looked up early for some types of cross-compiling to work
+ cpu_overide="no"
+ for opt do
+@@ -712,14 +723,14 @@
;;
FreeBSD)
joystick_menu="no"
@@ -9,3 +27,11 @@
bktr="yes"
audio_oss="yes"
dv1394="no"
+ make="gmake"
+ backend="yes"
+ v4l="yes"
+-CFLAGS="$CFLAGS -pthread"
++CFLAGS="$CFLAGS -pthread -I/usr/local/include"
+ CCONFIG="$CCONFIG freebsd"
+ ;;
+ GNU/kFreeBSD)
diff --git a/multimedia/mythtv/files/patch-httprequest.cpp b/multimedia/mythtv/files/patch-httprequest.cpp
index 48b2e90e4c32..1ec809934093 100644
--- a/multimedia/mythtv/files/patch-httprequest.cpp
+++ b/multimedia/mythtv/files/patch-httprequest.cpp
@@ -1,5 +1,5 @@
---- libs/libmythupnp/httprequest.cpp~ Tue Nov 14 12:29:06 2006
-+++ libs/libmythupnp/httprequest.cpp Tue Nov 14 12:59:13 2006
+--- libs/libmythupnp/httprequest.cpp~ Fri Mar 16 08:25:39 2007
++++ libs/libmythupnp/httprequest.cpp Fri Mar 16 08:40:32 2007
@@ -21,8 +21,12 @@
#ifdef CONFIG_DARWIN
#include "darwin-sendfile.h"
@@ -13,14 +13,13 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-@@ -281,7 +285,30 @@
- {
+@@ -289,6 +293,24 @@
__off64_t offset = llStart;
int file = open( sFileName.ascii(), O_RDONLY | O_LARGEFILE );
-- sendfile64( getSocketHandle(), file, &offset, llSize );
-+ int error;
-+
+ ssize_t sent = 0;
+#ifdef __FreeBSD__
++
++ int error;
+ error = sendfile (file,
+ getSocketHandle (),
+ offset,
@@ -28,20 +27,22 @@
+ NULL,
+ NULL,
+ NULL );
-+#else
-+ error = sendfile64( getSocketHandle(), file, &offset, llSize );
-+#endif
-+
-+ /*
-+ * Yes, this isn't needed for portability, but I can't stand the sight
-+ * of a call not checked for error conditions.
-+ */
+ if (error)
+ fprintf (stderr,
+ "Can't transfer %s: %s (%d)\n",
+ sFileName.ascii(),
+ strerror (errno),
+ errno );
-
++
++#else
+
+ do
+ {
+@@ -301,6 +319,7 @@
+ llSize -= sent;
+ }
+ while (( sent >= 0 ) && ( llSize > 0 ));
++#endif
+
close( file );
}
diff --git a/multimedia/mythtv/files/patch-libs-libmythtvfreemheg-Programs.cpp b/multimedia/mythtv/files/patch-libs-libmythtvfreemheg-Programs.cpp
new file mode 100644
index 000000000000..ebc08d3a7ab4
--- /dev/null
+++ b/multimedia/mythtv/files/patch-libs-libmythtvfreemheg-Programs.cpp
@@ -0,0 +1,18 @@
+--- libs/libmythfreemheg/Programs.cpp~ Fri Mar 16 18:11:34 2007
++++ libs/libmythfreemheg/Programs.cpp Sat Apr 7 11:41:11 2007
+@@ -30,7 +30,15 @@
+ #include "freemheg.h"
+
+ #include <sys/timeb.h>
++#ifdef __FreeBSD__
++/*
++ * This file refers to the non-POSIX structure timezone, which is
++ * defined in sys/time.h.
++ */
++#include <sys/time.h>
++#else
+ #include <time.h>
++#endif
+
+ #include "../../config.h"
+