[oe-commits] org.oe.dev merge of 'd7826d9cf7d1f91bfebd799820abbd0ce3128db9'
oe commit
openembedded-commits at lists.openembedded.org
Tue Feb 5 18:26:35 UTC 2008
merge of 'd7826d9cf7d1f91bfebd799820abbd0ce3128db9'
and 'eceb5780d848ff2a4a8e9d4a2310dfd39eb41b65'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: af9eb34687f837965d0670bd67d8a8ede46048ca
ViewMTN: http://monotone.openembedded.org/revision/info/af9eb34687f837965d0670bd67d8a8ede46048ca
Files:
1
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/angstrom-2007-for-openmoko-versions.inc
packages/gstreamer/gst-plugin-pulse_0.9.7.bb
conf/distro/include/angstrom-2007-for-openmoko.inc
packages/gpgme/gpgme_1.1.4.bb
packages/xorg-app/bitmap_1.0.3.bb
packages/xorg-app/luit_1.0.3.bb
packages/xorg-app/xcalc_1.0.2.bb
packages/xorg-app/xclock_1.0.3.bb
packages/xorg-app/xconsole_1.0.3.bb
packages/xorg-app/xcursorgen_1.0.2.bb
packages/xorg-app/xdriinfo_1.0.2.bb
packages/xorg-app/xinit_1.0.7.bb
packages/xorg-app/xload_1.0.2.bb
packages/xorg-app/xlsfonts_1.0.2.bb
packages/xorg-app/xmag_1.0.2.bb
packages/xorg-app/xman_1.0.3.bb
packages/xorg-app/xmessage_1.0.2.bb
packages/xorg-app/xsetpointer_1.0.1.bb
packages/xorg-app/xwininfo_1.0.3.bb
packages/xorg-proto/glproto_1.4.9.bb
packages/xorg-proto/xproto_7.0.11.bb
contrib/oe-stylize.py
Diffs:
#
# mt diff -rd7826d9cf7d1f91bfebd799820abbd0ce3128db9 -raf9eb34687f837965d0670bd67d8a8ede46048ca
#
#
#
# rename "conf/distro/include/angstrom-2007-preferred-versions.inc"
# to "conf/distro/include/angstrom-2007-for-openmoko-versions.inc"
#
# add_file "packages/gstreamer/gst-plugin-pulse_0.9.7.bb"
# content [c5556734ddb08e6598f9977cfab0a4291ccd955b]
#
# patch "conf/distro/include/angstrom-2007-for-openmoko.inc"
# from [62c9fe4233d8ba12cb368d90400784630b8d4641]
# to [c7679a5348edd7f0e42790d5841a5a84145282d3]
#
# patch "packages/gpgme/gpgme_1.1.4.bb"
# from [53b2f747053c5b94da60e11074304b02588bb891]
# to [aa0b3ea4aaa3d040cf4f1e567928d0281dc5af64]
#
============================================================
--- packages/gstreamer/gst-plugin-pulse_0.9.7.bb c5556734ddb08e6598f9977cfab0a4291ccd955b
+++ packages/gstreamer/gst-plugin-pulse_0.9.7.bb c5556734ddb08e6598f9977cfab0a4291ccd955b
@@ -0,0 +1,30 @@
+DESCRIPTION = "GStreamer plugin for using pulse audio as sink and source"
+HOMEPAGE = "http://0pointer.de/lennart/projects/gst-pulse/"
+LICENSE = "GPL"
+DEPENDS = "gstreamer pulseaudio"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz"
+S = "${WORKDIR}/gst-pulse-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-lynx"
+GST_LIBV = 0.10
+
+do_install() {
+ install -d ${D}${libdir}/gstreamer-${GST_LIBV}/
+ install -m 0755 src/.libs/libgstpulse.so ${D}${libdir}/gstreamer-${GST_LIBV}
+}
+
+export GST_MODDIR=${libdir}/gstreamer-0.10
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/libgstpulse.so"
+FILES_${PN}-dev = "\
+ ${libdir}/gstreamer-0.10/libgstpulse.a \
+ ${libdir}/gstreamer-0.10/libgstpulse.la \
+ ${libdir}/gstreamer-0.10/libgstpulse.so*"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+
============================================================
--- conf/distro/include/angstrom-2007-for-openmoko.inc 62c9fe4233d8ba12cb368d90400784630b8d4641
+++ conf/distro/include/angstrom-2007-for-openmoko.inc c7679a5348edd7f0e42790d5841a5a84145282d3
@@ -146,7 +146,7 @@ require conf/distro/include/preferred-xo
#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
require conf/distro/include/preferred-xorg-versions.inc
-require conf/distro/include/angstrom-2007-preferred-versions.inc
+require conf/distro/include/angstrom-2007-for-openmoko-versions.inc
require conf/distro/include/preferred-gpe-versions-2.8.inc
require conf/distro/include/preferred-e-versions.inc
============================================================
--- packages/gpgme/gpgme_1.1.4.bb 53b2f747053c5b94da60e11074304b02588bb891
+++ packages/gpgme/gpgme_1.1.4.bb aa0b3ea4aaa3d040cf4f1e567928d0281dc5af64
@@ -1,6 +1,6 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gp
LICENSE = "GPL"
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2"
-PR = "r1"
+PR = "r2"
DEPENDS = "libgpg-error pth libassuan"
@@ -20,3 +20,8 @@ do_stage() {
install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/
}
+FILES_${PN} = "${libdir}/libgpgme*.so.*"
+FILES_${PN}-dev += "${bindir}/gpgme-config"
+
+LEAD_SONAME = "libgpgme"
+
#
# mt diff -receb5780d848ff2a4a8e9d4a2310dfd39eb41b65 -raf9eb34687f837965d0670bd67d8a8ede46048ca
#
#
#
# add_file "packages/xorg-app/bitmap_1.0.3.bb"
# content [8aa71a66bcc5d0c3915aa1c1648a6d0bc2265561]
#
# add_file "packages/xorg-app/luit_1.0.3.bb"
# content [5a1467879e5a71ca546f39ca4361b04838a0ec43]
#
# add_file "packages/xorg-app/xcalc_1.0.2.bb"
# content [0ca079cb7bfaf9aa3202116fa40f3f5041be1c31]
#
# add_file "packages/xorg-app/xclock_1.0.3.bb"
# content [8a50d2006a988c5255057b1022f0d2d9083852c7]
#
# add_file "packages/xorg-app/xconsole_1.0.3.bb"
# content [b1c4c48c2b3f6f365438a2b74853817c8cf1d8d7]
#
# add_file "packages/xorg-app/xcursorgen_1.0.2.bb"
# content [47d08199356804be276fd512261857a641959014]
#
# add_file "packages/xorg-app/xdriinfo_1.0.2.bb"
# content [443438ad8673bd7fc1b79fb98d9be71d717cc373]
#
# add_file "packages/xorg-app/xinit_1.0.7.bb"
# content [11fa62b52d00712f372c7092ec265b4dae6c213a]
#
# add_file "packages/xorg-app/xload_1.0.2.bb"
# content [c6660034a45b27e5932abf2ff87a3a759bb1b23b]
#
# add_file "packages/xorg-app/xlsfonts_1.0.2.bb"
# content [b3cb02b6443bcf92b561279a419f16c282821622]
#
# add_file "packages/xorg-app/xmag_1.0.2.bb"
# content [9c5483f421123aea507bb6ea0b1cbb6e3956357d]
#
# add_file "packages/xorg-app/xman_1.0.3.bb"
# content [c0ef0565c86da06cec4c18233549fbd42a896b39]
#
# add_file "packages/xorg-app/xmessage_1.0.2.bb"
# content [8aedccaf7544e76189cc597c063d478f4a028305]
#
# add_file "packages/xorg-app/xsetpointer_1.0.1.bb"
# content [f234d8858cc34df648cf3e2252c9d3b52ff3300a]
#
# add_file "packages/xorg-app/xwininfo_1.0.3.bb"
# content [d2524403f0d26586345d8305e917b392f89c818e]
#
# add_file "packages/xorg-proto/glproto_1.4.9.bb"
# content [9c304fb5b8f9969d8466188f71b59db4c93c4426]
#
# add_file "packages/xorg-proto/xproto_7.0.11.bb"
# content [4a08c2cb595fc7d2a85d92d8d84f170771de58cb]
#
# patch "contrib/oe-stylize.py"
# from [e6d7034ad94cfea34288bf45c49e008d2f1c3445]
# to [9e40dcd24e4d8f38580faf97a7ca791069087802]
#
============================================================
--- packages/xorg-app/bitmap_1.0.3.bb 8aa71a66bcc5d0c3915aa1c1648a6d0bc2265561
+++ packages/xorg-app/bitmap_1.0.3.bb 8aa71a66bcc5d0c3915aa1c1648a6d0bc2265561
@@ -0,0 +1,3 @@
+require xorg-app-common.inc
+DEPENDS += " virtual/libx11 libxmu xbitmaps libxt"
+PE = "1"
============================================================
--- packages/xorg-app/luit_1.0.3.bb 5a1467879e5a71ca546f39ca4361b04838a0ec43
+++ packages/xorg-app/luit_1.0.3.bb 5a1467879e5a71ca546f39ca4361b04838a0ec43
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals"
+DEPENDS += " zlib zlib virtual/libx11 libfontenc"
+PE = "1"
============================================================
--- packages/xorg-app/xcalc_1.0.2.bb 0ca079cb7bfaf9aa3202116fa40f3f5041be1c31
+++ packages/xorg-app/xcalc_1.0.2.bb 0ca079cb7bfaf9aa3202116fa40f3f5041be1c31
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+DESCRIPTION = "scientific calculator for X"
+DEPENDS += " libxaw libxt"
+PE = "1"
============================================================
--- packages/xorg-app/xclock_1.0.3.bb 8a50d2006a988c5255057b1022f0d2d9083852c7
+++ packages/xorg-app/xclock_1.0.3.bb 8a50d2006a988c5255057b1022f0d2d9083852c7
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+DESCRIPTION = "analog / digital clock for X"
+DEPENDS += " virtual/libx11 libxaw libxrender libxft libxkbfile libxt"
+PE = "1"
============================================================
--- packages/xorg-app/xconsole_1.0.3.bb b1c4c48c2b3f6f365438a2b74853817c8cf1d8d7
+++ packages/xorg-app/xconsole_1.0.3.bb b1c4c48c2b3f6f365438a2b74853817c8cf1d8d7
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+DESCRIPTION = "monitor system console messages with X"
+DEPENDS += " libxt"
+PE = "1"
============================================================
--- packages/xorg-app/xcursorgen_1.0.2.bb 47d08199356804be276fd512261857a641959014
+++ packages/xorg-app/xcursorgen_1.0.2.bb 47d08199356804be276fd512261857a641959014
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+DESCRIPTION = "create an X cursor file from a collection of PNG images"
+DEPENDS += " virtual/libx11 libxcursor libpng"
+PE = "1"
============================================================
--- packages/xorg-app/xdriinfo_1.0.2.bb 443438ad8673bd7fc1b79fb98d9be71d717cc373
+++ packages/xorg-app/xdriinfo_1.0.2.bb 443438ad8673bd7fc1b79fb98d9be71d717cc373
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+DESCRIPTION = "query configuration information of DRI drivers"
+DEPENDS += " virtual/libx11 glproto mesa"
+PE = "1"
============================================================
--- packages/xorg-app/xinit_1.0.7.bb 11fa62b52d00712f372c7092ec265b4dae6c213a
+++ packages/xorg-app/xinit_1.0.7.bb 11fa62b52d00712f372c7092ec265b4dae6c213a
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X Window System initializer"
+PE = "1"
+
+FILES_${PN} += "${libdir}X11/xinit"
============================================================
--- packages/xorg-app/xload_1.0.2.bb c6660034a45b27e5932abf2ff87a3a759bb1b23b
+++ packages/xorg-app/xload_1.0.2.bb c6660034a45b27e5932abf2ff87a3a759bb1b23b
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "system load average display for X"
+DEPENDS += " libxaw libxt"
+PE = "1"
============================================================
--- packages/xorg-app/xlsfonts_1.0.2.bb b3cb02b6443bcf92b561279a419f16c282821622
+++ packages/xorg-app/xlsfonts_1.0.2.bb b3cb02b6443bcf92b561279a419f16c282821622
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "server font list displayer for X"
+DEPENDS += " virtual/libx11"
============================================================
--- packages/xorg-app/xmag_1.0.2.bb 9c5483f421123aea507bb6ea0b1cbb6e3956357d
+++ packages/xorg-app/xmag_1.0.2.bb 9c5483f421123aea507bb6ea0b1cbb6e3956357d
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "magnify parts of the screen"
+DEPENDS += " libxaw libxt"
+PE = "1"
============================================================
--- packages/xorg-app/xman_1.0.3.bb c0ef0565c86da06cec4c18233549fbd42a896b39
+++ packages/xorg-app/xman_1.0.3.bb c0ef0565c86da06cec4c18233549fbd42a896b39
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "manual page browser for X"
+DEPENDS += " libxaw libxprintutil libxp libxt"
+RDEPENDS = " man"
+PE = "1"
+
+FILES_${PN} += " /usr/share/X11/xman.help"
============================================================
--- packages/xorg-app/xmessage_1.0.2.bb 8aedccaf7544e76189cc597c063d478f4a028305
+++ packages/xorg-app/xmessage_1.0.2.bb 8aedccaf7544e76189cc597c063d478f4a028305
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "xmessage displays a message or query in a window."
+DEPENDS += " libxaw libxt"
+PE = "1"
============================================================
--- packages/xorg-app/xsetpointer_1.0.1.bb f234d8858cc34df648cf3e2252c9d3b52ff3300a
+++ packages/xorg-app/xsetpointer_1.0.1.bb f234d8858cc34df648cf3e2252c9d3b52ff3300a
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "set an X Input device as the main pointer"
+DEPENDS += " libxi virtual/libx11"
+PE = "1"
============================================================
--- packages/xorg-app/xwininfo_1.0.3.bb d2524403f0d26586345d8305e917b392f89c818e
+++ packages/xorg-app/xwininfo_1.0.3.bb d2524403f0d26586345d8305e917b392f89c818e
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "window information utility for X"
+DEPENDS += " libxmu libxext virtual/libx11"
+PE = "1"
============================================================
--- packages/xorg-proto/glproto_1.4.9.bb 9c304fb5b8f9969d8466188f71b59db4c93c4426
+++ packages/xorg-proto/glproto_1.4.9.bb 9c304fb5b8f9969d8466188f71b59db4c93c4426
@@ -0,0 +1,3 @@
+require xorg-proto-common.inc
+DESCRIPTION = "X11 OpenGL extension wire protocol"
+PE = "1"
============================================================
--- packages/xorg-proto/xproto_7.0.11.bb 4a08c2cb595fc7d2a85d92d8d84f170771de58cb
+++ packages/xorg-proto/xproto_7.0.11.bb 4a08c2cb595fc7d2a85d92d8d84f170771de58cb
@@ -0,0 +1,3 @@
+require xorg-proto-common.inc
+DESCRIPTION = "X11 core wire protocol and auxiliary headers"
+PE = "1"
============================================================
--- contrib/oe-stylize.py e6d7034ad94cfea34288bf45c49e008d2f1c3445
+++ contrib/oe-stylize.py 9e40dcd24e4d8f38580faf97a7ca791069087802
@@ -42,6 +42,7 @@ OE_vars = [
'RPROVIDES',
'RCONFLICTS',
'SRCDATE',
+ 'PE',
'PV',
'PR',
'SRC_URI',
More information about the Openembedded-commits
mailing list