[oe-commits] org.oe.dev libx11: added 1.1.4 from Poky

[hrw commit]

libx11: added 1.1.4 from Poky

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 58998d3abf03e0d72bc9cdb28db80deda4dcff37
ViewMTN: http://monotone.openembedded.org/revision/info/58998d3abf03e0d72bc9cdb28db80deda4dcff37
Files:
1
packages/xorg-lib/diet-x11_1.1.4.bb
packages/xorg-lib/libx11-native_1.1.4.bb
packages/xorg-lib/libx11_1.1.4.bb
Diffs:

#
# mt diff -r6ba02de8376bd7b3c4fe9e2a9052dec09ad8af6c -r58998d3abf03e0d72bc9cdb28db80deda4dcff37
#
#
#
# add_file "packages/xorg-lib/diet-x11_1.1.4.bb"
#  content [1307f7a3bd16ed959d629efdae27b26a0418fb80]
# 
# add_file "packages/xorg-lib/libx11-native_1.1.4.bb"
#  content [9c54449eecb074402c7e86f91767a80e5a1fe88f]
# 
# add_file "packages/xorg-lib/libx11_1.1.4.bb"
#  content [9f3ddbf4f281cbf5a5e3262ed1f5a9cc1f7ef0fe]
#
============================================================
--- packages/xorg-lib/diet-x11_1.1.4.bb	1307f7a3bd16ed959d629efdae27b26a0418fb80
+++ packages/xorg-lib/diet-x11_1.1.4.bb	1307f7a3bd16ed959d629efdae27b26a0418fb80
@@ -0,0 +1,10 @@
+require libx11_${PV}.bb
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+            file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
============================================================
--- packages/xorg-lib/libx11-native_1.1.4.bb	9c54449eecb074402c7e86f91767a80e5a1fe88f
+++ packages/xorg-lib/libx11-native_1.1.4.bb	9c54449eecb074402c7e86f91767a80e5a1fe88f
@@ -0,0 +1,7 @@
+require libx11_${PV}.bb
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+
+inherit native
============================================================
--- packages/xorg-lib/libx11_1.1.4.bb	9f3ddbf4f281cbf5a5e3262ed1f5a9cc1f7ef0fe
+++ packages/xorg-lib/libx11_1.1.4.bb	9f3ddbf4f281cbf5a5e3262ed1f5a9cc1f7ef0fe
@@ -0,0 +1,29 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "virtual/libx11"
+PE = "1"
+PR = "r3"
+
+XORG_PN = "libX11"
+
+SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
+            file://include_fix.patch;patch=1" 
+
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+		# mv to stop it getting rebuilt
+		mv makekeys.c makekeys.c.orig
+		cd ../../
+	) || exit 1
+	oe_runmake
+}
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"