Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=9634734dfc424eef713c7414e6c5a60a57c05b14
commit 9634734dfc424eef713c7414e6c5a60a57c05b14 Author: James Buren <[email protected]> Date: Wed Jul 11 17:16:17 2012 -0500 mythtv-0.23.1-3-x86_64 * convert to systemd schema diff --git a/source/xapps-extra/mythtv/FrugalBuild b/source/xapps-extra/mythtv/FrugalBuild index 72803d3..ba6048d 100644 --- a/source/xapps-extra/mythtv/FrugalBuild +++ b/source/xapps-extra/mythtv/FrugalBuild @@ -4,36 +4,43 @@ pkgname=mythtv pkgver=0.23.1 -pkgrel=2 +pkgrel=3 pkgdesc="MythTV is a homebrew PVR project." url="http://mythtv.org/" -depends=('libqtcore' 'libqtwebkit' 'libqtsql' 'libqtscript' 'libqt3support' 'lame' 'libxvmc' 'libdvb' 'lirc' 'python>=2.7') -rodepends=('mysql') +depends=('libqtcore' 'libqtwebkit' 'libqtsql' 'libqtscript' 'libqt3support' 'lame' 'libxvmc' 'libdvb' 'lirc' 'python>=2.7' 'libxxf86vm') +rodepends=('mysql' 'qt4-plugin-mysql') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://ftp.osuosl.org/pub/mythtv/ |grep mythtv-[0-9] |Flasttarbz2" -source=(http://ftp.osuosl.org/pub/mythtv/mythtv-$pkgver.tar.bz2 \ - rc.mythtv README.Frugalware) +source=(http://ftp.frugalware.org/pub/other/sources/mythtv/$pkgname-0.23-git.tar.xz \ + rc.mythtv mythtv.service README.Frugalware fixes.patch) options=('scriptlet') +_F_sysvinit_units=(mythtv) +_F_systemd_units=(mythtv=) +Finclude systemd build() { - unset MAKEFLAGS + Fcd $pkgname-0.23-git Fpatchall Fconf --enable-xvmc \ --enable-opengl-vsync \ --enable-dvb \ - --enable-lirc + --enable-lirc \ + --disable-distcc \ + --disable-ccache \ + --extra-cxxflags=-fpermissive qmake mythtv.pro || Fdie make || Fdie Fmakeinstall INSTALL_ROOT=$Fdestdir Ffilerel database/mc.sql /usr/share/mythtv Frcd2 - # fix up broken perl bindings - Fmv $Fdestdir/usr/lib/perl5 /usr/lib - Frm $(dirname $Fdestdir) + Ffile /lib/systemd/system/mythtv.service + Fgenscriptlet } -sha1sums=('79b3842b36ff4a32569f4852e33bc61ae370b78e' \ +sha1sums=('75d9763bf221244043cceda6967feeacb8494ac4' \ 'd0ef90e5bb4d3619d7576dc6cc0bc170e309713a' \ - 'a40bd04924c584b44e7062ded3a4fef6a9eaf6c2') + '50785b575d7e72af147587ed01736e93c3a62b75' \ + 'a40bd04924c584b44e7062ded3a4fef6a9eaf6c2' \ + '75d3c85448f08a804005f2e9688e644c8ef0c365') # optimization OK diff --git a/source/xapps-extra/mythtv/fixes.patch b/source/xapps-extra/mythtv/fixes.patch new file mode 100644 index 0000000..c51a88d --- /dev/null +++ b/source/xapps-extra/mythtv/fixes.patch @@ -0,0 +1,162 @@ +diff -ur a/libs/libmyth/mythcontext.cpp b/libs/libmyth/mythcontext.cpp +--- a/libs/libmyth/mythcontext.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmyth/mythcontext.cpp 2012-07-11 13:59:01.978233942 -0500 +@@ -10,7 +10,7 @@ + #include <QMutex> + + #include <cmath> +- ++#include <unistd.h> + #include <queue> + #include <algorithm> + using namespace std; +diff -ur a/libs/libmyth/programinfoupdater.cpp b/libs/libmyth/programinfoupdater.cpp +--- a/libs/libmyth/programinfoupdater.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmyth/programinfoupdater.cpp 2012-07-11 13:59:14.917924280 -0500 +@@ -1,3 +1,4 @@ ++#include <unistd.h> + #include "programinfoupdater.h" + #include "remoteutil.h" + #include "compat.h" +diff -ur a/libs/libmythdb/httpcomms.cpp b/libs/libmythdb/httpcomms.cpp +--- a/libs/libmythdb/httpcomms.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmythdb/httpcomms.cpp 2012-07-11 13:58:45.223634881 -0500 +@@ -5,6 +5,7 @@ + #include <QRegExp> + #include <QTimer> + #include <QFile> ++#include <unistd.h> + + #include "mythverbose.h" + #include "compat.h" +diff -ur a/libs/libmythdb/lcddevice.cpp b/libs/libmythdb/lcddevice.cpp +--- a/libs/libmythdb/lcddevice.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmythdb/lcddevice.cpp 2012-07-11 13:58:45.223634881 -0500 +@@ -36,6 +36,7 @@ + #include <QTextStream> + #include <QTextCodec> + #include <QByteArray> ++#include <unistd.h> + + // MythTV headers + #include "lcddevice.h" +diff -ur a/libs/libmythdb/mythdbcon.cpp b/libs/libmythdb/mythdbcon.cpp +--- a/libs/libmythdb/mythdbcon.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmythdb/mythdbcon.cpp 2012-07-11 13:58:45.224634858 -0500 +@@ -8,6 +8,7 @@ + #include <QSqlError> + #include <QSqlField> + #include <QSqlRecord> ++#include <unistd.h> + + // MythTV + #include "compat.h" +diff -ur a/libs/libmythdb/mythsocket.cpp b/libs/libmythdb/mythsocket.cpp +--- a/libs/libmythdb/mythsocket.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmythdb/mythsocket.cpp 2012-07-11 13:58:45.225634834 -0500 +@@ -8,6 +8,7 @@ + // POSIX + #ifndef USING_MINGW + #include <sys/select.h> // for select ++#include <unistd.h> + #endif + + // Qt +diff -ur a/libs/libmythdb/mythsocketthread.cpp b/libs/libmythdb/mythsocketthread.cpp +--- a/libs/libmythdb/mythsocketthread.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmythdb/mythsocketthread.cpp 2012-07-11 13:58:45.225634834 -0500 +@@ -3,6 +3,7 @@ + + // C++ + #include <algorithm> // for min/max ++#include <unistd.h> + //using namespace std; + + #include "compat.h" +diff -ur a/libs/libmythdb/remotefile.cpp b/libs/libmythdb/remotefile.cpp +--- a/libs/libmythdb/remotefile.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmythdb/remotefile.cpp 2012-07-11 13:58:45.225634834 -0500 +@@ -2,6 +2,7 @@ + using namespace std; + + #include <QUrl> ++#include <unistd.h> + + #include "mythdb.h" + #include "remotefile.h" +diff -ur a/libs/libmythtv/audioinputoss.cpp b/libs/libmythtv/audioinputoss.cpp +--- a/libs/libmythtv/audioinputoss.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmythtv/audioinputoss.cpp 2012-07-11 13:59:44.401218758 -0500 +@@ -31,6 +31,7 @@ + #include "mythcontext.h" + #include <fcntl.h> + #include <sys/ioctl.h> ++#include <unistd.h> + + #define LOC QString("AudioInOSS: ") + #define LOC_DEV QString("AudioInOSS(%1): ").arg(m_device_name.constData()) +diff -ur a/libs/libmythtv/previewgenerator.cpp b/libs/libmythtv/previewgenerator.cpp +--- a/libs/libmythtv/previewgenerator.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmythtv/previewgenerator.cpp 2012-07-11 13:59:28.859590672 -0500 +@@ -4,6 +4,7 @@ + // POSIX headers + #include <sys/time.h> + #include <fcntl.h> ++#include <unistd.h> + + // Qt headers + #include <QFileInfo> +diff -ur a/libs/libmythupnp/upnpdevice.cpp b/libs/libmythupnp/upnpdevice.cpp +--- a/libs/libmythupnp/upnpdevice.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmythupnp/upnpdevice.cpp 2012-07-11 13:58:45.225634834 -0500 +@@ -29,6 +29,7 @@ + + #include <QFile> + #include <QTextStream> ++#include <unistd.h> + + int DeviceLocation::g_nAllocated = 0; // Debugging only + +diff -ur a/libs/libmythupnp/upnptasknotify.cpp b/libs/libmythupnp/upnptasknotify.cpp +--- a/libs/libmythupnp/upnptasknotify.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmythupnp/upnptasknotify.cpp 2012-07-11 13:58:45.225634834 -0500 +@@ -28,6 +28,7 @@ + #include <QStringList> + #include <QUuid> + #include <QFile> ++#include <unistd.h> + + // MythTV headers + #include "upnp.h" +diff -ur a/libs/libmythupnp/upnptasksearch.cpp b/libs/libmythupnp/upnptasksearch.cpp +--- a/libs/libmythupnp/upnptasksearch.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/libs/libmythupnp/upnptasksearch.cpp 2012-07-11 13:58:45.226634809 -0500 +@@ -23,6 +23,7 @@ + + #include <compat.h> + #include <stdlib.h> ++#include <unistd.h> + + #include <QStringList> + #include <QFile> +diff -ur a/programs/mythfrontend/backendconnectionmanager.cpp b/programs/mythfrontend/backendconnectionmanager.cpp +--- a/programs/mythfrontend/backendconnectionmanager.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/programs/mythfrontend/backendconnectionmanager.cpp 2012-07-11 13:59:58.456882410 -0500 +@@ -4,6 +4,7 @@ + #include <QString> + #include <QEvent> + #include <QTimer> ++#include <unistd.h> + + #include "mythcontext.h" + #include "exitcodes.h" +diff -ur a/programs/mythtranscode/transcode.cpp b/programs/mythtranscode/transcode.cpp +--- a/programs/mythtranscode/transcode.cpp 2012-07-11 12:08:38.000000000 -0500 ++++ b/programs/mythtranscode/transcode.cpp 2012-07-11 14:00:10.472594873 -0500 +@@ -1,5 +1,6 @@ + #include <fcntl.h> + #include <math.h> ++#include <unistd.h> + + using namespace std; + diff --git a/source/xapps-extra/mythtv/mythtv.service b/source/xapps-extra/mythtv/mythtv.service new file mode 100644 index 0000000..5eaeed7 --- /dev/null +++ b/source/xapps-extra/mythtv/mythtv.service @@ -0,0 +1,13 @@ +[Unit] +Description=MythTV Backend +Requires=mysqld.service +After=network.target mysqld.service + +[Service] +Type=forking +Environment=HOME=/root +ExecStart=/usr/bin/mythbackend --daemon --pidfile /var/run/mythbackend.pid --logfile /var/log/mythbackend.log +PIDFile=/var/run/mythbackend.pid + +[Install] +WantedBy=multi-user.target _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
