[oe-commits] org.oe.dev merge of '5df8864bb6077e592cab2f4f7568f207380225e4'

mickeyl commit oe at amethyst.openembedded.net
Fri Jun 13 20:17:55 UTC 2008


merge of '5df8864bb6077e592cab2f4f7568f207380225e4'
     and 'e2cb5d1e0ecaf7ec345106320eaa9ab93d254714'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: f2bae0b887cebbfdeec03d82dd0f7387168079af
ViewMTN: http://monotone.openembedded.org/revision/info/f2bae0b887cebbfdeec03d82dd0f7387168079af
Files:
1
packages/libmodplug/libmodplug_0.7.bb
packages/linux/linux-omap2-git/omap3evm/flash.patch
packages/u-boot/u-boot-git
packages/u-boot/u-boot-git/beagleboard
packages/u-boot/u-boot-omap3beagleboard-1.1.4
packages/aspell/aspell_0.60.6.bb
packages/images/neuros-osd-base-image.bb
packages/libmodplug/libmodplug_0.8.bb
packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff
packages/pulseaudio/pulseaudio-0.9.10/2113.diff
packages/pulseaudio/pulseaudio-0.9.10/2114.diff
packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch
packages/u-boot/u-boot-git/beagleboard/armv7-a.patch
packages/u-boot/u-boot-git/beagleboard/base.patch
packages/u-boot/u-boot-git/beagleboard/name.patch
packages/u-boot/u-boot-omap3beagleboard-1.1.4/500mhz-l2enable.patch
packages/u-boot/u-boot-omap3beagleboard-1.1.4/armv7-a.patch
packages/u-boot/u-boot-omap3beagleboard-1.1.4/disable-tone-logo.patch
packages/u-boot/u-boot-omap3beagleboard-1.1.4/env.patch
packages/u-boot/u-boot-omap3beagleboard-1.1.4/name.patch
packages/u-boot/u-boot-omap3beagleboard_1.1.4.bb
packages/xorg-app/constype_1.0.1.bb
packages/xorg-app/editres_1.0.3.bb
packages/xorg-app/fonttosfnt_1.0.4.bb
packages/xorg-app/fslsfonts_1.0.2.bb
packages/xorg-app/fstobdf_1.0.3.bb
packages/xorg-app/mkfontscale-native_1.0.5.bb
packages/xorg-app/mkfontscale_1.0.5.bb
packages/xorg-app/rendercheck_1.3.bb
packages/xorg-app/rgb_1.0.3.bb
packages/xorg-app/showfont_1.0.2.bb
packages/xorg-app/xdm_1.1.8.bb
packages/xorg-app/xdpyinfo_1.0.3.bb
packages/xorg-app/xfs_1.0.8.bb
packages/xorg-app/xfsinfo_1.0.2.bb
packages/xorg-app/xinit_1.0.9.bb
packages/xorg-app/xkbcomp-native_1.0.5.bb
packages/xorg-app/xkbcomp_1.0.5.bb
packages/xorg-doc/xorg-docs_1.4.bb
packages/xorg-driver/xf86-input-calcomp_1.1.2.bb
packages/xorg-driver/xf86-input-digitaledge_1.1.1.bb
packages/xorg-driver/xf86-input-dmc_1.1.2.bb
packages/xorg-driver/xf86-input-dynapro_1.1.2.bb
packages/xorg-driver/xf86-input-elo2300_1.1.2.bb
packages/xorg-driver/xf86-input-elographics_1.2.2.bb
packages/xorg-driver/xf86-input-evdev_1.99.4.bb
packages/xorg-driver/xf86-input-fpit_1.2.0.bb
packages/xorg-driver/xf86-input-hyperpen_1.2.0.bb
packages/xorg-driver/xf86-input-jamstudio_1.2.0.bb
packages/xorg-driver/xf86-input-keyboard_1.3.1.bb
packages/xorg-driver/xf86-input-magellan_1.2.0.bb
packages/xorg-driver/xf86-input-microtouch_1.2.0.bb
packages/xorg-driver/xf86-input-mouse_1.3.0.bb
packages/xorg-driver/xf86-input-mutouch_1.2.0.bb
packages/xorg-driver/xf86-input-palmax_1.2.0.bb
packages/xorg-driver/xf86-input-penmount_1.3.0.bb
packages/xorg-driver/xf86-input-summa_1.2.0.bb
packages/xorg-driver/xf86-input-tek4957_1.2.0.bb
packages/xorg-driver/xf86-input-vmmouse_12.5.1.bb
packages/xorg-driver/xf86-video-tdfx_1.4.0.bb
packages/xorg-driver/xf86-video-tseng_1.2.0.bb
packages/xorg-driver/xf86-video-v4l_0.2.0.bb
packages/xorg-driver/xf86-video-vmware_10.16.1.bb
packages/xorg-driver/xf86-video-voodoo_1.2.0.bb
packages/xorg-lib/libfs_1.0.1.bb
packages/xorg-lib/xtrans_1.2.bb
packages/xorg-util/util-macros-native_1.1.6.bb
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/machine/beagleboard.conf
conf/machine/efika.conf
conf/machine/include/tune-cortexa8.inc
conf/machine/omap3evm.conf
contrib/angstrom/sort.sh
packages/gcc/gcc-cross-kernel.inc
packages/imagemagick/imagemagick_6.3.5-10.bb
packages/images/beagleboard-demo-image.bb
packages/linux/linux-omap2_git.bb
packages/modplugplay/modplugplay_1.0.bb
packages/pulseaudio/pulseaudio_0.9.10.bb
packages/u-boot/u-boot_git.bb
packages/xorg-lib/libxau-native_1.0.3.bb
packages/python/python-pyyaml_3.05.bb
packages/tasks/task-python-everything.bb
Diffs:

