Re: building mythtv 0.24 on el5, status and instructions

On 22 November 2010 23:38, Andy Burns <[email protected]> wrote:

> fails at the packaging step

Here's my patches so far (not as binary attachment this time!)

==============================================================
--- mythtv.spec.org	2010-11-22 22:27:39.000000000 +0000
+++ mythtv.spec	2010-11-22 23:47:22.000000000 +0000
@@ -61,6 +61,7 @@
 Source401: mythweb.conf-0.21
 Patch100: mythtv-%{version}-svnfixes.patch
 Patch101: mythtv-0.22-ostreaming.patch
+Patch102: mythv4l2.patch
 Patch200: mythplugins-%{version}-svnfixes.patch
 Patch300: mythplugins-0.19-gcc4.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -68,6 +69,7 @@
 BuildRequires: libXxf86vm-devel, libXmu-devel
 BuildRequires: %{_includedir}/freetype2
 BuildRequires: qt4-devel >= 4.5.0, mysql-devel
+BuildRequires: sqlite-devel >= 3.6.20
 %{?with_pulseaudio:BuildRequires: pulseaudio-libs-devel >= 0.9.7}
 BuildRequires: alsa-lib-devel, arts-devel
 BuildRequires: jack-audio-connection-kit-devel
@@ -413,6 +415,7 @@
 cd mythtv-%{version}
 %patch100 -p1
 %patch101 -p1 -b .ostreaming
+%patch102 -p1

 cp -a %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{SOURCE105} .
 for file in mythbackend.init \
@@ -968,6 +971,9 @@
 /var/www/html/mythweb

 %changelog
+* Mon Nov 22 2010 Andy Burns <[email protected]> - 0.24-251ab
+- V4L and sqlite fixes to build on centos5
+
 * Tue Nov 16 2010 Axel Thimm <[email protected]> - 0.24-250
 - Update to latest svn fixes (27235).
==============================================================
--- mythtv-0.24/libs/libmythtv/analogsignalmonitor.cpp.org	2010-11-21
19:10:53.000000000 +0000
+++ mythtv-0.24/libs/libmythtv/analogsignalmonitor.cpp	2010-11-21
19:11:13.000000000 +0000
@@ -6,6 +6,7 @@
 #include <sys/ioctl.h>
 #include <poll.h>

+#include <linux/videodev2.h>
 #include <linux/videodev.h>

 #include "mythverbose.h"
--- mythtv-0.24/libs/libmythtv/libmythtv.pro.org	2010-11-21
19:11:29.000000000 +0000
+++ mythtv-0.24/libs/libmythtv/libmythtv.pro	2010-11-21 19:12:11.000000000 +0000
@@ -471,7 +471,7 @@
     using_v4l {
         HEADERS += v4lchannel.h                analogsignalmonitor.h
         SOURCES += v4lchannel.cpp              analogsignalmonitor.cpp
-
+	INCLUDEPATH += /usr/include/v4l
         DEFINES += USING_V4L
     }
==============================================================
--- /usr/include/v4l/linux/videodev2.h	2010-03-28 03:09:47.000000000 +0100
+++ /usr/include/v4l/linux/videodev2.h.new	2010-11-21 19:18:26.000000000 +0000
@@ -58,10 +58,11 @@

 #ifdef __KERNEL__
 #include <linux/time.h>     /* need struct timeval */
+#include <linux/compiler.h>
 #else
 #include <sys/time.h>
+#define __user
 #endif
-#include <linux/compiler.h>
 #include <linux/ioctl.h>
 #include <linux/types.h>
===============================================================