---
classes/glx-use-tls.bbclass | 7 +++++++
conf/distro/include/shr-om-gta01.conf | 3 +--
conf/distro/include/shr-om-gta02.conf | 2 +-
conf/machine/om-gta02.conf | 1 -
recipes/clutter/clutter.inc | 2 +-
recipes/fltk/fltk_1.1.4.bb | 4 ++--
recipes/libsdl/libsdl.inc | 4 +++-
recipes/mesa/freeglut_2.4.0.bb | 4 +++-
recipes/mesa/mesa-common.inc | 15 +++++++++++----
recipes/mesa/mesa-dri_git.bb | 13 +++----------
recipes/mesa/mesa-tls.inc | 6 ------
recipes/opencv/artoolkit_2.72.1.bb | 4 +++-
recipes/qt/qt-x11-free_3.3.6.bb | 4 ++--
recipes/qt/qt-x11-free_3.3.7.bb | 4 ++--
recipes/quake/quetoo_0.6.1.bb | 4 +++-
recipes/xorg-app/xdriinfo_1.0.1.bb | 2 +-
recipes/xorg-app/xdriinfo_1.0.2.bb | 2 +-
recipes/xorg-xserver/xorg-xserver-common.inc | 2 +-
recipes/xorg-xserver/xserver-xorg_1.6.3.bb | 2 +-
recipes/xorg-xserver/xserver-xorg_1.6.99.901.bb | 2 +-
recipes/xorg-xserver/xserver-xorg_1.6.99.902.bb | 2 +-
recipes/xorg-xserver/xserver-xorg_1.6.99.903.bb | 2 +-
recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb | 2 +-
recipes/xorg-xserver/xserver-xorg_1.7.0.bb | 2 +-
recipes/xscreensaver/xscreensaver.inc | 2 +-
25 files changed, 52 insertions(+), 45 deletions(-)
create mode 100644 classes/glx-use-tls.bbclass
delete mode 100644 recipes/mesa/mesa-tls.inc
diff --git a/classes/glx-use-tls.bbclass b/classes/glx-use-tls.bbclass
new file mode 100644
index 0000000..7530872
--- /dev/null
+++ b/classes/glx-use-tls.bbclass
@@ -0,0 +1,7 @@
+def get_tls_setting(bb, d):
+ # until we have no prober TLS support in uclibc disable it
+ if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
+ return ""
+ return "--enable-glx-tls"
+
+EXTRA_OECONF += "$...@get_tls_setting(bb, d)}"
diff --git a/conf/distro/include/shr-om-gta01.conf
b/conf/distro/include/shr-om-gta01.conf
index 4aff7e4..473cdd6 100644
--- a/conf/distro/include/shr-om-gta01.conf
+++ b/conf/distro/include/shr-om-gta01.conf
@@ -2,8 +2,7 @@
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
PREFERRED_PROVIDER_xf86-video-fbdev = "xf86-video-fbdev"
-PREFERRED_PROVIDER_mesa = "mesa"
-PREFERRED_PROVIDER_drm = "libdrm"
+PREFERRED_PROVIDER_virtual/libgl = "mesa"
XSERVER = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard"
diff --git a/conf/distro/include/shr-om-gta02.conf
b/conf/distro/include/shr-om-gta02.conf
index 78d8e24..070301e 100644
--- a/conf/distro/include/shr-om-gta02.conf
+++ b/conf/distro/include/shr-om-gta02.conf
@@ -2,7 +2,7 @@
PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo"
-PREFERRED_PROVIDER_mesa = "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
MACHINE_DRI_MODULES = "glamo"
XSERVER = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard
xf86-input-mouse"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index ff7e8c0..ca45ddf 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -8,7 +8,6 @@ TARGET_ARCH = "arm"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-stable"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive-glamo"
-PREFERRED_PROVIDER_mesa ?= "mesa-dri"
UBOOT_ENTRYPOINT = "30008000"
MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone
wifi vfat ext2"
diff --git a/recipes/clutter/clutter.inc b/recipes/clutter/clutter.inc
index 60c7a48..bbdaeb4 100644
--- a/recipes/clutter/clutter.inc
+++ b/recipes/clutter/clutter.inc
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE =
"(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qe
STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+"
BASE_CONF = "--disable-gtk-doc $...@get_clutter_fpu_setting(bb, d)}"
-DEPENDS = "${STDDEPENDS} mesa"
+DEPENDS = "${STDDEPENDS} virtual/libgl"
EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib"
diff --git a/recipes/fltk/fltk_1.1.4.bb b/recipes/fltk/fltk_1.1.4.bb
index ae7c0e1..d9c8c00 100644
--- a/recipes/fltk/fltk_1.1.4.bb
+++ b/recipes/fltk/fltk_1.1.4.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.fltk.org";
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPL"
-DEPENDS = "jpeg libpng mesa zlib"
-PR = "r1"
+DEPENDS = "jpeg libpng virtual/libgl zlib"
+PR = "r2"
SRC_URI =
"ftp://ftp-fourier.ujf-grenoble.fr/xcas/devel/sources/fltk-${PV}-device.tar.gz";
diff --git a/recipes/libsdl/libsdl.inc b/recipes/libsdl/libsdl.inc
index 5653925..0db0be8 100644
--- a/recipes/libsdl/libsdl.inc
+++ b/recipes/libsdl/libsdl.inc
@@ -1,11 +1,13 @@
DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
+DEPENDS = "alsa-lib virtual/libgl virtual/libx11 libxext"
DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext"
PROVIDES = "virtual/libsdl"
LICENSE = "LGPL"
+PR = "r1"
+
SRC_URI = "\
http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://extra-keys.patch;patch=1 \
diff --git a/recipes/mesa/freeglut_2.4.0.bb b/recipes/mesa/freeglut_2.4.0.bb
index a244fb2..5826510 100644
--- a/recipes/mesa/freeglut_2.4.0.bb
+++ b/recipes/mesa/freeglut_2.4.0.bb
@@ -1,7 +1,9 @@
DESCRIPTION = "freeglut is a completely OpenSourced alternative to the OpenGL
Utility Toolkit (GLUT) library. "
LICENSE = "MIT/X11"
-DEPENDS = "mesa"
+DEPENDS = "virtual/libgl"
+
+PR = "r1"
SRC_URI =
"http://dfn.dl.sourceforge.net/sourceforge/freeglut/freeglut-${PV}.tar.gz";
diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc
index bc0af63..16f30dc 100644
--- a/recipes/mesa/mesa-common.inc
+++ b/recipes/mesa/mesa-common.inc
@@ -8,7 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 "
S = "${WORKDIR}/Mesa-${PV}"
-PROVIDES = "virtual/libgl mesa"
+PROVIDES = "virtual/libgl"
inherit autotools pkgconfig
@@ -17,8 +17,10 @@ EXTRA_OECONF = "--enable-glu \
--disable-glut \
"
-require mesa-tls.inc
-EXTRA_OECONF += "$...@get_tls_setting(bb, d)} "
+inherit glx-use-tls
+
+# Package contents vary according to ${MACHINE_DRI_MODULES}.
+PACKAGE_ARCH = "${MACHINE}"
PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
FILES_libgl = "${libdir}/libGL.so.*"
@@ -36,4 +38,9 @@ do_stage() {
cp -pPr ${S}/include/GL/internal* ${STAGING_INCDIR}/GL/
}
-
+do_install_append () {
+ install -d ${D}/${bindir}
+ for i in glxdemo glxgears glxheads glxinfo; do
+ install -m 0755 ${S}/progs/xdemos/${i} ${D}/${bindir}
+ done
+}
diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb
index a883008..557713c 100644
--- a/recipes/mesa/mesa-dri_git.bb
+++ b/recipes/mesa/mesa-dri_git.bb
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage
libxfixes"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
PV = "7.5.1+gitr${SRCREV}"
-PR = "r2"
+PR = "r3"
PE = "1"
DEFAULT_PREFERENCE = "-1"
@@ -14,20 +14,13 @@ DEFAULT_PREFERENCE_om-gta02 = "2"
SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
SRC_URI_om-gta02 = "git://git.bitwiz.org.uk/mesa.git;protocol=git;branch=glamo"
-
S = "${WORKDIR}/git"
-PACKAGES =+ " ${PN}-xprogs "
-
-do_install_append () {
- install -d ${D}/usr/bin
- install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo}
${D}/usr/bin/
-}
+PACKAGES =+ " mesa-utils "
FILES_${PN} += "${libdir}/dri/*.so"
FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads
${bindir}/glxinfo"
+FILES_mesa-utils = "${bindir}/*"
EXTRA_OECONF += "--with-driver=dri
--with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
EXTRA_OECONF_append_om-gta02 = " --disable-glx-tls --disable-gallium-intel "
-
diff --git a/recipes/mesa/mesa-tls.inc b/recipes/mesa/mesa-tls.inc
deleted file mode 100644
index 1472aa7..0000000
--- a/recipes/mesa/mesa-tls.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-def get_tls_setting(bb, d):
- # until we have no prober TLS support in uclibc disable it
- if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
- return ""
- return "--enable-glx-tls"
diff --git a/recipes/opencv/artoolkit_2.72.1.bb
b/recipes/opencv/artoolkit_2.72.1.bb
index 2dfbc42..e1228a6 100644
--- a/recipes/opencv/artoolkit_2.72.1.bb
+++ b/recipes/opencv/artoolkit_2.72.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "ARToolKit is a software library that allows for the creation of
augmented reality applications. "
LICENSE = "GPL/ARToolkit"
-DEPENDS = "libxi gstreamer virtual/libx11 freeglut mesa"
+DEPENDS = "libxi gstreamer virtual/libx11 freeglut virtual/libgl"
SRC_URI = "${SOURCEFORGE_MIRROR}/artoolkit/ARToolKit-${PV}.tgz \
file://configure.diff;patch=1 \
@@ -9,6 +9,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/artoolkit/ARToolKit-${PV}.tgz \
S = "${WORKDIR}/ARToolKit"
+PR = "r1"
+
LDFLAGS_append = " `pkg-config --libs gstreamer-0.10` -lpthread -lglut -lGLU
-lGL -lXi -lX11 -lm"
do_configure() {
diff --git a/recipes/qt/qt-x11-free_3.3.6.bb b/recipes/qt/qt-x11-free_3.3.6.bb
index 719215c..f5ff6b0 100644
--- a/recipes/qt/qt-x11-free_3.3.6.bb
+++ b/recipes/qt/qt-x11-free_3.3.6.bb
@@ -1,6 +1,6 @@
-DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender
libxrandr libxcursor mysql mesa"
+DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender
libxrandr libxcursor mysql virtual/libgl"
PROVIDES = "qt3x11"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
file://configure.patch;patch=1 \
diff --git a/recipes/qt/qt-x11-free_3.3.7.bb b/recipes/qt/qt-x11-free_3.3.7.bb
index 7e430c8..e218073 100644
--- a/recipes/qt/qt-x11-free_3.3.7.bb
+++ b/recipes/qt/qt-x11-free_3.3.7.bb
@@ -1,6 +1,6 @@
-DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu xft libxext
libxrender libxrandr libxcursor mysql mesa"
+DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu xft libxext
libxrender libxrandr libxcursor mysql virtual/libgl"
PROVIDES = "qt3x11"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
file://configure.patch;patch=1 \
diff --git a/recipes/quake/quetoo_0.6.1.bb b/recipes/quake/quetoo_0.6.1.bb
index 33a7075..38a3d90 100644
--- a/recipes/quake/quetoo_0.6.1.bb
+++ b/recipes/quake/quetoo_0.6.1.bb
@@ -1,9 +1,11 @@
DESCRIPTION = "Initially a fork of the Quake2Forge project, this engine aims
to provide security and performance enhancements."
LICENSE = "GPLv2"
-DEPENDS = "libsdl-x11 zlib mesa"
+DEPENDS = "libsdl-x11 zlib virtual/libgl"
SRC_URI = "http://tastyspleen.net/~jdolan/quetoo-${PV}.tar.bz2";
+PR = "r1"
+
inherit autotools pkgconfig
diff --git a/recipes/xorg-app/xdriinfo_1.0.1.bb
b/recipes/xorg-app/xdriinfo_1.0.1.bb
index 42541cd..7198a79 100644
--- a/recipes/xorg-app/xdriinfo_1.0.1.bb
+++ b/recipes/xorg-app/xdriinfo_1.0.1.bb
@@ -1,5 +1,5 @@
require xorg-app-common.inc
PE = "1"
-DEPENDS += " virtual/libx11 glproto mesa"
+DEPENDS += " virtual/libx11 glproto virtual/libgl"
diff --git a/recipes/xorg-app/xdriinfo_1.0.2.bb
b/recipes/xorg-app/xdriinfo_1.0.2.bb
index 3d1c9e9..b995e91 100644
--- a/recipes/xorg-app/xdriinfo_1.0.2.bb
+++ b/recipes/xorg-app/xdriinfo_1.0.2.bb
@@ -1,4 +1,4 @@
require xorg-app-common.inc
DESCRIPTION = "query configuration information of DRI drivers"
-DEPENDS += " virtual/libx11 glproto mesa"
+DEPENDS += " virtual/libx11 glproto virtual/libgl"
PE = "1"
diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc
b/recipes/xorg-xserver/xorg-xserver-common.inc
index 5b35ce4..5a1598c 100644
--- a/recipes/xorg-xserver/xorg-xserver-common.inc
+++ b/recipes/xorg-xserver/xorg-xserver-common.inc
@@ -11,7 +11,7 @@ scrnsaverproto bigreqsproto resourceproto fontsproto
inputproto \
xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \
resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
-libxkbui libxxf86misc libxi libdmx libxtst libxres mesa libxcalibrate \
+libxkbui libxxf86misc libxi libdmx libxtst libxres virtual/libgl libxcalibrate
\
libxv"
RECOMMENDS_${PN} = "hal libpciaccess"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.3.bb
b/recipes/xorg-xserver/xserver-xorg_1.6.3.bb
index c635980..5be86c2 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.6.3.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.6.3.bb
@@ -1,7 +1,7 @@
require xorg-xserver-common.inc
DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto mesa"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto"
PE = "2"
PR = "r4.74"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.99.901.bb
b/recipes/xorg-xserver/xserver-xorg_1.6.99.901.bb
index e6f05db..f7c62fc 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.6.99.901.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.6.99.901.bb
@@ -1,7 +1,7 @@
require xorg-xserver-common.inc
DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto mesa
xorg-minimal-fonts"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
PV = "1.6.99.901"
PE = "2"
PR = "r1.75"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.99.902.bb
b/recipes/xorg-xserver/xserver-xorg_1.6.99.902.bb
index fa33d1d..8c375e6 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.6.99.902.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.6.99.902.bb
@@ -1,7 +1,7 @@
require xorg-xserver-common.inc
DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto mesa
xorg-minimal-fonts"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
PE = "2"
PR = "r1.75"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.99.903.bb
b/recipes/xorg-xserver/xserver-xorg_1.6.99.903.bb
index 3ad989f..83721d4 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.6.99.903.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.6.99.903.bb
@@ -1,7 +1,7 @@
require xorg-xserver-common.inc
DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto mesa
xorg-minimal-fonts"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
PE = "2"
PR = "r0"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb
b/recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb
index 58b3614..427b01c 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb
@@ -1,7 +1,7 @@
require xorg-xserver-common.inc
DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto mesa
xorg-minimal-fonts"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
PE = "2"
PR = "r1"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.0.bb
b/recipes/xorg-xserver/xserver-xorg_1.7.0.bb
index 58b3614..427b01c 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.0.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.0.bb
@@ -1,7 +1,7 @@
require xorg-xserver-common.inc
DESCRIPTION = "the X.Org X server"
-DEPENDS += "pixman libpciaccess openssl dri2proto glproto mesa
xorg-minimal-fonts"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
PE = "2"
PR = "r1"
diff --git a/recipes/xscreensaver/xscreensaver.inc
b/recipes/xscreensaver/xscreensaver.inc
index a4925ac..96416db 100644
--- a/recipes/xscreensaver/xscreensaver.inc
+++ b/recipes/xscreensaver/xscreensaver.inc
@@ -6,7 +6,7 @@ DESCRIPTION = "*The* screensaver package for X11"
HOMEPAGE = "http://www.jwz.org/xscreensaver/";
SECTION = "x11-misc"
LICENSE = "BSD"
-DEPENDS = "intltool mesa freeglut virtual/libx11 gtk+ libxml2 libglade"
+DEPENDS = "intltool virtual/libgl freeglut virtual/libx11 gtk+ libxml2
libglade"
# xscreensaver-demo is a glade app
LDFLAGS_append = " -Wl,--export-dynamic"
--
1.6.5
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
