[oe-commits] org.oe.dev merge of '086f28dc642c28a49acc6fa22f6423d6ba5cef7d'
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Nov 30 21:06:35 UTC 2007
merge of '086f28dc642c28a49acc6fa22f6423d6ba5cef7d'
and 'd2bef6ae1a0cfb013070a22132d2c8c69fdf19e1'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 71df4f75a1331353855f0e6a93d2e806439e90b3
ViewMTN: http://monotone.openembedded.org/revision/info/71df4f75a1331353855f0e6a93d2e806439e90b3
Files:
1
packages/pulseaudio/pulseaudio_0.9.7.bb
packages/pulseaudio/pulseaudio_0.9.8.bb
packages/pulseaudio/pulse.inc
contrib/angstrom
packages/matchbox-keyboard/mboxkbd-layouts-gui
contrib/angstrom/angstrom.svg
packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch
packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png
packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch
packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
mtn:manual_merge
true
Diffs:
#
# mt diff -r086f28dc642c28a49acc6fa22f6423d6ba5cef7d -r71df4f75a1331353855f0e6a93d2e806439e90b3
#
#
#
# delete "packages/pulseaudio/pulseaudio_0.9.7.bb"
#
# add_file "packages/pulseaudio/pulseaudio_0.9.8.bb"
# content [815657961892febee8418dbc92e3e829a156e821]
#
# patch "packages/pulseaudio/pulse.inc"
# from [27a820341557f336debad69f0b2b30c012a2749a]
# to [d02a339e8d4ccdea7eb613a6303f1b7681494b6c]
#
============================================================
--- packages/pulseaudio/pulseaudio_0.9.8.bb 815657961892febee8418dbc92e3e829a156e821
+++ packages/pulseaudio/pulseaudio_0.9.8.bb 815657961892febee8418dbc92e3e829a156e821
@@ -0,0 +1,12 @@
+require pulse.inc
+
+# this is not correct (see below)
+SRC_URI += "file://disable-using-glibc-tls.patch;patch=1"
+
+PR = "r0"
+
+# problems w/ pulseaudio 0.9.8 atm:
+# 1.) needs libtool >= 1.5.24 (yes, any older version will NOT work)
+# 2.) doesn't build w/ glibc TLS support (hence patched out)
+DEFAULT_PREFERENCE = "-1"
+
============================================================
--- packages/pulseaudio/pulse.inc 27a820341557f336debad69f0b2b30c012a2749a
+++ packages/pulseaudio/pulse.inc d02a339e8d4ccdea7eb613a6303f1b7681494b6c
@@ -1,9 +1,8 @@ LICENSE = "LGPL"
DESCRIPTION = "Pulseaudio is a sound server for Linux and Unix-like operating systems."
HOMEPAGE = "http://www.pulseaudio.org"
AUTHOR = "Lennart Poettering"
SECTION = "libs/multimedia"
LICENSE = "LGPL"
-
DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
# optional
DEPENDS += "alsa-lib glib-2.0"
#
# mt diff -rd2bef6ae1a0cfb013070a22132d2c8c69fdf19e1 -r71df4f75a1331353855f0e6a93d2e806439e90b3
#
#
#
# add_dir "contrib/angstrom"
#
# add_dir "packages/matchbox-keyboard/mboxkbd-layouts-gui"
#
# add_file "contrib/angstrom/angstrom.svg"
# content [b5659f7c38dc54dcc4ad153de0e5afa5ccefc00f]
#
# add_file "packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch"
# content [74bbaabad86fc467bc01de331c18f0797a56169c]
#
# add_file "packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png"
# content [3a64c92f7f036bca12c7b29c3b3c7b73acab7912]
#
# add_file "packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch"
# content [4eb896267100555d1575098445ea7771e42000a9]
#
# patch "packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb"
# from [829c07ddef2c0dc2984f49728495a7e1af8a3422]
# to [697dc853819fc91d3920ff892548a52ceb399640]
#
# set "packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
--- contrib/angstrom/angstrom.svg b5659f7c38dc54dcc4ad153de0e5afa5ccefc00f
+++ contrib/angstrom/angstrom.svg b5659f7c38dc54dcc4ad153de0e5afa5ccefc00f
@@ -0,0 +1,632 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="300"
+ height="300"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44.1"
+ version="1.0"
+ sodipodi:docbase="/mnt/MultimediaA"
+ sodipodi:docname="passer.svg"
+ inkscape:export-filename="/mnt/MultimediaA/passer_s.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#dbe3e2"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.5"
+ inkscape:cx="305.99401"
+ inkscape:cy="190.18075"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer2"
+ width="300px"
+ height="300px"
+ showgrid="true"
+ gridspacingx="1px"
+ gridspacingy="1px"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginy="0px"
+ gridoriginx="0px"
+ inkscape:window-width="1590"
+ inkscape:window-height="1122"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:object-points="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <rect
+ style="opacity:1;color:black;fill:#1c2422;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.47713897;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect17263"
+ width="46.672043"
+ height="39.924259"
+ x="-176.07109"
+ y="-55.51947"
+ ry="11.246277"
+ rx="11.246277" />
+ <rect
+ style="opacity:1;color:black;fill:#93aca7;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.47713897;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect17265"
+ width="46.672043"
+ height="39.924259"
+ x="-176.07109"
+ y="-3.3768997"
+ ry="11.246277"
+ rx="11.246277" />
+ <rect
+ style="opacity:1;color:black;fill:#536c67;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.47713897;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect17267"
+ width="46.672043"
+ height="39.924259"
+ x="-176.07109"
+ y="100.90823"
+ ry="11.246277"
+ rx="11.246277" />
+ <rect
+ style="opacity:1;color:black;fill:#dbe3e2;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.47713897;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect17269"
+ width="46.672043"
+ height="39.924259"
+ x="-176.07109"
+ y="153.05081"
+ ry="11.246277"
+ rx="11.246277" />
+ <text
+ xml:space="preserve"
+ style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Garamond"
+ x="-219"
+ y="222"
+ id="text1929"
+ sodipodi:linespacing="100%"><tspan
+ sodipodi:role="line"
+ id="tspan1931"
+ x="-219"
+ y="222">Colour scheme</tspan></text>
+ <rect
+ style="opacity:1;color:black;fill:#6f918a;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.47713897;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect4585"
+ width="46.672043"
+ height="39.924259"
+ x="-176.07109"
+ y="48.765663"
+ ry="11.246277"
+ rx="11.246277" />
+ <g
+ id="g1927"
+ transform="matrix(2.146701,0,0,2.146701,-398.0853,376.2692)">
+ <text
+ transform="matrix(0,-1,1,0,0,0)"
+ sodipodi:linespacing="100%"
+ id="text1930"
+ y="94.3358"
+ x="-86.595512"
+ style="font-size:20.16246986px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#536c67;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Serif"
+ xml:space="preserve"><tspan
+ y="94.3358"
+ x="-86.595512"
+ id="tspan1932"
+ sodipodi:role="line">ngström</tspan></text>
+ <path
+ id="path1934"
+ d="M 78.016636,93.581841 C 77.603166,93.58185 77.252031,93.729524 76.963231,94.024864 C 76.667895,94.313657 76.520222,94.664793 76.520212,95.078274 C 76.520222,95.498333 76.664617,95.852751 76.953385,96.14153 C 77.235627,96.423757 77.590041,96.564868 78.016636,96.564863 C 78.430148,96.564868 78.781283,96.423757 79.070052,96.14153 C 79.358851,95.852751 79.503246,95.498333 79.503225,95.078274 C 79.503246,94.664793 79.358851,94.313657 79.070052,94.024864 C 78.781283,93.729524 78.430148,93.58185 78.016636,93.581841 M 88.698417,98.277885 L 88.698417,92.902539 L 81.708498,95.580367 L 88.698417,98.277885 M 94.024538,102.43246 L 92.980973,102.43246 L 92.980973,101.14276 L 80.399121,96.328584 C 80.156295,96.801147 79.834688,97.162129 79.434312,97.411529 C 79.033966,97.654375 78.561408,97.775797 78.016636,97.775793 C 77.268445,97.775797 76.631799,97.513265 76.106721,96.988195 C 75.575105,96.463137 75.309298,95.826498 75.309277,95.078274 C 75.309298,94.330066 75.575105,93.693426 76.106721,93.168353 C 76.631799,92.636735 77.268445,92.370921 78.016636,92.370912 C 78.541715,92.370921 79.014274,92.498906 79.434312,92.754865 C 79.847813,93.010843 80.16942,93.375106 80.399121,93.847655 L 92.980973,89.003937 L 92.980973,87.556728 L 94.024538,87.556728 L 94.024538,92.902539 L 92.980973,92.902539 L 92.980973,91.268276 L 89.751828,92.498895 L 89.751828,98.681529 L 92.980973,99.912148 L 92.980973,98.297575 L 94.024538,98.297575 L 94.024538,102.43246"
+ style="font-size:19.43293762px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#536c67;fill-opacity:1;stroke:#536c67;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:DejaVu Serif" />
+ </g>
+ <g
+ id="g1936"
+ transform="matrix(2.052686,0,0,2.052686,-404.4489,380.2516)">
+ <path
+ sodipodi:nodetypes="cc"
+ id="path1938"
+ d="M 12.999066,47.703463 L 55.357092,47.703463"
+ style="fill:#374845;fill-rule:evenodd;stroke:#6f918a;stroke-width:2.15206432;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ transform="matrix(0.794213,0,0,0.794213,161.2522,0.580159)"
+ d="M -150 26 A 10 10 0 1 1 -170,26 A 10 10 0 1 1 -150 26 z"
+ sodipodi:ry="10"
+ sodipodi:rx="10"
+ sodipodi:cy="26"
+ sodipodi:cx="-160"
+ id="path1940"
+ style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#6f918a;stroke-width:1.56876302;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="cccccccczc"
+ id="path1942"
+ d="M 32.589654,1.1096339 L 32.589654,2.6980598 L 32.589654,11.752088 L 33.330918,14.50536 L 35.02524,14.50536 L 35.766506,11.752088 L 35.766506,2.6980598 L 35.766506,1.1096339 C 35.23703,1.021388 34.707554,0.84489625 34.178079,0.84489625 C 33.648604,0.84489625 33.119128,1.021388 32.589654,1.1096339 z "
+ style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.9061324;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ id="path1944"
+ d="M 3.4488346,94.677852 L 1.9959014,102.74656 L 2.3485637,105.51135 L 3.6040027,103.02868 L 5.0569359,94.988187 L 3.4488346,94.677852 z "
+ style="fill:#536c67;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ transform="matrix(1.601179,0,0,1.601179,218.9345,-53.31984)"
+ d="M -131.25 91.8125 A 1.8125 1.8125 0 1 1 -134.875,91.8125 A 1.8125 1.8125 0 1 1 -131.25 91.8125 z"
+ sodipodi:ry="1.8125"
+ sodipodi:rx="1.8125"
+ sodipodi:cy="91.8125"
+ sodipodi:cx="-133.0625"
+ id="path1946"
+ style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#93aca7;stroke-width:0.42443681;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path1948"
+ d="M 65.113385,96.296589 L 66.285516,103.16021 L 65.262411,104.69422 L 63.809478,96.653724 L 65.113385,96.296589 z "
+ style="fill:#536c67;fill-opacity:1;fill-rule:evenodd;stroke:#536c67;stroke-width:0.33979961;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccc"
+ id="path1950"
+ d="M 58.810986,73.853337 L 56.19236,74.95143 L 58.810986,73.853337"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.79286575;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path1952"
+ d="M 31.100503,25.233854 L 1.7477151,95.190781 L 2.0124527,101.51139 L 3.9979853,101.84231 L 34.178079,29.899855 L 64.358173,101.84231 L 66.343705,101.51139 L 66.608443,95.190781 L 37.255655,25.233854 L 34.906107,26.22662 L 34.178079,29.171827 L 33.450051,26.22662 L 31.100503,25.233854 z "
+ style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.9061324;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path1954"
+ d="M 50.955828,69.908335 L 55.257816,80.133827 L 59.526711,78.346848 L 56.316767,70.669455 L 50.955828,69.908335 z "
+ style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#93aca7;stroke-width:0.5663327;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ transform="matrix(1.601179,0,0,1.601179,275.5363,-51.72735)"
+ d="M -131.25 91.8125 A 1.8125 1.8125 0 1 1 -134.875,91.8125 A 1.8125 1.8125 0 1 1 -131.25 91.8125 z"
+ sodipodi:ry="1.8125"
+ sodipodi:rx="1.8125"
+ sodipodi:cy="91.8125"
+ sodipodi:cx="-133.0625"
+ id="path1956"
+ style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#93aca7;stroke-width:0.42443681;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="cc"
+ id="path1958"
+ d="M 14.322754,46.379775 L 14.322754,49.027151"
+ style="fill:#4d4d4d;fill-rule:evenodd;stroke:#6f918a;stroke-width:3.28472996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cc"
+ id="path1960"
+ d="M 54.033404,46.379775 L 54.033404,49.027151"
+ style="fill:#4d4d4d;fill-rule:evenodd;stroke:#6f918a;stroke-width:3.28472996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccc"
+ id="path1962"
+ d="M 57.375198,79.240556 L 54.805887,73.113512 L 57.375198,79.240556"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.67959929;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccc"
+ id="path1964"
+ d="M 57.721094,71.214665 L 59.929123,76.480163 L 57.721094,71.214665"
+ style="color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.9061324;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ transform="matrix(0.881113,0,0,0.881113,166.3452,-0.181653)"
+ d="M -147.5 33.5 A 2.5 2.5 0 1 1 -152.5,33.5 A 2.5 2.5 0 1 1 -147.5 33.5 z"
+ sodipodi:ry="2.5"
+ sodipodi:rx="2.5"
+ sodipodi:cy="33.5"
+ sodipodi:cx="-150"
+ id="path1966"
+ style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.77%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list