[oe-commits] org.oe.dev libx11: add a new -native and stop removing xlib.h

[koen commit]

libx11: add a new -native and stop removing xlib.h

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: f97b052ce14cc109700831b22e63b906c1490ef6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f97b052ce14cc109700831b22e63b906c1490ef6
Files:
1
packages/xorg-lib/libx11-native_1.1.1.bb
packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb
packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
packages/xorg-lib/libx11_1.1.1.bb
packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
packages/xorg-lib/libx11_git.bb
Diffs:

#
# mt diff -r047d0bb5b2832ecbc471d6743d4f35165e38d51d -rf97b052ce14cc109700831b22e63b906c1490ef6
#
# 
# 
# add_file "packages/xorg-lib/libx11-native_1.1.1.bb"
#  content [7ee30141eecbc9f4aa1617fa3b31340e00c314bf]
# 
# patch "packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb"
#  from [409377931b5ea57dd7e6154e35c6f5c4d349293c]
#    to [8e94804138d8138b539606a26ebd4af25b0212b8]
# 
# patch "packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb"
#  from [117771129c6d056bff8c0e25ab05815b45681189]
#    to [e3167ff7667bc6a1ee5ce5f04e044660619ae184]
# 
# patch "packages/xorg-lib/libx11_1.1.1.bb"
#  from [75c6aeaf2de606a8b12a1f3f3bd8e9f9d8ec3f71]
#    to [a0a0140c42a78c8020c1b1268944f1832bd4a6e8]
# 
# patch "packages/xorg-lib/libx11_X11R7.0-1.0.0.bb"
#  from [924df23cd97858fbc04e933045d701dcf867b1e6]
#    to [0c14d65c59cf284b2d923aab44186002b4c93fc9]
# 
# patch "packages/xorg-lib/libx11_X11R7.1-1.0.1.bb"
#  from [ab5dcb0c63ab2ddae6113fb90321f6848c6b1ae0]
#    to [4e1dd0bec2c1d87ca39582c00cfafdd50dc8850c]
# 
# patch "packages/xorg-lib/libx11_git.bb"
#  from [7ba14b619c77aa49fd4819849c7237fc98969396]
#    to [e7d9db820d00a6400883b026015dc5cb544d9d25]
# 
============================================================
--- packages/xorg-lib/libx11-native_1.1.1.bb	7ee30141eecbc9f4aa1617fa3b31340e00c314bf
+++ packages/xorg-lib/libx11-native_1.1.1.bb	7ee30141eecbc9f4aa1617fa3b31340e00c314bf
@@ -0,0 +1,26 @@
+require xorg-lib-common.inc
+PE = "1"
+PR = "r0"
+
+DESCRIPTION = "Base X libs."
+
+DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+	libxcb libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+
+XORG_PN = "libX11"
+
+PACKAGES =+ "libx11-xcb"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*"
+
+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
+	) || exit 1
+	oe_runmake
+}
============================================================
--- packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb	409377931b5ea57dd7e6154e35c6f5c4d349293c
+++ packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb	8e94804138d8138b539606a26ebd4af25b0212b8
@@ -20,6 +20,5 @@ do_compile() {
 		unset CC LD CXX CCLD
 		oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
 	)
-	rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
 }
============================================================
--- packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb	117771129c6d056bff8c0e25ab05815b45681189
+++ packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb	e3167ff7667bc6a1ee5ce5f04e044660619ae184
@@ -20,6 +20,5 @@ do_compile() {
 		unset CC LD CXX CCLD
 		oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
 	)
-	rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
 }
============================================================
--- packages/xorg-lib/libx11_1.1.1.bb	75c6aeaf2de606a8b12a1f3f3bd8e9f9d8ec3f71
+++ packages/xorg-lib/libx11_1.1.1.bb	a0a0140c42a78c8020c1b1268944f1832bd4a6e8
@@ -22,6 +22,5 @@ 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
 	) || exit 1
-		rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
 }
============================================================
--- packages/xorg-lib/libx11_X11R7.0-1.0.0.bb	924df23cd97858fbc04e933045d701dcf867b1e6
+++ packages/xorg-lib/libx11_X11R7.0-1.0.0.bb	0c14d65c59cf284b2d923aab44186002b4c93fc9
@@ -17,6 +17,5 @@ do_compile() {
 		unset CC LD CXX CCLD
 		oe_runmake -C src/util 'X11_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
 	) || exit 1
-	rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
 }
============================================================
--- packages/xorg-lib/libx11_X11R7.1-1.0.1.bb	ab5dcb0c63ab2ddae6113fb90321f6848c6b1ae0
+++ packages/xorg-lib/libx11_X11R7.1-1.0.1.bb	4e1dd0bec2c1d87ca39582c00cfafdd50dc8850c
@@ -20,6 +20,5 @@ 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
 	) || exit 1
-		rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
 }
============================================================
--- packages/xorg-lib/libx11_git.bb	7ba14b619c77aa49fd4819849c7237fc98969396
+++ packages/xorg-lib/libx11_git.bb	e7d9db820d00a6400883b026015dc5cb544d9d25
@@ -24,7 +24,6 @@ do_compile() {
 		unset CC LD CXX CCLD
 		oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
 	)
-	rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
 }