* [PATCHv2 09/30] xserver-xf86: improve packaging and move shared definitions to .inc files
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1317648040.git.Martin.Jansa@gmail.com>
* introduce DISTRO_XORG_CONFIG_MANAGER for distribution to select
hal/udev/files
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xf86-common.inc | 114 +++++++++++++++++---
.../xorg-xserver/xserver-xf86-dri-lite.inc | 35 ++-----
.../xorg-xserver/xserver-xf86-lite.inc | 32 +-----
3 files changed, 110 insertions(+), 71 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
index 000aea3..81abfc9 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
@@ -2,8 +2,7 @@ DESCRIPTION = "The X.Org X server"
HOMEPAGE = "http://www.x.org"
SECTION = "x11/base"
LICENSE = "MIT-X"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
# xf86-*-* packages depend on an X server built with the xfree86 DDX
# so we have a virtual to represent that:
@@ -12,26 +11,115 @@ PROVIDES = "virtual/xserver-xf86"
# Other packages tend to just care that there is *an* X server:
PROVIDES += "virtual/xserver"
+# Config manager for xserver, options are: hal, udev, empty (for configuration in xorg.conf)
+DISTRO_XORG_CONFIG_MANAGER ?= "udev"
+
+# default none, enabled by DISTRO_XORG_CONFIG_MANAGER setting
+CONFIG_MANAGER_OPTION += "${@['--disable-config-hal','--enable-config-hal',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['hal']]}"
+CONFIG_MANAGER_OPTION += "${@['--disable-config-udev','--enable-config-udev',''][bb.data.getVar('DISTRO_XORG_CONFIG_MANAGER',d) in ['udev']]}"
+
XORG_PN = "xorg-server"
SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI += "file://macro_tweak.patch"
S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
-PACKAGES =+ "${PN}-utils"
+PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
-RDEPENDS_${PN} += "xserver-xf86-config xkeyboard-config"
+LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
-FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so ${libdir}/xorg/modules/*/*/*.so /etc/X11 "
-FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled"
+DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
-FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
- ${libdir}/xorg/modules/*/.debug \
- ${libdir}/xorg/modules/*/*/.debug \
- "
+EXTRA_OECONF += "--with-fop=no \
+ --disable-static \
+ --disable-acfb \
+ --disable-ccfb \
+ --disable-mcfb \
+ --disable-dga \
+ --disable-xinerama \
+ --disable-xf86misc \
+ --disable-xorgcfg \
+ --disable-record \
+ --disable-dmx \
+ --disable-xnest \
+ --disable-xvfb \
+ --enable-composite \
+ --sysconfdir=/etc/X11 \
+ --localstatedir=/var \
+ --with-fontdir=${datadir}/fonts/X11 \
+ --with-xkb-output=/var/lib/xkb \
+ ${CONFIG_MANAGER_OPTION} \
+ ac_cv_file__usr_share_sgml_X11_defs_ent=no \
+"
-SRC_URI += "file://macro_tweak.patch"
+# Split out some modules and extensions from the main package
+# These aren't needed for basic operations and only take up space:
+# 32.0k libdri.so
+# 336.0k libglx.so
+# 1360k libint10.so
+# 180.0k libwfb.so
+# 320.0k libxaa.so
+# 124.0k libxf1bpp.so
+# 84.0k libxf4bpp.so
+# librecord.so
+# libextmod.so
+# libdbe.so
+
+PACKAGES =+ "${PN}-security-policy \
+ ${PN}-sdl \
+ ${PN}-fbdev \
+ ${PN}-xprint \
+ ${PN}-xvfb \
+ ${PN}-utils \
+ ${PN}-xephyr \
+ ${PN}-multimedia-modules \
+ ${PN}-extension-dri \
+ ${PN}-extension-dri2 \
+ ${PN}-extension-glx \
+ ${PN}-extension-record \
+ ${PN}-extension-extmod \
+ ${PN}-extension-dbe \
+ ${PN}-module-libint10 \
+ ${PN}-module-libafb \
+ ${PN}-module-libwfb \
+ ${PN}-module-libmfb \
+ ${PN}-module-libcfb \
+ ${PN}-module-xaa \
+ ${PN}-module-libxf1bpp \
+ ${PN}-module-libxf4bpp"
+
+RDEPENDS_${PN} += "xorg-minimal-fonts"
+RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
+RDEPENDS_${PN}-xvfb += "xkeyboard-config"
-EXTRA_OECONF = "--with-fop=no"
+FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
+FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
+FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled"
+FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
+ ${libdir}/xorg/modules/*/.debug \
+ ${libdir}/xorg/modules/*/*/.debug \
+ "
+FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy"
+FILES_${PN}-sdl = "${bindir}/Xsdl"
+FILES_${PN}-fbdev = "${bindir}/Xfbdev"
+FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
+FILES_${PN}-xvfb = "${bindir}/Xvfb"
+FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
+FILES_${PN}-xephyr = "${bindir}/Xephyr"
+FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
+FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
+FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
+FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
+FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
+FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
+FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
+FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
+FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
+FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
+FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
+FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
+FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
+FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
+FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
index 3aca760..740c59d 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
@@ -1,37 +1,16 @@
require xserver-xf86-common.inc
-PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
+PROTO_DEPS += "xf86driproto dri2proto"
+LIB_DEPS += "virtual/libgl"
-LIB_DEPS = "pixman virtual/libgl libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
+inherit glx-use-tls
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
-
-RDEPENDS_${PN} += "hal xorg-minimal-fonts"
-
-FILES_${PN} += "${bindir}/Xorg "
-
-EXTRA_OECONF += "--disable-static \
- --disable-acfb \
- --disable-ccfb \
- --disable-mcfb \
- --disable-dga \
- --disable-xinerama \
- --disable-xf86misc \
- --disable-xorgcfg \
- --disable-record \
- --disable-dmx \
- --disable-xnest \
- --disable-xvfb \
- --enable-composite \
- --enable-glx-tls \
- --sysconfdir=/etc/X11 \
- --localstatedir=/var \
+EXTRA_OECONF += "\
+ --enable-dri \
+ --enable-dri2 \
--with-pic \
--with-int10=x86emu \
- --with-fontdir=${datadir}/fonts/X11 \
- --with-xkb-output=/var/lib/xkb \
- ac_cv_file__usr_share_sgml_X11_defs_ent=no"
+"
# Due to mesa-dri
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
index 5447058..a785e64 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
@@ -1,34 +1,6 @@
require xserver-xf86-common.inc
-PROVIDES += "xserver-xf86-lite"
-
-PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
-
-LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
-
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
-
-RDEPENDS_${PN} += "hal xorg-minimal-fonts"
-
-FILES_${PN} += "${bindir}/Xorg "
-
-EXTRA_OECONF += "--disable-static \
- --disable-acfb \
- --disable-ccfb \
- --disable-mcfb \
- --disable-dga \
- --disable-xinerama \
- --disable-xf86misc \
- --disable-xorgcfg \
- --disable-record \
- --disable-dmx \
- --disable-xnest \
- --disable-xvfb \
- --enable-composite \
+EXTRA_OECONF += "\
--disable-dri \
--disable-glx \
- --sysconfdir=/etc/X11 \
- --localstatedir=/var \
- --with-fontdir=${datadir}/fonts/X11 \
- --with-xkb-output=/var/lib/xkb \
- ac_cv_file__usr_share_sgml_X11_defs_ent=no"
+"
--
1.7.7
^ permalink raw reply related
* [PATCHv2 08/30] xserver-xf86-dri-lite: remove old git recipe
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1317648040.git.Martin.Jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 25 --------------------
1 files changed, 0 insertions(+), 25 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
deleted file mode 100644
index 066ff13..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require xserver-xf86-dri-lite.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-
-SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f"
-PE = "1"
-PR = "r1"
-PV = "1.10+git${SRCPV}"
-
-PROTO_DEPS += "xf86driproto dri2proto"
-
-DEPENDS += "font-util"
-
-RDEPENDS_${PN} += "xkeyboard-config"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \
- file://crosscompile.patch; \
- file://fix_macros1.patch;"
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch;"
-
-EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga"
-
-S = "${WORKDIR}/git"
--
1.7.7
^ permalink raw reply related
* [PATCHv2 07/30] rgb: import from meta-oe layer
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1317648040.git.Martin.Jansa@gmail.com>
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-app/rgb_1.0.4.bb | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
diff --git a/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb b/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
new file mode 100644
index 0000000..59dca2a
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+DEPENDS += " xproto util-macros"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "35c6cccbf25a872bdd62bfcb1a73d951"
+SRC_URI[sha256sum] = "80887da011ad086fff88bfd16c6d9d5ac7da45ef1bc9d0c192a6f370423370f1"
+
+FILES_${PN} += "${datadir}/X11"
--
1.7.7
^ permalink raw reply related
* [PATCHv2 06/30] xserver/mesa: Bump PR after libdrm packaging changes
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1317648040.git.Martin.Jansa@gmail.com>
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 2 +-
meta/recipes-graphics/mesa/mesa-dri_git.bb | 2 +-
.../xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb | 2 +-
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 2 +-
.../xorg-xserver/xserver-xf86-lite_1.10.1.bb | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
index aac7a1c..68f89a2 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
@@ -8,7 +8,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://crossfix.patch \
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index c4132d7..9e32d0a 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -13,7 +13,7 @@ DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
PV = "7.7+git${SRCPV}"
-PR = "r1"
+PR = "r2"
# most of our targets do not have DRI so will use mesa-xlib
DEFAULT_PREFERENCE = "-1"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
index ea57140..035e39c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
@@ -7,7 +7,7 @@ PROTO_DEPS += "xf86driproto dri2proto"
DEPENDS += "font-util"
PE = "1"
-PR = "r0"
+PR = "r1"
SRC_URI += "file://crosscompile.patch"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
index adefcdb..066ff13 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f"
PE = "1"
-PR = "r0"
+PR = "r1"
PV = "1.10+git${SRCPV}"
PROTO_DEPS += "xf86driproto dri2proto"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
index f9b3a64..5575c0f 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
@@ -2,7 +2,7 @@ require xserver-xf86-lite.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-PR = "r0"
+PR = "r1"
DEPENDS += "font-util"
--
1.7.7
^ permalink raw reply related
* [PATCHv2 05/30] libdrm: improve packaging
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1317648040.git.Martin.Jansa@gmail.com>
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/drm/libdrm.inc | 7 ++++---
meta/recipes-graphics/drm/libdrm_2.4.26.bb | 2 +-
meta/recipes-graphics/drm/libdrm_git.bb | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc
index 1ad9dc3..20d7f1f 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -15,7 +15,8 @@ DEPENDS += " libpciaccess"
inherit autotools pkgconfig
-PACKAGES =+ "libdrm-tests"
-FILES_libdrm-tests = "${bindir}/dr* ${bindir}/mode*"
+PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-kms"
+FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*"
+FILES_${PN}-drivers = "${libdir}/libdrm_*.so.*"
+FILES_${PN}-kms = "${libdir}/libkms*.so.*"
-LEAD_SONAME = "libdrm.so"
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.26.bb b/meta/recipes-graphics/drm/libdrm_2.4.26.bb
index e5aa6a4..f7a7307 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.26.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.26.bb
@@ -7,4 +7,4 @@ SRC_URI += "file://installtests.patch"
SRC_URI[md5sum] = "062569426773f69b11a47a7712bba770"
SRC_URI[sha256sum] = "b25b06ab5a077736044cbd9a3a05a9a23b873a0887ab1aaf93aa2b3218b2d3dc"
-PR = "r0"
+PR = "r1"
diff --git a/meta/recipes-graphics/drm/libdrm_git.bb b/meta/recipes-graphics/drm/libdrm_git.bb
index 7d4e1b3..85bd4fb 100644
--- a/meta/recipes-graphics/drm/libdrm_git.bb
+++ b/meta/recipes-graphics/drm/libdrm_git.bb
@@ -6,4 +6,4 @@ S = ${WORKDIR}/git
SRCREV = "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
PV = "2.4.15+git${SRCPV}"
-PR = "r0"
+PR = "r1"
--
1.7.7
^ permalink raw reply related
* [PATCHv2 03/30] xorg-driver: rename .inc files and merge some changes from meta-oe
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1317648040.git.Martin.Jansa@gmail.com>
From: Martin Jansa <martin.jansa@gmail.com>
* use INC_PR
* use BPN directly instead of XORG_PN
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-driver/xf86-input-evdev_2.6.0.bb | 4 ++--
.../xorg-driver/xf86-input-keyboard_1.6.0.bb | 4 ++--
.../xorg-driver/xf86-input-keyboard_git.bb | 3 ++-
.../xorg-driver/xf86-input-mouse_1.7.0.bb | 4 +++-
.../xorg-driver/xf86-input-mouse_git.bb | 4 ++--
.../xorg-driver/xf86-input-synaptics_1.4.0.bb | 4 +++-
.../xorg-driver/xf86-input-synaptics_git.bb | 3 ++-
.../xorg-driver/xf86-input-vmmouse_12.7.0.bb | 4 ++--
.../xorg-driver/xf86-video-intel_2.15.0.bb | 4 ++--
.../xorg-driver/xf86-video-intel_git.bb | 4 ++--
.../xorg-driver/xf86-video-omapfb_git.bb | 4 ++--
.../xorg-driver/xf86-video-vesa_2.3.0.bb | 4 +++-
.../xorg-driver/xf86-video-vmware_11.0.3.bb | 4 ++--
...86-driver-common.inc => xorg-driver-common.inc} | 14 +++++++-------
...xf86-input-common.inc => xorg-driver-input.inc} | 3 +--
...xf86-video-common.inc => xorg-driver-video.inc} | 2 +-
16 files changed, 38 insertions(+), 31 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-driver-common.inc => xorg-driver-common.inc} (66%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-common.inc => xorg-driver-input.inc} (81%)
rename meta/recipes-graphics/xorg-driver/{xf86-video-common.inc => xorg-driver-video.inc} (65%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
index a37be17..db6a3b3 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.6.0.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- event devices (evdev) input driver"
@@ -14,7 +14,7 @@ xorg.conf for each input device that will use this driver. "
LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16"
-PR = "r0"
+PR = "${INC_PR}.0"
SRC_URI[md5sum] = "f33fe9413bde68936d8909206a13e8a1"
SRC_URI[sha256sum] = "b0e7f3991a8183a4743196c3e16d7184d439b80bf43653aa2f45b0756a6753ac"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb
index 9b1441d..e374fbd 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.6.0.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- keyboard input driver"
@@ -9,7 +9,7 @@ core keyboard."
LIC_FILES_CHKSUM = "file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10"
-PR = "r0"
+PR = "${INC_PR}.0"
SRC_URI[md5sum] = "e2abe9f13e526a73cb68a7d257546eba"
SRC_URI[sha256sum] = "c46c790fec905d696573b7a374b10ab8b4389112a8f69993fe011006c99e858e"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
index fe8cee9..5bc0558 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- keyboard input driver"
@@ -9,6 +9,7 @@ core keyboard."
SRCREV = "3e28d68b50d291938734e9684b8296ca864f3892"
PV = "1.3.2+git${SRCPV}"
+PR = "${INC_PR}.0"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-keyboard;protocol=git"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
index fbc2c66..b4918ef 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.0.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- mouse input driver"
@@ -10,5 +10,7 @@ driver."
LIC_FILES_CHKSUM = "file://COPYING;md5=237eb1d1a602d29ef2af62d8fba60f19"
+PR = "${INC_PR}.0"
+
SRC_URI[md5sum] = "7f31472689c15b6de62eff04d0fb57d7"
SRC_URI[sha256sum] = "4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
index b4dd1ed..392892e 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- mouse input driver"
@@ -10,7 +10,7 @@ driver."
SRCREV = "ea5cfe804e112f320f14ad896c7802d53551d3e6"
PV = "1.3.0+git${SRCPV}"
-PR = "r2"
+PR = "${INC_PR}.0"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-mouse;protocol=git \
file://unbreak.patch"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.4.0.bb
index 39cd35f..a75d051 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.4.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.4.0.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- synaptics touchpad input driver"
@@ -10,6 +10,8 @@ advanced features of the touchpad to become available."
LIC_FILES_CHKSUM = "file://COPYING;md5=e395e21f3c21d4fc3a243783e85e9ab5"
+PR = "${INC_PR}.0"
+
DEPENDS += "libxi"
#
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
index dbfcef5..3b3db59 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
@@ -1,4 +1,4 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
SUMMARY = "X.Org X server -- synaptics touchpad input driver"
@@ -10,6 +10,7 @@ advanced features of the touchpad to become available."
SRCREV = "934bc0012f948c52aadc8eda912f7728fb7394a2"
PV = "0.15.2+git${SRCPV}"
+PR = "${INC_PR}.0"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics;protocol=git"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb
index 9535a8f..42e2b14 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb
@@ -1,7 +1,7 @@
-require xf86-input-common.inc
+require xorg-driver-input.inc
DESCRIPTION = "X.Org X server -- VMWare mouse input driver"
-PR = "r0"
+PR = "${INC_PR}.0"
RDEPENDS_${PN} += "xf86-input-mouse"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
index 6c9db59..caa8a40 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
@@ -1,4 +1,4 @@
-require xf86-video-common.inc
+require xorg-driver-video.inc
SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
@@ -9,7 +9,7 @@ Infrastructure (DRI)."
LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
-PR = "r0"
+PR = "${INC_PR}.0"
EXTRA_OECONF += "--disable-xvmc"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index 34fe533..ed1f269 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -1,4 +1,4 @@
-require xf86-video-common.inc
+require xorg-driver-video.inc
SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
@@ -12,7 +12,7 @@ DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \
SRCREV = "87ea531c5dc5b39809395b277c330854aaaaf019"
PV = "2.10.0+git${SRCPV}"
-PR = "r0"
+PR = "${INC_PR}.0"
EXTRA_OECONF += "--disable-xvmc --enable-dri --disable-static"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 66aa5c4..cf58302 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -1,4 +1,4 @@
-require xf86-driver-common.inc
+require xorg-driver-driver.inc
SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver"
@@ -11,7 +11,7 @@ DEPENDS += "virtual/libx11"
SRCREV = "044617665d6737f4909aab96f91b06261dff05d2"
PE = "1"
-PR = "r1"
+PR = "${INC_PR}.0"
PV = "0.1.1+git${SRCPV}"
SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
index 474c779..30e3dee 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
@@ -1,4 +1,4 @@
-require xf86-video-common.inc
+require xorg-driver-video.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=e5418e7a75e21268637984e70265e146"
@@ -11,6 +11,8 @@ can drive most VESA-compatible video cards, but only makes use of the \
basic standard VESA core that is common to these cards. The driver \
supports depths 8, 15 16 and 24."
+PR = "${INC_PR}.0"
+
DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
virtual/libgl xineramaproto xf86driproto libpciaccess"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.3.bb
index a0f6041..e77c918 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.3.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.3.bb
@@ -1,4 +1,4 @@
-require xf86-video-common.inc
+require xorg-driver-video.inc
SUMMARY = "X.Org X server -- VMware SVGA display driver"
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
DEPENDS += "virtual/libx11 libxvmc drm glproto \
virtual/libgl xineramaproto libpciaccess"
-PR = "r0"
+PR = "${INC_PR}.0"
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
diff --git a/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
similarity index 66%
rename from meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
rename to meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 34d03b2..801d8d3 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -5,14 +5,13 @@ SECTION = "x11/drivers"
LICENSE = "MIT-X"
PE = "1"
-PR = "r1"
+INC_PR = "r15"
DEPENDS = "virtual/xserver-xf86 xproto randrproto util-macros"
-XORG_PN = "${BPN}"
-SRC_URI = "${XORG_MIRROR}/individual/driver/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-${PV}"
+S = "${WORKDIR}/${BPN}-${PV}"
FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
@@ -27,7 +26,8 @@ do_configure_prepend () {
mv configure.ac.new configure.ac
}
-do_install_append () {
- # driver's la files are not packaged
- rm -f ${D}${libdir}/xorg/modules/drivers/*.la
+# FIXME: We don't want to include the libtool archives (*.la) from modules
+# directory, as they serve no useful purpose. Upstream should fix Makefile.am
+do_install_append() {
+ find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
}
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
similarity index 81%
rename from meta/recipes-graphics/xorg-driver/xf86-input-common.inc
rename to meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
index 6fc88cf..bf4ca6c 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
@@ -1,7 +1,6 @@
-include xf86-driver-common.inc
+include xorg-driver-common.inc
DEPENDS += "inputproto kbproto "
FILES_${PN} += " ${libdir}/xorg/modules/input/*.so"
FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug"
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
similarity index 65%
rename from meta/recipes-graphics/xorg-driver/xf86-video-common.inc
rename to meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
index f2e2817..57c80d1 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
@@ -1,4 +1,4 @@
-include xf86-driver-common.inc
+include xorg-driver-common.inc
DEPENDS =+ "renderproto videoproto xextproto fontsproto"
--
1.7.7
^ permalink raw reply related
* [PATCHv2 04/30] xf86-video-omapfb: bump SRCREV and add patch from meta-oe
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1317648040.git.Martin.Jansa@gmail.com>
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../0004-Attempt-to-fix-VRFB.patch | 325 ++++++++++++++++++++
.../xorg-driver/xf86-video-omapfb_git.bb | 20 +-
2 files changed, 335 insertions(+), 10 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
new file mode 100644
index 0000000..6b59b9f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
@@ -0,0 +1,325 @@
+From 9f034f7a83751e4d1bbff6dd742d54bd96d38230 Mon Sep 17 00:00:00 2001
+From: Eino-Ville Talvala <talvala@stanford.edu>
+Date: Tue, 23 Aug 2011 18:37:01 +0200
+Subject: [PATCH] Attempt to fix VRFB
+
+Upstream-Status: Pending
+
+http://dominion.thruhere.net/git/cgit.cgi/xf86-video-omapfb/commit/?h=koen/fixups&id=6833fc9f795265e4943d248103fbaf3463b515d6
+
+Signed-off-by: Sebastian Krzyszkowiak <dos@dosowisko.net>
+
+---
+ src/image-format-conversions.c | 4 +-
+ src/image-format-conversions.h | 2 +-
+ src/omapfb-driver.c | 28 +++++++++++++--
+ src/omapfb-xv-blizzard.c | 1 +
+ src/omapfb-xv-generic.c | 72 +++++++++++++++++++++++++++++++--------
+ src/omapfb-xv.c | 3 ++
+ 6 files changed, 88 insertions(+), 22 deletions(-)
+
+diff --git a/src/image-format-conversions.c b/src/image-format-conversions.c
+index dcefa9b..d43427d 100644
+--- a/src/image-format-conversions.c
++++ b/src/image-format-conversions.c
+@@ -38,13 +38,13 @@
+ #include "image-format-conversions.h"
+
+ /* Basic line-based copy for packed formats */
+-void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest)
++void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest)
+ {
+ int i;
+ int len = w * 2;
+ for (i = 0; i < h; i++)
+ {
+- memcpy(dest + i * len, src + i * stride, len);
++ memcpy(dest + i * dst_stride, src + i * src_stride, len);
+ }
+ }
+
+diff --git a/src/image-format-conversions.h b/src/image-format-conversions.h
+index 584896a..ba7caf2 100644
+--- a/src/image-format-conversions.h
++++ b/src/image-format-conversions.h
+@@ -27,7 +27,7 @@
+ #include <stdint.h>
+
+ /* Basic line-based copy for packed formats */
+-void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest);
++void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest);
+
+ /* Basic C implementation of YV12/I420 to UYVY conversion */
+ void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest);
+diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
+index 48aa09c..07989f5 100644
+--- a/src/omapfb-driver.c
++++ b/src/omapfb-driver.c
+@@ -66,6 +66,7 @@
+ #define OMAPFB_VERSION 1000
+ #define OMAPFB_DRIVER_NAME "OMAPFB"
+ #define OMAPFB_NAME "omapfb"
++#define ENFORCE_MODES
+
+ static Bool OMAPFBProbe(DriverPtr drv, int flags);
+ static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags);
+@@ -105,11 +106,13 @@ static SymTabRec OMAPFBChipsets[] = {
+ typedef enum {
+ OPTION_ACCELMETHOD,
+ OPTION_FB,
++ OPTION_ROTATE,
+ } FBDevOpts;
+
+ static const OptionInfoRec OMAPFBOptions[] = {
+ { OPTION_ACCELMETHOD, "AccelMethod", OPTV_STRING, {0}, FALSE },
+ { OPTION_FB, "fb", OPTV_STRING, {0}, FALSE },
++ { OPTION_ROTATE, "rotation", OPTV_STRING, {0}, FALSE },
+ { -1, NULL, OPTV_NONE, {0}, FALSE }
+ };
+
+@@ -286,6 +289,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
+ {
+ OMAPFBPtr ofb;
+ EntityInfoPtr pEnt;
++ char *rotate;
+ rgb zeros = { 0, 0, 0 };
+ struct stat st;
+
+@@ -379,6 +383,8 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags)
+ pScrn->progClock = TRUE;
+ pScrn->chipset = "omapfb";
+
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotate test version 0.02\n");
++
+ /* Start with configured virtual size */
+ pScrn->virtualX = pScrn->display->virtualX;
+ pScrn->virtualY = pScrn->display->virtualY;
+@@ -496,12 +502,21 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ ofb->CloseScreen = pScreen->CloseScreen;
+ pScreen->CloseScreen = OMAPFBCloseScreen;
+
++ /* Enforce the default mode (this is silly I guess) */
++#ifdef ENFORCE_MODES
++ //xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enforcing modes\n");
++ //set_mode(ofb, &ofb->default_mode);
++ //pScrn->displayWidth = ofb->fixed_info.line_length /
++ // (ofb->state_info.bits_per_pixel>>3); //ofb->state_info.xres;
++#endif
++
+ /* Map our framebuffer memory */
++ ofb->mem_info.size = ofb->fixed_info.line_length * ofb->state_info.yres;
+ ofb->fb = mmap (NULL, ofb->mem_info.size,
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ ofb->fd, 0);
+- if (ofb->fb == NULL) {
+- xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed\n");
++ if (ofb->fb == MAP_FAILED) {
++ xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size);
+ return FALSE;
+ }
+
+@@ -578,8 +593,13 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ } else if (!ofb->dss) {
+
+ ofb->plane_info.enabled = 1;
+- ofb->plane_info.out_width = ofb->state_info.xres;
+- ofb->plane_info.out_height = ofb->state_info.yres;
++ if (ofb->state_info.rotate == 0 || ofb->state_info.rotate == 2) {
++ ofb->plane_info.out_width = ofb->state_info.xres;
++ ofb->plane_info.out_height = ofb->state_info.yres;
++ } else {
++ ofb->plane_info.out_width = ofb->state_info.yres;
++ ofb->plane_info.out_height = ofb->state_info.xres;
++ }
+
+ if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) {
+ xf86DrvMsg(scrnIndex, X_ERROR,
+diff --git a/src/omapfb-xv-blizzard.c b/src/omapfb-xv-blizzard.c
+index 406ffc6..b71d2aa 100644
+--- a/src/omapfb-xv-blizzard.c
++++ b/src/omapfb-xv-blizzard.c
+@@ -220,6 +220,7 @@ int OMAPFBXVPutImageBlizzard (ScrnInfoPtr pScrn,
+ packed_line_copy(src_w & ~3,
+ src_h & ~3,
+ ((src_w + 1) & ~1) * 2,
++ ofb->port->fixed_info.line_length,
+ (uint8_t*)buf,
+ (uint8_t*)ofb->port->fb);
+ break;
+diff --git a/src/omapfb-xv-generic.c b/src/omapfb-xv-generic.c
+index e6f89fe..b33f344 100644
+--- a/src/omapfb-xv-generic.c
++++ b/src/omapfb-xv-generic.c
+@@ -62,7 +62,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
+ {
+ OMAPFBPtr ofb = OMAPFB(pScrn);
+
+- /* The memory size is already set in OMAPFBXVQueryImageAttributes */
++ /* The memory size is already set before we get here */
+ if (ioctl(ofb->port->fd, OMAPFB_SETUP_MEM, &ofb->port->mem_info) != 0) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Failed to allocate video plane memory\n");
+@@ -73,19 +73,20 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
+ ofb->port->fb = mmap (NULL, ofb->port->mem_info.size,
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ ofb->port->fd, 0);
+- if (ofb->port->fb == NULL) {
++ if (ofb->port->fb == MAP_FAILED) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Mapping video memory failed\n");
+ return XvBadAlloc;
+ }
+
+ /* Update the state info */
++ /* Let's not - it's bad
+ if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info))
+ {
+ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
+ return XvBadAlloc;
+ }
+-
++ */
+ return Success;
+ }
+
+@@ -93,6 +94,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn)
+ int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn)
+ {
+ OMAPFBPtr ofb = OMAPFB(pScrn);
++ int ret;
+
+ if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info))
+ {
+@@ -104,6 +106,31 @@ int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn)
+ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
+ return XvBadAlloc;
+ }
++ /* Changing rotation/nonstd flags can change the fixed info! */
++ if (ioctl (ofb->port->fd, FBIOGET_FSCREENINFO, &ofb->port->fixed_info))
++ {
++ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
++ return XvBadAlloc;
++ }
++ /* Correct fixed info requires recalculation of needed memory */
++ ofb->port->mem_info.size = ofb->port->fixed_info.line_length * ofb->port->state_info.yres;
++
++ /* Allocate buffer memory */
++ ret = OMAPXVAllocPlane(pScrn);
++ if (ret != Success)
++ return ret;
++
++ /* Workaround for reset of mode after memory allo */
++ if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info))
++ {
++ xf86Msg(X_ERROR, "%s: setting state info failed\n", __FUNCTION__);
++ return XvBadAlloc;
++ }
++ if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info))
++ {
++ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__);
++ return XvBadAlloc;
++ }
+
+ if(ioctl(ofb->port->fd, OMAPFB_SETUP_PLANE,
+ &ofb->port->plane_info) != 0) {
+@@ -124,6 +151,8 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
+ DrawablePtr pDraw)
+ {
+ OMAPFBPtr ofb = OMAPFB(pScrn);
++ short drw_temp;
++ short rot_xres, rot_yres;
+
+ if (!ofb->port->plane_info.enabled
+ || ofb->port->update_window.x != src_x
+@@ -163,13 +192,6 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
+ return Success;
+ }
+
+- /* If we don't have the plane running, enable it */
+- if (!ofb->port->plane_info.enabled) {
+- ret = OMAPXVAllocPlane(pScrn);
+- if (ret != Success)
+- return ret;
+- }
+-
+ /* Set up the state info, xres and yres will be used for
+ * scaling to the values in the plane info struct
+ */
+@@ -179,12 +201,31 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
+ ofb->port->state_info.yres_virtual = 0;
+ ofb->port->state_info.xoffset = 0;
+ ofb->port->state_info.yoffset = 0;
+- ofb->port->state_info.rotate = 0;
++ //ofb->port->state_info.rotate = 0;
+ ofb->port->state_info.grayscale = 0;
+ ofb->port->state_info.activate = FB_ACTIVATE_NOW;
+ ofb->port->state_info.bits_per_pixel = 0;
+ ofb->port->state_info.nonstd = xv_to_omapfb_format(image);
+
++ /* Plane info does not rotate with state_info */
++ if (ofb->port->state_info.rotate == 1 ||
++ ofb->port->state_info.rotate == 3) {
++ drw_temp = drw_x;
++ drw_x = drw_y;
++ drw_y = drw_temp;
++
++ drw_temp = drw_w;
++ drw_w = drw_h;
++ drw_h = drw_temp;
++
++ rot_xres = ofb->port->state_info.yres;
++ rot_yres = ofb->port->state_info.xres;
++ } else {
++ rot_xres = ofb->port->state_info.xres;
++ rot_yres = ofb->port->state_info.yres;
++ }
++
++
+ /* Set up the video plane info */
+ ofb->port->plane_info.enabled = 1;
+ ofb->port->plane_info.pos_x = drw_x;
+@@ -193,13 +234,13 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
+ ofb->port->plane_info.out_height = drw_h & ~15;
+
+ /* Cap output to screen size */
+- if (ofb->port->plane_info.out_width > ofb->state_info.xres) {
++ if (ofb->port->plane_info.out_width > rot_xres) {
+ ofb->port->plane_info.pos_x = 0;
+- ofb->port->plane_info.out_width = ofb->state_info.xres;
++ ofb->port->plane_info.out_width = rot_xres;
+ }
+- if (ofb->port->plane_info.out_height > ofb->state_info.yres) {
++ if (ofb->port->plane_info.out_height > rot_yres) {
+ ofb->port->plane_info.pos_y = 0;
+- ofb->port->plane_info.out_height = ofb->state_info.yres;
++ ofb->port->plane_info.out_height = rot_yres;
+ }
+
+ ret = OMAPXVSetupVideoPlane(pScrn);
+@@ -223,6 +264,7 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn,
+ packed_line_copy(src_w & ~15,
+ src_h & ~15,
+ ((src_w + 1) & ~1) * 2,
++ ofb->port->fixed_info.line_length,
+ (uint8_t*)buf,
+ (uint8_t*)ofb->port->fb);
+ break;
+diff --git a/src/omapfb-xv.c b/src/omapfb-xv.c
+index 1df651e..0fee2c6 100644
+--- a/src/omapfb-xv.c
++++ b/src/omapfb-xv.c
+@@ -169,8 +169,11 @@ static int OMAPFBXVQueryImageAttributes (ScrnInfoPtr pScrn,
+ h = *height;
+
+ w = (w + 1) & ~1;
++
++ /* Can't calculate these here - don't know line length
+ ofb->port->mem_info.size = w << 1;
+ ofb->port->mem_info.size *= h;
++ */
+
+ return size;
+ }
+--
+1.7.5.4
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index cf58302..565ad7e 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -1,25 +1,25 @@
-require xorg-driver-driver.inc
+require xorg-driver-video.inc
SUMMARY = "X.Org X server -- Texas Instruments OMAP framebuffer driver"
DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \
framebuffer."
-LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://src/omapfb-driver.c;beginline=1;endline=30;md5=a44c2a37e04d1c2c5f0313afb493f833"
+LICENSE = "MIT-X & GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f"
DEPENDS += "virtual/libx11"
-SRCREV = "044617665d6737f4909aab96f91b06261dff05d2"
-PE = "1"
-PR = "${INC_PR}.0"
-PV = "0.1.1+git${SRCPV}"
+SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f"
+PR = "${INC_PR}.5"
+PV = "0.1.1+gitr${SRCPV}"
-SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \
+SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \
file://omap-revert-set-CRTC-limit.patch \
file://omap-revert-set-virtual-size.patch \
file://omap-force-plain-mode.patch \
file://omap-blacklist-tv-out.patch \
- "
+ file://0004-Attempt-to-fix-VRFB.patch \
+"
S = "${WORKDIR}/git"
@@ -28,5 +28,5 @@ CFLAGS += " -I${STAGING_INCDIR}/xorg "
# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay)
do_compile_prepend_armv7a () {
- sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c
+ sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c
}
--
1.7.7
^ permalink raw reply related
* [PATCHv2 02/30] xorg-app-common: merge some changes from meta-oe
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1317648040.git.Martin.Jansa@gmail.com>
From: Martin Jansa <martin.jansa@gmail.com>
* use BPN directly instead of XORG_PN
* fix depends
* fix packaging
* add INC_PR (used by recipes in meta-oe now, but should be used here
too)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-app/xorg-app-common.inc | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
index 4add357..86e5c23 100644
--- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc
+++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
@@ -3,14 +3,14 @@ HOMEPAGE = "http://www.x.org/"
BUGTRACKER = "https://bugs.freedesktop.org"
SECTION = "x11/apps"
LICENSE = "MIT-X"
-DEPENDS = "util-macros virtual/libx11"
+DEPENDS = "util-macros-native virtual/libx11"
-XORG_PN = "${BPN}"
+INC_PR = "r5"
-SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-${PV}"
+S = "${WORKDIR}/${BPN}-${PV}"
inherit autotools pkgconfig
-FILES_${PN} += " /usr/lib/X11/${XORG_PN}"
+FILES_${PN} += " /usr/lib/X11/${BPN} /usr/share/X11/app-defaults/"
--
1.7.7
^ permalink raw reply related
* [PATCHv2 01/30] libxft, libxrender, renderproto: add native BBCLASSEXTEND
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1317648040.git.Martin.Jansa@gmail.com>
From: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb | 2 ++
meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb | 2 +-
.../xorg-proto/renderproto_0.11.1.bb | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
index ac7dfb1..0fb10e6 100644
--- a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
@@ -23,6 +23,8 @@ PE = "1"
XORG_PN = "libXft"
+BBCLASSEXTEND = "native nativesdk"
+
python () {
if bb.data.getVar('DEBIAN_NAMES', d, 1):
bb.data.setVar('PKG_${PN}', '${MLPREFIX}libxft2', d)
diff --git a/meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb b/meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
index a5c5ead..893ea14 100644
--- a/meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
+++ b/meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb
@@ -18,7 +18,7 @@ PE = "1"
XORG_PN = "libXrender"
-BBCLASSEXTEND = "nativesdk"
+BBCLASSEXTEND = "native nativesdk"
SRC_URI[md5sum] = "3b3b7d076c2384b6c600c0b5f4ba971f"
SRC_URI[sha256sum] = "7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668"
diff --git a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb b/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
index a352b1e..5eb06cb 100644
--- a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
+++ b/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
@@ -14,7 +14,7 @@ CONFLICTS = "renderext"
PR = "r0"
PE = "1"
-BBCLASSEXTEND = "nativesdk"
+BBCLASSEXTEND = "native nativesdk"
SRC_URI[md5sum] = "a914ccc1de66ddeb4b611c6b0686e274"
SRC_URI[sha256sum] = "06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537"
--
1.7.7
^ permalink raw reply related
* [PATCHv2 00/30] Xorg related changes
From: Martin Jansa @ 2011-10-03 13:28 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20111003103855.GN7364@jama.jama.net>
Hi,
this patchset brings meta-oe and oe-core xorg stuff together and most of
xorg recipes will be removed from meta-oe (sending another pull request now).
This step is needed to be able to separate common x11 to meta-x11 or whatever later.
The following changes since commit c54c1280fc0d06a53e23339c3913ec88eead13d9:
base.bbclass: Drop unneeded dependency (2011-09-30 11:34:44 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/x11
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11
Martin Jansa (29):
libxft, libxrender, renderproto: add native BBCLASSEXTEND
xorg-app-common: merge some changes from meta-oe
xorg-driver: rename .inc files and merge some changes from meta-oe
xf86-video-omapfb: bump SRCREV and add patch from meta-oe
libdrm: improve packaging
rgb: import from meta-oe layer
xserver-xf86-dri-lite: remove old git recipe
xserver-xf86: improve packaging and move shared definitions to .inc
files
xserver-xf86: add new version 1.11.1
xserver-xf86: remove old 1.10.1 version
xserver-xf86-dri-lite: remove COMPATIBLE_HOST
xserver-xf86: drop unused files
xserver-xf86: move patches to xserver-xf86-dri-lite-1.11.1 and use
same directory from xserver-xf86-lite recipe
xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
xserver-kdrive: drop unused files (same files are in
xserver-kdrive-1.7.99.2 directory
xorg-driver-common: bump INC_PR to rebuild drivers agains new
xserver-xorg ABI
libx11: package xcb, merge few changes from meta-oe
libx11: add new version 1.4.4
libx11: remove older 1.3.4
libx11: drop old 1.2.2 git version
libx11-trim: move files for libx11-trim from libx11-1.3.4 to
libx11-trim-1.3.4
libx11-diet: move old patches used only by libx11-diet-1.3 to
separate directory
libx11-diet: add SRC_URI checksums
xserver-nodm-init: merge some changes from meta-oe
glx-use-tls: add from meta-oe layer
mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move
uclibc.patch
mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2
was removed
mesa: add new version 7.11
mesa: drop older 7.10.2 and 7.7+git recipes
Richard Purdie (1):
xserver/mesa: Bump PR after libdrm packaging changes
meta/classes/glx-use-tls.bbclass | 7 +
meta/conf/distro/include/default-providers.inc | 4 +-
.../conf/distro/include/distro_tracking_fields.inc | 20 +-
meta/conf/machine/qemux86-64.conf | 6 +-
meta/conf/machine/qemux86.conf | 6 +-
meta/conf/multilib.conf | 2 +-
meta/recipes-graphics/drm/libdrm.inc | 7 +-
meta/recipes-graphics/drm/libdrm_2.4.26.bb | 2 +-
meta/recipes-graphics/drm/libdrm_git.bb | 2 +-
meta/recipes-graphics/mesa/mesa-7.11.inc | 15 +
meta/recipes-graphics/mesa/mesa-common.inc | 36 ++-
.../mesa/mesa-dri-glsl-native_7.11.bb | 28 +
.../mesa/mesa-dri-glsl-native_7.8.2.bb | 27 -
meta/recipes-graphics/mesa/mesa-dri.inc | 22 +
meta/recipes-graphics/mesa/mesa-dri/cross2.patch | 46 --
meta/recipes-graphics/mesa/mesa-dri/crossfix.patch | 18 -
meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h | 162 ------
meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 40 --
meta/recipes-graphics/mesa/mesa-dri_7.11.bb | 4 +
meta/recipes-graphics/mesa/mesa-dri_git.bb | 57 --
meta/recipes-graphics/mesa/mesa-xlib.inc | 1 +
meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 22 -
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb | 4 +
.../mesa/{mesa-dri => mesa}/uclibc.patch | 0
.../x11-common/xserver-nodm-init/xserver-nodm | 30 +-
meta/recipes-graphics/xorg-app/rgb_1.0.4.bb | 10 +
meta/recipes-graphics/xorg-app/xorg-app-common.inc | 10 +-
.../xorg-driver/xf86-input-evdev_2.6.0.bb | 4 +-
.../xorg-driver/xf86-input-keyboard_1.6.0.bb | 4 +-
.../xorg-driver/xf86-input-keyboard_git.bb | 3 +-
.../xorg-driver/xf86-input-mouse_1.7.0.bb | 4 +-
.../xorg-driver/xf86-input-mouse_git.bb | 4 +-
.../xorg-driver/xf86-input-synaptics_1.4.0.bb | 4 +-
.../xorg-driver/xf86-input-synaptics_git.bb | 3 +-
.../xorg-driver/xf86-input-vmmouse_12.7.0.bb | 4 +-
.../xorg-driver/xf86-video-intel_2.15.0.bb | 4 +-
.../xorg-driver/xf86-video-intel_git.bb | 4 +-
.../0004-Attempt-to-fix-VRFB.patch | 325 +++++++++++
.../xorg-driver/xf86-video-omapfb_git.bb | 20 +-
.../xorg-driver/xf86-video-vesa_2.3.0.bb | 4 +-
.../xorg-driver/xf86-video-vmware_11.0.3.bb | 4 +-
...86-driver-common.inc => xorg-driver-common.inc} | 14 +-
...xf86-input-common.inc => xorg-driver-input.inc} | 3 +-
...xf86-video-common.inc => xorg-driver-video.inc} | 2 +-
.../xorg-lib/libx11-1.4.4/keysymdef_include.patch | 23 +
.../libx11-1.4.4/x11_disable_makekeys.patch | 29 +
.../{libx11 => libx11-diet-1.3}/X18NCMSstubs.diff | 0
.../fix-disable-xlocale.diff | 0
.../fix-utf8-wrong-define.patch | 0
.../include_fix.patch | 0
.../{libx11-git => libx11-diet-1.3}/nodolt.patch | 0
.../x11_disable_makekeys.patch | 0
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 6 +-
meta/recipes-graphics/xorg-lib/libx11-diet_git.bb | 17 -
.../xorg-lib/libx11-git/X18NCMSstubs.diff | 570 --------------------
.../xorg-lib/libx11-git/x11_disable_makekeys.patch | 30 -
.../include_fix.patch | 0
.../makekeys_crosscompile.patch | 0
.../nodolt.patch | 0
.../x11_disable_makekeys.patch | 0
.../xorg-lib/libx11-trim/include_fix.patch | 25 -
.../xorg-lib/libx11-trim/nodolt.patch | 14 -
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb | 10 +-
meta/recipes-graphics/xorg-lib/libx11-trim_git.bb | 13 -
meta/recipes-graphics/xorg-lib/libx11.inc | 25 +-
.../xorg-lib/libx11/fix-disable-xlocale.diff | 16 -
.../xorg-lib/libx11/fix-utf8-wrong-define.patch | 17 -
.../xorg-lib/libx11/include_fix.patch | 25 -
meta/recipes-graphics/xorg-lib/libx11/nodolt.patch | 14 -
.../xorg-lib/libx11/x11_disable_makekeys.patch | 31 --
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 35 --
meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb | 18 +
meta/recipes-graphics/xorg-lib/libx11_git.bb | 14 -
meta/recipes-graphics/xorg-lib/libx11_git.inc | 11 -
meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb | 2 +
meta/recipes-graphics/xorg-lib/libxrender_0.9.6.bb | 2 +-
.../xorg-proto/renderproto_0.11.1.bb | 2 +-
.../xorg-xserver/files/macro_tweak.patch | 20 -
.../xorg-xserver/xserver-kdrive/disable-apm.patch | 24 -
.../xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 43 --
.../xorg-xserver/xserver-kdrive/extra-kmodes.patch | 87 ---
.../xserver-kdrive/fbdev_xrandr_ioctl.patch | 63 ---
.../xserver-kdrive/no-serial-probing.patch | 17 -
.../xorg-xserver/xserver-xf86-common.inc | 37 --
.../xorg-xserver/xserver-xf86-dri-lite.inc | 37 --
.../cache-xkbcomp-output-for-fast-start-up.patch | 360 ------------
.../xserver-xf86-dri-lite/fix_macros1.patch | 24 -
.../fix_open_max_preprocessor_error.patch | 15 -
.../xserver-xf86-dri-lite/macro_tweak.patch | 30 -
.../xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb | 20 -
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 25 -
.../xorg-xserver/xserver-xf86-lite.inc | 34 --
.../xserver-xf86-lite/crosscompile.patch | 22 -
.../xorg-xserver/xserver-xf86-lite_1.10.1.bb | 12 -
.../xorg-xserver/xserver-xorg-1.11.1.inc | 7 +
.../crosscompile.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 7 +-
.../xorg-xserver/xserver-xorg-common.inc | 126 +++++
.../xorg-xserver/xserver-xorg-lite.inc | 6 +
.../xorg-xserver/xserver-xorg-lite_1.11.1.bb | 4 +
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 13 +
.../xorg-xserver/xserver-xorg_1.11.1.bb | 4 +
103 files changed, 792 insertions(+), 2192 deletions(-)
create mode 100644 meta/classes/glx-use-tls.bbclass
create mode 100644 meta/recipes-graphics/mesa/mesa-7.11.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-dri.inc
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/cross2.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.11.bb
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_git.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib.inc
delete mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/uclibc.patch (100%)
create mode 100644 meta/recipes-graphics/xorg-app/rgb_1.0.4.bb
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-Attempt-to-fix-VRFB.patch
rename meta/recipes-graphics/xorg-driver/{xf86-driver-common.inc => xorg-driver-common.inc} (66%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-common.inc => xorg-driver-input.inc} (81%)
rename meta/recipes-graphics/xorg-driver/{xf86-video-common.inc => xorg-driver-video.inc} (65%)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/X18NCMSstubs.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-git => libx11-diet-1.3}/fix-disable-xlocale.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-git => libx11-diet-1.3}/fix-utf8-wrong-define.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-git => libx11-diet-1.3}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-git => libx11-diet-1.3}/nodolt.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-trim => libx11-diet-1.3}/x11_disable_makekeys.patch (100%)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/makekeys_crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/nodolt.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/x11_disable_makekeys.patch (100%)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_git.inc
delete mode 100644 meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-1.11.1}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg-1.11.1}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg-1.11.1}/macro_tweak.patch (74%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
--
1.7.7
^ permalink raw reply
* Re: [RFC] .la files cleanup
From: Richard Purdie @ 2011-10-03 11:32 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: openembedded-core
In-Reply-To: <CALT56yPoAbv43D_CGsGHMjr+eQxhNUJAW_Ryznoi7Tz8tb7THA@mail.gmail.com>
On Mon, 2011-10-03 at 14:58 +0400, Dmitry Eremin-Solenikov wrote:
> Proposal: extend some bbclass with a task to remove unused .la files
>
> Rationale: There are lots of recipes, which install tons of .la files
> (thanks libtool),
> but then do not ship them (correctly as most of them are unused in
> real systems).
> My proposal would be to include a special task or a
> do_install_append() part that
> will remove specified .la files. (like ${libdir}/xorg/modules/*/.la,
> ${libdir}/matchbox-panel/*.la, etc.). I see this usually done in
> do_install or in special do_install_append
> parts, but I think it would be better to handle this globally.
I think the simple append to the recipes concerned is just as simple as
any addition to core classes to try and do this generically...
Cheers,
Richard
^ permalink raw reply
* oe-core/meta-oe PN clash
From: Dmitry Eremin-Solenikov @ 2011-10-03 11:01 UTC (permalink / raw)
To: openembedded-core, openembedded-devel
Hello,
I've stumbled upon two different packages with same PN (screenshot):
One is a sato-related screenshoter from oe-core,
second is a e17 screenshot module from meta-efl.
I'd propose to rename a sato screenshot package, since e17 one
depends on PN being equal to internal module name in several places.
--
With best wishes
Dmitry
^ permalink raw reply
* [RFC] .la files cleanup
From: Dmitry Eremin-Solenikov @ 2011-10-03 10:58 UTC (permalink / raw)
To: openembedded-core
Proposal: extend some bbclass with a task to remove unused .la files
Rationale: There are lots of recipes, which install tons of .la files
(thanks libtool),
but then do not ship them (correctly as most of them are unused in
real systems).
My proposal would be to include a special task or a
do_install_append() part that
will remove specified .la files. (like ${libdir}/xorg/modules/*/.la,
${libdir}/matchbox-panel/*.la, etc.). I see this usually done in
do_install or in special do_install_append
parts, but I think it would be better to handle this globally.
--
With best wishes
Dmitry
^ permalink raw reply
* Re: [PATCH 00/13] Xorg related changes
From: Richard Purdie @ 2011-10-03 10:51 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <20111003103855.GN7364@jama.jama.net>
On Mon, 2011-10-03 at 12:38 +0200, Martin Jansa wrote:
> On Fri, Sep 30, 2011 at 12:28:39PM +0100, Richard Purdie wrote:
> > On Fri, 2011-09-30 at 09:26 +0200, Martin Jansa wrote:
> > > Hi,
> > >
> > > this patchset brings meta-oe and oe-core xorg stuff together and most of
> > > xorg recipes will be removed from meta-oe (sending another pull request now).
> > >
> > > This step is needed to be able to separate common x11 to meta-x11 or whatever later.
> > >
> > > The following changes since commit 96241de59fdf548ae0f80cc9e4668f9ba11924ef:
> > >
> > > Fix flac build on e500mc cores (2011-09-29 19:31:38 +0100)
> > >
> > > are available in the git repository at:
> > > git://git.openembedded.org/openembedded-core-contrib jansa/x11
> > > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11
> > >
> > > Martin Jansa (13):
> > > xorg-driver: rename .inc files and merge some changes from meta-oe
> > > libxft, libxrender, renderproto: add native BBCLASSEXTEND
> > > xorg-app-common: merge some changes from meta-oe
> > > xf86-video-omapfb: bump SRCREV and add patch from meta-oe
> > > rgb: import from meta-oe layer
> > > libdrm: improve packaging
> >
> > I'll take these ones. I've queued them on a master-next branch for now
> > as I want to give other people some time to comment on them. If there
> > isn't negative feedback I'll take them in ~24 hours.
> >
> > I've given feedback on why I think these need further work:
> >
> > > xserver-xf86: upgrade to 1.11.0 and move shared definitions to .inc
> > > files
> > > xserver-xf86-dri-lite: remove COMPATIBLE_HOST
> > > libx11: upgrade to 1.4.4
> > > default-providers: define PREFERRED_PROVIDER_virtual/libx11-native
> > > xserver-nodm-init: merge some changes from meta-oe
> > > glx-use-tls: add from meta-oe layer
> > > mesa: upgrade to 7.11
>
> I've updated jansa/x11 branch according to your comments, now 17 patches
> instead of 7 :).
>
> Before I send updated pull-request, what do you think about renaming
> xserver-xf86 to xserver-xorg which is closer to upstream naming and
> that's how it's named in OE-classic and meta-oe? It would make meta-oe
> transition easier and better to do it now then convert meta-oe to
> xserver-xf86 and then rename it back later.
I'm ok with renaming it. I think the historical reasons for the
differences don't matter now.
Cheers,
Richard
^ permalink raw reply
* Re: [PATCH 00/13] Xorg related changes
From: Martin Jansa @ 2011-10-03 10:38 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1317382126.12332.167.camel@ted>
[-- Attachment #1: Type: text/plain, Size: 2269 bytes --]
On Fri, Sep 30, 2011 at 12:28:39PM +0100, Richard Purdie wrote:
> On Fri, 2011-09-30 at 09:26 +0200, Martin Jansa wrote:
> > Hi,
> >
> > this patchset brings meta-oe and oe-core xorg stuff together and most of
> > xorg recipes will be removed from meta-oe (sending another pull request now).
> >
> > This step is needed to be able to separate common x11 to meta-x11 or whatever later.
> >
> > The following changes since commit 96241de59fdf548ae0f80cc9e4668f9ba11924ef:
> >
> > Fix flac build on e500mc cores (2011-09-29 19:31:38 +0100)
> >
> > are available in the git repository at:
> > git://git.openembedded.org/openembedded-core-contrib jansa/x11
> > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11
> >
> > Martin Jansa (13):
> > xorg-driver: rename .inc files and merge some changes from meta-oe
> > libxft, libxrender, renderproto: add native BBCLASSEXTEND
> > xorg-app-common: merge some changes from meta-oe
> > xf86-video-omapfb: bump SRCREV and add patch from meta-oe
> > rgb: import from meta-oe layer
> > libdrm: improve packaging
>
> I'll take these ones. I've queued them on a master-next branch for now
> as I want to give other people some time to comment on them. If there
> isn't negative feedback I'll take them in ~24 hours.
>
> I've given feedback on why I think these need further work:
>
> > xserver-xf86: upgrade to 1.11.0 and move shared definitions to .inc
> > files
> > xserver-xf86-dri-lite: remove COMPATIBLE_HOST
> > libx11: upgrade to 1.4.4
> > default-providers: define PREFERRED_PROVIDER_virtual/libx11-native
> > xserver-nodm-init: merge some changes from meta-oe
> > glx-use-tls: add from meta-oe layer
> > mesa: upgrade to 7.11
I've updated jansa/x11 branch according to your comments, now 17 patches
instead of 7 :).
Before I send updated pull-request, what do you think about renaming
xserver-xf86 to xserver-xorg which is closer to upstream naming and
that's how it's named in OE-classic and meta-oe? It would make meta-oe
transition easier and better to do it now then convert meta-oe to
xserver-xf86 and then rename it back later.
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply
* [PATCH] eglibc-2.14: add patch to fix libdl crash
From: mokml @ 2011-10-03 9:30 UTC (permalink / raw)
To: openembedded-core; +Cc: Klaus Kurzmann
From: Klaus Kurzmann <mok@fluxnetz.de>
* Without this patch programs using alsa-lib crash (alsamixer for example).
* This patch is taken verbatim from ArchLinux.
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
---
.../eglibc-2.14/glibc-2.14-libdl-crash.patch | 132 ++++++++++++++++++++
meta/recipes-core/eglibc/eglibc_2.14.bb | 3 +-
2 files changed, 134 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch b/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch
new file mode 100644
index 0000000..ee29f8c
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/glibc-2.14-libdl-crash.patch
@@ -0,0 +1,132 @@
+diff --git a/elf/dl-close.c b/elf/dl-close.c
+index 73b2a2f..9bd91e3 100644
+--- a/elf/dl-close.c
++++ b/elf/dl-close.c
+@@ -1,5 +1,5 @@
+ /* Close a shared object opened by `_dl_open'.
+- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
+ if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
+ || dl_close_state != not_pending)
+ {
+- if (map->l_direct_opencount == 0)
+- {
+- if (map->l_type == lt_loaded)
+- dl_close_state = rerun;
+- else if (map->l_type == lt_library)
+- {
+- struct link_map **oldp = map->l_initfini;
+- map->l_initfini = map->l_orig_initfini;
+- _dl_scope_free (oldp);
+- }
+- }
++ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
++ dl_close_state = rerun;
+
+ /* There are still references to this object. Do nothing more. */
+ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
+diff --git a/elf/dl-deps.c b/elf/dl-deps.c
+index 9e30594..3890d00 100644
+--- a/elf/dl-deps.c
++++ b/elf/dl-deps.c
+@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
+ nneeded * sizeof needed[0]);
+ atomic_write_barrier ();
+ l->l_initfini = l_initfini;
++ l->l_free_initfini = 1;
+ }
+
+ /* If we have no auxiliary objects just go on to the next map. */
+@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
+ l_initfini[nlist] = NULL;
+ atomic_write_barrier ();
+ map->l_initfini = l_initfini;
++ map->l_free_initfini = 1;
+ if (l_reldeps != NULL)
+ {
+ atomic_write_barrier ();
+@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
+ _dl_scope_free (old_l_reldeps);
+ }
+ if (old_l_initfini != NULL)
+- map->l_orig_initfini = old_l_initfini;
++ _dl_scope_free (old_l_initfini);
+ }
+diff --git a/elf/dl-libc.c b/elf/dl-libc.c
+index 7be9483..a13fce3 100644
+--- a/elf/dl-libc.c
++++ b/elf/dl-libc.c
+@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
+
+ for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
+ {
+- /* Remove all additional names added to the objects. */
+ for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
+ {
+ struct libname_list *lnp = l->l_libname->next;
+
+ l->l_libname->next = NULL;
+
++ /* Remove all additional names added to the objects. */
+ while (lnp != NULL)
+ {
+ struct libname_list *old = lnp;
+@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
+ if (! old->dont_free)
+ free (old);
+ }
++
++ /* Free the initfini dependency list. */
++ if (l->l_free_initfini)
++ free (l->l_initfini);
+ }
+
+ if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 4a9109e..617e30e 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+ lnp->dont_free = 1;
+ lnp = lnp->next;
+ }
++ l->l_free_initfini = 0;
+
+ if (l != &GL(dl_rtld_map))
+ _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
+diff --git a/include/link.h b/include/link.h
+index e877104..051b99a 100644
+--- a/include/link.h
++++ b/include/link.h
+@@ -1,6 +1,6 @@
+ /* Data structure for communication from the run-time dynamic linker for
+ loaded ELF shared objects.
+- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -192,6 +192,9 @@ struct link_map
+ during LD_TRACE_PRELINKING=1
+ contains any DT_SYMBOLIC
+ libraries. */
++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
++ freed, ie. not allocated with
++ the dummy malloc in ld.so. */
+
+ /* Collected information about own RPATH directories. */
+ struct r_search_path_struct l_rpath_dirs;
+@@ -240,9 +243,6 @@ struct link_map
+
+ /* List of object in order of the init and fini calls. */
+ struct link_map **l_initfini;
+- /* The init and fini list generated at startup, saved when the
+- object is also loaded dynamically. */
+- struct link_map **l_orig_initfini;
+
+ /* List of the dependencies introduced through symbol binding. */
+ struct link_map_reldeps
diff --git a/meta/recipes-core/eglibc/eglibc_2.14.bb b/meta/recipes-core/eglibc/eglibc_2.14.bb
index b2821db..4129947 100644
--- a/meta/recipes-core/eglibc/eglibc_2.14.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.14.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "15225"
DEPENDS += "gperf-native"
-PR = "r0"
+PR = "r1"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_14"
@@ -19,6 +19,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
file://ppc-sqrt.patch \
file://multilib_readlib.patch \
file://eglibc-rpc-export-again.patch \
+ file://glibc-2.14-libdl-crash.patch \
"
LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
--
1.7.6.4
^ permalink raw reply related
* Re: Problem building gcc-cross-initial with latest linaro patches.
From: James Limbouris @ 2011-10-03 3:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <CAEsOVNd8rh+-KqYWd=Tngp1GfLavxb5FZgNEAHMc42iK5Gn-dw@mail.gmail.com>
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> McClintock Matthew-B29882
> Sent: Monday, 3 October 2011 11:18 AM
> To: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] Problem building gcc-cross-initial with latest linaro
> patches.
>
> On Sun, Oct 2, 2011 at 9:46 PM, James Limbouris
> <james@digitalmatter.com.au> wrote:
> > | xterm Xt error: Can't open display:
> > | xterm: DISPLAY is not set
> > | ERROR: Error executing a python function in /home/james/oe/sources/oe-
> core/meta/recipes-devtools/
>
> Did you have the DISPLAY setup properly though? I noticed some issue
> with this. Some point in the past an xterm would pop up properly, then
> it stopped working and I could not longer get a TERMCMD prompt.
>
> -M
I have a working DISPLAY in the shell that I launch bitbake from. Is anyone aware of any additional setup required?
^ permalink raw reply
* Re: Problem building gcc-cross-initial with latest linaro patches.
From: James Limbouris @ 2011-10-03 3:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <CAMKF1soAt6UMSO+_M-S4Fgc4f5HU=wYQWnz-YMxdHa94222NVQ@mail.gmail.com>
On Monday, 3 October 2011 11:15 AM, Khem Raj wrote:
>> Which again is a bit confusing - I can't see any reason why the patch shouldn't apply.
>
> I have posted a patch for meta-oe which you should cherry pick. The oe-core gcc has been updated and meta oe needed to be adjusted too
>>
>> Regards,
>> James Limbouris
Thanks Khem, I must have missed it earlier.
James
^ permalink raw reply
* Re: Problem building gcc-cross-initial with latest linaro patches.
From: McClintock Matthew-B29882 @ 2011-10-03 3:17 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <840A81C1B782724A8EB52725BD519EFF19BD42@MBX20.4emm.local>
On Sun, Oct 2, 2011 at 9:46 PM, James Limbouris
<james@digitalmatter.com.au> wrote:
> | xterm Xt error: Can't open display:
> | xterm: DISPLAY is not set
> | ERROR: Error executing a python function in /home/james/oe/sources/oe-core/meta/recipes-devtools/
Did you have the DISPLAY setup properly though? I noticed some issue
with this. Some point in the past an xterm would pop up properly, then
it stopped working and I could not longer get a TERMCMD prompt.
-M
^ permalink raw reply
* Re: Problem building gcc-cross-initial with latest linaro patches.
From: Khem Raj @ 2011-10-03 3:14 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <840A81C1B782724A8EB52725BD519EFF19BD42@MBX20.4emm.local>
[-- Attachment #1: Type: text/plain, Size: 11673 bytes --]
On Sunday, October 2, 2011, James Limbouris <james@digitalmatter.com.au>
wrote:
> Hi,
>
> I'm getting the following build error with gcc-cross-initial:
>
> NOTE: package gcc-cross-initial-4.6.1+svnr178924-r16: task do_patch:
Started
> ERROR: Error executing a python function in
/home/james/oe/sources/oe-core/meta/recipes-devtools/gcc/
gcc-cross-initial_4.6.bb:
> AttributeError: 'module' object has no attribute 'domain'
>
> ERROR: The stack trace of python calls that resulted in this
exception/failure was:
> ERROR: File "patch_do_patch", line 136, in <module>
> ERROR:
> ERROR: File "patch_do_patch", line 133, in patch_do_patch
> ERROR:
> ERROR: File "/home/james/oe/sources/oe-core/meta/lib/oe/patch.py", line
379, in Resolve
> ERROR: bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual
patch resolution - '%s' not found. " \
> ERROR:
> ERROR: The code that was being executed was:
> ERROR: 0132: raise
bb.build.FuncFailed(str(sys.exc_value))
> ERROR: 0133: resolver.Resolve()
> ERROR: 0134:
> ERROR: 0135:
> ERROR: *** 0136:patch_do_patch(d)
> ERROR: 0137:
> ERROR: (file: 'patch_do_patch', lineno: 136, function: <module>)
> ERROR: 0129: patchset.Import({"file":local,
"remote":url, "strippath": striplevel}, True)
> ERROR: 0130: except Exception:
> ERROR: 0131: import sys
> ERROR: 0132: raise
bb.build.FuncFailed(str(sys.exc_value))
> ERROR: *** 0133: resolver.Resolve()
> ERROR: 0134:
> ERROR: 0135:
> ERROR: 0136:patch_do_patch(d)
> ERROR: 0137:
> ERROR: (file: 'patch_do_patch', lineno: 133, function: patch_do_patch)
> ERROR: Function 'patch_do_patch' failed
> ERROR: Logfile of failure stored in:
/home/james/oe/build/tmp-eglibc/work-shared/gcc-4.6.1+svnr178924-r16/temp/log.do_patch.15960
> Log data follows:
> | NOTE: Applying patch 'gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch)
> | NOTE: Applying patch '100-uclibc-conf.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/100-uclibc-conf.patch)
> | NOTE: Applying patch 'gcc-uclibc-locale-ctype_touplow_t.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-uclibc-locale-ctype_touplow_t.patch)
> | NOTE: Applying patch 'cache-amnesia.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/cache-amnesia.patch)
> | NOTE: Applying patch 'gcc-flags-for-build.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch)
> | NOTE: Applying patch '103-uclibc-conf-noupstream.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/103-uclibc-conf-noupstream.patch)
> | NOTE: Applying patch '200-uclibc-locale.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/200-uclibc-locale.patch)
> | NOTE: Applying patch '203-uclibc-locale-no__x.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/203-uclibc-locale-no__x.patch)
> | NOTE: Applying patch '204-uclibc-locale-wchar_fix.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch)
> | NOTE: Applying patch '205-uclibc-locale-update.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/205-uclibc-locale-update.patch)
> | NOTE: Applying patch '301-missing-execinfo_h.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/301-missing-execinfo_h.patch)
> | NOTE: Applying patch '302-c99-snprintf.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/302-c99-snprintf.patch)
> | NOTE: Applying patch '303-c99-complex-ugly-hack.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/303-c99-complex-ugly-hack.patch)
> | NOTE: Applying patch '304-index_macro.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/304-index_macro.patch)
> | NOTE: Applying patch '305-libmudflap-susv3-legacy.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/305-libmudflap-susv3-legacy.patch)
> | NOTE: Applying patch '306-libstdc++-namespace.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/306-libstdc++-namespace.patch)
> | NOTE: Applying patch '740-sh-pr24836.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/740-sh-pr24836.patch)
> | NOTE: Applying patch '800-arm-bigendian.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/800-arm-bigendian.patch)
> | NOTE: Applying patch '904-flatten-switch-stmt-00.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/904-flatten-switch-stmt-00.patch)
> | NOTE: Applying patch 'arm-nolibfloat.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/arm-nolibfloat.patch)
> | NOTE: Applying patch 'arm-softfloat.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/arm-softfloat.patch)
> | NOTE: Applying patch 'zecke-xgcc-cpp.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/zecke-xgcc-cpp.patch)
> | NOTE: Applying patch 'gcc-poison-system-directories.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch)
> | NOTE: Applying patch 'gcc-poison-dir-extend.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-dir-extend.patch)
> | NOTE: Applying patch 'gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch)
> | NOTE: Applying patch '64bithack.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch)
> | NOTE: Applying patch 'optional_libstdc.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch)
> | NOTE: Applying patch 'disable_relax_pic_calls_flag.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/disable_relax_pic_calls_flag.patch)
> | NOTE: Applying patch 'GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch)
> | NOTE: Applying patch 'COLLECT_GCC_OPTIONS.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/COLLECT_GCC_OPTIONS.patch)
> | NOTE: Applying patch 'volatile_access_backport.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/volatile_access_backport.patch)
> | NOTE: Applying patch 'use-defaults.h-and-t-oe-in-B.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/use-defaults.h-and-t-oe-in-B.patch)
> | NOTE: Applying patch 'powerpc-e5500.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch)
> | NOTE: Applying patch 'fix-for-ice-50099.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch)
> | NOTE: Applying patch 'gcc-with-linker-hash-style.patch'
(sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch)
> | NOTE: Applying patch 'gcc-4.6-linaro-r106720.patch'
(sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106720.patch)
> | NOTE: Applying patch 'gcc-4.6-linaro-r106723.patch'
(sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106723.patch)
> | NOTE: Applying patch 'gcc-4.6-linaro-r106729.patch'
(sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106729.patch)
> | NOTE: Applying patch 'gcc-4.6-linaro-r106733.patch'
(sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106733.patch)
> | NOTE: Applying patch 'gcc-4.6-linaro-r106737.patch'
(sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106737.patch)
> | NOTE: Applying patch 'gcc-4.6-linaro-r106738.patch'
(sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106738.patch)
> | NOTE: Applying patch 'gcc-4.6-linaro-r106739.patch'
(sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106739.patch)
> | NOTE: Applying patch 'gcc-4.6-linaro-r106740.patch'
(sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106740.patch)
> | NOTE: Applying patch 'gcc-4.6-linaro-r106741.patch'
(sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch)
> | xterm Xt error: Can't open display:
> | xterm: DISPLAY is not set
> | ERROR: Error executing a python function in
/home/james/oe/sources/oe-core/meta/recipes-devtools/gcc/
gcc-cross-initial_4.6.bb:
> | AttributeError: 'module' object has no attribute 'domain'
> |
> | ERROR: The stack trace of python calls that resulted in this
exception/failure was:
> | ERROR: File "patch_do_patch", line 136, in <module>
> | ERROR:
> | ERROR: File "patch_do_patch", line 133, in patch_do_patch
> | ERROR:
> | ERROR: File "/home/james/oe/sources/oe-core/meta/lib/oe/patch.py",
line 379, in Resolve
> | ERROR: bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with
manual patch resolution - '%s' not found. " \
> | ERROR:
> | ERROR: The code that was being executed was:
> | ERROR: 0132: raise
bb.build.FuncFailed(str(sys.exc_value))
> | ERROR: 0133: resolver.Resolve()
> | ERROR: 0134:
> | ERROR: 0135:
> | ERROR: *** 0136:patch_do_patch(d)
> | ERROR: 0137:
> | ERROR: (file: 'patch_do_patch', lineno: 136, function: <module>)
> | ERROR: 0129: patchset.Import({"file":local,
"remote":url, "strippath": striplevel}, True)
> | ERROR: 0130: except Exception:
> | ERROR: 0131: import sys
> | ERROR: 0132: raise
bb.build.FuncFailed(str(sys.exc_value))
> | ERROR: *** 0133: resolver.Resolve()
> | ERROR: 0134:
> | ERROR: 0135:
> | ERROR: 0136:patch_do_patch(d)
> | ERROR: 0137:
> | ERROR: (file: 'patch_do_patch', lineno: 133, function: patch_do_patch)
> | ERROR: Function 'patch_do_patch' failed
> NOTE: package gcc-cross-initial-4.6.1+svnr178924-r16: task do_patch:
Failed
> ERROR: Task 2 (/home/james/oe/sources/oe-core/meta/recipes-devtools/gcc/
gcc-cross-initial_4.6.bb, do_patch) failed with exit code '1'
> ERROR: '/home/james/oe/sources/oe-core/meta/recipes-devtools/gcc/
gcc-cross-initial_4.6.bb' failed
>
>
> I'm not sure why the manual patch resolution isn't working - does it work
for other people?
> When I try to apply the patch manually, I get the following hunk failure
in gcc/combine.c:
>
> ***************
> *** 5629,5635 ****
> {
> /* Try to simplify the expression further. */
> rtx tor = simplify_gen_binary (IOR, mode, XEXP (x, 0), XEXP (x,
1));
> - temp = combine_simplify_rtx (tor, mode, in_dest);
>
> /* If we could, great. If not, do not go ahead with the IOR
> replacement, since PLUS appears in many special purpose
> --- 5635,5641 ----
> {
> /* Try to simplify the expression further. */
> rtx tor = simplify_gen_binary (IOR, mode, XEXP (x, 0), XEXP (x,
1));
> + temp = combine_simplify_rtx (tor, mode, in_dest, 0);
>
> /* If we could, great. If not, do not go ahead with the IOR
> replacement, since PLUS appears in many special purpose
>
> Which again is a bit confusing - I can't see any reason why the patch
shouldn't apply.
I have posted a patch for meta-oe which you should cherry pick. The oe-core
gcc has been updated and meta oe needed to be adjusted too
>
> Regards,
> James Limbouris
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 13770 bytes --]
^ permalink raw reply
* Problem building gcc-cross-initial with latest linaro patches.
From: James Limbouris @ 2011-10-03 2:46 UTC (permalink / raw)
To: openembedded-core@lists.openembedded.org
Hi,
I'm getting the following build error with gcc-cross-initial:
NOTE: package gcc-cross-initial-4.6.1+svnr178924-r16: task do_patch: Started
ERROR: Error executing a python function in /home/james/oe/sources/oe-core/meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb:
AttributeError: 'module' object has no attribute 'domain'
ERROR: The stack trace of python calls that resulted in this exception/failure was:
ERROR: File "patch_do_patch", line 136, in <module>
ERROR:
ERROR: File "patch_do_patch", line 133, in patch_do_patch
ERROR:
ERROR: File "/home/james/oe/sources/oe-core/meta/lib/oe/patch.py", line 379, in Resolve
ERROR: bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \
ERROR:
ERROR: The code that was being executed was:
ERROR: 0132: raise bb.build.FuncFailed(str(sys.exc_value))
ERROR: 0133: resolver.Resolve()
ERROR: 0134:
ERROR: 0135:
ERROR: *** 0136:patch_do_patch(d)
ERROR: 0137:
ERROR: (file: 'patch_do_patch', lineno: 136, function: <module>)
ERROR: 0129: patchset.Import({"file":local, "remote":url, "strippath": striplevel}, True)
ERROR: 0130: except Exception:
ERROR: 0131: import sys
ERROR: 0132: raise bb.build.FuncFailed(str(sys.exc_value))
ERROR: *** 0133: resolver.Resolve()
ERROR: 0134:
ERROR: 0135:
ERROR: 0136:patch_do_patch(d)
ERROR: 0137:
ERROR: (file: 'patch_do_patch', lineno: 133, function: patch_do_patch)
ERROR: Function 'patch_do_patch' failed
ERROR: Logfile of failure stored in: /home/james/oe/build/tmp-eglibc/work-shared/gcc-4.6.1+svnr178924-r16/temp/log.do_patch.15960
Log data follows:
| NOTE: Applying patch 'gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch)
| NOTE: Applying patch '100-uclibc-conf.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/100-uclibc-conf.patch)
| NOTE: Applying patch 'gcc-uclibc-locale-ctype_touplow_t.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-uclibc-locale-ctype_touplow_t.patch)
| NOTE: Applying patch 'cache-amnesia.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/cache-amnesia.patch)
| NOTE: Applying patch 'gcc-flags-for-build.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch)
| NOTE: Applying patch '103-uclibc-conf-noupstream.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/103-uclibc-conf-noupstream.patch)
| NOTE: Applying patch '200-uclibc-locale.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/200-uclibc-locale.patch)
| NOTE: Applying patch '203-uclibc-locale-no__x.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/203-uclibc-locale-no__x.patch)
| NOTE: Applying patch '204-uclibc-locale-wchar_fix.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch)
| NOTE: Applying patch '205-uclibc-locale-update.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/205-uclibc-locale-update.patch)
| NOTE: Applying patch '301-missing-execinfo_h.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/301-missing-execinfo_h.patch)
| NOTE: Applying patch '302-c99-snprintf.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/302-c99-snprintf.patch)
| NOTE: Applying patch '303-c99-complex-ugly-hack.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/303-c99-complex-ugly-hack.patch)
| NOTE: Applying patch '304-index_macro.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/304-index_macro.patch)
| NOTE: Applying patch '305-libmudflap-susv3-legacy.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/305-libmudflap-susv3-legacy.patch)
| NOTE: Applying patch '306-libstdc++-namespace.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/306-libstdc++-namespace.patch)
| NOTE: Applying patch '740-sh-pr24836.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/740-sh-pr24836.patch)
| NOTE: Applying patch '800-arm-bigendian.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/800-arm-bigendian.patch)
| NOTE: Applying patch '904-flatten-switch-stmt-00.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/904-flatten-switch-stmt-00.patch)
| NOTE: Applying patch 'arm-nolibfloat.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/arm-nolibfloat.patch)
| NOTE: Applying patch 'arm-softfloat.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/arm-softfloat.patch)
| NOTE: Applying patch 'zecke-xgcc-cpp.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/zecke-xgcc-cpp.patch)
| NOTE: Applying patch 'gcc-poison-system-directories.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch)
| NOTE: Applying patch 'gcc-poison-dir-extend.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-dir-extend.patch)
| NOTE: Applying patch 'gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch)
| NOTE: Applying patch '64bithack.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch)
| NOTE: Applying patch 'optional_libstdc.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch)
| NOTE: Applying patch 'disable_relax_pic_calls_flag.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/disable_relax_pic_calls_flag.patch)
| NOTE: Applying patch 'GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch)
| NOTE: Applying patch 'COLLECT_GCC_OPTIONS.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/COLLECT_GCC_OPTIONS.patch)
| NOTE: Applying patch 'volatile_access_backport.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/volatile_access_backport.patch)
| NOTE: Applying patch 'use-defaults.h-and-t-oe-in-B.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/use-defaults.h-and-t-oe-in-B.patch)
| NOTE: Applying patch 'powerpc-e5500.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch)
| NOTE: Applying patch 'fix-for-ice-50099.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch)
| NOTE: Applying patch 'gcc-with-linker-hash-style.patch' (sources/oe-core/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106720.patch' (sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106720.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106723.patch' (sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106723.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106729.patch' (sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106729.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106733.patch' (sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106733.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106737.patch' (sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106737.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106738.patch' (sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106738.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106739.patch' (sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106739.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106740.patch' (sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106740.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106741.patch' (sources/meta-oe/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch)
| xterm Xt error: Can't open display:
| xterm: DISPLAY is not set
| ERROR: Error executing a python function in /home/james/oe/sources/oe-core/meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb:
| AttributeError: 'module' object has no attribute 'domain'
|
| ERROR: The stack trace of python calls that resulted in this exception/failure was:
| ERROR: File "patch_do_patch", line 136, in <module>
| ERROR:
| ERROR: File "patch_do_patch", line 133, in patch_do_patch
| ERROR:
| ERROR: File "/home/james/oe/sources/oe-core/meta/lib/oe/patch.py", line 379, in Resolve
| ERROR: bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \
| ERROR:
| ERROR: The code that was being executed was:
| ERROR: 0132: raise bb.build.FuncFailed(str(sys.exc_value))
| ERROR: 0133: resolver.Resolve()
| ERROR: 0134:
| ERROR: 0135:
| ERROR: *** 0136:patch_do_patch(d)
| ERROR: 0137:
| ERROR: (file: 'patch_do_patch', lineno: 136, function: <module>)
| ERROR: 0129: patchset.Import({"file":local, "remote":url, "strippath": striplevel}, True)
| ERROR: 0130: except Exception:
| ERROR: 0131: import sys
| ERROR: 0132: raise bb.build.FuncFailed(str(sys.exc_value))
| ERROR: *** 0133: resolver.Resolve()
| ERROR: 0134:
| ERROR: 0135:
| ERROR: 0136:patch_do_patch(d)
| ERROR: 0137:
| ERROR: (file: 'patch_do_patch', lineno: 133, function: patch_do_patch)
| ERROR: Function 'patch_do_patch' failed
NOTE: package gcc-cross-initial-4.6.1+svnr178924-r16: task do_patch: Failed
ERROR: Task 2 (/home/james/oe/sources/oe-core/meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb, do_patch) failed with exit code '1'
ERROR: '/home/james/oe/sources/oe-core/meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb' failed
I'm not sure why the manual patch resolution isn't working - does it work for other people?
When I try to apply the patch manually, I get the following hunk failure in gcc/combine.c:
***************
*** 5629,5635 ****
{
/* Try to simplify the expression further. */
rtx tor = simplify_gen_binary (IOR, mode, XEXP (x, 0), XEXP (x, 1));
- temp = combine_simplify_rtx (tor, mode, in_dest);
/* If we could, great. If not, do not go ahead with the IOR
replacement, since PLUS appears in many special purpose
--- 5635,5641 ----
{
/* Try to simplify the expression further. */
rtx tor = simplify_gen_binary (IOR, mode, XEXP (x, 0), XEXP (x, 1));
+ temp = combine_simplify_rtx (tor, mode, in_dest, 0);
/* If we could, great. If not, do not go ahead with the IOR
replacement, since PLUS appears in many special purpose
Which again is a bit confusing - I can't see any reason why the patch shouldn't apply.
Regards,
James Limbouris
^ permalink raw reply
* [PATCH 2/2] qt4: packaging fixup
From: Dmitry Eremin-Solenikov @ 2011-10-02 21:46 UTC (permalink / raw)
To: openembedded-core; +Cc: Dmitry Eremin-Solenikov
In-Reply-To: <1317591971-22553-1-git-send-email-dbaryshkov@gmail.com>
Improve packaging:
* Add phrasebook packages to DYNAMIC_PACKAGES
* Correct phrasebook packages generation
* Include more files into -dbg packages
* Package fontdir and fonts README.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 13 ++++++++-----
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 53e1297..79473c9 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.1 | GPLv3"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r34"
+INC_PR = "r35"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index f76a97f..f391028 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r31"
+INC_PR = "r32"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index eb01a1b..d6382f5 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -50,7 +50,7 @@ python __anonymous () {
${libdir}/lib%(name)s${QT_LIBINFIX}.so
${includedir}/${QT_DIR_NAME}/%(incname)s
${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals(), d)
- bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
+ bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals(), d)
bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d)
lib_packages.append(pkg)
dev_packages.append("%s-dev" % pkg)
@@ -67,7 +67,7 @@ python __anonymous () {
${libdir}/lib%(name)s.so
${includedir}/${QT_DIR_NAME}/%(incname)s
${libdir}/pkgconfig/%(name)s.pc""" % locals(), d)
- bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so.*" % locals(), d)
+ bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so*" % locals(), d)
bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d)
lib_packages.append(pkg)
dev_packages.append("%s-dev" % pkg)
@@ -104,7 +104,7 @@ OTHER_PACKAGES = "\
#We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before.
PACKAGES =+ "${QT_BASE_NAME}-demos-doc"
PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
-PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*"
+PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*"
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
@@ -157,6 +157,7 @@ FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa"
FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb"
FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf"
+FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir"
FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts"
FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts"
FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool"
@@ -171,7 +172,7 @@ FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/
FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*"
FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*"
FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*"
-FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug"
+FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug"
do_configure() {
unset QMAKESPEC
@@ -233,8 +234,10 @@ python populate_packages_prepend() {
phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
import os;
- if os.path.exists(phrasebook_dir):
+ if os.path.exists("%s%s" % (bb.data.expand('${D}',d), phrasebook_dir)):
do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
+ else:
+ bb.note("The path does not exist:", bb.data.expand('${D}', d), phrasebook_dir)
# Package all the plugins and their -dbg version and create a meta package
def qtopia_split(path, name, glob):
--
1.7.2.5
^ permalink raw reply related
* [PATCH 1/2] qt4: Fix translation support
From: Dmitry Eremin-Solenikov @ 2011-10-02 21:46 UTC (permalink / raw)
To: openembedded-core; +Cc: Dmitry Eremin-Solenikov
From: Otavio Salvador <otavio@ossystems.com.br>
The translation support was disable in build. The
fix-translation.patch was imported from OpenEmbedded to fix a linking
issue in phonon translation support.
[Dmitry Eremin-Solenikov: ported to apply to qt 4.7.4 build, bumped PR]
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
meta/recipes-qt/qt4/qt-4.7.4.inc | 9 ++---
.../recipes-qt/qt4/qt-4.7.4/fix-translations.patch | 32 ++++++++++++++++++++
meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | 2 +-
meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | 2 +-
4 files changed, 38 insertions(+), 7 deletions(-)
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index 5c06bbe..bc33b6b 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -13,6 +13,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://0009-support-2bpp.patch \
file://0001-Added-Openembedded-crossarch-option.patch \
file://blacklist-diginotar-certs.diff \
+ file://fix-translations.patch \
file://g++.conf \
file://linux.conf \
file://fix-qtbug-20925.patch \
@@ -27,7 +28,9 @@ FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
do_configure_prepend() {
for pro in $(find ${S} -name "*.pro") ; do
- sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
+ sed -i \
+ -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \
+ -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro
done
sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
@@ -39,10 +42,6 @@ do_configure_prepend() {
${S}/configure
}
-do_configure_append() {
- sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
-}
-
QT_GLFLAGS ?= ""
QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch b/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch
new file mode 100644
index 0000000..906d4e3
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch
@@ -0,0 +1,32 @@
+fix phony translation linking error
+
+ | .../usr/lib/crt1.o: In function `_start':
+ | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
+ | collect2: ld returned 1 exit status
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+
+diff --git a/translations/translations.pro b/translations/translations.pro
+index cdaf04a..24fa668 100644
+--- a/translations/translations.pro
++++ b/translations/translations.pro
+@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
+ updateqm.CONFIG += no_link
+ QMAKE_EXTRA_COMPILERS += updateqm
+
+-isEmpty(vcproj) {
++!isEmpty(vcproj) {
+ QMAKE_LINK = @: IGNORE THIS LINE
+ OBJECTS_DIR =
+ win32:CONFIG -= embed_manifest_exe
+@@ -30,7 +30,7 @@ isEmpty(vcproj) {
+ phony_src.input = PHONY_DEPS
+ phony_src.output = phony.c
+ phony_src.variable_out = GENERATED_SOURCES
+- phony_src.commands = echo int main() { return 0; } > phony.c
++ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
+ phony_src.name = CREATE phony.c
+ phony_src.CONFIG += combine
+ QMAKE_EXTRA_COMPILERS += phony_src
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
index 9d893f9..34061cb 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
@@ -1,7 +1,7 @@
require qt-${PV}.inc
require qt4-embedded.inc
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
index 2f39ec0..0290313 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
@@ -1,7 +1,7 @@
require qt4-x11-free.inc
require qt-${PV}.inc
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
--
1.7.2.5
^ permalink raw reply related
* [PATCH] qt-4.7.4: fix translation support
From: Eric Bénard @ 2011-10-02 19:45 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <j6abik$9f7$1@dough.gmane.org>
- this was fiexed in 4.7.3 by :
d8b9aad9e3fa0cacbde4597d45f68652009af001
- but forgotten in the 4.7.4 upgrade in :
c3a784cb13f0afc0616ae3ed4102271c6dde17af
Thanks to Dmitry Eremin-Solenikov for noticing this.
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
meta/recipes-qt/qt4/qt-4.7.4.inc | 9 ++---
.../recipes-qt/qt4/qt-4.7.4/fix-translations.patch | 32 ++++++++++++++++++++
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4-native.inc | 2 +-
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 2 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
6 files changed, 40 insertions(+), 9 deletions(-)
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index 5c06bbe..bc33b6b 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -13,6 +13,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://0009-support-2bpp.patch \
file://0001-Added-Openembedded-crossarch-option.patch \
file://blacklist-diginotar-certs.diff \
+ file://fix-translations.patch \
file://g++.conf \
file://linux.conf \
file://fix-qtbug-20925.patch \
@@ -27,7 +28,9 @@ FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
do_configure_prepend() {
for pro in $(find ${S} -name "*.pro") ; do
- sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro
+ sed -i \
+ -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \
+ -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro
done
sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
@@ -39,10 +42,6 @@ do_configure_prepend() {
${S}/configure
}
-do_configure_append() {
- sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile
-}
-
QT_GLFLAGS ?= ""
QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch b/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch
new file mode 100644
index 0000000..906d4e3
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch
@@ -0,0 +1,32 @@
+fix phony translation linking error
+
+ | .../usr/lib/crt1.o: In function `_start':
+ | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
+ | collect2: ld returned 1 exit status
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+
+diff --git a/translations/translations.pro b/translations/translations.pro
+index cdaf04a..24fa668 100644
+--- a/translations/translations.pro
++++ b/translations/translations.pro
+@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
+ updateqm.CONFIG += no_link
+ QMAKE_EXTRA_COMPILERS += updateqm
+
+-isEmpty(vcproj) {
++!isEmpty(vcproj) {
+ QMAKE_LINK = @: IGNORE THIS LINE
+ OBJECTS_DIR =
+ win32:CONFIG -= embed_manifest_exe
+@@ -30,7 +30,7 @@ isEmpty(vcproj) {
+ phony_src.input = PHONY_DEPS
+ phony_src.output = phony.c
+ phony_src.variable_out = GENERATED_SOURCES
+- phony_src.commands = echo int main() { return 0; } > phony.c
++ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
+ phony_src.name = CREATE phony.c
+ phony_src.CONFIG += combine
+ QMAKE_EXTRA_COMPILERS += phony_src
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 53e1297..79473c9 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.1 | GPLv3"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r34"
+INC_PR = "r35"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index ebbee9b..a3ffe03 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
-INC_PR = "r13"
+INC_PR = "r14"
inherit native
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index a71c3ae..b1a5661 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com"
LICENSE = "LGPLv2.1 | GPLv3"
-INC_PR = "r7"
+INC_PR = "r8"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index f76a97f..f391028 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r31"
+INC_PR = "r32"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
--
1.7.6.2
^ permalink raw reply related
* Re: [PATCH 0/7] Qt4 upgrade/fixes
From: Dmitry Eremin-Solenikov @ 2011-10-02 18:45 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1317401867.12332.216.camel@ted>
On 09/30/2011 08:57 PM, Richard Purdie wrote:
> On Fri, 2011-09-30 at 17:33 +0100, Paul Eggleton wrote:
>> This is a pull request for Eric Bénard's qt4_upgrade branch, including
>> an update of Qt to 4.7.4 (preserving 4.7.3 until other layers such as
>> meta-oe, meta-yocto etc. can sync up) as well as several important bug
>> fixes.
>>
>> The patches look good; if was to be really picky though I would say that
>> the two demo/doc patches in the series ought to be merged into one patch,
>> and there are a few typos in the commit messages. I'm also relying on
>> others to review the correctness of the armv6-vfp no-neon patch as I have
>> no knowledge of this area.
>>
>>
>> The following changes since commit c54c1280fc0d06a53e23339c3913ec88eead13d9:
>>
>> base.bbclass: Drop unneeded dependency (2011-09-30 11:34:44 +0100)
>>
>> are available in the git repository at:
>> git://git.openembedded.org/openembedded-core-contrib paule/qt4_upgrade
>> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4_upgrade
>>
>> Denis Carikli (3):
>> qt4.inc: remove the optional documentation package from the demo's
>> RRECOMMENDS
>> qt4(embedded and x11): disable neon for armv6-vfp
>> qt4.inc: package qtdemo's docs in a separate package
>>
>> Eric Bénard (3):
>> qt4e-demo-image: improve image
>> qt4: fix generated sdk
>> qt4: update to latest version 4.7.4
>>
>> Otavio Salvador (1):
>> qt4: fix translation support
>
> Thanks Paul. I fixed the typos and queued this on master-next.
It seems, during 4.7.3 -> 4.7.4 addition, fix-translation patch got
lost. Richard please reaply the "qt4: fix translation support" after
s/4.7.3/4.7.4/ . I can provide a patch if you'd like.
>
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
With best wishes
Dmitry
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox