diff options
64 files changed, 1154 insertions, 88 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index bc50c67d4b..9c51c0a08e 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -885,7 +885,7 @@ def base_get_metadata_svn_revision(path, d): def base_get_metadata_git_branch(path, d): import os - branch = os.popen('cd %s; PATH=%s git symbolic-ref HEAD 2>/dev/null' % (path, d.getVar("BBPATH", 1))).read().rstrip() + branch = os.popen('cd %s; PATH=%s git symbolic-ref HEAD 2>/dev/null' % (path, d.getVar("PATH", 1))).read().rstrip() if len(branch) != 0: return branch.replace("refs/heads/", "") @@ -893,7 +893,7 @@ def base_get_metadata_git_branch(path, d): def base_get_metadata_git_revision(path, d): import os - rev = os.popen("cd %s; PATH=%s git show-ref HEAD 2>/dev/null" % (path, d.getVar("BBPATH", 1))).read().split(" ")[0].rstrip() + rev = os.popen("cd %s; PATH=%s git show-ref HEAD 2>/dev/null" % (path, d.getVar("PATH", 1))).read().split(" ")[0].rstrip() if len(rev) != 0: return rev return "<unknown>" diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass index 8922496242..e6b8485385 100644 --- a/classes/oestats-client.bbclass +++ b/classes/oestats-client.bbclass @@ -5,8 +5,9 @@ # To make use of this class, add to your local.conf: # # INHERIT += "oestats-client" -# OESTATS_SERVER = "some.server.org" +# OESTATS_SERVER = "http://some.server.org" # OESTATS_BUILDER = "some_nickname" +# def oestats_setid(d, val): import bb @@ -19,8 +20,8 @@ def oestats_getid(d): return f.read() def oestats_send(d, server, action, vars = {}, files = {}): - import httplib import bb + import urllib2 # build body output = [] @@ -49,21 +50,12 @@ def oestats_send(d, server, action, vars = {}, files = {}): "Content-type": "multipart/form-data; boundary=%s" % bound, "Content-length": str(len(body))} - # send request - proxy = bb.data.getVar('HTTP_PROXY', d, True ) - if (proxy): - if (proxy.endswith('/')): - proxy = proxy[:-1] - if (proxy.startswith('http://')): - proxy = proxy[7:] - conn = httplib.HTTPConnection(proxy) - action = "http://%s%s" %(server, action) - else: - conn = httplib.HTTPConnection(server) - conn.request("POST", action, body, headers) - response = conn.getresponse() + # send request using urllib2, proxies should be auto-detected + actionURL = "%s%s" %(server, action) + req = urllib2.Request(actionURL, body, headers); + response = urllib2.urlopen(req) data = response.read() - conn.close() + return data def oestats_start(server, builder, d): @@ -111,7 +103,7 @@ def oestats_stop(server, d, failures): 'status': status, }) if status == 'Failed': - bb.note("oestats: build failed, see http://%s%s" % (server,response)) + bb.note("oestats: build failed, see %s%s" % (server, response)) except: bb.note("oestats: error stopping build") @@ -169,7 +161,7 @@ def oestats_task(server, d, task, status): try: response = oestats_send(d, server, "/tasks/", vars, files) if status == 'Failed': - bb.note("oestats: task failed, see http://%s%s" % (server, response)) + bb.note("oestats: task failed, see %s%s" % (server, response)) except: bb.note("oestats: error sending task, disabling stats") oestats_setid(d, "") @@ -184,6 +176,8 @@ python oestats_eventhandler () { return NotHandled server = bb.data.getVar('OESTATS_SERVER', e.data, True) + if not server.startswith('http://') and not server.startswith('https://'): + server = "http://%s" %(server) builder = bb.data.getVar('OESTATS_BUILDER', e.data, True) if not server or not builder: return NotHandled diff --git a/conf/checksums.ini b/conf/checksums.ini index e19a0ff1b7..392ec5063b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -58,6 +58,10 @@ sha256=7a960180e7873b1bdb522e76b0423b5c2c1b8efe1d30d7ca80c41eb97d822b2d md5=f13ab353b11329ce3d605b6f40e77fa6 sha256=41991e8aa2e5fe8e5dfd47b1e5c446fa03c3ee96a5eae54fd6ec15d1d9afef30 +[http://hg.openjdk.java.net/hsx/hsx14/master/archive/25a020f13592.tar.gz] +md5=dbd7aca5544d1aeebf0eadd45d29d08e +sha256=02f10b35508cb11908bb908156daad1ea5e653840440d62482231efeb4cbe178 + [http://sense.net/zc/free42/42c_skins.tgz] md5=24b0e5bbfe21ea9c5a5c589bcc79c0f2 sha256=ab877846c6caaff32efbf5be6fc5c63b7dec97a2e78c57c525da7705d2052bfc @@ -1542,6 +1546,10 @@ sha256=caba504ca4f769c5f3f8b4e97ed0da1888bd0be2efd3c33cac9bf36e7c285bc3 md5=0d68db4a1ada5c91bcbf53cefd0c2fd7 sha256=4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6 +[http://ftp.riken.jp/net/apache/ant/source/apache-ant-1.7.1-src.tar.gz] +md5=2a44ff60456cf67bb83771cfcedb8e33 +sha256=1a2fceea38f04e6fea0c0cb8ad7312dc948004af4d9308b5e630d299d89dfb38 + [http://archive.apache.org/dist/logging/log4j/1.2.15/apache-log4j-1.2.15.tar.gz] md5=10f04abe4d68d5a89e8eb167e4e45e1a sha256=f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31 @@ -2838,6 +2846,10 @@ sha256=0b22f518085528b71aa9eab8bbc44d2696458c85d902c6a6686076ae10d64549 md5=d24dfd3ca42847123e29f58b29af6948 sha256=ed7631a6d22b456eb26b881bdbe46ea47f93d2f192da420408bad4bbc245f796 +[http://www.kernel.org/pub/linux/bluetooth/bluez-4.46.tar.gz] +md5=ed24b291e9a724a37bc8e9d04adae413 +sha256=31f058fb722dfb96a7b496a064e0c46d634d7dffdd5b64c7dce3ab6ec2fa48bc + [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz] md5=2aa806940d2c841e57a9b2ab7302b750 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0 @@ -4670,6 +4682,10 @@ sha256=9ae500ffb1af6e29da00114bad18b776c2f24872c254ee62f6283948beaefc15 md5=e52d681c5ca11f4a9491624ab8c4fa90 sha256=e9f0cd45a82d2f60af7e927b1740b5971e9007bf7d05e39a900db2dcb7871916 +[http://ftp.gnome.org/pub/GNOME/sources/devhelp/0.23/devhelp-0.23.tar.bz2] +md5=704c0c90616aeb1c52ca3af1df93fde6 +sha256=60f336ac396f67a0cce70d71ea931545727ab48e9d09bf36415098965f9a7ef2 + [ftp://sources.redhat.com/pub/dm/device-mapper.1.01.04.tgz] md5=42dd0610e24d4b4f2409a32a04e6e37f sha256=49c8303f58abf3a0efbbd42decdc5968688df32c154cffb20a1c3c1ae8b92048 @@ -4719,8 +4735,8 @@ md5=e23f236e94be4c429aa1ceac0f01544b sha256=3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639 [http://www.lartmaker.nl/lartware/port/devmem2.c] -md5=be12c0132a1ae118cbf5e79d98427c1d -sha256=ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191 +md5=e23f236e94be4c429aa1ceac0f01544b +sha256=3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639 [http://pknet.com/~joe/dgen-sdl-1.23.tar.gz] md5=b1896c1b21ddb152626aec2e8a157a3a @@ -5262,6 +5278,10 @@ sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56 md5=c75f112d24bdc39c76dbec61d59a4a91 sha256=dc1eb1b7bbad2edc030e50e7506c79562d98098f99a5d6cb5db5aa5ca92ffe48 +[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.41.8.tar.gz] +md5=bd28f2ccce2c14f06091e04fd1a0c67e +sha256=90428106333a38b93b6f4a306fff17749243862883a06598ff6e6ea11f8d24d2 + [http://www.pobox.com/~sheff/sw/e2tools/e2tools-0.0.16.tar.gz] md5=1829b2b261e0e0d07566066769b5b28b sha256=4e3c8e17786ccc03fc9fb4145724edf332bb50e1b3c91b6f33e0e3a54861949b @@ -5310,6 +5330,10 @@ sha256=b5725fa7f8b1f7dc28776e60591e9ef0c171629fe567ef49ab9be28516ff2cd6 md5=f7b84d912e61dfdd77b7173065845250 sha256=a6ce5f0682462e85e5e47229e5b16555f74c60188fa0bb17536beb1138c537b4 +[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.5-200906111540/ecjsrc-3.5.zip] +md5=356f1d337833670e34cf53b58513daeb +sha256=f3f82d0b91f63fa3aab52f61ad8f5d50c0e4029479cf4b720b83a3424074bd38 + [http://mirror.calvin.edu/eclipse/downloads/drops/S-3.3M5eh-200702220951/ecjsrc.zip] md5=9e1fc1c86c85e72df5e141069b82041d sha256=f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc @@ -5418,6 +5442,10 @@ sha256=998b50e3920546cb43cd281d519394a2db23f5bf10223cac49120296407b3c6d md5=3009f30e124a2062370824bb307c5313 sha256=21032e8a420365d0539c6356d220bb8634e9c1ee839bfcceb3c03d9e427cd397 +[http://ftp.gnome.org/pub/GNOME/sources/ekiga/3.2/ekiga-3.2.5.tar.bz2] +md5=a545490e03a6b49f00253bf0d692f362 +sha256=6a624b741b110b5b1d9cdff8179760f52b0a623bf597b8e6be757fc18af20a4c + [http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip] md5=30e2fe5edd143f347e03a8baf5d60f8a sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad @@ -7134,6 +7162,10 @@ sha256=9f17181cd8bf46203a288e3fc1d9bd82d5dc011fe419d33bee2f62bace081f08 md5=d2f52d92776f47bf353787237607f23c sha256=9f17181cd8bf46203a288e3fc1d9bd82d5dc011fe419d33bee2f62bace081f08 +[http://www.gnome.org/~veillard/gamin/sources/gamin-0.1.10.tar.gz] +md5=b4ec549e57da470c04edd5ec2876a028 +sha256=28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1 + [http://www.gnome.org/~veillard/gamin/sources/gamin-0.1.8.tar.gz] md5=985022c8b1b993e471d528fd0e14ffbe sha256=be22f69b4797db510f4270ff0e228dd027e99e561ac5f5d38be595be7e82d203 @@ -7886,6 +7918,10 @@ sha256=6fb4269a187bee6f7825c358fd6f0e0e99e6ad71f7f995ddcbfe9466ec8f6631 md5=346916673c0eab72191cf44b4afe535f sha256=af709f0eabfbbfa5c59a02764ca1dd5e6509bbe7fb67a474b2c448bda7b06fb9 +[http://ftp.gnome.org/pub/GNOME/sources/glib/2.21/glib-2.21.4.tar.bz2] +md5=5092c5b479ba80065dc164d27e63000f +sha256=b772e4bdf1b28dd23cdb4c4d7f1d219ddb748226d0207e57c75992bf0100182d + [ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.6.tar.bz2] md5=a45db7d82480da431f6cd00ea041a534 sha256=d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2 @@ -10398,6 +10434,10 @@ sha256=730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90 md5=bb7c36e142437f7363f9a80ae8391926 sha256=c444e0485e4361eec0e6f06580c45b9fcf6f20a119634a5f0a5c13218cfdfd02 +[http://hal.freedesktop.org/releases/hal-0.5.13.tar.gz] +md5=46ecc5d2e5bd964fb78099688f01bb6a +sha256=ebcf22a373761530920643add1a791af40954dc7349f027d1c35b0e0f7f9c8af + [http://freedesktop.org/~david/dist/hal-0.5.2.tar.gz] md5=3b351822ba359669646026013a3d5a03 sha256=46d0a75f90058909269da4cc42986cd51d5163a6af669e9d7fb4a7d170217d17 @@ -10946,6 +10986,10 @@ sha256=c15fb24475ad93e064ba252f2739c020f9981a808bde6cbd6c41eae38dd0143d md5=6428ca1b0c38111cca230f5b69460b03 sha256=4f23aadcee80a9a03c858e36a8eaaa92149987ce0a3eac276e3003c9b2462739 +[http://icedtea.classpath.org/download/source/icedtea6-1.5.tar.gz] +md5=a67303675a53781c4e42bdb02ec78e40 +sha256=1ec328f41f8adfbf797599bc7bf4c07de162ac6d565d2b9fd95685b1cbc99ac8 + [http://jalimo.evolvis.org/repository/sources/icepick-0.0+hg20080118.tar.bz2] md5=ce7b1827e6f4cbe73b9ffa90b0d45a6a sha256=63170836095f8451498c813a1f93a9ec70a1164d82aa30650c0f2216ca4377ab @@ -14202,6 +14246,10 @@ sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c md5=6d6b6a75bc8751a7421b5e739c53ef6e sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c +[http://downloads.sourceforge.net/omxil/libomxil-bellagio-0.9.1.tar.gz] +md5=757371e21e4f3653ce4d12d3ba0be1e0 +sha256=9a0864cd442c43e5b69072dc0617b56252bc933fce26f6bfd6d47909287a353a + [http://download.ofb.net/liboop/liboop-1.0.tar.bz2] md5=88fc8decf99fd75d2af40e0a005fa0d3 sha256=4a973d28466fde0b689099192f9bcd081b129d90b3c5a9815e5ade73052cf8d2 @@ -16782,6 +16830,10 @@ sha256=e6cc1b6da8a7af99ba9298e0cb4aac790595f04e04497ea8c2bb4b48c44feb5f md5=c6299ecf93417526f37bc0154c18b126 sha256=9b74a776831c3680c10ad5c3d04985a1368c4fdf2f383a0e8efcc3cda925baaf +[http://goodies.xfce.org/releases/midori/midori-0.1.8.tar.bz2] +md5=06935203b20e9794121a2c354fc9dea5 +sha256=3b0e4a2c5c3e4457ce8f44e6cbb9f14ddfb66a515017b430f4f4484893e8ce9d + [http://git.xfce.org/kalikiana/midori/snapshot/midori-abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4.tar.bz2] md5=d50f0a9683dee60685bcd48e04970949 sha256=c5eb824148935697cf4fc36f11cfd7a05fbe6a3392d8f32e296e2cdfd21de3ee @@ -17970,6 +18022,10 @@ sha256=8ed452371010117e183ade4e1e3ae4b489485b792722bf3b97b817cf0ed66ac8 md5=8764dcbcd7b5ed80e17b1279a82701b0 sha256=c986121e520897af6c326ece8a26eca87bdb4641a93913b63a5c29521cefaf66 +[http://www.kernel.org/pub/linux/bluetooth/obexd-0.15.tar.gz] +md5=f9adc013e0e4b26c992cc0ca05328f3d +sha256=44ba0d99e1bf8fa2caf9f7a85d569e513208c0710c1ad00032e271289e87b63f + [http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz] md5=085b9edc0504c0d79e7479a54e2018c5 sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e @@ -18170,6 +18226,10 @@ sha256=e6b48a294b35449c851c2a6ea6969041ed7f4148e92b3faa03a330b7bb5a59af md5=88076eeadee1351704afb2aeb3532c17 sha256=09ffe451256fafdd74d4dc35ed153b93c81328c397d36872cca1f0104877caca +[http://downloads.sourceforge.net/opalvoip/opal-3.6.4.tar.bz2] +md5=d894c176818a33d34a04b21386798c4f +sha256=b1fb3bad0c8581b82f0da9c69673f43ad9aed7868a7e4f2a68c6c72ed656237b + [http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz] md5=641cf53761f35ee979f3e888614797a0 sha256=723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe @@ -18182,6 +18242,10 @@ sha256=a898b79336c7372c901bcc7e5f83db7b8e79f8e864be6a262f515b3e088bc607 md5=5c9c1639bdff3bd35c63697d398f1a68 sha256=3d6c58830e50373d0dc2a72f6fc65afd7ef30aabf2d1078e6878c911270dec16 +[http://downloads.sourceforge.net/myposition/openbmap-logger-0.4.0.tar.gz] +md5=52b71c33ce0d2da8d5c29db293132630 +sha256=93820366128b394d84b1b37830344b70f349c2896b60b601e884f9d857ff5d84 + [http://icculus.org/openbox/releases/openbox-3.4.7.2.tar.gz] md5=9e7589e90519bc6ac2f4656ea6869439 sha256=d11f2137a0fe1de6c36c999d29523ad68c05f22c5935ce8628a8cab7a2e4b000 @@ -18210,6 +18274,10 @@ sha256=f099b3b1f3c22b8cea950403b992267ec69f43ad8a80bbcb84448b26340807ab md5=9f9773a822156dd3d576d83d794364ce sha256=1272f975052e51d3faf2d7ac13d0b8b4ac68019a688bffe03d9b684a9e3b4480 +[http://download.java.net/openjdk/jdk6/promoted/b16/openjdk-6-src-b16-24_apr_2009.tar.gz] +md5=850a29b70206bc7fa083cd26acc781f3 +sha256=96159489d8b70db275c125b627c6e6912e6c078279d76b968d2e0969359c9420 + [http://jalimo.evolvis.org/repository/sources/openjdk-langtools-jdk7-b31.tar.bz2] md5=670931f67b2e4ac46c6e0cd15418f2fa sha256=f8b8820e410c137d279d14dec7e7a93217cc371acdfe1b3343b2278d1728932e @@ -18222,6 +18290,10 @@ sha256=82ed5a27d2b340826b2e10625e687627ccefc883a426314952e4a253d5a6af29 md5=fbde128a8421b8d2ea587a25057a281e sha256=63d1c60a49277a4e95dcfb7f45dbb66a902d9e9023f8aca3a01cda4ff221d6a9 +[ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.17.tgz] +md5=5e82103780f8cfc2b2fbd0f77c47c158 +sha256=4a18ce70154f5c0ffc1804698dba609d8f4aab3e74f01bbddf31b28b96403fc3 + [http://www.zip.com.au/~dtucker/openntpd/release/openntpd-3.7p1.tar.gz] md5=10ed8eefd760e5819efcf3277b118f47 sha256=313509a7ccb15565e911f61c599055afc705cfe4bf6370bdc1c30582d52a9ea9 @@ -19938,6 +20010,10 @@ sha256=b8301389c1ee9968df8075942061665e33198d3865f92d8fb26e519068517305 md5=d478121cfc82da7c0f0ce0e53fc7c2fd sha256=941ead5179f5bab8dd6e81806b6e52120dc5b98c6ced8128df24639af1eabedd +[http://downloads.sourceforge.net/opalvoip/ptlib-2.6.4.tar.bz2] +md5=bcc8e2d5bb6be7e3fea857ce2f7fce5c +sha256=22eae4f6c72247f8ac79c57ce4469797ad3df67614758c5096b7ce9290bd10b4 + [http://pypi.python.org/packages/source/p/ptrace/ptrace-0.3.2.tar.gz] md5=8108c2474bef16d126e956dce3c5073b sha256=634fe75e195179adafb6218040724f38252bd0fc8f796bb3e3e9bdba065890c5 @@ -24250,6 +24326,10 @@ sha256=7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c md5=71919b69eeecbba05612224d8f2c450f sha256=db4dcbf99d989a8f539d7521e9e64047367fa2ccdcbb91517cdec19693a41ffd +[http://kernel.org/pub/linux/utils/util-linux-ng/v2.16/util-linux-ng-2.16.tar.bz2] +md5=9623380641b0c2e0449f5b1ecc567663 +sha256=a6365fcb2b34439faa52164e1a018086c2b6818f8a189c487c79e09dc3c62722 + [http://xorg.freedesktop.org/releases/individual/util/util-macros-1.1.5.tar.bz2] md5=51952682d8b42aeda3af5cee0133ce2c sha256=75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 3e2705a445..d5e09af068 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -161,8 +161,8 @@ PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" PREFERRED_PROVIDER_bluez-libs = "bluez4" PREFERRED_PROVIDER_bluez-utils = "bluez4" -ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez3 has been replace by bluez4" -ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez3 has been replace by bluez4" +ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" +ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index 8fefbbce8a..bc42ebc227 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -194,6 +194,9 @@ PREFERRED_VERSION_swt3.4-gtk-hildon = "3.4" # Does not build with later versions PREFERRED_VERSION_fakeroot-native = "1.9.6" +# newer Versions needs newer autotools we cant relay on +PREFERRED_VERSION_guile-native = "1.8.2" + # WARNING: If you change these values after the respective package has # been built the change will have no effect. Edit the package's file in # ${STAGING}/pkgdata/runtime then. diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 5bf5b30d4c..6c1963549c 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -13,7 +13,7 @@ PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.16.4" PREFERRED_VERSION_gtkmm = "2.14.1" -PREFERRED_VERSION_hal = "0.5.12" +PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" PREFERRED_VERSION_libsdl-x11 = "1.2.11" @@ -24,7 +24,7 @@ PREFERRED_VERSION_libtool-sdk = "2.2.4" PREFERRED_VERSION_libx11 = "1.2" PREFERRED_VERSION_mesa = "7.2" PREFERRED_VERSION_pango = "1.24.4" -PREFERRED_VERSION_pixman = "0.13.2" +#PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index a00fec4c2a..643ae0b611 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -119,6 +119,11 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # squashfs, squashfs-lzma IMAGE_FSTYPES = "jffs2 tar" +# Uncomment this if you want to keep the temporary rootfs +# diretory, this can be useful during development. +# (Note that this rootfs is NOT usuable as NFS export.) +# IMAGE_KEEPROOTFS = "1" + # Uncomment this to disable the parse cache (not recommended). # CACHE = "" diff --git a/recipes/binutils/binutils-2.18/parse-neon-vmov.diff b/recipes/binutils/binutils-2.18/parse-neon-vmov.diff new file mode 100644 index 0000000000..e14b2a70c4 --- /dev/null +++ b/recipes/binutils/binutils-2.18/parse-neon-vmov.diff @@ -0,0 +1,41 @@ +=================================================================== +RCS file: /cvs/src/src/gas/config/tc-arm.c,v +retrieving revision 1.353 +retrieving revision 1.354 +diff -u -r1.353 -r1.354 +--- src/gas/config/tc-arm.c 2008/03/27 14:12:15 1.353 ++++ src/gas/config/tc-arm.c 2008/03/28 18:13:52 1.354 +@@ -5209,16 +5209,6 @@ + inst.operands[i].present = 1; + } + } +- else if (parse_qfloat_immediate (&ptr, &inst.operands[i].imm) == SUCCESS) +- /* Case 2: VMOV<c><q>.<dt> <Qd>, #<float-imm> +- Case 3: VMOV<c><q>.<dt> <Dd>, #<float-imm> +- Case 10: VMOV.F32 <Sd>, #<imm> +- Case 11: VMOV.F64 <Dd>, #<imm> */ +- inst.operands[i].immisfloat = 1; +- else if (parse_big_immediate (&ptr, i) == SUCCESS) +- /* Case 2: VMOV<c><q>.<dt> <Qd>, #<imm> +- Case 3: VMOV<c><q>.<dt> <Dd>, #<imm> */ +- ; + else if ((val = arm_typed_reg_parse (&ptr, REG_TYPE_NSDQ, &rtype, + &optype)) != FAIL) + { +@@ -5258,6 +5248,16 @@ + inst.operands[i++].present = 1; + } + } ++ else if (parse_qfloat_immediate (&ptr, &inst.operands[i].imm) == SUCCESS) ++ /* Case 2: VMOV<c><q>.<dt> <Qd>, #<float-imm> ++ Case 3: VMOV<c><q>.<dt> <Dd>, #<float-imm> ++ Case 10: VMOV.F32 <Sd>, #<imm> ++ Case 11: VMOV.F64 <Dd>, #<imm> */ ++ inst.operands[i].immisfloat = 1; ++ else if (parse_big_immediate (&ptr, i) == SUCCESS) ++ /* Case 2: VMOV<c><q>.<dt> <Qd>, #<imm> ++ Case 3: VMOV<c><q>.<dt> <Dd>, #<imm> */ ++ ; + else + { + first_error (_("expected <Rm> or <Dm> or <Qm> operand")); diff --git a/recipes/binutils/binutils_2.18.bb b/recipes/binutils/binutils_2.18.bb index 159d97f981..b1ae402e29 100644 --- a/recipes/binutils/binutils_2.18.bb +++ b/recipes/binutils/binutils_2.18.bb @@ -1,4 +1,4 @@ -INC_PR = "r7" +INC_PR = "r8" PR = "${INC_PR}.1" require binutils.inc @@ -16,6 +16,7 @@ SRC_URI = "\ file://binutils-uclibc-gas-needs-libm.patch;patch=1 \ file://binutils-x86_64_i386_biarch.patch;patch=1 \ file://binutils-section-in-segment.patch;patch=1;pnum=0 \ + file://parse-neon-vmov.diff;patch=1 \ " # powerpc patches diff --git a/recipes/bluez/bluez4_4.46.bb b/recipes/bluez/bluez4_4.46.bb new file mode 100644 index 0000000000..8f5c6e8f7c --- /dev/null +++ b/recipes/bluez/bluez4_4.46.bb @@ -0,0 +1,13 @@ +require bluez4.inc + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" + +DEPENDS += "libsndfile1" +PR = "${INC_PR}.1" + +# Not all distros have a recent enough udev +BTUDEV = " --disable-udevrules" +BTUDEV_angstrom = " --enable-udevrules" +EXTRA_OECONF += "${BTUDEV}" + diff --git a/recipes/bluez/obexd_0.15.bb b/recipes/bluez/obexd_0.15.bb new file mode 100644 index 0000000000..e1cc6ce8ff --- /dev/null +++ b/recipes/bluez/obexd_0.15.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "OBEX Server and Client" +DEPENDS = "openobex glib-2.0 dbus bluez4" + +LICENSE = "GPLv2" + +SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz" + +inherit autotools_stage + +FILES_${PN} += "${datadir}/dbus-1/" diff --git a/recipes/classpath/classpath-tools-native.bb b/recipes/classpath/classpath-tools-native.bb index df5df33407..685f0634d3 100644 --- a/recipes/classpath/classpath-tools-native.bb +++ b/recipes/classpath/classpath-tools-native.bb @@ -5,3 +5,9 @@ DESCRIPTION = "Provides working jar, javah etc. from the GNU Classpath project" DEPENDS = "virtual/java-native classpath-native" + +inherit native + +do_stage () { + echo 1 /dev/null +} diff --git a/recipes/devhelp/devhelp_0.23.bb b/recipes/devhelp/devhelp_0.23.bb new file mode 100644 index 0000000000..4cfcecea01 --- /dev/null +++ b/recipes/devhelp/devhelp_0.23.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "API documentation browser for GTK+ and GNOME" +HOMEPAGE = "http://live.gnome.org/devhelp" +DEPENDS = "gconf glib-2.0 gtk+ libwnck webkit-gtk zlib" +PR = "r0" + +inherit gnome + +SRC_URI += "file://devhelp-includes.patch;patch=1 \ + file://devhelp-webkit.patch;patch=1" + +PACKAGES += "gedit-plugin-${PN}" +FILES_gedit-plugin-${PN} += "${libdir}/gedit-2" + +do_stage() { + autotools_stage_all +} diff --git a/recipes/devhelp/files/devhelp-includes.patch b/recipes/devhelp/files/devhelp-includes.patch new file mode 100644 index 0000000000..154dd8dac9 --- /dev/null +++ b/recipes/devhelp/files/devhelp-includes.patch @@ -0,0 +1,12 @@ +g_mapped_file_free() is deprecated since glib-2.22. +================================================================================ +--- devhelp-0.23/src/Makefile.am ++++ devhelp-0.23/src/Makefile.am +@@ -6,7 +6,6 @@ + -DLOCALEDIR=\""$(datadir)/locale"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DG_LOG_DOMAIN=\"Devhelp\" \ +- -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DG_DISABLE_SINGLE_INCLUDES \ diff --git a/recipes/devhelp/files/devhelp-webkit.patch b/recipes/devhelp/files/devhelp-webkit.patch new file mode 100644 index 0000000000..5ba3f3d5a8 --- /dev/null +++ b/recipes/devhelp/files/devhelp-webkit.patch @@ -0,0 +1,71 @@ +http://bugzilla.gnome.org/show_bug.cgi?id=586559 +Comment #6 from Daniel Macks (reporter, points: 15) +2009-07-15 17:27 UTC [reply] + +Created an attachment (id=138458) [edit] +Prepend file:// + +Here's the patch we're using in fink. Not "complete" (only minimal change to +work, not *every* use of webkit_web_view_open()) and doesn't resolve the +inconsistent meaning of "uri", but also doesn't change anything in webkit lib +API or behavior so no interface chaos (unlike webkit:) + +diff -Nurd -x'*~' devhelp-0.23.orig/src/dh-window.c devhelp-0.23/src/dh-window.c +--- devhelp-0.23.orig/src/dh-window.c 2008-11-28 10:56:04.000000000 -0500 ++++ devhelp-0.23/src/dh-window.c 2009-07-08 03:36:23.000000000 -0400 +@@ -133,6 +133,20 @@ + #define GET_PRIVATE(instance) G_TYPE_INSTANCE_GET_PRIVATE \ + (instance, DH_TYPE_WINDOW, DhWindowPriv); + ++ ++static void ++_webkit_web_view_open_compat (WebKitWebView *view, ++ const gchar *uri) ++{ ++ gchar *real_uri; ++ if (g_path_is_absolute(uri)) ++ real_uri = g_strdup_printf ("file://%s", uri); ++ else ++ real_uri = g_strdup (uri); ++ webkit_web_view_load_uri (view, real_uri); ++ g_free(real_uri); ++} ++ + static void + window_activate_new_window (GtkAction *action, + DhWindow *window) +@@ -803,7 +817,7 @@ + window); + + uri = dh_link_get_uri (link); +- webkit_web_view_open (view, uri); ++ _webkit_web_view_open_compat (view, uri); + g_free (uri); + + g_signal_handlers_unblock_by_func (view, +@@ -827,7 +841,7 @@ + view = window_get_active_web_view (window); + + uri = dh_link_get_uri (link); +- webkit_web_view_open (view, uri); ++ _webkit_web_view_open_compat (view, uri); + g_free (uri); + + window_check_history (window, view); +@@ -1093,7 +1107,7 @@ + } + + if (location) { +- webkit_web_view_open (WEBKIT_WEB_VIEW (view), location); ++ _webkit_web_view_open_compat (WEBKIT_WEB_VIEW (view), location); + } else { + webkit_web_view_open (WEBKIT_WEB_VIEW (view), "about:blank"); + } +@@ -1357,6 +1371,6 @@ + priv = window->priv; + + web_view = window_get_active_web_view (window); +- webkit_web_view_open (web_view, uri); ++ _webkit_web_view_open_compat (web_view, uri); + dh_book_tree_select_uri (DH_BOOK_TREE (priv->book_tree), uri); + } diff --git a/recipes/devmem2/devmem2.bb b/recipes/devmem2/devmem2.bb index 143883afea..5b72d1c31b 100644 --- a/recipes/devmem2/devmem2.bb +++ b/recipes/devmem2/devmem2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Simple program to read/write from/to any location in memory." SRC_URI = "http://www.lartmaker.nl/lartware/port/devmem2.c" LICENSE = "GPL" -PR = "r1" +PR = "r2" S = "${WORKDIR}" diff --git a/recipes/dhcp/dhcp_3.0.2.bb b/recipes/dhcp/dhcp_3.0.2.bb index faf22b29cf..2ce808343f 100644 --- a/recipes/dhcp/dhcp_3.0.2.bb +++ b/recipes/dhcp/dhcp_3.0.2.bb @@ -2,7 +2,7 @@ SECTION = "console/network" DESCRIPTION = "Internet Software Consortium DHCP package" HOMEPAGE = "http://www.isc.org/" LICENSE = "BSD" -PR = "r8" +PR = "r9" SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \ file://noattrmode.patch;patch=1 \ file://fixincludes.patch;patch=1 \ @@ -19,6 +19,8 @@ INITSCRIPT_PACKAGES = "dhcp-server" INITSCRIPT_NAME_dhcp-server = dhcp-server INITSCRIPT_PARAMS_dhcp-server = "start 30 2 3 4 5 . stop 30 0 1 6 ." +TARGET_CC_ARCH += "${LDFLAGS}" + do_configure() { ./configure } diff --git a/recipes/dvsdk/gstreamer-ti/codec_combo_directory_fix.patch b/recipes/dvsdk/gstreamer-ti/codec_combo_directory_fix.patch new file mode 100644 index 0000000000..72a0ab319f --- /dev/null +++ b/recipes/dvsdk/gstreamer-ti/codec_combo_directory_fix.patch @@ -0,0 +1,52 @@ +From: Vishnudas P <vishnudas@gmail.com> + +Found the fix here. +http://wiki.davincidsp.com/index.php?title=Configuring_Codec_Engine_in_Arm_apps_with_createFromServer +In the section "Advanced: overwriting fields, creating multiple engines" + +Needed tor reverse the previous patch 263 and apply the attached patch. + +When you call createFromServer the path you give is relative to +package, not the filesystem one. For that you need to set +"engine.server" to the desired full filesystem path. +This is what the attached patch does. + +-- + + +diff -Naur ticodecplugin.orig/src/gstticodecplugin_dm6446.cfg ticodecplugin/src/gstticodecplugin_dm6446.cfg +--- ticodecplugin.orig/src/gstticodecplugin_dm6446.cfg 2009-07-21 12:55:32.000000000 -0700 ++++ ticodecplugin/src/gstticodecplugin_dm6446.cfg 2009-07-21 12:55:26.000000000 -0700 +@@ -38,6 +38,8 @@ + "./encodeCombo.x64P", + "ti.sdo.servers.encode" + ); ++encodeEngine.server = "/usr/share/ti-codec-combos/encodeCombo.x64P"; ++decodeEngine.server = "/usr/share/ti-codec-combos/decodeCombo.x64P"; + + /* Load support for the 'Davinci Multimedia Application Interface' modules */ + var DMAI = xdc.loadPackage('ti.sdo.dmai'); +diff -Naur ticodecplugin.orig/src/gstticodecplugin_dm6467.cfg ticodecplugin/src/gstticodecplugin_dm6467.cfg +--- ticodecplugin.orig/src/gstticodecplugin_dm6467.cfg 2009-07-21 12:55:32.000000000 -0700 ++++ ticodecplugin/src/gstticodecplugin_dm6467.cfg 2009-07-21 12:55:26.000000000 -0700 +@@ -39,6 +39,8 @@ + "./encodeCombo.x64P", + "ti.sdo.servers.encode" + ); ++encodeEngine.server = "/usr/share/ti-codec-combos/encodeCombo.x64P"; ++decodeEngine.server = "/usr/share/ti-codec-combos/decodeCombo.x64P"; + + /* Load support for the 'Davinci Multimedia Application Interface' modules */ + var DMAI = xdc.loadPackage('ti.sdo.dmai'); +diff -Naur ticodecplugin.orig/src/gstticodecplugin_omap3530.cfg ticodecplugin/src/gstticodecplugin_omap3530.cfg +--- ticodecplugin.orig/src/gstticodecplugin_omap3530.cfg 2009-07-21 12:55:32.000000000 -0700 ++++ ticodecplugin/src/gstticodecplugin_omap3530.cfg 2009-07-21 12:55:26.000000000 -0700 +@@ -38,6 +38,8 @@ + "./decodeCombo.x64P", + "ti.sdo.servers.decode" + ); ++encEngine.server = "/usr/share/ti-codec-combos/encodeCombo.x64P"; ++decEngine.server = "/usr/share/ti-codec-combos/decodeCombo.x64P"; + + /* Load support for the DMAI module */ + var DMAI = xdc.loadPackage('ti.sdo.dmai'); diff --git a/recipes/dvsdk/gstreamer-ti_svn.bb b/recipes/dvsdk/gstreamer-ti_svn.bb index 6eeffd0225..e1c4c1e2e9 100644 --- a/recipes/dvsdk/gstreamer-ti_svn.bb +++ b/recipes/dvsdk/gstreamer-ti_svn.bb @@ -5,12 +5,13 @@ inherit autotools DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly" # Fetch source from svn repo -SRCREV = "285" +SRCREV = "308" SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \ +file://codec_combo_directory_fix.patch;patch=1 \ " # Again, no '.' in PWD allowed :( -PR = "r23" +PR = "r24" PV = "svnr${SRCREV}" S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin" diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc index 5b82c11ca1..517771c11b 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc @@ -2,8 +2,9 @@ DESCRIPTION = "EXT2 Filesystem Utilities" LICENSE = "GPL" SECTION = "base" PRIORITY = "optional" +DEPENDS = "util-linux-ng" -inherit autotools pkgconfig +inherit autotools_stage pkgconfig SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -13,6 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ S = "${WORKDIR}/e2fsprogs-libs-${PV}" FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" FILES_${PN} = "${bindir}" +EXTRA_OECONF = "--disable-libblkid --disable-libuuid" python populate_packages_prepend () { e2fs_libdir = bb.data.expand('${libdir}', d) @@ -24,18 +26,12 @@ python populate_packages_prepend () { } do_stage () { - for i in libcom_err libss libuuid libblkid; do + for i in libcom_err libss; do oe_libinstall -a -C lib $i ${STAGING_LIBDIR} done install -d ${STAGING_INCDIR}/et \ - ${STAGING_INCDIR}/ss \ - ${STAGING_INCDIR}/uuid \ - ${STAGING_INCDIR}/blkid + ${STAGING_INCDIR}/ss install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/ install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/ install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/ - install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/ } diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.33.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.33.bb index 38449667fe..0ac8ac34d1 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.33.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.33.bb @@ -1 +1,2 @@ +PR = "r1" require e2fsprogs-libs.inc diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.34.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.34.bb index 738d1ee206..6be92898d7 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.34.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.34.bb @@ -1,5 +1,5 @@ require e2fsprogs-libs.inc - +PR = "r1" SRC_URI += "file://ldflags.patch;patch=1" do_compile_prepend () { diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.35.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.35.bb index 0d7d25e2cc..fc3e85f2dc 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.35.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.35.bb @@ -1,8 +1,10 @@ require e2fsprogs-libs.inc +PR = "r1" + SRC_URI += "file://ldflags.patch;patch=1" -EXTRA_OECONF=" --enable-elf-shlibs " +EXTRA_OECONF += " --enable-elf-shlibs " do_compile_prepend () { find ./ -print|xargs chmod u=rwX diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.39.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.39.bb index dfd83e3c1f..ccd5a3ce75 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.39.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.39.bb @@ -5,7 +5,7 @@ PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ file://configure.patch;patch=1" -EXTRA_OECONF=" --enable-elf-shlibs " +EXTRA_OECONF += " --enable-elf-shlibs " do_compile_prepend () { find ./ -print|xargs chmod u=rwX diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb index d9447ab616..53afbaabe7 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb @@ -1,6 +1,6 @@ require e2fsprogs-libs.inc -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ file://mkinstalldirs.patch;patch=1 \ @@ -8,7 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ DEPENDS = "gettext-native" -EXTRA_OECONF=" --enable-elf-shlibs " +EXTRA_OECONF += " --enable-elf-shlibs " do_compile_prepend () { find ./ -print|xargs chmod u=rwX diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb index 25a6490c7c..47e543c238 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb @@ -1,12 +1,12 @@ require e2fsprogs-libs.inc - +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ file://mkinstalldirs.patch;patch=1 \ " -DEPENDS = "gettext-native" +DEPENDS += "gettext-native" -EXTRA_OECONF=" --enable-elf-shlibs " +EXTRA_OECONF += " --enable-elf-shlibs " do_compile_prepend () { find ./ -print|xargs chmod u=rwX diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb new file mode 100644 index 0000000000..f9a67af2f7 --- /dev/null +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.8.bb @@ -0,0 +1,16 @@ +require e2fsprogs-libs.inc +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ + " + +DEPENDS += "gettext-native" + +EXTRA_OECONF += " --enable-elf-shlibs " + +do_configure() { + oe_runconf +} + +do_compile_prepend () { + find ./ -print|xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} diff --git a/recipes/ecj/libecj-bootstrap_3.5.bb b/recipes/ecj/libecj-bootstrap_3.5.bb new file mode 100644 index 0000000000..1665b337b6 --- /dev/null +++ b/recipes/ecj/libecj-bootstrap_3.5.bb @@ -0,0 +1,8 @@ +require libecj-bootstrap.inc + +PR = "r0" + +SRC_URI = " \ + http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.5-200906111540/ecjsrc-3.5.zip \ + " + diff --git a/recipes/ekiga/ekiga_3.2.5.bb b/recipes/ekiga/ekiga_3.2.5.bb new file mode 100644 index 0000000000..3a63015d66 --- /dev/null +++ b/recipes/ekiga/ekiga_3.2.5.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Gnome videoconferencing application" +LICENSE = "GPLv2" + +ARM_INSTRUCTION_SET = "arm" + +inherit gnome +DEPENDS += " avahi libnotify eds-dbus libgnome gtkmm libsigc++-2.0 gstreamer gst-plugins-good gst-plugins-base gst-plugins-bad opal ptlib gnome-doc-utils" +RDEPENDS += "gst-plugin-app gst-plugin-video4linux2 opal ptlib" + +EXTRA_OECONF = "--enable-static-libs --disable-ldap --disable-gnome --enable-gstreamer --disable-gdu --disable-scrollkeeper " + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g +} + +FILES_${PN} += "${datadir}/dbus-1 ${datadir}/icons" + diff --git a/recipes/ekiga/opal_3.6.4.bb b/recipes/ekiga/opal_3.6.4.bb new file mode 100644 index 0000000000..502c344b13 --- /dev/null +++ b/recipes/ekiga/opal_3.6.4.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Open Phone Abstraction Library, implementation of the ITU H.323 teleconferencing protocol, and successor of the openh323 library." +LICENSE = "MPL" + +inherit gnome + +DEPENDS += " ffmpeg ptlib virtual/libsdl openldap" + +SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/opal-${PV}.tar.bz2 \ + file://configure.diff;patch=1 \ + " + +EXTRA_OECONF = "--enable-localgsm --disable-spandsp " +ARM_INSTRUCTION_SET = "arm" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure() { + libtoolize --force + gnu-configize + oe_runconf +} + +FILES_${PN} += "${libdir}/opal-${PV}/*/*.so ${libdir}/opal-${PV}/*/*/*.so" +FILES_${PN}-dbg += "${libdir}/opal-${PV}/*/.debug ${libdir}/opal-${PV}/*/*/.debug" + +do_stage() { + autotools_stage_all +} + diff --git a/recipes/ekiga/ptlib_2.6.4.bb b/recipes/ekiga/ptlib_2.6.4.bb new file mode 100644 index 0000000000..41fda722df --- /dev/null +++ b/recipes/ekiga/ptlib_2.6.4.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Portable Tools Libary" +LICENSE = "MPL" + +PR = "r1" + +inherit gnome + +DEPENDS += "libgsm openldap openssl expat virtual/libsdl alsa-lib" + +SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/ptlib-${PV}.tar.bz2" + +do_configure() { + libtoolize --force + gnu-configize + oe_runconf +} + +do_compile_append() { + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + ptlib.pc +} + +do_install_append() { + chmod +x ${D}${libdir}/* +} + +FILES_${PN} += "${libdir}/ptlib-${PV}/*/*/*.so" + +do_stage() { + autotools_stage_all +} + + + + diff --git a/recipes/gamin/gamin_0.1.10.bb b/recipes/gamin/gamin_0.1.10.bb new file mode 100644 index 0000000000..754f47dc9e --- /dev/null +++ b/recipes/gamin/gamin_0.1.10.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Gamin is a file and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor) system." +LICENSE = "LGPL" + +SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \ + file://no-abstract-sockets.patch;patch=1" + +EXTRA_OECONF = " --without-python " + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/recipes/glib-2.0/glib-2.0-2.21.4/atomic-thumb.patch b/recipes/glib-2.0/glib-2.0-2.21.4/atomic-thumb.patch new file mode 100644 index 0000000000..d7aa08821f --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.21.4/atomic-thumb.patch @@ -0,0 +1,42 @@ +# gatomic.c uses SWP, which doesn't work in Thumb mode. +# Put that source file into a separate convenience library which is always built as ARM. + +Index: glib-2.18.1/glib/Makefile.am +=================================================================== +--- glib-2.18.1/glib/Makefile.am 2008-09-18 00:33:57.000000000 +0200 ++++ glib-2.18.1/glib/Makefile.am 2008-11-08 10:13:27.000000000 +0100 +@@ -80,6 +80,7 @@ + galiasdef.c + + lib_LTLIBRARIES = libglib-2.0.la ++noinst_LTLIBRARIES = libgatomic.la + + if OS_WIN32_AND_DLL_COMPILATION + if MS_LIB_AVAILABLE +@@ -96,10 +97,14 @@ + uninstall-ms-lib: + $(uninstall_ms_lib_cmd) + ++libgatomic_la_CFLAGS = $(CFLAGS) -mno-thumb ++ ++libgatomic_la_SOURCES = \ ++ gatomic.c ++ + libglib_2_0_la_SOURCES = \ + garray.c \ + gasyncqueue.c \ +- gatomic.c \ + gbacktrace.c \ + gbase64.c \ + gbookmarkfile.c \ +@@ -286,8 +291,8 @@ + pcre_inc = + endif + +-libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) +-libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) ++libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) libgatomic.la ++libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) libgatomic.la + + libglib_2_0_la_LDFLAGS = \ + $(glib_win32_res_ldflag) \ diff --git a/recipes/glib-2.0/glib-2.0-2.21.4/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.21.4/configure-libtool.patch new file mode 100644 index 0000000000..3ba79b8986 --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.21.4/configure-libtool.patch @@ -0,0 +1,34 @@ +# Poky renames libtool to $host_alias-libtool. +# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 +# so we can't call # it at this point. We can safely assume a version is available +# from PATH though + +--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100 ++++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100 +@@ -1174,7 +1174,7 @@ + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1265,7 +1265,7 @@ + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile ${CC} -shared \ ++ ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \ + -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ +@@ -1339,7 +1339,7 @@ + + AC_MSG_CHECKING(for the suffix of shared libraries) + export SED +-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` ++shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='` + eval $shrext_cmds + module=yes eval std_shrext=$shrext_cmds + # chop the initial dot diff --git a/recipes/glib-2.0/glib-2.0_2.21.4.bb b/recipes/glib-2.0/glib-2.0_2.21.4.bb new file mode 100644 index 0000000000..4be09494e5 --- /dev/null +++ b/recipes/glib-2.0/glib-2.0_2.21.4.bb @@ -0,0 +1,11 @@ +require glib.inc + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" + +SRC_URI = "\ + http://ftp.gnome.org/pub/GNOME/sources/glib/2.21/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1 \ +" +SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1" diff --git a/recipes/gnash/gnash_0.8.5.bb b/recipes/gnash/gnash_0.8.5.bb index fa9b3230e3..30478cb81e 100644 --- a/recipes/gnash/gnash_0.8.5.bb +++ b/recipes/gnash/gnash_0.8.5.bb @@ -1,10 +1,11 @@ require gnash.inc -DEPENDS += "gst-plugins-base" +DEPENDS += "gst-plugins-base cairo" acpaths = " -Imacros" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" # Boost lacks defines for lots of archs TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" @@ -33,6 +34,10 @@ EXTRA_OECONF += " --without-included-ltdl \ --enable-png \ --with-png-incl=${STAGING_INCDIR} \ --with-png-lib=${STAGING_LIBDIR} \ + --with-cairo-incl=${STAGING_DIR_HOST}/usr/include/cairo \ + --with-cairo-lib=${STAGING_DIR_HOST}/usr/lib \ --enable-media=gst \ - " + --disable-speex \ + --disable-speexdsp \ + " diff --git a/recipes/gnome/gnome-bluetooth_git.bb b/recipes/gnome/gnome-bluetooth_git.bb index 23c4ca92ac..29c98139ea 100644 --- a/recipes/gnome/gnome-bluetooth_git.bb +++ b/recipes/gnome/gnome-bluetooth_git.bb @@ -11,12 +11,12 @@ SRC_URI = "git://git.gnome.org/gnome-bluetooth;protocol=git \ S = "${WORKDIR}/git" -SRCREV = "93fd8de2cc717b96ad719ab2fb5ed38b8a0fc707" -PV = "2.27.5" -PR = "r2" +SRCREV = "59efa1c06153cd5bdaff64f7efca791c11c77f2f" +PV = "2.27.8" +PR = "r0" PR_append = "+gitr${SRCREV}" -DEPENDS = "obexd gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" +DEPENDS = "geoclue obexd gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" RRECOMMENDS_${PN} += "obexd" RCONFLICTS_${PN} = "bluez-gnome" @@ -26,3 +26,6 @@ do_configure_prepend() { echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make } +# Todo: automagic plugin splitting + +FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug" diff --git a/recipes/gnome/libgweather_2.26.0.bb b/recipes/gnome/libgweather_2.26.0.bb index f36dbbdec7..3493e7d344 100644 --- a/recipes/gnome/libgweather_2.26.0.bb +++ b/recipes/gnome/libgweather_2.26.0.bb @@ -1,6 +1,8 @@ LICENSE = "LGPL" DEPENDS = "libgnome libsoup-2.4 gtk+" +PR = "r1" + inherit gnome do_configure_prepend() { @@ -20,6 +22,10 @@ do_configure_prepend() { EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2" +# A hundred meg of xml files is a bit much... +PACKAGES =+ "${PN}-locationdata" +FILES_${PN}-locationdata = "${datadir}/libgweather/Locations*" + do_stage() { autotools_stage_all } diff --git a/recipes/gtk-webcore/midori_0.1.8.bb b/recipes/gtk-webcore/midori_0.1.8.bb new file mode 100644 index 0000000000..8568074343 --- /dev/null +++ b/recipes/gtk-webcore/midori_0.1.8.bb @@ -0,0 +1,31 @@ +require midori.inc + +DEPENDS += "python-native python-docutils-native" + +SRC_URI = "http://goodies.xfce.org/releases/midori/midori-${PV}.tar.bz2 \ + file://waf" + +do_configure() { + cp -f ${WORKDIR}/waf ${S}/ + sed -i -e 's:, shell=False::g' wscript + ./configure \ + --prefix=${prefix} \ + --bindir=${bindir} \ + --sbindir=${sbindir} \ + --libexecdir=${libexecdir} \ + --datadir=${datadir} \ + --sysconfdir=${sysconfdir} \ + --sharedstatedir=${sharedstatedir} \ + --localstatedir=${localstatedir} \ + --libdir=${libdir} \ + --includedir=${includedir} \ + --infodir=${infodir} \ + --mandir=${mandir} \ + ${EXTRA_OECONF} + + sed -i /LINK_CC/d ./_build_/c4che/default.cache.py + echo "LINK_CC = '${CXX}'" >> ./_build_/c4che/default.cache.py +} + + + diff --git a/recipes/guile/guile-native_1.8.2.bb b/recipes/guile/guile-native_1.8.2.bb index 7c4b26e873..2dc32bfd3d 100644 --- a/recipes/guile/guile-native_1.8.2.bb +++ b/recipes/guile/guile-native_1.8.2.bb @@ -1,13 +1,17 @@ SECTION = "unknown" LICENSE = "GPL" DEPENDS = "gmp-native libtool (< 2)" -SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ - " +SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz" + +PR = "r1" inherit autotools native S="${WORKDIR}/guile-${PV}" + +EXTRA_OECONF += "--enable-error-on-warning=no" + OE_LT_RPATH_ALLOW = "any" LDFLAGS += " -L${STAGING_LIBDIR} " diff --git a/recipes/hal/hal_0.5.12.bb b/recipes/hal/hal_0.5.12.bb index b6531e8235..3edb33275b 100644 --- a/recipes/hal/hal_0.5.12.bb +++ b/recipes/hal/hal_0.5.12.bb @@ -2,9 +2,12 @@ require hal.inc DEFAULT_PREFERENCE = "-1" +PR = "r1" + # The following code finds the right linux/input.h, # which also works with external-toolchain/SDK do_configure() { + sed -i -e s:1.43:1.41:g ${S}/configure.in linux_input_h=`echo "#include <linux/input.h>" | ${CPP} - | \ grep "linux\/input.h" | head -n 1 | awk -F '"' '{print $2}'` autotools_do_configure --with-linux-input-header=${linux_input_h} diff --git a/recipes/hal/hal_0.5.13.bb b/recipes/hal/hal_0.5.13.bb new file mode 100644 index 0000000000..c5d9f65c2c --- /dev/null +++ b/recipes/hal/hal_0.5.13.bb @@ -0,0 +1,12 @@ +require hal.inc + +DEFAULT_PREFERENCE = "-1" + +# The following code finds the right linux/input.h, +# which also works with external-toolchain/SDK +do_configure() { + sed -i -e s:1.43:1.41:g ${S}/configure.in + linux_input_h=`echo "#include <linux/input.h>" | ${CPP} - | \ + grep "linux\/input.h" | head -n 1 | awk -F '"' '{print $2}'` + autotools_do_configure --with-linux-input-header=${linux_input_h} +} diff --git a/recipes/libsndfile/libsndfile1_1.0.20.bb b/recipes/libsndfile/libsndfile1_1.0.20.bb index 2562271af2..5dd722369b 100644 --- a/recipes/libsndfile/libsndfile1_1.0.20.bb +++ b/recipes/libsndfile/libsndfile1_1.0.20.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.mega-nerd.com/libsndfile" AUTHOR = "Erik de Castro Lopo" SECTION = "libs/multimedia" LICENSE = "LGPL" +DEPENDS = "sqlite3" SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz \ " diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index dfb73536de..d26302e65b 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 virtual/kernel \ +DEPENDS = "live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 virtual/kernel \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" RDEPENDS = "mplayer-common" diff --git a/recipes/ntp/files/ntp-4.2.4_p6-nano.patch b/recipes/ntp/files/ntp-4.2.4_p6-nano.patch new file mode 100644 index 0000000000..cb1e2f7341 --- /dev/null +++ b/recipes/ntp/files/ntp-4.2.4_p6-nano.patch @@ -0,0 +1,17 @@ +--- a/include/ntp_syscall.h.orig 2009-05-19 16:44:55.048156467 -0400 ++++ b/include/ntp_syscall.h 2009-05-19 16:46:19.293323686 -0400 +@@ -14,6 +14,14 @@ + # include <sys/timex.h> + #endif + ++#if defined(ADJ_NANO) && !defined(MOD_NANO) ++#define MOD_NANO ADJ_NANO ++#endif ++ ++#if defined(ADJ_TAI) && !defined(MOD_TAI) ++#define MOD_TAI ADJ_TAI ++#endif ++ + #ifndef NTP_SYSCALLS_LIBC + #ifdef NTP_SYSCALLS_STD + # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) diff --git a/recipes/ntp/ntp_4.2.2p3.bb b/recipes/ntp/ntp_4.2.2p3.bb index 22d2e1bff6..e53594c259 100644 --- a/recipes/ntp/ntp_4.2.2p3.bb +++ b/recipes/ntp/ntp_4.2.2p3.bb @@ -1,10 +1,11 @@ require ntp.inc -PR = "r1" +PR = "r2" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ file://ipv6only-workaround.patch;patch=1 \ file://tickadj.c.patch;patch=1 \ + file://ntp-4.2.4_p6-nano.patch;patch=1 \ file://ntpd \ file://ntp.conf \ file://ntpdate" diff --git a/recipes/openbmap/openbmap-logger_0.4.0.bb b/recipes/openbmap/openbmap-logger_0.4.0.bb new file mode 100644 index 0000000000..a7648f1989 --- /dev/null +++ b/recipes/openbmap/openbmap-logger_0.4.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "openBmap logger and uploader of GPS/GSM data" +SECTION = "x11/utils" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/myposition/openbmap-logger-${PV}.tar.gz" + +inherit distutils + +RDEPENDS = "python python-dbus python-pygobject python-pygtk libglade \ + python-subprocess python-netclient python-math python-core python-io frameworkd" + +FILES_${PN} += "${datadir}" diff --git a/recipes/openldap/openldap-2.4.17/openldap-m4-pthread.patch b/recipes/openldap/openldap-2.4.17/openldap-m4-pthread.patch new file mode 100644 index 0000000000..b669b7254d --- /dev/null +++ b/recipes/openldap/openldap-2.4.17/openldap-m4-pthread.patch @@ -0,0 +1,20 @@ +--- openldap-2.3.11/build/openldap.m4.orig 2005-11-11 00:11:18.604322590 -0800 ++++ openldap-2.3.11/build/openldap.m4 2005-11-11 00:26:21.621145856 -0800 +@@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ + ]]) + + AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], +-AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES ++[AC_LANG_SOURCE([[OL_PTHREAD_TEST_INCLUDES + + int main(argc, argv) + int argc; +@@ -796,7 +796,7 @@ int main(argc, argv) + { + OL_PTHREAD_TEST_FUNCTION + } +-])) ++]])]) + dnl -------------------------------------------------------------------- + AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2) + if test "$ol_link_threads" = no ; then diff --git a/recipes/openldap/openldap_2.3.11.bb b/recipes/openldap/openldap_2.3.11.bb index fb980cb946..9315f5b3d1 100644 --- a/recipes/openldap/openldap_2.3.11.bb +++ b/recipes/openldap/openldap_2.3.11.bb @@ -11,7 +11,7 @@ PRIORITY = "optional" LICENSE = "OpenLDAP" SECTION = "libs" -PR = "r4" +PR = "r5" LDAP_VER = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}" @@ -217,6 +217,8 @@ PACKAGES += "${PN}-overlay-proxycache" EXTRA_OECONF += "${OPENLDAP_OPTIONS}" DEPENDS += "${OPENLDAP_DEPENDS}" +CPPFLAGS_append = " -D_GNU_SOURCE" + do_configure() { gnu-configize oe_runconf diff --git a/recipes/openldap/openldap_2.4.17.bb b/recipes/openldap/openldap_2.4.17.bb new file mode 100644 index 0000000000..2ca40eacb9 --- /dev/null +++ b/recipes/openldap/openldap_2.4.17.bb @@ -0,0 +1,290 @@ +# OpenLDAP, a license free (see http://www.OpenLDAP.org/license.html) +# +DESCRIPTION = "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol." +HOMEPAGE = "http://www.OpenLDAP.org/license.html" +PRIORITY = "optional" +# The OpenLDAP Public License - see the HOMEPAGE - defines +# the license. www.openldap.org claims this is Open Source +# (see http://www.openldap.org), the license appears to be +# basically BSD. opensource.org does not record this license +# at present (so it is apparently not OSI certified). +LICENSE = "OpenLDAP" +SECTION = "libs" + +LDAP_VER = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}" + +SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz" +SRC_URI += "file://openldap-m4-pthread.patch;patch=1" +SRC_URI += "file://initscript" +# The build tries to run a host executable, this fails. The patch +# causes the executable and its data to be installed instead of +# the output - ucgendat must be run after the ipkg install! +#SRC_URI += "file://ucgendat.patch;patch=1" +# The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when +# installing .so and executables, this fails in cross compilation +# environments +SRC_URI += "file://install-strip.patch;patch=1" + +inherit autotools + +# OPTIONS +# The following two variables can be set in a distro or local.conf +# to switch features on. Each feature foo defines OPENLDAP_OPTION_foo +# and OPENLDAP_DEPENDS_foo in this file - to include feature foo add +# the two variables into the setting of the options below (please use +# += because that means this can be done in *both* distro.conf and +# local.conf! +OPENLDAP_OPTIONS ?= "" +OPENLDAP_DEPENDS ?= "" + +# CV SETTINGS +# Required to work round AC_FUNC_MEMCMP which gets the wrong answer +# when cross compiling (should be in site?) +EXTRA_OECONF += "ac_cv_func_memcmp_working=yes" + +# CONFIG DEFINITIONS +# The following is necessary because it cannot be determined for a +# cross compile automagically. Select should yield fine on all OE +# systems... +EXTRA_OECONF += "--with-yielding-select=yes" +# Shared libraries are nice... +EXTRA_OECONF += "--enable-dynamic" +# +# Disable TLS to remove the need for openssl/libcrypto +OPENLDAP_OPTION_tls ?= "--with-tls" +# set the following to "openssl" to build tls support +OPENLDAP_DEPENDS_tls ?= "gnutls" +EXTRA_OECONF += "${OPENLDAP_OPTION_tls}" +DEPENDS += "${OPENLDAP_DEPENDS_tls}" +# +# Disable Cyrus SASL, which may or may not be working at present... +OPENLDAP_OPTION_sasl ?= "--without-cyrus-sasl" +# set the following to "cyrus-sasl" to build SASL support +OPENLDAP_DEPENDS_sasl ?= "" +EXTRA_OECONF += "${OPENLDAP_OPTION_sasl}" +DEPENDS += "${OPENLDAP_DEPENDS_sasl}" + +# SLAPD options +# +# UNIX crypt(3) passwd support: +EXTRA_OECONF += "--enable-crypt" +# +# Enable dynamic module loading. If this is *disabled* the +# dependency on libtool is removed (to disable set the following +# to variables to "" in a .conf file). +OPENLDAP_OPTION_modules += "lt_cv_dlopen_self=yes --enable-modules" +OPENLDAP_DEPENDS_modules += "libtool" +EXTRA_OECONF += " ${OPENLDAP_OPTION_modules}" +DEPENDS += "${OPENLDAP_DEPENDS_modules}" + +# SLAPD BACKEND +# +# The backend must be set by the configuration. This controls the +# required database, the default database, bdb, is turned off but +# can be turned back on again and it *is* below! The monitor backend +# is also disabled. If you try to change the backends but fail to +# enable a single one the build will fail in an obvious way. +# +EXTRA_OECONF += "--disable-bdb --disable-hdb --disable-monitor" +# +# Backends="bdb dnssrv hdb ldap ldbm meta monitor null passwd perl shell sql" +# +# Note that multiple backends can be built. The ldbm backend requires a +# build-time choice of database API. The bdb backend forces this to be +# DB4. To use the gdbm (or other) API the Berkely database module must +# be removed from the build. +md = "${libexecdir}/openldap" +# +#--enable-bdb enable Berkeley DB backend no|yes|mod yes +# The Berkely DB is the standard choice. This version of OpenLDAP requires +# the version 4 implementation or better. +# To disable this set all three of the following variables to <empty> in +# a .conf file (this will allow ldbm to be build with gdbm). +#OPENLDAP_OPTION_bdb ?= "--enable-bdb=mod" +OPENLDAP_DEPENDS_bdb ?= "db" +OPENLDAP_PACKAGE_bdb ?= "${PN}-backend-bdb" +FILES_${PN}-backend-bdb = "${md}/back_bdb.so ${md}/back_bdb.la ${md}/back_bdb-*.so.*" +EXTRA_OECONF += "${OPENLDAP_OPTION_bdb}" +DEPENDS += "${OPENLDAP_DEPENDS_bdb}" +PACKAGES += "${OPENLDAP_PACKAGE_bdb}" +# +#--enable-dnssrv enable dnssrv backend no|yes|mod no +# This has no dependencies. +FILES_${PN}-backend-dnssrv = "${md}/back_dnssrv.so ${md}/back_dnssrv.la ${md}/back_dnssrv-*.so.*" +EXTRA_OECONF += "--enable-dnssrv=mod" +PACKAGES += "${PN}-backend-dnssrv" +# +#--enable-hdb enable Hierarchical DB backend no|yes|mod no +# This forces ldbm to use Berkeley too, remove to use gdbm +#OPENLDAP_OPTION_hdb ?= "--enable-hdb=mod" +OPENLDAP_DEPENDS_hdb ?= "db" +OPENLDAP_PACKAGE_hdb ?= "${PN}-backend-hdb" +FILES_${PN}-backend-hdb = "${md}/back_hdb.so ${md}/back_hdb.la ${md}/back_hdb-*.so.*" +EXTRA_OECONF += "${OPENLDAP_OPTION_hdb}" +DEPENDS += "${OPENLDAP_DEPENDS_hdb}" +PACKAGES += "${OPENLDAP_PACKAGE_hdb}" +# +#--enable-ldap enable ldap backend no|yes|mod no +# This has no dependencies +EXTRA_OECONF += "--enable-ldap=mod" +FILES_${PN}-backend-ldap = "${md}/back_ldap.so ${md}/back_ldap.la ${md}/back_ldap-*.so.*" +PACKAGES += "${PN}-backend-ldap" +# +#--enable-ldbm enable ldbm backend no|yes|mod no +# ldbm requires further specification of the underlying database API, because +# bdb is enabled above this must be set to berkeley, however the config +# defaults this correctly so --with-ldbm-api is *not* set. The build will +# fail if bdb is removed (above) but not database is built to provide the +# support for ldbm (because the 'DEPENDS_ldbm' is empty below.) +# +# So to use gdbm set: +OPENLDAP_OPTION_ldbm = "--enable-ldbm=mod --with-ldbm-api=gdbm" +OPENLDAP_DEPENDS_ldbm = gdbm +# And clear the bdb and hdb settings. +OPENLDAP_OPTION_ldbm ?= "--enable-ldbm=mod" +OPENLDAP_DEPENDS_ldbm ?= "" +OPENLDAP_PACKAGES_ldbm ?= "${PN}-backend-ldbm" +FILES_${PN}-backend-ldbm = "${md}/back_ldbm.so ${md}/back_ldbm.la ${md}/back_ldbm-*.so.*" +EXTRA_OECONF += "${OPENLDAP_OPTION_ldbm}" +DEPENDS += "${OPENLDAP_DEPENDS_ldbm}" +PACKAGES += "${PN}-backend-ldbm" +# +#--enable-meta enable metadirectory backend no|yes|mod no +# No dependencies +EXTRA_OECONF += "--enable-meta=mod" +FILES_${PN}-backend-meta = "${md}/back_meta.so ${md}/back_meta.la ${md}/back_meta-*.so.*" +PACKAGES += "${PN}-backend-meta" +# +#--enable-monitor enable monitor backend no|yes|mod yes +EXTRA_OECONF += "--enable-monitor=mod" +FILES_${PN}-backend-monitor = "${md}/back_monitor.so ${md}/back_monitor.la ${md}/back_monitor-*.so.*" +PACKAGES += "${PN}-backend-monitor" +# +#--enable-null enable null backend no|yes|mod no +EXTRA_OECONF += "--enable-null=mod" +FILES_${PN}-backend-null = "${md}/back_null.so ${md}/back_null.la ${md}/back_null-*.so.*" +PACKAGES += "${PN}-backend-null" +# +#--enable-passwd enable passwd backend no|yes|mod no +EXTRA_OECONF += " --enable-passwd=mod" +FILES_${PN}-backend-passwd = "${md}/back_passwd.so ${md}/back_passwd.la ${md}/back_passwd-*.so.*" +PACKAGES += "${PN}-backend-passwd" +# +#--enable-perl enable perl backend no|yes|mod no +# This requires a loadable perl dynamic library, if enabled without +# doing something appropriate (building perl?) the build will pick +# up the build machine perl - not good. +OPENLDAP_OPTION_perl ?= "--enable-perl=mod" +OPENLDAP_DEPENDS_perl ?= "perl" +OPENLDAP_PACKAGES_perl ?= "${PN}-backend-perl" +FILES_${PN}-backend-perl = "${md}/back_perl.so ${md}/back_perl.la ${md}/back_perl-*.so.*" +#EXTRA_OECONF += "${OPENLDAP_OPTION_perl}" +#DEPENDS += "${OPENLDAP_DEPENDS_perl}" +#PACKAGES += "${PN}-backend-perl" +# +#--enable-shell enable shell backend no|yes|mod no +EXTRA_OECONF += "--enable-shell=mod" +FILES_${PN}-backend-shell = "${md}/back_shell.so ${md}/back_shell.la ${md}/back_shell-*.so.*" +PACKAGES += "${PN}-backend-shell" +# +#--enable-sql enable sql backend no|yes|mod no +# sql requires some sql backend which provides sql.h, sqlite* provides +# sqlite.h (which may be compatible but hasn't been tried.) +OPENLDAP_OPTION_sql ?= "--enable-sql=mod" +OPENLDAP_DEPENDS_sql ?= "sql" +OPENLDAP_PACKAGES_sql ?= "${PN}-backend-sql" +FILES_${PN}-backend-sql = "${md}/back_sql.so ${md}/back_sql.la ${md}/back_sql-*.so.*" +#EXTRA_OECONF += "${OPENLDAP_OPTION_sql}" +#DEPENDS += "${OPENLDAP_DEPENDS_sql}" +#PACKAGES += "${PN}-backend-sql" +# +#--enable-dyngroup Dynamic Group overlay no|yes|mod no +# This is a demo, Proxy Cache defines init_module which conflicts with the +# same symbol in dyngroup +#EXTRA_OECONF += "--enable-dyngroup=mod" +#FILES_${PN}-overlay-dyngroup = "${md}/back_dyngroup.so ${md}/back_dyngroup.la ${md}/back_dyngroup-*.so.*" +#PACKAGES += "${PN}-overlay-dyngroup" +# +#--enable-proxycache Proxy Cache overlay no|yes|mod no +EXTRA_OECONF += "--enable-proxycache=mod" +FILES_${PN}-overlay-proxycache = "${md}/pcache.so ${md}/pcache.la ${md}/pcache-*.so.*" +PACKAGES += "${PN}-overlay-proxycache" +# +# LOCAL OPTION OVERRIDES +# The distro/lcoal options must be added in *last* +EXTRA_OECONF += "${OPENLDAP_OPTIONS}" +DEPENDS += "${OPENLDAP_DEPENDS}" + +CPPFLAGS_append = " -D_GNU_SOURCE" + +do_configure() { + gnu-configize + oe_runconf +} + +#FIXME: this is a hack, at present an openldap build will pick up the header +# files from staging rather than the local ones (bad -I order), so remove +# the headers (from openldap-old.x) before compiling... +do_compile_prepend() { + ( cd ${STAGING_INCDIR} + rm -f ldap.h ldap_*.h + ) + ( cd ${STAGING_LIBDIR} + rm -f libldap* liblber* + ) +} + +do_stage() { + echo "staging libldap-${LDAP_VER}" >&2 + # + autotools_stage_includes + # Install the -${LDAP_VER} versions, but link foo.so to foo-x.y.so ONLY + # if they do not exist! + oe_libinstall -so -C libraries/libldap/.libs libldap-${LDAP_VER} ${STAGING_LIBDIR} + test -e ${STAGING_LIBDIR}/libldap.so || + ln -s $(basename ${STAGING_LIBDIR}/libldap-${LDAP_VER}.so.*.*.*) ${STAGING_LIBDIR}/libldap.so + oe_libinstall -so -C libraries/libldap_r/.libs libldap_r-${LDAP_VER} ${STAGING_LIBDIR} + test -e ${STAGING_LIBDIR}/libldap_r.so || + ln -s $(basename ${STAGING_LIBDIR}/libldap_r-${LDAP_VER}.so.*.*.*) ${STAGING_LIBDIR}/libldap_r.so + oe_libinstall -so -C libraries/liblber/.libs liblber-${LDAP_VER} ${STAGING_LIBDIR} + test -e ${STAGING_LIBDIR}/liblber.so || + ln -s $(basename ${STAGING_LIBDIR}/liblber-${LDAP_VER}.so.*.*.*) ${STAGING_LIBDIR}/liblber.so +} + +LEAD_SONAME = "libldap-${LDAP_VER}.so.*" + +# The executables go in a separate package. This allows the +# installation of the libraries with no daemon support. +# Each module also has its own package - see above. +PACKAGES += "${PN}-slapd ${PN}-slurpd ${PN}-bin" + +# Package contents - shift most standard contents to -bin +FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/openldap-data" +FILES_${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run \ + ${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \ + ${sysconfdir}/openldap/DB_CONFIG.example" +FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp ${localstatedir}/run" +FILES_${PN}-bin = "${bindir}" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libexecdir}/openldap/*.a" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + cat ${WORKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap + chmod 755 ${D}${sysconfdir}/init.d/openldap + # This is duplicated in /etc/openldap and is for slapd + rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example +} + +pkg_postinst_${PN}-slapd () { + if test -n "${D}"; then + D="-r $D" + fi + update-rc.d $D openldap defaults +} + +pkg_prerm_${PN}-slapd () { + if test -n "${D}"; then + D="-r $D" + fi + update-rc.d $D openldap remove +} diff --git a/recipes/openmax/libomxil-bellagio_0.9.1.bb b/recipes/openmax/libomxil-bellagio_0.9.1.bb new file mode 100644 index 0000000000..2934da7d87 --- /dev/null +++ b/recipes/openmax/libomxil-bellagio_0.9.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "OpenMAX Integration Layer (IL) is a standard API to access Multimedia Components on mobile platforms. It has been defined by the Khronos group." +LICENSE = "LGPLv2" +DEPENDS = "alsa-lib ffmpeg \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz" + +inherit autotools_stage + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +FILES_${PN} += "${libdir}/bellagio/*.so ${libdir}/bellagio/*.la" +FILES_${PN}-dev += "${libdir}/bellagio/*.a" +FILES_${PN}-dbg += "${libdir}/bellagio/.debug" + diff --git a/recipes/pciutils/pciutils_3.1.2.bb b/recipes/pciutils/pciutils_3.1.2.bb index d7458a1c7a..ae7317ebbf 100644 --- a/recipes/pciutils/pciutils_3.1.2.bb +++ b/recipes/pciutils/pciutils_3.1.2.bb @@ -12,7 +12,7 @@ SRC_URI_append_nylon = "file://gcc-3-compatibility.patch;patch=1 " PARALLEL_MAKE = "" -PR ="r2" +PR ="r3" EXTRA_OEMAKE += "'STRIP = '" export SHARED=yes @@ -21,18 +21,20 @@ do_configure () { (cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH}) } -export PREFIX = "${D}${prefix}" -export SBINDIR = "${D}${sbindir}" -export SHAREDIR = "${D}${datadir}" -export MANDIR = "${D}${mandir}" +export DESTDIR = "${D}" +export PREFIX = "${prefix}" +export SBINDIR = "${sbindir}" +export SHAREDIR = "${datadir}" +export MANDIR = "${mandir}" +export IDSDIR = "${datadir}" do_install () { oe_runmake install } do_install_append () { - install -d ${D}/${prefix}/share - install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids ${D}/${prefix}/share + install -d ${D}/${datadir} + install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids.gz ${D}/${datadir} # The makefile does not install the development files: # libpci.so pci.h header.h config.h types.h @@ -57,4 +59,4 @@ do_stage () { PACKAGES =+ "pciutils-ids" -FILES_pciutils-ids="${prefix}/share/pci.ids" +FILES_pciutils-ids="${datadir}/pci.ids.gz" diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb index 57e9e1c394..bde7638137 100644 --- a/recipes/perl/perl-native_5.8.8.bb +++ b/recipes/perl/perl-native_5.8.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "virtual/db-native gdbm-native" -PR = "r13" +PR = "r14" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}" @@ -43,6 +43,7 @@ do_configure () { -Dusethreads \ -Duseithreads \ -Duselargefiles \ + -Dnoextensions=ODBM_File \ -Ud_dosuid \ -Ui_db \ -Ui_ndbm \ diff --git a/recipes/sqlite/sqlite3.inc b/recipes/sqlite/sqlite3.inc index 93a536e8b6..ae20ff5ead 100644 --- a/recipes/sqlite/sqlite3.inc +++ b/recipes/sqlite/sqlite3.inc @@ -9,7 +9,7 @@ SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ S = "${WORKDIR}/sqlite-${PV}" -inherit autotools pkgconfig +inherit autotools_stage pkgconfig EXTRA_OECONF = "--disable-tcl --enable-shared \ --enable-threadsafe" @@ -26,15 +26,6 @@ do_compile_prepend() { install -m 0644 sqlite3.h ${STAGING_INCDIR} } -do_stage() { - oe_libinstall -so libsqlite3 ${STAGING_LIBDIR} - install -m 0644 sqlite3.h ${STAGING_INCDIR} -} - -#do_install() { -# oe_runmake install DESTDIR=${D} prefix=${prefix} exec_prefix=${exec_prefix} -#} - PACKAGES = "libsqlite libsqlite-dev libsqlite-doc sqlite3 sqlite3-dbg" FILES_sqlite3 = "${bindir}/*" FILES_libsqlite = "${libdir}/*.so.*" diff --git a/recipes/tangogps/tangogps.inc b/recipes/tangogps/tangogps.inc index 90789377d1..677000fb45 100644 --- a/recipes/tangogps/tangogps.inc +++ b/recipes/tangogps/tangogps.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://tangogps.org/" SECTION = "x11/applications" LICENSE = "GPLv2" PRIORITY = "optional" -DEPENDS = "curl gtk+ gconf sqlite3" +DEPENDS = "curl gtk+ gconf sqlite3 libexif" SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz" S = "${WORKDIR}/tangogps-${PV}" diff --git a/recipes/tslib/tslib/tslib-nopressure.patch b/recipes/tslib/tslib/tslib-nopressure.patch new file mode 100644 index 0000000000..1b19b43c52 --- /dev/null +++ b/recipes/tslib/tslib/tslib-nopressure.patch @@ -0,0 +1,30 @@ +diff -ur tslib-1.0/plugins/input-raw.c tslib/plugins/input-raw.c +--- tslib-1.0/plugins/input-raw.c 2006-08-24 23:02:54.000000000 +0200 ++++ tslib/plugins/input-raw.c 2009-07-21 00:54:29.000000000 +0200 +@@ -95,7 +95,11 @@ + case EV_KEY: + switch (ev.code) { + case BTN_TOUCH: +- if (ev.value == 0) { ++ if (ev.value) { ++ samp->x = i->current_x; ++ samp->y = i->current_y; ++ samp->pressure = i->current_p = 1; ++ } else { + /* pen up */ + samp->x = 0; + samp->y = 0; +@@ -198,7 +202,11 @@ + } else if (ev.type == EV_KEY) { + switch (ev.code) { + case BTN_TOUCH: +- if (ev.value == 0) { ++ if (ev.value) { ++ samp->x = i->current_x; ++ samp->y = i->current_y; ++ samp->pressure = i->current_p = 1; ++ } else { + /* pen up */ + samp->x = 0; + samp->y = 0; + diff --git a/recipes/tslib/tslib_1.0.bb b/recipes/tslib/tslib_1.0.bb index c22256f4d2..1929ee0557 100644 --- a/recipes/tslib/tslib_1.0.bb +++ b/recipes/tslib/tslib_1.0.bb @@ -1,5 +1,6 @@ SRC_URI = "http://download.berlios.de/tslib/${BP}.tar.bz2 \ - file://fix_version.patch;patch=1" -PR = "${INC_PR}.1" + file://fix_version.patch;patch=1 \ + file://tslib-nopressure.patch;patch=1" +PR = "${INC_PR}.2" include tslib.inc diff --git a/recipes/util-linux-ng/util-linux-ng-2.16/uclibc-compile.patch b/recipes/util-linux-ng/util-linux-ng-2.16/uclibc-compile.patch new file mode 100644 index 0000000000..b2e8a8b95a --- /dev/null +++ b/recipes/util-linux-ng/util-linux-ng-2.16/uclibc-compile.patch @@ -0,0 +1,13 @@ +Index: util-linux-ng-2.16/misc-utils/cal.c +=================================================================== +--- util-linux-ng-2.16.orig/misc-utils/cal.c 2009-07-03 16:20:01.000000000 -0700 ++++ util-linux-ng-2.16/misc-utils/cal.c 2009-07-18 23:21:37.000000000 -0700 +@@ -407,7 +407,7 @@ + strcpy(day_headings,""); + strcpy(j_day_headings,""); + +-#ifdef HAVE_LANGINFO_H ++#ifdef HAVE_LANGINFO_H && !defined(__UCLIBC__) + # define weekday(wd) nl_langinfo(ABDAY_1+wd) + #else + # define weekday(wd) _time_info->abbrev_wkday[wd] diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 59d2f0818b..837ff70330 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -1,14 +1,14 @@ DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system." SECTION = "base" LICENSE = "GPL" -DEPENDS = "udev zlib ncurses virtual/libintl e2fsprogs-libs" +DEPENDS = "udev zlib ncurses virtual/libintl" inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" DEFAULT_PREFERENCE = "-1" -INC_PR = "r6" +INC_PR = "r7" # allows for a release candidate RC ?= "" diff --git a/recipes/util-linux-ng/util-linux-ng_2.16.bb b/recipes/util-linux-ng/util-linux-ng_2.16.bb new file mode 100644 index 0000000000..1cfdc34b5c --- /dev/null +++ b/recipes/util-linux-ng/util-linux-ng_2.16.bb @@ -0,0 +1,11 @@ +require util-linux-ng.inc + +PR = "${INC_PR}" + +SRC_URI += "file://uclibc-compile.patch;patch=1 \ +" + +EXTRA_OECONF += " --enable-libuuid --enable-libblkid \ + --disable-fsck" +LDFLAGS_append_libc-uclibc = " -lintl" +PACKAGES_DYNAMIC += "libuuid*" diff --git a/recipes/xorg-driver/xf86-video-sis_0.10.1.bb b/recipes/xorg-driver/xf86-video-sis_0.10.1.bb new file mode 100644 index 0000000000..dc083b3e88 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-sis_0.10.1.bb @@ -0,0 +1,11 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- SiS display driver" +DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto" +PE = "1" + +EXTRA_OECONF += " \ + ac_cv_file__usr_include_xorg_dri_h=yes \ + ac_cv_file__usr_include_xorg_sarea_h=yes \ + ac_cv_file__usr_include_xorg_dristruct_h=yes \ +" diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb index 6c05c0ca53..2ba06af67e 100644 --- a/recipes/xorg-lib/pixman_git.bb +++ b/recipes/xorg-lib/pixman_git.bb @@ -3,22 +3,26 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" -PV = "0.15.8" +PV = "0.15.16" PR = "r1" PR_append = "+gitr${SRCREV}" -SRCREV = "3c570a815afb282df01f41acad385ff0e3e33899" +SRCREV = "f9660ce29ed072c6cbaec711c5d18b9f0ba113ae" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" SRC_URI = "git://anongit.freedesktop.org/pixman;protocol=git \ -file://0041-Fix-filler-bug.patch;patch=1 \ -file://0042-Really-fix-filler-bug.patch;patch=1 \ " S = "${WORKDIR}/git" inherit autotools_stage +NEON = " --disable-arm-neon " +NEON_armv7a = "" + +EXTRA_OECONF = "${NEON}" + AUTOTOOLS_STAGE_PKGCONFIG = "1" diff --git a/recipes/xserver-common/files/ts-handling-cleanup.diff b/recipes/xserver-common/files/ts-handling-cleanup.diff new file mode 100644 index 0000000000..ab6ab075ba --- /dev/null +++ b/recipes/xserver-common/files/ts-handling-cleanup.diff @@ -0,0 +1,66 @@ +--- /tmp/Xserver 2009-07-21 12:53:26.000000000 +0200 ++++ xserver-common-1.25/X11/Xserver 2009-07-21 12:53:41.000000000 +0200 +@@ -53,13 +53,13 @@ + ARGS="-br -pn $INPUT_EXTRA_ARGS" + + # use ucb 1x00 touchscreen if present +-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then ++if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ] && [ "$XSERVER" != "Xorg" ] ; then + ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" + fi + + # kdrive 1.4 onwards needs -mouse args + # Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically +-if [ -e "$TSLIB_TSDEVICE" ] ; then ++if [ -e "$TSLIB_TSDEVICE" ] && [ "$XSERVER" != "Xorg" ] ; then + ARGS="$ARGS -mouse tslib" + else + if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then +@@ -97,7 +97,7 @@ + "Generic OMAP1510/1610/1710") + ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;; + "TI-OSK") +- ARGS="$ARGS -dpi 100 -mouse tslib" ;; ++ ARGS="$ARGS -dpi 100 " ;; + "Cellon C8000 Board") + ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE},10,1" ;; + "HTC Universal") +@@ -105,13 +105,13 @@ + "HTC Tornado") + ARGS="$ARGS -dpi 100 -hide-cursor" ;; + "Atmel AT91SAM9261-EK" | "Atmel AT91SAM9263-EK") +- ARGS="$ARGS -mouse tslib -dpi 100 -rgba bgr -screen 240x320" ;; ++ ARGS="$ARGS -dpi 100 -rgba bgr -screen 240x320" ;; + "Generic OMAP1510/1610/1710" | "Nokia N770") +- ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;; ++ ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} " ;; + "Nokia N800") +- ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;; ++ ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} " ;; + "Nokia RX-44") +- ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;; ++ ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} " ;; + "GTA01" ) + ARGS="$ARGS -dpi 285" + if [ "$XSERVER" != "Xorg" ] ; then +@@ -132,16 +132,16 @@ + fi + ;; + "Boundary Devices Neon board") +- ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} -mouse tslib" ++ ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} " + ;; + "Hoeft&Wessel HW90350") +- ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} -mouse tslib" ++ ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} " + ;; + "Hoeft&Wessel HW90250") +- ARGS="$ARGS -dpi 100 -screen 240x320@90 -mouse tslib" ++ ARGS="$ARGS -dpi 100 -screen 240x320@90 " + ;; + "MINI2440") +- ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} -mouse tslib" ++ ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} " + ;; + # This is a fallback for PCs + "") diff --git a/recipes/xserver-common/xserver-common_1.25.bb b/recipes/xserver-common/xserver-common_1.25.bb index 9db0c2a8d2..ac1f758ef4 100644 --- a/recipes/xserver-common/xserver-common_1.25.bb +++ b/recipes/xserver-common/xserver-common_1.25.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r1" +PR = "r2" PACKAGE_ARCH = "all" @@ -12,6 +12,7 @@ inherit gpe SRC_URI_append = " file://setDPI.sh \ file://89xdgautostart.sh \ file://avoid-rotated-server.patch;patch=1 \ + file://ts-handling-cleanup.diff;patch=1 \ " do_install_append() { |