Ticket #1267: mythv-freebsd-patch

File mythv-freebsd-patch, 4.3 KB (added by carlfongheiser@…, 18 years ago)
Line 
1diff -ur mythtv-0.19/libs/libmyth/DisplayResX.cpp mythtv-0.19.patched/libs/libmyth/DisplayResX.cpp
2--- mythtv-0.19/libs/libmyth/DisplayResX.cpp    Sat Apr 23 14:29:06 2005
3+++ mythtv-0.19.patched/libs/libmyth/DisplayResX.cpp    Sun Feb 12 08:39:20 2006
4@@ -1,3 +1,5 @@
5+#include "DisplayResX.h"
6+#include <iostream>
7 #include <cstdio>
8 #include <cstring>
9 #include <cstdlib>
10@@ -10,9 +12,7 @@
11 #include <X11/extensions/Xrandr.h>
12 }
13 
14-#include <iostream>
15 
16-#include "DisplayResX.h"
17 #include "util-x11.h"
18 
19 using namespace X11;
20diff -ur mythtv-0.19/libs/libmythtv/NuppelVideoPlayer.cpp mythtv-0.19.patched/libs/libmythtv/NuppelVideoPlayer.cpp
21--- mythtv-0.19/libs/libmythtv/NuppelVideoPlayer.cpp    Tue Feb  7 15:56:06 2006
22+++ mythtv-0.19.patched/libs/libmythtv/NuppelVideoPlayer.cpp    Sat Feb 11 22:20:20 2006
23@@ -2715,7 +2715,7 @@
24 
25 void NuppelVideoPlayer::WrapTimecode(long long &timecode, TCTypes tc_type)
26 {
27-    if ((tc_type == TC_AUDIO) && (tc_wrap[TC_AUDIO] == LONG_LONG_MIN))
28+    if ((tc_type == TC_AUDIO) && (tc_wrap[TC_AUDIO] == LLONG_MIN))
29     {
30         long long newaudio;
31         newaudio = tc_lastval[TC_VIDEO] - tc_diff_estimate;
32diff -ur mythtv-0.19/libs/libmythtv/NuppelVideoPlayer.h mythtv-0.19.patched/libs/libmythtv/NuppelVideoPlayer.h
33--- mythtv-0.19/libs/libmythtv/NuppelVideoPlayer.h      Thu Feb  2 12:06:32 2006
34+++ mythtv-0.19.patched/libs/libmythtv/NuppelVideoPlayer.h      Sat Feb 11 21:16:45 2006
35@@ -251,7 +251,7 @@
36     long long ResetAudioTimecodeOffset(void)
37         { tc_wrap[TC_AUDIO] = 0LL; return tc_wrap[TC_AUDIO]; }
38     long long ResyncAudioTimecodeOffset(void)
39-        { tc_wrap[TC_AUDIO] = LONG_LONG_MIN; return 0L; }
40+        { tc_wrap[TC_AUDIO] = LLONG_MIN; return 0L; }
41     long long GetAudioTimecodeOffset(void) const
42         { return tc_wrap[TC_AUDIO]; }
43 
44diff -ur mythtv-0.19/libs/libmythtv/osdxvmc.cpp mythtv-0.19.patched/libs/libmythtv/osdxvmc.cpp
45--- mythtv-0.19/libs/libmythtv/osdxvmc.cpp      Fri Jul  1 17:37:06 2005
46+++ mythtv-0.19.patched/libs/libmythtv/osdxvmc.cpp      Sun Feb 12 16:13:47 2006
47@@ -3,6 +3,7 @@
48 
49 #ifdef USING_XVMC
50 
51+#include <sys/types.h>
52 #include <sys/ipc.h>
53 #include <sys/shm.h>
54 #include <unistd.h>
55diff -ur mythtv-0.19/libs/libmythtv/tv_play.cpp mythtv-0.19.patched/libs/libmythtv/tv_play.cpp
56--- mythtv-0.19/libs/libmythtv/tv_play.cpp      Tue Feb  7 15:56:06 2006
57+++ mythtv-0.19.patched/libs/libmythtv/tv_play.cpp      Sat Feb 11 22:14:59 2006
58@@ -212,7 +212,7 @@
59       menurunning(false), runMainLoop(false), wantsToQuit(true),
60       exitPlayer(false), paused(false), errored(false),
61       stretchAdjustment(false),
62-      audiosyncAdjustment(false), audiosyncBaseline(LONG_LONG_MIN),
63+      audiosyncAdjustment(false), audiosyncBaseline(LLONG_MIN),
64       editmode(false), zoomMode(false), sigMonMode(false),
65       update_osd_pos(false), endOfRecording(false), requestDelete(false),
66       doSmartForward(false),
67@@ -4650,7 +4650,7 @@
68 {
69     long long newval;
70 
71-    if (!audiosyncAdjustment && LONG_LONG_MIN == audiosyncBaseline)
72+    if (!audiosyncAdjustment && LLONG_MIN == audiosyncBaseline)
73         audiosyncBaseline = activenvp->GetAudioTimecodeOffset();
74 
75     audiosyncAdjustment = allowEdit;
76diff -ur mythtv-0.19/libs/libmythtv/videoout_xv.cpp mythtv-0.19.patched/libs/libmythtv/videoout_xv.cpp
77--- mythtv-0.19/libs/libmythtv/videoout_xv.cpp  Wed Feb  8 10:38:17 2006
78+++ mythtv-0.19.patched/libs/libmythtv/videoout_xv.cpp  Sun Feb 12 15:58:02 2006
79@@ -6,7 +6,9 @@
80 #include <ctime>
81 #include <cerrno>
82 
83+#ifndef __FreeBSD__
84 #include <malloc.h>
85+#endif
86 #include <fcntl.h>
87 #include <unistd.h>
88 #include <signal.h>
89@@ -3469,7 +3471,15 @@
90     uint bpl = img[i]->bytes_per_line;
91 
92     // create chroma key line
93+#ifdef MEMALIGN_HACK
94+    void *cln_mem = malloc(bpl + 128);
95+    int cln_off = 128 - ((int)cln_mem) % 128;
96+    if (cln_off == 128)
97+       cln_off = 0;
98+    char *cln = (char*)cln_mem + cln_off;
99+#else
100     char *cln = (char*) memalign(128, bpl + 128);
101+#endif
102     bzero(cln, bpl);
103     int j  = max(videoOutput->dispxoff - videoOutput->dispx, 0);
104     int ej = min(videoOutput->dispxoff + videoOutput->dispwoff, vf[i].width);
105@@ -3500,7 +3510,11 @@
106     if (cend < vf[i].height)
107         bzero(buf + (cend * bpl), (vf[i].height - cend) * bpl);
108 
109+#ifdef MEMALIGN_HACK
110+    free(cln_mem);
111+#else
112     free(cln);
113+#endif
114 }
115 
116 /** \fn ChromaKeyOSD::ProcessOSD(OSD*)