[oe-commits] org.oe.dev mythtv: disable opengl since qt4 doesn't build QtOpenGL

[koen commit]

mythtv: disable opengl since qt4 doesn't build QtOpenGL

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: a1e27e3d570a7fa5e3ce79efba2b5ba43fc361e4
ViewMTN: http://monotone.openembedded.org/revision/info/a1e27e3d570a7fa5e3ce79efba2b5ba43fc361e4
Files:
1
packages/mythtv/mythtv/ifdef-qt.diff
packages/mythtv/mythtv/configure.patch
packages/mythtv/mythtv_svn.bb
Diffs:

#
# mt diff -r123f7f731e54b41ebc9e7595cb23ee61c6b48c81 -ra1e27e3d570a7fa5e3ce79efba2b5ba43fc361e4
#
#
#
# add_file "packages/mythtv/mythtv/ifdef-qt.diff"
#  content [1371fe1b67002e5b8213ebd167adfd5ffa836d71]
# 
# patch "packages/mythtv/mythtv/configure.patch"
#  from [02de2e41548d3bbaf743be687cd8a61f75f53b45]
#    to [542f276e72e4a3c7ecfe9b3a7ed53407e3901868]
# 
# patch "packages/mythtv/mythtv_svn.bb"
#  from [280a95e7fa9c7ffb591b27800bdca538df0ea3fe]
#    to [a2a9d51742e9cc4175cf4250e0d86115e9ad2c99]
#
============================================================
--- packages/mythtv/mythtv/ifdef-qt.diff	1371fe1b67002e5b8213ebd167adfd5ffa836d71
+++ packages/mythtv/mythtv/ifdef-qt.diff	1371fe1b67002e5b8213ebd167adfd5ffa836d71
@@ -0,0 +1,13 @@
+--- /tmp/mythmainwindow.cpp	2008-07-22 18:19:06.000000000 +0200
++++ mythtv/libs/libmythui/mythmainwindow.cpp	2008-07-22 18:19:26.000000000 +0200
+@@ -4,7 +4,10 @@
+ 
+ #include <algorithm>
+ 
++#ifdef USE_OPENGL_PAINTER
+ #include <QGLWidget>
++endif
++
+ #include <QApplication>
+ #include <QTimer>
+ #include <QDesktopWidget>
============================================================
--- packages/mythtv/mythtv/configure.patch	02de2e41548d3bbaf743be687cd8a61f75f53b45
+++ packages/mythtv/mythtv/configure.patch	542f276e72e4a3c7ecfe9b3a7ed53407e3901868
@@ -1,5 +1,5 @@
 --- /tmp/configure	2008-07-22 10:27:56.000000000 +0200
-+++ mythtv/configure	2008-07-22 12:50:43.000000000 +0200
++++ mythtv/configure	2008-07-22 17:53:20.000000000 +0200
 @@ -476,12 +476,13 @@
  }
  
@@ -30,6 +30,15 @@
  processor_flags=""
  tune="generic"
  
+@@ -1185,7 +1186,7 @@
+ lamemp3="yes"
+ lirc="yes"
+ mac_bundle="no"
+-opengl="yes"
++opengl="no"
+ v4l="yes"
+ x11="yes"
+ x11_include_path="/usr/X11R6/include"
 @@ -1214,7 +1215,7 @@
  # build settings
  SHFLAGS='-shared -Wl,-soname,$@'
@@ -129,3 +138,11 @@
  fi
  
  # test for distcc
+@@ -2718,6 +2723,7 @@
+ 
+ check_header GL/gl.h
+ has_library libGL || has_library libopengl32 || disable opengl
++enabled cross_compile && disable opengl
+ 
+ VENDOR_XVMC_LIBS=""
+ check_header X11/extensions/XvMClib.h
============================================================
--- packages/mythtv/mythtv_svn.bb	280a95e7fa9c7ffb591b27800bdca538df0ea3fe
+++ packages/mythtv/mythtv_svn.bb	a2a9d51742e9cc4175cf4250e0d86115e9ad2c99
@@ -5,10 +5,11 @@ PR = "r0"
 PV = "0.21+svnr${SRCREV}"
 PR = "r0"
 
-SRCREV = "17880"
+SRCREV = "17891"
 SRC_URI = "svn://svn.mythtv.org/svn/trunk;module=mythtv;proto=http"
 
 SRC_URI += "file://configure.patch;patch=1 \
+            file://ifdef-qt.diff;patch=1 \
            "
 
 S = "${WORKDIR}/mythtv"
@@ -62,11 +63,13 @@ do_configure_prepend() {
 do_configure_prepend() {
 # it's not autotools anyway, so we call ./configure directly
 	find . -name "Makefile"|xargs rm -f
+
 	./configure	--prefix=/usr		\
 			--mandir=/usr/man 	\
 			--cpu=${MYTHTV_ARCH}	\
 			--arch=${MYTHTV_ARCH} \
 			--disable-altivec	\
+		 	--disable-opengl-video \
 			--disable-strip \
 			--enable-v4l		\
 			--enable-audio-oss	\
@@ -79,6 +82,10 @@ do_configure_prepend() {
 
 	sed 's!PREFIX =.*!PREFIX = ${prefix}!;/INCLUDEPATH += $${PREFIX}\/include/d' < settings.pro > settings.pro.new
 	mv settings.pro.new settings.pro
+    for pro in ${S}/libs/*pro ${S}/libs/*/*pro; do
+		sed -i -e s:opengl::g $pro
+	done
+
 }
 
 python populate_packages_prepend () {