diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-01-22 10:04:48 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-01-22 10:04:48 +0100 |
| commit | 9b2387f596f4b5c0b47eb970522534750816c9a4 (patch) | |
| tree | a998d24c8c550a3bd6b97ee9269f4ea603471f1f | |
| parent | a72f0d33dd88bcc183ec8d7efd8ff814d6528cc3 (diff) | |
| parent | 658cf78bc2615df4d3a8ef5b2f5c9974d4aab292 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
111 files changed, 1487 insertions, 393 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ae0519b2ca..83b2835c23 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -180,10 +180,13 @@ Interests: Small read-only Linux based firmware, deterministic builds. Recipes: lighttpd, fastcgi, squashfs-tools, rt-tests, linux-rt, linux Machines: mpc8313e-rdb, mpc8315e-rdb, canyonlands, calamari, openrd-base -Person: Liam Girdwoord -Mail: liam.girdwood@wolfsonmicro.com +Person: Liam Girdwood +Mail: lrg@slimlogic.co.uk +Website: http://www.slimlogic.co.uk +Interests: Mobile and embedded Linux within commercial environments. +Interests: Kernel development, userspace development, audio, power management. Machines: mx31ads -Recipes: mx31ads-kernel* +Recipes: mx31ads-kernel*, glibc-2.10.1, some pulseaudio versions Person: Lynn Lin Mail: Lin_Lynn@emc.com diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 83530b5a5e..53ea252b0e 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -112,7 +112,9 @@ kernel_do_stage() { # Check for arch/x86 on i386 elif [ -d arch/x86/include/asm/ ]; then - cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ + if [ -e include/asm ] ; then + cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ + fi install -d ${STAGING_KERNEL_DIR}/arch/x86/include cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/ fi diff --git a/conf/checksums.ini b/conf/checksums.ini index 75daba9f0d..de94be8477 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1362,6 +1362,10 @@ sha256=0b654cd39126333a0dab7fdd2fd0c5023f6eb45e72d1d8bf9fb3cab175002bc7 md5=0fc5008858661c0abd0399acbe30ef28 sha256=26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037 +[http://www.us.xfce.org/archive/xfce-4.6.1/src/Thunar-1.0.1.tar.bz2] +md5=218373aa45d74b6ba8c69c4d5af3bb19 +sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d + [http://www.us.xfce.org/archive/xfce/4.6.1/src/Thunar-1.0.1.tar.bz2] md5=218373aa45d74b6ba8c69c4d5af3bb19 sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d @@ -2642,6 +2646,10 @@ sha256=f34f8eabb463815adbf18d78883e2e61c5ad0020e087152a4c7a604fcd5754ea md5=2ad6ebb3f058e5fbe9ec5e0f0017db28 sha256=06d9807c4135a468a5def531585ead9ea0948b206794e848efe234aa02df39d5 +[http://pawsa.fedorapeople.org/balsa/balsa-2.4.2.tar.bz2] +md5=1eb90a92c089e194a595072a57c57394 +sha256=48bde6ff926fcc5d47853b87242cc890bdb21b5c74a2454a2b5c0269e9340090 + [ftp://ftp.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz] md5=5afcef5d6047f14cd5f65d2fdbd86fb2 sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e @@ -5814,6 +5822,10 @@ sha256=1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4 md5=5cb7987d29db068153bdc8f23c767c43 sha256=2b33f7c7658fb8f004c3aaf2717711262baeb5d77cf3fd24e9b6cc263895122d +[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.2.tar.bz2] +md5=3ca8ddb42cd4ee31b8690031303221af +sha256=f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1 + [http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz] md5=8e11d77770452f97bb3c23f510489815 sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d @@ -9314,6 +9326,10 @@ sha256=9d9ef356cc4478499442573556787125dc76c8acd1e55e5001fb11f1e224d27f md5=c9f8cebfba72bfab674bc0170551fb8d sha256=7fb83a28ae24d4f56eca88bc48f0fe414faee1afb2574bfb6257b52e8c716fcf +[http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.11.tar.bz2] +md5=78e7c4dc7dcb74b1869fee7897e00f59 +sha256=fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451 + [http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.8.tar.bz2] md5=3dfbd17203c0c88b94b6f579f24c11cc sha256=2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c @@ -13930,6 +13946,10 @@ sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051 md5=001d780829f936e34851ef7cd37b4dfd sha256=4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2 +[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.3.tar.bz2] +md5=5d74971360f194ce33d2bd2e4d9b066c +sha256=8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac + [http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.tar.bz2] md5=0545089013213e90aac19b8f8045d32e sha256=34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac @@ -14922,6 +14942,10 @@ sha256=ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c md5=e0e66fae165d0b665b61e9516bf33ade sha256=5e07ec4b644f50160900d4281a74dd1cbf1535cfe4ab24e0c28ae5b038836a8c +[http://dri.freedesktop.org/libdrm/libdrm-2.4.17.tar.bz2] +md5=667d81f993f7fd8a1b1b1b830a28a748 +sha256=b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a + [http://www.metzlerbros.org/dvb/libdvb-0.5.5.1.tar.gz] md5=47612d2f8a4d4dee746a166d8b7f6f77 sha256=941e8020129111377652bd7253ea85e6c133fd1c23c66bd9fc0ca9eabab1385a @@ -15202,6 +15226,10 @@ sha256=7562042a6210947363bd6a9bbcdd03f8d02470c0347970b507f689d25a907844 md5=06b14f1cd96432b0717ed03fe013ca4d sha256=55c616b0761faaa9fb028434de97b02d5145dfc52b1db632671ebc6cc6905575 +[http://ftp.gnome.org/pub/GNOME/sources/libgdata/0.5/libgdata-0.5.1.tar.bz2] +md5=fc9be11d2f823bb16d6e03e2a0dda85d +sha256=2b90f206063405ae6cf579ed3a090b0130e849e1ead02b2ad2ed4fc6d7f585a0 + [http://geda.seul.org/release/v1.4/1.4.1/libgeda-1.4.1.tar.gz] md5=16f2e3176eb489838bad57c8728c7388 sha256=c0598428fc25e79b7ac1da35d44133e3fc50763b32fcdfffd5e6654f2f94682d @@ -17746,6 +17774,10 @@ sha256=9dbd0f6c92b33ae8b96c5a045a341a00b2454492c2229839d056e4fd1488bca5 md5=5d86ca7bb4ed458743acd922ff09dae6 sha256=e4b6ab08eaff2766c3bf85ea8d63ab31ae774266b8351772117fcc94d1318ade +[http://palm.cdnetworks.net/opensource/1.3.1/linuxkernel-2.6.24-patch.gz] +md5=651e9c518db317d11ae5b9076fb0e3ee +sha256=f9c0327a9fa379f2db6bf4b599bd1e37b65e7224aa3fd2bd860a5e0dc5b06040 + [http://linuxtv.org/downloads/linuxtv-dvb-apps-1.1.1.tar.bz2] md5=de958cdb8d00e74792dd69f3c945b037 sha256=371f8133db705bde6c2f79cccb0b1a1f626a0d94bf41acceba5d76a69155f057 @@ -21974,6 +22006,10 @@ sha256=acbadfd4d725e628ab8906f87438b26ebf86e67d219bbdcf07a9ccd18bdaafd6 md5=6e1dc8b9dd6983a54ff3a6de33efa778 sha256=fa907ace507708e4a4bae32cc81a6271fb6da8bc0458fd8fc97cc4429ec8be11 +[http://downloads.sourceforge.net/pidgin/pidgin-2.6.5.tar.bz2] +md5=90847ed22ec830db5d9768748812b661 +sha256=3c459e4093fca679591e35ea34da4a0e45b15f2bb7ca00314a1486dc022f3d0e + [ftp://ftp.cac.washington.edu/pine/pine4.64.tar.Z] md5=75af127948cc0c701d424d22d621f792 sha256=62c7b97695cb486e420afbbbe21bef853dd68a71665d867ffef50cb34dfba5f4 @@ -22034,6 +22070,10 @@ sha256=3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22 md5=02bd3669f53c404c19980d5efb6f86fb sha256=05f78c2fd3a5f054c0d716e8ba1b67a0c04a7a7e642d6946828ec383b389d185 +[http://cairographics.org/releases/pixman-0.17.4.tar.gz] +md5=734f70667d0a6454a1b1e332f8d50083 +sha256=dd2f4a7c9c9373d20720d78718c0e9603741a83d66da3316a020b097b1c918a9 + [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.4.tar.bz2] md5=c354ab5b0da10227226d3ef604254875 sha256=261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa @@ -24234,6 +24274,10 @@ sha256=91619748c4dba733c60eb8a40805c972f407b2463dc6de856ac40336d66bc16c md5=5b60500bc9605d2409b71124e48aa929 sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c +[http://cloud.github.com/downloads/kichkasch/rtmom/rtmom-src-0.1.3.tar.gz] +md5=c4a1012fc0e00d2b64d8d794166bf893 +sha256=9227e503a90054dd643364272d48b3eae8dae3a9c6c4a42a2859395a8786398f + [http://libtorrent.rakshasa.no/downloads/rtorrent-0.8.0.tar.gz] md5=6216be7ce5e3ead9dc115eaeea863694 sha256=597cefac4535d7f3b752253e5997b3c851c261b26b966a39beb032dcf1d5baa7 @@ -27370,6 +27414,10 @@ sha256=57d2629849796b4dc919261eadd1eea3ee6e634d58979797287f7e09408cde67 md5=8ac38951e753f250aaefbd4ba0afda94 sha256=d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986 +[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.5.0.tar.gz] +md5=ffef78135535c60c2b68d0a2a4ecae9b +sha256=d47116ce5df198859a6082af7a72505575d1685b8c82bb4ef6fbedfa3316617e + [http://xorg.freedesktop.org/releases/X11R7.0/src/util/util-macros-X11R7.0-1.0.1.tar.bz2] md5=bc6be634532d4936eb753de54e1663d3 sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd @@ -28206,6 +28254,10 @@ sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7 md5=3ad40ea2b1728eefa94f60beb9951ff7 sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7 +[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.9.0.tar.bz2] +md5=09058928eeb72853142c062bdec056ce +sha256=8cf5c1dcf6357b2d27efd0c737b95baf1d2d1e88b5bf24560824b5eb6f2dc782 + [http://xorg.freedesktop.org/releases/individual/app/x11perf-1.4.1.tar.bz2] md5=fd06c8b8e3572a0e14af65a49e0dd7d1 sha256=c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064 @@ -29674,6 +29726,10 @@ sha256=738463dbf1980b9d0f95936a2d951dc51bd776c7949215c2456580948660669e md5=4d76953e97ee760efb7627e7ac721dbf sha256=ea2b875a8bb8ab9d987192dbcb4fb595e511b382d06260baf23a936f7e61fa14 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.10.0.tar.bz2] +md5=78309d4f04dd8ae6585d120377042741 +sha256=e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.2.1.tar.bz2] md5=3334dc5142871b78fc609fd1b3dac3f2 sha256=d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a @@ -30234,6 +30290,10 @@ sha256=8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226 md5=61a1dc9a22991bd04d0ff98f800775c1 sha256=a3657971232e9c7db3e7517a8aedd86d3ef4d159f7099ec974cdd03aafa41080 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.0.tar.bz2] +md5=07fa32958aff9b463dd3af5481ef6626 +sha256=8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2] md5=049ada4df1abb5aa2b6633ba90353e78 sha256=c6601cd278ebc30a0d20b49b6284bc21b4910f8ef5d24d1c62daa1591a251452 @@ -30286,6 +30346,10 @@ sha256=3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366 md5=25287a202c986b33bd79fbe379c96a16 sha256=956443948d94f7459b0056d8cb8ff2cd9fba4621d8b61f0257cb84469ea7da07 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.9.tar.bz2] +md5=3b3d38abfa1f8be4b1e26dcd236bc94f +sha256=835a5e45b54837cbbd963a48bd09db709717e097e931dd76e68e397a167e8bc1 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2] md5=4df79349e26add4c23f6be8bec347ad4 sha256=79b0bf59d866d3760fa8a55b4a19d56ae7fa6a962d629a9de5c188cec5c98c9a @@ -30510,6 +30574,10 @@ sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4 md5=7d09d161efc7ef86b3b48791d98c8ae8 sha256=1e7a506f08c8a4f368dd18648006ba3934a94eb96fd4545f5303d46aeae9cc3e +[http://www.us.xfce.org/archive/xfce-4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2] +md5=c9587fa78e877eee858a33391d0afd62 +sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac + [http://www.us.xfce.org/archive/xfce/4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2] md5=c9587fa78e877eee858a33391d0afd62 sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac @@ -31342,6 +31410,10 @@ sha256=f4fb49209a6f3cb1c5b039b1f43870774e2eac1540b4d3235a2f13bc441da159 md5=4c63b22cad9ed8ae8b86561f0f92c327 sha256=4b644113cd030fc77615c03c7b6529e063dc1d471ec6a990e6f62eb45a9c2db4 +[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.4.tar.bz2] +md5=75d27c3a1c12293f620a2d6518fcbdfa +sha256=b8ec11b3f2c6f84c21e8cd9804672ba6e27fda3e913d58dd947205ea253e33f8 + [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2] md5=0e7527480fb845a3c2e333bd0f47ff50 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47 @@ -31894,6 +31966,10 @@ sha256=487bf07b2f9ead6a59682d091081e47cfe4ca5777de32e6cec5bef55fa51c82f md5=e0744594f4e5969b20df28d897781318 sha256=6d0feb42c2f1d6011d97c776b9d580fd589cdf3cfe246cd99437c406a2740d36 +[http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.2.tar.bz2] +md5=e40eeb4454f2a7cdde3a14f5dfd3aadd +sha256=73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xvidtune-X11R7.0-1.0.1.tar.bz2] md5=a12e27fb732cb115b6adc4c724c44c5d sha256=f7b3925d7e9981d146d3e5774de0521e6d48e2ed99841f538f267e8bc58bf5cd diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc index 8b120f2eb2..870ac04036 100644 --- a/conf/distro/include/kaeilos-2009-preferred-versions.inc +++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc @@ -4,7 +4,7 @@ #@NAME: KaeilOS(R) - http://www.kaeilos.com #@DESCRIPTION: KaeilOS Linux Distribution preferred version #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com> -#@VERSION: 11-01-2010 +#@VERSION: 20-01-2010 # # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia # Product website : http://www.KaeilOS.com @@ -46,6 +46,9 @@ PREFERRED_VERSION_python = "2.6.2" PREFERRED_VERSION_samba = "3.3.9" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" +KAEILOS_WX_VERSION ?= "2.8.10" +PREFERRED_VERSION_wxwidgets = "${KAEILOS_WX_VERSION}" + KAEILOS_QT_VERSION ?= "4.6.0" PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}" diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index bea2b4105c..65e94fac5c 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Thu Dec 31 14:54:51 CET 2009 +#Mon Jan 18 14:00:56 CET 2010 #app PREFERRED_VERSION_appres ?= "1.0.2" PREFERRED_VERSION_bdftopcf ?= "1.0.2" @@ -98,7 +98,7 @@ PREFERRED_VERSION_xsetroot ?= "1.0.3" PREFERRED_VERSION_xsm ?= "1.0.1" PREFERRED_VERSION_xstdcmap ?= "1.0.1" PREFERRED_VERSION_xtrap ?= "1.0.2" -PREFERRED_VERSION_xvidtune ?= "1.0.1" +PREFERRED_VERSION_xvidtune ?= "1.0.2" PREFERRED_VERSION_xvinfo ?= "1.1.0" PREFERRED_VERSION_xwd ?= "1.0.3" PREFERRED_VERSION_xwininfo ?= "1.0.5" @@ -156,8 +156,7 @@ PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2" PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4" PREFERRED_VERSION_xf86-video-impact ?= "0.2.0" PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0" -#PREFERRED_VERSION_xf86-video-intel ?= "2.9.99.902" -PREFERRED_VERSION_xf86-video-intel ?= "2.9.1" +PREFERRED_VERSION_xf86-video-intel ?= "2.10.0" PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2" PREFERRED_VERSION_xf86-video-mga ?= "1.9.100" PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4" @@ -187,11 +186,10 @@ PREFERRED_VERSION_xf86-video-trident ?= "1.3.3" PREFERRED_VERSION_xf86-video-tseng ?= "1.2.3" PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0" PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" -PREFERRED_VERSION_xf86-video-vesa ?= "2.2.1" +PREFERRED_VERSION_xf86-video-vesa ?= "2.3.0" PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" PREFERRED_VERSION_xf86-video-via ?= "0.2.2" -#PREFERRED_VERSION_xf86-video-vmware ?= "10.16.9" -PREFERRED_VERSION_xf86-video-vmware ?= "10.16.8" +PREFERRED_VERSION_xf86-video-vmware ?= "10.16.9" PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3" PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0" PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1" @@ -244,8 +242,8 @@ PREFERRED_VERSION_libice-native ?= "1.0.6" PREFERRED_VERSION_libsm ?= "1.1.1" PREFERRED_VERSION_libsm-native ?= "1.1.1" PREFERRED_VERSION_libwindowswm ?= "1.0.1" -PREFERRED_VERSION_libx11 ?= "1.3.2" -PREFERRED_VERSION_libx11-native ?= "1.3.2" +PREFERRED_VERSION_libx11 ?= "1.3.3" +PREFERRED_VERSION_libx11-native ?= "1.3.3" PREFERRED_VERSION_libxscrnsaver ?= "1.2.0" PREFERRED_VERSION_libxtrap ?= "1.0.0" PREFERRED_VERSION_libxau ?= "1.0.5" @@ -294,8 +292,7 @@ PREFERRED_VERSION_libpciaccess ?= "0.11.0" PREFERRED_VERSION_libxkbfile ?= "1.0.6" PREFERRED_VERSION_libxkbfile-native ?= "1.0.6" PREFERRED_VERSION_libxkbui ?= "1.0.2" -#PREFERRED_VERSION_pixman ?= "0.17.2" -PREFERRED_VERSION_pixman ?= "0.16.2" +PREFERRED_VERSION_pixman ?= "0.17.4" PREFERRED_VERSION_xtrans ?= "1.2.5" PREFERRED_VERSION_xtrans-native ?= "1.2.5" #proto @@ -305,7 +302,7 @@ PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0" PREFERRED_VERSION_compositeproto ?= "0.4.1" PREFERRED_VERSION_damageproto ?= "1.2.0" PREFERRED_VERSION_dmxproto ?= "2.3" -PREFERRED_VERSION_dri2proto ?= "2.1" +PREFERRED_VERSION_dri2proto ?= "2.2" PREFERRED_VERSION_evieext ?= "1.1.0" PREFERRED_VERSION_fixesproto ?= "4.1.1" PREFERRED_VERSION_fixesproto-native ?= "4.1.1" @@ -313,7 +310,7 @@ PREFERRED_VERSION_fontcacheproto ?= "0.1.3" PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3" PREFERRED_VERSION_fontsproto ?= "2.1.0" PREFERRED_VERSION_fontsproto-native ?= "2.1.0" -PREFERRED_VERSION_glproto ?= "1.4.10" +PREFERRED_VERSION_glproto ?= "1.4.11" PREFERRED_VERSION_inputproto ?= "2.0" PREFERRED_VERSION_inputproto-native ?= "2.0" PREFERRED_VERSION_kbproto ?= "1.0.4" @@ -349,9 +346,9 @@ PREFERRED_VERSION_imake ?= "1.0.2" PREFERRED_VERSION_lndir ?= "1.0.1" PREFERRED_VERSION_makedepend ?= "1.0.2" PREFERRED_VERSION_makedepend-native ?= "1.0.2" -PREFERRED_VERSION_util-macros ?= "1.4.1" -PREFERRED_VERSION_util-macros-native ?= "1.4.1" +PREFERRED_VERSION_util-macros ?= "1.5.0" +PREFERRED_VERSION_util-macros-native ?= "1.5.0" PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" #xserver #PREFERRED_VERSION_xserver-xorg ?= "1.7.99.2" -PREFERRED_VERSION_xserver-xorg ?= "1.7.3" +PREFERRED_VERSION_xserver-xorg ?= "1.7.4" diff --git a/conf/distro/include/sane-feed.inc b/conf/distro/include/sane-feed.inc index 5bc19a1806..873972f5aa 100644 --- a/conf/distro/include/sane-feed.inc +++ b/conf/distro/include/sane-feed.inc @@ -41,7 +41,13 @@ FEED_ARCH_a780 = "armv5te" FEED_ARCH_akita = "armv5te" FEED_ARCH_asus620 = "armv5te" FEED_ARCH_asus730 = "armv5te" +FEED_ARCH_at91sam9260ek = "armv5te" +FEED_ARCH_at91sam9261ek = "armv5te" FEED_ARCH_at91sam9263ek = "armv5te" +FEED_ARCH_at91sam9rlek = "armv5te" +FEED_ARCH_at91sam9g10ek = "armv5te" +FEED_ARCH_at91sam9g20ek = "armv5te" +FEED_ARCH_at91sam9g45ekes = "armv5te" FEED_ARCH_aximx50 = "armv5te" FEED_ARCH_aximx50v = "armv5te" FEED_ARCH_c7x0 = "armv5te" diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 733b15e78b..06e3f1c8e0 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -16,6 +16,7 @@ SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2" SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-mickeydbus2 ?= "${FSO_CORNUCOPIA_SRCREV}" # FSO Projects -- Misc SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 207c320a66..f4d79268a2 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -148,7 +148,7 @@ SRCREV_pn-linux-ixp4xx ?= "1089" SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7" SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5" SRCREV_pn-linux-openmoko-2.6.31 ?= "dd32737aa524e09c1d141a0e735dd58674552244" -SRCREV_pn-linux-openmoko-2.6.32 ?= "5827b20d022fb47ce9c9731d0fb894d361e16ffe" +SRCREV_pn-linux-openmoko-2.6.32 ?= "058cbf4220fd2f1cd970bf553c044cb178e3804e" SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88" SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88" SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40" @@ -312,6 +312,7 @@ SRCREV_pn-socketcan-modules ?= "917" SRCREV_pn-socketcan-utils-test ?= "917" SRCREV_pn-sphyrna-python ?= "45" SRCREV_pn-starling ?= "9574" +SRCREV_pn-stopwatch ?= "89644b91e02151fc72989755f20c1ffb144ef5e2" SRCREV_pn-table ?= "2191" SRCREV_pn-tichy ?= "ab68d849502009cf3214df48ffa8075a10cc2177" SRCREV_pn-tmut ?= "60" diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index 04fde21b25..daa2deff29 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -9,8 +9,8 @@ PREFERRED_GCC_VERSION ?= "4.4.2" PREFERRED_BINUTILS ?= "2.20" # Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. -PREFERRED_VERSION_glibc ?= "2.6.1" -PREFERRED_VERSION_glibc-initial ?= "2.6.1" +PREFERRED_VERSION_glibc ?= "2.10.1" +PREFERRED_VERSION_glibc-initial ?= "2.10.1" PREFERRED_VERSION_eglibc ?= "2.10" PREFERRED_VERSION_eglibc-initial ?= "2.10" PREFERRED_VERSION_uclibc ?= "0.9.30.1" diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index d9fc595303..9885425979 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -62,6 +62,8 @@ MACHINE_KERNEL_VERSION = "2.6" ############################################################################# LIBC ?= "eglibc" PREFERRED_BINUTILS = "2.19.51" +PREFERRED_VERSION_glibc ?= "2.10.1" +PREFERRED_VERSION_glibc-initial ?= "2.10.1" PREFERRED_ARM_INSTRUCTION_SET ?= "thumb" require conf/distro/include/sane-toolchain.inc diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf index 9a7ca9af62..3fdfce4ba1 100644 --- a/conf/machine/at91sam9260ek.conf +++ b/conf/machine/at91sam9260ek.conf @@ -7,7 +7,6 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.28" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" UBOOT_MACHINE = "at91sam9260ek_config" diff --git a/conf/machine/at91sam9g10ek.conf b/conf/machine/at91sam9g10ek.conf new file mode 100644 index 0000000000..9f41fd9b11 --- /dev/null +++ b/conf/machine/at91sam9g10ek.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@Name: Atmel AT91SAM9G10EK Development Platform +#@DESCRIPTION: Machine configuration for the at91sam9g10ek development board with a at91sam9g10 processor + +TARGET_ARCH = "arm" +#PACKAGE_EXTRA_ARCHS = "armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +KERNEL_IMAGETYPE = "uImage" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf index 7dc6ba0d53..59c5a42c64 100644 --- a/conf/machine/at91sam9g20ek.conf +++ b/conf/machine/at91sam9g20ek.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.28" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" UBOOT_MACHINE = "at91sam9g20ek_config" diff --git a/conf/machine/at91sam9g45ekes.conf b/conf/machine/at91sam9g45ekes.conf new file mode 100644 index 0000000000..2d962ef276 --- /dev/null +++ b/conf/machine/at91sam9g45ekes.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@Name: Atmel AT91SAM9G45EKES Development Platform +#@DESCRIPTION: Machine configuration for the at91sam9g45ekes development board with a at91sam9g45-es processor + +TARGET_ARCH = "arm" +#PACKAGE_EXTRA_ARCHS = "armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +KERNEL_IMAGETYPE = "uImage" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf index f7a78dcf75..de26926650 100644 --- a/conf/machine/at91sam9rlek.conf +++ b/conf/machine/at91sam9rlek.conf @@ -17,7 +17,7 @@ PREFERRED_VERSION_at91bootstrap = "2.10" #don't try to access tty1 USE_VT = "0" -MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen" +MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget screen touchscreen" EXTRA_IMAGEDEPENDS += "u-boot" #EXTRA_IMAGEDEPENDS += "at91bootstrap" diff --git a/recipes/barebox/barebox.inc b/recipes/barebox/barebox.inc new file mode 100644 index 0000000000..b3def2a7b6 --- /dev/null +++ b/recipes/barebox/barebox.inc @@ -0,0 +1,49 @@ +DESCRIPTION = "Barebox - a bootloader that inherits the best of U-Boot and the Linux kernel" +HOMEPAGE = "http://www.barebox.org/" +SECTION = "bootloaders" +PRIORITY = "optional" +LICENSE = "GPL" +PROVIDES = "virtual/bootloader" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit kernel-arch + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" + +BAREBOX_MACHINE ?= "${MACHINE}_defconfig" +BAREBOX_BINARY ?= "barebox.bin" +BAREBOX_IMAGE ?= "barebox-${MACHINE}-${PV}-${PR}.bin" +BAREBOX_SYMLINK ?= "barebox-${MACHINE}.bin" + +INSANE_SKIP_${PN} = True + +do_configure_prepend() { + cp ${WORKDIR}/defconfig ${S}/.config + oe_runmake oldconfig +} + +do_compile () { + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + oe_runmake all +} + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + install ${S}/${BAREBOX_BINARY} ${DEPLOY_DIR_IMAGE}/${BAREBOX_IMAGE} + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${BAREBOX_IMAGE} + + cd ${DEPLOY_DIR_IMAGE} + rm -f ${BAREBOX_SYMLINK} + ln -sf ${BAREBOX_IMAGE} ${BAREBOX_SYMLINK} + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${BAREBOX_SYMLINK} +} +do_deploy[dirs] = "${S}" +addtask deploy before do_build after do_compile + +do_stage() { + install -d ${STAGING_BINDIR_NATIVE} + install -m 755 scripts/mkimage ${STAGING_BINDIR_NATIVE}/ +} diff --git a/recipes/barebox/barebox_2009.12.bb b/recipes/barebox/barebox_2009.12.bb new file mode 100644 index 0000000000..2977429180 --- /dev/null +++ b/recipes/barebox/barebox_2009.12.bb @@ -0,0 +1,15 @@ +require barebox.inc + +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +BAREBOX_REVISION ?= "0" + +S = "${WORKDIR}/barebox-${PV}.${BAREBOX_REVISION}" + +SRC_URI = "http://barebox.org/download/barebox-${PV}.${BAREBOX_REVISION}.tar.bz2;name=barebox-${PV}.${BAREBOX_REVISION} \ + file://defconfig" + +SRC_URI[barebox-2009.12.0.md5sum] = "d1aefe17cfd72affec766617b42dfb78" +SRC_URI[barebox-2009.12.0.sha256sum] = "0ccd59898289652f4bebd8282737a771729d84886195221c781df08f81a837ef" diff --git a/recipes/barebox/barebox_git.bb b/recipes/barebox/barebox_git.bb new file mode 100644 index 0000000000..8f9e3221d7 --- /dev/null +++ b/recipes/barebox/barebox_git.bb @@ -0,0 +1,10 @@ +require barebox.inc + +PR = "r0" + +FILESPATHPKG =. "barebox-git:" + +SRC_URI = "git://git.pengutronix.de/git/barebox.git;protocol=git \ + file://defconfig" + +S = "${WORKDIR}/git" diff --git a/recipes/binutils/binutils_2.17.bb b/recipes/binutils/binutils_2.17.bb index fdee8a56ec..ceea7c6d26 100644 --- a/recipes/binutils/binutils_2.17.bb +++ b/recipes/binutils/binutils_2.17.bb @@ -1,7 +1,8 @@ require binutils.inc require binutils-avr32.inc -PR = "r7" +INC_PR = "r7" +PR = "${INC_PR}.1" SRC_URI = \ "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \ diff --git a/recipes/cairo/cairo-native_1.8.0.bb b/recipes/cairo/cairo-native_1.8.0.bb index c575cdcce1..d58e16b61d 100644 --- a/recipes/cairo/cairo-native_1.8.0.bb +++ b/recipes/cairo/cairo-native_1.8.0.bb @@ -3,8 +3,7 @@ require cairo_1.8.0.bb inherit native -DEPENDS += "glib-2.0-native libpng-native libpixman-native libx11-native fontconfig-native" +DEPENDS += "glib-2.0-native libpng-native pixman-native libx11-native fontconfig-native" PROVIDES = "cairo-native" -PR = "r0" - +PR = "r1" diff --git a/recipes/dri/libdrm_2.4.17.bb b/recipes/dri/libdrm_2.4.17.bb new file mode 100644 index 0000000000..fd1ab3a5e4 --- /dev/null +++ b/recipes/dri/libdrm_2.4.17.bb @@ -0,0 +1,18 @@ +SECTION = "x11/base" +DEPENDS = "libpthread-stubs" +LICENSE = "MIT" +SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" +PROVIDES = "drm" +PR = "r2" + +inherit autotools pkgconfig + +EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel',d)}" + +do_stage() { + autotools_stage_all +} + +PACKAGES =+ "${@base_contains('MACHINE_FEATURES', 'x86', '${PN}-intel', '',d)}" + +FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" diff --git a/recipes/eggdbus/eggdbus_0.6.bb b/recipes/eggdbus/eggdbus_0.6.bb new file mode 100644 index 0000000000..1d8717929b --- /dev/null +++ b/recipes/eggdbus/eggdbus_0.6.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "gobject dbus binding" +HOMEPAGE = "http://cgit.freedesktop.org/~david/eggdbus" +LICENSE = "GPLv2" + +DEPENDS = "dbus glib-2.0" + +BASE_SRC_URI = "http://cgit.freedesktop.org/~david/${BPN}/snapshot/${BPN}-${PV}.tar.bz2 \ + file://gtk-doc.patch;patch=1 \ + " + +SRC_URI = "${BASE_SRC_URI} \ + file://marshal.patch;patch=1 \ + " + +SRC_URI_virtclass-native = "${BASE_SRC_URI}" + +inherit autotools + +EXTRA_OECONF = " --disable-man-pages --disable-gtk-doc-html " + +BBCLASSEXTEND = "native" + diff --git a/recipes/eggdbus/files/gtk-doc.patch b/recipes/eggdbus/files/gtk-doc.patch new file mode 100644 index 0000000000..0999a85153 --- /dev/null +++ b/recipes/eggdbus/files/gtk-doc.patch @@ -0,0 +1,32 @@ +Index: eggdbus-0.6/docs/eggdbus/Makefile.am +=================================================================== +--- eggdbus-0.6.orig/docs/eggdbus/Makefile.am ++++ eggdbus-0.6/docs/eggdbus/Makefile.am +@@ -87,11 +87,7 @@ HTML_IMAGES = \ + # Extra options to supply to gtkdoc-fixref + FIXXREF_OPTIONS= + +-if ENABLE_GTK_DOC +-include $(top_srcdir)/gtk-doc.make +-else + CLEANFILES = +-endif + + CLEANFILES += *~ \ + eggdbus-scan.* \ +Index: eggdbus-0.6/docs/tests/Makefile.am +=================================================================== +--- eggdbus-0.6.orig/docs/tests/Makefile.am ++++ eggdbus-0.6/docs/tests/Makefile.am +@@ -65,11 +65,7 @@ HTML_IMAGES = \ + # Extra options to supply to gtkdoc-fixref + FIXXREF_OPTIONS= + +-if ENABLE_GTK_DOC +-include $(top_srcdir)/gtk-doc.make +-else + CLEANFILES = +-endif + + CLEANFILES += *~ \ + tests-scan.* \ diff --git a/recipes/eggdbus/files/marshal.patch b/recipes/eggdbus/files/marshal.patch new file mode 100644 index 0000000000..2b2cb4985b --- /dev/null +++ b/recipes/eggdbus/files/marshal.patch @@ -0,0 +1,26 @@ +Index: eggdbus-0.6/src/eggdbus/Makefile.am +=================================================================== +--- eggdbus-0.6.orig/src/eggdbus/Makefile.am ++++ eggdbus-0.6/src/eggdbus/Makefile.am +@@ -130,7 +130,7 @@ BUILT_SOURCES = \ + $(NULL) + + eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal +- EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \ ++ EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool \ + --namespace EggDBus \ + --dbus-namespace org.freedesktop.DBus \ + --interfaces-only \ +Index: eggdbus-0.6/src/tests/Makefile.am +=================================================================== +--- eggdbus-0.6.orig/src/tests/Makefile.am ++++ eggdbus-0.6/src/tests/Makefile.am +@@ -25,7 +25,7 @@ BUILT_SOURCES = \ + $(NULL) + + test-built-sources.stamp : Makefile.am $(top_builddir)/src/eggdbus/eggdbus-binding-tool com.example.Frob.xml com.example.Tweak.xml com.example.Twiddle.xml +- EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \ ++ EGG_DBUS_GENMARSHAL=eggdbus-glib-genmarshal eggdbus-binding-tool \ + --namespace "Test" \ + --dbus-namespace "com.example" \ + --include-header testtypes.h \ diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb index 7865f019f7..c2e0534974 100644 --- a/recipes/eglibc/eglibc_svn.bb +++ b/recipes/eglibc/eglibc_svn.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -SRCREV = "9527" +SRCREV = "9570" DEFAULT_PREFERENCE = "-1" FILESPATHPKG =. "eglibc-svn:" PV = "2.11+svnr${SRCPV}" diff --git a/recipes/freesmartphone/mickeydbus2_git.bb b/recipes/freesmartphone/mickeydbus2_git.bb new file mode 100644 index 0000000000..799cbe72c1 --- /dev/null +++ b/recipes/freesmartphone/mickeydbus2_git.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Mickey's DBus introspection and calling Program rewritten in vala" +AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" +HOMEPAGE = "http://www.freesmartphone.org" +SECTION = "console/network" +LICENSE = "GPLv2" + +DEPENDS = "vala-native glib-2.0 dbus dbus-glib" + +PV = "2.0.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master" +S = "${WORKDIR}/git/tools/mdbus2" + +inherit autotools + + diff --git a/recipes/gdb/gdb.inc b/recipes/gdb/gdb.inc index 77a9ca6a3e..a63fb6159b 100644 --- a/recipes/gdb/gdb.inc +++ b/recipes/gdb/gdb.inc @@ -10,6 +10,10 @@ FILES_gdbserver = "${bindir}/gdbserver" RRECOMMENDS_gdb_append_linux = " glibc-thread-db " RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " +RRECOMMENDS_gdb_append_linux-uclibc = " uclibc-thread-db " +RRECOMMENDS_gdb_append_linux-uclibceabi = " uclibc-thread-db " +RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db " + inherit gettext SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \ @@ -43,5 +47,3 @@ do_install () { install -d ${D}${bindir} install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} } - - diff --git a/recipes/gdb/gdbserver.inc b/recipes/gdb/gdbserver.inc index b98058fe5d..f477c3aa9c 100644 --- a/recipes/gdb/gdbserver.inc +++ b/recipes/gdb/gdbserver.inc @@ -1,6 +1,6 @@ require gdb-common.inc -INC_PR = "r1" +INC_PR = "r2" DEFAULT_PREFERENCE_avr32 = "-99" @@ -9,6 +9,10 @@ FILES_gdbserver = "${bindir}/gdbserver" RRECOMMENDS_gdb_append_linux = " glibc-thread-db " RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " +RRECOMMENDS_gdb_append_linux-uclibc = " uclibc-thread-db " +RRECOMMENDS_gdb_append_linux-uclibceabi = " uclibc-thread-db " +RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db " + inherit gettext FILESPATHPKG =. "gdb-${PV}:" diff --git a/recipes/gettext/gettext-native_0.14.1.bb b/recipes/gettext/gettext-native_0.14.1.bb deleted file mode 100644 index fed847b5c5..0000000000 --- a/recipes/gettext/gettext-native_0.14.1.bb +++ /dev/null @@ -1,62 +0,0 @@ -require gettext_${PV}.bb -PR = "r1" - -S = "${WORKDIR}/gettext-${PV}" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}" -inherit native -DEPENDS = "" -PROVIDES = "" - -M4_FILES = "\ -lib-ld.m4 \ -lib-link.m4 \ -lib-prefix.m4 \ -codeset.m4 \ -gettext.m4 \ -glibc21.m4 \ -iconv.m4 \ -intdiv0.m4 \ -intmax.m4 \ -inttypes.m4 \ -inttypes_h.m4 \ -inttypes-pri.m4 \ -isc-posix.m4 \ -lcmessage.m4 \ -longdouble.m4 \ -longlong.m4 \ -nls.m4 \ -po.m4 \ -printf-posix.m4 \ -progtest.m4 \ -signed.m4 \ -size_max.m4 \ -stdint_h.m4 \ -uintmax_t.m4 \ -ulonglong.m4 \ -wchar_t.m4 \ -wint_t.m4 \ -xsize.m4 \ -" - -do_stage_append() { - for i in ${M4_FILES}; do - src="gettext-runtime/m4/$i" - if [ ! -f $src ]; then - src="gettext-tools/m4/$i" - fi - if [ ! -f $src ]; then - src="autoconf-lib-link/m4/$i" - fi - if [ ! -f $src ]; then - echo "can't find $i" >&2 - exit 1 - fi - install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i - done - # config.rpath is needed by some configure macros and needs to be autoinstalled. - # automake will do this but config.rpath needs to be visible to automake - for i in `ls -d ${STAGING_DATADIR}/automake*` - do - cp ${STAGING_DATADIR}/gettext/config.rpath $i - done -} diff --git a/recipes/gettext/gettext-native_0.17.bb b/recipes/gettext/gettext-native_0.17.bb deleted file mode 100644 index d2de0bcccb..0000000000 --- a/recipes/gettext/gettext-native_0.17.bb +++ /dev/null @@ -1,67 +0,0 @@ -require gettext_${PV}.bb -PR = "r4" - -DEPENDS = "" -PROVIDES = "" - -inherit native - -S = "${WORKDIR}/gettext-${PV}" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}" - -M4_FILES = "\ -ansi-c++.m4 \ -codeset.m4 \ -gettext.m4 \ -glibc21.m4 \ -glibc2.m4 \ -iconv.m4 \ -intdiv0.m4 \ -intldir.m4 \ -intl.m4 \ -intlmacosx.m4 \ -intmax.m4 \ -inttypes_h.m4 \ -inttypes-pri.m4 \ -lcmessage.m4 \ -lock.m4 \ -longlong.m4 \ -nls.m4 \ -po.m4 \ -printf-posix.m4 \ -progtest.m4 \ -size_max.m4 \ -stdint_h.m4 \ -uintmax_t.m4 \ -visibility.m4 \ -wchar_t.m4 \ -wint_t.m4 \ -xsize.m4 \ -lib-ld.m4 \ -lib-link.m4 \ -lib-prefix.m4 \ -" - -do_stage_append() { - for i in ${M4_FILES}; do - src="gettext-runtime/m4/$i" - if [ ! -f $src ]; then - src="gettext-tools/m4/$i" - fi - if [ ! -f $src ]; then - src="autoconf-lib-link/m4/$i" - fi - if [ ! -f $src ]; then - echo "can't find $i" >&2 - exit 1 - fi - install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i - done - - # config.rpath is needed by some configure macros and needs to be autoinstalled. - # automake will do this but config.rpath needs to be visible to automake - for i in `ls -d ${STAGING_DATADIR}/automake*` - do - cp ${STAGING_DATADIR}/gettext/config.rpath $i - done -} diff --git a/recipes/gettext/gettext_0.14.1.bb b/recipes/gettext/gettext_0.14.1.bb index b383525d88..77ec7b9e4e 100644 --- a/recipes/gettext/gettext_0.14.1.bb +++ b/recipes/gettext/gettext_0.14.1.bb @@ -2,9 +2,11 @@ DESCRIPTION = "The GNU internationalization library." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPL" -PR = "r10" +PR = "r11" DEPENDS = "virtual/libiconv" +DEPENDS_virtclass-native = "" PROVIDES = "virtual/libintl" +PROVIDES_virtclass-native = "" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://gettext-vpath.patch;patch=1;pnum=1 \ @@ -28,7 +30,6 @@ acpaths = '-I ${S}/autoconf-lib-link/m4/ \ do_configure_prepend() { rm -f ${S}/config/m4/libtool.m4 - install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/ } # these lack the .x behind the .so, but shouldn't be in the -dev package @@ -45,6 +46,3 @@ PACKAGES =+ "libgettextlib libgettextsrc" FILES_libgettextlib = "${libdir}/libgettextlib-*.so*" FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*" -do_stage () { - autotools_stage_all -} diff --git a/recipes/gettext/gettext_0.17.bb b/recipes/gettext/gettext_0.17.bb index 9f9f695b6a..2f7faa70fa 100644 --- a/recipes/gettext/gettext_0.17.bb +++ b/recipes/gettext/gettext_0.17.bb @@ -2,9 +2,14 @@ DESCRIPTION = "The GNU internationalization library." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPLv3" -PR = "r3" +PR = "r5" DEPENDS = "gettext-native virtual/libiconv ncurses expat" +DEPENDS_virtclass-native = "" PROVIDES = "virtual/libintl" +PROVIDES_virtclass-native = "" +RCONFLICTS_gettext-libintl = "proxy-libintl" + +BBCLASSEXTEND = "native nativesdk" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://autotools.patch;patch=1 \ @@ -45,10 +50,9 @@ acpaths = '-I ${S}/autoconf-lib-link/m4/ \ # 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk # 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk -PACKAGES =+ "libgettextlib libgettextsrc" +PACKAGES =+ "gettext-libintl libgettextlib libgettextsrc" + +FILES_gettext-libintl = "${libdir}/libintl*.so.*" FILES_libgettextlib = "${libdir}/libgettextlib-*.so*" FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*" -do_stage () { - autotools_stage_all -} diff --git a/recipes/gnome/at-spi_1.28.0.bb b/recipes/gnome/at-spi_1.28.0.bb index 3639407eb6..79b48b3f1b 100644 --- a/recipes/gnome/at-spi_1.28.0.bb +++ b/recipes/gnome/at-spi_1.28.0.bb @@ -6,8 +6,16 @@ LICENSE = "LGPL" DEPENDS = "gtk+ atk libbonobo orbit2 orbit2-native" RDEPENDS_${PN} = "libgail-gnome gtk-module-gail" +PR = "r1" + inherit gnome +do_configure_prepend () { + sed -i "s|ORBIT_IDL=.*|ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2|" ${S}/configure.in + sed -i "s|BONOBO_ACTIVATION_IDL_DIR=.*|BONOBO_ACTIVATION_IDL_DIR=${STAGING_DATADIR}/idl/bonobo-activation-2.0|" ${S}/configure.in + sed -i "s|LIBBONOBO_IDL_DIR=.*|LIBBONOBO_IDL_DIR=${STAGING_DATADIR}/idl//bonobo-2.0|" ${S}/configure.in +} + do_stage () { autotools_stage_all } diff --git a/recipes/gnome/libgdata_0.5.1.bb b/recipes/gnome/libgdata_0.5.1.bb new file mode 100644 index 0000000000..7c510d0b5f --- /dev/null +++ b/recipes/gnome/libgdata_0.5.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "libgdata is a GLib-based library for accessing online service APIs" +LICENSE = "LGPL" +DEPENDS = "libxml2 glib-2.0 libsoup-2.4" + +inherit gnome lib_package autotools_stage + +SRC_URI += " \ + file://gtk-doc.make \ +" + +do_configure_prepend() { + cp ${WORKDIR}/gtk-doc.make ${S}/ + sed -i -e s:docs::g ${S}/Makefile.am + echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make +} + + + diff --git a/recipes/gsoap/gsoap-native/use-just-built-binary-2.7.13.patch b/recipes/gsoap/gsoap-native/use-just-built-binary-2.7.13.patch deleted file mode 100644 index 25a8ef0db1..0000000000 --- a/recipes/gsoap/gsoap-native/use-just-built-binary-2.7.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN gsoap-2.7.orig/gsoap/wsdl/Makefile.am gsoap-2.7.orig/gsoap/wsdl/Makefile.am ---- gsoap-2.7.orig/gsoap/wsdl/Makefile.am 2009-03-21 22:24:42.000000000 +0100 -+++ gsoap-2.7.orig/gsoap/wsdl/Makefile.am 2009-04-07 11:30:50.000000000 +0200 -@@ -17,7 +17,7 @@ BUILT_SOURCES=$(SOAP_CPP_SRC) - # WSDL2H_EXTRA_LIBS=-lssl -lcrypto -lz # defined in configure.in - - $(SOAP_CPP_SRC) : $(SOAPHEADER) -- $(SOAP) $(SOAP_FLAGS) $(SOAPHEADER) -+ ../src/soapcpp2 $(SOAP_FLAGS) $(SOAPHEADER) - - #LIBS= - diff --git a/recipes/gsoap/gsoap-native/use-just-built-binary.patch b/recipes/gsoap/gsoap-native/use-just-built-binary.patch deleted file mode 100644 index f7e4811f9e..0000000000 --- a/recipes/gsoap/gsoap-native/use-just-built-binary.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- - soapcpp2/wsdl/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- gsoap-2.7.orig/soapcpp2/wsdl/Makefile.am -+++ gsoap-2.7/soapcpp2/wsdl/Makefile.am -@@ -13,11 +13,11 @@ SOAP_CPP_SRC=wsdlC.cpp - SOAPHEADER=wsdl.h - SOAP_FLAGS=-SC -pwsdl - BUILT_SOURCES=$(SOAP_CPP_SRC) - - $(SOAP_CPP_SRC) : $(SOAPHEADER) -- $(SOAP) $(SOAP_FLAGS) $(SOAPHEADER) -+ ../src/soapcpp2 $(SOAP_FLAGS) $(SOAPHEADER) - - #LIBS= - - bin_PROGRAMS=wsdl2h - diff --git a/recipes/gsoap/gsoap-native_2.7.13.bb b/recipes/gsoap/gsoap-native_2.7.13.bb index 3ed78d0227..f0370beb2b 100644 --- a/recipes/gsoap/gsoap-native_2.7.13.bb +++ b/recipes/gsoap/gsoap-native_2.7.13.bb @@ -2,7 +2,7 @@ require gsoap_${PV}.inc DEPENDS = "" -SRC_URI += "file://use-just-built-binary-2.7.13.patch;patch=1" +EXTRA_OEMAKE = "" inherit native diff --git a/recipes/gsoap/gsoap-native_2.7.7.bb b/recipes/gsoap/gsoap-native_2.7.7.bb index 206208d329..0b8a4b8a5c 100644 --- a/recipes/gsoap/gsoap-native_2.7.7.bb +++ b/recipes/gsoap/gsoap-native_2.7.7.bb @@ -3,7 +3,7 @@ require gsoap_${PV}.bb DEPENDS = "" PR = "r1" -SRC_URI += "file://use-just-built-binary.patch;patch=1" +EXTRA_OEMAKE = "" inherit native diff --git a/recipes/htop/htop_0.7.bb b/recipes/htop/htop_0.7.bb index 4a614bd8e0..f3b3c96167 100644 --- a/recipes/htop/htop_0.7.bb +++ b/recipes/htop/htop_0.7.bb @@ -4,7 +4,7 @@ SECTION = "console/utils" PRIORITY = "optional" LICENSE = "GPLv2" -RDEPENDS = "ncurses" +DEPENDS = "ncurses" SRC_URI = "${SOURCEFORGE_MIRROR}/htop/htop-${PV}.tar.gz \ file://remove-proc-test.patch;patch=1" diff --git a/recipes/iproute2/files/remove-bashisms.patch b/recipes/iproute2/files/remove-bashisms.patch new file mode 100644 index 0000000000..f90149a85c --- /dev/null +++ b/recipes/iproute2/files/remove-bashisms.patch @@ -0,0 +1,59 @@ +From ddf7948f9a088f26e7ed9ba01479029cd4e6f060 Mon Sep 17 00:00:00 2001 +From: Marc Olzheim <marc@iphion.nl> +Date: Wed, 18 Nov 2009 10:43:53 +0100 +Subject: [PATCH] Get rid of bashisms. + +--- + ip/ifcfg | 12 ++++++------ + ip/rtpr | 2 +- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/ip/ifcfg b/ip/ifcfg +index 083d9df..cd78d61 100644 +--- a/ip/ifcfg ++++ b/ip/ifcfg +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /bin/sh + + CheckForwarding () { + local sbase fwd +@@ -6,7 +6,7 @@ CheckForwarding () { + fwd=0 + if [ -d $sbase ]; then + for dir in $sbase/*/forwarding; do +- fwd=$[$fwd + `cat $dir`] ++ fwd=$(($fwd + `cat $dir`)) + done + else + fwd=2 +@@ -127,12 +127,12 @@ fi + arping -q -A -c 1 -I $dev $ipaddr + noarp=$? + ( sleep 2 ; +- arping -q -U -c 1 -I $dev $ipaddr ) >& /dev/null </dev/null & ++ arping -q -U -c 1 -I $dev $ipaddr ) >/dev/null 2>&1 </dev/null & + +-ip route add unreachable 224.0.0.0/24 >& /dev/null +-ip route add unreachable 255.255.255.255 >& /dev/null ++ip route add unreachable 224.0.0.0/24 >/dev/null 2>&1 ++ip route add unreachable 255.255.255.255 >/dev/null 2>&1 + if [ `ip link ls $dev | grep -c MULTICAST` -ge 1 ]; then +- ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null ++ ip route add 224.0.0.0/4 dev $dev scope global >/dev/null 2>&1 + fi + + if [ $fwd -eq 0 ]; then +diff --git a/ip/rtpr b/ip/rtpr +index c3629fd..674198d 100644 +--- a/ip/rtpr ++++ b/ip/rtpr +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /bin/sh + + exec tr "[\\\\]" "[ + ]" +-- +1.6.3.3 + diff --git a/recipes/iproute2/iproute2_2.6.20.bb b/recipes/iproute2/iproute2_2.6.20.bb index dd1a504142..ec659a8130 100644 --- a/recipes/iproute2/iproute2_2.6.20.bb +++ b/recipes/iproute2/iproute2_2.6.20.bb @@ -1,11 +1,12 @@ require iproute2.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DATE = "070313" SRC_URI_append = " file://new-flex-fix.patch;patch=1 \ file://ip6tunnel.patch;patch=1 \ file://man-pages-fix.patch;patch=1 \ + file://remove-bashisms.patch;patch=1 \ file://no-strip.patch;patch=1" S = "${WORKDIR}/iproute-${PV}-${DATE}" diff --git a/recipes/iproute2/iproute2_2.6.22.bb b/recipes/iproute2/iproute2_2.6.22.bb index 55e3a7575d..06fcfe9b0e 100644 --- a/recipes/iproute2/iproute2_2.6.22.bb +++ b/recipes/iproute2/iproute2_2.6.22.bb @@ -1,10 +1,11 @@ require iproute2.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DATE = "070710" SRC_URI_append = " file://new-flex-fix.patch;patch=1 \ file://ip6tunnel.patch;patch=1 \ + file://remove-bashisms.patch;patch=1 \ file://no-strip.patch;patch=1" S = "${WORKDIR}" diff --git a/recipes/iproute2/iproute2_2.6.29.bb b/recipes/iproute2/iproute2_2.6.29.bb index d38dde880f..d72738da7e 100644 --- a/recipes/iproute2/iproute2_2.6.29.bb +++ b/recipes/iproute2/iproute2_2.6.29.bb @@ -1,11 +1,12 @@ require iproute2.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \ file://new-flex-fix.patch;patch=1 \ file://compilation-fix.patch;patch=1 \ file://use-cross-compiler.patch;patch=1 \ + file://remove-bashisms.patch;patch=1 \ " S = "${WORKDIR}/iproute2-${PV}" diff --git a/recipes/konqueror/konqueror-embedded_20030705.bb b/recipes/konqueror/konqueror-embedded_20030705.bb index 979c1ce305..fba9d31ac3 100644 --- a/recipes/konqueror/konqueror-embedded_20030705.bb +++ b/recipes/konqueror/konqueror-embedded_20030705.bb @@ -31,7 +31,6 @@ FILES_${PN} = "${palmtopdir}" export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake" export MOC = "${STAGING_BINDIR_NATIVE}/moc" export UIC = "${STAGING_BINDIR_NATIVE}/uic" -export exec_prefix = "${STAGING_LIBDIR}/.." EXTRA_OECONF = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir} \ --enable-static --disable-shared --disable-debug \ diff --git a/recipes/konqueror/konqueror-embedded_20060404.bb b/recipes/konqueror/konqueror-embedded_20060404.bb index a84f47d471..9f6ed35aeb 100644 --- a/recipes/konqueror/konqueror-embedded_20060404.bb +++ b/recipes/konqueror/konqueror-embedded_20060404.bb @@ -21,7 +21,7 @@ S = "${WORKDIR}/kdenox" export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake" export MOC = "${STAGING_BINDIR_NATIVE}/moc" export UIC = "${STAGING_BINDIR_NATIVE}/uic" -export exec_prefix = "${palmtopdir}" +#export exec_prefix = "${palmtopdir}" export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS" export PCRE_CONFIG = "invalid" # uncomment this for a static build diff --git a/recipes/libcap/libcap_1.10.bb b/recipes/libcap/libcap_1.10.bb index 172acaca6e..241529e865 100644 --- a/recipes/libcap/libcap_1.10.bb +++ b/recipes/libcap/libcap_1.10.bb @@ -3,9 +3,9 @@ PRIORITY = "optional" SECTION = "libs" LICENSE = "GPL" DEPENDS = "bison-native flex-native" -PR = "r1" +PR = "r2" -CFLAGS_append = " -I${S}/libcap/include" +CFLAGS_append = " -I${S}/libcap/include -fPIC" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/kernel-2.4/${PN}-${PV}.tar.bz2 \ file://makenames.patch;patch=1 \ diff --git a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig index c7a32421bb..e63bbd73dc 100644 --- a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig +++ b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig @@ -1332,7 +1332,7 @@ CONFIG_USB_ETH_RNDIS=y # CONFIG_NOP_USB_XCEIV is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_UNSAFE_RESUME=y # # MMC/SD/SDIO Card Drivers diff --git a/recipes/mokomaze/mokomaze_0.5.5.bb b/recipes/mokomaze/mokomaze_0.5.5.bb index 6fbe415d2e..f15ca0ff53 100644 --- a/recipes/mokomaze/mokomaze_0.5.5.bb +++ b/recipes/mokomaze/mokomaze_0.5.5.bb @@ -8,7 +8,7 @@ RDEPENDS="ttf-liberation-mono libpng" RDEPENDS_shr += "fsoraw" -PR="r1" +PR="r2" PV="0.5.5+git8" diff --git a/recipes/mozilla/firefox_3.5.2.bb b/recipes/mozilla/firefox_3.5.2.bb index f126f13763..3d940d7af5 100644 --- a/recipes/mozilla/firefox_3.5.2.bb +++ b/recipes/mozilla/firefox_3.5.2.bb @@ -1,5 +1,5 @@ -DEPENDS += "cairo" -PR = "r2" +DEPENDS += "cairo sqlite3" +PR = "r3" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ file://jsautocfg.h \ diff --git a/recipes/mozilla/firefox_3.5.4.bb b/recipes/mozilla/firefox_3.5.4.bb index 37be0fb858..8ba6ba15db 100644 --- a/recipes/mozilla/firefox_3.5.4.bb +++ b/recipes/mozilla/firefox_3.5.4.bb @@ -1,6 +1,6 @@ -DEPENDS += "cairo" +DEPENDS += "cairo sqlite3" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \ file://jsautocfg.h \ diff --git a/recipes/mozilla/firefox_3.5.5.bb b/recipes/mozilla/firefox_3.5.5.bb index a440382d14..da54872046 100644 --- a/recipes/mozilla/firefox_3.5.5.bb +++ b/recipes/mozilla/firefox_3.5.5.bb @@ -1,6 +1,6 @@ -DEPENDS += "cairo" +DEPENDS += "cairo sqlite3" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \ file://jsautocfg.h \ diff --git a/recipes/mozilla/firefox_3.5b4.bb b/recipes/mozilla/firefox_3.5b4.bb index 149ee3cbdf..4a12329231 100644 --- a/recipes/mozilla/firefox_3.5b4.bb +++ b/recipes/mozilla/firefox_3.5b4.bb @@ -1,8 +1,8 @@ -DEPENDS += "cairo" +DEPENDS += "cairo sqlite" PV = "3.0.1+3.5b4" MOZPV = "3.5b4" -PR = "r1" +PR = "r2" SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build1/source/firefox-${MOZPV}-source.tar.bz2 \ file://jsautocfg.h \ diff --git a/recipes/libpixman/libpixman-native_0.12.0.bb b/recipes/obsolete/libpixman/libpixman-native_0.12.0.bb index 808cc86d1a..808cc86d1a 100644 --- a/recipes/libpixman/libpixman-native_0.12.0.bb +++ b/recipes/obsolete/libpixman/libpixman-native_0.12.0.bb diff --git a/recipes/libpixman/libpixman_0.1.5.bb b/recipes/obsolete/libpixman/libpixman_0.1.5.bb index bf23947fc1..bf23947fc1 100644 --- a/recipes/libpixman/libpixman_0.1.5.bb +++ b/recipes/obsolete/libpixman/libpixman_0.1.5.bb diff --git a/recipes/libpixman/libpixman_0.1.6.bb b/recipes/obsolete/libpixman/libpixman_0.1.6.bb index bf23947fc1..bf23947fc1 100644 --- a/recipes/libpixman/libpixman_0.1.6.bb +++ b/recipes/obsolete/libpixman/libpixman_0.1.6.bb diff --git a/recipes/libpixman/libpixman_0.10.0.bb b/recipes/obsolete/libpixman/libpixman_0.10.0.bb index fba7dc9152..fba7dc9152 100644 --- a/recipes/libpixman/libpixman_0.10.0.bb +++ b/recipes/obsolete/libpixman/libpixman_0.10.0.bb diff --git a/recipes/libpixman/libpixman_0.9.6.bb b/recipes/obsolete/libpixman/libpixman_0.9.6.bb index fba7dc9152..fba7dc9152 100644 --- a/recipes/libpixman/libpixman_0.9.6.bb +++ b/recipes/obsolete/libpixman/libpixman_0.9.6.bb diff --git a/recipes/libpixman/libpixman_cvs.bb b/recipes/obsolete/libpixman/libpixman_cvs.bb index a75a284bca..a75a284bca 100644 --- a/recipes/libpixman/libpixman_cvs.bb +++ b/recipes/obsolete/libpixman/libpixman_cvs.bb diff --git a/recipes/openmoko-3rdparty/rtmom_0.1.3.bb b/recipes/openmoko-3rdparty/rtmom_0.1.3.bb new file mode 100644 index 0000000000..10ab501916 --- /dev/null +++ b/recipes/openmoko-3rdparty/rtmom_0.1.3.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Elementary based client for Remember the Milk written in Python. " +AUTHOR = "Michael Pilgermann" +PRIORITY = "optional" +LICENSE = "GPL" +HOMEPAGE = "http://freshmeat.net/projects/rtmom" +SRCNAME = "rtmom" +DEPENDS = "python python-elementary" +RDEPENDS = "python-core pyrtm" +RSUGGESTS_${PN} = "python-simplejson" + +PACKAGE_ARCH = "all" + +PR = "r0" + +SRC_URI = "http://cloud.github.com/downloads/kichkasch/rtmom/rtmom-src-${PV}.tar.gz" + +FILES_${PN} += "/opt/rtmom \ + ${datadir}/pixmaps \ + ${datadir}/applications \ + ${datadir}/doc/rtmom" +CONFFILES_${PN} += "/usr/share/doc/${PN}/rtmom.conf.example" + +do_compile() { + ${STAGING_BINDIR_NATIVE}/python ${S}/setup.py build ${D} +} + +do_install() { + ${STAGING_BINDIR_NATIVE}/python ${S}/setup.py install ${D} + rm -rf ${D}/opt/rtmom/build/ + rm -rf ${D}/opt/rtmom/patches/ +} diff --git a/recipes/parted/parted_1.8.8.bb b/recipes/parted/parted_1.8.8.bb index e93dbc8dfc..4ab4aa62f9 100644 --- a/recipes/parted/parted_1.8.8.bb +++ b/recipes/parted/parted_1.8.8.bb @@ -2,9 +2,8 @@ DESCRIPTION = "parted, the GNU partition resizing program" HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" LICENSE = "GPLv3" SECTION = "console/tools" -DEPENDS = "readline e2fsprogs-libs" - -PR = "r2" +DEPENDS = "readline util-linux-ng" +PR = "r3" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ file://use_llseek_syscall.patch;patch=1 \ diff --git a/recipes/perl/libxml-namespacesupport-perl_1.10.bb b/recipes/perl/libxml-namespacesupport-perl_1.10.bb new file mode 100644 index 0000000000..3b49cef480 --- /dev/null +++ b/recipes/perl/libxml-namespacesupport-perl_1.10.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "XML-NamespaceSupport" +SECTION = "libs" +LICENSE = "" +PR = "r0" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-${PV}.tar.gz;name=namespacesupport" + +SRC_URI[namespacesupport.md5sum] = "0a760067d4b517672f064e911679c509" +SRC_URI[namespacesupport.sha256sum] = "a57357ac22959a5093a19177a0d541a478595d538afef659c19ae1e75849833e" + +S = "${WORKDIR}/XML-NamespaceSupport-${PV}" + +inherit cpan + +BBCLASSEXTEND="native" + diff --git a/recipes/perl/libxml-sax-perl_0.96.bb b/recipes/perl/libxml-sax-perl_0.96.bb new file mode 100644 index 0000000000..260a98f809 --- /dev/null +++ b/recipes/perl/libxml-sax-perl_0.96.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "XML-SAX" +SECTION = "libs" +LICENSE = "" +DEPENDS += "libxml-namespacesupport-perl-native" +PR = "r0" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-${PV}.tar.gz;name=sax" +SRC_URI[sax.md5sum] = "bdcd4119a62505184e211e9dfaef0ab1" +SRC_URI[sax.sha256sum] = "9bbef613afa42c46df008d537decc5a61df7e92d65463f3c900769f39e5c8e08" + +S = "${WORKDIR}/XML-SAX-${PV}" + +inherit cpan + +BBCLASSEXTEND = "native" diff --git a/recipes/pidgin/pidgin/pidgin-cross-python-265.patch b/recipes/pidgin/pidgin/pidgin-cross-python-265.patch new file mode 100644 index 0000000000..57c4c46814 --- /dev/null +++ b/recipes/pidgin/pidgin/pidgin-cross-python-265.patch @@ -0,0 +1,16 @@ +Index: pidgin-2.6.5/configure.ac +=================================================================== +--- pidgin-2.6.5.orig/configure.ac ++++ pidgin-2.6.5/configure.ac +@@ -1470,8 +1470,9 @@ if test "_$pythonpath" != _ ; then + AC_CHECK_LIB(pthread, pthread_create, ) + AC_CHECK_LIB(util, openpty, ) + AC_CHECK_LIB(db, dbopen, ) +- PY_LIBS="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config -lpython$PY_VERSION" +- PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION" ++ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$]) ++ PY_LIBS="-L$PKG_CONFIG_SYSROOT_DIR/usr/lib/python$PY_VERSION/config -lpython$PY_VERSION" ++ PY_CFLAGS="-I$PKG_CONFIG_SYSROOT_DIR/usr/include/python$PY_VERSION" + AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.]) + AC_MSG_RESULT(ok) + else diff --git a/recipes/pidgin/pidgin_2.6.2.bb b/recipes/pidgin/pidgin_2.6.2.bb deleted file mode 100644 index d3b27a771b..0000000000 --- a/recipes/pidgin/pidgin_2.6.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -require pidgin.inc -PR = "${INC_PR}.1" - -DEPENDS += "farsight2 libidn" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch;patch=1 \ - file://pidgin.desktop-set-icon.patch;patch=1 \ - file://purple-OE-branding-25.patch;patch=1 \ - file://pidgin-cross-python.patch;patch=1 \ - file://status-icon-theme-crash.patch;patch=1 \ -" - -EXTRA_OECONF += "\ - --disable-gtkspell \ - --disable-meanwhile \ - --disable-nm \ - --disable-screensaver \ -" diff --git a/recipes/pidgin/pidgin_2.6.4.bb b/recipes/pidgin/pidgin_2.6.5.bb index 7ced40d9c3..67b573fa3e 100644 --- a/recipes/pidgin/pidgin_2.6.4.bb +++ b/recipes/pidgin/pidgin_2.6.5.bb @@ -8,7 +8,7 @@ SRC_URI = "\ file://sanitize-configure.ac.patch;patch=1 \ file://pidgin.desktop-set-icon.patch;patch=1 \ file://purple-OE-branding-25.patch;patch=1 \ - file://pidgin-cross-python.patch;patch=1 \ + file://pidgin-cross-python-265.patch;patch=1 \ " EXTRA_OECONF += "\ diff --git a/recipes/preboot/files/etc/init.d/usbnet b/recipes/preboot/files/etc/init.d/usbnet new file mode 100644 index 0000000000..e6c7f4e412 --- /dev/null +++ b/recipes/preboot/files/etc/init.d/usbnet @@ -0,0 +1,9 @@ +#!/bin/sh + +# usb gadget configuration: +# there already different configurations on the palm pre defined, we choose nr 5 +# cause it provides the usbnet, novacom and storage gadget +if [ -e /sys/class/usb_gadget/config_num ]; then + echo 5 > /sys/class/usb_gadget/config_num +fi + diff --git a/recipes/preboot/files/etc/miniboot.sh b/recipes/preboot/files/etc/miniboot.sh new file mode 100644 index 0000000000..1997ff8646 --- /dev/null +++ b/recipes/preboot/files/etc/miniboot.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +# Mount proc +mount -t proc proc /proc -o rw,noexec,nosuid,nodev +# Mount sys +mount -t sysfs sys /sys -o rw,noexec,nosuid,nodev + +# Mount root rw +mount / -o remount,rw + +# Prep modules +depmod -A + +# Populate /dev +/etc/init.d/udev start + +# Mount everything +# mount -a + +# Setup a proper /tmp using tmpfs +cat /proc/mounts | grep -q "\s/tmp\s" +[ "x$?" != "x0" ] && mount -t tmpfs tmpfs /tmp + +cat /proc/mounts | grep -q "\s/dev/pts\s" +[ "x$?" != "x0" ] && mount -t devpts devpts /dev/pts + +# Set the hostname +hostname -F /etc/hostname + +# USB gadget configuration +if [ -e /sys/class/usb_gadget/config_num ]; then + echo 5 > /sys/class/usb_gadget/config_num +fi + +# USB network configuration +ifup -f usb0 +ifconfig usb0 192.168.0.202 + +# Dropbear ssh service +/etc/init.d/dropbear start + +# Spin relaunching login +while true; do getty 115200 console; done diff --git a/recipes/preboot/initramfs-preboot-image.bb b/recipes/preboot/initramfs-preboot-image.bb new file mode 100644 index 0000000000..0675916680 --- /dev/null +++ b/recipes/preboot/initramfs-preboot-image.bb @@ -0,0 +1,69 @@ +#initramfs image which mounts the rootfilesystem and kexecs a kernel from there +PR = "r1" + +ONLINE_PACKAGE_MANAGEMENT = "none" +IMAGE_FSTYPES = "cpio.gz" + +export IMAGE_BASENAME = "initramfs-preboot-image" + +IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" + +# avoid circular dependencies +EXTRA_IMAGEDEPENDS = "" + +IMAGE_INSTALL = " \ + task-boot \ + util-linux-ng-mount util-linux-ng-umount \ + dropbear \ + fontconfig \ + ttf-freefonts \ + eina \ + evas \ + edje \ + efreet \ + eet \ + edbus \ + elementary \ + elementary-themes \ + elementary-tests \ + fbset \ + fbset-init \ + msmcommd \ +# lvm2 \ +# preboot \ + " + +IMAGE_LINGUAS = "" + +inherit image + +preboot_palmpre_rootfs_postprocess() { + # copy all our files to the rootfs + dirs=`find ${FILESDIR} -type d -printf "%P\n" | grep -v "^.$" | grep -v ".git"` + for dir in $dirs; do + mkdir -p ${IMAGE_ROOTFS}/$dir + done + files=`find ${FILESDIR} -type f -printf "%P\n" | grep -v ".git"` + for file in $files; do + cp -f ${FILESDIR}/$file ${IMAGE_ROOTFS}/$file + done + + curdir=$PWD + cd ${IMAGE_ROOTFS} + + # install our usbnet initscript + chmod +x etc/init.d/usbnet +# ln -sf ../init.d/usbnet ${IMAGE_ROOTFS}/etc/rcS.d/S15usbnet + + # miniboot sequence (just for debugging) + rm ${IMAGE_ROOTFS}/sbin/init + chmod +x ${IMAGE_ROOTFS}/etc/miniboot.sh + ln -sf /etc/miniboot.sh ${IMAGE_ROOTFS}/init + ln -sf ../etc/miniboot.sh ${IMAGE_ROOTFS}/sbin/init + + cd $curdir +} + +ROOTFS_POSTPROCESS_COMMAND_palmpre += " preboot_palmpre_rootfs_postprocess" + + diff --git a/recipes/preboot/linux-preboot-palmpre_2.6.24.bb b/recipes/preboot/linux-preboot-palmpre_2.6.24.bb new file mode 100644 index 0000000000..e2d278cb68 --- /dev/null +++ b/recipes/preboot/linux-preboot-palmpre_2.6.24.bb @@ -0,0 +1,24 @@ +require linux-preboot.inc + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_palmpre = "-1" + +# Hacks should clearly named and at the bottom +SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ + " + +SRC_URI_append_palmpre = "\ +http://palm.cdnetworks.net/opensource/1.3.1/linuxkernel-2.6.24-patch.gz;patch=1 \ +" +S = "${WORKDIR}/linux-2.6.24" + +# We try to build the identical kernel as Palms here, use their defconfig. +do_configure_prepend() { + install -m 0644 ${S}/arch/arm/configs/omap_sirloin_3430_defconfig ${WORKDIR}/defconfig +} + +# linux.inc overrides LOCAVERSION but we like to stay with the one used originally +do_compile_prepend() { + sed -i -e '/CONFIG_LOCALVERSION=/d' ${S}/.config + echo 'CONFIG_LOCALVERSION="-joplin-3430"' >>${S}/.config +} diff --git a/recipes/preboot/linux-preboot.inc b/recipes/preboot/linux-preboot.inc new file mode 100644 index 0000000000..56a90a9723 --- /dev/null +++ b/recipes/preboot/linux-preboot.inc @@ -0,0 +1,52 @@ +# We set PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels: +PR = "r15" + +LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga", d)}' + +require ../linux/linux.inc + +DONT_CHECK_KERNELSIZE = "" +INITRAMFS_IMAGE = "initramfs-preboot-image" + +# here we set master console on serial +CMDLINE = "console=tty1 console=ttyS0,115200n8" + +PACKAGES = "" +PROVIDES = "" + +KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-preboot-${PV}-${PR}-${MACHINE}" +KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-preboot-${MACHINE}" + +do_configure[depends] += "${INITRAMFS_IMAGE}:do_rootfs" + +do_configure_append() { +sed -i -e /CONFIG_BLK_DEV_INITRD/d \ + -e /CONFIG_KEXEC/d \ + -e /CONFIG_INITRAMFS_SOURCE/d \ + -e /=m/d \ + -e /CONFIG_MODULES/d \ + -e /CONFIG_DEBUG_ERRORS/d \ + -e /CONFIG_DEBUG_BUGVERBOSE/d \ + -e /CONFIG_DEBUG_KERNEL/d \ + ${S}/.config + +# Remove last tag appended by linux.inc (output messes screen) +sed -i -e /CONFIG_CMDLINE/s/quiet/loglevel=3/1 ${S}/.config +sed -i -e /CONFIG_CMDLINE/s/debug/loglevel=3/1 ${S}/.config + +echo 'CONFIG_BLK_DEV_INITRD=y +CONFIG_KEXEC=y +CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz" +CONFIG_MODULES=n' >> ${S}/.config + + yes '' | oe_runmake oldconfig +} + +do_stage() { +} + +do_install() { +} + +python do_package() { +} diff --git a/recipes/rpm/rpm-native_4.4.2.3.bb b/recipes/rpm/rpm-native_4.4.2.3.bb index 62cef86a72..ec98cb8817 100644 --- a/recipes/rpm/rpm-native_4.4.2.3.bb +++ b/recipes/rpm/rpm-native_4.4.2.3.bb @@ -4,6 +4,3 @@ require rpm-${PV}.inc DEPENDS = "beecrypt-native gettext-native zlib-native file-native popt-native python-native" PACKAGES = "" - -export localstatedir = "${layout_localstatedir}" -export varprefix = "${layout_localstatedir}" diff --git a/recipes/stopwatch/stopwatch_git.bb b/recipes/stopwatch/stopwatch_git.bb new file mode 100644 index 0000000000..f0d40da54b --- /dev/null +++ b/recipes/stopwatch/stopwatch_git.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Simple Qt based stop watch" +AUTHOR = "Christof Musik" +SECTION = "x11/applications" +PRIORITY = "optional" +HOMEPAGE = "http://git.senfdax.de" +LICENSE = "GPL QPL" +DEPENDS = "qt4-x11-free" +PV = "1.3.1+gitr${SRCREV}" +PR = "r0" + +inherit qt4x11 + +SRC_URI = "git://git.senfdax.de/git/stopwatch;protocol=http;tag=master;branch=master" +S = "${WORKDIR}/git/" + +do_configure() { + ${OE_QMAKE_QMAKE} +} + +do_compile() { + oe_runmake +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}stopwatch ${D}${bindir} + install -d ${D}${datadir}/applications + install ${S}desktop/stopwatch.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps + install ${S}desktop/stopwatch.png ${D}${datadir}/pixmaps/ + install -d ${D}${datadir}/${PN} + install ${S}desktop/om.style ${D}${datadir}/${PN}/ +} diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index aedeb3bb1b..7b5d1a2067 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -266,4 +266,6 @@ RDEPENDS_${PN} += "\ qi-ubi \ wpa-gui \ gabriel \ + stopwatch \ + rtmom \ " diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb index c30539c607..8538391df3 100644 --- a/recipes/tasks/task-shr-minimal.bb +++ b/recipes/tasks/task-shr-minimal.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Lite Image Feed" -PR = "r19" +PR = "r20" PV = "2.0" LICENSE = "GPL" @@ -122,6 +122,7 @@ RDEPENDS_${PN}-x = "\ libx11-locale \ libmokoui2 \ xcursor-transparent-theme \ + xinput-calibrator \ " RDEPENDS_${PN}-apps = "\ diff --git a/recipes/uclibc/uclibc-nptl/mips-nptl-fix-dynamic-global-tls.patch b/recipes/uclibc/uclibc-nptl/mips-nptl-fix-dynamic-global-tls.patch new file mode 100644 index 0000000000..67d49060fb --- /dev/null +++ b/recipes/uclibc/uclibc-nptl/mips-nptl-fix-dynamic-global-tls.patch @@ -0,0 +1,249 @@ +Index: git/ldso/ldso/mips/dl-sysdep.h +=================================================================== +--- git.orig/ldso/ldso/mips/dl-sysdep.h 2010-01-21 13:33:18.000000000 -0800 ++++ git/ldso/ldso/mips/dl-sysdep.h 2010-01-21 13:39:02.389689911 -0800 +@@ -8,6 +8,7 @@ + /* Define this if the system uses RELOCA. */ + #undef ELF_USES_RELOCA + #include <elf.h> ++#include <tls.h> + + #ifdef __mips64 /* from glibc sysdeps/mips/elf/ldsodefs.h 1.4 */ + /* The 64-bit MIPS ELF ABI uses an unusual reloc format. Each +@@ -163,9 +164,25 @@ void _dl_perform_mips_global_got_relocat + #define OFFS_ALIGN (0x10000000000UL-0x1000) + #endif /* O32 || N32 */ + +-#define elf_machine_type_class(type) \ +- ((((type) == R_MIPS_JUMP_SLOT) * ELF_RTYPE_CLASS_PLT) \ ++#if defined USE_TLS ++# if _MIPS_SIM == _MIPS_SIM_ABI64 ++# define elf_machine_type_class(type) \ ++ ((((type) == R_MIPS_JUMP_SLOT || (type) == R_MIPS_TLS_DTPMOD64 \ ++ || (type) == R_MIPS_TLS_DTPREL64 || (type) == R_MIPS_TLS_TPREL64) \ ++ * ELF_RTYPE_CLASS_PLT) \ + | (((type) == R_MIPS_COPY) * ELF_RTYPE_CLASS_COPY)) ++# else ++# define elf_machine_type_class(type) \ ++ ((((type) == R_MIPS_JUMP_SLOT || (type) == R_MIPS_TLS_DTPMOD32 \ ++ || (type) == R_MIPS_TLS_DTPREL32 || (type) == R_MIPS_TLS_TPREL32) \ ++ * ELF_RTYPE_CLASS_PLT) \ ++ | (((type) == R_MIPS_COPY) * ELF_RTYPE_CLASS_COPY)) ++# endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ ++#else ++#define elf_machine_type_class(type) \ ++ ((((type) == R_MIPS_JUMP_SLOT) * ELF_RTYPE_CLASS_PLT) \ ++ | (((type) == R_MIPS_COPY) * ELF_RTYPE_CLASS_COPY)) ++#endif /* USE_TLS */ + + #define OFFSET_GP_GOT 0x7ff0 + +Index: git/ldso/ldso/mips/elfinterp.c +=================================================================== +--- git.orig/ldso/ldso/mips/elfinterp.c 2010-01-21 13:33:18.000000000 -0800 ++++ git/ldso/ldso/mips/elfinterp.c 2010-01-21 13:39:02.389689911 -0800 +@@ -156,6 +156,7 @@ int _dl_parse_relocation_information(str + unsigned long symbol_addr; + int reloc_type, symtab_index; + struct elf_resolve *tpnt = xpnt->dyn; ++ char *symname = NULL; + #if defined (__SUPPORT_LD_DEBUG__) + unsigned long old_val=0; + #endif +@@ -169,7 +170,6 @@ int _dl_parse_relocation_information(str + got = (unsigned long *) tpnt->dynamic_info[DT_PLTGOT]; + + for (i = 0; i < rel_size; i++, rpnt++) { +- char *symname = NULL; + reloc_addr = (unsigned long *) (tpnt->loadaddr + + (unsigned long) rpnt->r_offset); + reloc_type = ELF32_R_TYPE(rpnt->r_info); +@@ -178,13 +178,13 @@ int _dl_parse_relocation_information(str + + debug_sym(symtab,strtab,symtab_index); + debug_reloc(symtab,strtab,rpnt); ++ symname = strtab + symtab[symtab_index].st_name; + #if defined (__SUPPORT_LD_DEBUG__) + if (reloc_addr) + old_val = *reloc_addr; + #endif + + if (reloc_type == R_MIPS_JUMP_SLOT || reloc_type == R_MIPS_COPY) { +- symname = strtab + symtab[symtab_index].st_name; + symbol_addr = (unsigned long)_dl_find_hash(symname, + tpnt->symbol_scope, + tpnt, +@@ -192,6 +192,13 @@ int _dl_parse_relocation_information(str + if (unlikely(!symbol_addr && ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK)) + return 1; + } ++ if (!symtab_index) { ++ /* Relocs against STN_UNDEF are usually treated as using a ++ * symbol value of zero, and using the module containing the ++ * reloc itself. ++ */ ++ symbol_addr = symtab[symtab_index].st_value; ++ } + + switch (reloc_type) { + #if USE_TLS +@@ -205,21 +212,17 @@ int _dl_parse_relocation_information(str + case R_MIPS_TLS_TPREL32: + # endif + { +- ElfW(Sym) *sym_tls = &symtab[symtab_index]; + struct elf_resolve *tpnt_tls = NULL; + + if (ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_LOCAL) { +- _dl_find_hash((strtab + symtab[symtab_index].st_name), +- _dl_symbol_tables, tpnt, +- elf_machine_type_class(reloc_type), &tpnt_tls); ++ symbol_addr = (unsigned long) _dl_find_hash(symname, tpnt->symbol_scope, ++ tpnt, elf_machine_type_class(reloc_type), &tpnt_tls); + } +-#if USE_TLS + /* In case of a TLS reloc, tpnt_tls NULL means we have an 'anonymous' + symbol. This is the case for a static tls variable, so the lookup + module is just that one is referencing the tls variable. */ + if (!tpnt_tls) + tpnt_tls = tpnt; +-#endif + + switch (reloc_type) { + case R_MIPS_TLS_DTPMOD64: +@@ -228,17 +231,17 @@ int _dl_parse_relocation_information(str + *(ElfW(Word) *)reloc_addr = tpnt_tls->l_tls_modid; + #ifdef __SUPPORT_LD_DEBUG__ + _dl_dprintf(2, "TLS_DTPMOD : %s, %d, %d\n", +- (strtab + symtab[symtab_index].st_name), old_val, *((unsigned int *)reloc_addr)); ++ symname, old_val, *((unsigned int *)reloc_addr)); + #endif + break; + + case R_MIPS_TLS_DTPREL64: + case R_MIPS_TLS_DTPREL32: + *(ElfW(Word) *)reloc_addr += +- TLS_DTPREL_VALUE (sym_tls); ++ TLS_DTPREL_VALUE (symbol_addr); + #ifdef __SUPPORT_LD_DEBUG__ + _dl_dprintf(2, "TLS_DTPREL : %s, %x, %x\n", +- (strtab + symtab[symtab_index].st_name), old_val, *((unsigned int *)reloc_addr)); ++ symname, old_val, *((unsigned int *)reloc_addr)); + #endif + break; + +@@ -246,10 +249,10 @@ int _dl_parse_relocation_information(str + case R_MIPS_TLS_TPREL64: + CHECK_STATIC_TLS((struct link_map *)tpnt_tls); + *(ElfW(Word) *)reloc_addr += +- TLS_TPREL_VALUE (tpnt_tls, sym_tls); ++ TLS_TPREL_VALUE (tpnt_tls, symbol_addr); + #ifdef __SUPPORT_LD_DEBUG__ + _dl_dprintf(2, "TLS_TPREL : %s, %x, %x\n", +- (strtab + symtab[symtab_index].st_name), old_val, *((unsigned int *)reloc_addr)); ++ symname, old_val, *((unsigned int *)reloc_addr)); + #endif + break; + } +@@ -301,7 +304,7 @@ int _dl_parse_relocation_information(str + _dl_dprintf(2, "\n%s: ",_dl_progname); + + if (symtab_index) +- _dl_dprintf(2, "symbol '%s': ", strtab + symtab[symtab_index].st_name); ++ _dl_dprintf(2, "symbol '%s': ", symname); + + #if defined (__SUPPORT_LD_DEBUG__) + _dl_dprintf(2, "can't handle reloc type '%s' in lib '%s'\n", _dl_reltypes(reloc_type), tpnt->libname); +Index: git/ldso/libdl/libdl.c +=================================================================== +--- git.orig/ldso/libdl/libdl.c 2010-01-21 13:33:18.000000000 -0800 ++++ git/ldso/libdl/libdl.c 2010-01-21 13:39:02.393687926 -0800 +@@ -37,6 +37,7 @@ + + #ifdef __UCLIBC_HAS_TLS__ + #include <tls.h> ++#include <dl-tls.h> + #endif + + #if defined(USE_TLS) && USE_TLS +Index: git/libc/inet/resolv.c +=================================================================== +--- git.orig/libc/inet/resolv.c 2010-01-21 13:33:18.000000000 -0800 ++++ git/libc/inet/resolv.c 2010-01-21 13:39:02.393687926 -0800 +@@ -3016,7 +3016,7 @@ __thread struct __res_state *__resp = &_ + * relocations. + */ + extern __thread struct __res_state *__libc_resp +- __attribute__ ((alias ("__resp"))); ++ __attribute__ ((alias ("__resp"))) attribute_hidden; + # else + # undef __resp + struct __res_state *__resp = &_res; +Index: git/libc/misc/internals/errno.c +=================================================================== +--- git.orig/libc/misc/internals/errno.c 2010-01-21 13:33:18.000000000 -0800 ++++ git/libc/misc/internals/errno.c 2010-01-21 13:39:02.393687926 -0800 +@@ -4,15 +4,14 @@ + __thread int errno; + __thread int h_errno; + +-extern __thread int __libc_errno __attribute__ ((alias ("errno"))); +-extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno"))); ++extern __thread int __libc_errno __attribute__ ((alias ("errno"))) attribute_hidden; ++extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno"))) attribute_hidden; + #define h_errno __libc_h_errno + + #else + #include "internal_errno.h" + int errno = 0; + int h_errno = 0; +- + #ifdef __UCLIBC_HAS_THREADS__ + libc_hidden_def(errno) + weak_alias(errno, _errno) +Index: git/libpthread/nptl/sysdeps/mips/dl-tls.h +=================================================================== +--- git.orig/libpthread/nptl/sysdeps/mips/dl-tls.h 2010-01-21 13:33:18.000000000 -0800 ++++ git/libpthread/nptl/sysdeps/mips/dl-tls.h 2010-01-21 13:39:02.393687926 -0800 +@@ -17,6 +17,8 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++#ifndef _DL_TLS_H ++#define _DL_TLS_H 1 + + /* Type used for the representation of TLS information in the GOT. */ + typedef struct +@@ -33,14 +35,16 @@ typedef struct + #define TLS_DTV_OFFSET 0x8000 + + /* Compute the value for a GOTTPREL reloc. */ +-#define TLS_TPREL_VALUE(sym_map, sym) \ +- ((sym_map)->l_tls_offset + (sym)->st_value - TLS_TP_OFFSET) ++#define TLS_TPREL_VALUE(sym_map, sym_val) \ ++ ((sym_map)->l_tls_offset + sym_val - TLS_TP_OFFSET) + + /* Compute the value for a DTPREL reloc. */ +-#define TLS_DTPREL_VALUE(sym) \ +- ((sym)->st_value - TLS_DTV_OFFSET) ++#define TLS_DTPREL_VALUE(sym_val) \ ++ (sym_val - TLS_DTV_OFFSET) + + extern void *__tls_get_addr (tls_index *ti); + + # define GET_ADDR_OFFSET (ti->ti_offset + TLS_DTV_OFFSET) + # define __TLS_GET_ADDR(__ti) (__tls_get_addr (__ti) - TLS_DTV_OFFSET) ++ ++#endif /* _DL_TLS_H */ +Index: git/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch +=================================================================== +--- git.orig/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch 2010-01-21 13:33:18.000000000 -0800 ++++ git/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch 2010-01-21 13:39:02.393687926 -0800 +@@ -15,6 +15,7 @@ ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) + CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ + endif + CFLAGS-pthread_once.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 ++CFLAGS-pt-__syscall_rt_sigaction.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 + + ASFLAGS-pt-vfork.S = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 + diff --git a/recipes/uclibc/uclibc-nptl/uclibc_fix_mips_tls_relocation_and_crt.patch b/recipes/uclibc/uclibc-nptl/uclibc_fix_mips_tls_relocation_and_crt.patch deleted file mode 100644 index b964da7512..0000000000 --- a/recipes/uclibc/uclibc-nptl/uclibc_fix_mips_tls_relocation_and_crt.patch +++ /dev/null @@ -1,127 +0,0 @@ -Index: git/ldso/ldso/mips/elfinterp.c -=================================================================== ---- git.orig/ldso/ldso/mips/elfinterp.c 2010-01-12 12:11:37.268037011 -0800 -+++ git/ldso/ldso/mips/elfinterp.c 2010-01-12 12:11:56.132037599 -0800 -@@ -148,7 +148,7 @@ int _dl_parse_relocation_information(str - unsigned long rel_addr, unsigned long rel_size) - { - ElfW(Sym) *symtab; -- ElfW(Rel) *rpnt; -+ ELF_RELOC *rpnt; - char *strtab; - unsigned long i; - unsigned long *got; -@@ -162,7 +162,7 @@ int _dl_parse_relocation_information(str - - /* Now parse the relocation information */ - rel_size = rel_size / sizeof(ElfW(Rel)); -- rpnt = (ElfW(Rel) *) rel_addr; -+ rpnt = (ELF_RELOC *) rel_addr; - - symtab = (ElfW(Sym) *) tpnt->dynamic_info[DT_SYMTAB]; - strtab = (char *) tpnt->dynamic_info[DT_STRTAB]; -@@ -172,8 +172,8 @@ int _dl_parse_relocation_information(str - char *symname = NULL; - reloc_addr = (unsigned long *) (tpnt->loadaddr + - (unsigned long) rpnt->r_offset); -- reloc_type = ELF_R_TYPE(rpnt->r_info); -- symtab_index = ELF_R_SYM(rpnt->r_info); -+ reloc_type = ELF32_R_TYPE(rpnt->r_info); -+ symtab_index = ELF32_R_SYM(rpnt->r_info); - symbol_addr = 0; - - debug_sym(symtab,strtab,symtab_index); -@@ -206,12 +206,20 @@ int _dl_parse_relocation_information(str - # endif - { - ElfW(Sym) *sym_tls = &symtab[symtab_index]; -- struct elf_resolve *tpnt_tls = tpnt; -+ struct elf_resolve *tpnt_tls = NULL; - - if (ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_LOCAL) { - _dl_find_hash((strtab + symtab[symtab_index].st_name), -- _dl_symbol_tables, tpnt_tls, 1, &sym_tls); -+ _dl_symbol_tables, tpnt, -+ elf_machine_type_class(reloc_type), &tpnt_tls); - } -+#if USE_TLS -+ /* In case of a TLS reloc, tpnt_tls NULL means we have an 'anonymous' -+ symbol. This is the case for a static tls variable, so the lookup -+ module is just that one is referencing the tls variable. */ -+ if (!tpnt_tls) -+ tpnt_tls = tpnt; -+#endif - - switch (reloc_type) { - case R_MIPS_TLS_DTPMOD64: -Index: git/libc/sysdeps/linux/mips/crt1.S -=================================================================== ---- git.orig/libc/sysdeps/linux/mips/crt1.S 2010-01-12 12:11:37.328038307 -0800 -+++ git/libc/sysdeps/linux/mips/crt1.S 2010-01-12 12:11:45.720038162 -0800 -@@ -85,29 +85,10 @@ - - __start: - #ifdef __PIC__ --#if _MIPS_SIM == _MIPS_SIM_ABI32 -- .frame sp, 24, sp -- .set noreorder -- move $0, $31 /* Save old ra. */ -- bal 10f /* Find addr of cpload. */ -- nop --10: -- .cpload $31 -- move $31, $0 -- .set reorder -- .cprestore 16 --#else -- move $0, $31; /* Save old ra. */ -- .set noreorder -- bal 10f /* Find addr of .cpsetup. */ -- nop --10: -- .set reorder -- .cpsetup $31, $25, 10b -- move $31, $0 --#endif -+ SETUP_GPX($0) -+ SETUP_GPX64($25,$0) - #else -- la $28, _gp /* Setup GP correctly if we're non-PIC. */ -+ PTR_LA $28, _gp /* Setup GP correctly if we're non-PIC. */ - move $31, $0 - #endif - -@@ -118,18 +99,18 @@ __start: - /* Allocate space on the stack for seven arguments and - * make sure the stack is aligned to double words (8 bytes) */ - -+ and $29, -2 * SZREG -+ - #if _MIPS_SIM == _MIPS_SIM_ABI32 -- and $29, -2 * 4 -- subu $29, 32 -- la $7, _init /* init */ -- la $8, _fini -- sw $8, 16($29) /* fini */ -- sw $2, 20($29) /* rtld_fini */ -- sw $29, 24($29) /* stack_end */ --#else -- and $29, -2 * PTRSIZE -+ PTR_SUBIU $29, 32 -+#endif - PTR_LA $7, _init /* init */ -- PTR_LA $8, _fini /* fini */ -+ PTR_LA $8, _fini -+#if _MIPS_SIM == _MIPS_SIM_ABI32 -+ PTR_S $8, 16($29) /* fini */ -+ PTR_S $2, 20($29) /* rtld_fini */ -+ PTR_S $29, 24($29) /* stack_end */ -+#else - move $9, $2 /* rtld_fini */ - move $10, $29 /* stack_end */ - #endif -@@ -148,4 +129,3 @@ __data_start: - .weak data_start - data_start = __data_start - -- diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb index 428c6f62c3..c2d0b71ac7 100644 --- a/recipes/uclibc/uclibc_nptl.bb +++ b/recipes/uclibc/uclibc_nptl.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.30" -SRCREV="784e157fadbf1622d381e7dc9e82d2510a690776" +SRCREV="f2e300431f5c56c0d2019a197ad1da24592ea842" PV = "${UCLIBC_BASE}+gitr${SRCREV}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take @@ -35,7 +35,7 @@ SRC_URI = "git://uclibc.org/uClibc.git;protocol=git;branch=nptl \ file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \ file://uclibc_arm_remove_duplicate_sysdep_defs.patch;patch=1 \ file://installfix.patch;patch=1 \ - file://uclibc_fix_mips_tls_relocation_and_crt.patch;patch=1 \ + file://mips-nptl-fix-dynamic-global-tls.patch;patch=1 \ " S = "${WORKDIR}/git" diff --git a/recipes/whois/whois.inc b/recipes/whois/whois.inc index 15af5e8454..f7fc93861d 100644 --- a/recipes/whois/whois.inc +++ b/recipes/whois/whois.inc @@ -4,6 +4,14 @@ LICENSE = "GPL" HOMEPAGE = "http://www.linux.it/~md/software/" SECTION = "network" +INC_PR = "r1" + +SRC_URI = "${DEBIAN_MIRROR}/main/w/whois/whois_${PV}.tar.gz;name=whois" + +S = "${WORKDIR}/whois-${PV}" + +inherit gettext + def whois_intl(bb, d): # FIXME: This is ugly.. we already have the virtual for this, # but there's no way to ask bb who the current selected provider of diff --git a/recipes/whois/whois_4.5.25.bb b/recipes/whois/whois_4.5.25.bb index 22952b0d8c..2a574678df 100644 --- a/recipes/whois/whois_4.5.25.bb +++ b/recipes/whois/whois_4.5.25.bb @@ -1,6 +1,2 @@ +PR = "${INC_PR}.0" require whois.inc - -SRC_URI = "${DEBIAN_MIRROR}/main/w/whois/whois_${PV}.tar.gz" -S = "${WORKDIR}/whois-${PV}" - -inherit gettext diff --git a/recipes/whois/whois_5.0.0.bb b/recipes/whois/whois_5.0.0.bb new file mode 100644 index 0000000000..a595ec5565 --- /dev/null +++ b/recipes/whois/whois_5.0.0.bb @@ -0,0 +1,6 @@ +require whois.inc +PR = "${INC_PR}.0" + +SRC_URI[whois.md5sum] = "18d74a07d711262b75f04a1c319bc833" +SRC_URI[whois.sha256sum] = "fb13316c09ff9f98bd9af659d0789c9a09b97757f5c6c3dbfbc790250d5c5abc" + diff --git a/recipes/wxsqlite3/wxsqlite3-1.9.7/gcc-inline.patch b/recipes/wxsqlite3/wxsqlite3-1.9.7/gcc-inline.patch new file mode 100644 index 0000000000..10338ad00d --- /dev/null +++ b/recipes/wxsqlite3/wxsqlite3-1.9.7/gcc-inline.patch @@ -0,0 +1,29 @@ +diff -pru wxsqlite3-1.9.7.orig/include/wx/wxsqlite3.h wxsqlite3-1.9.7/include/wx/wxsqlite3.h +--- wxsqlite3-1.9.7.orig/include/wx/wxsqlite3.h 2009-11-09 20:59:38.000000000 +0100 ++++ wxsqlite3-1.9.7/include/wx/wxsqlite3.h 2009-12-06 17:19:58.000000000 +0100 +@@ -94,7 +94,7 @@ public: + int GetExtendedErrorCode() const { return m_errorCode; } + + /// Get error message associated with the exception +- const wxString GetMessage() const { return m_errorMessage; } ++ const wxString GetMessage() const; + + /// Convert error code to error message + static const wxString ErrorCodeAsString(int errorCode); +Only in wxsqlite3-1.9.7: patches +diff -pru wxsqlite3-1.9.7.orig/src/wxsqlite3.cpp wxsqlite3-1.9.7/src/wxsqlite3.cpp +--- wxsqlite3-1.9.7.orig/src/wxsqlite3.cpp 2009-11-09 20:59:38.000000000 +0100 ++++ wxsqlite3-1.9.7/src/wxsqlite3.cpp 2009-12-06 17:58:01.000000000 +0100 +@@ -263,6 +263,11 @@ wxSQLite3Exception::~wxSQLite3Exception( + { + } + ++const wxString wxSQLite3Exception::GetMessage() const ++{ ++ return m_errorMessage; ++} ++ + // ---------------------------------------------------------------------------- + // wxSQLite3StatementBuffer: class providing a statement buffer + // for use with the SQLite3 vmprintf function +Only in wxsqlite3-1.9.7/src: .wxsqlite3.cpp.swp diff --git a/recipes/wxsqlite3/wxsqlite3-1.9.7/wxtranslate.patch b/recipes/wxsqlite3/wxsqlite3-1.9.7/wxtranslate.patch new file mode 100644 index 0000000000..b40511cf05 --- /dev/null +++ b/recipes/wxsqlite3/wxsqlite3-1.9.7/wxtranslate.patch @@ -0,0 +1,11 @@ +--- wxsqlite3-1.9.7.orig/src/wxsqlite3.cpp 2009-11-09 20:59:38.000000000 +0100 ++++ wxsqlite3-1.9.7/src/wxsqlite3.cpp 2009-12-06 17:58:35.000000000 +0100 +@@ -94,6 +94,8 @@ static void InitSQLite3DLL() + + // Error messages + ++#undef wxTRANSLATE ++#define wxTRANSLATE wxT + const wxChar* wxERRMSG_NODB = wxTRANSLATE("No Database opened"); + const wxChar* wxERRMSG_NOSTMT = wxTRANSLATE("Statement not accessible"); + const wxChar* wxERRMSG_NOMEM = wxTRANSLATE("Out of memory"); diff --git a/recipes/wxsqlite3/wxsqlite3_1.9.7.bb b/recipes/wxsqlite3/wxsqlite3_1.9.7.bb new file mode 100644 index 0000000000..5f7d3c9cdd --- /dev/null +++ b/recipes/wxsqlite3/wxsqlite3_1.9.7.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "A wxWindows wrapper for the sqlite database." +HOMEPAGE = "http://wxcode.sourceforge.net/components/wxsqlite3" +SECTION = "libs" +LICENSE = "wxWindows" +DEPENDS = "sqlite3 wxwidgets" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/wxcode/wxsqlite3-${PV}.tar.gz;name=wxsqlite3 \ + file://gcc-inline.patch;patch=1 \ + file://wxtranslate.patch;patch=1 \ + " +SRC_URI[wxsqlite3.md5sum] = "2e1bec387bbdf50c632649d041b32a4a" +SRC_URI[wxsqlite3.sha256sum] = "eaee8290c1f386413f5cb1e1af9ec4e7573c1dcce2760d79f4276497a75c4f64" + +inherit autotools + +EXTRA_OECONF = "--with-sqlite3-prefix=${STAGING_LIBDIR}" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + newincludedir=${D}/${includedir}/wx-$(wx-config --release) + mkdir "$newincludedir" + mv ${D}/${includedir}/wx "$newincludedir" +} diff --git a/recipes/wxwidgets/wxwidgets-2.9.0.inc b/recipes/wxwidgets/wxwidgets-2.9.0.inc new file mode 100644 index 0000000000..cb6a971e7a --- /dev/null +++ b/recipes/wxwidgets/wxwidgets-2.9.0.inc @@ -0,0 +1,44 @@ +require wxwidgets.inc + +INC_PR = "r0" + +PROVIDES += "wxwidgets" + +TOOLKIT ?= "gtk2" +UNICODE ?= "${@base_contains('EXTRA_OECONF', '--disable-unicode', 'ansi', 'unicode', d)}" +DEBUG ?= "${@base_contains('EXTRA_OECONF', '--enable-debug', 'debug', 'release', d)}" +RELEASE ?= "${@bb.data.getVar('PV',d,1).rsplit('.', 1)[0]}" + +WXCONFIG ?= "${TOOLKIT}-${UNICODE}-${DEBUG}-${RELEASE}" + +LEAD_SONAME = "libwx_.*_core-.*\.so" + +# Patch and regenerate configure script so that it finds staging root. +FILESDIR = "${FILE_DIRNAME}/wxwidgets-${PV}" +SRC_URI += "file://configure-cross_root.patch;patch=1" + +do_configure_prepend() { + ./autogen.sh +} + +do_stage() { + install -d ${STAGING_INCDIR}/wx-${RELEASE}/wx + cp -pR include/wx ${STAGING_INCDIR}/wx-${RELEASE} + cp -pR lib/libwx* ${STAGING_LIBDIR} + cp -pR lib/wx ${STAGING_LIBDIR} + cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile + cp -p wxwin.m4 ${STAGING_DATADIR}/aclocal + ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}${WXCONFIG} \ + ${STAGING_BINDIR_CROSS}/wx-config + sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ + -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ + -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ + -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ + -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}${WXCONFIG} +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + ln -sf ${libdir}/wx/config/${TARGET_PREFIX}${WXCONFIG} \ + ${D}${bindir}/wx-config +} diff --git a/recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch b/recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch new file mode 100644 index 0000000000..e91a95cfbb --- /dev/null +++ b/recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch @@ -0,0 +1,30 @@ +diff -pu a/configure.in b/configure.in +--- a/configure.in 2009-12-04 11:02:26.000000000 +0100 ++++ b/configure.in 2009-12-03 22:08:05.000000000 +0100 +@@ -2117,14 +2117,21 @@ if test "$build" != "$host" -a "$GCC" = + dnl the linker. Stripping off the trailing '/bin/ld' gives us a candiate + dnl for a 'root' below which libraries and headers for the target system + dnl might be installed. +- if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then ++ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$]) ++ if test ! -z "$PKG_CONFIG_SYSROOT_DIR"; then ++ cross_root="$PKG_CONFIG_SYSROOT_DIR" ++ elif cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then + cross_root=`dirname $cross_root` + cross_root=`dirname $cross_root` ++ else ++ cross_root="" ++ fi + +- dnl substitute this candiate root for '^/usr' in the search lists, +- dnl strip out any that don't start '^/usr'. +- SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"` +- SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"` ++ if test ! -z "$cross_root"; then ++ dnl substitute this candiate root for '^/' in the search lists, ++ dnl strip out any that don't start '^/'. ++ SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/|$cross_root/|p"` ++ SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/|$cross_root/|p"` + SEARCH_INCLUDE="$SEARCH_INCLUDE $cross_root/include" + + dnl also have pkg-config search for *.pc files under this 'root' diff --git a/recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb b/recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb new file mode 100644 index 0000000000..aafbe5b238 --- /dev/null +++ b/recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb @@ -0,0 +1,5 @@ +require wxwidgets-${PV}.inc + +PR = "${INC_PR}.0" + +EXTRA_OECONF += "--disable-unicode" diff --git a/recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb b/recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb new file mode 100644 index 0000000000..e85658c36a --- /dev/null +++ b/recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb @@ -0,0 +1,7 @@ +require wxwidgets-${PV}.inc + +DEPENDS += "virtual/libgl" + +PR = "${INC_PR}.0" + +EXTRA_OECONF += "--with-opengl" diff --git a/recipes/wxwidgets/wxwidgets_2.9.0.bb b/recipes/wxwidgets/wxwidgets_2.9.0.bb new file mode 100644 index 0000000000..c23c969861 --- /dev/null +++ b/recipes/wxwidgets/wxwidgets_2.9.0.bb @@ -0,0 +1,3 @@ +require wxwidgets-${PV}.inc + +PR = "${INC_PR}.0" diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch new file mode 100644 index 0000000000..08f430999b --- /dev/null +++ b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch @@ -0,0 +1,32 @@ +From aaf549ecacc05bd5ddd29bb345cae471ce3ab48c Mon Sep 17 00:00:00 2001 +From: Marco Cavallini <m.cavallini@koansoftware.com> +Date: Thu, 21 Jan 2010 16:46:18 +0100 +Subject: [PATCH] gui_x11.cpp: Load font fixed when 9x15 fails in GuiCalibratorX11 + + +Signed-off-by: Marco Cavallini <m.cavallini@koansoftware.com> +--- + gui_x11.cpp | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gui_x11.cpp b/gui_x11.cpp +index bc483cd..02ddc73 100644 +--- a/gui_x11.cpp ++++ b/gui_x11.cpp +@@ -112,8 +112,11 @@ GuiCalibratorX11::GuiCalibratorX11(Calibrator* calibrator0) + // Load font and get font information structure + font_info = XLoadQueryFont(display, "9x15"); + if (font_info == NULL) { +- XCloseDisplay(display); +- throw std::runtime_error("Unable to open 9x15 font"); ++ font_info = XLoadQueryFont(display, "fixed"); ++ if (font_info == NULL) { ++ XCloseDisplay(display); ++ throw std::runtime_error("Unable to open 9x15 neither fixed font"); ++ } + } + + // Compute absolute circle centers +-- +1.6.3.3 + diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb index 2d6924711d..b01d4fd4a9 100644 --- a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb +++ b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb @@ -2,7 +2,8 @@ DEPENDS = "virtual/libx11 libxi" SRCREV = "6af268f1b435f7bdd83335092ddc684054df2110" SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \ - file://0001-switch-to-autotools-based-build-system.patch;patch=1" + file://0001-switch-to-autotools-based-build-system.patch;patch=1 \ + file://0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch;patch=1" PR = "r1" inherit autotools diff --git a/recipes/xorg-app/xvidtune_1.0.2.bb b/recipes/xorg-app/xvidtune_1.0.2.bb new file mode 100644 index 0000000000..bfab14a67a --- /dev/null +++ b/recipes/xorg-app/xvidtune_1.0.2.bb @@ -0,0 +1,6 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxaw libxxf86vm libxt" + +FILES_${PN} += " ${datadir}/X11/app-defaults/Xvidtune " diff --git a/recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch b/recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch new file mode 100644 index 0000000000..07754731dd --- /dev/null +++ b/recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch @@ -0,0 +1,20 @@ +xorg-server-1.7.3/hw/xfree86/common/xf86Helper.c contains this code +causing a double free crash on chvt or exit: + + /* This should *really* be handled in drv->UnInit(dev) call instead, but + * if the driver forgets about it make sure we free it or at least crash + * with flying colors */ + if (pInp->private) + xfree(pInp->private); +Index: xf86-input-tslib-0.0.6/src/tslib.c +=================================================================== +--- xf86-input-tslib-0.0.6.orig/src/tslib.c ++++ xf86-input-tslib-0.0.6/src/tslib.c +@@ -435,6 +435,7 @@ xf86TslibUninit(InputDriverPtr drv, Inpu + xf86TslibControlProc(pInfo->dev, DEVICE_OFF); + ts_close(priv->ts); + xfree(pInfo->private); ++ pInfo->private = NULL; + xf86DeleteInput(pInfo, 0); + } + diff --git a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb index 84d2da0ffd..cce5e9bdd1 100644 --- a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb +++ b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb @@ -4,9 +4,10 @@ DESCRIPTION = "X.Org X server -- tslib input driver" RRECOMMENDS += "hal tslib-calibrate" DEPENDS += "tslib" -PR = "r8" +PR = "r9" SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \ + file://double-free-crash.patch;patch=1 \ file://10-x11-input-tslib.fdi" do_configure_prepend() { diff --git a/recipes/xorg-driver/xf86-video-intel_2.10.0.bb b/recipes/xorg-driver/xf86-video-intel_2.10.0.bb new file mode 100644 index 0000000000..eed1fcb600 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-intel_2.10.0.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb b/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch new file mode 100644 index 0000000000..5d0a24ca2d --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch @@ -0,0 +1,23 @@ +diff -uNr libX11-1.3.3.orig/src/util/Makefile.am libX11-1.3.3/src/util/Makefile.am +--- libX11-1.3.3.orig/src/util/Makefile.am 2010-01-15 02:11:36.000000000 +0100 ++++ libX11-1.3.3/src/util/Makefile.am 2010-01-18 14:48:27.000000000 +0100 +@@ -1,19 +1 @@ +- +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS=$(X11_CFLAGS) +- +-CC = @CC_FOR_BUILD@ +- + EXTRA_DIST = mkks.sh +- +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/recipes/xorg-lib/libx11-native_1.3.3.bb b/recipes/xorg-lib/libx11-native_1.3.3.bb new file mode 100644 index 0000000000..98fe79f5c3 --- /dev/null +++ b/recipes/xorg-lib/libx11-native_1.3.3.bb @@ -0,0 +1,10 @@ +require libx11_${PV}.bb + +SRC_URI += "file://dolt-fix.patch;patch=1" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native" +PROVIDES = "" + +inherit native diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb new file mode 100644 index 0000000000..8858a09721 --- /dev/null +++ b/recipes/xorg-lib/libx11_1.3.3.bb @@ -0,0 +1,33 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Base X libs." +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" +PROVIDES = "virtual/libx11" +PE = "1" +PR = "r3" + +XORG_PN = "libX11" + +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ +# file://dolt-fix.patch;patch=1 \ +# file://keysymdef_include.patch;patch=1 \ +" + +EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" + +do_compile() { + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; + mv makekeys.c.orig makekeys.c || true + touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys + # mv to stop it getting rebuilt + mv makekeys.c makekeys.c.orig + cd ../../ + ) || exit 1 + oe_runmake +} + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" diff --git a/recipes/xorg-lib/pixman_0.16.2.bb b/recipes/xorg-lib/pixman_0.16.2.bb index 2517f8f354..1a15ac4a96 100644 --- a/recipes/xorg-lib/pixman_0.16.2.bb +++ b/recipes/xorg-lib/pixman_0.16.2.bb @@ -3,7 +3,9 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" -DEFAULT_PREFERENCE = "-1" +PR = "r1" + +BBCLASSEXTEND="native" SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \ " diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb index 1b5ca6388f..0c3008de99 100644 --- a/recipes/xorg-lib/pixman_git.bb +++ b/recipes/xorg-lib/pixman_git.bb @@ -4,9 +4,11 @@ DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" PV = "0.17.3" -PR = "r4" +PR = "r5" PR_append = "+gitr${SRCREV}" +BBCLASSEXTEND="native" + SRCREV = "c97b1e803fc214e9880eaeff98410c8fa37f9ddc" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/xorg-proto/dri2proto_2.2.bb b/recipes/xorg-proto/dri2proto_2.2.bb new file mode 100644 index 0000000000..a0e1fd3989 --- /dev/null +++ b/recipes/xorg-proto/dri2proto_2.2.bb @@ -0,0 +1,3 @@ +DESCRIPTION = "DRI2 extension headers" + +require xorg-proto-common.inc diff --git a/recipes/xorg-proto/glproto_1.4.11.bb b/recipes/xorg-proto/glproto_1.4.11.bb new file mode 100644 index 0000000000..9f09fff7b7 --- /dev/null +++ b/recipes/xorg-proto/glproto_1.4.11.bb @@ -0,0 +1,4 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" diff --git a/recipes/xorg-util/util-macros-native_1.5.0.bb b/recipes/xorg-util/util-macros-native_1.5.0.bb new file mode 100644 index 0000000000..618e78f116 --- /dev/null +++ b/recipes/xorg-util/util-macros-native_1.5.0.bb @@ -0,0 +1,7 @@ +require util-macros_${PV}.bb + +inherit native + +XORG_PN = "util-macros" + +S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros_1.5.0.bb b/recipes/xorg-util/util-macros_1.5.0.bb new file mode 100644 index 0000000000..4775fc6901 --- /dev/null +++ b/recipes/xorg-util/util-macros_1.5.0.bb @@ -0,0 +1,6 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" +PE = "1" + +ALLOW_EMPTY = "1" diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch new file mode 100644 index 0000000000..a947582f15 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch @@ -0,0 +1,14 @@ +diff --git a/fb/fbcopy.c b/fb/fbcopy.c +index 07eb663..ba394b7 100644 +--- a/fb/fbcopy.c ++++ b/fb/fbcopy.c +@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable, + while (nbox--) + { + #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */ +- if (pm == FB_ALLONES && alu == GXcopy && !reverse && +- !upsidedown) ++ if (pm == FB_ALLONES && alu == GXcopy) + { + if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp, + (pbox->x1 + dx + srcXoff), diff --git a/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch new file mode 100644 index 0000000000..d3661cbea2 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch @@ -0,0 +1,39 @@ +Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1 +(and probably other) while returning from chvt or resume on some +hardware (e. g. zaurus). + +Correct fix would require debugging of fbdev mode during LeaveVT and +EnterVT. + +This patch may cause staying in incorrect or corrupted display mode +after EnterVT, but on man affected devices it does not cause any visible +problems. + +Hacked code is never called on properly written drivers. + +Devices affected and testers involved for future patch removal: +Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz> + +See also: +https://bugzilla.redhat.com/show_bug.cgi?id=238451 + +The bug (first line indicates that your device is affected): + +(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode + +Fatal server error: +EnterVT failed for screen 0 + +Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c +=================================================================== +--- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c ++++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c +@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa + #if DEBUG + print_fbdev_mode("returned", &set_var); + #endif +- return FALSE; ++ /* return FALSE; UGLY HACK to allow return from chvt */ + } + + if (!check) diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb index edede8b3ff..2ecb169a84 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb @@ -3,11 +3,12 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts" PE = "2" -PR = "r4" +PR = "r5" SRC_URI += "file://sysroot_fix.patch;patch=1 \ file://dolt-fix-1.7.0.patch;patch=1 \ file://randr-support-1.7.0.patch;patch=1 \ + file://hack-fbdev-ignore-return-mode.patch;patch=1 \ " SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb new file mode 100644 index 0000000000..bd2e6f82a8 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb @@ -0,0 +1,26 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts" +PE = "2" + +SRC_URI += "file://sysroot_fix.patch;patch=1 \ + file://dolt-fix-1.7.0.patch;patch=1 \ + file://randr-support-1.7.0.patch;patch=1 \ + file://hack-fbdev-ignore-return-mode.patch;patch=1 \ + " + +SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" +SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" + +do_install_prepend() { + mkdir -p ${D}/${libdir}/X11/fonts +} + +# The NVidia driver requires Xinerama support in the X server. Ion uses it. +XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" + +EXTRA_OECONF += " --enable-config-hal ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests " + +export LDFLAGS += " -ldl " diff --git a/recipes/xserver-common/files/Xserver-at91.patch b/recipes/xserver-common/files/Xserver-at91.patch new file mode 100644 index 0000000000..e030e9fd57 --- /dev/null +++ b/recipes/xserver-common/files/Xserver-at91.patch @@ -0,0 +1,18 @@ +diff -ru xserver-common-1.25.orig/X11/Xserver xserver-common-1.25/X11/Xserver +--- xserver-common-1.25.orig/X11/Xserver 2010-01-12 12:04:52.000000000 +0100 ++++ xserver-common-1.25/X11/Xserver 2010-01-12 12:15:32.000000000 +0100 +@@ -104,8 +104,12 @@ + ARGS="$ARGS -dpi 100 -screen 480x640@270" ;; + "HTC Tornado") + ARGS="$ARGS -dpi 100 -hide-cursor" ;; +- "Atmel AT91SAM9261-EK" | "Atmel AT91SAM9263-EK") +- ARGS="$ARGS -dpi 100 -rgba bgr -screen 240x320" ;; ++ "Atmel AT91SAM9261-EK" | "Atmel AT91SAM9263-EK" | "Atmel AT91CAP9A-DK" | "Atmel AT91CAP9-STK") ++ ARGS="$ARGS -dpi 100 -rgba bgr -screen ${SCREEN_SIZE} " ;; ++ "Atmel AT91SAM9RL-EK" | "Atmel AT91SAM9G10-EK" ) ++ ARGS="$ARGS -dpi 100 -rgba rgb -screen ${SCREEN_SIZE} " ;; ++ "Atmel AT91SAM9M10-EKES" | "Atmel AT91SAM9G45-EKES" | "Atmel AT91SAM9M10G45-EK") ++ ARGS="$ARGS -rgba rgb -screen 480x272 " ;; + "Generic OMAP1510/1610/1710" | "Nokia N770") + ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} " ;; + "Nokia N800") diff --git a/recipes/xserver-common/xserver-common_1.25.bb b/recipes/xserver-common/xserver-common_1.25.bb index b55e0e5ce1..40ec4affa0 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 = "r3" +PR = "r4" PACKAGE_ARCH = "all" @@ -13,6 +13,7 @@ SRC_URI_append = " file://setDPI.sh \ file://89xdgautostart.sh \ file://avoid-rotated-server.patch;patch=1 \ file://ts-handling-cleanup.diff;patch=1 \ + file://Xserver-at91.patch;patch=1 \ " SRC_URI_append_angstrom = " file://xtscal-fix.patch;patch=1 " |