From 0d01d62a8ac09669b671c5a13abcac98eb73c899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
Date: Thu, 19 Feb 2009 18:25:55 +0100
Subject: qt4: enable phonon support for qt4-x11-free and qt-embedded

---
 packages/qt4/qt-embedded_4.4.3.bb  | 6 +++---
 packages/qt4/qt4-x11-free_4.4.3.bb | 2 +-
 packages/qt4/qt_configuration.inc  | 4 ++--
 packages/qt4/qt_depends.inc        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'packages')

diff --git a/packages/qt4/qt-embedded_4.4.3.bb b/packages/qt4/qt-embedded_4.4.3.bb
index a407dd58ca..47d65da57d 100644
--- a/packages/qt4/qt-embedded_4.4.3.bb
+++ b/packages/qt4/qt-embedded_4.4.3.bb
@@ -3,7 +3,7 @@ require qtopia-core.inc
 PROVIDES += "qtopia-core"
 RPROVIDES_${PN} = "qtopia-core"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
            file://qconfig-oe.h \
@@ -23,8 +23,8 @@ SRC_URI += " \
 "
 
 QT_CONFIG_FLAGS += " \
-    -no-phonon -webkit \
-	-DQT_KEYPAD_NAVIGATION \
+    -webkit \
+    -DQT_KEYPAD_NAVIGATION \
  "
 
 QT_BASE_NAME = "qt-embedded"
diff --git a/packages/qt4/qt4-x11-free_4.4.3.bb b/packages/qt4/qt4-x11-free_4.4.3.bb
index 1d5f924bc0..987a489e97 100644
--- a/packages/qt4/qt4-x11-free_4.4.3.bb
+++ b/packages/qt4/qt4-x11-free_4.4.3.bb
@@ -1,5 +1,5 @@
 require qt4-x11-free.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI += " \
            file://0002-fix-resinit-declaration.patch;patch=1 \
diff --git a/packages/qt4/qt_configuration.inc b/packages/qt4/qt_configuration.inc
index 252a80a408..8fd5262397 100644
--- a/packages/qt4/qt_configuration.inc
+++ b/packages/qt4/qt_configuration.inc
@@ -5,8 +5,8 @@ QT_ENDIAN = "${@qt_endian(d)}"
 QT_CONFIG_FLAGS += "-release -no-cups -no-accessibility -reduce-relocations \
                     -shared -no-nas-sound -no-sm -no-nis \
                     -qt-gif -system-libjpeg -system-libpng -system-zlib \
-                     -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
-                    -no-pch -qdbus -stl -glib"
+                    -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
+                    -no-pch -qdbus -stl -glib -phonon"
 
 EXTRA_OEMAKE = "-e"
 
diff --git a/packages/qt4/qt_depends.inc b/packages/qt4/qt_depends.inc
index 289b625d0e..26cffa224f 100644
--- a/packages/qt4/qt_depends.inc
+++ b/packages/qt4/qt_depends.inc
@@ -1,3 +1,3 @@
 inherit pkgconfig qmake_base
 
-DEPENDS += " uicmoc4-native qmake2-native freetype jpeg libpng zlib dbus openssl glib-2.0"
+DEPENDS += " uicmoc4-native qmake2-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base"
-- 
cgit v1.2.3