Skip to contentSkip to conversation

recpies upgrade: mesa and other graphics recipes

PATCH In review Yu Ke 2 participants 14 messages Nov 28, 2010 – Dec 2, 2010

lore
Share & tools
lore

Yu Ke

author
#0 lore raw

cover recpies upgrade: mesa and other graphics recipes

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: kyu3/upgrade-11-28
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-11-28

Thanks,
Yu Ke <[email protected]>
---

Yu Ke (11):
sqlite: upgrade from 3.6.23 to 3.7.3
libxml2-native: remove the --without-debug option
talloc: add new recipes talloc 2.0.1
mesa-dri: upgrade from 7.8.2 to 7.9
mesa-xlib: upgrade from 7.8.2 to 7.9
mesa: enable glu
glew: add new recipes glew 1.5.7
mesa-demo: add new recpies mesa demo 8.0.2
mesa-dri-glsl-native: upgrade from 7.8.2 to 7.9
qemugl: upgrade to git commit

    33466cd83c2a9d7d3fb9fe437fb6a4d6fbd866b9

xf86-video-omapfb: upgrade to latest commit

 .../conf/distro/include/poky-default-revisions.inc |    6 +-
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 meta/recipes-core/libxml/libxml2.inc               |    2 +-
 meta/recipes-core/libxml/libxml2_2.7.7.bb          |    2 +-
 meta/recipes-extended/talloc/talloc_2.0.1.bb       |   24 ++++
 meta/recipes-graphics/glew/files/autotools.patch   |  146 ++++++++++++++++++++
 meta/recipes-graphics/glew/glew_1.5.7.bb           |   19 +++
 meta/recipes-graphics/mesa/mesa-common.inc         |    5 +-
 meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb     |   19 +++
 ...native_7.8.2.bb => mesa-dri-glsl-native_7.9.bb} |    9 +-
 meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb       |   53 -------
 meta/recipes-graphics/mesa/mesa-dri_7.9.bb         |   38 +++++
 .../mesa/{mesa-xlib_7.8.2.bb => mesa-xlib_7.9.bb}  |   15 +--
 meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb    |    3 -
 meta/recipes-support/sqlite/sqlite3_3.7.3.bb       |    5 +
 15 files changed, 270 insertions(+), 78 deletions(-)
 create mode 100644 meta/recipes-extended/talloc/talloc_2.0.1.bb
 create mode 100644 meta/recipes-graphics/glew/files/autotools.patch
 create mode 100644 meta/recipes-graphics/glew/glew_1.5.7.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
 rename meta/recipes-graphics/mesa/{mesa-dri-glsl-native_7.8.2.bb => mesa-dri-glsl-native_7.9.bb} (58%)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.9.bb
 rename meta/recipes-graphics/mesa/{mesa-xlib_7.8.2.bb => mesa-xlib_7.9.bb} (51%)
 delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb
 create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.3.bb
author
#1 lore raw

PATCH 1/11 sqlite: upgrade from 3.6.23 to 3.7.3

---
 meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb |    3 ---
 meta/recipes-support/sqlite/sqlite3_3.7.3.bb    |    5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb
 create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.3.bb
meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb deleted +0 -3
deleted file mode 100644
index 5075dd3..0000000
@@ -1,3 +0,0 @@
-require sqlite3.inc
-
-PR = "r1"
meta/recipes-support/sqlite/sqlite3_3.7.3.bb new file +5 -0
new file mode 100644
index 0000000..fa68c56
@@ -0,0 +1,5 @@
+require sqlite3.inc
+
+LIC_FILES_CHKSUM = "file://src/main.c;endline=16;md5=86c9b824e9d68f8a26343a4b57f6d85a"
+
+PR = "r0"
Signature · 1 line
1.7.0.4
author
#2 lore raw

PATCH 2/11 libxml2-native: remove the --without-debug option

In reply to Yu Ke

mesa 7.9 build script es_generator.py use libxml2 API xmlLsCountNode, which only available in debug module, so remove the --without-debug option for mesa 7.9

---
 meta/recipes-core/libxml/libxml2.inc      |    2 +-
 meta/recipes-core/libxml/libxml2_2.7.7.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/libxml/libxml2.inc +1 -1
index 6959b69..748a7fb 100644
@@ -20,7 +20,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \
 inherit autotools pkgconfig binconfig
 
 EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
-EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-debug --without-legacy --with-catalog --without-docbook --with-c14n"
+EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n"
 
 # required for pythong binding
 export HOST_SYS
meta/recipes-core/libxml/libxml2_2.7.7.bb +1 -1
index deb28b3..656cb88 100644
@@ -1,3 +1,3 @@
 require libxml2.inc
 
-PR = "r1"
+PR = "r2"
Signature · 1 line
1.7.0.4
author
#3 lore raw

PATCH 3/11 talloc: add new recipes talloc 2.0.1

In reply to Yu Ke

talloc is a hierarchical, reference counted memory pool system with destructors. It is the core memory allocator used in Samba. Mesa7.9 also depends on it,so add it for mesa7.9.

It is ported from OpenEmbedded, with some format modification.

---
 meta/recipes-extended/talloc/talloc_2.0.1.bb |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-extended/talloc/talloc_2.0.1.bb
meta/recipes-extended/talloc/talloc_2.0.1.bb new file +24 -0
new file mode 100644
index 0000000..dfbaf31
@@ -0,0 +1,24 @@
+DESCRIPTION = "Hierarchical, reference counted memory pool system with destructors"
+HOMEPAGE = "http://talloc.samba.org"
+BUGTRACKER = "https://bugzilla.samba.org/"
+LICENSE = "LGPLv3+"
+LIC_FILES_CHKSUM = "file://talloc.c;beginline=8;endline=26;md5=ea9b6ec07a6d8b3e771f0ec75ca3a317"
+
+PR = "r0"
+
+SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "c6e736540145ca58cb3dcb42f91cf57b"
+SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4"
+
+inherit autotools pkgconfig
+
+# autoreconf doesn't work well while reconfiguring included libreplace
+do_configure () {
+       gnu-configize
+       oe_runconf
+}
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+BBCLASSEXTEND = "native"
Signature · 1 line
1.7.0.4
author
#4 lore raw

PATCH 4/11 mesa-dri: upgrade from 7.8.2 to 7.9

In reply to Yu Ke

with the following changes:

- remove mesa-demos, because starting from mesa 7.9, mesa-demos becomes a standalone src tar ball in upstream, so there will be a seperate recipes to build the mesa-demos

- add dependency of talloc and libxml2-native

---
 .../distro/include/preferred-xorg-versions.inc     |    2 +-
 meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb       |   53 --------------------
 meta/recipes-graphics/mesa/mesa-dri_7.9.bb         |   38 ++++++++++++++
 3 files changed, 39 insertions(+), 54 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.9.bb
meta/conf/distro/include/preferred-xorg-versions.inc +1 -1
index eaea3d6..703d3a6 100644
@@ -136,7 +136,7 @@ PREFERRED_VERSION_xtrans-native ?= "1.2.5"
 PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.5"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
 PREFERRED_VERSION_xwininfo ?= "1.1.0"
-PREFERRED_VERSION_mesa-dri ?= "7.8.2"
+PREFERRED_VERSION_mesa-dri ?= "7.9"
 PREFERRED_VERSION_libdrm ?= "2.4.22"
 PREFERRED_VERSION_xcb-proto ?= "1.6"
 PREFERRED_VERSION_libxcb ?= "1.6"
meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb deleted +0 -53

53 lines not on this page · raw message

meta/recipes-graphics/mesa/mesa-dri_7.9.bb new file +38 -0
new file mode 100644
index 0000000..6f0f984
@@ -0,0 +1,38 @@
+include mesa-common.inc
+
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
+
+PROTO_DEPS = "xf86driproto glproto dri2proto"
+LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \
+            libxml2-native talloc"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} mesa-dri-glsl-native"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+           file://crossfix.patch"
+
+# most of our targets do not have DRI so will use mesa-xlib
+DEFAULT_PREFERENCE = "-1"
+
+# Atom PCs have DRI support so use mesa-dri by default
+DEFAULT_PREFERENCE_atom-pc = "1"
+
+LEAD_SONAME = "libGL.so.1"
+
+EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
+
+python populate_packages_prepend() {
+	import os.path
+
+	dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
+
+	do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
+}
+
+COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
+
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
Signature · 1 line
1.7.0.4
author
#6 lore raw

PATCH 6/11 mesa: enable glu

