7 files changed, 87 insertions, 110 deletions
diff --git a/multimedia/mythtv-frontend/files/patch-configure b/multimedia/mythtv-frontend/files/patch-configure
index 476f2b1a6362..40981fe8fcd8 100644
--- a/multimedia/mythtv-frontend/files/patch-configure
+++ b/multimedia/mythtv-frontend/files/patch-configure
@@ -1,31 +1,49 @@
---- configure.orig	2010-03-30 00:09:16.000000000 +0200
-+++ configure	2010-04-06 19:10:20.000000000 +0200
-@@ -666,21 +666,21 @@
+--- configure.orig	2010-11-08 18:40:43.000000000 +0100
++++ configure	2010-11-11 19:23:31.000000000 +0100
+@@ -691,21 +691,21 @@
      log check_cc "$@"
      cat > $TMPC
      log_file $TMPC
--    check_cmd $cc $CPPFLAGS $CFLAGS $OPTFLAGS "$@" -c -o $TMPO $TMPC
-+    check_cmd $cc $CPPFLAGS $CFLAGS $OPTFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC
+-    check_cmd $cc $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC
++    check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC
  }
  
  check_cpp(){
      log check_cpp "$@"
      cat > $TMPC
      log_file $TMPC
--    check_cmd $cc $CPPFLAGS $CFLAGS $OPTFLAGS "$@" -E -o $TMPO $TMPC
-+    check_cmd $cc $CPPFLAGS $CFLAGS $OPTFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC
+-    check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC
++    check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC
  }
  
  check_cxx(){
      log check_cxx "$@"
      cat > $TMPCXX
      log_file $TMPCXX
--    check_cmd $cxx $ECXXFLAGS "$@" -c -o $TMPO $TMPCXX
-+    check_cmd $cxx $ECXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCXX
+-    check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS "$@" -c -o $TMPO $TMPCXX
++    check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCXX
  }
  
  check_as(){
-@@ -2841,7 +2841,6 @@
+@@ -1865,7 +1865,7 @@
+ 
+ # machine
+ arch_default=$(uname -m)
+-cpu="generic"
++cpu="i686"
+ processor=`uname -p 2>/dev/null`
+ processor_flags=""
+ tune="generic"
+@@ -2826,7 +2826,7 @@
+         i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|k8-sse3|opteron-sse3|athlon64-sse3|core2|amdfam10|barcelona|atom)
+             cpuflags="-march=$cpu"
+             enable cmov
+-            enable fast_cmov
++            disable fast_cmov
+         ;;
+         # targets that do support conditional mov but on which it's slow
+         pentium4|pentium4m|prescott|nocona)
+@@ -3026,7 +3026,6 @@
          enable malloc_aligned
          # Workaround compile errors from missing u_int/uint def
          CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
@@ -33,12 +51,20 @@
          enable backend
          ;;
      bsd/os)
-@@ -4581,6 +4580,8 @@
+@@ -4742,6 +4741,8 @@
  #       directories, it cannot be modified.
- QMAKE_LIBDIR_QT -= $libdir
- LATE_LIBS            += -L$libdir
+ QMAKE_LIBDIR_QT-=${sysroot}${libdir}
+ LATE_LIBS+=-L${sysroot}${libdir}
 +CONFIG_INCLUDEPATH=
 +FREETYPE_CFLAGS -= -I/usr/local/include
  EOF
  
- diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1
+ #echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
+@@ -4778,6 +4779,7 @@
+ BINDIR=\$(INSTALL_ROOT)$bindir
+ DATADIR=\$(INSTALL_ROOT)$datadir
+ MANDIR=\$(INSTALL_ROOT)$mandir
++CFLAGS+=-I/usr/local/include
+ endif # FFMPEG_CONFIG_MAK
+ EOF
+ 
diff --git a/multimedia/mythtv-frontend/files/patch-external__FFmpeg__configure b/multimedia/mythtv-frontend/files/patch-external__FFmpeg__configure
new file mode 100644
index 000000000000..8fe0073fafd3
--- /dev/null
+++ b/multimedia/mythtv-frontend/files/patch-external__FFmpeg__configure
@@ -0,0 +1,31 @@
+--- external/FFmpeg/configure.orig	2010-08-23 18:54:20.000000000 +0200
++++ external/FFmpeg/configure	2010-11-01 21:13:19.000000000 +0100
+@@ -1528,8 +1528,8 @@
+ nm_opts='-g'
+ 
+ # machine
+-arch_default=$(uname -m)
+-cpu="generic"
++arch_default=$(uname -p)
++cpu="i686"
+ 
+ # OS
+ target_os_default=$(tolower $(uname -s))
+@@ -2108,7 +2108,7 @@
+         i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|core2|amdfam10|barcelona)
+             cpuflags="-march=$cpu"
+             enable cmov
+-            enable fast_cmov
++            disable fast_cmov
+         ;;
+         # targets that do support conditional mov but on which it's slow
+         pentium4|pentium4m|prescott|nocona)
+@@ -3063,7 +3063,7 @@
+ SRC_PATH_BARE=$source_path
+ BUILD_ROOT="$PWD"
+ CC_IDENT=$cc_ident
+-ARCH=$arch
++FFMPEG_ARCH=$arch
+ CC=$cc
+ AS=$as
+ LD=$ld
diff --git a/multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__Makefile b/multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__Makefile
new file mode 100644
index 000000000000..2f3a9b67c3f1
--- /dev/null
+++ b/multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__Makefile
@@ -0,0 +1,11 @@
+--- external/FFmpeg/libavcodec/Makefile.orig	2010-11-01 21:14:42.000000000 +0100
++++ external/FFmpeg/libavcodec/Makefile	2010-11-01 20:30:35.000000000 +0100
+@@ -631,7 +631,7 @@
+ # well.
+ OBJS-$(!CONFIG_SMALL)                  += inverse.o
+ 
+--include $(SUBDIR)$(ARCH)/Makefile
++-include $(SUBDIR)x86/Makefile
+ 
+ SKIPHEADERS                             = %_tablegen.h
+ SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmyth__mythdeque.h b/multimedia/mythtv-frontend/files/patch-libs__libmyth__mythdeque.h
deleted file mode 100644
index a911b0c9573f..000000000000
--- a/multimedia/mythtv-frontend/files/patch-libs__libmyth__mythdeque.h
+++ /dev/null
@@ -1,49 +0,0 @@
---- ./libs/libmyth/mythdeque.h	(revision 20349)
-+++ ./libs/libmyth/mythdeque.h	(revision 26434)
-@@ -4,6 +4,12 @@
- #define __MYTH_DEQUE_H__
- 
-+#include <QString>
- #include <deque>
- using namespace std;
-+
-+template<typename T>
-+inline T myth_deque_init(const T*) { return (T)(0); }
-+template<>
-+inline QString myth_deque_init(const QString*) { return QString(); }
- 
- /** \class MythDeque
-@@ -19,6 +25,7 @@
-     T dequeue()
-     {
-+        T *dummy = NULL;
-         if (deque<T>::empty())
--            return (T)(0);
-+            return myth_deque_init(dummy);
-         T item = deque<T>::front();
-         deque<T>::pop_front();
-@@ -66,14 +73,20 @@
- 
-     /// \brief Returns item at head of list. O(1).
--    T head() { return (deque<T>::size()) ? deque<T>::front() : (T)(NULL); }
-+    T head()
-+        { if (!deque<T>::empty()) return deque<T>::front();
-+          T *dummy = NULL; return myth_deque_init(dummy); }
-     /// \brief Returns item at head of list. O(1).
-     const T head() const
--        { return (deque<T>::size()) ? deque<T>::front() : (T)(NULL); }
-+        { if (!deque<T>::empty()) return deque<T>::front();
-+          T *dummy = NULL; return myth_deque_init(dummy); }
- 
-     /// \brief Returns item at tail of list. O(1).
--    T tail() { return (deque<T>::size()) ? deque<T>::back() : (T)(NULL); }
-+    T tail()
-+        { if (!deque<T>::empty()) return deque<T>::back();
-+          T *dummy = NULL; return myth_deque_init(dummy); }
-     /// \brief Returns item at tail of list. O(1).
-     const T tail() const
--        { return (deque<T>::size()) ? deque<T>::back() : (T)(NULL); }
-+        { if (!deque<T>::empty()) return deque<T>::back();
-+          T *dummy = NULL; return myth_deque_init(dummy); }
- };
- 
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythtv__recordingprofile.h b/multimedia/mythtv-frontend/files/patch-libs__libmythtv__recordingprofile.h
deleted file mode 100644
index ce37bfe29256..000000000000
--- a/multimedia/mythtv-frontend/files/patch-libs__libmythtv__recordingprofile.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libs/libmythtv/recordingprofile.h.orig	2009-10-22 03:30:12.000000000 +0400
-+++ ./libs/libmythtv/recordingprofile.h	2010-12-01 23:01:20.247699483 +0300
-@@ -84,7 +84,7 @@
- 
-   public:
-     // initializers
--    RecordingProfile(QString profName = NULL);
-+    RecordingProfile(QString profName = QString());
-     virtual void loadByID(int id);
-     virtual bool loadByType(const QString &name, const QString &cardtype);
-     virtual bool loadByGroup(const QString &name, const QString &group);
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythupnp__eventing.h b/multimedia/mythtv-frontend/files/patch-libs__libmythupnp__eventing.h
deleted file mode 100644
index 72ccc8be963b..000000000000
--- a/multimedia/mythtv-frontend/files/patch-libs__libmythupnp__eventing.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./libs/libmythupnp/eventing.h	(revision 23038)
-+++ ./libs/libmythupnp/eventing.h	(revision 26434)
-@@ -174,4 +174,9 @@
- //////////////////////////////////////////////////////////////////////////////
- 
-+template<typename T>
-+inline T state_var_init(const T*) { return (T)(0); }
-+template<>
-+inline QString state_var_init(const QString*) { return QString(); }
-+
- class UPNP_PUBLIC StateVariables
- {   
-@@ -232,7 +237,8 @@
-         T GetValue( const QString &sName )
-         {
-+            T *dummy = NULL;
-             SVMap::iterator it = m_map.find(sName);
-             if (it == m_map.end())
--                return T(0);
-+                return state_var_init(dummy);
- 
-             StateVariable< T > *pVariable =
-@@ -242,5 +248,5 @@
-                 return pVariable->GetValue();
- 
--            return T(0);
-+            return state_var_init(dummy);
-         }
- 
diff --git a/multimedia/mythtv-frontend/files/patch-programs__programs.pro b/multimedia/mythtv-frontend/files/patch-programs__programs.pro
index eb20dc7fea6c..b5a933ab40fc 100644
--- a/multimedia/mythtv-frontend/files/patch-programs__programs.pro
+++ b/multimedia/mythtv-frontend/files/patch-programs__programs.pro
@@ -1,13 +1,11 @@
---- programs/programs.pro.orig	2009-10-15 23:39:07.000000000 +0000
-+++ programs/programs.pro	2009-10-15 23:39:19.000000000 +0000
-@@ -9,10 +9,6 @@
-     SUBDIRS += mythwelcome mythshutdown mythtranscode/replex
+--- programs/programs.pro.orig	2010-11-01 14:01:30.000000000 +0100
++++ programs/programs.pro	2010-11-01 14:07:41.000000000 +0100
+@@ -11,8 +11,4 @@
+     !mingw: SUBDIRS += mythtranscode/replex
  }
  
 -using_backend {
 -    SUBDIRS += mythbackend mythfilldatabase mythtv-setup scripts
 -}
 -
- using_frontend:using_backend {
-     SUBDIRS += mythtranscode
- }
+ using_mythtranscode: SUBDIRS += mythtranscode