Index: filters/kerneldeint/filter_kerneldeint.c
===================================================================
--- filters/kerneldeint/filter_kerneldeint.c	(revision 20469)
+++ filters/kerneldeint/filter_kerneldeint.c	(working copy)
@@ -525,8 +525,8 @@
     {
         filter->kill_threads = 1;
         for (i = 0; i < filter->requested_threads; i++)
-            if (filter->threads[i].id != 0)
-                pthread_join(filter->threads[i].id, NULL);
+            //if (filter->threads[i].id != 0)
+            //    pthread_join(filter->threads[i].id, NULL);
         free(filter->threads);
     }
 }
@@ -613,10 +613,10 @@
         int success = 0;
         for (int i = 0; i < filter->requested_threads; i++)
         {
-            if (pthread_create(&(filter->threads[i].id), NULL,
-                               KernelThread, (void*)filter) != 0)
-                filter->threads[i].id  = 0;
-            else
+           // if (pthread_create(&(filter->threads[i].id), NULL,
+             //                  KernelThread, (void*)filter) != 0)
+                //filter->threads[i].id  = 0;
+            //else
                 success++;
         }
 
Index: filters/yadif/filter_yadif.c
===================================================================
--- filters/yadif/filter_yadif.c	(revision 20469)
+++ filters/yadif/filter_yadif.c	(working copy)
@@ -545,8 +545,8 @@
     {
         f->kill_threads = 1;
         for (i = 0; i < f->requested_threads; i++)
-            if (f->threads[i].id != 0)
-                pthread_join(f->threads[i].id, NULL);
+            //if (f->threads[i].id != 0)
+            //    pthread_join(f->threads[i].id, NULL);
         free(f->threads);
     }
 
@@ -669,10 +669,10 @@
         int success = 0;
         for (int i = 0; i < filter->requested_threads; i++)
         {
-            if (pthread_create(&(filter->threads[i].id), NULL,
-                               YadifThread, (void*)filter) != 0)
-                filter->threads[i].id  = 0;
-            else
+            //if (pthread_create(&(filter->threads[i].id), NULL,
+             //                  YadifThread, (void*)filter) != 0)
+                //filter->threads[i].id  = 0;
+            //else
                 success++;
         }
 
Index: libs/libmythdvdnav/dvdnav/dvdnav.h
===================================================================
--- libs/libmythdvdnav/dvdnav/dvdnav.h	(revision 20469)
+++ libs/libmythdvdnav/dvdnav/dvdnav.h	(working copy)
@@ -378,7 +378,7 @@
  * Otherwise tries to guess the nearest VOBU by calculating an offset.
  */
 dvdnav_status_t dvdnav_absolute_time_search(dvdnav_t *self,
-                                   uint64_t time, uint search_to_nearest_cell);
+                                   uint64_t time, uint32_t search_to_nearest_cell);
 
 int dvdnav_relative_time_search(dvdnav_t *self,
                    int relative_time);
Index: libs/libmythdvdnav/dvdnav/searching.c
===================================================================
--- libs/libmythdvdnav/dvdnav/searching.c	(revision 20469)
+++ libs/libmythdvdnav/dvdnav/searching.c	(working copy)
@@ -130,7 +130,7 @@
 }
 
 dvdnav_status_t dvdnav_absolute_time_search(dvdnav_t *this,
-				   uint64_t time, uint search_to_nearest_cell) {
+				   uint64_t time, uint32_t search_to_nearest_cell) {
 
   uint64_t target = time;
   uint64_t length = 0;
Index: libs/libmythtv/channelscan/channelscan_sm.h
===================================================================
--- libs/libmythtv/channelscan/channelscan_sm.h	(revision 20469)
+++ libs/libmythtv/channelscan/channelscan_sm.h	(working copy)
@@ -30,6 +30,8 @@
 #ifndef SISCAN_H
 #define SISCAN_H
 
+#include <pthread.h>
+
 // Qt includes
 #include <qobject.h>
 #include <qstring.h>
Index: libs/libmythtv/util-opengl.h
===================================================================
--- libs/libmythtv/util-opengl.h	(revision 20469)
+++ libs/libmythtv/util-opengl.h	(working copy)
@@ -31,6 +31,10 @@
 #define GL_TEXTURE0 0x84C0
 #endif
 
+#ifndef GL_MAX_TEXTURE_UNITS
+#define GL_MAX_TEXTURE_UNITS 0x84E2
+#endif
+
 #ifndef GL_TEXTURE_RECTANGLE_ARB
 #define GL_TEXTURE_RECTANGLE_ARB 0x84F5
 #endif
Index: programs/mythjobqueue/main.cpp
===================================================================
--- programs/mythjobqueue/main.cpp	(revision 20469)
+++ programs/mythjobqueue/main.cpp	(working copy)
@@ -2,6 +2,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <signal.h>
 
 #include <iostream>
 #include <fstream>