#
# mt diff -r5df8864bb6077e592cab2f4f7568f207380225e4 -rf2bae0b887cebbfdeec03d82dd0f7387168079af
#
#
#
# delete "packages/libmodplug/libmodplug_0.7.bb"
# 
# delete "packages/linux/linux-omap2-git/omap3evm/flash.patch"
# 
# add_dir "packages/u-boot/u-boot-git"
# 
# add_dir "packages/u-boot/u-boot-git/beagleboard"
# 
# add_dir "packages/u-boot/u-boot-omap3beagleboard-1.1.4"
# 
# add_file "packages/aspell/aspell_0.60.6.bb"
#  content [fb6c580d1f0a1cf4f036860d2915c11469e286af]
# 
# add_file "packages/images/neuros-osd-base-image.bb"
#  content [c917176930daa9aa78c1264ea7bc13edf825a943]
# 
# add_file "packages/libmodplug/libmodplug_0.8.bb"
#  content [9f5b4b4484cfb77adc87ed92ec1ce75a00e63893]
# 
# add_file "packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff"
#  content [ed839a9f2631cfb7bfc8a8b341ca783a9e7f1c0c]
# 
# add_file "packages/pulseaudio/pulseaudio-0.9.10/2113.diff"
#  content [0046507a819e54bd7d7863b060daad48bfb88960]
# 
# add_file "packages/pulseaudio/pulseaudio-0.9.10/2114.diff"
#  content [8e4a6ffafeeb9ae461826916e50b44596f3a4c7d]
# 
# add_file "packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch"
#  content [3e84133dc42bed50437a4d5910f0ace625c11e93]
# 
# add_file "packages/u-boot/u-boot-git/beagleboard/armv7-a.patch"
#  content [4bba3fab6800af92473fa2e30a214f7fe8338a96]
# 
# add_file "packages/u-boot/u-boot-git/beagleboard/base.patch"
#  content [2a376b51f55582cc5b5c789d00814ed2c676f152]
# 
# add_file "packages/u-boot/u-boot-git/beagleboard/name.patch"
#  content [84ee1a8c95077d6b7039a5b6741e3e7e4f347b3f]
# 
# add_file "packages/u-boot/u-boot-omap3beagleboard-1.1.4/500mhz-l2enable.patch"
#  content [0fcdb7180195146ffc05fad9dc7b8dce467d43eb]
# 
# add_file "packages/u-boot/u-boot-omap3beagleboard-1.1.4/armv7-a.patch"
#  content [4bba3fab6800af92473fa2e30a214f7fe8338a96]
# 
# add_file "packages/u-boot/u-boot-omap3beagleboard-1.1.4/disable-tone-logo.patch"
#  content [5ba0ecb76f76bc6b45121bbcc625d9a7adf8b6f9]
# 
# add_file "packages/u-boot/u-boot-omap3beagleboard-1.1.4/env.patch"
#  content [1e3e02a73466c1fca367543f24870b8505797e43]
# 
# add_file "packages/u-boot/u-boot-omap3beagleboard-1.1.4/name.patch"
#  content [7ce3313577cab5c5cf32d98787bfe166c8442d6e]
# 
# add_file "packages/u-boot/u-boot-omap3beagleboard_1.1.4.bb"
#  content [6cd62d1c647948e82d12b805fec5851f18b4bd0d]
# 
# add_file "packages/xorg-app/constype_1.0.1.bb"
#  content [2f0ae1124192ed49e42f86d83315e1daf31f9455]
# 
# add_file "packages/xorg-app/editres_1.0.3.bb"
#  content [5361e8ab7dd90f1cea8b9152a91663b1ec187a3b]
# 
# add_file "packages/xorg-app/fonttosfnt_1.0.4.bb"
#  content [52d94d82365b66ca3b4c04ed041a17eae2597f49]
# 
# add_file "packages/xorg-app/fslsfonts_1.0.2.bb"
#  content [201bdc8e1a86c6bae647c9bb80930e4a705556a1]
# 
# add_file "packages/xorg-app/fstobdf_1.0.3.bb"
#  content [201bdc8e1a86c6bae647c9bb80930e4a705556a1]
# 
# add_file "packages/xorg-app/mkfontscale-native_1.0.5.bb"
#  content [a2aeeb8cea9d3804f3ffa4518284e24576fbd8fe]
# 
# add_file "packages/xorg-app/mkfontscale_1.0.5.bb"
#  content [eb9a0e3b72a797f86daf7ab1b696575c04cc4e1b]
# 
# add_file "packages/xorg-app/rendercheck_1.3.bb"
#  content [d39f134417dc18c7e0f8bc47cda3b300b1b0ce1d]
# 
# add_file "packages/xorg-app/rgb_1.0.3.bb"
#  content [5328d2f1e2d9b690be46ef9a18e1e5b203536d01]
# 
# add_file "packages/xorg-app/showfont_1.0.2.bb"
#  content [d051543a0af745209ab30f7e42ee0bb94362e955]
# 
# add_file "packages/xorg-app/xdm_1.1.8.bb"
#  content [30825809ec93214779ba18934104d6e0ceaa070e]
# 
# add_file "packages/xorg-app/xdpyinfo_1.0.3.bb"
#  content [457a02cd2a4177b8621fe769781020e5e78efa73]
# 
# add_file "packages/xorg-app/xfs_1.0.8.bb"
#  content [0f312249fdc3c96ad553e5eb574ba3fef73ff790]
# 
# add_file "packages/xorg-app/xfsinfo_1.0.2.bb"
#  content [201bdc8e1a86c6bae647c9bb80930e4a705556a1]
# 
# add_file "packages/xorg-app/xinit_1.0.9.bb"
#  content [11fa62b52d00712f372c7092ec265b4dae6c213a]
# 
# add_file "packages/xorg-app/xkbcomp-native_1.0.5.bb"
#  content [db40b6f945170186f920f081cbfe80999af64bc2]
# 
# add_file "packages/xorg-app/xkbcomp_1.0.5.bb"
#  content [fe1c963076ee2385eee973a5e034b6ab916e0384]
# 
# add_file "packages/xorg-doc/xorg-docs_1.4.bb"
#  content [8884ebcc8037c47f17d3237ed914693bfe87b536]
# 
# add_file "packages/xorg-driver/xf86-input-calcomp_1.1.2.bb"
#  content [decf1925caef5ee90fbc1f3229efd19ce76d504c]
# 
# add_file "packages/xorg-driver/xf86-input-digitaledge_1.1.1.bb"
#  content [2a0578061130af7499914c4c68c50cb354515bfd]
# 
# add_file "packages/xorg-driver/xf86-input-dmc_1.1.2.bb"
#  content [b16e5813ce5b2d77ab82f1772c66f0927b81b860]
# 
# add_file "packages/xorg-driver/xf86-input-dynapro_1.1.2.bb"
#  content [b447a0878534562285a317ca04d9b53a567976c8]
# 
# add_file "packages/xorg-driver/xf86-input-elo2300_1.1.2.bb"
#  content [9bcaa8881c8602d41ec33a34cee6d303607cf256]
# 
# add_file "packages/xorg-driver/xf86-input-elographics_1.2.2.bb"
#  content [0eca43ba102499cf7d66da3eea2f1357b5b19b86]
# 
# add_file "packages/xorg-driver/xf86-input-evdev_1.99.4.bb"
#  content [a87982a9bd27a1742c9e6bdb32d13fc88506d1b9]
# 
# add_file "packages/xorg-driver/xf86-input-fpit_1.2.0.bb"
#  content [2a0578061130af7499914c4c68c50cb354515bfd]
# 
# add_file "packages/xorg-driver/xf86-input-hyperpen_1.2.0.bb"
#  content [2a0578061130af7499914c4c68c50cb354515bfd]
# 
# add_file "packages/xorg-driver/xf86-input-jamstudio_1.2.0.bb"
#  content [b99981280d7ecee88f77dd0a230178dc485cd943]
# 
# add_file "packages/xorg-driver/xf86-input-keyboard_1.3.1.bb"
#  content [f3ce46713577902364ded92fe22d0822592e2ca7]
# 
# add_file "packages/xorg-driver/xf86-input-magellan_1.2.0.bb"
#  content [afe6c35e368a8824676ccec320aa6b9806eedbc0]
# 
# add_file "packages/xorg-driver/xf86-input-microtouch_1.2.0.bb"
#  content [8b956e01215b30a3dd8ee475e06c058e6c16dc96]
# 
# add_file "packages/xorg-driver/xf86-input-mouse_1.3.0.bb"
#  content [2778f83d149677442ccc536b9bb2482de1b25545]
# 
# add_file "packages/xorg-driver/xf86-input-mutouch_1.2.0.bb"
#  content [57a48fe5e556cb01214bbec2a3c28a93b26cd808]
# 
# add_file "packages/xorg-driver/xf86-input-palmax_1.2.0.bb"
#  content [14c21c56ba96a92d98a9525c4450a99b590d305c]
# 
# add_file "packages/xorg-driver/xf86-input-penmount_1.3.0.bb"
#  content [68bc88f8b2006c4d131c7eb6945a804ee101eb38]
# 
# add_file "packages/xorg-driver/xf86-input-summa_1.2.0.bb"
#  content [0eb9c5694d7f3d78067935f28a2216dabd1fa961]
# 
# add_file "packages/xorg-driver/xf86-input-tek4957_1.2.0.bb"
#  content [ea71b44a1e3d3c184483b9c47075ebbbaacd5c40]
# 
# add_file "packages/xorg-driver/xf86-input-vmmouse_12.5.1.bb"
#  content [e9e8a31c2da0f89fe005b0a1ce00bf3b2d81c382]
# 
# add_file "packages/xorg-driver/xf86-video-tdfx_1.4.0.bb"
#  content [fa6975b2171d35007943581ed15995d9f046bb6c]
# 
# add_file "packages/xorg-driver/xf86-video-tseng_1.2.0.bb"
#  content [7e13fbaf1644b16fa1b4445ea7812bbe2b0c1a19]
# 
# add_file "packages/xorg-driver/xf86-video-v4l_0.2.0.bb"
#  content [eb79324143f0f4370dcad655414714d4a7f1412e]
# 
# add_file "packages/xorg-driver/xf86-video-vmware_10.16.1.bb"
#  content [a5d730e0a406f5ff8c5e5388053285718be0b15d]
# 
# add_file "packages/xorg-driver/xf86-video-voodoo_1.2.0.bb"
#  content [ff9d89872bccf259ab97273d9fec96ca37405df2]
# 
# add_file "packages/xorg-lib/libfs_1.0.1.bb"
#  content [934688106c83ca1369c0cb694aa8571258bbdea8]
# 
# add_file "packages/xorg-lib/xtrans_1.2.bb"
#  content [5adfa3a5c753b71a9a61e266569ccbd26e940b09]
# 
# add_file "packages/xorg-util/util-macros-native_1.1.6.bb"
#  content [b22eb2f771afdf4ce2a0a4a31ea0e8cc5e456089]
# 
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
#  from [63b8040c483bf3e919ec4af86edbea3281c9d341]
#    to [345628e585c27582599200282307fe68ae1c1937]
# 
# patch "conf/machine/beagleboard.conf"
#  from [494f0451aa66fd9bccc43c39f265a4f5cbbcaab1]
#    to [94064c93efc40a9c7e203885156fbaf819c853f1]
# 
# patch "conf/machine/efika.conf"
#  from [08a6498b09a4e63a1c570a6944a3d2f243c59160]
#    to [c72523935798601ef0078e59ad1152c319a67fe4]
# 
# patch "conf/machine/include/tune-cortexa8.inc"
#  from [ffd911180ea7eb03d473826a023a54d88a219438]
#    to [1c7e4d80a5ad5dd0a7deedf35e59fa26a9322663]
# 
# patch "conf/machine/omap3evm.conf"
#  from [29a033515664d24c537e38e7286fa39e69c1cd75]
#    to [8a1536d37f51d54c5bd940f32ecf825e9285954f]
# 
# patch "contrib/angstrom/sort.sh"
#  from [3c83857daf315ecca0771eff753f8ddb557f0002]
#    to [1799a6de9fd2f5d0c3771f7d2e8077651abd68e5]
# 
# patch "packages/gcc/gcc-cross-kernel.inc"
#  from [e9ac5a2b85dee8e5f2cf54d2464b0a8f4b938707]
#    to [20867aba06eab9b6f8398e481391ea9109b3b80e]
# 
# patch "packages/imagemagick/imagemagick_6.3.5-10.bb"
#  from [3a59507dd9ac879052c82916586b76a91884091f]
#    to [1d2ed3471deb4e336d60cf64a0fd08aa576337bc]
# 
# patch "packages/images/beagleboard-demo-image.bb"
#  from [f70ee41394921debd219b58d972968d5d915bb73]
#    to [15ee949cc895b649a63d999a1fec276bcb31e3e6]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [728a83a1d213657ee125565b0bd34a9006bcca11]
#    to [947402088688f4d67b5eedf1d81246f553d9bd61]
# 
# patch "packages/modplugplay/modplugplay_1.0.bb"
#  from [9753dff886467c5b89984bf8c15ea11a8ae7456d]
#    to [837485dc39158336a82104bad7ff4dde56464989]
# 
# patch "packages/pulseaudio/pulseaudio_0.9.10.bb"
#  from [5a1f2edbaa29c7b721fc6295ce11dd78d9370e6f]
#    to [10a533cfa6921e64cd626d5af4500e800ce63138]
# 
# patch "packages/u-boot/u-boot_git.bb"
#  from [e9764f3c6c5b495e1807c9f07081a24094765740]
#    to [f5a6ed35ebbb55acec4098d2f8543f801d9416ab]
# 
# patch "packages/xorg-lib/libxau-native_1.0.3.bb"
#  from [862fcd4301dcbfca01329a7990f3739f7219073f]
#    to [f561d6856014b78a11a4e6a16fe621b3a4baf23d]
#
============================================================
--- packages/aspell/aspell_0.60.6.bb	fb6c580d1f0a1cf4f036860d2915c11469e286af
+++ packages/aspell/aspell_0.60.6.bb	fb6c580d1f0a1cf4f036860d2915c11469e286af
@@ -0,0 +1,19 @@
+SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/aspell-${PV}.tar.gz"
+DESCRIPTION = "GNU Aspell spell-checker"
+SECTION = "console/utils"
+LICENSE="LGPL"
+
+PACKAGES += "libaspell libpspell libpspell-dev aspell-utils"
+
+FILES_${PN}-dbg += "${libdir}/aspell-0.60/.debu*"
+FILES_libaspell = "${libdir}/libaspell.so.* ${libdir}/aspell*"
+FILES_aspell-utils = "${bindir}/word-list-compress ${bindir}/aspell-import ${bindir}/run-with-aspell ${bindir}/pre*"
+FILES_${PN} = "${bindir}/aspell"
+FILES_libpspell = "${libdir}/libpspell.so.*"
+FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell"
+
+inherit autotools
+
+do_stage() {
+	autotools_stage_all
+}
============================================================
--- packages/images/neuros-osd-base-image.bb	c917176930daa9aa78c1264ea7bc13edf825a943
+++ packages/images/neuros-osd-base-image.bb	c917176930daa9aa78c1264ea7bc13edf825a943
@@ -0,0 +1,18 @@
+# This image is intended to be the base for further neuros images
+
+# Select which Secure Shell Daemon gets included into the rootfs
+DISTRO_SSH_DAEMON ?= "dropbear"
+
+# Include a timestamp that initscripts can use to set the time to a 
+# more sane value after a reboot  
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
+IMAGE_INSTALL = "task-boot \
+                 util-linux-mount util-linux-umount \
+                 ${DISTRO_SSH_DAEMON} \
+	         "
+
+IMAGE_LINGUAS = ""
+
+inherit image
+
============================================================
--- packages/libmodplug/libmodplug_0.8.bb	9f5b4b4484cfb77adc87ed92ec1ce75a00e63893
+++ packages/libmodplug/libmodplug_0.8.bb	9f5b4b4484cfb77adc87ed92ec1ce75a00e63893
@@ -0,0 +1,14 @@
+DESCRIPTION = "Library for reading mod-like audio files."
+HOMEPAGE = "http://modplug-xmms.sf.net"
+SECTION = "libs"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+# NOTE: autotools_stage_all does nothing here, we need to do it manually
+do_stage() {
+	install -m 0644 ${S}/src/modplug.h ${STAGING_INCDIR}
+	oe_libinstall -C src -so libmodplug ${STAGING_LIBDIR}
+}
============================================================
--- packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff	ed839a9f2631cfb7bfc8a8b341ca783a9e7f1c0c
+++ packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff	ed839a9f2631cfb7bfc8a8b341ca783a9e7f1c0c
@@ -0,0 +1,11 @@
+--- /tmp/Makefile	2008-04-24 14:36:20.509598016 +0200
++++ git/arch/arm/Makefile	2008-04-24 14:36:31.949546584 +0200
+@@ -47,7 +47,7 @@
+ # Note that GCC does not numerically define an architecture version
+ # macro, but instead defines a whole series of macros which makes
+ # testing for a specific architecture or later rather impossible.
+-arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a)
++arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
+ arch-$(CONFIG_CPU_32v6)		:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
+ # Only override the compiler option if ARMv6. The ARMv6K extensions are
+ # always available in ARMv7
============================================================
--- packages/pulseaudio/pulseaudio-0.9.10/2113.diff	0046507a819e54bd7d7863b060daad48bfb88960
+++ packages/pulseaudio/pulseaudio-0.9.10/2113.diff	0046507a819e54bd7d7863b060daad48bfb88960
@@ -0,0 +1,19 @@
+from upstream svn r2113
+
+Index: configure.ac
+===================================================================
+--- configure.ac	(wersja 2112)
++++ configure.ac	(wersja 2113)
+@@ -172,6 +172,12 @@
+ AC_SUBST(LIBLTDL)
+ AC_CONFIG_SUBDIRS(libltdl)
+ 
++old_LIBS=$LIBS
++LIBS="$LIBS $LIBLTDL"
++AC_CHECK_FUNCS([lt_dlmutex_register])
++LIBS=$old_LIBS
++AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
++
+ if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
+     AC_MSG_ERROR([[
+ 
============================================================
--- packages/pulseaudio/pulseaudio-0.9.10/2114.diff	8e4a6ffafeeb9ae461826916e50b44596f3a4c7d
+++ packages/pulseaudio/pulseaudio-0.9.10/2114.diff	8e4a6ffafeeb9ae461826916e50b44596f3a4c7d
@@ -0,0 +1,15 @@
+from upstream svn r2114
+
+Index: configure.ac
+===================================================================
+--- configure.ac	(wersja 2113)
++++ configure.ac	(wersja 2114)
+@@ -176,7 +176,7 @@
+ LIBS="$LIBS $LIBLTDL"
+ AC_CHECK_FUNCS([lt_dlmutex_register])
+ LIBS=$old_LIBS
+-AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
++AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
+ 
+ if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
+     AC_MSG_ERROR([[
============================================================
--- packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch	3e84133dc42bed50437a4d5910f0ace625c11e93
+++ packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch	3e84133dc42bed50437a4d5910f0ace625c11e93
@@ -0,0 +1,48 @@
+Tell where is libltdl from libtool - was needed to get it built with libtool 2.2.4
+
+---
+ configure.ac |   26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
+
+--- pulseaudio-0.9.10.orig/configure.ac
++++ pulseaudio-0.9.10/configure.ac
+@@ -242,20 +242,32 @@ if test $ret -eq 0 ; then
+ else
+     AC_MSG_RESULT([no])
+ fi
+ 
+ #### libtool stuff ####
+-
+-AC_LTDL_ENABLE_INSTALL
+-AC_LIBLTDL_INSTALLABLE
+-AC_LIBTOOL_DLOPEN
+-AC_LIBTOOL_WIN32_DLL
++LT_PREREQ([2.2])
++LT_INIT([dlopen win32-dll])
+ AC_PROG_LIBTOOL
+-AC_SUBST(LTDLINCL)
+-AC_SUBST(LIBLTDL)
++#AC_SUBST(LTDLINCL)
++#AC_SUBST(LIBLTDL)
+ AC_CONFIG_SUBDIRS(libltdl)
+ 
++AC_ARG_WITH(libltdl-libs,
++	[  --with-libltdl-libs=DIR  path to libltdl libs], libltdl_libs_prefix=$withval)
++if test x$libltdl_libs_prefix != x; then
++	LIBLTDL="-L${libltdl_libs_prefix}/libltdl.so -lltdl"
++fi
++AC_SUBST(LIBLTDL)
++
++AC_ARG_WITH(libltdl-includes,
++	[  --with-libltdl-includes=DIR  path to libltdl includes], libltdl_prefix=$withval)
++if test x$libltdl_prefix != x; then
++	LTDLINCL="-I${libltdl_prefix} ${libltdl_libs_prefix}/libltdl.so"
++fi
++AC_SUBST(LTDLINCL)
++
++
+ old_LIBS=$LIBS
+ LIBS="$LIBS $LIBLTDL"
+ AC_CHECK_FUNCS([lt_dlmutex_register])
+ LIBS=$old_LIBS
+ AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
============================================================
--- packages/u-boot/u-boot-git/beagleboard/armv7-a.p%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -re2cb5d1e0ecaf7ec345106320eaa9ab93d254714 -rf2bae0b887cebbfdeec03d82dd0f7387168079af
#
#
#
# add_file "packages/python/python-pyyaml_3.05.bb"
#  content [898374dce665b664ecd9a5ee88e694728389b706]
# 
# patch "packages/tasks/task-python-everything.bb"
#  from [c2f41df3fd8667bf162471cd211f2cd6053c4ed3]
#    to [459ea3b6154cfd34d4b68901888518f858cfd22d]
#
============================================================
--- packages/python/python-pyyaml_3.05.bb	898374dce665b664ecd9a5ee88e694728389b706
+++ packages/python/python-pyyaml_3.05.bb	898374dce665b664ecd9a5ee88e694728389b706
@@ -0,0 +1,10 @@
+DESCRIPTION = "Python support for YAML"
+HOMEPAGE = "http://www.pyyaml.org"
+SECTION = "devel/python"
+LICENSE = "MIT"
+PR = "ml0"
+
+SRC_URI = "http://pyyaml.org/download/pyyaml/PyYAML-3.05.tar.gz"
+S = "${WORKDIR}/PyYAML-${PV}"
+
+inherit distutils
============================================================
--- packages/tasks/task-python-everything.bb	c2f41df3fd8667bf162471cd211f2cd6053c4ed3
+++ packages/tasks/task-python-everything.bb	459ea3b6154cfd34d4b68901888518f858cfd22d
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml29"
+PR = "ml30"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -9,10 +9,8 @@ RDEPENDS = "\
 		python-constraint	\
 		python-dbus			\
 		python-dialog		\
-		python-pydirectfb		\
 		task-python-efl			\
 		task-python-efl-examples		\
-		python-pycurl		\
 		python-fam			\
 		python-fnorb		\
 		python-formencode	\
@@ -45,6 +43,8 @@ RDEPENDS = "\
 		python-pycairo		\
 		python-pychecker	\
 		python-pycodes		\
+		python-pycurl		\
+		python-pydirectfb	\
 		python-pyephem		\
 		python-pyfits		\
 		python-pyflakes		\
@@ -69,6 +69,7 @@ RDEPENDS = "\
 		python-pyweather	\
 		python-pyxml		\
 		python-pyxmlrpc		\
+		python-pyyaml		\
 		python-scapy		\
 		python-scons		\
 		python-setuptools	\






More information about the Openembedded-commits mailing list