diff options
35 files changed, 321 insertions, 503 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index ac73e909f8..1a7ef4f143 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -636,7 +636,7 @@ def oe_unpack_file(file, data, url = None): cmd = 'gzip -dc %s > %s' % (file, efile) elif file.endswith('.bz2'): cmd = 'bzip2 -dc %s > %s' % (file, efile) - elif file.endswith('.zip'): + elif file.endswith('.zip') or file.endswith('.jar'): cmd = 'unzip -q -o' (type, host, path, user, pswd, parm) = bb.decodeurl(url) if 'dos' in parm: diff --git a/classes/java.bbclass b/classes/java.bbclass index 11a2bf5c0c..620dae79fb 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -70,19 +70,27 @@ oe_jarinstall() { oe_makeclasspath() { # Purpose: Generate a classpath variable from the given Jar file names - # where the ".jar" has been omitted. + # where the ".jar" has been omitted. The string is stored in the script + # variable whose name is given in the first argument to this function. # - # oe_makeclasspath foo baz bar - # Prints ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar - # - # oe_makeclasspath -s foo baz bar - # Prints ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar + # oe_makeclasspath cp foo baz bar + # Stores ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar + # in variable "cp". # + # oe_makeclasspath bootcp -s foo baz bar + # Stores ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar + # in variable "bootcp". + # # Provide the -s at the beginning otherwise strange things happen. - # + # If -s is given the function checks whether the requested jar file exists + # and exits with an error message if it cannot be found. + # dir=${datadir_java} classpath= delimiter= + retval=$1 + + shift while [ "$#" -gt 0 ]; do case "$1" in @@ -95,7 +103,7 @@ oe_makeclasspath() { *) file=$dir/$1.jar - if [ ! -f $file ]; then + if [ -z "$dir" -a ! -f $file ]; then oefatal "oe_makeclasspath: Jar file for '$1' not found at $file" fi @@ -106,7 +114,7 @@ oe_makeclasspath() { shift done - echo $classpath + eval $retval="$classpath" } # Creates a simple wrapper script for your Java program. diff --git a/conf/checksums.ini b/conf/checksums.ini index 99bc7bae3b..872e6720dc 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -13306,9 +13306,9 @@ sha256=dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481 md5=e1f1af8c2add8310d0bbcddc9af523b8 sha256=dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481 -[http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip] -md5=9473375f7615814025a5b66ee6a8400d -sha256=b9eaecd9edc58291c5b2c0d8de6a1ce0677b442d63edccd52dd3080da0bc55dc +[http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip] +md5=b6bf01aa408377f2fe5f617a4dea1876 +sha256=c913105c740fe9cbbf7ab49f663acf5640b812995c2f9c716294f6b44a3185c4 [http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-2.2.9.tar.bz2] md5=45e9e89775613b0afb732fbc11c73d26 diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index b9d882d5d6..ff6aa1f6a3 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -185,7 +185,7 @@ PREFERRED_PROVIDER_classpath = "classpath" PREFERRED_VERSION_classpath = "0.97.2" PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon" -PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5" +PREFERRED_VERSION_swt3.4-gtk-hildon = "3.4" # Does not compile with the CodeSourcery compiler .. :( #PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 16753863b5..811c20e945 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -43,13 +43,14 @@ SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-fbgrab-viewer-native ?= "1943" -SRCREV_pn-frameworkd ?= "86a660108f988f5611cc796d33911cca8836004e" +SRCREV_pn-frameworkd ?= "5a292ced8330ace191d66fc1b655e921fa442fdf" SRCREV_pn-fso-gpsd ?= "fd1cd578d6ba9fa13aadceb59a9b46345108583b" SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "9721" SRCREV_pn-gpe-contacts ?= "9312" +SRCREV_pn-gpe-sketchbook ?= "9547" SRCREV_pn-gsm0710muxd ?= "3ff86b129640b647ccba3d86eb243d864671b039" SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" @@ -80,8 +81,8 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1066" -SRCREV_pn-linux-openmoko ?= "968c41d0c32099d78927849a71e2ef3143cc05e7" -SRCREV_pn-linux-openmoko-devel ?= "e20ce2bd6fc6e711eed58a580ae117cb574abe96" +SRCREV_pn-linux-openmoko ?= "bc2caff9cdef8a16297a2cb196306f88fa5ea2c2" +SRCREV_pn-linux-openmoko-devel ?= "8119fb41bf9cfd12964fa5e987ff6dbaf5729f75" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" @@ -90,8 +91,8 @@ SRCREV_pn-matchbox-keyboard ?= "1910" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-matchbox-stroke ?= "1820" -SRCREV_pn-mickeydbus ?= "d1f32060474767582dd4248d5e5c2adc63931d5a" -SRCREV_pn-mickeyterm ?= "d1f32060474767582dd4248d5e5c2adc63931d5a" +SRCREV_pn-mickeydbus ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a" +SRCREV_pn-mickeyterm ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a" SRCREV_pn-moko-gtk-engine ?= "3612" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer ?= "27659" @@ -178,7 +179,7 @@ SRCREV_pn-sphyrna-python ?= "45" SRCREV_pn-starling ?= "9574" SRCREV_pn-tichy ?= "168" SRCREV_pn-tmut ?= "60" -SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" +SRCREV_pn-u-boot-openmoko ?= "414367bf5b65942947dd5d569c27d2a8e8e5e562" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" @@ -190,12 +191,12 @@ SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "4067470ea4d569bae7b4161ca998645a0c9b96e7" -SRCREV_pn-zhone ?= "11392b1d2ee3a0622dc324e1805699e4301249c4" +SRCREV_pn-zhone ?= "2cccdc592d10c15509d974dfbba493e95a776530" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "36204" +EFL_SRCREV ?= "36520" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eet-native ?= "${EFL_SRCREV}" @@ -239,8 +240,7 @@ SRCREV_pn-python-etk ?= "${EFL_SRCREV}" # Enlightenment Applications SRCREV_pn-edje-editor ?= "${EFL_SRCREV}" -#SRCREV_pn-edje-player ?= "${EFL_SRCREV}" -SRCREV_pn-edje-player ?= "36296" +SRCREV_pn-edje-player ?= "${EFL_SRCREV}" SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}" SRCREV_pn-emphasis ?= "${EFL_SRCREV}" SRCREV_pn-ephoto ?= "${EFL_SRCREV}" @@ -254,6 +254,12 @@ SRCREV_pn-e-utils ?= "${EFL_SRCREV}" SRCREV_pn-e-wm ?= "${EFL_SRCREV}" SRCREV_pn-enna ?= "${EFL_SRCREV}" SRCREV_pn-exquisite ?= "${EFL_SRCREV}" +SRCREV_pn-exquisite-theme-illume ?= "${EFL_SRCREV}" SRCREV_pn-rage ?= "${EFL_SRCREV}" - SRCREV_pn-illume ?= "${EFL_SRCREV}" +SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}" + +# Enlightenment ST +SRCREV_pn-alarm ?= "${EFL_SRCREV}" +SRCREV_pn-waker ?= "${EFL_SRCREV}" +SRCREV_pn-elementary ?= "${EFL_SRCREV}" diff --git a/packages/beecrypt/beecrypt_3.1.0.bb b/packages/beecrypt/beecrypt_3.1.0.bb index 3187b9b12a..f9a45e74df 100644 --- a/packages/beecrypt/beecrypt_3.1.0.bb +++ b/packages/beecrypt/beecrypt_3.1.0.bb @@ -6,7 +6,23 @@ DESCRIPTION="Beecrypt is a general-purpose cryptography library." HOMEPAGE="http://sourceforge.net/projects/beecrypt" SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz" +PR = "r2" + inherit autotools acpaths="" EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static" + +do_stage() { + +# oe_libinstall -a -C .libs libbeecrypt ${STAGING_LIBDIR} + cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/ + install -d ${STAGING_INCDIR}/beecrypt + for X in beecrypt.h beecrypt.api.h memchunk.h mpnumber.h beecrypt.gnu.h mp.h mpopt.h blockmode.h endianness.h + do + install -m 0644 ${X} ${STAGING_INCDIR}/beecrypt/${X} + done + +} + diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb index 46ade701a3..e16cad051d 100644 --- a/packages/e17/e-wm_svn.bb +++ b/packages/e17/e-wm_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17" DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" PV = "0.16.999.043+svnr${SRCREV}" -PR = "r13" +PR = "r14" inherit e update-alternatives @@ -10,7 +10,6 @@ RDEPENDS += "shared-mime-info mime-support" SRC_URI = "\ svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \ - file://disable-e-cursor.patch;patch=1 \ file://enlightenment_start.oe \ file://applications.menu \ " diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 74ec3615a9..63da1dffa2 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -4,8 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al." SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -PV = "0.8.2+${PR}-gitr${SRCREV}" -PR = "r2" +PV = "0.8.3+${PR}-gitr${SRCREV}" +PR = "r0" inherit distutils update-rc.d @@ -26,6 +26,7 @@ do_install_append() { RDEPENDS_${PN} += "\ python-dbus \ python-datetime \ + python-pprint \ python-pygobject \ python-pyrtc \ python-pyserial \ diff --git a/packages/freesmartphone/mickeydbus_git.bb b/packages/freesmartphone/mickeydbus_git.bb index cbd90e5030..648cc48f91 100644 --- a/packages/freesmartphone/mickeydbus_git.bb +++ b/packages/freesmartphone/mickeydbus_git.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Mickey's DBus introspection and calling Program" AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" LICENSE = "GPLv2" -PV = "0.9.0+gitr${SRCREV}" -PR = "r0" +PV = "0.9.1+gitr${SRCREV}" +PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" S = "${WORKDIR}/git" @@ -15,4 +15,8 @@ do_install() { RDEPENDS_${PN} = "\ python-dbus \ + python-pprint \ " + +PACKAGE_ARCH_${PN} = "all" + diff --git a/packages/freesmartphone/mickeyterm_git.bb b/packages/freesmartphone/mickeyterm_git.bb index 243354cc91..0ecc8bbbea 100644 --- a/packages/freesmartphone/mickeyterm_git.bb +++ b/packages/freesmartphone/mickeyterm_git.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Mickey's Terminal Program" AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" LICENSE = "GPLv2" -PV = "2.9.0+gitr${SRCREV}" -PR = "r0" +PV = "2.9.1+gitr${SRCREV}" +PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" S = "${WORKDIR}/git" @@ -23,3 +23,6 @@ RRECOMMENDS_${PN} += "\ gsm0710muxd \ python-dbus \ " + +PACKAGE_ARCH_${PN} = "all" + diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb index 1bd275d7e7..d8c678ce59 100644 --- a/packages/freesmartphone/zhone_git.bb +++ b/packages/freesmartphone/zhone_git.bb @@ -2,9 +2,8 @@ DESCRIPTION = "Zhone: Zen Phone" LICENSE = "GPL" SECTION = "x11" DEPENDS = "edje-native python-pyrex-native python-cython-native" -RDEPENDS = "task-python-efl python-textutils python-dbus python-pycairo" PV = "0.0.0+${PR}-gitr${SRCREV}" -PR = "r9" +PR = "r10" SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \ file://80zhone" @@ -18,3 +17,10 @@ do_install_append() { } FILES_${PN} += "${datadir} ${sysconfdir}" + +RDEPENDS = "\ + task-python-efl \ + python-textutils \ + python-dbus \ + python-pycairo \ +" diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb index b4878406de..b04cfc39bf 100644 --- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb +++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb @@ -1,15 +1,10 @@ +DEPENDS = "libgpewidget sqlite" LICENSE = "GPL" -PR = "r4" - -inherit gpe pkgconfig - -DEPENDS = "libgpewidget" -SECTION = "gpe" -SECTION = "gpe" -PRIORITY = "optional" DESCRIPTION = "A GPE notebook to sketch your notes" export CVSBUILD = "no" +inherit gpe pkgconfig + CFLAGS +="-D_GNU_SOURCE" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb index 60bb1b3d76..488e32f55b 100644 --- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb +++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb @@ -1,14 +1,10 @@ +DEPENDS = "libgpewidget sqlite" LICENSE = "GPL" - -inherit gpe pkgconfig - -DEPENDS = "libgpewidget" -SECTION = "gpe" -SECTION = "gpe" -PRIORITY = "optional" DESCRIPTION = "A GPE notebook to sketch your notes" export CVSBUILD = "no" +inherit gpe pkgconfig + CFLAGS +="-D_GNU_SOURCE" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" diff --git a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb index 8884746136..929d622a51 100644 --- a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb +++ b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb @@ -1,18 +1,23 @@ DESCRIPTION = "A GPE notebook to sketch your notes" SECTION = "gpe" -SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "libgpewidget" -PV = "0.2.9+svn-${SRCDATE}" +DEPENDS = "libgpewidget sqlite" +PV = "0.2.9+svnr${SRCREV}" -inherit pkgconfig autotools +DEFAULT_PREFERENCE = "-1" -SRC_URI = "${GPE_SVN} \ - file://svn-build.patch;patch=1" +inherit pkgconfig autotools +SRC_URI = "\ + ${GPE_SVN} \ + file://svn-build.patch;patch=1 \ +" S = "${WORKDIR}/${PN}" +export CVSBUILD = "no" +CFLAGS += "-D_GNU_SOURCE" + do_compile () { oe_runmake PREFIX=${prefix} oe_runmake all-desktop PREFIX=${prefix} @@ -23,10 +28,3 @@ do_install () { FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" FILES_${PN} += " ${datadir}/gpe/pixmaps" - -export CVSBUILD = "no" - -CFLAGS += "-D_GNU_SOURCE" - -DEFAULT_PREFERENCE = "-1" - diff --git a/packages/linux/linux-omap/dvb-fix-dma.diff b/packages/linux/linux-omap/dvb-fix-dma.diff new file mode 100644 index 0000000000..e05473fc7f --- /dev/null +++ b/packages/linux/linux-omap/dvb-fix-dma.diff @@ -0,0 +1,60 @@ +Hi, +I post this patch that fixes a kernel crash that happens when using a dvb +usb stick on a mips platform and I think even on other platforms on which +the dma access in not cache-coherent. + +The problem's origin is that, inside the method usb_bulk_urb_init of file +drivers/media/dvb/dvb-usb/usb-urb.c, stream->urb_list[i]->transfer_buffer +points to a memory area that has been allocated to be dma-coherent but +stream->urb_list[i]->transfer_flags doesn't include the +URB_NO_TRANSFER_DMA_MAP flag and stream->urb_list[i]->transfer_dma is not +set. +When later on the stream->urb_list[i]->transfer_buffer pointer is used +inside function usb_hcd_submit_urb of file drivers/usb/core/hcd.c since the +flag URB_NO_TRANSFER_DMA_MAP is not set the urb->transfer_buffer pointer is +passed to the dma_map_single function that since the address is dma-coherent +returns a wrong tranfer_dma address that later on leads to the kernel crash. + +The problem is solved by setting the URB_NO_TRANSFER_DMA_MAP flag and the +stream->urb_list[i]->transfer_dma address. + +Perhaps to be more safe the URB_NO_TRANSFER_DMA_MAP flag can be set only +if stream->urb_list[i]->transfer_dma != 0. + +I don't know if half of the fault can be of the dma_map_single function that +should anyway returns a valid address both for a not dma-coherent and a +dma-coherent address. + +Just to be clear: +I've done this patch to solve my problem and I tested it only on a mips +platform +but I think it should not cause any problems on other platforms. +I posted it here to help someone else that can have my same problem and to +point it out +to the mantainer of this part of code. +You can use it at your own risk and I'm not resposible in any way for any +problem or +damage that it can cause. +I'm available to discuss about it + +Bye + +Michele Scorcia + +-------------------- + + + + +--- /tmp/usb-urb.c 2008-10-08 09:53:23.000000000 +0200 ++++ git/drivers/media/dvb/dvb-usb/usb-urb.c 2008-10-08 09:54:16.000000000 +0200 +@@ -152,7 +152,8 @@ + stream->props.u.bulk.buffersize, + usb_urb_complete, stream); + +- stream->urb_list[i]->transfer_flags = 0; ++ stream->urb_list[i]->transfer_flags = URB_NO_TRANSFER_DMA_MAP; ++ stream->urb_list[i]->transfer_dma = stream->dma_addr[i]; + stream->urbs_initialized++; + } + return 0; diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index 290d90084b..a81cec89aa 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| SRCREV = "e1c49d7d22af768188e2a54c167ed79919361e55" PV = "2.6.26+2.6.27-rc7+${PR}+git${SRCREV}" -PR = "r12" +PR = "r13" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -34,6 +34,7 @@ SRC_URI_append = " \ file://musb-fix-multiple-bulk-transfers.diff;patch=1 \ file://mru-256MB.diff;patch=1 \ file://musb-fix-endpoints.diff;patch=1 \ + file://dvb-fix-dma.diff;patch=1 \ " diff --git a/packages/miglayout/miglayout_3.0.3.bb b/packages/miglayout/miglayout_3.0.3.bb new file mode 100644 index 0000000000..2450a7e01f --- /dev/null +++ b/packages/miglayout/miglayout_3.0.3.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Flexible layout classes for Swing and SWT" +LICENSE = "BSD" + +AUTHOR = "Mikael Grev" +HOMEPAGE = "http://www.migcalendar.com/miglayout" + +SRC_URI = "http://www.migcalendar.com/${PN}/versions/${P}.zip" + +S = "${WORKDIR}" + +inherit java-library + +DEPENDS = "unzip-native fastjar-native classpath swt3.4-gtk" + +do_unpackpost() { + find -name "*.jar" -exec rm {} \; + + mkdir sources + unzip miglayout-src.zip -d sources +} + +addtask unpackpost after do_unpack before do_patch + +do_compile() { + oe_makeclasspath cp -s swt + + javac \ + -source 5.0 -sourcepath sources -cp $cp \ + -d build \ + `find sources -name "*.java" -and -not -wholename "*demo*"` \ + + fastjar -C build -c -f ${JARFILENAME} . +} + diff --git a/packages/portabase/beecrypt/.mtn2git_empty b/packages/portabase/beecrypt/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/portabase/beecrypt/.mtn2git_empty +++ /dev/null diff --git a/packages/portabase/beecrypt/config.m4 b/packages/portabase/beecrypt/config.m4 deleted file mode 100644 index 05d2d1593d..0000000000 --- a/packages/portabase/beecrypt/config.m4 +++ /dev/null @@ -1,16 +0,0 @@ -dnl config.m4 -ifdef(`__CONFIG_M4_INCLUDED__',,` -define(`CONFIG_TOP_SRCDIR',`/home/hrw/zaurus/oe/build/0930/tmp/work/beecrypt-3.1.0-r0/beecrypt-3.1.0') -define(`ASM_OS',`linux-gnu') -define(`ASM_CPU',`arm') -define(`ASM_ARCH',`arm') -define(`ASM_BIGENDIAN',`no') -define(`ASM_SRCDIR',`/home/hrw/zaurus/oe/build/0930/tmp/work/beecrypt-3.1.0-r0/beecrypt-3.1.0/gas') -define(`TEXTSEG',`.text') -define(`GLOBL',`.globl') -define(`GSYM_PREFIX',`') -define(`LSYM_PREFIX',`.L') -define(`ALIGN',`') -define(`__CONFIG_M4_INCLUDED__') -include(asmdefs.m4) -') diff --git a/packages/portabase/beecrypt/gas.patch b/packages/portabase/beecrypt/gas.patch deleted file mode 100644 index bdb20944d3..0000000000 --- a/packages/portabase/beecrypt/gas.patch +++ /dev/null @@ -1,166 +0,0 @@ -diff -ur beecrypt-3.1.0/gas.orig/aesopt.ppc.m4 beecrypt-3.1.0/gas/aesopt.ppc.m4 ---- beecrypt-3.1.0/gas.orig/aesopt.ppc.m4 2003-06-09 08:03:21 +0200 -+++ beecrypt-3.1.0/gas/aesopt.ppc.m4 2004-10-06 17:59:31 +0200 -@@ -21,7 +21,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/ppc.m4) -+include(ppc.m4) - - define(`s0',`r24') - define(`s1',`r25') -diff -ur beecrypt-3.1.0/gas.orig/aesopt.x86.m4 beecrypt-3.1.0/gas/aesopt.x86.m4 ---- beecrypt-3.1.0/gas.orig/aesopt.x86.m4 2003-06-09 10:35:39 +0200 -+++ beecrypt-3.1.0/gas/aesopt.x86.m4 2004-10-06 17:54:36 +0200 -@@ -1,5 +1,5 @@ - include(config.m4) --include(ASM_SRCDIR/x86.m4) -+include(x86.m4) - - ifdef(`USE_MMX',` - -diff -ur beecrypt-3.1.0/gas.orig/blowfishopt.i586.m4 beecrypt-3.1.0/gas/blowfishopt.i586.m4 ---- beecrypt-3.1.0/gas.orig/blowfishopt.i586.m4 2003-06-09 10:25:11 +0200 -+++ beecrypt-3.1.0/gas/blowfishopt.i586.m4 2004-10-06 17:54:58 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/x86.m4) -+include(x86.m4) - - dnl during this macro we assume: - dnl bp in %esi, xl and xr in %ecx and %edx, %eax and %ebx clear -diff -ur beecrypt-3.1.0/gas.orig/blowfishopt.ppc.m4 beecrypt-3.1.0/gas/blowfishopt.ppc.m4 ---- beecrypt-3.1.0/gas.orig/blowfishopt.ppc.m4 2003-06-04 19:39:57 +0200 -+++ beecrypt-3.1.0/gas/blowfishopt.ppc.m4 2004-10-06 17:59:36 +0200 -@@ -21,7 +21,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/ppc.m4) -+include(ppc.m4) - - define(`round',` - lwz r9,$3(r3) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.alpha.m4 beecrypt-3.1.0/gas/mpopt.alpha.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.alpha.m4 2003-05-29 10:44:37 +0200 -+++ beecrypt-3.1.0/gas/mpopt.alpha.m4 2004-10-06 17:57:20 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/alpha.m4) -+include(alpha.m4) - - - C_FUNCTION_BEGIN(mpadd) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.ia64.m4 beecrypt-3.1.0/gas/mpopt.ia64.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.ia64.m4 2003-05-28 10:40:44 +0200 -+++ beecrypt-3.1.0/gas/mpopt.ia64.m4 2004-10-06 17:57:32 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/ia64.m4) -+include(ia64.m4) - - define(`sze',`r14') - define(`dst',`r15') -diff -ur beecrypt-3.1.0/gas.orig/mpopt.m68k.m4 beecrypt-3.1.0/gas/mpopt.m68k.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.m68k.m4 2003-04-26 14:01:57 +0200 -+++ beecrypt-3.1.0/gas/mpopt.m68k.m4 2004-10-06 17:57:38 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/m68k.m4) -+include(m68k.m4) - - dnl works - C_FUNCTION_BEGIN(mpadd) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.ppc64.m4 beecrypt-3.1.0/gas/mpopt.ppc64.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.ppc64.m4 2003-04-19 18:05:43 +0200 -+++ beecrypt-3.1.0/gas/mpopt.ppc64.m4 2004-10-06 17:57:54 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/ppc64.m4) -+include(ppc64.m4) - - - C_FUNCTION_BEGIN(mpaddw) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.ppc.m4 beecrypt-3.1.0/gas/mpopt.ppc.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.ppc.m4 2003-04-19 18:05:43 +0200 -+++ beecrypt-3.1.0/gas/mpopt.ppc.m4 2004-10-06 17:57:50 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/ppc.m4) -+include(ppc.m4) - - - C_FUNCTION_BEGIN(mpaddw) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.sparcv8.m4 beecrypt-3.1.0/gas/mpopt.sparcv8.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.sparcv8.m4 2003-04-19 18:05:43 +0200 -+++ beecrypt-3.1.0/gas/mpopt.sparcv8.m4 2004-10-06 17:56:54 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/sparc.m4) -+include(sparc.m4) - - - C_FUNCTION_BEGIN(mpsetmul) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.sparcv8plus.m4 beecrypt-3.1.0/gas/mpopt.sparcv8plus.m4 |