merge of '33277e0b1c7ca0f6953d618e9606c2a3d9e112f3'

     and 'e6a146e5939a85de15f93abfd20e4ad3ab3a9e5c'

12 files changed, 198 insertions, 100 deletions

diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass
index 24e824d06f..95ed4f538a 100644
--- a/classes/qt3x11.bbclass
+++ b/classes/qt3x11.bbclass
@@ -11,5 +11,5 @@ export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
 export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
-
-
+export OE_QMAKE_LIBS_OPENGL = "-lGLU -lGL -lXmu"
+export OE_QMAKE_LIBS_OPENGL_QT = "-lGL -lXmu"
diff --git a/classes/xorg-module.bbclass b/classes/xorg-module.bbclass
new file mode 100644
index 0000000000..135ca31c16
--- /dev/null
+++ b/classes/xorg-module.bbclass
@@ -0,0 +1,31 @@
+python populate_packages_prepend () {
+	import re, os.path
+
+	new_packages = []
+
+	def the_hook(file, pkg, pattern, format, basename):
+		new_packages.append(pkg)
+
+	do_split_packages(d, root=bb.data.expand('${libdir}/xorg/modules/drivers', d), file_regex='(.*)_drv\.so', output_pattern='xorg-driver-%s', description='xorg %s driver', extra_depends='xserver-xorg', hook=the_hook)
+
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
+
+	so_to_la_re = "\.so$"
+
+	# fish out any debug or devel files corresponding to the new packages
+	for p in new_packages:
+		packages.append("%s-dbg" % p)
+		packages.append("%s-dev" % p)
+
+		files = bb.data.getVar("FILES_%s" % p, d).split()
+		dev_files = []
+		dbg_files = []
+		for f in files:
+			dev_files.append(re.sub(so_to_la_re, ".la", f))
+			(dir, file) = os.path.split(f)
+			dbg_files.append(os.path.join(dir, ".debug", file))
+		bb.data.setVar("FILES_%s-dbg" % p, " ".join(dbg_files), d)
+		bb.data.setVar("FILES_%s-dev" % p, " ".join(dev_files), d)
+	
+	bb.data.setVar('PACKAGES', ' '.join(packages), d)
+}
diff --git a/packages/openchrome/.mtn2git_empty b/packages/openchrome/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openchrome/.mtn2git_empty
diff --git a/packages/openchrome/configure.patch b/packages/openchrome/configure.patch
new file mode 100644
index 0000000000..a2f236470d
--- /dev/null
+++ b/packages/openchrome/configure.patch
@@ -0,0 +1,42 @@
+--- trunk/configure.ac	2007-01-16 16:58:44.000000000 +0000
++++ trunk/configure.ac	2007-01-16 18:09:26.000000000 +0000
+@@ -69,11 +69,11 @@
+ AC_HEADER_STDC
+ 
+ if test "$DRI" != no; then
+-        AC_CHECK_FILE([${sdkdir}/dri.h],
++        AC_CHECK_BUILD_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+-        AC_CHECK_FILE([${sdkdir}/sarea.h],
++        AC_CHECK_BUILD_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+-        AC_CHECK_FILE([${sdkdir}/dristruct.h],
++        AC_CHECK_BUILD_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
+ fi
+ 
+@@ -113,7 +113,7 @@
+ 
+ AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
+ 
+-AC_CHECK_FILE([${sdkdir}/xf86Module.h],
++AC_CHECK_BUILD_FILE([${sdkdir}/xf86Module.h],
+               [have_xf86Module_h="yes"], [have_xf86Module_h="no"])
+ 
+ # Check the ABI_VIDEODRV_VERSION
+--- /dev/null	2003-09-15 14:40:47.000000000 +0100
++++ trunk/m4/check-build.m4	2007-01-16 18:07:37.000000000 +0000
+@@ -0,0 +1,13 @@
++# Check for the existence of FILE.
++AC_DEFUN([AC_CHECK_BUILD_FILE],
++[AS_VAR_PUSHDEF([ac_File], [ac_cv_file_$1])dnl
++AC_CACHE_CHECK([for $1], ac_File,
++[if test -r "$1"; then
++  AS_VAR_SET(ac_File, yes)
++else
++  AS_VAR_SET(ac_File, no)
++fi])
++AS_IF([test AS_VAR_GET(ac_File) = yes], [$2], [$3])[]dnl
++AS_VAR_POPDEF([ac_File])dnl
++])# AC_CHECK_BUILD_FILE
++
diff --git a/packages/openchrome/openchrome_svn.bb b/packages/openchrome/openchrome_svn.bb
new file mode 100644
index 0000000000..d5de8afce9
--- /dev/null
+++ b/packages/openchrome/openchrome_svn.bb
@@ -0,0 +1,20 @@
+SRC_URI = "svn://svn.openchrome.org/svn;module=trunk;proto=http \
+	file://configure.patch;patch=1"
+S = "${WORKDIR}/trunk"
+
+PACKAGES = "libviaXvMC libviaXvMCPro libviaXvMC-dev libviaXvMCPro-dev libviaXvMC-dbg libviaXvMCPro-dbg ${PN}-doc"
+
+FILES_libviaXvMC = "${libdir}/libviaXvMC.so.*"
+FILES_libviaXvMCPro = "${libdir}/libviaXvMCPro.so.*"
+FILES_libviaXvMC-dev = "${libdir}/libviaXvMC.so ${libdir}/libviaXvMC.la"
+FILES_libviaXvMCPro-dev = "${libdir}/libviaXvMCPro.so ${libdir}/libviaXvMCPro.la"
+FILES_libviaXvMC-dbg = "${libdir}/.debug/libviaXvMC.so.*"
+FILES_libviaXvMCPro-dbg = "${libdir}/.debug/libviaXvMCPro.so.*"
+
+DEPENDS = "xserver-xorg"
+
+inherit autotools xorg-module
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/qmake/files/linux-oe-qmake.conf b/packages/qmake/files/linux-oe-qmake.conf
index 287dbeba19..205b693fda 100644
--- a/packages/qmake/files/linux-oe-qmake.conf
+++ b/packages/qmake/files/linux-oe-qmake.conf
@@ -56,7 +56,8 @@ QMAKE_LIBS_X11		= $(OE_QMAKE_LIBS_X11)
 QMAKE_LIBS_X11SM	= 
 QMAKE_LIBS_QT		= -l$(OE_QMAKE_LIBS_QT)
 QMAKE_LIBS_QT_THREAD    = -l$(OE_QMAKE_LIBS_QT)-mt
-QMAKE_LIBS_QT_OPENGL	= -lqgl
+QMAKE_LIBS_OPENGL	= $(OE_QMAKE_LIBS_OPENGL)
+QMAKE_LIBS_OPENGL_QT	= $(OE_QMAKE_LIBS_OPENGL_QT)
 QMAKE_LIBS_THREAD       = -lpthread
 
 QMAKE_MOC		= $(OE_QMAKE_MOC)
diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb
index a5c164c08a..29f736dea1 100644
--- a/packages/qmake/qmake-native_1.07a.bb
+++ b/packages/qmake/qmake-native_1.07a.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
-PR = "r3"
+PR = "r4"
 
 QTEVER = "qt-embedded-free-3.3.5"
 
diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb
index 2dcabe3261..306891e9af 100644
--- a/packages/qmake/qmake2-native_2.00a.bb
+++ b/packages/qmake/qmake2-native_2.00a.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
-PR = "r1"
+PR = "r2"
 
 QTVER = "qt-x11-opensource-src-4.1.1"
 
diff --git a/packages/qt/qt-x11-free-common.inc b/packages/qt/qt-x11-free-common.inc
new file mode 100644
index 0000000000..b15dc270ee
--- /dev/null
+++ b/packages/qt/qt-x11-free-common.inc
@@ -0,0 +1,86 @@
+DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+HOMEPAGE = "http://www.trolltech.com"
+
+S = "${WORKDIR}/qt-x11-free-${PV}"
+
+inherit qmake-base qt3x11
+
+export QTDIR = "${S}"
+STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
+ARCH_i686 = "x86"
+EXTRA_OEMAKE = "-e"
+
+QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \
+                   -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose"
+
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \
+             INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
+             QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+             AR="${TARGET_PREFIX}ar cqs" \
+             MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"'
+
+do_configure() {
+	echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \
+		-L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
+	# force regenerate
+	rm -f src/qtmain.pro
+	cat Makefile >makefile
+	find . -name "Makefile"|xargs rm -f
+	(cd src && qmake -spec ${QMAKESPEC} )
+	(cd plugins/src && qmake -spec ${QMAKESPEC} )
+	(cd tools && qmake -spec ${QMAKESPEC} )
+	(cd tools/qvfb && qmake -spec ${QMAKESPEC} )
+}
+
+do_compile() {
+	unset CFLAGS
+	unset CXXFLAGS
+	oe_runmake -C src ${EXTRA_ENV}
+	oe_runmake -C plugins/src ${EXTRA_ENV}
+	oe_runmake -C tools ${EXTRA_ENV}
+	oe_runmake -C tools/qvfb ${EXTRA_ENV}
+}
+
+do_stage() {
+	install -d ${STAGING_QT_DIR}/bin
+	ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc
+	ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic
+	ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake
+	install -d ${STAGING_QT_DIR}/lib
+	oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
+	install -d ${STAGING_QT_DIR}/include/private
+	for f in include/*.h
+	do
+		install -m 0644 $f ${STAGING_QT_DIR}/include/
+	done
+	for f in include/private/*.h
+	do
+		install -m 0644 $f ${STAGING_QT_DIR}/include/private
+	done
+	for f in lib/*.prl
+	do
+		install -m 0644 $f ${STAGING_QT_DIR}/lib
+	done
+}
+
+do_install() {
+	install -d ${D}${libdir}/
+	oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
+	install -d ${D}${bindir}/
+	install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir}
+	install -d ${D}${prefix}/plugins/
+	cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/
+}
+
+PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \
+             qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig"
+FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats"
+FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers"
+FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer"
+FILES_qt-x11-designer = "${bindir}/designer"
+FILES_qt-x11-assistant = "${bindir}/assistant"
+FILES_qt-x11-qvfb = "${bindir}/qvfb"
+FILES_qt-x11-qtconfig = "${bindir}/qtconfig"
diff --git a/packages/qt/qt-x11-free/configure.patch b/packages/qt/qt-x11-free/configure.patch
index a56c621abb..9d6c1e8ef7 100644
--- a/packages/qt/qt-x11-free/configure.patch
+++ b/packages/qt/qt-x11-free/configure.patch
@@ -5,15 +5,6 @@
 
 --- qt-x11-free-3.3.2/configure~configure.patch
 +++ qt-x11-free-3.3.2/configure
-@@ -219,7 +219,7 @@
- # licensed modules depend on type of commercial license
- MODULES="styles tools kernel widgets dialogs iconview workspace"
- [ "$PLATFORM_QWS" = "yes" ] && [ "$Products" = "qt-professional" ] && MODULES="$MODULES network"
--[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml opengl sql"
-+[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml sql"
- CFG_MODULES_AVAILABLE=$MODULES
- QMAKE_VARS="$QMAKE_VARS \"QT_PRODUCT=$Products\""
- QMAKE_VARS="$QMAKE_VARS \"styles += windows motif mac platinum sgi cde motifplus\""
 @@ -1754,21 +1754,14 @@
  	    CFG_FREETYPE=yes
  	fi
diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb
index 5a1c014e6d..d5df55cbb4 100644
--- a/packages/qt/qt-x11-free_3.3.6.bb
+++ b/packages/qt/qt-x11-free_3.3.6.bb
@@ -1,93 +1,10 @@
-DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "GPL QPL"
-HOMEPAGE = "http://www.trolltech.com"
-DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql"
+DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa"
 PROVIDES = "qt3x11"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
 	   file://no-examples.patch;patch=1 \
            file://gcc4_1-HACK.patch;patch=1"
-S = "${WORKDIR}/qt-x11-free-${PV}"
 
-inherit qmake-base qt3x11
-
-export QTDIR = "${S}"
-STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
-ARCH_i686 = "x86"
-EXTRA_OEMAKE = "-e"
-
-QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \
-                   -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose"
-
-EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \
-             INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
-             QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
-             AR="${TARGET_PREFIX}ar cqs" \
-             MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"'
-
-do_configure() {
-	echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \
-		-L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
-	# force regenerate
-	rm -f src/qtmain.pro
-	cat Makefile >makefile
-	find . -name "Makefile"|xargs rm -f
-	(cd src && qmake -spec ${QMAKESPEC} )
-	(cd plugins/src && qmake -spec ${QMAKESPEC} )
-	(cd tools && qmake -spec ${QMAKESPEC} )
-	(cd tools/qvfb && qmake -spec ${QMAKESPEC} )
-}
-
-do_compile() {
-	unset CFLAGS
-	unset CXXFLAGS
-	oe_runmake -C src ${EXTRA_ENV}
-	oe_runmake -C plugins/src ${EXTRA_ENV}
-	oe_runmake -C tools ${EXTRA_ENV}
-	oe_runmake -C tools/qvfb ${EXTRA_ENV}
-}
-
-do_stage() {
-	install -d ${STAGING_QT_DIR}/bin
-	ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc
-	ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic
-	ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake
-	install -d ${STAGING_QT_DIR}/lib
-	oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
-	install -d ${STAGING_QT_DIR}/include/private
-	for f in include/*.h
-	do
-		install -m 0644 $f ${STAGING_QT_DIR}/include/
-	done
-	for f in include/private/*.h
-	do
-		install -m 0644 $f ${STAGING_QT_DIR}/include/private
-	done
-	for f in lib/*.prl
-	do
-		install -m 0644 $f ${STAGING_QT_DIR}/lib
-	done
-}
-
-do_install() {
-	install -d ${D}${libdir}/
-	oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
-	install -d ${D}${bindir}/
-	install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir}
-	install -d ${D}${prefix}/plugins/
-	cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/
-}
-
-PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \
-             qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig"
-FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats"
-FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers"
-FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer"
-FILES_qt-x11-designer = "${bindir}/designer"
-FILES_qt-x11-assistant = "${bindir}/assistant"
-FILES_qt-x11-qvfb = "${bindir}/qvfb"
-FILES_qt-x11-qtconfig = "${bindir}/qtconfig"
+require qt-x11-free-common.inc
diff --git a/packages/qt/qt-x11-free_3.3.7.bb b/packages/qt/qt-x11-free_3.3.7.bb
new file mode 100644
index 0000000000..3c8533e608
--- /dev/null
+++ b/packages/qt/qt-x11-free_3.3.7.bb
@@ -0,0 +1,10 @@
+DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa"
+PROVIDES = "qt3x11"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+	   file://configure.patch;patch=1 \
+	   file://no-examples.patch;patch=1 \
+           file://gcc4_1-HACK.patch;patch=1"
+
+require qt-x11-free-common.inc