In reply to Yu Ke

GLU is needed by glew, which in turn needed by mesa-demos

---
 meta/recipes-graphics/mesa/mesa-common.inc  |    5 ++++-
 meta/recipes-graphics/mesa/mesa-dri_7.9.bb  |    2 +-
 meta/recipes-graphics/mesa/mesa-xlib_7.9.bb |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
meta/recipes-graphics/mesa/mesa-common.inc +4 -1
index 240f956..f029d3d 100644
@@ -13,7 +13,7 @@ PROVIDES = "virtual/libgl"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--disable-glu \
+EXTRA_OECONF = "--enable-glu \
                 --disable-glw \
                 --disable-glut \
                 --enable-glx-tls"
@@ -21,4 +21,7 @@ EXTRA_OECONF = "--disable-glu \
 # Multiple virtual/gl providers being built breaks staging
 EXCLUDE_FROM_WORLD = "1"
 
+PACKAGES =+ "libglu libglu-dev"
 
+FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
meta/recipes-graphics/mesa/mesa-dri_7.9.bb +1 -1
index 6f0f984..313b655 100644
@@ -8,7 +8,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} mesa-dri-glsl-native"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
            file://crossfix.patch"
meta/recipes-graphics/mesa/mesa-xlib_7.9.bb +1 -1
index c4d3b31..a816e93 100644
@@ -10,6 +10,6 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes talloc libxml
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF += "--with-driver=xlib"
Signature · 1 line
1.7.0.4
author
#9 lore raw

PATCH 9/11 mesa-dri-glsl-native: upgrade from 7.8.2 to 7.9

In reply to Yu Ke

with the following changes
- add license checksum
- add dependency of talloc-native, because mesa 7.9 start to use talloc to manage its memory.

---
 ...native_7.8.2.bb => mesa-dri-glsl-native_7.9.bb} |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-dri-glsl-native_7.8.2.bb => mesa-dri-glsl-native_7.9.bb} (58%)
meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.9.bb renamed from meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb +5 -4
similarity index 58%
rename from meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
rename to meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.9.bb
index f6121c1..ffc113b 100644
@@ -3,22 +3,23 @@ HOMEPAGE = "http://mesa3d.org"
 BUGTRACKER = "https://bugs.freedesktop.org"
 SECTION = "x11"
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://main.cpp;endline=22;md5=a12a9c0208ee64a07ce314dfed4c81eb"
 PR = "r0"
 
-DEPENDS = "makedepend-native"
+DEPENDS = "makedepend-native talloc-native"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
 
-S = "${WORKDIR}/Mesa-7.8.2/src/glsl/"
+S = "${WORKDIR}/Mesa-${PV}/src/glsl"
 
 inherit native
 
 # use default config for native build
 do_configure_prepend() {
-	ln -s ${S}/../../configs/default ${S}/../../configs/current
+	ln -sf ${S}/../../configs/default ${S}/../../configs/current
 }
 
 do_install() {
 	install -d ${D}/${bindir}
-	install -m 755 ${S}/apps/compile ${D}/${bindir}/glsl-compile
+	install -m 755 ${S}/glsl_compiler ${D}/${bindir}/
 }
Signature · 1 line
1.7.0.4
author
#11 lore raw

PATCH 11/11 xf86-video-omapfb: upgrade to latest commit

In reply to Yu Ke

xf86-video-omapfb has no major version upgrade since the last 24 monthes, so simply upgrade to the latest commit of Nov 2010.

---
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +1 -1
index bcf7164..009481c 100644
@@ -164,7 +164,7 @@ SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
 SRCREV_pn-xcb-proto-native ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
 SRCREV_pn-xf86-video-intel ??= "87ea531c5dc5b39809395b277c330854aaaaf019"
 SRCREV_pn-xf86-video-intel-dri2 ??= "3dd7f0f9423bb891bc99cd3b77dc3d57e057a7ef"
-SRCREV_pn-xf86-video-omapfb ??= "2ae9a57ebc3236cd0aec6534067b91a5c6916a3a"
+SRCREV_pn-xf86-video-omapfb ??= "6cff996abcb305460e9fa2c75569b776f099c9d5"
 SRCREV_pn-xf86-input-keyboard ??= "3e28d68b50d291938734e9684b8296ca864f3892"
 SRCREV_pn-xf86-input-mouse ??= "ea5cfe804e112f320f14ad896c7802d53551d3e6"
 SRCREV_pn-xf86-input-synaptics ??= "934bc0012f948c52aadc8eda912f7728fb7394a2"
