[oe-commits] org.oe.dev merge of '288863eb61389cf9c42b3101a9e8cd27ebcd129a'

[koen commit]

merge of '288863eb61389cf9c42b3101a9e8cd27ebcd129a'
     and 'f8424d0fef190f772371b3b3691233dbdd5e7b58'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: d4a7ca2f550a62c6aaff7d9f80c80793f890f66f
ViewMTN: http://monotone.openembedded.org/revision/info/d4a7ca2f550a62c6aaff7d9f80c80793f890f66f
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/mkfontscale-native_1.0.3.bb
packages/mkfontscale_1.0.3.bb
packages/xorg-app/xkbcomp-native_1.0.3.bb
packages/xorg-app/xkbcomp_1.0.3.bb
packages/xorg-app/xkbutils_1.0.1.bb
packages/xorg-app/xlsfonts_1.0.1.bb
packages/xorg-lib/libxkbfile-native_1.0.4.bb
Diffs:

#
# mt diff -r288863eb61389cf9c42b3101a9e8cd27ebcd129a -rd4a7ca2f550a62c6aaff7d9f80c80793f890f66f
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [28b596e1b8de32d09be5c775f8e611602cad4dcd]
#    to [1b6e4763af7e6a8c351c4de6f4474969a6f53117]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	28b596e1b8de32d09be5c775f8e611602cad4dcd
+++ conf/distro/include/sane-srcrevs.inc	1b6e4763af7e6a8c351c4de6f4474969a6f53117
@@ -65,7 +65,7 @@ SRCREV_pn-openmoko-libs ?= "2367"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3066"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3208"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3230"
 SRCREV_pn-openmoko-messages ?= "2276"
 SRCREV_pn-openmoko-panel-battery ?= "2897"
 SRCREV_pn-openmoko-panel-bt ?= "2896"
@@ -87,7 +87,7 @@ SRCREV_pn-openmoko-theme-standard-qvga ?
 SRCREV_pn-openmoko-terminal2 ?= "2972"
 SRCREV_pn-openmoko-theme-standard ?= "2370"
 SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
-SRCREV_pn-openmoko-theme-standard2 ?= "3044"
+SRCREV_pn-openmoko-theme-standard2 ?= "3210"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964"
 SRCREV_pn-openmoko-today ?= "3056"
 SRCREV_pn-openmoko-today2 ?= "3180"


#
# mt diff -rf8424d0fef190f772371b3b3691233dbdd5e7b58 -rd4a7ca2f550a62c6aaff7d9f80c80793f890f66f
#
# 
# 
# add_file "packages/mkfontscale-native_1.0.3.bb"
#  content [89b7272e2c88abb445d72875e1c7c9346bb54c4d]
# 
# add_file "packages/mkfontscale_1.0.3.bb"
#  content [43410a7dfbc40dd02b3a6e4383b4a8383a8c8160]
# 
# add_file "packages/xorg-app/xkbcomp-native_1.0.3.bb"
#  content [db40b6f945170186f920f081cbfe80999af64bc2]
# 
# add_file "packages/xorg-app/xkbcomp_1.0.3.bb"
#  content [fe1c963076ee2385eee973a5e034b6ab916e0384]
# 
# add_file "packages/xorg-app/xkbutils_1.0.1.bb"
#  content [490c07a2f999c8f750c3979f029e2583c4e5a404]
# 
# add_file "packages/xorg-app/xlsfonts_1.0.1.bb"
#  content [a0a6cb399f7b34720853315ba0f8e13a2c6ed7e9]
# 
# add_file "packages/xorg-lib/libxkbfile-native_1.0.4.bb"
#  content [d644e5e1565916fbb6e1e40100127dc68a947c2d]
# 
============================================================
--- packages/mkfontscale-native_1.0.3.bb	89b7272e2c88abb445d72875e1c7c9346bb54c4d
+++ packages/mkfontscale-native_1.0.3.bb	89b7272e2c88abb445d72875e1c7c9346bb54c4d
@@ -0,0 +1,10 @@
+DESCRIPTION = "X mkfontscale app"
+SECTION = "x11/applications"
+LICENSE = "MIT-X"
+S="${WORKDIR}/mkfontscale-${PV}"
+
+DEPENDS = "libx11-native libfontenc-native freetype-native"
+
+SRC_URI = "${XORG_MIRROR}/individual/app/mkfontscale-${PV}.tar.bz2"
+
+inherit native autotools pkgconfig
============================================================
--- packages/mkfontscale_1.0.3.bb	43410a7dfbc40dd02b3a6e4383b4a8383a8c8160
+++ packages/mkfontscale_1.0.3.bb	43410a7dfbc40dd02b3a6e4383b4a8383a8c8160
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " zlib libfontenc freetype virtual/libx11"
+
============================================================
--- packages/xorg-app/xkbcomp-native_1.0.3.bb	db40b6f945170186f920f081cbfe80999af64bc2
+++ packages/xorg-app/xkbcomp-native_1.0.3.bb	db40b6f945170186f920f081cbfe80999af64bc2
@@ -0,0 +1,11 @@
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+
+SECTION = "x11/applications"
+LICENSE = "MIT-X"
+S="${WORKDIR}/xkbcomp-${PV}"
+
+DEPENDS = "libx11-native libxkbfile-native"
+
+SRC_URI = "${XORG_MIRROR}/individual/app/xkbcomp-${PV}.tar.bz2"
+
+inherit native autotools pkgconfig
============================================================
--- packages/xorg-app/xkbcomp_1.0.3.bb	fe1c963076ee2385eee973a5e034b6ab916e0384
+++ packages/xorg-app/xkbcomp_1.0.3.bb	fe1c963076ee2385eee973a5e034b6ab916e0384
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+
+DEPENDS += " virtual/libx11 libxkbfile"
============================================================
--- packages/xorg-app/xkbutils_1.0.1.bb	490c07a2f999c8f750c3979f029e2583c4e5a404
+++ packages/xorg-app/xkbutils_1.0.1.bb	490c07a2f999c8f750c3979f029e2583c4e5a404
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxkbfile virtual/libx11"
+
============================================================
--- packages/xorg-app/xlsfonts_1.0.1.bb	a0a6cb399f7b34720853315ba0f8e13a2c6ed7e9
+++ packages/xorg-app/xlsfonts_1.0.1.bb	a0a6cb399f7b34720853315ba0f8e13a2c6ed7e9
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11"
============================================================
--- packages/xorg-lib/libxkbfile-native_1.0.4.bb	d644e5e1565916fbb6e1e40100127dc68a947c2d
+++ packages/xorg-lib/libxkbfile-native_1.0.4.bb	d644e5e1565916fbb6e1e40100127dc68a947c2d
@@ -0,0 +1,8 @@
+require libxkbfile_${PV}.bb
+
+DEPENDS = "libx11-native kbproto-native"
+PE = "1"
+
+XORG_PN = "libxkbfile"
+
+inherit native