diff options
| author | Rod Whitby <rod@whitby.id.au> | 2009-02-10 18:52:52 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2009-02-10 18:52:52 +0000 |
| commit | a19c7f36303e21667ca9390bdb49bfc10d6ad3dc (patch) | |
| tree | 7279ea86f658c0a5baa9dbb379232f045b5822c2 | |
| parent | f5be4d30ff1a57ce9ccd114627cc2d5ab1f8f1c6 (diff) | |
| parent | 0345d624647954e3a49e05b8c221f8281e0897eb (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
54 files changed, 507 insertions, 594 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 0eba0c8847..1ea968e2da 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -150,10 +150,22 @@ sha256=dde5d254cd00e4182680b1241e9a5feebbc9b4887f5d0bac2ba2935f213c97e7 md5=dac0f6c217437819f620da18a97d505f sha256=ec9ba2f4ac57fea244639d3ddcdcb0307a4130b250a2b7f3b3ef416aaa5cdb53 +[http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.010.tar.gz] +md5=a63c9f73afef70b6c80d899424b003e9 +sha256=7068295a5e35ed7dcf20446bee6d80a8de8ba7af5eb5fa35c0b60135c3445c2f + +[http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-1.607.tar.gz] +md5=bd5785b39675213948a61dea1b400012 +sha256=7090a1e6a0d13be2f7e27a724351c61e44ffa5d165a7720bfe505aa2c4d47e14 + [http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Data-OptList-0.101.tar.gz] md5=6e9bb994a8716112a78c1306261f4164 sha256=a96fb122261fb5f069341d7e69dcf07a2988da7cfd8df65d50843b8b102fb55c +[http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/Date-Manip-5.54.tar.gz] +md5=16c343329bad644b17f4f8ec5fb243cf +sha256=b61f4f0e3e580723ca7f5c0e1952922c101875535bff04afd772fbd3f193e22a + [http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.13.tar.gz] md5=35d85c3f2c91c1de389b13436659551a sha256=fe044ec9817a31f2b76f701b2cfd980809676943a901ba3d49200162807fa1f9 @@ -214,6 +226,10 @@ sha256=4c780b9e2906944ce02a9325b15f480d2bd4c0b12137f752aa4800c0f8563acf md5=3bf4d8d285591a5b7f31170f9b87aba0 sha256=c196988f55fc6633d9f9f6d9ddc2ae9b4dfa1f300edf4cbbad865c06a8656df7 +[http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Date-Format-1.002.tar.gz] +md5=7ae25275da6ab272aa8b40141eac9f82 +sha256=0c7f3636dffa5ff151f6906baa17582c2efeb29109750f40f820fe5d2dc38e84 + [http://divmod.org/trac/attachment/wiki/SoftwareReleases/Epsilon-0.5.11.tar.gz?format=raw] md5=39710dfdeb42e51c953b17b6cded163e sha256=a5907a3b7584d63be30b3f79b0422b2b0778e73c053be9ac5a11004f1c9097dc @@ -294,6 +310,14 @@ sha256=5673927f18790511f2a01004a51110e167f7950e7accf9e1bc6832a4bfed4feb md5=c09f77e2af500b51d22e0238c0534994 sha256=01c75ebc523b77b88d5754fa93a283eeff77bcf799536db8697b61daf42f36bd +[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.60.tar.gz] +md5=fb97ea7e5bd832b079d8660732f9d8d9 +sha256=0f1365a546e8c54faf5e17c5d011d0b9db8784568fb6b03522ab558ad39d9a63 + +[http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz] +md5=d2bfa18fe1904df7f683e96611e87437 +sha256=adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2 + [http://gallium.prg.dtu.dk/HVSC/random/HVSC_45-all-of-them.rar] md5=5394dac412dbe34d2dfe63cb91bdce8d sha256=6068499eeb3aad19d2f860390c65496cf38c5f5e5b54422db6ec2f67abbb8d10 @@ -406,6 +430,10 @@ sha256=ab8fdcfdbb6c74ecef4cfaf9e83f955aa422e43f8cd8683c1f2648c70070b88c md5=a7bda690ec0ad0bed457fa525e28034a sha256=ffac9cd4a6fbc59618bf4e79c389a927491a81b448528278e010a190e2483544 +[http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/MIME-Lite-3.024.tar.gz] +md5=ca71d1d844f5c4f693e5079a2b4fa9a5 +sha256=886b57c7d8d9903b54dad07b68f58e398745d6d92522e89e2ce714472c09f903 + [http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2] md5=18c05d88e22c3b815a43ca8d7152ccdc sha256=8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063 @@ -498,6 +526,10 @@ sha256=a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 md5=598bb59b86c2c4842eeffb03392fab5b sha256=8fd609d1e6b460b5c95ad5612cb823aa863d51360ed55caea987909a9bab50f5 +[http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Module-Load-0.16.tar.gz] +md5=851a225e31621a66621f28a25ec53d9a +sha256=f05c3300c988dc5f5f02d55f8ee241c05fbf4565c512f804f47c6e72e5f69e33 + [http://downloads.sourceforge.net/mysql-python/MySQL-python-1.2.1_p2.tar.gz] md5=e6b9ea21fd91cb4a5663304da727bb70 sha256=59f44cd53cfa1189dcaa5bf2c48662d5765f347b03827feb807f4cd0ef18943e @@ -570,6 +602,10 @@ sha256=987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704 md5=87f56e79ae0c20397f4207d61d154303 sha256=987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704 +[http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.30.tar.gz] +md5=210b764fca7c791f4387717185f589b5 +sha256=09917ebe3b088649f0767723a7e25ae08fb8db921a85183e2e8c3d2e79ae6d10 + [http://www.packagekit.org/releases/PackageKit-0.2.4.tar.gz] md5=87bf41fd021077c93549d47de6d5fe07 sha256=3b1a6f451928ca7e36d25e6e5a2e3dec2adae11c20770406f8bdc484f38b1600 @@ -978,6 +1014,10 @@ sha256=3d92318dadef22b1d1b062925ef66bac2ad48a0fd4fc83b88dcabba38c182b7b md5=61eed8ed819688663e399b5e79ed006f sha256=6a19418a074a7dec6fd67f00df74f3335e85eb38d2d2a17bd0e91cf8010537e3 +[http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/X10-0.03.tar.gz] +md5=056b3d98fab545865148b948de6784c7 +sha256=2b34d7c2112e8b79856c63f43403bff1a7ed5005d9b98db5f94c6f4cc7ba5623 + [ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-1.tgz] md5=4f241a4f867363f40efa2b00dca292af sha256=5276b045e154948fce7abba7d686406c65862d90b43b50f2546b33e38378f0d7 @@ -1042,6 +1082,10 @@ sha256=f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599e06e43 md5=4be042a043ec520074b0ab6f7ca0bded sha256=fa668e8f01fe43fdddb33f0c5e294698818f37519000b9f782f504ece071c740 +[http://www2.zoneminder.com/downloads/ZoneMinder-1.23.3.tar.gz] +md5=ee803f0f71d6e67adf602c3557fb6bc9 +sha256=76cba999bf602b1d561921cfcbbf7a9eab64370f349a0b389efff75f4b0c3af2 + [http://zope.org/Products/Zope/2.7.1/Zope-2.7.1.tgz] md5=ae9d4bb3f7220dfffb6e91b42503b16c sha256=341f56aa4ece9001a118be8ff9675bfad6410dc1df86dd86aeb726adc732341b @@ -17914,6 +17958,10 @@ sha256=1fe008b728923f25d3c8ebd7f28cc538aa0814f3b090df817e25c266fcaecf6a md5=e65d9245d706350b3db811280d897f30 sha256=3eecd66deecc2de5c31bb91a4b4479232087e80da94e3086e2a686879374cde9 +[http://pypi.python.org/packages/source/p/pyflakes/pyflakes-0.3.0.tar.gz] +md5=ec7eee3444214bda18e57b82175e1da7 +sha256=019b6d4b549306d013974678872aaf2453af3f02760175504dbe8a9f89db0a2c + [http://pyftpdlib.googlecode.com/files/pyftpdlib-0.5.1.tar.gz] md5=f64ac67ebec1d8ab47c0766082617384 sha256=6daed9475412eaab232e021ed76568c6520dacd75c58da406454139bef95c393 @@ -19070,6 +19118,10 @@ sha256=22647c6bdd0f1b311bd0e3a893fb184f07d0f5e1c4b3bccd20a024fe18fd7567 md5=528677f261f3ed4a58f9483ca25ba6b2 sha256=4f2bb8c5785c50ad05d3adc0027c0881211b8a5c51e840651b53b7e455c004a3 +[http://samba.org/samba/ftp/stable/samba-3.2.8.tar.gz] +md5=06efd6e6cc4aac628a1a0b082e4be0f2 +sha256=7e7fb53d6ff05993dcb8b871e3c3016bd4d161d72ded8f8760a4439e9d76aa3b + [http://samba.org/samba/ftp/stable/samba-3.3.0.tar.gz] md5=adb048dc3988055533e1ea5d91d81f99 sha256=b00ca360e9b414744eff33ca4567f3eb1a28d32914e20f00b6672fbc141c9beb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index ecc3d0917e..e72549e58c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -57,7 +57,7 @@ SRCREV_pn-flashrom ?= "3682" SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d" SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}" SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136" -SRCREV_pn-fso-abyss ?= "4afeacb21c3d4193289e2b7db549a91751d75195" +SRCREV_pn-fso-abyss ?= "30817edd8767bb9405f56cad72b3420670975128" SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" @@ -84,6 +84,7 @@ SRCREV_pn-libexalt-dbus ?= "76" SRCREV_pn-libfakekey ?= "1455" SRCREV_pn-libframeworkd-glib ?= "703017c8f874a325d917931378071c614597110e" SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f" +SRCREV_pn-libgsm0710 ?= "a05704a56003dc02dca784cef4176e97eaf9f688" SRCREV_pn-libgsmd ?= "4505" SRCREV_pn-libiac ?= "1590" SRCREV_pn-libjana ?= "713" @@ -229,7 +230,7 @@ SRCREV_pn-uclibc-initial ?= "24279" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b" -SRCREV_pn-webkit-gtk ?= "39964" +SRCREV_pn-webkit-gtk ?= "40814" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wlan-ng-modules ?= "1859" diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc index c8656bb117..1835af4727 100644 --- a/conf/machine/include/kexecboot.inc +++ b/conf/machine/include/kexecboot.inc @@ -13,4 +13,4 @@ RDEPENDS_kernel-base = "kernel-image" # we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels DONT_CHECK_KERNELSIZE ?= "1" -MACHINE_EXTRA_RRECOMMENDS_append = " kexecboot-cfg" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg" diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index a6c613403c..3ebc0d5476 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Alsa Scenario Files" LICENSE = "MIT" PV = "0.2.0" -PR = "r2" +PR = "r3" SRC_URI = "\ file://asound.conf \ diff --git a/packages/alsa/alsa-state/at91sam9263ek/asound.conf b/packages/alsa/alsa-state/at91sam9263ek/asound.conf new file mode 100644 index 0000000000..87bb5ec050 --- /dev/null +++ b/packages/alsa/alsa-state/at91sam9263ek/asound.conf @@ -0,0 +1,2 @@ +pcm.!default { type hw card 0 } +ctl.!default { type hw card 0 } diff --git a/packages/freesmartphone/fso-abyss_git.bb b/packages/freesmartphone/fso-abyss_git.bb index 471f404fc1..45d2257c72 100644 --- a/packages/freesmartphone/fso-abyss_git.bb +++ b/packages/freesmartphone/fso-abyss_git.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Abyss is a GSM 07.10 muxer userspace daemon" HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/Abyss" AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" -DEPENDS = "vala-native dbus dbus-glib libgee" +DEPENDS = "vala-native dbus dbus-glib libgsm0710" LICENSE = "GPL" -PV = "0.2.0+gitr${SRCREV}" +PV = "0.2.1+gitr${SRCREV}" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/fso-abyss.git;protocol=git;branch=master" @@ -12,7 +12,6 @@ S = "${WORKDIR}/git" inherit autotools -RDEPENDS = "dbus dbus-glib" -RCONFLICTS = "gsm0710muxd fso-gsm0710muxd" +#RCONFLICTS = "gsm0710muxd fso-gsm0710muxd" FILES_${PN} += "${datadir} ${sysconfdir}" diff --git a/packages/freesmartphone/libgsm0710_git.bb b/packages/freesmartphone/libgsm0710_git.bb new file mode 100644 index 0000000000..bc4e59ea34 --- /dev/null +++ b/packages/freesmartphone/libgsm0710_git.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "A GSM 07.10 Protocol Engine" +LICENSE = "GPL" +SECTION = "devel" +PV = "1.0.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/libgsm0710.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +inherit autotools autotools_stage pkgconfig + +# ship vapi file +FILES_${PN}-dev += "${datadir}/vala" + diff --git a/packages/images/x11-gpe-image.bb b/packages/images/x11-gpe-image.bb index 86f4cd838c..7b272f60a1 100644 --- a/packages/images/x11-gpe-image.bb +++ b/packages/images/x11-gpe-image.bb @@ -1,7 +1,6 @@ #Angstrom X11 image, with apps and kernel modules included ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ " XSERVER ?= "xserver-kdrive-fbdev" diff --git a/packages/images/x11-gpe-java-image.bb b/packages/images/x11-gpe-java-image.bb index 72b04ec2bc..fcc022c7a0 100644 --- a/packages/images/x11-gpe-java-image.bb +++ b/packages/images/x11-gpe-java-image.bb @@ -1,7 +1,6 @@ #Angstrom X11 image, with apps and kernel modules included ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ " XSERVER ?= "xserver-kdrive-fbdev" diff --git a/packages/images/x11-office-image.bb b/packages/images/x11-office-image.bb index 47a8fae71f..48799d8998 100644 --- a/packages/images/x11-office-image.bb +++ b/packages/images/x11-office-image.bb @@ -1,7 +1,6 @@ #Angstrom X11 image, with apps and kernel modules included ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ " XSERVER ?= "xserver-kdrive-fbdev" diff --git a/packages/images/x11-pimlico-image.bb b/packages/images/x11-pimlico-image.bb index 3c93bfbd1b..79dcacce6e 100644 --- a/packages/images/x11-pimlico-image.bb +++ b/packages/images/x11-pimlico-image.bb @@ -1,7 +1,6 @@ #Angstrom X11 image, with apps and kernel modules included ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ " XSERVER ?= "xserver-kdrive-fbdev" diff --git a/packages/ogre/ogre-egl_svn.bb b/packages/ogre/ogre-egl_svn.bb index 8cecf56a7d..61d2429945 100644 --- a/packages/ogre/ogre-egl_svn.bb +++ b/packages/ogre/ogre-egl_svn.bb @@ -2,6 +2,8 @@ DESCRIPTION = "OGRE (Object-Oriented Graphics Rendering Engine) is a scene-orien LICENSE = "LGPL" DEPENDS = "zziplib boost freeimage freetype virtual/libx11 virtual/egl" +PR = "r1" + SRCREV = "8310" PV = "1.6.1+svnr${SRCREV}" @@ -25,5 +27,5 @@ do_configure_prepend() { FILES_${PN}-dbg += "${libdir}/OGRE/.debug" FILES_${PN}-dev += "${libdir}/OGRE/*.la" -FILES_${PN} += "${libdir}/OGRE/*.so" +FILES_${PN} += "${libdir}/libOgreMain-*.so ${libdir}/OGRE/*.so" diff --git a/packages/perl/libdate-manip-perl-native_5.54.bb b/packages/perl/libdate-manip-perl-native_5.54.bb new file mode 100644 index 0000000000..7199d9f8c5 --- /dev/null +++ b/packages/perl/libdate-manip-perl-native_5.54.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libdate-manip-perl_${PV}.bb diff --git a/packages/perl/libdate-manip-perl_5.54.bb b/packages/perl/libdate-manip-perl_5.54.bb new file mode 100644 index 0000000000..9097ce39c6 --- /dev/null +++ b/packages/perl/libdate-manip-perl_5.54.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Date and time manipulation routines." +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r0" + +RDEPENDS = "perl-module-test-more \ + perl-module-io-file \ + perl-module-carp" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/Date-Manip-${PV}.tar.gz" + +S = "${WORKDIR}/Date-Manip-${PV}" + +inherit cpan diff --git a/packages/perl/libdbd-mysql-perl-native_4.010.bb b/packages/perl/libdbd-mysql-perl-native_4.010.bb new file mode 100644 index 0000000000..180d1d0b13 --- /dev/null +++ b/packages/perl/libdbd-mysql-perl-native_4.010.bb @@ -0,0 +1,8 @@ +require libdbd-mysql-perl.inc + +DEPENDS = "libdbi-perl-native mysql-native" + +EXTRA_OECONF = " --mysql_config=${STAGING_BINDIR_NATIVE}" + +inherit native + diff --git a/packages/perl/libdbd-mysql-perl.inc b/packages/perl/libdbd-mysql-perl.inc new file mode 100644 index 0000000000..6200c2844a --- /dev/null +++ b/packages/perl/libdbd-mysql-perl.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "The database interface driver for the MySQL database." +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r0" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-${PV}.tar.gz" + +S = "${WORKDIR}/DBD-mysql-${PV}" + +inherit cpan diff --git a/packages/perl/libdbd-mysql-perl_4.010.bb b/packages/perl/libdbd-mysql-perl_4.010.bb new file mode 100644 index 0000000000..95aa53b14b --- /dev/null +++ b/packages/perl/libdbd-mysql-perl_4.010.bb @@ -0,0 +1,13 @@ +require libdbd-mysql-perl.inc + +DEPENDS = "libdbi-perl mysql" +RDEPENDS = "perl-module-data-dumper \ + libdbi-perl \ + perl-module-scalar-util \ + perl-module-file-spec \ + perl-module-storable \ + perl-module-test-simple" + +EXTRA_OECONF = " --mysql_config=${STAGING_BINDIR_CROSS}/mysql_config" + +CFLAGS_append = " -I${STAGING_INCDIR}/mysql" diff --git a/packages/perl/libdbi-perl-native_1.607.bb b/packages/perl/libdbi-perl-native_1.607.bb new file mode 100644 index 0000000000..c5e3b1dea7 --- /dev/null +++ b/packages/perl/libdbi-perl-native_1.607.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libdbi-perl_${PV}.bb diff --git a/packages/perl/libdbi-perl_1.607.bb b/packages/perl/libdbi-perl_1.607.bb new file mode 100644 index 0000000000..af6853544c --- /dev/null +++ b/packages/perl/libdbi-perl_1.607.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Various MIME modules." +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r0" + +RDEPENDS = "perl-module-scalar-util \ + perl-module-file-spec \ + perl-module-storable \ + perl-module-test-simple" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-1.607.tar.gz" + +S = "${WORKDIR}/DBI-${PV}" + +inherit cpan diff --git a/packages/perl/libdevice-serialport-perl-native_1.04.bb b/packages/perl/libdevice-serialport-perl-native_1.04.bb new file mode 100644 index 0000000000..af3b2dfeec --- /dev/null +++ b/packages/perl/libdevice-serialport-perl-native_1.04.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libdevice-serialport-perl_${PV}.bb diff --git a/packages/perl/libemail-date-format-perl-native_1.002.bb b/packages/perl/libemail-date-format-perl-native_1.002.bb new file mode 100644 index 0000000000..ebae345876 --- /dev/null +++ b/packages/perl/libemail-date-format-perl-native_1.002.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libemail-date-format-perl_${PV}.bb diff --git a/packages/perl/libemail-date-format-perl_1.002.bb b/packages/perl/libemail-date-format-perl_1.002.bb new file mode 100644 index 0000000000..d83dac00bd --- /dev/null +++ b/packages/perl/libemail-date-format-perl_1.002.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Various MIME modules." +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r0" + +RDEPENDS = "perl-module-test-more \ + perl-module-time-local" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Date-Format-${PV}.tar.gz" + +S = "${WORKDIR}/Email-Date-Format-${PV}" + +inherit cpan diff --git a/packages/perl/libhtml-parser-perl_3.60.bb b/packages/perl/libhtml-parser-perl_3.60.bb new file mode 100644 index 0000000000..08525331db --- /dev/null +++ b/packages/perl/libhtml-parser-perl_3.60.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "HTML Parser bits." +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r0" + +RDEPENDS = "perl-module-test-more \ + perl-module-xsloader \ + perl-module-test-simple \ + libhtml-tagset-perl" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.60.tar.gz" + +S = "${WORKDIR}/HTML-Parser-${PV}" + +inherit cpan diff --git a/packages/perl/libhtml-tagset-perl_3.20.bb b/packages/perl/libhtml-tagset-perl_3.20.bb new file mode 100644 index 0000000000..788c37e094 --- /dev/null +++ b/packages/perl/libhtml-tagset-perl_3.20.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "HTML Tagset bits." +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r0" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz" + +S = "${WORKDIR}/HTML-Tagset-${PV}" + +inherit cpan diff --git a/packages/perl/libmime-lite-perl-native_3.024.bb b/packages/perl/libmime-lite-perl-native_3.024.bb new file mode 100644 index 0000000000..50be9e11ff --- /dev/null +++ b/packages/perl/libmime-lite-perl-native_3.024.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libmime-lite-perl_${PV}.bb diff --git a/packages/perl/libmime-lite-perl_3.024.bb b/packages/perl/libmime-lite-perl_3.024.bb new file mode 100644 index 0000000000..80de33330f --- /dev/null +++ b/packages/perl/libmime-lite-perl_3.024.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Simple standalone module for generating MIME messages." +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r0" + +RDEPENDS = "perl-module-file-spec \ + libemail-date-format-perl \ + perl-module-test-more \ + perl-module-time-local" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/MIME-Lite-3.024.tar.gz" + +S = "${WORKDIR}/MIME-Lite-${PV}" + +inherit cpan diff --git a/packages/perl/libmodule-load-perl-native_0.16.bb b/packages/perl/libmodule-load-perl-native_0.16.bb new file mode 100644 index 0000000000..f09c3f9741 --- /dev/null +++ b/packages/perl/libmodule-load-perl-native_0.16.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libmodule-load-perl_${PV}.bb diff --git a/packages/perl/libmodule-load-perl_0.16.bb b/packages/perl/libmodule-load-perl_0.16.bb new file mode 100644 index 0000000000..1d5a3ebeab --- /dev/null +++ b/packages/perl/libmodule-load-perl_0.16.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "A module loading thingy for perl." +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r0" + +RDEPENDS = "perl-module-test-more" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Module-Load-0.16.tar.gz" + +S = "${WORKDIR}/Module-Load-${PV}" + +inherit cpan diff --git a/packages/perl/libphp-serialization-perl-native_0.30.bb b/packages/perl/libphp-serialization-perl-native_0.30.bb new file mode 100644 index 0000000000..9f83c5cc5a --- /dev/null +++ b/packages/perl/libphp-serialization-perl-native_0.30.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libphp-serialization-perl_${PV}.bb diff --git a/packages/perl/libphp-serialization-perl_0.30.bb b/packages/perl/libphp-serialization-perl_0.30.bb new file mode 100644 index 0000000000..07dd7de7e5 --- /dev/null +++ b/packages/perl/libphp-serialization-perl_0.30.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "The standard database interface module for Perl." +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r0" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.30.tar.gz" + +S = "${WORKDIR}/PHP-Serialization-${PV}" + +inherit cpan diff --git a/packages/perl/libx10-perl-native_0.03.bb b/packages/perl/libx10-perl-native_0.03.bb new file mode 100644 index 0000000000..bc5702d42f --- /dev/null +++ b/packages/perl/libx10-perl-native_0.03.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libx10-perl_${PV}.bb diff --git a/packages/perl/libx10-perl_0.03.bb b/packages/perl/libx10-perl_0.03.bb new file mode 100644 index 0000000000..bd76e2060d --- /dev/null +++ b/packages/perl/libx10-perl_0.03.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "X10 support for Perl." +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r0" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/X10-0.03.tar.gz" + +S = "${WORKDIR}/X10-${PV}" + +inherit cpan diff --git a/packages/python/python-pyflakes_0.2.1.bb b/packages/python/python-pyflakes_0.3.0.bb index 8be6d54478..4a6580ea05 100644 --- a/packages/python/python-pyflakes_0.2.1.bb +++ b/packages/python/python-pyflakes_0.3.0.bb @@ -4,9 +4,9 @@ HOMEPAGE = "http://divmod.org/projects/pyflakes" PRIORITY = "optional" LICENSE = "BSD" SRCNAME = "pyflakes" -PR = "ml1" +PR = "ml0" -SRC_URI = "http://www.divmod.org/static/projects/pyflakes/pyflakes-${PV}.tar.gz" +SRC_URI = "http://pypi.python.org/packages/source/p/pyflakes/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils diff --git a/packages/samba/files/configure-3.2.7.patch b/packages/samba/files/configure-3.2.8.patch index 94d684813e..2668b9d632 100644 --- a/packages/samba/files/configure-3.2.7.patch +++ b/packages/samba/files/configure-3.2.8.patch @@ -1,25 +1,31 @@ -diff -urN source.old/configure source/configure ---- source.old/configure 2008-11-20 14:45:08.000000000 +0000 -+++ source/configure 2008-11-30 17:53:02.116791281 +0000 -@@ -40777,11 +40777,10 @@ +diff -urN source.old//configure source//configure +--- source.old//configure 2009-02-03 16:34:41.000000000 +0000 ++++ source//configure 2009-02-06 00:25:49.502205687 +0000 +@@ -43860,13 +43860,14 @@ *linux*) # glibc <= 2.3.2 has a broken getgrouplist if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling +-$as_echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+# { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -+# echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} -+# { (exit 1); exit 1; }; } +- { (exit 1); exit 1; }; }; } ++# { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++#{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++#See \`config.log' for more details." >&5 ++#$as_echo "$as_me: error: cannot run test program while cross compiling ++#See \`config.log' for more details." >&2;} ++# { (exit 1); exit 1; }; }; } +linux_getgrouplist_ok=no else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -diff -urN source.old/configure.in source/configure.in ---- source.old/configure.in 2008-11-18 15:17:17.000000000 +0000 -+++ source/configure.in 2008-11-30 17:33:10.960791551 +0000 +diff -urN source.old//configure.in source//configure.in +--- source.old//configure.in 2009-02-03 16:10:07.000000000 +0000 ++++ source//configure.in 2009-02-06 00:23:27.346211236 +0000 @@ -275,6 +275,8 @@ fi AC_SUBST(BROKEN_CC) @@ -58,7 +64,7 @@ diff -urN source.old/configure.in source/configure.in ], samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv__CC_NEGATIVE_ENUM_VALUES=no)]) if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then -@@ -1187,22 +1175,12 @@ +@@ -1204,22 +1192,12 @@ case "$host_os" in *linux*) # glibc <= 2.3.2 has a broken getgrouplist diff --git a/packages/samba/files/smb.conf b/packages/samba/files/smb.conf index 3854621c3e..f07e3e4ec7 100644 --- a/packages/samba/files/smb.conf +++ b/packages/samba/files/smb.conf @@ -160,7 +160,7 @@ #============================ Share Definitions ============================== [homes] comment = Home Directories - browseable = no + browseable = yes writable = yes # Un-comment the following and create the netlogon directory for Domain Logons diff --git a/packages/samba/samba-ads.inc b/packages/samba/samba-ads.inc index 1249528fdb..fee61a7a81 100644 --- a/packages/samba/samba-ads.inc +++ b/packages/samba/samba-ads.inc @@ -1,4 +1,6 @@ -DEPENDS += " openldap krb5" +# openldap and kerberos are for active directory support +# netatalk is needed to support a vfs module +DEPENDS += " openldap krb5 netatalk" EXTRA_OECONF += "\ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ @@ -26,12 +28,12 @@ RCONFLICTS_cifs-ads-doc = "cifs-doc" RCONFLICTS_smbfs-ads = "smbfs" RCONFLICTS_swat-ads = "swat" -FILES_cifs-ads= "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs" +FILES_cifs-ads = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs" FILES_cifs-ads-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8" FILES_libsmbclient-ads = "${libdir}/libsmbclient.so.*" FILES_libsmbclient-ads-dev = "${libdir}/libsmbclient.so ${includedir}" FILES_smbfs-ads = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb" -FILES_swat-ads = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" +FILES_swat-ads = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" do_configure() { oe_runconf diff --git a/packages/samba/samba-ads_3.2.7.bb b/packages/samba/samba-ads_3.2.8.bb index 83b4416625..944fc792e0 100644 --- a/packages/samba/samba-ads_3.2.7.bb +++ b/packages/samba/samba-ads_3.2.8.bb @@ -4,7 +4,7 @@ require samba-ads.inc PR = "r1" SRC_URI += "file://config-lfs.patch;patch=1 \ file://quota.patch;patch=1;pnum=0 \ - file://configure-3.2.7.patch;patch=1 \ + file://configure-3.2.8.patch;patch=1 \ file://config-h.patch;patch=1 \ file://mtab.patch;patch=1 \ " diff --git a/packages/samba/samba-ads_3.3.0.bb b/packages/samba/samba-ads_3.3.0.bb index 7688fd6703..a2f2e2c47a 100644 --- a/packages/samba/samba-ads_3.3.0.bb +++ b/packages/samba/samba-ads_3.3.0.bb @@ -1,7 +1,7 @@ require samba.inc require samba-ads.inc -PR = "r1" +PR = "r2" SRC_URI += "file://config-lfs.patch;patch=1 \ file://quota.patch;patch=1;pnum=0 \ file://configure-3.3.0.patch;patch=1 \ diff --git a/packages/samba/samba_3.2.7.bb b/packages/samba/samba_3.2.8.bb index 49ff24a646..57f5753fce 100644 --- a/packages/samba/samba_3.2.7.bb +++ b/packages/samba/samba_3.2.8.bb @@ -1,12 +1,12 @@ require samba.inc require samba-basic.inc -SRC_URI += "file://configure-3.2.7.patch;patch=1 \ +SRC_URI += "file://configure-3.2.8.patch;patch=1 \ file://config-h.patch;patch=1 \ file://mtab.patch;patch=1 \ " -PR = "r4" +PR = "r0" EXTRA_OECONF += "\ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb index 3d69256e64..1a74f15ad1 100644 --- a/packages/tasks/task-boot.bb +++ b/packages/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r47" +PR = "r48" inherit task diff --git a/packages/u-boot/u-boot-1.3.2/boc01/001-090115-SPI.patch b/packages/u-boot/u-boot-1.3.2/boc01/001-090205-SPI.patch index 96b624b3a1..6c0ed5c36a 100644 --- a/packages/u-boot/u-boot-1.3.2/boc01/001-090115-SPI.patch +++ b/packages/u-boot/u-boot-1.3.2/boc01/001-090205-SPI.patch @@ -1,7 +1,7 @@ Index: u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c =================================================================== ---- u-boot-1.3.2.orig/board/freescale/mpc8313erdb/mpc8313erdb.c 2009-01-15 10:51:45.000000000 +0100 -+++ u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c 2009-01-15 12:18:31.000000000 +0100 +--- u-boot-1.3.2.orig/board/freescale/mpc8313erdb/mpc8313erdb.c ++++ u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c @@ -28,6 +28,7 @@ #endif #include <pci.h> @@ -10,7 +10,7 @@ Index: u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c DECLARE_GLOBAL_DATA_PTR; -@@ -107,3 +108,29 @@ +@@ -107,3 +108,33 @@ void ft_board_setup(void *blob, bd_t *bd #endif } #endif @@ -21,12 +21,16 @@ Index: u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c + */ +#ifdef CONFIG_HARD_SPI + -+void spi_rfid_chipsel(int cs) ++#define SPI_CS_MASK 0x80000000 ++ ++void spi_eeprom_chipsel(int cs) +{ -+ if(cs) -+ gpio_clear(14); ++ volatile gpio83xx_t *iopd = &((immap_t *)CFG_IMMR)->gpio[0]; ++ ++ if (cs) ++ iopd->dat &= ~SPI_CS_MASK; + else -+ gpio_set(14); ++ iopd->dat |= SPI_CS_MASK; +} + +/* @@ -34,7 +38,7 @@ Index: u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c + * chip selects. + */ +spi_chipsel_type spi_chipsel[] = { -+ spi_rfid_chipsel, ++ spi_eeprom_chipsel, +}; +int spi_chipsel_cnt = sizeof(spi_chipsel) / sizeof(spi_chipsel[0]); + @@ -42,8 +46,8 @@ Index: u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c + Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h =================================================================== ---- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h 2009-01-15 10:51:51.000000000 +0100 -+++ u-boot-1.3.2/include/configs/MPC8313ERDB.h 2009-01-15 12:16:57.000000000 +0100 +--- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h ++++ u-boot-1.3.2/include/configs/MPC8313ERDB.h @@ -369,6 +369,7 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_NAND @@ -66,8 +70,8 @@ Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h */ Index: u-boot-1.3.2/drivers/spi/mpc8xxx_spi.c =================================================================== ---- u-boot-1.3.2.orig/drivers/spi/mpc8xxx_spi.c 2009-01-15 10:52:30.000000000 +0100 -+++ u-boot-1.3.2/drivers/spi/mpc8xxx_spi.c 2009-01-15 10:53:23.000000000 +0100 +--- u-boot-1.3.2.orig/drivers/spi/mpc8xxx_spi.c ++++ u-boot-1.3.2/drivers/spi/mpc8xxx_spi.c @@ -34,6 +34,8 @@ #define SPI_MODE_REV (0x80000000 >> 5) /* Reverse mode - MSB first */ #define SPI_MODE_MS (0x80000000 >> 6) /* Always master */ @@ -77,7 +81,7 @@ Index: u-boot-1.3.2/drivers/spi/mpc8xxx_spi.c #define SPI_TIMEOUT 1000 -@@ -45,9 +47,7 @@ +@@ -45,9 +47,7 @@ void spi_init(void) * SPI pins on the MPC83xx are not muxed, so all we do is initialize * some registers */ diff --git a/packages/u-boot/u-boot-1.3.2/boc01/010-081212-LCD.patch b/packages/u-boot/u-boot-1.3.2/boc01/010-081212-LCD.patch index 07c7b3840a..33a0c761f9 100644 --- a/packages/u-boot/u-boot-1.3.2/boc01/010-081212-LCD.patch +++ b/packages/u-boot/u-boot-1.3.2/boc01/010-081212-LCD.patch @@ -181,7 +181,7 @@ Index: u-boot-1.3.2/common/cmd_lcd.c =================================================================== --- /dev/null +++ u-boot-1.3.2/common/cmd_lcd.c -@@ -0,0 +1,243 @@ +@@ -0,0 +1,237 @@ +/* + * (C) Copyright 2008 + * Alexandre Coffignal, CénoSYS, alexandre.coffignal@cenosys.com @@ -216,13 +216,6 @@ Index: u-boot-1.3.2/common/cmd_lcd.c +#define DELAY 1 +#define AEL 0x0F + -+static void NT7506_init_lcd(char ael); -+static void NT7506_print_splash(char * Picture,char width,char height); -+static void NT7506_set_xaddr(unsigned char x); -+static void NT7506_set_yaddr(unsigned char y); -+static void NT7506_writeb_data(unsigned char value); -+static void NT7506_writeb_ctl(unsigned char value); -+static void iowrite16(unsigned short value); + +static void iowrite16(unsigned short value) +{ @@ -269,7 +262,7 @@ Index: u-boot-1.3.2/common/cmd_lcd.c + NT7506_writeb_ctl(NT_COL_LSB | (x & 0x0F) ); //Send low nibble +} + -+static void ImageRota(char * src,char * dest, int w ,int h) ++static void ImageRota(unsigned char *src, unsigned char *dest, int w ,int h) +{ + int i,j,bit,IndexRead; + char mask=0; @@ -290,14 +283,13 @@ Index: u-boot-1.3.2/common/cmd_lcd.c +} + + -+static void NT7506_print_splash(char * picture,char width,char height) ++static void NT7506_print_splash(unsigned char *picture, char width, char height) +{ + int i; -+ char value; -+ char imagerota[2048]; ++ unsigned char imagerota[2048]; + int indeximage=0; + -+ int x,y,xfb,yfb,Index; ++ int x,y,xfb,yfb; + char src[2048]; + if(width>128) + width=128; @@ -379,7 +371,7 @@ Index: u-boot-1.3.2/common/cmd_lcd.c + + +/**************************************************/ -+void do_lcd(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) ++int do_lcd(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +{ + char lcd_ael=AEL; + if(argc>1) @@ -390,6 +382,8 @@ Index: u-boot-1.3.2/common/cmd_lcd.c + + NT7506_init_lcd(lcd_ael); + NT7506_print_splash(Bollore_bits,Bollore_width,Bollore_height); ++ ++ return 0; +} + +U_BOOT_CMD( @@ -398,7 +392,7 @@ Index: u-boot-1.3.2/common/cmd_lcd.c + "lcd\n" +); + -+void do_backlight(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) ++int do_backlight(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) +{ + if (!strncmp(argv[1], "on", 7)) + { diff --git a/packages/u-boot/u-boot-1.3.2/boc01/013-081211-FIX_OOB_8BITS_LARGEPAGE_NAND.patch b/packages/u-boot/u-boot-1.3.2/boc01/013-081211-FIX_OOB_8BITS_LARGEPAGE_NAND.patch deleted file mode 100644 index 911dd2907e..0000000000 --- a/packages/u-boot/u-boot-1.3.2/boc01/013-081211-FIX_OOB_8BITS_LARGEPAGE_NAND.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: u-boot-1.3.2/drivers/mtd/nand/nand_bbt.c -=================================================================== ---- u-boot-1.3.2.orig/drivers/mtd/nand/nand_bbt.c 2008-12-11 10:15:52.000000000 +0100 -+++ u-boot-1.3.2/drivers/mtd/nand/nand_bbt.c 2008-12-11 10:16:39.000000000 +0100 -@@ -914,10 +914,11 @@ - .pattern = scan_ff_pattern - }; - -+//Samsung makes sure that either the 1st or 2nd page of every initial invalid block has non-FFh data at the column address of 2048. - static struct nand_bbt_descr largepage_memorybased = { - .options = 0, - .offs = 0, -- .len = 2, -+ .len = 1, - .pattern = scan_ff_pattern - }; - diff --git a/packages/u-boot/u-boot-1.3.2/boc01/013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch b/packages/u-boot/u-boot-1.3.2/boc01/013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch new file mode 100644 index 0000000000..803b46d8e9 --- /dev/null +++ b/packages/u-boot/u-boot-1.3.2/boc01/013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch @@ -0,0 +1,29 @@ +Index: u-boot-1.3.2/drivers/mtd/nand/nand_bbt.c +=================================================================== +--- u-boot-1.3.2.orig/drivers/mtd/nand/nand_bbt.c 2008-03-09 16:20:02.000000000 +0100 ++++ u-boot-1.3.2/drivers/mtd/nand/nand_bbt.c 2009-02-06 14:50:35.000000000 +0100 +@@ -914,10 +914,11 @@ + .pattern = scan_ff_pattern + }; + ++//Samsung makes sure that either the 1st or 2nd page of every initial invalid block has non-FFh data at the column address of 2048. + static struct nand_bbt_descr largepage_memorybased = { + .options = 0, + .offs = 0, +- .len = 2, ++ .len = 1, + .pattern = scan_ff_pattern + }; + +Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h +=================================================================== +--- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h 2009-02-06 15:42:07.000000000 +0100 ++++ u-boot-1.3.2/include/configs/MPC8313ERDB.h 2009-02-06 15:42:45.000000000 +0100 +@@ -205,6 +205,7 @@ + | BR_MS_FCM /* MSEL = FCM */ \ + | BR_V ) /* valid */ + #define CFG_OR1_PRELIM ( 0xFFFF8000 /* length 32K */ \ ++ | OR_FCM_PGS \ + | OR_FCM_CSCT \ + | OR_FCM_CST \ + | OR_FCM_CHT \ diff --git a/packages/u-boot/u-boot-1.3.2/boc01/014-081211-BOOT_RESCUE.patch b/packages/u-boot/u-boot-1.3.2/boc01/014-081211-BOOT_RESCUE.patch index e18055e64c..d2ebdef772 100644 --- a/packages/u-boot/u-boot-1.3.2/boc01/014-081211-BOOT_RESCUE.patch +++ b/packages/u-boot/u-boot-1.3.2/boc01/014-081211-BOOT_RESCUE.patch @@ -2,7 +2,15 @@ Index: u-boot-1.3.2/common/main.c =================================================================== --- u-boot-1.3.2.orig/common/main.c +++ u-boot-1.3.2/common/main.c -@@ -377,6 +377,15 @@ void main_loop (void) +@@ -39,6 +39,7 @@ + #endif + + #include <post.h> ++#include <gpio.h> + + #ifdef CONFIG_SILENT_CONSOLE + DECLARE_GLOBAL_DATA_PTR; +@@ -377,6 +378,15 @@ void main_loop (void) } else #endif /* CONFIG_BOOTCOUNT_LIMIT */ @@ -22,7 +30,7 @@ Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h =================================================================== --- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h +++ u-boot-1.3.2/include/configs/MPC8313ERDB.h -@@ -405,6 +405,7 @@ +@@ -406,6 +406,7 @@ #define PRE_INIT_GPIO 0x28 #define INIT_GPIO 0x08 #define MAX_GPIO_OUT 7 @@ -30,7 +38,7 @@ Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h /* Digital Thermometer and Thermostat */ #define CONFIG_DTT_LM73 1 -@@ -558,6 +559,7 @@ +@@ -559,6 +560,7 @@ * Environment Configuration */ #define CONFIG_ENV_OVERWRITE diff --git a/packages/u-boot/u-boot-1.3.2/boc01/015-090205-EMC.patch b/packages/u-boot/u-boot-1.3.2/boc01/015-090205-EMC.patch new file mode 100644 index 0000000000..afc43c47ed --- /dev/null +++ b/packages/u-boot/u-boot-1.3.2/boc01/015-090205-EMC.patch @@ -0,0 +1,31 @@ +Index: u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c +=================================================================== +--- u-boot-1.3.2.orig/board/freescale/mpc8313erdb/mpc8313erdb.c ++++ u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c +@@ -135,8 +135,9 @@ void pci_init_board(void) + struct pci_region *reg[] = { pci_regions }; + int warmboot; + +- /* Enable all 3 PCI_CLK_OUTPUTs. */ +- clk->occr |= 0xe0000000; ++ /* Enable PCI_CLK_OUTPUT 1 only. ++ Disable others for better EMC footprint. */ ++ clk->occr = (clk->occr & 0x1fffffff) | OCCR_PCICOE1; + + /* + * Configure PCI Local Access Windows +Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h +=================================================================== +--- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h ++++ u-boot-1.3.2/include/configs/MPC8313ERDB.h +@@ -133,8 +133,8 @@ + #define CFG_DDR_CLK_CNTL DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05 + /*0x02000000*/ + #define CFG_DDRCDR_VALUE ( DDRCDR_EN \ +- | DDRCDR_PZ_NOMZ \ +- | DDRCDR_NZ_NOMZ \ ++ | DDRCDR_PZ_MAXZ \ ++ | DDRCDR_NZ_MAXZ \ + | DDRCDR_M_ODR ) + + /* diff --git a/packages/u-boot/u-boot-1.3.2/boc01/016-090209-PM.patch b/packages/u-boot/u-boot-1.3.2/boc01/016-090209-PM.patch new file mode 100644 index 0000000000..940e4ae40c --- /dev/null +++ b/packages/u-boot/u-boot-1.3.2/boc01/016-090209-PM.patch @@ -0,0 +1,56 @@ +Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h +=================================================================== +--- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h ++++ u-boot-1.3.2/include/configs/MPC8313ERDB.h +@@ -60,7 +60,7 @@ + * to access the PMC registers, unless a JTAG debugger is + * connected, or some resistor modifications are made. + */ +-#define CFG_8313ERDB_BROKEN_PMC 1 ++#undef CFG_8313ERDB_BROKEN_PMC + + #define CFG_ACR_PIPE_DEP 3 /* Arbiter pipeline depth (0-3) */ + #define CFG_ACR_RPTCNT 3 /* Arbiter repeat count (0-7) */ +Index: u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c +=================================================================== +--- u-boot-1.3.2.orig/board/freescale/mpc8313erdb/mpc8313erdb.c ++++ u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c +@@ -30,6 +30,7 @@ + #include <mpc83xx.h> + #include <spi.h> + #include <gpio.h> ++#include <asm/processor.h> + + DECLARE_GLOBAL_DATA_PTR; + +@@ -39,7 +40,29 @@ int board_early_init_f(void) + volatile immap_t *im = (immap_t *)CFG_IMMR; + + if (im->pmc.pmccr1 & PMCCR1_POWER_OFF) +- gd->flags |= GD_FLG_SILENT; ++ { ++ volatile immap_t *immap = (immap_t *) CFG_IMMR; ++ ulong msr; ++ /* Interrupts and MMU off */ ++ __asm__ __volatile__ ("mfmsr %0":"=r" (msr):); ++ ++ msr &= ~( MSR_EE | MSR_IR | MSR_DR); ++ __asm__ __volatile__ ("mtmsr %0"::"r" (msr)); ++ ++ /* enable Reset Control Reg */ ++ immap->reset.rpr = 0x52535445; ++ __asm__ __volatile__ ("sync"); ++ __asm__ __volatile__ ("isync"); ++ ++ /* confirm Reset Control Reg is enabled */ ++ while(!((immap->reset.rcer) & RCER_CRE)); ++ ++ udelay(200); ++ ++ /* perform reset, only one bit */ ++ immap->reset.rcr = RCR_SWHR; ++ } ++ + #endif + + return 0; diff --git a/packages/u-boot/u-boot_1.3.2.bb b/packages/u-boot/u-boot_1.3.2.bb index 003838a670..0ed92c70b8 100644 --- a/packages/u-boot/u-boot_1.3.2.bb +++ b/packages/u-boot/u-boot_1.3.2.bb @@ -2,7 +2,7 @@ require u-boot.inc DEFAULT_PREFERENCE = "-1" -PR = "r9" +PR = "r10" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2" @@ -22,9 +22,10 @@ SRC_URI_append_boc01 = "\ file://mpc8313e-rdb-nand.patch;patch=1 \ file://mpc8313e-rdb-mtdparts.patch;patch=1 \ file://mpc8313e-rdb-eeprom.patch;patch=1 \ - file://001-090115-SPI.patch;patch=1 \ + file://001-090205-SPI.patch;patch=1 \ file://002-081212-GPIO.patch;patch=1 \ file://003-081205-DTT_LM73.patch;patch=1 \ + file://004-081205-WATCHDOG.patch;patch=1 \ file://006-081211-EEPROM_M24C32.patch;patch=1 \ file://007-090112-CAPSENSE.patch;patch=1 \ file://008-090107-TSEC.patch;patch=1 \ @@ -32,8 +33,10 @@ SRC_URI_append_boc01 = "\ file://010-081212-LCD.patch;patch=1 \ file://011-081211-CMD_TEST.patch;patch=1 \ file://012-081209-BUG_SETENV.patch;patch=1 \ - file://013-081211-FIX_OOB_8BITS_LARGEPAGE_NAND.patch;patch=1 \ + file://013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch;patch=1 \ file://014-081211-BOOT_RESCUE.patch;patch=1 \ + file://015-090205-EMC.patch;patch=1 \ + file://016-090209-PM.patch;patch=1 \ " PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am index 7aec061bd2..c74e1fa428 100644 --- a/packages/webkit/webkit-gtk/GNUmakefile.am +++ b/packages/webkit/webkit-gtk/GNUmakefile.am @@ -77,7 +77,7 @@ no_undefined = -no-undefined endif if OS_GNU -version_script = -Wl,--version-script,$(srcdir)/symbols.filter +version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter endif # Shared libraries @@ -121,7 +121,7 @@ libJavaScriptCore_la_SOURCES = \ libJavaScriptCore_la_LIBADD = \ $(UNICODE_LIBS) \ - $(GLOBALDEPS_LIBS) \ + $(GLIB_LIBS) \ -lpthread libJavaScriptCore_la_CXXFLAGS = \ @@ -132,7 +132,7 @@ libJavaScriptCore_la_CFLAGS = \ -fstrict-aliasing \ -O3 \ $(global_cflags) \ - $(GLOBALDEPS_CFLAGS) \ + $(GLIB_CFLAGS) \ $(UNICODE_CFLAGS) libJavaScriptCore_la_CPPFLAGS = \ @@ -167,7 +167,7 @@ libWebCore_la_CXXFLAGS = \ libWebCore_la_CFLAGS = \ -fno-strict-aliasing \ $(global_cflags) \ - $(GLOBALDEPS_CFLAGS) \ + $(GLIB_CFLAGS) \ $(UNICODE_CFLAGS) \ $(LIBXML_CFLAGS) \ $(CAIRO_CFLAGS) \ @@ -181,7 +181,8 @@ libWebCore_la_CFLAGS = \ $(GSTREAMER_CFLAGS) \ $(LIBXSLT_CFLAGS) \ $(COVERAGE_CFLAGS) \ - $(HILDON_CFLAGS) + $(HILDON_CFLAGS) \ + $(GEOCLUE_CFLAGS) libWebCore_la_CPPFLAGS = \ $(global_cppflags) \ @@ -194,7 +195,7 @@ libWebCore_la_LIBADD = \ libJavaScriptCore.la \ libWebCoreJS.la \ $(webcore_libadd) \ - $(GLOBALDEPS_LIBS) \ + $(GLIB_LIBS) \ $(LIBXML_LIBS) \ $(CAIRO_LIBS) \ $(PANGO_LIBS) \ @@ -210,6 +211,7 @@ libWebCore_la_LIBADD = \ $(HILDON_LIBS) \ $(JPEG_LIBS) \ $(PNG_LIBS) \ + $(GEOCLUE_LIBS) \ -lpthread # WebKit diff --git a/packages/webkit/webkit-gtk/acinclude.m4 b/packages/webkit/webkit-gtk/acinclude.m4 index 5353429010..e69de29bb2 100644 --- a/packages/webkit/webkit-gtk/acinclude.m4 +++ b/packages/webkit/webkit-gtk/acinclude.m4 @@ -1,359 +0,0 @@ -dnl dolt, a replacement for libtool -dnl Copyright © 2007-2008 Josh Triplett <josh@freedesktop.org> -dnl Copying and distribution of this file, with or without modification, -dnl are permitted in any medium without royalty provided the copyright -dnl notice and this notice are preserved. -dnl -dnl To use dolt, invoke the DOLT macro immediately after the libtool macros. -dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it -dnl installed when running autoconf on your project. - -AC_DEFUN([DOLT], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -# dolt, a replacement for libtool -# Josh Triplett <josh@freedesktop.org> -AC_PATH_PROG(DOLT_BASH, bash) -AC_MSG_CHECKING([if dolt supports this host]) -dolt_supported=yes -if test x$DOLT_BASH = x; then - dolt_supported=no -fi -if test x$GCC != xyes; then - dolt_supported=no -fi -case $host in -i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \ -|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*) - pic_options='-fPIC' - ;; -i?86-apple-darwin*) - pic_options='-fno-common' - ;; -*mingw32*) - pic_options='-DDLL_EXPORT' - ;; -*) - dolt_supported=no - ;; -esac -if test x$dolt_supported = xno ; then - AC_MSG_RESULT([no, falling back to libtool]) - LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)' - LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)' -else - AC_MSG_RESULT([yes, replacing libtool]) - -dnl Start writing out doltcompile. - cat <<__DOLTCOMPILE__EOF__ >doltcompile -#!$DOLT_BASH -__DOLTCOMPILE__EOF__ - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -args=("$[]@") -for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do - if test x"${args@<:@$arg@:>@}" = x-o ; then - objarg=$((arg+1)) - break - fi -done -if test x$objarg = x ; then - echo 'Error: no -o on compiler command line' 1>&2 - exit 1 -fi -lo="${args@<:@$objarg@:>@}" -obj="${lo%.lo}" -if test x"$lo" = x"$obj" ; then - echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2 - exit 1 -fi -objbase="${obj##*/}" -__DOLTCOMPILE__EOF__ - -dnl Write out shared compilation code. - if test x$enable_shared = xyes; then - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -libobjdir="${obj%$objbase}.libs" -if test ! -d "$libobjdir" ; then - mkdir_out="$(mkdir "$libobjdir" 2>&1)" - mkdir_ret=$? - if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then - echo "$mkdir_out" 1>&2 - exit $mkdir_ret - fi -fi -pic_object="$libobjdir/$objbase.o" -args@<:@$objarg@:>@="$pic_object" -__DOLTCOMPILE__EOF__ - cat <<__DOLTCOMPILE__EOF__ >>doltcompile -"\${args@<:@@@:>@}" $pic_options -DPIC || exit \$? -__DOLTCOMPILE__EOF__ - fi - -dnl Write out static compilation code. -dnl Avoid duplicate compiler output if also building shared objects. - if test x$enable_static = xyes; then - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -non_pic_object="$obj.o" -args@<:@$objarg@:>@="$non_pic_object" -__DOLTCOMPILE__EOF__ - if test x$enable_shared = xyes; then - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -"${args@<:@@@:>@}" >/dev/null 2>&1 || exit $? -__DOLTCOMPILE__EOF__ - else - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -"${args@<:@@@:>@}" || exit $? -__DOLTCOMPILE__EOF__ - fi - fi - -dnl Write out the code to write the .lo file. -dnl The second line of the .lo file must match "^# Generated by .*libtool" - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -{ -echo "# $lo - a libtool object file" -echo "# Generated by doltcompile, not libtool" -__DOLTCOMPILE__EOF__ - - if test x$enable_shared = xyes; then - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -echo "pic_object='.libs/${objbase}.o'" -__DOLTCOMPILE__EOF__ - else - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -echo pic_object=none -__DOLTCOMPILE__EOF__ - fi - - if test x$enable_static = xyes; then - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -echo "non_pic_object='${objbase}.o'" -__DOLTCOMPILE__EOF__ - else - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -echo non_pic_object=none -__DOLTCOMPILE__EOF__ - fi - - cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -} > "$lo" -__DOLTCOMPILE__EOF__ - -dnl Done writing out doltcompile; substitute it for libtool compilation. - chmod +x doltcompile - LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)' - LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)' - -dnl automake ignores LTCOMPILE and LTCXXCOMPILE when it has separate CFLAGS for -dnl a target, so write out a libtool wrapper to handle that case. -dnl Note that doltlibtool does not handle inferred tags or option arguments -dnl without '=', because automake does not use them. - cat <<__DOLTLIBTOOL__EOF__ > doltlibtool -#!$DOLT_BASH -__DOLTLIBTOOL__EOF__ - cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool -top_builddir_slash="${0%%doltlibtool}" -: ${top_builddir_slash:=./} -args=() -modeok=false -tagok=false -for arg in "$[]@"; do - case "$arg" in - --mode=compile) modeok=true ;; - --tag=CC|--tag=CXX) tagok=true ;; - *) args@<:@${#args[@]}@:>@="$arg" ;; - esac -done -if $modeok && $tagok ; then - . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" -else - exec ${top_builddir_slash}libtool "$[]@" -fi -__DOLTLIBTOOL__EOF__ - -dnl Done writing out doltlibtool; substitute it for libtool. - chmod +x doltlibtool - LIBTOOL='$(top_builddir)/doltlibtool' -fi -AC_SUBST(LTCOMPILE) -AC_SUBST(LTCXXCOMPILE) -# end dolt -]) - -# =========================================================================== -# http://autoconf-archive.cryp.to/ax_compare_version.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) -# -# DESCRIPTION -# -# This macro compares two version strings. Due to the various number of -# minor-version numbers that can exist, and the fact that string -# comparisons are not compatible with numeric comparisons, this is not -# necessarily trivial to do in a autoconf script. This macro makes doing -# these comparisons easy. -# -# The six basic comparisons are available, as well as checking equality -# limited to a certain number of minor-version levels. -# -# The operator OP determines what type of comparison to do, and can be one -# of: -# -# eq - equal (test A == B) -# ne - not equal (test A != B) -# le - less than or equal (test A <= B) -# ge - greater than or equal (test A >= B) -# lt - less than (test A < B) -# gt - greater than (test A > B) -# -# Additionally, the eq and ne operator can have a number after it to limit -# the test to that number of minor versions. -# -# eq0 - equal up to the length of the shorter version -# ne0 - not equal up to the length of the shorter version -# eqN - equal up to N sub-version levels -# neN - not equal up to N sub-version levels -# -# When the condition is true, shell commands ACTION-IF-TRUE are run, -# otherwise shell commands ACTION-IF-FALSE are run. The environment -# variable 'ax_compare_version' is always set to either 'true' or 'false' -# as well. -# -# Examples: -# -# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) -# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) -# -# would both be true. -# -# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) -# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) -# -# would both be false. -# -# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) -# -# would be true because it is only comparing two minor versions. -# -# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) -# -# would be true because it is only comparing the lesser number of minor -# versions of the two values. -# -# Note: The characters that separate the version numbers do not matter. An -# empty string is the same as version 0. OP is evaluated by autoconf, not -# configure, so must be a string, not a variable. -# -# The author would like to acknowledge Guido Draheim whose advice about -# the m4_case and m4_ifvaln functions make this macro only include the -# portions necessary to perform the specific comparison specified by the -# OP argument in the final configure script. -# -# LAST MODIFICATION -# -# 2008-04-12 -# -# COPYLEFT -# -# Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. - -dnl ######################################################################### -AC_DEFUN([AX_COMPARE_VERSION], [ - AC_PROG_AWK - - # Used to indicate true or false condition - ax_compare_version=false - - # Convert the two version strings to be compared into a format that - # allows a simple string comparison. The end result is that a version - # string of the form 1.12.5-r617 will be converted to the form - # 0001001200050617. In other words, each number is zero padded to four - # digits, and non digits are removed. - AS_VAR_PUSHDEF([A],[ax_compare_version_A]) - A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ - -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/[[^0-9]]//g'` - - AS_VAR_PUSHDEF([B],[ax_compare_version_B]) - B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ - -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ - -e 's/[[^0-9]]//g'` - - dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary - dnl # then the first line is used to determine if the condition is true. - dnl # The sed right after the echo is to remove any indented white space. - m4_case(m4_tolower($2), - [lt],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` - ], - [gt],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` - ], - [le],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` - ], - [ge],[ - ax_compare_version=`echo "x$A -x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` - ],[ - dnl Split the operator from the subversion count if present. - m4_bmatch(m4_substr($2,2), - [0],[ - # A count of zero means use the length of the shorter version. - # Determine the number of characters in A and B. - ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` - ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` - - # Set A to no more than B's length and B to no more than A's length. - A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` - B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` - ], - [[0-9]+],[ - # A count greater than zero means use only that many subversions - A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` - B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` - ], - [.+],[ - AC_WARNING( - [illegal OP numeric parameter: $2]) - ],[]) - - # Pad zeros at end of numbers to make same length. - ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" - B="$B`echo $A | sed 's/./0/g'`" - A="$ax_compare_version_tmp_A" - - # Check for equality or inequality as necessary. - m4_case(m4_tolower(m4_substr($2,0,2)), - [eq],[ - test "x$A" = "x$B" && ax_compare_version=true - ], - [ne],[ - test "x$A" != "x$B" && ax_compare_version=true - ],[ - AC_WARNING([illegal OP parameter: $2]) - ]) - ]) - - AS_VAR_POPDEF([A])dnl - AS_VAR_POPDEF([B])dnl - - dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. - if test "$ax_compare_version" = "true" ; then - m4_ifvaln([$4],[$4],[:])dnl - m4_ifvaln([$5],[else $5])dnl - fi -]) dnl AX_COMPARE_VERSION diff --git a/packages/webkit/webkit-gtk/autogen.sh b/packages/webkit/webkit-gtk/autogen.sh index a929538d20..f87238cf92 100644 --- a/packages/webkit/webkit-gtk/autogen.sh +++ b/packages/webkit/webkit-gtk/autogen.sh @@ -8,6 +8,10 @@ test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` cd $srcdir +LIBTOOLIZE_FLAGS="--force --automake" +ACLOCAL_FLAGS="-I autotools" +AUTOMAKE_FLAGS="--foreign --add-missing" + DIE=0 (autoconf --version) < /dev/null > /dev/null 2>&1 || { @@ -46,10 +50,10 @@ rm -rf $top_srcdir/autom4te.cache touch README INSTALL -aclocal || exit $? -$LIBTOOLIZE --force || exit $? +aclocal $ACLOCAL_FLAGS || exit $? +$LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $? autoheader || exit $? -automake --foreign --add-missing || exit $? +automake $AUTOMAKE_FLAGS || exit $? autoconf || exit $? cd $ORIGDIR || exit 1 diff --git a/packages/webkit/webkit-gtk/configure.ac b/packages/webkit/webkit-gtk/configure.ac index 7b451efe96..c7ed988329 100644 --- a/packages/webkit/webkit-gtk/configure.ac +++ b/packages/webkit/webkit-gtk/configure.ac @@ -6,6 +6,10 @@ m4_define([webkit_micro_version], [0]) AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) +AC_CONFIG_MACRO_DIR([autotools]) +AC_CONFIG_AUX_DIR([autotools]) +AC_SUBST(ACLOCAL_AMFLAGS, "-I autotools") + AC_CONFIG_HEADERS([autotoolsconfig.h]) AC_CANONICAL_SYSTEM @@ -23,10 +27,13 @@ dnl # see http://www.gnu.org/software/libtool/manual.html#Versioning LIBWEBKITGTK_VERSION=1:0:0 AC_SUBST([LIBWEBKITGTK_VERSION]) +# Recent libtool+automake don't assume you want C++, explicitly enable it +AC_PROG_CXX + AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) # host checking - inspired by the GTK+ configure.in -# TODO: os_mac, os_bsd +# TODO: move these to webkit.m4? AC_MSG_CHECKING([for native Win32]) case "$host" in *-*-mingw*) @@ -59,57 +66,14 @@ case "$host_os" in ;; esac -# If CXXFLAGS and CFLAGS are unset, default to empty. -# This is to tell automake not to include '-g' if CXXFLAGS is not set -# For more info - http://www.gnu.org/software/automake/manual/autoconf.html#C_002b_002b-Compiler -if test -z "$CXXFLAGS"; then - CXXFLAGS="" -fi -if test -z "$CFLAGS"; then - CFLAGS="" -fi - -AM_PROG_CC_STDC -AM_PROG_CC_C_O -AC_PROG_CXX -AC_PROG_INSTALL +# initialize webkit options +WEBKIT_INIT AC_DISABLE_STATIC AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL -AC_SYS_LARGEFILE +# use dolt to speedup the build DOLT -# check for -fvisibility=hidden compiler support (GCC >= 4) -saved_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" -AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden]) -AC_COMPILE_IFELSE([char foo;], - [ AC_MSG_RESULT([yes]) - SYMBOL_VISIBILITY="-fvisibility=hidden" SYMBOL_VISIBILITY_INLINES="-fvisibility-inlines-hidden" ], - AC_MSG_RESULT([no])) -CFLAGS="$saved_CFLAGS" -AC_SUBST(SYMBOL_VISIBILITY) -AC_SUBST(SYMBOL_VISIBILITY_INLINES) - -AC_PATH_PROG(PERL, perl) -if test -z "$PERL"; then - AC_MSG_ERROR([You need 'perl' to compile WebKit]) -fi - -AC_PATH_PROG(BISON, bison) -if test -z "$BISON"; then - AC_MSG_ERROR([You need the 'bison' parser generator to compile WebKit]) -else - case "$target_cpu" in - arm) - BISON_VERSION=`$BISON --version | head -n1 | sed 's,.*\ \([0-9]*\.[0-9]*\)$,\1,'` - AX_COMPARE_VERSION([2.2],[gt],[$BISON_VERSION], - echo "Autoconf say: I'm broken, ignore me") - ;; - *) ;; - esac -fi - AC_PATH_PROG(FLEX, flex) if test -z "$FLEX"; then AC_MSG_ERROR([You need the 'flex' lexer generator to compile WebKit]) @@ -124,34 +88,6 @@ if test -z "$GPERF"; then AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit]) fi -AC_PATH_PROG(MV, mv) -if test -z "$MV"; then - AC_MSG_ERROR([You need 'mv' to compile WebKit]) -fi - -# GTK+ port only -# Check for glib-genmarshal and glib-mkenums -AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) -AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) -if test -z "$GLIB_GENMARSHAL" || test -z "$GLIB_MKENUMS"; then - AC_MSG_ERROR([You need the GLib dev tools in your path]) -fi - -# Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it -# doesn't exist) -AC_LANG_PUSH([C++]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[],[AC_MSG_ERROR([No C++ compiler found])]) -AC_LANG_POP([C++]) - -# C/C++ Language Features -AC_C_CONST -AC_C_INLINE -AC_C_VOLATILE - -# C/C++ Headers -AC_HEADER_STDC -AC_HEADER_STDBOOL - # pthread (not needed on Windows) if test "$os_win32" = "no"; then AC_CHECK_HEADERS([pthread.h], @@ -183,12 +119,6 @@ if test "$jpeg_ok" = yes; then fi AC_SUBST([JPEG_LIBS]) -# check for pkg-config -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -if test "$PKG_CONFIG" = "no"; then - AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed in your PATH]) -fi - # Check for libpng the way Gtk+ does it AC_MSG_CHECKING(for libpng12) if $PKG_CONFIG --exists libpng12 ; then @@ -219,44 +149,6 @@ else fi AC_SUBST([PNG_LIBS]) -# determine the Unicode backend -AC_MSG_CHECKING([the Unicode backend to use]) -AC_ARG_WITH(unicode_backend, - AC_HELP_STRING([--with-unicode-backend=@<:@icu@:>@], - [Select Unicode backend [default=icu]]), - [],[unicode_backend="icu"]) - -case "$unicode_backend" in - icu) ;; - *) AC_MSG_ERROR([Invalid Unicode backend: must be icu.]) ;; -esac - -AC_MSG_RESULT([$unicode_backend]) - -if test "$unicode_backend" = "icu"; then - AC_PATH_PROG(icu_config, icu-config, no) - if test "$icu_config" = "no"; then - if test "$os_darwin" = "yes"; then - UNICODE_CFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu" - UNICODE_LIBS="-licucore" - elif test "$os_win32" = "yes"; then - UNICODE_CFLAGS="" - UNICODE_LIBS="-licuin -licuuc" - else - AC_MSG_ERROR([Cannot find icu-config. The ICU library is needed.]) - fi - else - # We don't use --cflags as this gives us a lot of things that we don't - # necessarily want, like debugging and optimization flags - # See man (1) icu-config for more info. - UNICODE_CFLAGS=`$icu_config --cppflags` - UNICODE_LIBS=`$icu_config --ldflags` - fi -fi - -AC_SUBST([UNICODE_CFLAGS]) -AC_SUBST([UNICODE_LIBS]) - # determine the GDK/GTK+ target AC_MSG_CHECKING([the target windowing system]) AC_ARG_WITH(target, @@ -307,9 +199,6 @@ FREETYPE2_REQUIRED_VERSION=9.0 LIBXML_REQUIRED_VERSION=2.6 # minimum GTK+ base dependencies -GLIB_REQUIRED_VERSION=2.0 -GOBJECT_REQUIRED_VERSION=2.0 -GTHREAD_REQUIRED_VERSION=2.0 PANGO_REQUIRED_VERSION=1.0 GTK_REQUIRED_VERSION=2.8 @@ -320,13 +209,14 @@ LIBXSLT_REQUIRED_VERSION=1.1.7 SQLITE_REQUIRED_VERSION=3.0 GSTREAMER_REQUIRED_VERSION=0.10 -PKG_CHECK_MODULES([GLOBALDEPS], - [glib-2.0 >= $GLIB_REQUIRED_VERSION - gobject-2.0 >= $GOBJECT_REQUIRED_VERSION - gthread-2.0 >= $GTHREAD_REQUIRED_VERSION]) -AC_SUBST([GLOBALDEPS_CFLAGS]) -AC_SUBST([GLOBALDEPS_LIBS]) - +# Available modules +# +# glib - glib and includes gthread +# unicode - check and identify which unicode backend to use +# +# todo: webcore gtk +WEBKIT_CHECK_DEPENDENCIES([glib unicode]) + PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION) AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_LIBS) @@ -456,8 +346,8 @@ AC_MSG_RESULT([$enable_xslt]) AC_MSG_CHECKING([whether to enable geolocation support]) AC_ARG_ENABLE(geolocation, AC_HELP_STRING([--enable-geolocation], - [enable support for geolocation [default=yes]]), - [],[enable_geolocation="yes"]) + [enable support for geolocation [default=no]]), + [],[enable_geolocation="no"]) AC_MSG_RESULT([$enable_geolocation]) # check whether to enable SVG support @@ -676,6 +566,14 @@ if test "$enable_xslt" = "yes"; then AC_SUBST([LIBXSLT_LIBS]) fi +# check if geoclue is available +if test "$enable_geolocation" = "yes"; then + PKG_CHECK_MODULES([GEOCLUE], [geoclue]) + AC_SUBST([GEOCLUE_CFLAGS]) + AC_SUBST([GEOCLUE_LIBS]) +fi + + # check if gstreamer is available if test "$enable_video" = "yes"; then PKG_CHECK_MODULES([GSTREAMER], diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 96ef562e75..98926727fe 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -1,11 +1,11 @@ DESCRIPTION = "WebKit browser engine, GTK+ edition" -DEPENDS = "curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs bison-native flex-native gperf-native perl-native sqlite3" +DEPENDS = "libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs bison-native flex-native gperf-native perl-native sqlite3" SRCREV_FORMAT = "webcore-rwebkit" # Yes, this is wrong... PV = "0.1+svnr${SRCREV}" -PR = "r7" +PR = "r8" SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ @@ -14,7 +14,7 @@ SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \ - file://acinclude.m4 \ + svn://svn.webkit.org/repository/webkit/trunk/;module=autotools;proto=http \ file://Makefile \ file://Makefile.shared \ file://autogen.sh \ @@ -29,13 +29,13 @@ inherit autotools pkgconfig lib_package export BISON="${STAGING_BINDIR_NATIVE}/bison" ARM_INSTRUCTION_SET = "arm" -# FIXME: Segfaulting without --with-http-backend=curl EXTRA_OECONF = "\ --enable-debug=no \ --enable-svg \ --enable-icon-database=yes \ - --with-http-backend=curl \ + --with-http-backend=soup \ " +EXTRA_AUTORECONF = " -I autotools " # Dolt gets used on x86 and ppc and hardcodes 'libtool' do_configure_append() { diff --git a/packages/wt/wt_2.2.3.bb b/packages/wt/wt_2.2.3.bb index ec0f3cc302..b9ab7580f8 100644 --- a/packages/wt/wt_2.2.3.bb +++ b/packages/wt/wt_2.2.3.bb @@ -2,8 +2,9 @@ DESCRIPTION = "A C++ Web Toolkit" PRIORITY = "optional" SECTION = "devel" LICENSE = "GPL" +HOMEPAGE = "http://www.webtoolkit.eu/wt" DEPENDS = "boost zlib openssl" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \ file://cmakelist.patch;patch=1" |