- updated to build snv fixes for stable mythtv-0.22

[packages/mythtv.git] / mythtv-sbinpath.patch

diff --git a/mythtv-sbinpath.patch b/mythtv-sbinpath.patch
index 9c6ec50e935177665de19251003a92ebcab62875..cf340d11196b4f0c7149a22aec06e0b90b3577af 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.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&";
  
-     if (runningJobCommands[key] == "mythcommflag")
+ #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 (runningJobs[jobID].command == "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.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() +
+-                                    "/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.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
 -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.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
- 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.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
@@ -42,9 +70,10 @@
  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
-@@ -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