[oe-commits] org.oe.dev merge of '7ba62c1bc5f5f44c638e1e5f4805429a188ca3a6'
thebohemian commit
oe at amethyst.openembedded.net
Mon Sep 1 18:18:09 UTC 2008
merge of '7ba62c1bc5f5f44c638e1e5f4805429a188ca3a6'
and 'a211067fbce0623d7710d98f40f12ce3a2247ecf'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 9697772e74e1128fc7696d65c26aec0bb8220e75
ViewMTN: http://monotone.openembedded.org/revision/info/9697772e74e1128fc7696d65c26aec0bb8220e75
Files:
1
packages/guile/guile-amd64.patch
packages/uclibc/files/arm_fix_alignment.patch
packages/uclibc/uclibc-0.9.29/arm_fix_alignment.patch
packages/uclibc/uclibc-cvs
packages/uclibc/uclibc-svn
packages/uclibc/uclibc-nptl
packages/xscreensaver/xscreensaver-5.07
packages/busybox/busybox-1.9.2/topmem.patch
packages/dbus-java/dbus-java_2.5.bb
packages/gnome/gnome-python-desktop/acinclude.m4
packages/gstreamer/gst-ffmpeg/autotools.patch
packages/php/php-5.2.6/acinclude-xml2-config.patch
packages/php/php-5.2.6/pear-makefile.patch
packages/python/python-numpy_1.1.1.bb
packages/sugar/sugar-base_0.82.0.bb
packages/uclibc/uclibc-0.9.29/uclibc-use-fgnu89-inline.patch
packages/uclibc/uclibc-initial_nptl.bb
packages/uclibc/uclibc-nptl/arm_fix_alignment.patch
packages/uclibc/uclibc-nptl/uClibc.distro
packages/uclibc/uclibc-nptl/uClibc.machine.armv5te
packages/uclibc/uclibc-svn/arm_fix_alignment.patch
packages/uclibc/uclibc_nptl.bb
packages/xscreensaver/xscreensaver-5.07/configure.in.patch
packages/xscreensaver/xscreensaver_5.07.bb
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
packages/busybox/busybox_1.9.2.bb
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/dbus-java/dbus-java_2.3.bb
packages/dbus-java/dbus-java_2.4.bb
packages/ffmpeg/ffmpeg_git.bb
packages/flumotion/flumotion_0.4.1.bb
packages/gcc/gcc-4.2.4.inc
packages/gcc/gcc-4.3.1/100-uclibc-conf.patch
packages/gcc/gcc-4.3.1/200-uclibc-locale.patch
packages/gcc/gcc-4.3.1/203-uclibc-locale-no__x.patch
packages/gcc/gcc-4.3.1/205-uclibc-locale-update.patch
packages/gcc/gcc-4.3.1/302-c99-snprintf.patch
packages/gcc/gcc-4.3.1/307-locale_facets.patch
packages/gcc/gcc-4.3.1/cache-amnesia.patch
packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch
packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch
packages/gcc/gcc-4.3.1.inc
packages/gcc/gcc-configure-common.inc
packages/gcc/gcc-cross-sdk_4.2.4.bb
packages/gcc/gcc-cross-sdk_4.3.1.bb
packages/gcc/gcc-cross_4.3.1.bb
packages/gcc/gcc_4.3.1.bb
packages/gnome/gnome-games_2.23.6.bb
packages/gnome/gnome-panel_2.18.1.bb
packages/gstreamer/gst-ffmpeg_0.10.2.bb
packages/guile/guile_1.8.5.bb
packages/jamvm/jamvm.inc
packages/linux/linux-nokia800.inc
packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
packages/mozilla/firefox-3.0.1/mozconfig
packages/mozilla/firefox.inc
packages/mozilla/firefox_3.0.1.bb
packages/mythtv/gmyth-upnp_0.7.0.bb
packages/openjade/openjade-native_1.3.2.bb
packages/openjade/openjade_1.3.2.bb
packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
packages/phoneme/phoneme-advanced.inc
packages/portaudio/portaudio-v19_svn.bb
packages/python/python-pygame_1.8.1.bb
packages/sugar/sugar-toolkit_0.82.1.bb
packages/sugar/sugar_0.82.0.bb
packages/tasks/task-openmoko-feed.bb
packages/uclibc/uclibc_0.9.29.bb
packages/uclibc/uclibc_svn.bb
packages/linux/linux-2.6.25/at32stk1000/virtualmouse.patch
packages/gnash/gnash-minimal.inc
packages/linux/linux_2.6.25.bb
Diffs:
#
# mt diff -r7ba62c1bc5f5f44c638e1e5f4805429a188ca3a6 -r9697772e74e1128fc7696d65c26aec0bb8220e75
#
#
#
# delete "packages/guile/guile-amd64.patch"
#
# rename "packages/uclibc/files/arm_fix_alignment.patch"
# to "packages/uclibc/uclibc-0.9.29/arm_fix_alignment.patch"
#
# rename "packages/uclibc/uclibc-cvs"
# to "packages/uclibc/uclibc-svn"
#
# add_dir "packages/uclibc/uclibc-nptl"
#
# add_dir "packages/xscreensaver/xscreensaver-5.07"
#
# add_file "packages/busybox/busybox-1.9.2/topmem.patch"
# content [c9c8b416ba6d11a6913066129f7c183cf9874181]
#
# add_file "packages/dbus-java/dbus-java_2.5.bb"
# content [9bbed2a9fcf70ddad94fdf80d17ee07775ea8619]
#
# add_file "packages/gnome/gnome-python-desktop/acinclude.m4"
# content [a88d00bee840b475039af1207dad53ea6337f513]
#
# add_file "packages/gstreamer/gst-ffmpeg/autotools.patch"
# content [26e0e0b7ba6e33eab90fc6305cfdd9f90dcb2ebb]
#
# add_file "packages/php/php-5.2.6/acinclude-xml2-config.patch"
# content [4080e8e868b4269682c9d79d897bbffeb000a730]
#
# add_file "packages/php/php-5.2.6/pear-makefile.patch"
# content [a628c96a8b13cab5b2845c3ce7143c1781e07b7c]
#
# add_file "packages/python/python-numpy_1.1.1.bb"
# content [94d5ee7200a201465655e3946ebf7b020628cd9b]
#
# add_file "packages/sugar/sugar-base_0.82.0.bb"
# content [cbfe5bb7096952d90c4998d19566e160f5d230b2]
#
# add_file "packages/uclibc/uclibc-0.9.29/uclibc-use-fgnu89-inline.patch"
# content [5dfb9586fa43464af763ff774e15dc0418a181de]
#
# add_file "packages/uclibc/uclibc-initial_nptl.bb"
# content [6872f3dbf713d969e837fff3267dfe6c79cc7aa2]
#
# add_file "packages/uclibc/uclibc-nptl/arm_fix_alignment.patch"
# content [101a4d8c3d97cb09d2dd7737af4cf7fce15ea767]
#
# add_file "packages/uclibc/uclibc-nptl/uClibc.distro"
# content [c21a277aac0650ca6c77cd0851d7e2be0165c376]
#
# add_file "packages/uclibc/uclibc-nptl/uClibc.machine.armv5te"
# content [55b4a5c7c3dcf81fc96e330e74fc84374f0bc276]
#
# add_file "packages/uclibc/uclibc-svn/arm_fix_alignment.patch"
# content [101a4d8c3d97cb09d2dd7737af4cf7fce15ea767]
#
# add_file "packages/uclibc/uclibc_nptl.bb"
# content [4999fa82e8cb40cbff3508bf2427ca942ce9fc73]
#
# add_file "packages/xscreensaver/xscreensaver-5.07/configure.in.patch"
# content [69b89e407848d4fac28329a37c7cf696a84d543c]
#
# add_file "packages/xscreensaver/xscreensaver_5.07.bb"
# content [13c5dc8656d125eebcf6c89541142d2d474404b7]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [cbbb69b48411373416615825a20788cb411d02dc]
# to [b9fff997cf9168d27a2b9124a6eb016820bc9466]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [647a26cd30973ca6a2a668fa840c7bff50c53ae3]
# to [1d1167f51c5546bba85239ea51b825be54cde78c]
#
# patch "conf/distro/openmoko.conf"
# from [ee68bedb7c293916d63371c4a1679786be088e72]
# to [1e59e3f5d022ae68bc761167efa36f32da031173]
#
# patch "packages/busybox/busybox_1.9.2.bb"
# from [e67cffcad4bfadee85161e3e26073ad85cd557d2]
# to [8b59700d27a489937a5044b27a76d56ddba61a5c]
#
# patch "packages/cacao/cacaoh-cldc-native_0.98.bb"
# from [cc2ee6f43a136dc2ba76ed7bea4fec2f935c6fdb]
# to [21799fcb0417b38523f83c803b588582ad360d24]
#
# patch "packages/dbus-java/dbus-java_2.3.bb"
# from [575d1bce4f960e8739b07964559e58e5768379d1]
# to [061fae181a63b2fd115413ac49ae154b1e460c30]
#
# patch "packages/dbus-java/dbus-java_2.4.bb"
# from [3be815bf6755338045753a524ff10c510c2494e9]
# to [3f5fc4bd6d7ad822cbce130de00dc47d49b71806]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [3dbc091185870b33314c866b8ab9802f88af1c32]
# to [d04b5e43882b6a3d26d0c30606207cdebe14d5b1]
#
# patch "packages/flumotion/flumotion_0.4.1.bb"
# from [888ee41205578b445b00295429cddc535e80a0f3]
# to [9674eb392f880147b7136e7db7db37ac7e9fa7af]
#
# patch "packages/gcc/gcc-4.2.4.inc"
# from [c19d6f421c89aafcc3831e5693496a19b54c1669]
# to [a9018fb5647464a2eddd44e1894c1d9e5eff68fa]
#
# patch "packages/gcc/gcc-4.3.1/100-uclibc-conf.patch"
# from [7864e7e76567d72bd6339ccea248ae75c24a6074]
# to [21ec782ec4cb87ec7e391c7a878ea133b25f48d8]
#
# patch "packages/gcc/gcc-4.3.1/200-uclibc-locale.patch"
# from [28c039b24a03a717740c6985e40b5ea01e869378]
# to [759565fa86b80e47e509cda3dfa36b4097e9e866]
#
# patch "packages/gcc/gcc-4.3.1/203-uclibc-locale-no__x.patch"
# from [64a0003447e854b6c8205b5b87d3cdc8ca7caa1d]
# to [5ee89d22b24f940e26f40e812103487f78bef992]
#
# patch "packages/gcc/gcc-4.3.1/205-uclibc-locale-update.patch"
# from [129ab676c2787de37f94bf3c802616e8b21b7ab9]
# to [aa30251c0c03c583f18bb28ab47c472352a29420]
#
# patch "packages/gcc/gcc-4.3.1/302-c99-snprintf.patch"
# from [5837922659dae60d1753d6257befc3472b9180df]
# to [ac00d75b46057b7fec17aaacad6b582c3339c45a]
#
# patch "packages/gcc/gcc-4.3.1/307-locale_facets.patch"
# from [5dd86533b193ad688496b19e73f8e0395bb18761]
# to [0110e9263c7a54d3bbc8b68339b338687b2262d1]
#
# patch "packages/gcc/gcc-4.3.1/cache-amnesia.patch"
# from [fc92668ad7f244bd08aa8c42ed9453ec619aa35c]
# to [f48d39ae8b68dd9745effe9975b0e874f25e9e92]
#
# patch "packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch"
# from [2cbc3b136ee24e92a85a74d95f62c6efd87f7591]
# to [54476decfdfe84996cd127331065e40ee27c9d07]
#
# patch "packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch"
# from [82a2c416b670506138070ddc8a4b94929373b031]
# to [d272cd6c310740732e6e6ac35c9e5cffa5b82cce]
#
# patch "packages/gcc/gcc-4.3.1.inc"
# from [7ee3a1d24f6fe58cc59653a6e65c7e8bcc68a8a7]
# to [63e353bf383d5eaf37da5f0b8b487f1f5470fd0a]
#
# patch "packages/gcc/gcc-configure-common.inc"
# from [25915b9362f47697289ee2936469e63ae7ce9ebe]
# to [6a009baf06cdeed62d1ae068c65ac8646be509f9]
#
# patch "packages/gcc/gcc-cross-sdk_4.2.4.bb"
# from [e2a276b361c10c453d83333227c0367a9226dd42]
# to [d5d2104cedde09409e61acdcb9d621c9fc792712]
#
# patch "packages/gcc/gcc-cross-sdk_4.3.1.bb"
# from [3cb7d1947efad651a0ff5bae8955a0ee1fd54a15]
# to [798f187c94aeb2906e721710f0ca25d578302c7c]
#
# patch "packages/gcc/gcc-cross_4.3.1.bb"
# from [e090b234e1631af4203640b957526e50464e6b31]
# to [cca304cc4b891b5f453c4e45ddd0c4161400c4a0]
#
# patch "packages/gcc/gcc_4.3.1.bb"
# from [3b72d4bc757dfb4722711cce0268d025768b1278]
# to [e5bbb814e8bb53d3b9f131e07f7f2773ad205ef1]
#
# patch "packages/gnome/gnome-games_2.23.6.bb"
# from [c01f9935c5c03fe552a68bf44ef06850a3949b88]
# to [15674cb170dac8039ced8c4eafe3f19424b78d27]
#
# patch "packages/gnome/gnome-panel_2.18.1.bb"
# from [66a10c63ee606cf23e62708ca3345f5866138f6e]
# to [94a05d1197132a1dca6f18f2d7d3335340a81a5d]
#
# patch "packages/gstreamer/gst-ffmpeg_0.10.2.bb"
# from [e0e185738811f0607a57b4d5b4948e0b92301af6]
# to [907ebdb116c5b75cda56d4b12d53ca1f6d6a8ba9]
#
# patch "packages/guile/guile_1.8.5.bb"
# from [05082e8e04e004b6041183ba494181980cffcc06]
# to [df991f5610402733fc53dbf28d32b630051cd928]
#
# patch "packages/jamvm/jamvm.inc"
# from [640f0c3f79be256ead95d73fcfc672b3fd0c38c1]
# to [0bdc3194904f7692f441fd8c40c599f27094c08f]
#
# patch "packages/linux/linux-nokia800.inc"
# from [e115eb464fd01dc9fb6240cf410d23831cdb0c3f]
# to [6a011f12e3c1cb85af2fb3ee6256f0f1ce45e89c]
#
# patch "packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb"
# from [3973ded34b696092b34b03f4883501088965b583]
# to [d52dd9d399e3ae8b6c66f999229e5f797d319665]
#
# patch "packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb"
# from [b41941b0d420980c4211a1fa04fd53db33d07f92]
# to [098380e73ab98a0ac07f4437a937edd32324eea7]
#
# patch "packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb"
# from [966b5d88b9928c4b7654a06ca0c5250612b72485]
# to [0dd83a30378cbd321e2891c6fdce475de1149853]
#
# patch "packages/mozilla/firefox-3.0.1/mozconfig"
# from [2704adff3ffa3175691de0aa03a89add1e4c3169]
# to [f51e160c952ebde87e47f50d75f425843dff2e27]
#
# patch "packages/mozilla/firefox.inc"
# from [fcf882c98cb2ecfebe08686ffb477faf55261957]
# to [19236ab5b587efdf0d2e74dee775ec90c0ddbe88]
#
# patch "packages/mozilla/firefox_3.0.1.bb"
# from [5747a684fd3be549857c7c0f811a2ac8ccd81027]
# to [61bf44cf9add45dd7cbe1746f5f55c153b427d47]
#
# patch "packages/mythtv/gmyth-upnp_0.7.0.bb"
# from [4667af3879b4e91ebc27b0ecf26ebfe32d999a2d]
# to [8b75bcd164ea2941db3ae19b4f30ab821fa36300]
#
# patch "packages/openjade/openjade-native_1.3.2.bb"
# from [fe4d7272d3a91055775804bedf2ab7af3fcc45f2]
# to [71010dc2c983fe59f78867b3ee655ce1f89d7baa]
#
# patch "packages/openjade/openjade_1.3.2.bb"
# from [76bc945ead3da7d2228e8c419c0a3fa3f1fd193e]
# to [d3a31831d26d84480a79570ca2fb3c0d309d1459]
#
# patch "packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb"
# from [3c5864ec8c49138cc893c47ab0e73877b04d0783]
# to [458508adc8e06b4cf1c7cf861dfebd603b5f58c8]
#
# patch "packages/phoneme/phoneme-advanced.inc"
# from [71f3ea62b1678f4a0865fd4d4927ee7d252ce7ac]
# to [546e30038b8cd714ed6d1d4713bc79a64cf4ad0b]
#
# patch "packages/portaudio/portaudio-v19_svn.bb"
# from [2412bb2e306a60afa27283238b90b401ca15749c]
# to [560fcf8f87dfc060e6d95a1477f95dfe6864ada3]
#
# patch "packages/python/python-pygame_1.8.1.bb"
# from [d20237c5870066d97af5c40249900e87c039beda]
# to [7c06795fb776e2174fb4c60091adb29c826fe448]
#
# patch "packages/sugar/sugar-toolkit_0.82.1.bb"
# from [26cbe65d86d7a8971743b26419af876eafaea7ef]
# to [77b79d5412c3229763f934d7818ca6b0a44ea317]
#
# patch "packages/sugar/sugar_0.82.0.bb"
# from [a186f451e2c19db6fa16f473692cff2eafea42de]
# to [195b4a3f243212f92c3173a56429e9622739e058]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [baa4e904acab8916566bec7f5b14359d063354e9]
# to [f11e545cc7b002fc5a19f572b7fa7ed6551e81e3]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [e35f597e006a79e860bcfcbc82d23c9b7dabf317]
# to [8b02df79e5136a8b2833ea26f26f95484bc814ec]
#
# patch "packages/uclibc/uclibc_svn.bb"
# from [88b7021e9c8e55186b7a8a8fe49a21da5aa94bac]
# to [eaf1abec09168bb845c5cc7719513cfa957f0072]
#
============================================================
--- packages/busybox/busybox-1.9.2/topmem.patch c9c8b416ba6d11a6913066129f7c183cf9874181
+++ packages/busybox/busybox-1.9.2/topmem.patch c9c8b416ba6d11a6913066129f7c183cf9874181
@@ -0,0 +1,28 @@
+Index: busybox-1.9.2/procps/top.c
+===================================================================
+--- busybox-1.9.2.orig/procps/top.c 2008-08-21 16:19:31.004137057 +0200
++++ busybox-1.9.2/procps/top.c 2008-08-21 16:21:46.066805448 +0200
+@@ -909,17 +909,22 @@
+ #else
+ qsort(top, ntop, sizeof(top_status_t), (void*)(sort_function[0]));
+ #endif /* FEATURE_TOP_CPU_USAGE_PERCENTAGE */
+- } else { /* TOPMEM */
++ }
++#if ENABLE_FEATURE_TOPMEM
++ else { /* TOPMEM */
+ qsort(topmem, ntop, sizeof(topmem_status_t), (void*)topmem_sort);
+ }
++#endif
+ count = lines;
+ if (OPT_BATCH_MODE || count > ntop) {
+ count = ntop;
+ }
+ if (scan_mask == TOP_MASK)
+ display_process_list(count, col);
++#if ENABLE_FEATURE_TOPMEM
+ else
+ display_topmem_process_list(count, col);
++#endif
+ clearmems();
+ if (iterations >= 0 && !--iterations)
+ break;
============================================================
--- packages/dbus-java/dbus-java_2.5.bb 9bbed2a9fcf70ddad94fdf80d17ee07775ea8619
+++ packages/dbus-java/dbus-java_2.5.bb 9bbed2a9fcf70ddad94fdf80d17ee07775ea8619
@@ -0,0 +1,87 @@
+DESCRIPTION = "A pure Java D-Bus Implementation"
+DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)"
+DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)"
+AUTHOR = "Matthew Johnson <dbus at matthew.ath.cx>"
+HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
+SECTION = "libs"
+LICENSE = "LGPLv2 AFL"
+DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
+RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java dbus-java-bin libmatthew-debug-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}"
+RSUGGESTS_libdbus-java = "libunixsocket-java"
+PR = "r1"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
+
+S = "${WORKDIR}/dbus-java-${PV}"
+
+inherit java-library
+
+# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
+# which are accessed in this package. Work around this by setting the bootclasspath
+# explicitly.
+JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip"
+
+do_compile () {
+ oe_runmake \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
+ JAVAC="javac" \
+ JARPREFIX="${STAGING_DATADIR_JAVA}" \
+ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
+ CLASSPATH="${S}/classes" \
+ JAR="fastjar" \
+ bin
+
+ # Generated shell scripts will have staging paths inside them.
+ rm bin/*
+
+ # Generate them again with target paths.
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
+ bin
+
+ # Generate man pages.
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
+ man
+}
+
+do_install () {
+ oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar dbus.jar
+ oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar dbus-viewer.jar
+ oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar dbus-bin.jar
+
+ install -d ${D}${bindir}
+ install bin/DBusViewer ${D}${bindir}
+ install bin/DBusCall ${D}${bindir}
+ install bin/CreateInterface ${D}${bindir}
+ install bin/ListDBus ${D}${bindir}
+ install bin/DBusDaemon ${D}${bindir}
+
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ MANPREFIX=${D}${mandir} \
+ DOCPREFIX=${D}${docdir}/${JPN} \
+ install-man
+}
+
+do_stage () {
+ oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar
+}
+
+PACKAGE_ARCH = "all"
+# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar
+# and dbus-bin*.jar
+PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}"
+
+FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer"
+FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*"
+FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}"
+FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}"
============================================================
--- packages/gnome/gnome-python-desktop/acinclude.m4 a88d00bee840b475039af1207dad53ea6337f513
+++ packages/gnome/gnome-python-desktop/acinclude.m4 a88d00bee840b475039af1207dad53ea6337f513
@@ -0,0 +1,90 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+ import $1
+except ImportError:
+ sys.exit(1)
+except:
+ sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+ then
+ eval "py_cv_mod_$py_mod_var=yes"
+ else
+ eval "py_cv_mod_$py_mod_var=no"
+ fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+ AC_MSG_RESULT(yes)
+ ifelse([$3], [],, [$3
+])dnl
+else
+ AC_MSG_RESULT(no)
+ ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+AC_ARG_WITH(python-includes,
+ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval)
+if test x$py_exec_prefix != x; then
+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+else
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+ PYTHON_INCLUDES="$PYTHON_I%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -ra211067fbce0623d7710d98f40f12ce3a2247ecf -r9697772e74e1128fc7696d65c26aec0bb8220e75
#
#
#
# add_file "packages/linux/linux-2.6.25/at32stk1000/virtualmouse.patch"
# content [02f56a6c5ba2e3fcf2eee0a14b900182c3272b07]
#
# patch "packages/gnash/gnash-minimal.inc"
# from [1d97af65dabb8f2af969bd858ef3578a722d92d2]
# to [14a531d2eda49fe983be58f1c1b58cd2efe86307]
#
# patch "packages/linux/linux_2.6.25.bb"
# from [17408d418b583626e5de54e9ef049c0f271e98f5]
# to [c680ef2795b703554c5aa221d5b1e4888d53655b]
#
============================================================
--- packages/linux/linux-2.6.25/at32stk1000/virtualmouse.patch 02f56a6c5ba2e3fcf2eee0a14b900182c3272b07
+++ packages/linux/linux-2.6.25/at32stk1000/virtualmouse.patch 02f56a6c5ba2e3fcf2eee0a14b900182c3272b07
@@ -0,0 +1,125 @@
+Index: linux-2.6.25/drivers/input/Kconfig
+===================================================================
+--- linux-2.6.25.orig/drivers/input/Kconfig 2008-04-17 04:49:44.000000000 +0200
++++ linux-2.6.25/drivers/input/Kconfig 2008-08-21 16:37:40.000000000 +0200
+@@ -69,6 +69,13 @@
+ To compile this driver as a module, choose M here: the
+ module will be called mousedev.
+
++config INPUT_VMS
++ tristate "Virtual Mouse Driver" if EMBEDDED
++ default y
++ ---help---
++ vms.c from the book Essential Linux Device Drivers
++
++
+ config INPUT_MOUSEDEV_PSAUX
+ bool "Provide legacy /dev/psaux device"
+ default y
+Index: linux-2.6.25/drivers/input/Makefile
+===================================================================
+--- linux-2.6.25.orig/drivers/input/Makefile 2008-04-17 04:49:44.000000000 +0200
++++ linux-2.6.25/drivers/input/Makefile 2008-08-21 16:37:40.000000000 +0200
+@@ -11,6 +11,8 @@
+ obj-$(CONFIG_INPUT_POLLDEV) += input-polldev.o
+
+ obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o
++
++obj-$(CONFIG_INPUT_VMS) += vms.o
+ obj-$(CONFIG_INPUT_JOYDEV) += joydev.o
+ obj-$(CONFIG_INPUT_EVDEV) += evdev.o
+ obj-$(CONFIG_INPUT_EVBUG) += evbug.o
+Index: linux-2.6.25/drivers/input/vms.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.25/drivers/input/vms.c 2008-08-21 17:24:05.000000000 +0200
+@@ -0,0 +1,89 @@
++/**
++ * Copyright (c) 2008 by Pearson Education, Inc.
++ *
++ * This material may be distributed only subject to the terms and conditions
++ * set forth in the Open Publication License, v1.0 or later (the latest version
++ * is presently available at http://www.opencontent.org/openpub/).
++ *
++ * Copyright (c) 2008 Leon Woestenberg
++ * Copyright (c) 2008 Sreekrishnan Venkateswaran
++ *
++ * I copied this from Sreekrishnan's book (see http://elinuxdd.com) -- Leon.
++ *
++ */
++
++#include <linux/fs.h>
++#include <asm/uaccess.h>
++#include <linux/input.h>
++#include <linux/platform_device.h>
++
++struct input_dev *vms_input_dev;
++static struct platform_device *vms_dev;
++
++/* for each set of coordinates, we publish them along with a left button
++ * press and release event
++ */
++static ssize_t write_vms(struct device *dev, struct device_attribute *attr,
++ const char *buffer, size_t count)
++{
++ int x, y;
++ sscanf(buffer, "%d%d", &x, &y);
++ input_report_abs(vms_input_dev, ABS_X, x);
++ input_report_abs(vms_input_dev, ABS_Y, y);
++ input_report_key(vms_input_dev, BTN_LEFT, 1);
++ input_sync(vms_input_dev);
++ input_report_key(vms_input_dev, BTN_LEFT, 0);
++ input_sync(vms_input_dev);
++ return count;
++}
++
++DEVICE_ATTR(coordinates, 0644, NULL, write_vms);
++
++static struct attribute *vms_attrs[] = {
++ &dev_attr_coordinates.attr,
++ NULL
++};
++
++static struct attribute_group vms_attr_group = {
++ .attrs = vms_attrs,
++};
++
++static int __init vms_init(void)
++{
++ vms_dev = platform_device_register_simple("vms", -1, NULL, 0);
++ if (IS_ERR(vms_dev)) {
++ PTR_ERR(vms_dev);
++ printk("vms_init: error\n");
++ }
++ sysfs_create_group(&vms_dev->dev.kobj, &vms_attr_group);
++
++ vms_input_dev = input_allocate_device();
++ if (!vms_input_dev) {
++ printk("bad input_allocate_device()\n");
++ }
++
++ set_bit(EV_ABS, vms_input_dev->evbit);
++ set_bit(ABS_X, vms_input_dev->absbit);
++ set_bit(ABS_Y, vms_input_dev->absbit);
++
++ set_bit(EV_KEY, vms_input_dev->evbit);
++ set_bit(BTN_LEFT, vms_input_dev->keybit);
++
++ input_register_device(vms_input_dev);
++ printk("vms initialized\n");
++ return 0;
++}
++
++static int __init vms_exit(void)
++{
++ input_unregister_device(vms_input_dev);
++ sysfs_remove_group(&vms_dev->dev.kobj, &vms_attr_group);
++ platform_device_unregister(vms_dev);
++ return;
++}
++
++module_init(vms_init);
++module_exit(vms_exit);
++
++MODULE_LICENSE("GPL");
++
============================================================
--- packages/gnash/gnash-minimal.inc 1d97af65dabb8f2af969bd858ef3578a722d92d2
+++ packages/gnash/gnash-minimal.inc 14a531d2eda49fe983be58f1c1b58cd2efe86307
@@ -1,8 +1,10 @@ LICENSE = "GPL-2"
DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
HOMEPAGE = "http://www.gnu.org/software/gnash"
LICENSE = "GPL-2"
-DEPENDS = "virtual/libiconv virtual/libintl libltdl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
+DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
+RDEPENDS = "libltdl"
+
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
S = ${WORKDIR}/gnash-${PV}
============================================================
--- packages/linux/linux_2.6.25.bb 17408d418b583626e5de54e9ef049c0f271e98f5
+++ packages/linux/linux_2.6.25.bb c680ef2795b703554c5aa221d5b1e4888d53655b
@@ -1,6 +1,6 @@ require linux.inc
require linux.inc
-PR = "r3"
+PR = "r4"
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
@@ -31,6 +31,7 @@ SRC_URI_append_at32stk1000 = " \
SRC_URI_append_at32stk1000 = " \
http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.6.atmel.1.patch.bz2;patch=1 \
+ file://virtualmouse.patch;patch=1 \
"
SRC_URI_append_at91-l9260 = " \
More information about the Openembedded-commits
mailing list