[oe-commits] org.oe.dev merge of '0cb8f2ce480fcc07aa6c28de994811e8b223d81c'

[mickeyl commit]

merge of '0cb8f2ce480fcc07aa6c28de994811e8b223d81c'
     and 'e32e0321deebf52172fbb0d967704f72299ab0c1'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9f589235a06157e3b846f658afd78fcd3835900a
ViewMTN: http://monotone.openembedded.org/revision/info/9f589235a06157e3b846f658afd78fcd3835900a
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
packages/xorg-lib/libxfont-native_1.3.2.bb
packages/xorg-lib/libxfont_1.3.2.bb
packages/xorg-lib/libxinerama_1.0.3.bb
packages/xorg-lib/libxscrnsaver_1.1.3.bb
packages/xorg-lib/libxv_1.0.4.bb
packages/python/python-pyrtc_svn.bb
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r0cb8f2ce480fcc07aa6c28de994811e8b223d81c -r9f589235a06157e3b846f658afd78fcd3835900a
#
#
#
# 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]
# 
# add_file "packages/xorg-lib/libxfont-native_1.3.2.bb"
#  content [7bd6334b17430fa25692f315b4203370dfbbf36a]
# 
# add_file "packages/xorg-lib/libxfont_1.3.2.bb"
#  content [259fa54fbb6ab8d72e1cadfcfa7f733f7134babd]
# 
# add_file "packages/xorg-lib/libxinerama_1.0.3.bb"
#  content [88196c89fad49491b8f02b072c92ae6ed41568da]
# 
# add_file "packages/xorg-lib/libxscrnsaver_1.1.3.bb"
#  content [9f20458008728e99f23cb0d3d680a147b266aaeb]
# 
# add_file "packages/xorg-lib/libxv_1.0.4.bb"
#  content [900d983fedd38a9c9ecad4fe461a83740dee4fc6]
#
============================================================
--- 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"
============================================================
--- packages/xorg-lib/libxfont-native_1.3.2.bb	7bd6334b17430fa25692f315b4203370dfbbf36a
+++ packages/xorg-lib/libxfont-native_1.3.2.bb	7bd6334b17430fa25692f315b4203370dfbbf36a
@@ -0,0 +1,10 @@
+require libxfont_${PV}.bb
+
+DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native \
+           libfontenc-native xtrans-native freetype-native util-macros-native"
+PE = "1"
+
+# no need for patch used in libxfont
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
+
+inherit native
============================================================
--- packages/xorg-lib/libxfont_1.3.2.bb	259fa54fbb6ab8d72e1cadfcfa7f733f7134babd
+++ packages/xorg-lib/libxfont_1.3.2.bb	259fa54fbb6ab8d72e1cadfcfa7f733f7134babd
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 font rasterisation library"
+LICENSE= "BSD-X"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PROVIDES = "xfont"
+PE = "1"
+
+SRC_URI += "file://no-scalable-crash.patch;patch=1"
+
+XORG_PN = "libXfont"
============================================================
--- packages/xorg-lib/libxinerama_1.0.3.bb	88196c89fad49491b8f02b072c92ae6ed41568da
+++ packages/xorg-lib/libxinerama_1.0.3.bb	88196c89fad49491b8f02b072c92ae6ed41568da
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Xinerama extension library"
+DEPENDS += "libxext xineramaproto"
+PROVIDES = "xinerama"
+PR = "r3"
+PE = "1"
+
+XORG_PN = "libXinerama"
============================================================
--- packages/xorg-lib/libxscrnsaver_1.1.3.bb	9f20458008728e99f23cb0d3d680a147b266aaeb
+++ packages/xorg-lib/libxscrnsaver_1.1.3.bb	9f20458008728e99f23cb0d3d680a147b266aaeb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Screen Saver extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext scrnsaverproto"
+PROVIDES = "libxss"
+RREPLACES = "libxss"
+PR = "r1"
+PE = "1"
+
+XORG_PN = "libXScrnSaver"
============================================================
--- packages/xorg-lib/libxv_1.0.4.bb	900d983fedd38a9c9ecad4fe461a83740dee4fc6
+++ packages/xorg-lib/libxv_1.0.4.bb	900d983fedd38a9c9ecad4fe461a83740dee4fc6
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Video extension library"
+LICENSE = "GPL"
+DEPENDS += "libxext videoproto"
+PR = "r1"
+
+XORG_PN = "libXv"


#
# mt diff -re32e0321deebf52172fbb0d967704f72299ab0c1 -r9f589235a06157e3b846f658afd78fcd3835900a
#
#
#
# add_file "packages/python/python-pyrtc_svn.bb"
#  content [bfeeeeccaeaceda2fa0fee0dfffed426bfcad026]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69]
#    to [fa679c887c40501f1728c25ffd9222506ce6f366]
#
============================================================
--- packages/python/python-pyrtc_svn.bb	bfeeeeccaeaceda2fa0fee0dfffed426bfcad026
+++ packages/python/python-pyrtc_svn.bb	bfeeeeccaeaceda2fa0fee0dfffed426bfcad026
@@ -0,0 +1,16 @@
+DESCRIPTION = "PyRTC is a python extension module that supports talking to the \
+RTC (Real Time Clock) found in most PCs and SOCs"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.freesmartphone.org"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+LICENSE = "GPLv2"
+SRCNAME = "pyrtc"
+DEPENDS = "python-cython-native"
+PV = "1.0.0+svnr${SRCREV}"
+PR = "ml0"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit distutils
+
============================================================
--- conf/distro/include/sane-srcrevs.inc	7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69
+++ conf/distro/include/sane-srcrevs.inc	fa679c887c40501f1728c25ffd9222506ce6f366
@@ -146,8 +146,9 @@ SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-pyneod ?= "88"
 SRCREV_pn-pyneog ?= "88"
 SRCREV_pn-python-formencode = "3148"
-SRCREV_pn-python-gsmd = "127"
+SRCREV_pn-python-gsmd = "148"
 SRCREV_pn-python-lightmediascanner = "68"
+SRCREV_pn-python-pyrtc = "152"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"