- rewriten for current version

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

diff --git a/mythtv-configure.patch b/mythtv-configure.patch
index 94f59aaf0eb8ad9bc1f3e69985950315a3b03fc9..aa93ba64bb647e8474dd2db32a832c14b1e3fad4 100644 (file)
--- a/mythtv-configure.patch
+++ b/mythtv-configure.patch
@@ -1,6 +1,7 @@
---- configure.orig     2008-11-01 18:37:08.000000000 +0100
-+++ configure  2008-11-01 18:42:53.000000000 +0100
-@@ -1279,8 +1279,8 @@
+diff -urN mythtv-0.22rc1.orig/configure mythtv-0.22rc1/configure
+--- mythtv-0.22rc1.orig/configure      2009-10-09 00:30:46.000000000 +0200
++++ mythtv-0.22rc1/configure   2009-10-17 23:10:29.000000000 +0200
+@@ -1564,8 +1564,8 @@
      arch=`arch`
      if test x"$arch" = x"ppc" -o x"$arch" = x"ppc64" ; then
          processor=`/usr/bin/hostinfo | grep "Processor type:"`

diff --git a/mythtv-sbinpath.patch b/mythtv-sbinpath.patch
index 3d24834f879ee77c40365fcef67890c1e864e0e3..cf340d11196b4f0c7149a22aec06e0b90b3577af 100644 (file)
--- a/mythtv-sbinpath.patch
+++ b/mythtv-sbinpath.patch
@@ -1,31 +1,31 @@
-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.22rc1.orig/libs/libmythdb/lcddevice.cpp mythtv-0.22rc1/libs/libmythdb/lcddevice.cpp
+--- mythtv-0.22rc1.orig/libs/libmythdb/lcddevice.cpp   2009-08-15 12:38:39.000000000 +0200
++++ mythtv-0.22rc1/libs/libmythdb/lcddevice.cpp        2009-10-18 18:57:51.000000000 +0200
+@@ -686,7 +686,7 @@
+ bool LCD::startLCDServer(void)
+ {
+     QString LOC_ERR = QString("startLCDServer: Error: ");
+-    QString command = GetInstallPrefix() + "/bin/mythlcdserver -v none&";
++    QString command = GetInstallPrefix() + "/sbin/mythlcdserver -v none&";
  
-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 @@
+ #ifndef USING_MINGW
+     pid_t child = fork();
+diff -urN mythtv-0.22rc1.orig/libs/libmythtv/jobqueue.cpp mythtv-0.22rc1/libs/libmythtv/jobqueue.cpp
+--- mythtv-0.22rc1.orig/libs/libmythtv/jobqueue.cpp    2009-10-06 04:35:33.000000000 +0200
++++ mythtv-0.22rc1/libs/libmythtv/jobqueue.cpp 2009-10-18 18:55:54.000000000 +0200
+@@ -2115,7 +2115,7 @@
  
-     if (runningJobCommands[key] == "mythcommflag")
+     if (runningJobs[jobID].command == "mythcommflag")
      {
 -        path = GetInstallPrefix() + "/bin/mythcommflag";
 +        path = GetInstallPrefix() + "/sbin/mythcommflag";
          command = QString("%1 -j %2 -V %3")
                            .arg(path).arg(jobID).arg(print_verbose_messages);
      }
-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 @@
+diff -urN mythtv-0.22rc1.orig/libs/libmythtv/previewgenerator.cpp mythtv-0.22rc1/libs/libmythtv/previewgenerator.cpp
+--- mythtv-0.22rc1.orig/libs/libmythtv/previewgenerator.cpp    2009-09-29 15:49:11.000000000 +0200
++++ mythtv-0.22rc1/libs/libmythtv/previewgenerator.cpp 2009-10-18 18:55:54.000000000 +0200
+@@ -224,7 +224,7 @@
      {
          // This is where we fork and run mythbackend to actually make preview
          QString command = GetInstallPrefix() +
@@ -34,10 +34,10 @@ diff -urN mythtv-0.22.orig/libs/libmythtv/previewgenerator.cpp mythtv-0.22/libs/
          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 @@
+diff -urN mythtv-0.22rc1.orig/programs/mythbackend/mythbackend.pro mythtv-0.22rc1/programs/mythbackend/mythbackend.pro
+--- mythtv-0.22rc1.orig/programs/mythbackend/mythbackend.pro   2009-07-17 23:08:07.000000000 +0200
++++ mythtv-0.22rc1/programs/mythbackend/mythbackend.pro        2009-10-18 18:55:54.000000000 +0200
+@@ -7,7 +7,7 @@
  TEMPLATE = app
  CONFIG += thread
  TARGET = mythbackend
@@ -46,10 +46,10 @@ diff -urN mythtv-0.22.orig/programs/mythbackend/mythbackend.pro mythtv-0.22/prog
  INSTALLS = target
  
  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 @@
+diff -urN mythtv-0.22rc1.orig/programs/mythcommflag/mythcommflag.pro mythtv-0.22rc1/programs/mythcommflag/mythcommflag.pro
+--- mythtv-0.22rc1.orig/programs/mythcommflag/mythcommflag.pro 2009-08-23 07:31:52.000000000 +0200
++++ mythtv-0.22rc1/programs/mythcommflag/mythcommflag.pro      2009-10-18 18:55:54.000000000 +0200
+@@ -3,7 +3,7 @@
  
  TEMPLATE = app
  CONFIG += thread
@@ -58,10 +58,10 @@ diff -urN mythtv-0.22.orig/programs/mythcommflag/mythcommflag.pro mythtv-0.22/pr
  INSTALLS = target
  
  QMAKE_CLEAN += $(TARGET)
-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 @@
+diff -urN mythtv-0.22rc1.orig/programs/mythjobqueue/mythjobqueue.pro mythtv-0.22rc1/programs/mythjobqueue/mythjobqueue.pro
+--- mythtv-0.22rc1.orig/programs/mythjobqueue/mythjobqueue.pro 2009-07-17 23:08:07.000000000 +0200
++++ mythtv-0.22rc1/programs/mythjobqueue/mythjobqueue.pro      2009-10-18 18:55:54.000000000 +0200
+@@ -6,7 +6,7 @@
  
  TEMPLATE = app
  CONFIG += thread
@@ -70,10 +70,10 @@ diff -urN mythtv-0.22.orig/programs/mythjobqueue/mythjobqueue.pro mythtv-0.22/pr
  INSTALLS = target
  
  QMAKE_CLEAN += $(TARGET)
-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 @@
+diff -urN mythtv-0.22rc1.orig/programs/mythlcdserver/mythlcdserver.pro mythtv-0.22rc1/programs/mythlcdserver/mythlcdserver.pro
+--- mythtv-0.22rc1.orig/programs/mythlcdserver/mythlcdserver.pro       2009-07-17 23:08:07.000000000 +0200
++++ mythtv-0.22rc1/programs/mythlcdserver/mythlcdserver.pro    2009-10-18 18:55:54.000000000 +0200
+@@ -4,7 +4,7 @@
  TEMPLATE = app
  CONFIG += thread
  TARGET = mythlcdserver