aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-graphics')
-rw-r--r--recipes-graphics/layer-management/layer-management-0.9.5/layermanager.service12
-rw-r--r--recipes-graphics/layer-management/layer-management-0.9.5/layermanager_demo.service12
-rw-r--r--recipes-graphics/layer-management/layer-management-0.9.5/point-to-internal-CMakeVersions.patch26
-rw-r--r--recipes-graphics/layer-management/layer-management_0.9.5.bb87
-rw-r--r--recipes-graphics/mesa/mesa-8.0.1.inc42
-rw-r--r--recipes-graphics/mesa/mesa-common.inc55
-rw-r--r--recipes-graphics/mesa/mesa-dri-glsl-native_8.0.1.bb54
-rw-r--r--recipes-graphics/mesa/mesa-dri.inc52
-rw-r--r--recipes-graphics/mesa/mesa-dri_8.0.1.bb8
-rw-r--r--recipes-graphics/mesa/mesa/crossfix-mklib.patch71
-rw-r--r--recipes-graphics/mesa/mesa/crossfix.patch36
-rw-r--r--recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch76
-rw-r--r--recipes-graphics/mesa/mesa/remove_OES_EGL_image_externals.patch44
-rw-r--r--recipes-graphics/pango/pango-1.28.4/no-tests.patch32
-rw-r--r--recipes-graphics/pango/pango-1.28.4/noconst.patch408
-rw-r--r--recipes-graphics/pango/pango.inc56
-rw-r--r--recipes-graphics/pango/pango_1.28.4.bb26
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf52
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb36
-rwxr-xr-x[-rw-r--r--]recipes-graphics/xorg-xserver/xserver-xorg/X.service20
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bbappend52
21 files changed, 941 insertions, 316 deletions
diff --git a/recipes-graphics/layer-management/layer-management-0.9.5/layermanager.service b/recipes-graphics/layer-management/layer-management-0.9.5/layermanager.service
new file mode 100644
index 0000000..231fa01
--- /dev/null
+++ b/recipes-graphics/layer-management/layer-management-0.9.5/layermanager.service
@@ -0,0 +1,12 @@
+Description=LayerManager Service from Genivi
+Requires=X.service
+After=X.service
+
+[Service]
+Type=simple
+Environment=LD_PRELOAD=/usr/lib/layermanager/communicator/libDBUSCommunicator.so:/usr/lib/libGLESv2.so.2
+ExecStart=/usr/bin/LayerManagerService
+TimeoutSec=2s
+
+[Install]
+WantedBy=multi-user.target.wants \ No newline at end of file
diff --git a/recipes-graphics/layer-management/layer-management-0.9.5/layermanager_demo.service b/recipes-graphics/layer-management/layer-management-0.9.5/layermanager_demo.service
new file mode 100644
index 0000000..a1b1823
--- /dev/null
+++ b/recipes-graphics/layer-management/layer-management-0.9.5/layermanager_demo.service
@@ -0,0 +1,12 @@
+Description=LayerManager DEMO Application from Genivi
+Requires=layermanager.service
+After=layermanager.service
+
+[Service]
+Type=simple
+Environment=DISPLAY=:0
+ExecStart=/usr/bin/EGLX11ApplicationExample
+TimeoutSec=2s
+
+[Install]
+WantedBy=multi-user.target.wants \ No newline at end of file
diff --git a/recipes-graphics/layer-management/layer-management-0.9.5/point-to-internal-CMakeVersions.patch b/recipes-graphics/layer-management/layer-management-0.9.5/point-to-internal-CMakeVersions.patch
index 0750dff..5fd080f 100644
--- a/recipes-graphics/layer-management/layer-management-0.9.5/point-to-internal-CMakeVersions.patch
+++ b/recipes-graphics/layer-management/layer-management-0.9.5/point-to-internal-CMakeVersions.patch
@@ -1,13 +1,13 @@
-Index: git/CMakeLists.txt
-===================================================================
---- git.orig/CMakeLists.txt 2012-02-16 13:02:02.257718578 +0200
-+++ git/CMakeLists.txt 2012-02-16 13:02:20.217968698 +0200
-@@ -22,7 +22,7 @@
-
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
-
--include(${CMAKE_MODULE_PATH}/CMakeVersions.txt)
-+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/CMakeVersions.txt)
-
- # set default build type, if not defined by user
- if (NOT CMAKE_BUILD_TYPE)
+Index: git/CMakeLists.txt
+===================================================================
+--- git.orig/CMakeLists.txt 2012-02-16 13:02:02.257718578 +0200
++++ git/CMakeLists.txt 2012-02-16 13:02:20.217968698 +0200
+@@ -22,7 +22,7 @@
+
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
+
+-include(${CMAKE_MODULE_PATH}/CMakeVersions.txt)
++include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/CMakeVersions.txt)
+
+ # set default build type, if not defined by user
+ if (NOT CMAKE_BUILD_TYPE)
diff --git a/recipes-graphics/layer-management/layer-management_0.9.5.bb b/recipes-graphics/layer-management/layer-management_0.9.5.bb
index 665f52f..90ad25c 100644
--- a/recipes-graphics/layer-management/layer-management_0.9.5.bb
+++ b/recipes-graphics/layer-management/layer-management_0.9.5.bb
@@ -1,38 +1,49 @@
-DESCRIPTION = "LayerManager"
-
-HOMEPAGE = "https://www.genivi.org/"
-SECTION = "environment/base"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=249d3578d6bba1bb946148d367a28080"
-
-DEPENDS = "virtual/libgl dbus libxcomposite"
-
-SRCREV = "02c4d61f14d8d684757f5d13bf2105ddb11ac8ee"
-
-SRC_URI = "git://git.genivi.org/srv/git/layer_management;protocol=git \
- file://point-to-internal-CMakeVersions.patch \
- "
-# Needed this for imx6 boards to use precompiled EGL libraries
-python () {
- if ((d.getVar("MACHINE", True) or "").find("imx6sabre") != -1):
- flags = d.getVar("OECMAKE_CXX_FLAGS", True)
- flags += " -DLINUX"
- d.setVar('OECMAKE_CXX_FLAGS', flags)
-}
-
-S = "${WORKDIR}/git"
-
-inherit autotools gettext cmake
-
-FILES_${PN} += "${libdir}/lib* \
- ${libdir}/layermanager/lib* \
- ${libdir}/layermanager/communicator/lib* \
- ${libdir}/layermanager/renderer/lib* \
- ${libdir}/layermanager/renderer/renderer*"
-
-FILES_${PN}-dev += "${includedir}/*"
-FILES_${PN}-staticdev += "${libdir}/layermanager/static/lib*"
-FILES_${PN}-dbg += "${libdir}/layermanager/.debug/ \
- ${libdir}/layermanager/communicator/.debug/ \
- ${libdir}/layermanager/renderer/.debug/ "
+DESCRIPTION = "LayerManager"
+
+HOMEPAGE = "https://www.genivi.org/"
+SECTION = "environment/base"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=249d3578d6bba1bb946148d367a28080"
+
+DEPENDS = "virtual/libgl dbus libxcomposite"
+
+SRCREV = "02c4d61f14d8d684757f5d13bf2105ddb11ac8ee"
+
+SRC_URI = "git://git.genivi.org/srv/git/layer_management;protocol=git \
+ file://point-to-internal-CMakeVersions.patch \
+ file://layermanager.service \
+ file://layermanager_demo.service \
+ "
+# Needed this for imx6 boards to use precompiled EGL libraries
+python () {
+ if ((d.getVar("MACHINE", True) or "").find("imx6sabre") != -1):
+ flags = d.getVar("OECMAKE_CXX_FLAGS", True)
+ flags += " -DLINUX"
+ d.setVar('OECMAKE_CXX_FLAGS', flags)
+}
+
+S = "${WORKDIR}/git"
+
+inherit autotools gettext cmake
+
+do_install_append() {
+ install -d ${D}/lib/systemd/system
+ install -m 0755 ${WORKDIR}/layermanager.service ${D}/lib/systemd/system
+ install -m 0755 ${WORKDIR}/layermanager_demo.service ${D}/lib/systemd/system
+}
+
+FILES_${PN} += "${libdir}/lib* \
+ ${libdir}/layermanager/lib* \
+ ${libdir}/layermanager/communicator/lib* \
+ ${libdir}/layermanager/renderer/lib* \
+ ${libdir}/layermanager/renderer/renderer* \
+ /lib/systemd"
+
+FILES_${PN}-dev += "${includedir}/*"
+FILES_${PN}-staticdev += "${libdir}/layermanager/static/lib*"
+FILES_${PN}-dbg += "${libdir}/layermanager/.debug/ \
+ ${libdir}/layermanager/communicator/.debug/ \
+ ${libdir}/layermanager/renderer/.debug/ "
+
+WARN_QA = "ldflags useless-rpaths rpaths staticdev"
diff --git a/recipes-graphics/mesa/mesa-8.0.1.inc b/recipes-graphics/mesa/mesa-8.0.1.inc
index ac464a5..8e63af8 100644
--- a/recipes-graphics/mesa/mesa-8.0.1.inc
+++ b/recipes-graphics/mesa/mesa-8.0.1.inc
@@ -1,21 +1,21 @@
-DEPENDS += "mesa-dri-glsl-native"
-
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
- file://crossfix.patch \
- file://crossfix-mklib.patch \
- file://mesa_fix_for_x32.patch \
- file://remove_OES_EGL_image_externals.patch \
- "
-
-S = "${WORKDIR}/Mesa-${PV}"
-
-SRC_URI[md5sum] = "24eeebf66971809d8f40775a379b36c9"
-SRC_URI[sha256sum] = "593af02ea2b5b7afb057a12c550f2c03b1d1cf59a716972d601c1499545ea0a7"
-
-do_configure_prepend() {
- #check for python not python2, because python-native does not stage python2 binary/link
- sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
- # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
- sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
-}
+DEPENDS += "mesa-dri-glsl-native"
+
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+ file://crossfix.patch \
+ file://crossfix-mklib.patch \
+ file://mesa_fix_for_x32.patch \
+ file://remove_OES_EGL_image_externals.patch \
+ "
+
+S = "${WORKDIR}/Mesa-${PV}"
+
+SRC_URI[md5sum] = "24eeebf66971809d8f40775a379b36c9"
+SRC_URI[sha256sum] = "593af02ea2b5b7afb057a12c550f2c03b1d1cf59a716972d601c1499545ea0a7"
+
+do_configure_prepend() {
+ #check for python not python2, because python-native does not stage python2 binary/link
+ sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
+ # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
+ sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
+}
diff --git a/recipes-graphics/mesa/mesa-common.inc b/recipes-graphics/mesa/mesa-common.inc
new file mode 100644
index 0000000..b04e432
--- /dev/null
+++ b/recipes-graphics/mesa/mesa-common.inc
@@ -0,0 +1,55 @@
+SUMMARY = "A free implementation of the OpenGL API"
+DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \
+a system for rendering interactive 3D graphics. \
+A variety of device drivers allows Mesa to be used in many different environments \
+ranging from software emulation to complete hardware acceleration for modern GPUs. \
+Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \
+environment."
+
+HOMEPAGE = "http://mesa3d.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
+
+INC_PR = "r13"
+PE = "2"
+
+
+PROTO_DEPS = "xf86driproto glproto"
+LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
+
+DEPENDS = "makedepend-native python-native ${PROTO_DEPS} ${LIB_DEPS}"
+RDEPENDS_${PN} = "${PN}-driver-swrast"
+
+PROVIDES = "virtual/libgl"
+
+# for mesa-dri and mesa-xlib
+FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-glu \
+ --disable-glw \
+ --disable-glut \
+ --enable-glx-tls"
+
+# Multiple virtual/gl providers being built breaks staging
+EXCLUDE_FROM_WORLD = "1"
+
+# ie mesa-dri could be empty and mesa-dri-dev RDEPENDS on it
+ALLOW_EMPTY_${PN} = "1"
+
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_libgl = "${libdir}/libGL.so.*"
+FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
+FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libegl-dbg += "${libdir}/egl/.debug/*"
diff --git a/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.1.bb b/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.1.bb
index 9c51050..2183857 100644
--- a/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.1.bb
+++ b/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.1.bb
@@ -1,27 +1,27 @@
-DESCRIPTION = "gl shader language specific build from mesa-dri"
-HOMEPAGE = "http://mesa3d.org"
-BUGTRACKER = "https://bugs.freedesktop.org"
-SECTION = "x11"
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9"
-
-DEPENDS = "makedepend-native"
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
-SRC_URI[md5sum] = "24eeebf66971809d8f40775a379b36c9"
-SRC_URI[sha256sum] = "593af02ea2b5b7afb057a12c550f2c03b1d1cf59a716972d601c1499545ea0a7"
-
-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
-}
-
-do_install() {
- install -d ${D}/${bindir}/glsl
- install -m 755 ${S}/builtin_compiler ${D}/${bindir}/glsl/builtin_compiler
- install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl/glsl_compiler
-}
+DESCRIPTION = "gl shader language specific build from mesa-dri"
+HOMEPAGE = "http://mesa3d.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9"
+
+DEPENDS = "makedepend-native"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
+SRC_URI[md5sum] = "24eeebf66971809d8f40775a379b36c9"
+SRC_URI[sha256sum] = "593af02ea2b5b7afb057a12c550f2c03b1d1cf59a716972d601c1499545ea0a7"
+
+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
+}
+
+do_install() {
+ install -d ${D}/${bindir}/glsl
+ install -m 755 ${S}/builtin_compiler ${D}/${bindir}/glsl/builtin_compiler
+ install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl/glsl_compiler
+}
diff --git a/recipes-graphics/mesa/mesa-dri.inc b/recipes-graphics/mesa/mesa-dri.inc
index 4eafaa7..d4308e4 100644
--- a/recipes-graphics/mesa/mesa-dri.inc
+++ b/recipes-graphics/mesa/mesa-dri.inc
@@ -1,26 +1,26 @@
-PROTO_DEPS += "dri2proto"
-LIB_DEPS += "libdrm expat"
-
-# most of our targets do not have DRI so will use mesa-xlib
-DEFAULT_PREFERENCE = "-1"
-
-DRIDRIVERS = "swrast"
-DRIDRIVERS_append_x86 = ",i915,i965"
-DRIDRIVERS_append_x86-64 = ",i915,i965"
-
-EXTRA_OECONF += "--disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS} --enable-gles2 --enable-glx --enable-dri --disable-osmesa --with-egl-platform=drm --disable-xlib-glx"
-
-python populate_packages_prepend() {
- import os.path
-
- dri_drivers_root = os.path.join(d.getVar('libdir', 1), "dri")
-
- do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
-}
-
-PACKAGES_DYNAMIC = "mesa-dri-driver-*"
-
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-
-FILES_${PN}-driver-swrast += "${libdir}/dri/libdricore.so"
-FILES_${PN}-driver-swrast += "${libdir}/dri/libglsl.so"
+PROTO_DEPS += "dri2proto"
+LIB_DEPS += "libdrm expat"
+
+# most of our targets do not have DRI so will use mesa-xlib
+DEFAULT_PREFERENCE = "-1"
+
+DRIDRIVERS = "swrast"
+DRIDRIVERS_append_x86 = ",i915,i965"
+DRIDRIVERS_append_x86-64 = ",i915,i965"
+
+EXTRA_OECONF += "--disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS} --enable-gles2 --enable-glx --enable-dri --disable-osmesa --with-egl-platform=drm --disable-xlib-glx"
+
+python populate_packages_prepend() {
+ import os.path
+
+ dri_drivers_root = os.path.join(d.getVar('libdir', 1), "dri")
+
+ do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
+}
+
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+
+FILES_${PN}-driver-swrast += "${libdir}/dri/libdricore.so"
+FILES_${PN}-driver-swrast += "${libdir}/dri/libglsl.so"
diff --git a/recipes-graphics/mesa/mesa-dri_8.0.1.bb b/recipes-graphics/mesa/mesa-dri_8.0.1.bb
index 09811a1..219e555 100644
--- a/recipes-graphics/mesa/mesa-dri_8.0.1.bb
+++ b/recipes-graphics/mesa/mesa-dri_8.0.1.bb
@@ -1,4 +1,4 @@
-include mesa-common.inc
-include mesa-${PV}.inc
-include mesa-dri.inc
-PR = "${INC_PR}.1"
+include mesa-common.inc
+include mesa-${PV}.inc
+include mesa-dri.inc
+PR = "${INC_PR}.1"
diff --git a/recipes-graphics/mesa/mesa/crossfix-mklib.patch b/recipes-graphics/mesa/mesa/crossfix-mklib.patch
new file mode 100644
index 0000000..dc08228
--- /dev/null
+++ b/recipes-graphics/mesa/mesa/crossfix-mklib.patch
@@ -0,0 +1,71 @@
+This patch is ported from WindRiver linux and to fix cross compile failure.
+
+And original commits are:
+commit 8d5ccc8113e1b51b0529a00c18a4aba956247e1b
+commit 5c4212084b871a0c0fb7d174280ec9a634637deb
+
+Upstream-Status: Pending
+
+Signed-off-by: Kang Kai <kai.kang@windriver.com>
+
+--- Mesa-7.10.2/bin/mklib.orig 2011-09-28 16:15:34.170000074 +0800
++++ Mesa-7.10.2/bin/mklib 2011-09-28 16:15:42.370000073 +0800
+@@ -49,8 +49,8 @@
+ /*) ;;
+ *) FILE="$ORIG_DIR/$FILE" ;;
+ esac
+- MEMBERS=`ar t $FILE`
+- ar x $FILE
++ MEMBERS=`${AR} t $FILE`
++ ${AR} x $FILE
+ for MEMBER in $MEMBERS ; do
+ NEWFILES="$NEWFILES $DIR/$MEMBER"
+ done
+@@ -77,7 +77,7 @@
+ make_ar_static_lib() {
+ OPTS=$1
+ shift;
+- RANLIB=$1
++ USE_RANLIB=$1
+ shift;
+ LIBNAME=$1
+ shift;
+@@ -87,11 +87,11 @@
+ rm -f ${LIBNAME}
+
+ # make static lib
+- ar ${OPTS} ${LIBNAME} ${OBJECTS}
++ ${AR} ${OPTS} ${LIBNAME} ${OBJECTS}
+
+ # run ranlib
+- if [ ${RANLIB} = 1 ] ; then
+- ranlib ${LIBNAME}
++ if [ ${USE_RANLIB} = 1 ] ; then
++ ${RANLIB} ${LIBNAME}
+ fi
+
+ echo ${LIBNAME}
+@@ -313,9 +313,9 @@
+ if [ "x$LINK" = "x" ] ; then
+ # -linker was not specified so set default link command now
+ if [ $CPLUSPLUS = 1 ] ; then
+- LINK=g++
++ LINK=$CXX
+ else
+- LINK=gcc
++ LINK=$CC
+ fi
+ fi
+
+@@ -531,9 +531,9 @@
+ if [ "x$LINK" = "x" ] ; then
+ # -linker was not specified so set default link command now
+ if [ $CPLUSPLUS = 1 ] ; then
+- LINK=g++
++ LINK=${CXX}
+ else
+- LINK=gcc
++ LINK=${CC}
+ fi
+ fi
+
diff --git a/recipes-graphics/mesa/mesa/crossfix.patch b/recipes-graphics/mesa/mesa/crossfix.patch
index 38010f4..d300e2f 100644
--- a/recipes-graphics/mesa/mesa/crossfix.patch
+++ b/recipes-graphics/mesa/mesa/crossfix.patch
@@ -1,18 +1,18 @@
-Upstream-Status: Pending
-
-Index: Mesa-7.5/bin/mklib
-===================================================================
---- Mesa-7.5.orig/bin/mklib 2009-08-12 13:01:34.000000000 +0100
-+++ Mesa-7.5/bin/mklib 2009-08-12 13:04:19.000000000 +0100
-@@ -234,9 +234,9 @@
- if [ "x$LINK" = "x" ] ; then
- # -linker was not specified so set default link command now
- if [ $CPLUSPLUS = 1 ] ; then
-- LINK=g++
-+ LINK=$CXX
- else
-- LINK=gcc
-+ LINK=$CC
- fi
- fi
-
+Upstream-Status: Pending
+
+Index: Mesa-7.5/bin/mklib
+===================================================================
+--- Mesa-7.5.orig/bin/mklib 2009-08-12 13:01:34.000000000 +0100
++++ Mesa-7.5/bin/mklib 2009-08-12 13:04:19.000000000 +0100
+@@ -234,9 +234,9 @@
+ if [ "x$LINK" = "x" ] ; then
+ # -linker was not specified so set default link command now
+ if [ $CPLUSPLUS = 1 ] ; then
+- LINK=g++
++ LINK=$CXX
+ else
+- LINK=gcc
++ LINK=$CC
+ fi
+ fi
+
diff --git a/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch b/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
index 83b1587..8994faf 100644
--- a/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
+++ b/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
@@ -1,38 +1,38 @@
-Upstream-Status: Pending
-
-get correct compiler options for x32 gcc.
-
-Received this patch from H.J. Lu <hjl.tools@gmail.com>
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/06
-
---- Mesa-7.11/bin/mklib.x32 2011-12-06 13:15:17.968695114 -0800
-+++ Mesa-7.11/bin/mklib 2011-12-06 13:17:13.872152249 -0800
-@@ -335,7 +335,12 @@ case $ARCH in
- set ${OBJECTS}
- ABI32=`file $1 | grep 32-bit`
- if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
-- OPTS="-m32 ${OPTS}"
-+ ABIX32=`file $1 | grep x86-64`
-+ if [ "${ABI32}" ]; then
-+ OPTS="-mx32 ${OPTS}"
-+ else
-+ OPTS="-m32 ${OPTS}"
-+ fi
- fi
-
- if [ "${ALTOPTS}" ] ; then
-@@ -392,7 +397,12 @@ case $ARCH in
- set ${OBJECTS}
- ABI32=`file $1 | grep 32-bit`
- if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
-- OPTS="-m32 ${OPTS}"
-+ ABIX32=`file $1 | grep x86-64`
-+ if [ "${ABI32}" ]; then
-+ OPTS="-mx32 ${OPTS}"
-+ else
-+ OPTS="-m32 ${OPTS}"
-+ fi
- fi
- if [ "${ALTOPTS}" ] ; then
- OPTS=${ALTOPTS}
+Upstream-Status: Pending
+
+get correct compiler options for x32 gcc.
+
+Received this patch from H.J. Lu <hjl.tools@gmail.com>
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/06
+
+--- Mesa-7.11/bin/mklib.x32 2011-12-06 13:15:17.968695114 -0800
++++ Mesa-7.11/bin/mklib 2011-12-06 13:17:13.872152249 -0800
+@@ -335,7 +335,12 @@ case $ARCH in
+ set ${OBJECTS}
+ ABI32=`file $1 | grep 32-bit`
+ if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+- OPTS="-m32 ${OPTS}"
++ ABIX32=`file $1 | grep x86-64`
++ if [ "${ABI32}" ]; then
++ OPTS="-mx32 ${OPTS}"
++ else
++ OPTS="-m32 ${OPTS}"
++ fi
+ fi
+
+ if [ "${ALTOPTS}" ] ; then
+@@ -392,7 +397,12 @@ case $ARCH in
+ set ${OBJECTS}
+ ABI32=`file $1 | grep 32-bit`
+ if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+- OPTS="-m32 ${OPTS}"
++ ABIX32=`file $1 | grep x86-64`
++ if [ "${ABI32}" ]; then
++ OPTS="-mx32 ${OPTS}"
++ else
++ OPTS="-m32 ${OPTS}"
++ fi
+ fi
+ if [ "${ALTOPTS}" ] ; then
+ OPTS=${ALTOPTS}
diff --git a/recipes-graphics/mesa/mesa/remove_OES_EGL_image_externals.patch b/recipes-graphics/mesa/mesa/remove_OES_EGL_image_externals.patch
index c231483..6f5fa14 100644
--- a/recipes-graphics/mesa/mesa/remove_OES_EGL_image_externals.patch
+++ b/recipes-graphics/mesa/mesa/remove_OES_EGL_image_externals.patch
@@ -1,22 +1,22 @@
-Index: Mesa-8.0.1/src/glsl/builtins/profiles/OES_EGL_image_external.frag
-===================================================================
---- Mesa-8.0.1.orig/src/glsl/builtins/profiles/OES_EGL_image_external.frag 2012-03-20 18:22:02.645070696 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,6 +0,0 @@
--#version 100
--#extension GL_OES_EGL_image_external : enable
--
--vec4 texture2D(samplerExternalOES sampler, vec2 coord);
--vec4 texture2DProj(samplerExternalOES sampler, vec3 coord);
--vec4 texture2DProj(samplerExternalOES sampler, vec4 coord);
-Index: Mesa-8.0.1/src/glsl/builtins/profiles/OES_EGL_image_external.vert
-===================================================================
---- Mesa-8.0.1.orig/src/glsl/builtins/profiles/OES_EGL_image_external.vert 2012-03-20 18:22:02.661070696 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,6 +0,0 @@
--#version 100
--#extension GL_OES_EGL_image_external : enable
--
--vec4 texture2D(samplerExternalOES sampler, vec2 coord);
--vec4 texture2DProj(samplerExternalOES sampler, vec3 coord);
--vec4 texture2DProj(samplerExternalOES sampler, vec4 coord);
+Index: Mesa-8.0.1/src/glsl/builtins/profiles/OES_EGL_image_external.frag
+===================================================================
+--- Mesa-8.0.1.orig/src/glsl/builtins/profiles/OES_EGL_image_external.frag 2012-03-20 18:22:02.645070696 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,6 +0,0 @@
+-#version 100
+-#extension GL_OES_EGL_image_external : enable
+-
+-vec4 texture2D(samplerExternalOES sampler, vec2 coord);
+-vec4 texture2DProj(samplerExternalOES sampler, vec3 coord);
+-vec4 texture2DProj(samplerExternalOES sampler, vec4 coord);
+Index: Mesa-8.0.1/src/glsl/builtins/profiles/OES_EGL_image_external.vert
+===================================================================
+--- Mesa-8.0.1.orig/src/glsl/builtins/profiles/OES_EGL_image_external.vert 2012-03-20 18:22:02.661070696 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,6 +0,0 @@
+-#version 100
+-#extension GL_OES_EGL_image_external : enable
+-
+-vec4 texture2D(samplerExternalOES sampler, vec2 coord);
+-vec4 texture2DProj(samplerExternalOES sampler, vec3 coord);
+-vec4 texture2DProj(samplerExternalOES sampler, vec4 coord);
diff --git a/recipes-graphics/pango/pango-1.28.4/no-tests.patch b/recipes-graphics/pango/pango-1.28.4/no-tests.patch
index 4aa759d..6d9e74b 100644
--- a/recipes-graphics/pango/pango-1.28.4/no-tests.patch
+++ b/recipes-graphics/pango/pango-1.28.4/no-tests.patch
@@ -1,16 +1,16 @@
-Upstream-Status: Inappropriate [ disable tests make sense in embedded, but not appropriate for upstream]
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
-Index: pango-1.22.2/Makefile.am
-===================================================================
---- pango-1.22.2.orig/Makefile.am
-+++ pango-1.22.2/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in.
-
--SUBDIRS= pango modules pango-view examples docs tools tests
-+SUBDIRS= pango modules pango-view examples docs tools
-
- EXTRA_DIST = \
- autogen.sh \
+Upstream-Status: Inappropriate [ disable tests make sense in embedded, but not appropriate for upstream]
+
+Signed-off-by: Yu Ke <ke.yu@intel.com>
+
+Index: pango-1.22.2/Makefile.am
+===================================================================
+--- pango-1.22.2.orig/Makefile.am
++++ pango-1.22.2/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in.
+
+-SUBDIRS= pango modules pango-view examples docs tools tests
++SUBDIRS= pango modules pango-view examples docs tools
+
+ EXTRA_DIST = \
+ autogen.sh \
diff --git a/recipes-graphics/pango/pango-1.28.4/noconst.patch b/recipes-graphics/pango/pango-1.28.4/noconst.patch
new file mode 100644
index 0000000..d4832a5
--- /dev/null
+++ b/recipes-graphics/pango/pango-1.28.4/noconst.patch
@@ -0,0 +1,408 @@
+G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid
+build failures.
+
+RP 2011/10/12
+
+Upstream-Status: Pending
+
+Index: pango-1.28.4/pango/fonts.c
+===================================================================
+--- pango-1.28.4.orig/pango/fonts.c 2011-10-12 01:32:09.372046342 +0100
++++ pango-1.28.4/pango/fonts.c 2011-10-12 01:32:34.512036630 +0100
+@@ -165,7 +165,7 @@
+ * %NULL if not previously set. This has the same life-time
+ * as the font description itself and should not be freed.
+ **/
+-G_CONST_RETURN char *
++const char *
+ pango_font_description_get_family (const PangoFontDescription *desc)
+ {
+ g_return_val_if_fail (desc != NULL, NULL);
+@@ -1927,7 +1927,7 @@
+ * Return value: the name of the family. This string is owned
+ * by the family object and must not be modified or freed.
+ **/
+-G_CONST_RETURN char *
++const char *
+ pango_font_family_get_name (PangoFontFamily *family)
+ {
+ g_return_val_if_fail (PANGO_IS_FONT_FAMILY (family), NULL);
+@@ -2060,7 +2060,7 @@
+ * Return value: the face name for the face. This string is
+ * owned by the face object and must not be modified or freed.
+ **/
+-G_CONST_RETURN char *
++const char *
+ pango_font_face_get_face_name (PangoFontFace *face)
+ {
+ g_return_val_if_fail (PANGO_IS_FONT_FACE (face), NULL);
+Index: pango-1.28.4/pango/pango-attributes.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-attributes.c 2011-10-12 01:32:09.552046155 +0100
++++ pango-1.28.4/pango/pango-attributes.c 2011-10-12 01:32:34.522037975 +0100
+@@ -97,7 +97,7 @@
+ *
+ * Since: 1.22
+ **/
+-G_CONST_RETURN char *
++const char *
+ pango_attr_type_get_name (PangoAttrType type)
+ {
+ const char *result = NULL;
+Index: pango-1.28.4/pango/pango-attributes.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-attributes.h 2011-10-12 01:32:12.712046218 +0100
++++ pango-1.28.4/pango/pango-attributes.h 2011-10-12 01:32:36.342045777 +0100
+@@ -180,7 +180,7 @@
+ };
+
+ PangoAttrType pango_attr_type_register (const gchar *name);
+-G_CONST_RETURN char * pango_attr_type_get_name (PangoAttrType type) G_GNUC_CONST;
++const char * pango_attr_type_get_name (PangoAttrType type) G_GNUC_CONST;
+
+ void pango_attribute_init (PangoAttribute *attr,
+ const PangoAttrClass *klass);
+Index: pango-1.28.4/pango/pango-context.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-context.c 2011-10-12 01:32:09.782046152 +0100
++++ pango-1.28.4/pango/pango-context.c 2011-10-12 01:32:34.532039187 +0100
+@@ -188,7 +188,7 @@
+ *
+ * Since: 1.6
+ **/
+-G_CONST_RETURN PangoMatrix *
++const PangoMatrix *
+ pango_context_get_matrix (PangoContext *context)
+ {
+ g_return_val_if_fail (PANGO_IS_CONTEXT (context), NULL);
+Index: pango-1.28.4/pango/pango-context.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-context.h 2011-10-12 01:32:12.892046153 +0100
++++ pango-1.28.4/pango/pango-context.h 2011-10-12 01:32:36.352046105 +0100
+@@ -86,7 +86,7 @@
+
+ void pango_context_set_matrix (PangoContext *context,
+ const PangoMatrix *matrix);
+-G_CONST_RETURN PangoMatrix *pango_context_get_matrix (PangoContext *context);
++const PangoMatrix *pango_context_get_matrix (PangoContext *context);
+
+ /* Break a string of Unicode characters into segments with
+ * consistent shaping/language engine and bidrectional level.
+Index: pango-1.28.4/pango/pango-font.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-font.h 2011-10-12 01:32:13.072046150 +0100
++++ pango-1.28.4/pango/pango-font.h 2011-10-12 01:32:36.362046243 +0100
+@@ -117,7 +117,7 @@
+ const char *family);
+ void pango_font_description_set_family_static (PangoFontDescription *desc,
+ const char *family);
+-G_CONST_RETURN char *pango_font_description_get_family (const PangoFontDescription *desc) G_GNUC_PURE;
++const char *pango_font_description_get_family (const PangoFontDescription *desc) G_GNUC_PURE;
+ void pango_font_description_set_style (PangoFontDescription *desc,
+ PangoStyle style);
+ PangoStyle pango_font_description_get_style (const PangoFontDescription *desc) G_GNUC_PURE;
+@@ -212,7 +212,7 @@
+ void pango_font_family_list_faces (PangoFontFamily *family,
+ PangoFontFace ***faces,
+ int *n_faces);
+-G_CONST_RETURN char *pango_font_family_get_name (PangoFontFamily *family) G_GNUC_PURE;
++const char *pango_font_family_get_name (PangoFontFamily *family) G_GNUC_PURE;
+ gboolean pango_font_family_is_monospace (PangoFontFamily *family) G_GNUC_PURE;
+
+ #ifdef PANGO_ENABLE_BACKEND
+@@ -261,7 +261,7 @@
+ GType pango_font_face_get_type (void) G_GNUC_CONST;
+
+ PangoFontDescription *pango_font_face_describe (PangoFontFace *face);
+-G_CONST_RETURN char *pango_font_face_get_face_name (PangoFontFace *face) G_GNUC_PURE;
++const char *pango_font_face_get_face_name (PangoFontFace *face) G_GNUC_PURE;
+ void pango_font_face_list_sizes (PangoFontFace *face,
+ int **sizes,
+ int *n_sizes);
+Index: pango-1.28.4/pango/pango-fontmap.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-fontmap.c 2011-10-12 01:32:09.912046152 +0100
++++ pango-1.28.4/pango/pango-fontmap.c 2011-10-12 01:32:34.542040267 +0100
+@@ -290,7 +290,7 @@
+ *
+ * Since: 1.4
+ **/
+-G_CONST_RETURN char *
++const char *
+ pango_font_map_get_shape_engine_type (PangoFontMap *fontmap)
+ {
+ g_return_val_if_fail (PANGO_IS_FONT_MAP (fontmap), NULL);
+Index: pango-1.28.4/pango/pango-language.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-language.c 2011-10-12 01:32:10.052046151 +0100
++++ pango-1.28.4/pango/pango-language.c 2011-10-12 01:32:34.542040267 +0100
+@@ -319,7 +319,7 @@
+ * Returns: a string representing the language tag. This is owned by
+ * Pango and should not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ (pango_language_to_string) (PangoLanguage *language)
+ {
+ return pango_language_to_string (language);
+@@ -531,7 +531,7 @@
+ * Return value: the sample string. This value is owned by Pango
+ * and should not be freed.
+ **/
+-G_CONST_RETURN char *
++const char *
+ pango_language_get_sample_string (PangoLanguage *language)
+ {
+ const LangInfo *lang_info;
+@@ -592,7 +592,7 @@
+
+ * Since: 1.22
+ **/
+-G_CONST_RETURN PangoScript *
++const PangoScript *
+ pango_language_get_scripts (PangoLanguage *language,
+ int *num_scripts)
+ {
+Index: pango-1.28.4/pango/pango-language.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-language.h 2011-10-12 01:32:13.262046150 +0100
++++ pango-1.28.4/pango/pango-language.h 2011-10-12 01:32:36.362046243 +0100
+@@ -34,11 +34,11 @@
+ GType pango_language_get_type (void) G_GNUC_CONST;
+ PangoLanguage *pango_language_from_string (const char *language);
+
+-G_CONST_RETURN char *pango_language_to_string (PangoLanguage *language) G_GNUC_CONST;
++const char *pango_language_to_string (PangoLanguage *language) G_GNUC_CONST;
+ /* For back compat. Will have to keep indefinitely. */
+ #define pango_language_to_string(language) ((const char *)language)
+
+-G_CONST_RETURN char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST;
++const char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST;
+ PangoLanguage *pango_language_get_default (void) G_GNUC_CONST;
+
+ gboolean pango_language_matches (PangoLanguage *language,
+@@ -48,7 +48,7 @@
+
+ gboolean pango_language_includes_script (PangoLanguage *language,
+ PangoScript script) G_GNUC_PURE;
+-G_CONST_RETURN PangoScript *pango_language_get_scripts (PangoLanguage *language,
++const PangoScript *pango_language_get_scripts (PangoLanguage *language,
+ int *num_scripts);
+
+ G_END_DECLS
+Index: pango-1.28.4/pango/pango-layout.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-layout.c 2011-10-12 01:32:10.072046151 +0100
++++ pango-1.28.4/pango/pango-layout.c 2011-10-12 01:32:34.552041215 +0100
+@@ -677,7 +677,7 @@
+ *
+ * Since: 1.8
+ **/
+-G_CONST_RETURN PangoFontDescription *
++const PangoFontDescription *
+ pango_layout_get_font_description (PangoLayout *layout)
+ {
+ g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL);
+@@ -1087,7 +1087,7 @@
+ *
+ * Return value: the text in the @layout.
+ **/
+-G_CONST_RETURN char*
++const char*
+ pango_layout_get_text (PangoLayout *layout)
+ {
+ g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL);
+Index: pango-1.28.4/pango/pango-layout.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-layout.h 2011-10-12 01:32:13.302046150 +0100
++++ pango-1.28.4/pango/pango-layout.h 2011-10-12 01:32:36.362046243 +0100
+@@ -116,7 +116,7 @@
+ void pango_layout_set_font_description (PangoLayout *layout,
+ const PangoFontDescription *desc);
+
+-G_CONST_RETURN PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout);
++const PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout);
+
+ void pango_layout_set_width (PangoLayout *layout,
+ int width);
+Index: pango-1.28.4/pango/pango-ot-ruleset.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-ot-ruleset.c 2011-10-12 01:32:10.152046150 +0100
++++ pango-1.28.4/pango/pango-ot-ruleset.c 2011-10-12 01:32:34.552041215 +0100
+@@ -107,7 +107,7 @@
+ *
+ * Since: 1.18
+ **/
+-G_CONST_RETURN PangoOTRuleset *
++const PangoOTRuleset *
+ pango_ot_ruleset_get_for_description (PangoOTInfo *info,
+ const PangoOTRulesetDescription *desc)
+ {
+Index: pango-1.28.4/pango/pango-renderer.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-renderer.c 2011-10-12 01:32:10.192046151 +0100
++++ pango-1.28.4/pango/pango-renderer.c 2011-10-12 01:32:34.562041682 +0100
+@@ -1352,7 +1352,7 @@
+ *
+ * Since: 1.8
+ **/
+-G_CONST_RETURN PangoMatrix *
++const PangoMatrix *
+ pango_renderer_get_matrix (PangoRenderer *renderer)
+ {
+ g_return_val_if_fail (PANGO_IS_RENDERER (renderer), NULL);
+Index: pango-1.28.4/pango/pango-renderer.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-renderer.h 2011-10-12 01:32:13.402046150 +0100
++++ pango-1.28.4/pango/pango-renderer.h 2011-10-12 01:32:36.362046243 +0100
+@@ -249,7 +249,7 @@
+
+ void pango_renderer_set_matrix (PangoRenderer *renderer,
+ const PangoMatrix *matrix);
+-G_CONST_RETURN PangoMatrix *pango_renderer_get_matrix (PangoRenderer *renderer);
++const PangoMatrix *pango_renderer_get_matrix (PangoRenderer *renderer);
+
+ PangoLayout *pango_renderer_get_layout (PangoRenderer *renderer);
+ PangoLayoutLine *pango_renderer_get_layout_line (PangoRenderer *renderer);
+Index: pango-1.28.4/pango/pango-script.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-script.c 2011-10-12 01:32:10.212046151 +0100
++++ pango-1.28.4/pango/pango-script.c 2011-10-12 01:32:34.562041682 +0100
+@@ -165,8 +165,8 @@
+ **/
+ void
+ pango_script_iter_get_range (PangoScriptIter *iter,
+- G_CONST_RETURN char **start,
+- G_CONST_RETURN char **end,
++ const char **start,
++ const char **end,
+ PangoScript *script)
+ {
+ if (start)
+Index: pango-1.28.4/pango/pango-script.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-script.h 2011-10-12 01:32:13.422046150 +0100
++++ pango-1.28.4/pango/pango-script.h 2011-10-12 01:32:36.362046243 +0100
+@@ -129,8 +129,8 @@
+ PangoScriptIter *pango_script_iter_new (const char *text,
+ int length);
+ void pango_script_iter_get_range (PangoScriptIter *iter,
+- G_CONST_RETURN char **start,
+- G_CONST_RETURN char **end,
++ const char **start,
++ const char **end,
+ PangoScript *script);
+ gboolean pango_script_iter_next (PangoScriptIter *iter);
+ void pango_script_iter_free (PangoScriptIter *iter);
+Index: pango-1.28.4/pango/pango-utils.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-utils.c 2011-10-12 01:32:10.242046149 +0100
++++ pango-1.28.4/pango/pango-utils.c 2011-10-12 01:32:34.562041682 +0100
+@@ -689,7 +689,7 @@
+ * Return value: the Pango sysconf directory. The returned string should
+ * not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ pango_get_sysconf_subdirectory (void)
+ {
+ #ifdef G_OS_WIN32
+@@ -718,7 +718,7 @@
+ * Return value: the Pango lib directory. The returned string should
+ * not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ pango_get_lib_subdirectory (void)
+ {
+ #ifdef G_OS_WIN32
+Index: pango-1.28.4/pango/pango-utils.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-utils.h 2011-10-12 01:32:13.512046149 +0100
++++ pango-1.28.4/pango/pango-utils.h 2011-10-12 01:32:36.362046243 +0100
+@@ -82,13 +82,13 @@
+ * stored in the registry). The returned string should not be
+ * g_free'd.
+ */
+-G_CONST_RETURN char * pango_get_sysconf_subdirectory (void) G_GNUC_PURE;
++const char * pango_get_sysconf_subdirectory (void) G_GNUC_PURE;
+
+ /* Ditto for LIBDIR/pango. On Win32, use the same Pango
+ * installation directory. This returned string should not be
+ * g_free'd either.
+ */
+-G_CONST_RETURN char * pango_get_lib_subdirectory (void) G_GNUC_PURE;
++const char * pango_get_lib_subdirectory (void) G_GNUC_PURE;
+
+ #endif /* PANGO_ENABLE_BACKEND */
+
+@@ -131,10 +131,10 @@
+ int pango_version (void) G_GNUC_CONST;
+
+ /* Return run-time Pango version as an string */
+-G_CONST_RETURN char * pango_version_string (void) G_GNUC_CONST;
++const char * pango_version_string (void) G_GNUC_CONST;
+
+ /* Check that run-time Pango is as new as required */
+-G_CONST_RETURN char * pango_version_check (int required_major,
++const char * pango_version_check (int required_major,
+ int required_minor,
+ int required_micro) G_GNUC_CONST;
+
+Index: pango-1.28.4/pango/pangocairo-context.c
+===================================================================
+--- pango-1.28.4.orig/pango/pangocairo-context.c 2011-10-12 01:32:09.622046154 +0100
++++ pango-1.28.4/pango/pangocairo-context.c 2011-10-12 01:32:34.522037975 +0100
+@@ -260,7 +260,7 @@
+ *
+ * Since: 1.10
+ **/
+-G_CONST_RETURN cairo_font_options_t *
++const cairo_font_options_t *
+ pango_cairo_context_get_font_options (PangoContext *context)
+ {
+ PangoCairoContextInfo *info;
+@@ -286,7 +286,7 @@
+ * Return value: the combined set of font options. This value is owned
+ * by the context and must not be modified or freed.
+ **/
+-G_CONST_RETURN cairo_font_options_t *
++const cairo_font_options_t *
+ _pango_cairo_context_get_merged_font_options (PangoContext *context)
+ {
+ PangoCairoContextInfo *info = get_context_info (context, TRUE);
+Index: pango-1.28.4/pango/pangoft2.c
+===================================================================
+--- pango-1.28.4.orig/pango/pangoft2.c 2011-10-12 01:32:09.942046152 +0100
++++ pango-1.28.4/pango/pangoft2.c 2011-10-12 01:32:34.542040267 +0100
+@@ -520,7 +520,7 @@
+ return ((ft_error_description *) pkey)->code - ((ft_error_description *) pbase)->code;
+ }
+
+-G_CONST_RETURN char *
++const char *
+ _pango_ft2_ft_strerror (FT_Error error)
+ {
+ #undef __FTERRORS_H__
+Index: pango-1.28.4/pango/pangox-fontmap.c
+===================================================================
+--- pango-1.28.4.orig/pango/pangox-fontmap.c 2011-10-12 01:32:10.352046151 +0100
++++ pango-1.28.4/pango/pangox-fontmap.c 2011-10-12 01:32:34.572042704 +0100
+@@ -1441,7 +1441,7 @@
+ }
+
+
+-G_CONST_RETURN char *
++const char *
+ pango_x_fontmap_name_from_atom (PangoFontMap *fontmap,
+ Atom atom)
+ {
+@@ -1645,7 +1645,7 @@
+ }
+ }
+
+-static G_CONST_RETURN char *
++static const char *
+ pango_x_family_get_name (PangoFontFamily *family)
+ {
+ PangoXFamily *xfamily = PANGO_X_FAMILY (family);
diff --git a/recipes-graphics/pango/pango.inc b/recipes-graphics/pango/pango.inc
new file mode 100644
index 0000000..a8bd878
--- /dev/null
+++ b/recipes-graphics/pango/pango.inc
@@ -0,0 +1,56 @@
+SUMMARY = "Framework for layout and rendering of internationalized text"
+DESCRIPTION = "Pango is a library for laying out and rendering of text, \
+with an emphasis on internationalization. Pango can be used anywhere \
+that text layout is needed, though most of the work on Pango so far has \
+been done in the context of the GTK+ widget toolkit. Pango forms the \
+core of text and font handling for GTK+-2.x."
+HOMEPAGE = "http://www.pango.org/"
+BUGTRACKER = "http://bugzilla.gnome.org"
+SECTION = "libs"
+LICENSE = "LGPL"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pango/1.28/pango-1.28.4.tar.bz2"
+
+SRC_URI[md5sum] = "3f3989700f04e9117d30544a9078b3a0"
+SRC_URI[sha256sum] = "7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f"
+
+X11DEPENDS = "virtual/libx11 libxft"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
+
+PACKAGES_DYNAMIC = "pango-module-*"
+
+RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc"
+
+inherit autotools pkgconfig
+
+EXTRA_AUTORECONF = ""
+
+# seems to go wrong with default cflags
+FULL_OPTIMIZATION_arm = "-O2"
+
+EXTRA_OECONF = "--disable-glibtest \
+ --enable-explicit-deps=no \
+ --disable-debug \
+ ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
+
+LEAD_SONAME = "libpango-1.0*"
+LIBV = "1.6.0"
+
+postinst_prologue() {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+}
+
+python populate_packages_prepend () {
+ prologue = d.getVar("postinst_prologue", 1)
+
+ modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
+
+ do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
+}
+
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*${SOLIBS}"
+FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
+FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
diff --git a/recipes-graphics/pango/pango_1.28.4.bb b/recipes-graphics/pango/pango_1.28.4.bb
index 3d82fe4..d7af871 100644
--- a/recipes-graphics/pango/pango_1.28.4.bb
+++ b/recipes-graphics/pango/pango_1.28.4.bb
@@ -1,13 +1,13 @@
-require pango.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-
-PR = "r3"
-
-SRC_URI += "file://no-tests.patch"
-SRC_URI += "file://noconst.patch"
-
-SRC_URI[archive.md5sum] = "3f3989700f04e9117d30544a9078b3a0"
-SRC_URI[archive.sha256sum] = "7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f"
-
-#PARALLEL_MAKE = ""
+require pango.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+PR = "r3"
+
+SRC_URI += "file://no-tests.patch"
+SRC_URI += "file://noconst.patch"
+
+SRC_URI[archive.md5sum] = "3f3989700f04e9117d30544a9078b3a0"
+SRC_URI[archive.sha256sum] = "7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f"
+
+#PARALLEL_MAKE = ""
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
index 12170d7..c1938ab 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
@@ -1,26 +1,26 @@
-
-Section "Device"
- Identifier "Intel Graphics Driver"
- Driver "fbdev"
-EndSection
-
-Section "Monitor"
- Identifier "Generic Monitor"
- Option "DPMS"
-EndSection
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Intel Graphics Driver"
- Monitor "Generic Monitor"
- DefaultDepth 16
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
-EndSection
-
-Section "ServerFlags"
- Option "DontZap" "0"
-EndSection
+
+Section "Device"
+ Identifier "Intel Graphics Driver"
+ Driver "fbdev"
+EndSection
+
+Section "Monitor"
+ Identifier "Generic Monitor"
+ Option "DPMS"
+EndSection
+
+Section "Screen"
+ Identifier "Default Screen"
+ Device "Intel Graphics Driver"
+ Monitor "Generic Monitor"
+ DefaultDepth 16
+EndSection
+
+Section "ServerLayout"
+ Identifier "Default Layout"
+ Screen "Default Screen"
+EndSection
+
+Section "ServerFlags"
+ Option "DontZap" "0"
+EndSection
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
index cc0b93a..970b4bd 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
@@ -1,18 +1,18 @@
-DESCRIPTION = "X.Org X server configuration file"
-HOMEPAGE = "http://www.x.org"
-SECTION = "x11/base"
-LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r10"
-
-SRC_URI = "file://xorg.conf"
-
-CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install () {
- install -d ${D}/${sysconfdir}/X11
- install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
-}
-
+DESCRIPTION = "X.Org X server configuration file"
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/base"
+LICENSE = "MIT-X"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+PR = "r10"
+
+SRC_URI = "file://xorg.conf"
+
+CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_install () {
+ install -d ${D}/${sysconfdir}/X11
+ install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
+}
+
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/X.service b/recipes-graphics/xorg-xserver/xserver-xorg/X.service
index ba25065..dd91514 100644..100755
--- a/recipes-graphics/xorg-xserver/xserver-xorg/X.service
+++ b/recipes-graphics/xorg-xserver/xserver-xorg/X.service
@@ -1,11 +1,11 @@
-[Unit]
-Description=Starts the X Server
-
-[Service]
-Type=simple
-KillMode=none
-ExecStartPre=-/bin/rm -rf /var/log/Xorg*
-ExecStart=/usr/bin/X
-
-[Install]
+[Unit]
+Description=Starts the X Server
+
+[Service]
+Type=simple
+KillMode=none
+ExecStartPre=-/bin/rm -rf /var/log/Xorg*
+ExecStart=/usr/bin/X
+
+[Install]
WantedBy=multi-user.target \ No newline at end of file
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bbappend
index 3e90610..f6c5709 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bbappend
@@ -1,26 +1,26 @@
-LIB_DEPS := "${@oe_filter_out('mesa-dri', '${LIB_DEPS}', d)}"
-LIB_DEPS += "virtual/libgl"
-
-FILESEXTRAPATHS := "${THISDIR}/${PN}"
-SRC_URI_append = " file://X.service \
- "
-
-# If we don't have mesa-dri as virtual/gl we deactivate this support in xserver and
-# remove remove xorg-extension-glx from RDEPENDS as we user OPENGLES and EGL
-python () {
- if ((d.getVar("PREFERRED_PROVIDER_virtual/libgl", True) or "").find("mesa-dri") == -1):
- extraoeconf = d.getVar("EXTRA_OECONF", True)
- extraoeconf += " --disable-glx --disable-dri"
- d.setVar('EXTRA_OECONF', extraoeconf)
- else:
- d.setVar('RDEPENDS_xserver-xorg', "xserver-xorg-extension-glx")
-}
-
-do_install_append() {
- install -d ${D}/lib/systemd/system
- install -m 0755 ${WORKDIR}/X.service ${D}/lib/systemd/system
-}
-
-FILES_${PN} += "/lib/systemd/system"
-
-WARN_QA = "ldflags useless-rpaths rpaths staticdev"
+LIB_DEPS := "${@oe_filter_out('mesa-dri', '${LIB_DEPS}', d)}"
+LIB_DEPS += "virtual/libgl"
+
+FILESEXTRAPATHS := "${THISDIR}/${PN}"
+SRC_URI_append = " file://X.service \
+ "
+
+# If we don't have mesa-dri as virtual/gl we deactivate this support in xserver and
+# remove remove xorg-extension-glx from RDEPENDS as we user OPENGLES and EGL
+python () {
+ if ((d.getVar("PREFERRED_PROVIDER_virtual/libgl", True) or "").find("mesa-dri") == -1):
+ extraoeconf = d.getVar("EXTRA_OECONF", True)
+ extraoeconf += " --disable-glx --disable-dri"
+ d.setVar('EXTRA_OECONF', extraoeconf)
+ else:
+ d.setVar('RDEPENDS_xserver-xorg', "xserver-xorg-extension-glx")
+}
+
+do_install_append() {
+ install -d ${D}/lib/systemd/system
+ install -m 0755 ${WORKDIR}/X.service ${D}/lib/systemd/system
+}
+
+FILES_${PN} += "/lib/systemd/system"
+
+WARN_QA = "ldflags useless-rpaths rpaths staticdev"
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-01 09:56:44 +0000