- rewriten for 0.22 svn version

Changed files:
    mythtv-configure.patch -> 1.4
    mythtv-sbinpath.patch -> 1.3

diff --git a/mythtv-configure.patch b/mythtv-configure.patch
index 66fb78c352da55b1f1d063e9084ada4c53717f4f..94f59aaf0eb8ad9bc1f3e69985950315a3b03fc9 100644 (file)
--- a/mythtv-configure.patch
+++ b/mythtv-configure.patch
@@ -1,11 +1,13 @@
---- mythtv-0.20/configure      2006-09-14 15:58:26.000000000 +0300
-+++ mythtv/configure   2006-09-05 05:09:59.000000000 +0300
-@@ -452,7 +452,7 @@
-             x"$processor" = x"unknown" -o x"$processor" = x"powerpc" ; then 
-         processor=`/usr/bin/hostinfo | grep "Processor type:"` 
-         processor=${processor#Processor type: *} 
--        processor=${processor% (*} 
+--- configure.orig     2008-11-01 18:37:08.000000000 +0100
++++ configure  2008-11-01 18:42:53.000000000 +0100
+@@ -1279,8 +1279,8 @@
+     arch=`arch`
+     if test x"$arch" = x"ppc" -o x"$arch" = x"ppc64" ; then
+         processor=`/usr/bin/hostinfo | grep "Processor type:"`
+-        processor=${processor#Processor type: *}
+-        processor=${processor% (*}
++        processor="${processor#Processor type:\ *}"
 +        processor="${processor% \(*}"
-         if test x"`echo $processor | cut -c1-3`" = x"ppc" ; then
-             tune=$processor 
-         else 
+         tune=$processor
+     else
+             # 10.4 only:

diff --git a/mythtv-sbinpath.patch b/mythtv-sbinpath.patch
index 9c6ec50e935177665de19251003a92ebcab62875..3d24834f879ee77c40365fcef67890c1e864e0e3 100644 (file)
--- a/mythtv-sbinpath.patch
+++ b/mythtv-sbinpath.patch
@@ -1,39 +1,67 @@
---- mythtv/libs/libmythtv/jobqueue.cpp~        2006-09-05 04:56:41.000000000 +0300
-+++ mythtv/libs/libmythtv/jobqueue.cpp 2006-09-05 04:57:45.000000000 +0300
-@@ -1955,7 +1955,7 @@
+diff -urN mythtv-0.22.orig/libs/libmythdb/lcddevice.cpp mythtv-0.22/libs/libmythdb/lcddevice.cpp
+--- mythtv-0.22.orig/libs/libmythdb/lcddevice.cpp      2009-01-03 19:19:01.000000000 +0100
++++ mythtv-0.22/libs/libmythdb/lcddevice.cpp   2009-02-11 23:13:42.000000000 +0100
+@@ -139,7 +139,7 @@
+     {
+         // we need to start the mythlcdserver
+         VERBOSE(VB_GENERAL, "Starting mythlcdserver");
+-        system(qPrintable(GetInstallPrefix() + "/bin/mythlcdserver -v none&"));
++        system(qPrintable(GetInstallPrefix() + "/sbin/mythlcdserver -v none&"));
+         usleep(500000);
+     }
+ 
+diff -urN mythtv-0.22.orig/libs/libmythtv/jobqueue.cpp mythtv-0.22/libs/libmythtv/jobqueue.cpp
+--- mythtv-0.22.orig/libs/libmythtv/jobqueue.cpp       2009-02-11 19:21:54.000000000 +0100
++++ mythtv-0.22/libs/libmythtv/jobqueue.cpp    2009-02-11 23:09:50.000000000 +0100
+@@ -2130,7 +2130,7 @@
  
      if (runningJobCommands[key] == "mythcommflag")
      {
--        path = gContext->GetInstallPrefix() + "/bin/mythcommflag";
-+        path = gContext->GetInstallPrefix() + "/sbin/mythcommflag";
+-        path = GetInstallPrefix() + "/bin/mythcommflag";
++        path = GetInstallPrefix() + "/sbin/mythcommflag";
          command = QString("%1 -j %2 -V %3")
                            .arg(path).arg(jobID).arg(print_verbose_messages);
      }
---- mythtv/programs/mythcommflag/mythcommflag.pro~     2005-10-18 02:33:37.000000000 +0300
-+++ mythtv/programs/mythcommflag/mythcommflag.pro      2006-02-05 16:20:01.000000000 +0200
-@@ -4,7 +4,7 @@
- 
+diff -urN mythtv-0.22.orig/libs/libmythtv/previewgenerator.cpp mythtv-0.22/libs/libmythtv/previewgenerator.cpp
+--- mythtv-0.22.orig/libs/libmythtv/previewgenerator.cpp       2009-02-11 19:21:54.000000000 +0100
++++ mythtv-0.22/libs/libmythtv/previewgenerator.cpp    2009-02-11 23:10:59.000000000 +0100
+@@ -220,7 +220,7 @@
+     {
+         // This is where we fork and run mythbackend to actually make preview
+         QString command = GetInstallPrefix() +
+-                                    "/bin/mythbackend --generate-preview ";
++                                    "/sbin/mythbackend --generate-preview ";
+         command += QString("%1x%2")
+             .arg(outSize.width()).arg(outSize.height());
+         if (captureTime >= 0)
+diff -urN mythtv-0.22.orig/programs/mythbackend/mythbackend.pro mythtv-0.22/programs/mythbackend/mythbackend.pro
+--- mythtv-0.22.orig/programs/mythbackend/mythbackend.pro      2008-11-03 21:50:59.000000000 +0100
++++ mythtv-0.22/programs/mythbackend/mythbackend.pro   2009-02-11 23:09:50.000000000 +0100
+@@ -8,7 +8,7 @@
  TEMPLATE = app
  CONFIG += thread
+ TARGET = mythbackend
 -target.path = $${PREFIX}/bin
 +target.path = $${PREFIX}/sbin
  INSTALLS = target
  
- QMAKE_CLEAN += $(TARGET)
---- mythtv/programs/mythbackend/mythbackend.pro~       2006-01-29 18:32:00.000000000 +0200
-+++ mythtv/programs/mythbackend/mythbackend.pro        2006-02-05 16:20:52.000000000 +0200
-@@ -6,7 +6,7 @@
+ setting.path = $${PREFIX}/share/mythtv/
+diff -urN mythtv-0.22.orig/programs/mythcommflag/mythcommflag.pro mythtv-0.22/programs/mythcommflag/mythcommflag.pro
+--- mythtv-0.22.orig/programs/mythcommflag/mythcommflag.pro    2008-11-03 21:50:56.000000000 +0100
++++ mythtv-0.22/programs/mythcommflag/mythcommflag.pro 2009-02-11 23:09:50.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
  TEMPLATE = app
  CONFIG += thread
- TARGET = mythbackend
 -target.path = $${PREFIX}/bin
 +target.path = $${PREFIX}/sbin
  INSTALLS = target
  
  QMAKE_CLEAN += $(TARGET)
---- mythtv/programs/mythjobqueue/mythjobqueue.pro~     2005-10-18 02:33:36.000000000 +0300
-+++ mythtv/programs/mythjobqueue/mythjobqueue.pro      2006-02-05 16:21:08.000000000 +0200
-@@ -4,7 +4,7 @@
+diff -urN mythtv-0.22.orig/programs/mythjobqueue/mythjobqueue.pro mythtv-0.22/programs/mythjobqueue/mythjobqueue.pro
+--- mythtv-0.22.orig/programs/mythjobqueue/mythjobqueue.pro    2008-11-03 21:50:53.000000000 +0100
++++ mythtv-0.22/programs/mythjobqueue/mythjobqueue.pro 2009-02-11 23:09:50.000000000 +0100
+@@ -7,7 +7,7 @@
  
  TEMPLATE = app
  CONFIG += thread
@@ -42,8 +70,9 @@
  INSTALLS = target
  
  QMAKE_CLEAN += $(TARGET)
---- mythtv/programs/mythlcdserver/mythlcdserver.pro~   2005-10-18 02:33:38.000000000 +0300
-+++ mythtv/programs/mythlcdserver/mythlcdserver.pro    2006-02-05 16:21:25.000000000 +0200
+diff -urN mythtv-0.22.orig/programs/mythlcdserver/mythlcdserver.pro mythtv-0.22/programs/mythlcdserver/mythlcdserver.pro
+--- mythtv-0.22.orig/programs/mythlcdserver/mythlcdserver.pro  2008-11-03 21:50:59.000000000 +0100
++++ mythtv-0.22/programs/mythlcdserver/mythlcdserver.pro       2009-02-11 23:09:50.000000000 +0100
 @@ -5,7 +5,7 @@
  TEMPLATE = app
  CONFIG += thread