Signature · 1 line
1.7.0.4
author
#7 lore raw

PATCH 7/11 glew: add new recipes glew 1.5.7

In reply to Yu Ke

The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. GLEW provides efficient run-time mechanisms for determining which OpenGL extensions are supported on the target platform.

mesa-demos requires glew, so port it from OE, with the following changes:
- upgrade it from 1.5.1 to 1.5.7
- add license checksum

---
 meta/recipes-graphics/glew/files/autotools.patch |  146 ++++++++++++++++++++++
 meta/recipes-graphics/glew/glew_1.5.7.bb         |   19 +++
 2 files changed, 165 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/glew/files/autotools.patch
 create mode 100644 meta/recipes-graphics/glew/glew_1.5.7.bb
meta/recipes-graphics/glew/files/autotools.patch new file +146 -0
new file mode 100644
index 0000000..7fe1d6e
@@ -0,0 +1,146 @@
+Index: glew/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ glew/Makefile.am	2009-12-02 00:30:23.296641663 +0100
+@@ -0,0 +1,5 @@
++
++ACLOCAL_AMFLAGS = -I m4 --install
++
++SUBDIRS = include src
++
+Index: glew/configure.ac
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ glew/configure.ac	2009-12-02 00:30:23.296641663 +0100
+@@ -0,0 +1,67 @@
++#                                               -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_PREREQ([2.62])
++AC_INIT([glew], [1.5.7], [BUG-REPORT-ADDRESS])
++AC_CONFIG_SRCDIR([src/glew.c])
++AC_CONFIG_HEADERS([config.h])
++AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AC_CONFIG_MACRO_DIR([m4])
++
++LT_INIT
++
++# Checks for programs.
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++
++# Checks for libraries.
++
++# Checks for header files.
++AC_CHECK_HEADERS([inttypes.h stddef.h stdint.h stdlib.h string.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_TYPE_INT32_T
++AC_TYPE_INT64_T
++AC_TYPE_UINT64_T
++AC_CHECK_TYPES([ptrdiff_t])
++
++# Checks for library functions.
++AC_FUNC_MALLOC
++AC_CHECK_FUNCS([strtol])
++
++# Check for pkgconfig libs
++
++PKG_CHECK_MODULES([X11], [x11])
++AC_SUBST([X11_LIBS])
++AC_SUBST([X11_CFLAGS])
++
++PKG_CHECK_MODULES([XMU], [xmu])
++AC_SUBST([XMU_LIBS])
++AC_SUBST([XMU_CFLAGS])
++
++PKG_CHECK_MODULES([XI], [xi])
++AC_SUBST([XI_LIBS])
++AC_SUBST([XI_CFLAGS])
++
++PKG_CHECK_MODULES([XEXT], [xext])
++AC_SUBST([XEXT_LIBS])
++AC_SUBST([XEXT_CFLAGS])
++
++# Check for GLU is enough and imples gl so no doubled -lGL in LDFLAGS
++PKG_CHECK_MODULES([GLU], [glu])
++AC_SUBST([GLU_LIBS])
++AC_SUBST([GLU_CFLAGS])
++
++# ENABLE option for Multiple Rendering Contexts support
++AC_CHECK_ENABLE_GLEWMX
++
++# for now we use the same version as the package, but that should be avoided
++# in the future
++
++AC_SUBST([LIBGLEW_SO_VERSION], [1:5:7])
++
++AC_CONFIG_FILES([Makefile
++                 include/Makefile
++                 src/Makefile])
++AC_OUTPUT
+Index: glew/src/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ glew/src/Makefile.am	2009-12-02 00:33:48.690786110 +0100
+@@ -0,0 +1,35 @@
++
++AM_CPPFLAGS = -I$(top_srcdir)/include
++
++if ENABLE_GLEWMX
++AM_CPPFLAGS += -DGLEW_MX
++endif
++
++AM_CFLAGS = @X11_CFLAGS@ \
++            @XMU_CFLAGS@ \
++            @XI_CFLAGS@ \
++            @XEXT_CFLAGS@ \
++            @GLU_CFLAGS@
++
++lib_LTLIBRARIES = libGLEW.la
++
++libGLEW_la_SOURCES = glew.c
++
++libGLEW_la_LIBADD = @X11_LIBS@ \
++                    @XMU_LIBS@ \
++                    @XI_LIBS@ \
++                    @XEXT_LIBS@ \
++                    @GLU_LIBS@
++
++libGLEW_la_LDFLAGS = -version-number @LIBGLEW_SO_VERSION@
++
++bin_PROGRAMS = glewinfo visualinfo
++
++glewinfo_SOURCES = glewinfo.c
++
++glewinfo_LDADD = libGLEW.la
++
++visualinfo_SOURCES =  visualinfo.c
++
++visualinfo_LDADD = libGLEW.la
++
+Index: glew/m4/glewmx.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ glew/m4/glewmx.m4	2009-12-02 00:30:23.296641663 +0100
+@@ -0,0 +1,11 @@
++
++AC_DEFUN([AC_CHECK_ENABLE_GLEWMX],[
++AC_MSG_CHECKING([whether to include Multiple Rendering Contexts support])
++AC_ARG_ENABLE([glewmx],
++   [AS_HELP_STRING([--enable-glewmx], [enable GLEW Multiple Rendering Contexts (default is no)])],
++   [ENABLE_GLEWMX="$enableval"],
++   [ENABLE_GLEWMX="no"])
++AC_MSG_RESULT([${ENABLE_GLEWMX}])
++AM_CONDITIONAL([ENABLE_GLEWMX], [test x"${ENABLE_GLEWMX}" = "xyes"])
++])
++
+Index: glew/include/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ glew/include/Makefile.am	2009-12-02 00:30:23.296641663 +0100
+@@ -0,0 +1,3 @@
++
++nobase_include_HEADERS = GL/glew.h  GL/glxew.h  GL/wglew.h
++
meta/recipes-graphics/glew/glew_1.5.7.bb new file +19 -0
new file mode 100644
index 0000000..e2e6b43
@@ -0,0 +1,19 @@
+DESCRIPTION = "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library."
+HOMEPAGE = "http://glew.sourceforge.net/"
+BUGTRACKER = "http://sourceforge.net/tracker/?group_id=67586"
+SECTION = "x11"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2"
+
+DEPENDS = "virtual/libx11 virtual/libgl libxext libxi libxmu"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
+           file://autotools.patch \
+          "
+
+SRC_URI[md5sum] = "f913ce9dbde4cd250b932731b3534ded"
+SRC_URI[sha256sum] = "86bd36a163640d6027ec6be5fdd8a6e3b90f02dcf55f95c3c2429ebb58be3107"
+
+inherit autotools lib_package
Signature · 1 line
1.7.0.4
author
#8 lore raw

PATCH 8/11 mesa-demo: add new recpies mesa demo 8.0.2

In reply to Yu Ke

mesa-demo is originally part of mesa in 7.8 or earlier version. But starting from 7.9, mesa-demo become a seperate tar ball and has its own version 8.0.2, so this commit add new recipe for mesa-demos

---
 meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb new file +19 -0
new file mode 100644
index 0000000..fde2453
@@ -0,0 +1,19 @@
+DESCRIPTION = "mesa demo applications"
+HOMEPAGE = "http://mesa3d.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11"
+
+LICENSE = "MIT & PD"
+LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \
+                    file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06"
+
+DEPENDS = "virtual/libx11 virtual/libgl glew"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+SRC_URI[md5sum] = "320c2a4b6edc6faba35d9cb1e2a30bf4"
+SRC_URI[sha256sum] = "4bc7f2b20d17e3eebfec288f2367a435cd2db71fc5ac9ece2c14827e290d77d1"
Signature · 1 line
1.7.0.4
author
#5 lore raw

PATCH 5/11 mesa-xlib: upgrade from 7.8.2 to 7.9

In reply to Yu Ke

- starting from mesa 7.9, mesa-demos is not bundled with mesa in upstream, so remove the mesa demo in mesa recipes. there will be a seperate recipes to build mesa-demos

---
 .../mesa/{mesa-xlib_7.8.2.bb => mesa-xlib_7.9.bb}  |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-xlib_7.8.2.bb => mesa-xlib_7.9.bb} (52%)
meta/recipes-graphics/mesa/mesa-xlib_7.9.bb renamed from meta/recipes-graphics/mesa/mesa-xlib_7.8.2.bb +3 -10
similarity index 52%
rename from meta/recipes-graphics/mesa/mesa-xlib_7.8.2.bb
rename to meta/recipes-graphics/mesa/mesa-xlib_7.9.bb
index 093ad6e..c4d3b31 100644
@@ -1,9 +1,11 @@
 include mesa-common.inc
 
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
+
 LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
 
 PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes talloc libxml2-native"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
@@ -11,12 +13,3 @@ PE = "1"
 PR = "r0"
 
 EXTRA_OECONF += "--with-driver=xlib"
-
-do_install_append () {
-    install -d ${D}/${bindir}
-    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir}
-}
-
-PACKAGES =+ "${PN}-xprogs"
-
-FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
Signature · 1 line
1.7.0.4
author
#10 lore raw

