[oe-commits] org.oe.dev merge of '576d7c6e5dbff47f56003806561fdc43a07c6f50'
jeremy_laine commit
openembedded-commits at lists.openembedded.org
Fri Dec 7 16:14:41 UTC 2007
merge of '576d7c6e5dbff47f56003806561fdc43a07c6f50'
and 'f564197dcff7dea800a0dcabf27c4809e2521c8c'
Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 0d687ebf73328d86c69750e15499ae073b7b80f6
ViewMTN: http://monotone.openembedded.org/revision/info/0d687ebf73328d86c69750e15499ae073b7b80f6
Files:
1
packages/python/python-sword_1.5.8.bb
packages/python/python-sword_1.5.9.bb
packages/uicmoc/uicmoc4-native_4.2.3.bb
packages/uicmoc/uicmoc4-native_4.3.0.bb
packages/e17/rage_0.2.0.003.bb
packages/e17/rage_0.2.0.005.bb
packages/e17/expedite
packages/mozilla/mozilla
packages/mozilla/mozilla/files
packages/mozilla/mozilla/files/i386
packages/mozilla/mozilla/files/i486
packages/mozilla/mozilla/files/i586
packages/mozilla/mozilla/files/i686
packages/mozilla/mozilla/firefox-2.0.0.3
packages/openrdate
contrib/angstrom/build-release.sh
contrib/angstrom/rss.php
contrib/angstrom/rss2.php
packages/e17/expedite/hack-disable-opengl.patch
packages/images/console-mipv6-image.bb
packages/mipl-mipv6/mipv6_2.0.2.bb
packages/mozilla/firefox-2.0.0.3/linkage-problem.patch
packages/mozilla/mozilla/files/i386/jsautocfg.h
packages/mozilla/mozilla/files/i486/jsautocfg.h
packages/mozilla/mozilla/files/i586/jsautocfg.h
packages/mozilla/mozilla/files/i686/jsautocfg.h
packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch
packages/openrdate/openrdate_1.1.3.bb
packages/pulseaudio/files/fix-dbus-without-hal.patch
packages/python/python-2.5.1/enable-ctypes-module.patch
packages/python/python-cython-native_0.9.6.9.bb
packages/python/python-cython_0.9.6.9.bb
packages/python/python-efl.bb
packages/python/python-epsilon_cvs.bb
packages/python/python-sword_1.5.10.bb
packages/sword/sword_1.5.10.bb
packages/tasks/task-mipl.bb
classes/distutils.bbclass
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom.inc
conf/distro/include/sane-srcdates.inc
contrib/python/generate-manifest-2.5.py
packages/e17/expedite_cvs.bb
packages/efl1/ecore.inc
packages/efl1/ecore_cvs.bb
packages/efl1/evas-native_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/efl1/ewl_cvs.bb
packages/glibc/glibc-package.bbclass
packages/linux/linux-rp_2.6.17.bb
packages/linux/linux-rp_2.6.20.bb
packages/linux/linux-rp_2.6.21.bb
packages/linux/linux-rp_2.6.22.bb
packages/linux/linux-rp_2.6.23.bb
packages/mozilla/firefox-2.0.0.3/mozconfig
packages/mozilla/firefox_2.0.0.3.bb
packages/pimlico/contacts.inc
packages/pimlico/dates.inc
packages/psplash/files/configurability.patch
packages/psplash/psplash_svn.bb
packages/pulseaudio/pulseaudio_0.9.8.bb
packages/python/python-2.5-manifest.inc
packages/python/python-ecore_cvs.bb
packages/python/python-efl.inc
packages/python/python-pygtk_2.10.4.bb
packages/python/python_2.5.1.bb
packages/tasks/task-base.bb
packages/tasks/task-python-everything.bb
packages/tasks/task-python-sharprom_20060425.bb
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
mtn:execute
true
Diffs:
#
# mt diff -r576d7c6e5dbff47f56003806561fdc43a07c6f50 -r0d687ebf73328d86c69750e15499ae073b7b80f6
#
#
#
# delete "packages/python/python-sword_1.5.8.bb"
#
# delete "packages/python/python-sword_1.5.9.bb"
#
# delete "packages/uicmoc/uicmoc4-native_4.2.3.bb"
#
# delete "packages/uicmoc/uicmoc4-native_4.3.0.bb"
#
# rename "packages/e17/rage_0.2.0.003.bb"
# to "packages/e17/rage_0.2.0.005.bb"
#
# add_dir "packages/e17/expedite"
#
# add_dir "packages/mozilla/mozilla"
#
# add_dir "packages/mozilla/mozilla/files"
#
# add_dir "packages/mozilla/mozilla/files/i386"
#
# add_dir "packages/mozilla/mozilla/files/i486"
#
# add_dir "packages/mozilla/mozilla/files/i586"
#
# add_dir "packages/mozilla/mozilla/files/i686"
#
# add_dir "packages/mozilla/mozilla/firefox-2.0.0.3"
#
# add_dir "packages/openrdate"
#
# add_file "contrib/angstrom/build-release.sh"
# content [2fb09c74580347257b64436551a2367492be367b]
#
# add_file "contrib/angstrom/rss.php"
# content [1ed147213049aa6f7086f8439401621c2a865702]
#
# add_file "contrib/angstrom/rss2.php"
# content [30cfd581394ae7f5e17996503a966670e246c014]
#
# add_file "packages/e17/expedite/hack-disable-opengl.patch"
# content [25cb1ff579c94ca9605c900d89870e2e1cef4336]
#
# add_file "packages/images/console-mipv6-image.bb"
# content [a1e3ca126544a1d9cb8ae78892c6c5db5867b103]
#
# add_file "packages/mipl-mipv6/mipv6_2.0.2.bb"
# content [d61e13a0489a81ad82a4624f86cf071ca926914e]
#
# add_file "packages/mozilla/firefox-2.0.0.3/linkage-problem.patch"
# content [7863efd4c4cce2aacd3fca003a8f96089e3189bf]
#
# add_file "packages/mozilla/mozilla/files/i386/jsautocfg.h"
# content [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
#
# add_file "packages/mozilla/mozilla/files/i486/jsautocfg.h"
# content [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
#
# add_file "packages/mozilla/mozilla/files/i586/jsautocfg.h"
# content [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
#
# add_file "packages/mozilla/mozilla/files/i686/jsautocfg.h"
# content [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
#
# add_file "packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch"
# content [7863efd4c4cce2aacd3fca003a8f96089e3189bf]
#
# add_file "packages/openrdate/openrdate_1.1.3.bb"
# content [23a1926943ef815462e8302b1ea34233d5194de0]
#
# add_file "packages/pulseaudio/files/fix-dbus-without-hal.patch"
# content [e816cccb9c342074e7c44d20f642b8833d11d57f]
#
# add_file "packages/python/python-2.5.1/enable-ctypes-module.patch"
# content [fcdbe615e5967af46ce02747bce2fdec7aa32063]
#
# add_file "packages/python/python-cython-native_0.9.6.9.bb"
# content [e1421a5e31559ec41144bbdc77a4c448d493e717]
#
# add_file "packages/python/python-cython_0.9.6.9.bb"
# content [0a9a75ec77d6190dc80054f14140c6d397f4f97c]
#
# add_file "packages/python/python-efl.bb"
# content [38e140ae1f0addeb5ff6e307653bfd5032f4df82]
#
# add_file "packages/python/python-epsilon_cvs.bb"
# content [7bd65f186128ab558629d1d56830b76733712059]
#
# add_file "packages/python/python-sword_1.5.10.bb"
# content [73eb9b115d9b21296ba5df9e59506f3079400369]
#
# add_file "packages/sword/sword_1.5.10.bb"
# content [009e6b694d5ce33c34f3f5738c165c4347da10c9]
#
# add_file "packages/tasks/task-mipl.bb"
# content [6524ebb4dd47f3984406053cebd25e3e8724b3b6]
#
# patch "classes/distutils.bbclass"
# from [41980eec92cf67538cc2af843af8a2424a084a31]
# to [d6701363cef5b26ab81a90ffc863f5ea8686cb17]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [0556daa097782b542ec3ef3bc2bc525d58b78091]
# to [a59b4bdff5fea83e852628a968abbeb155999248]
#
# patch "conf/distro/include/angstrom.inc"
# from [fbec2661b476213454b69adc6d89a7b5be329d4d]
# to [52dbd93aadf5979fc5b657ed07068f613d323a74]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [8af2f634c8a91d9c27579c3537ca1e7d3132f5c6]
# to [7749bfba16f5e3781dfb985e24f1664204058a6e]
#
# patch "contrib/python/generate-manifest-2.5.py"
# from [e2e4d8c66dd9b6732679d4586d43d433b78c9fde]
# to [f768218da4136ae607054f3c46f08ce296c06475]
#
# patch "packages/e17/expedite_cvs.bb"
# from [d6c491e48f867162a8690fce0bf8044dcb7136bc]
# to [3619ffd86c2d193c30ed018a3a064296e7609850]
#
# patch "packages/e17/rage_0.2.0.005.bb"
# from [4f42243a18e7ac96672cf185a1fd7bea7c76bdf0]
# to [be8c5ba108c7b91ce0516d15c10fa44c67f9be4d]
#
# patch "packages/efl1/ecore.inc"
# from [cec350030eb895068d6de7c48653ae95634e61c2]
# to [a23578418f9709d9270c1064bb6e9c82c205d509]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [dec22496c322b59a7a8bc85c16638bc3df968b44]
# to [beca187339858acf3df078a145b9583c19f8fbb7]
#
# patch "packages/efl1/evas-native_cvs.bb"
# from [43075f93e3ccaafd51b16995c68d846aaa61d951]
# to [711258833aed0945577bccaa289dda0250e2e010]
#
# patch "packages/efl1/evas.inc"
# from [fd3e4b3fe2bc86c11be17af6e14d5eff08387a89]
# to [75e7e49650901c4a5ed2bd9c2e390eb76c130a3c]
#
# patch "packages/efl1/evas_cvs.bb"
# from [876a23f29e979df031ca09d730a1840667e998e4]
# to [bf66442121095eca949f9fd7637e93fecdfcaf1c]
#
# patch "packages/efl1/ewl_cvs.bb"
# from [dc929b34b3fd94b358ec70f0cc96d56aa4f08a60]
# to [c054e8480d8c515eb1aa7d7fc623fd4d60cfd3c4]
#
# patch "packages/glibc/glibc-package.bbclass"
# from [7424898eefe4cc4de00b0f2afd7c044a6c8fb18d]
# to [87de7a00ded18ae91f844d05b3fb78dd64e0fd7b]
#
# patch "packages/linux/linux-rp_2.6.17.bb"
# from [16685e46813867023bf00b5cdc8d553d43f7be32]
# to [1e091bd34d98eb0a943a7ad227b3f9428a35c721]
#
# patch "packages/linux/linux-rp_2.6.20.bb"
# from [c9ffdc44330899f28017ea5640fb994033c1c355]
# to [4543ed5404a5182988a9eead29310aba8694dafc]
#
# patch "packages/linux/linux-rp_2.6.21.bb"
# from [8c217a9d5063a2507dca17af6cadab2c38b84e5a]
# to [0c168c0cccea7b91c96d3883e69486337818106c]
#
# patch "packages/linux/linux-rp_2.6.22.bb"
# from [35b07533548dccd8eb3b3c2e22e7874b0a277ca7]
# to [8a34ec5f81848cec7da4097bdcd7883611b3dcf0]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [fd4ac29b114505fecc77298651fb1b8a4728f312]
# to [eac5aa60f2ddb10ba84d485d2396f61479482d33]
#
# patch "packages/mozilla/firefox-2.0.0.3/mozconfig"
# from [035d9834d662d15a37cc3f7aa65c0111e433b3b9]
# to [411dfae58ddc1627c6aa7e0ae66592e8a6d27877]
#
# patch "packages/mozilla/firefox_2.0.0.3.bb"
# from [ff9dc115db7d1ddc78b700764d392c5d86f63481]
# to [0ee74a5aef3cee4364cdc98fcb62c10891e384a5]
#
# patch "packages/pimlico/contacts.inc"
# from [38562bb570c26dae7efe5495e05642d1e60d2401]
# to [a72e504109936a7b880eab839a9a87875c068a38]
#
# patch "packages/pimlico/dates.inc"
# from [3bf8c125be87bac049b6da0893eaecfce67b0c7e]
# to [bafdd6c556d9fa89501cc790456bdd165d63e266]
#
# patch "packages/psplash/files/configurability.patch"
# from [62ed2328f8bd83a1609058709ddf254ee396d33d]
# to [e7accf68bfb32354a51e199c9960e40cf655d9ae]
#
# patch "packages/psplash/psplash_svn.bb"
# from [5f388d9f92a2d8c405d7d667d3c6c45c288c82bb]
# to [4e90d427d5ad257ee0faf49f0e087779364df998]
#
# patch "packages/pulseaudio/pulseaudio_0.9.8.bb"
# from [815657961892febee8418dbc92e3e829a156e821]
# to [0ce1c8812f67eceea08584e12ec2e17e8b225790]
#
# patch "packages/python/python-2.5-manifest.inc"
# from [fe601293378798fbe52a39d55b428fecec3fa1f5]
# to [310d5b976333bfad4ed4517dcf5756b428282424]
#
# patch "packages/python/python-ecore_cvs.bb"
# from [8ae4047c69093053f4e143c210798f9df1ea20db]
# to [bfa8e271f3daff2c2b60e8e4c9cbf7aedbe9a699]
#
# patch "packages/python/python-efl.inc"
# from [80730c5bf36a6a6a0cbbbb65f28daf6416921c23]
# to [52c210d09e0ffddb7db102b3f81f7759c1f7991d]
#
# patch "packages/python/python-pygtk_2.10.4.bb"
# from [1fe07d72af509c3c4379bfd590276993274cdb1f]
# to [d9b42f194943701dd3dd2cf861e84c49df9183b9]
#
# patch "packages/python/python_2.5.1.bb"
# from [e1aab59299568cfc19d5379dc80703a639cbd155]
# to [be4656d29bd3d98990716fee77c71ef69a758a2d]
#
# patch "packages/tasks/task-base.bb"
# from [bd9f0978ca2a00519da16302f7e73d3fad3879fd]
# to [b2a95f7d8e72d2e4046a8e35491b379a2bbd4e2c]
#
# patch "packages/tasks/task-python-everything.bb"
# from [8ac45927171c9bfd7e98506a31c29c28f1184299]
# to [2e4ebcc640b47da88d113e5780f8f4da2e755a21]
#
# patch "packages/tasks/task-python-sharprom_20060425.bb"
# from [bb604ff879079decdfb7854f7f348520aae886ba]
# to [48cf28905153f00fc6be5a2d9087070941eb5f2b]
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [b20b6450310cee01b3ad65ab6cf78e66fe1fdb08]
# to [d04594f8a058a8d49fc0d2325f21064bc83a5050]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [7a273ae9f26d4da3830acc3f36b0dd21a6432e48]
# to [17a310f0b8b06db9d390982494ba835550b32204]
#
# set "contrib/angstrom/build-release.sh"
# attr "mtn:execute"
# value "true"
#
============================================================
--- contrib/angstrom/build-release.sh 2fb09c74580347257b64436551a2367492be367b
+++ contrib/angstrom/build-release.sh 2fb09c74580347257b64436551a2367492be367b
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+DO_UCLIBC=0
+
+do_build() {
+ echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
+
+ BUILD_MODE="glibc"
+ if [ "$BUILD_CLEAN" != "" ]
+ then
+ bitbake -c clean $BUILD_CLEAN
+ fi
+
+ for target in $BUILD_TARGETS
+ do
+ bitbake $target && do_report_success
+ done
+
+ if [ $DO_UCLIBC = 1 ]
+ then
+ BUILD_MODE="uclibc"
+ echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+ for target in $BUILD_TARGETS
+ do
+ bitbake $target && do_report_success
+ done
+ fi
+}
+
+do_report_success() {
+
+ echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder.log
+}
+
+# No graphics
+for machine in ep93xx gumstix-connex efika omap5912osk
+do
+ BUILD_MACHINE=$machine
+ BUILD_TARGETS="minimal-image console-image"
+ do_build
+done
+
+for machine in ixp4xxle ixp4xxbe
+do
+ BUILD_MACHINE=$machine
+ BUILD_TARGETS="nslu2-minimal-image"
+ do_build
+done
+
+# build altboot images for zaurus
+for machine in c7x0 poodle tosa akita spitz collie
+do
+ BUILD_MACHINE=$machine
+ BUILD_TARGETS="altboot-console-image"
+ do_build
+done
+
+# graphics, flash storage
+for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h4000 poodle tosa hx4700 c7x0 spitz akita collie
+do
+ BUILD_MACHINE=$machine
+ BUILD_TARGETS="minimal-image console-image x11-image"
+ do_build
+done
+
+# graphics, disk storage
+for machine in spitz
+do
+ BUILD_MACHINE=$machine
+ BUILD_TARGETS="x11-gpe-image x11-pimlico-image x11-office-image"
+ BUILD_CLEAN="qmake2-native"
+ do_build
+done
+
+#phones
+for machine in fic-gta01 a780
+do
+ BUILD_MACHINE=$machine
+ BUILD_TARGETS="openmoko-image"
+ BUILD_CLEAN="qmake2-native"
+ do_build
+done
============================================================
--- contrib/angstrom/rss.php 1ed147213049aa6f7086f8439401621c2a865702
+++ contrib/angstrom/rss.php 1ed147213049aa6f7086f8439401621c2a865702
@@ -0,0 +1,48 @@
+<?php echo ('<?xml version="1.0" encoding="utf-8"?>'); ?>
+<rss version="2.0" xml:base="http://www.angstrom-distribution.org/unstable/autobuild/" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <channel>
+ <title>Ã
ngström autobuilder updates</title>
+ <link>http://www.angstrom-distribution.org/unstable/autobuild/</link>
+ <description></description>
+ <language>en</language>
+<?php
+
+$base_path = "/home/angstrom/website/unstable/autobuild";
+
+if ($handle = opendir("$base_path"))
+{
+ while (false !== ($file = readdir($handle)))
+ {
+ if(!(is_dir($file) && $file != "." && $file != ".."))
+ {
+ continue;
+ }
+
+ $second_handle = opendir("$base_path/$file/");
+
+ while (false !== ($file2 = readdir($second_handle)))
+ {
+ if(is_file("/$base_path/$file/$file2"))
+ {
+ $fmtime = filemtime("$file/$file2");
+
+ echo "<item>\n"
+ echo "<title>$file/$file2 uploaded</title>\n";
+ echo " <link>http://www.angstrom-distribution.org/unstable/autobuild/$file/$file2</link>\n";
+
+ $rsstime = strftime("%a, %d %b %Y %T +0100", $fmtime);
+
+ echo "<pubDate>$rsstime</pubDate>\n";
+ echo "<dc:creator>Angstrom autobuilder</dc:creator>";
+ echo "</item>\n";
+ }
+ }
+
+ closedir($second_handle);
+ }
+
+ closedir($handle);
+}
+?>
+ </channel>
+</rss>
============================================================
--- contrib/angstrom/rss2.php 30cfd581394ae7f5e17996503a966670e246c014
+++ contrib/angstrom/rss2.php 30cfd581394ae7f5e17996503a966670e246c014
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This generator expect only log from autobuilder in simple format:
+ * TIME_OF_BUILD BUILD_TARGET BUILD_MODE MACHINE
+ *
+ * where TIME_OF_BUILD is epoch
+ *
+ * All what it does is parsing log and output it in reverse order (new builds
+ * first) in RSS 2.0 format.
+ *
+ * (C) 2007 Marcin Juszkiewicz
+ *
+ * License: MIT
+ *
+ */
+
+$build_link_base = 'http://www.angstrom-distribution.org/unstable/autobuild/';
+
+$builder_log_date = file('autobuilder.log');
+
+if(empty($builder_log_date))
+ die("No logs\n");
+
+$builder_log_date = array_reverse($builder_log_date);
+
+$rss_xml = new xmlWriter();
+
+if(!$rss_xml)
+ die("Unable to create XML Writer\n");
+
+$rss_xml->openMemory();
+
+$rss_xml->startDocument('1.0','utf-8');
+$rss_xml->startElement('rss');
+$rss_xml->writeAttribute('version', '2.0');
+
+$rss_xml->startElement('channel');
+
+$rss_xml->writeElement('title', 'Ã
ngström autobuilder updates');
+$rss_xml->writeElement('link', $build_link_base);
+$rss_xml->writeElement('description', 'Ã
ngström autobuilder updates list');
+
+foreach($builder_log_date as $build)
+{
+ $build = str_replace("\n", "", $build);
+ $data = explode(' ', $build);
+
+ $rss_xml->startElement('item');
+ $rss_xml->writeElement('title', "{$data[1]} ({$data[2]}) built for {$data[3]}");
+ $rss_xml->writeElement('link', "{$build_link_base}{$data[3]}/");
+ $rss_xml->writeElement('pubDate', date('r', $data[0]));
+
+ $rss_xml->endElement();
+}
+
+$rss_xml->endElement();
+$rss_xml->endElement();
+
+echo $rss_xml->outputMemory(true);
+
+echo "\n";
+?>
============================================================
--- packages/e17/expedite/hack-disable-opengl.patch 25cb1ff579c94ca9605c900d89870e2e1cef4336
+++ packages/e17/expedite/hack-disable-opengl.patch 25cb1ff579c94ca9605c900d89870e2e1cef4336
@@ -0,0 +1,87 @@
+Index: expedite/configure.in
+===================================================================
+--- expedite.orig/configure.in
++++ expedite/configure.in
+@@ -47,24 +47,11 @@
+ PKG_CHECK_MODULES([EVAS], evas)
+
+ dnl OpenGL GLEW
+-PKG_CHECK_EXISTS(evas-opengl-glew,
+- [
+- AC_DEFINE(HAVE_EVAS_OPENGL_GLEW, 1, [Evas GL Glew Engine Support])
+- have_opengl_glew="yes"
+- glew_libs="-lglew32 -lgdi32"
+- ],
+- [ have_opengl_glew="no" ]
+-)
++have_opengl_glew="no"
+ AM_CONDITIONAL(BUILD_OPENGL_GLEW, test "x$have_opengl_glew" = "xyes")
+
+ dnl OpenGL X11
+-PKG_CHECK_EXISTS(evas-opengl-x11,
+- [
+- AC_DEFINE(HAVE_EVAS_OPENGL_X11, 1, [Evas GL X11 Engine Support])
+- have_opengl_x11="yes"
+- ],
+- [ have_opengl_x11="no" ]
+-)
++have_opengl_x11="no"
+ AM_CONDITIONAL(BUILD_OPENGL_X11, test "x$have_opengl_x11" = "xyes")
+
+ dnl Software X11
+@@ -109,49 +96,23 @@
+
+ # TODO: Check availability of libs
+ dnl DirectDraw
+-PKG_CHECK_EXISTS(evas-software-ddraw,
+- [
+- AC_DEFINE(HAVE_EVAS_SOFTWARE_DDRAW, 1, [Evas Software DirectDraw Engine Support])
+- have_software_ddraw="yes"
+- ddraw_libs="-lddraw -ldxguid"
+- ],
+- [ have_software_ddraw="no" ]
+-)
++have_software_ddraw="no"
+ AM_CONDITIONAL(BUILD_SOFTWARE_DDRAW, test "x$have_software_ddraw" = "xyes")
+
+ # TODO: Check availability of libs
+ dnl 16bit DirectDraw
+-PKG_CHECK_EXISTS(evas-software-16-ddraw,
+- [
+- AC_DEFINE(HAVE_EVAS_SOFTWARE_16_DDRAW, 1, [Evas Software 16bit DirectDraw Engine Support])
+- have_software_16_ddraw="yes"
+- ddraw_libs="-lddraw -ldxguid"
+- ],
+- [ have_software_16_ddraw="no" ]
+-)
++have_software_16_ddraw="no"
+ AM_CONDITIONAL(BUILD_SOFTWARE_16_DDRAW, test "x$have_software_16_ddraw" = "xyes")
+
+ # TODO: Check availability of libs
+ dnl Direct3D
+-PKG_CHECK_EXISTS(evas-direct3d,
+- [
+- AC_DEFINE(HAVE_EVAS_DIRECT3D, 1, [Evas Direct3D Engine Support])
+- have_direct3d="yes"
+- d3d_libs="-ld3d9 -ld3dx9d"
+- ],
+- [ have_direct3d="no" ]
+-)
++have_direct3d="no"
+ AM_CONDITIONAL(BUILD_DIRECT3D, test "x$have_direct3d" = "xyes")
+
+ dnl Software SDL
+-PKG_CHECK_EXISTS(evas-software-sdl,
+- [
+- AC_DEFINE(HAVE_EVAS_SOFTWARE_SDL, 1, [Evas Software SDL Engine Support])
+- have_software_sdl="yes"
+- ],
+- [ have_direct3d="no" ]
+-)%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rf564197dcff7dea800a0dcabf27c4809e2521c8c -r0d687ebf73328d86c69750e15499ae073b7b80f6
#
#
# no changes
#
More information about the Openembedded-commits
mailing list