PATCH 10/11 qemugl: upgrade to git commit 33466cd83c2a9d7d3fb9fe437fb6a4d6fbd866b9

In reply to Yu Ke

qemugl has no update since May 2009. Compared to current SRCREV, there is 3 new commit in upstream. So simply upgrade the SRCREV to the latest commit of May 2009, to include the 3 new commits.

---
 .../conf/distro/include/poky-default-revisions.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/conf/distro/include/poky-default-revisions.inc +2 -2
index c5a0c7f..bcf7164 100644
@@ -145,8 +145,8 @@ QEMUSRCREV ??= "72bb3c7571226af13cfe9eec020a56add3d30a70"
 SRCREV_pn-qemu-native ??= "${QEMUSRCREV}"
 SRCREV_pn-qemu-nativesdk ??= "${QEMUSRCREV}"
 SRCREV_pn-qemu ??= "${QEMUSRCREV}"
-SRCREV_pn-qemugl ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
-SRCREV_pn-qemugl-nativesdk ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
+SRCREV_pn-qemugl ??= "33466cd83c2a9d7d3fb9fe437fb6a4d6fbd866b9"
+SRCREV_pn-qemugl-nativesdk ??= "33466cd83c2a9d7d3fb9fe437fb6a4d6fbd866b9"
 SRCREV_pn-sat-solver = "aa799f7bae0ec055e0e527203635001bb7346dbc"
 SRCREV_pn-screenshot ??= "292"
 SRCREV_pn-settings-daemon ??= "2059"
Signature · 1 line
1.7.0.4
#12 lore raw
In reply to Yu Ke
Quoted 9 lines · Yu Ke

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: kyu3/upgrade-11-28
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-11-28

Thanks,
Yu Ke<[email protected]>
---

Quoted 4 lines

Yu Ke (11):

   sqlite: upgrade from 3.6.23 to 3.7.3
   libxml2-native: remove the --without-debug option
   talloc: add new recipes talloc 2.0.1

Ke:
Is talloc's usage native only, or is it also used on the target system? Seems to be used on the target also.

Since talloc is really a support library, I am moving it to recipes-support.

More importantly, you override the do_confgure() functionality. I understand this was taken from OE, but this is not encouraged in poky. This do_configure() may work in the native, but may not be correct when cross compiling. This recipe / upstream package needs to be fixed to correctly handle this.

We know that currently the mesa code is primarily built for x86, but that may change in the future.

Thanks
Sau!

Quoted 42 lines

mesa-dri: upgrade from 7.8.2 to 7.9
mesa-xlib: upgrade from 7.8.2 to 7.9
mesa: enable glu
glew: add new recipes glew 1.5.7
mesa-demo: add new recpies mesa demo 8.0.2
mesa-dri-glsl-native: upgrade from 7.8.2 to 7.9
qemugl: upgrade to git commit

     33466cd83c2a9d7d3fb9fe437fb6a4d6fbd866b9

xf86-video-omapfb: upgrade to latest commit

  .../conf/distro/include/poky-default-revisions.inc |    6 +-
  .../distro/include/preferred-xorg-versions.inc     |    2 +-
  meta/recipes-core/libxml/libxml2.inc               |    2 +-
  meta/recipes-core/libxml/libxml2_2.7.7.bb          |    2 +-
  meta/recipes-extended/talloc/talloc_2.0.1.bb       |   24 ++++
  meta/recipes-graphics/glew/files/autotools.patch   |  146 ++++++++++++++++++++
  meta/recipes-graphics/glew/glew_1.5.7.bb           |   19 +++
  meta/recipes-graphics/mesa/mesa-common.inc         |    5 +-
  meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb     |   19 +++
  ...native_7.8.2.bb =>  mesa-dri-glsl-native_7.9.bb} |    9 +-
  meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb       |   53 -------
  meta/recipes-graphics/mesa/mesa-dri_7.9.bb         |   38 +++++
  .../mesa/{mesa-xlib_7.8.2.bb =>  mesa-xlib_7.9.bb}  |   15 +--
  meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb    |    3 -
  meta/recipes-support/sqlite/sqlite3_3.7.3.bb       |    5 +
  15 files changed, 270 insertions(+), 78 deletions(-)

create mode 100644 meta/recipes-extended/talloc/talloc_2.0.1.bb
create mode 100644 meta/recipes-graphics/glew/files/autotools.patch
create mode 100644 meta/recipes-graphics/glew/glew_1.5.7.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
rename meta/recipes-graphics/mesa/{mesa-dri-glsl-native_7.8.2.bb => mesa-dri-glsl-native_7.9.bb} (58%) delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.9.bb
rename meta/recipes-graphics/mesa/{mesa-xlib_7.8.2.bb => mesa-xlib_7.9.bb} (51%) delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb
create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.3.bb

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

#13 lore raw
In reply to Yu Ke
Quoted 50 lines · Yu Ke

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: kyu3/upgrade-11-28
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/upgrade-11-28

Thanks,
Yu Ke<[email protected]>
---

Yu Ke (11):
sqlite: upgrade from 3.6.23 to 3.7.3
libxml2-native: remove the --without-debug option
talloc: add new recipes talloc 2.0.1
mesa-dri: upgrade from 7.8.2 to 7.9
mesa-xlib: upgrade from 7.8.2 to 7.9
mesa: enable glu
glew: add new recipes glew 1.5.7
mesa-demo: add new recpies mesa demo 8.0.2
mesa-dri-glsl-native: upgrade from 7.8.2 to 7.9
qemugl: upgrade to git commit

     33466cd83c2a9d7d3fb9fe437fb6a4d6fbd866b9

xf86-video-omapfb: upgrade to latest commit

  .../conf/distro/include/poky-default-revisions.inc |    6 +-
  .../distro/include/preferred-xorg-versions.inc     |    2 +-
  meta/recipes-core/libxml/libxml2.inc               |    2 +-
  meta/recipes-core/libxml/libxml2_2.7.7.bb          |    2 +-
  meta/recipes-extended/talloc/talloc_2.0.1.bb       |   24 ++++
  meta/recipes-graphics/glew/files/autotools.patch   |  146 ++++++++++++++++++++
  meta/recipes-graphics/glew/glew_1.5.7.bb           |   19 +++
  meta/recipes-graphics/mesa/mesa-common.inc         |    5 +-
  meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb     |   19 +++
  ...native_7.8.2.bb =>  mesa-dri-glsl-native_7.9.bb} |    9 +-
  meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb       |   53 -------
  meta/recipes-graphics/mesa/mesa-dri_7.9.bb         |   38 +++++
  .../mesa/{mesa-xlib_7.8.2.bb =>  mesa-xlib_7.9.bb}  |   15 +--
  meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb    |    3 -
  meta/recipes-support/sqlite/sqlite3_3.7.3.bb       |    5 +
  15 files changed, 270 insertions(+), 78 deletions(-)

create mode 100644 meta/recipes-extended/talloc/talloc_2.0.1.bb
create mode 100644 meta/recipes-graphics/glew/files/autotools.patch
create mode 100644 meta/recipes-graphics/glew/glew_1.5.7.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
rename meta/recipes-graphics/mesa/{mesa-dri-glsl-native_7.8.2.bb => mesa-dri-glsl-native_7.9.bb} (58%) delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.9.bb
rename meta/recipes-graphics/mesa/{mesa-xlib_7.8.2.bb => mesa-xlib_7.9.bb} (51%) delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb
create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.3.bb

Quoted 5 lines

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Pulled into Master

Thanks

Sau!