From cbea2f4a751b5ee8fb1343a05742f8b8765dec7a Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 24 Aug 2007 08:40:43 +0000 Subject: gst-plugins-bad_0.10.5.bb : apply bug from #2854 to fix properly the directfb problems in compile. Thanks to "Gordon Syme" --- .../gst-plugins-bad/gst-plugins-directfb-fix.patch | 32 ++++++++++++++++++++++ packages/gstreamer/gst-plugins-bad_0.10.5.bb | 6 ++-- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch (limited to 'packages') diff --git a/packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch b/packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch new file mode 100644 index 0000000000..f8f516bc44 --- /dev/null +++ b/packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch @@ -0,0 +1,32 @@ +--- gst-plugins-bad-0.10.5-r1.orig/gst-plugins-bad-0.10.5/examples/directfb/gstdfb.c 2007-08-24 08:23:23.000000000 +0100 ++++ gst-plugins-bad-0.10.5-r1/gst-plugins-bad-0.10.5/examples/directfb/gstdfb.c 2007-08-24 08:24:28.000000000 +0100 +@@ -35,7 +35,7 @@ + #include + #include + +-#include ++#include + #include + #include + +--- gst-plugins-bad-0.10.5-r1.orig/gst-plugins-bad-0.10.5/ext/directfb/dfb-example.c 2007-08-24 08:23:24.000000000 +0100 ++++ gst-plugins-bad-0.10.5-r1/gst-plugins-bad-0.10.5/ext/directfb/dfb-example.c 2007-08-24 08:24:41.000000000 +0100 +@@ -1,5 +1,5 @@ + +-#include ++#include + #include + + static IDirectFB *dfb = NULL; + +--- gst-plugins-bad-0.10.5-r1.orig/gst-plugins-bad-0.10.5/ext/directfb/dfbvideosink.h 2007-08-24 08:23:24.000000000 +0100 ++++ gst-plugins-bad-0.10.5-r1/gst-plugins-bad-0.10.5/ext/directfb/dfbvideosink.h 2007-08-24 08:24:56.000000000 +0100 +@@ -22,7 +22,7 @@ + + #include + +-#include ++#include + + G_BEGIN_DECLS + diff --git a/packages/gstreamer/gst-plugins-bad_0.10.5.bb b/packages/gstreamer/gst-plugins-bad_0.10.5.bb index 9c7d94117c..ce61d10010 100644 --- a/packages/gstreamer/gst-plugins-bad_0.10.5.bb +++ b/packages/gstreamer/gst-plugins-bad_0.10.5.bb @@ -1,8 +1,8 @@ require gst-plugins.inc -SRC_URI += "file://vorbisenc.h file://vorbisdec.h" -DEPENDS += "gst-plugins-base" -EXTRA_OECONF += " --disable-directfb " +SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ + file://gst-plugins-directfb-fix.patch;patch=1;pnum=2" +DEPENDS += "gst-plugins-base directfb" do_compile_prepend() { # work around missing files in upstream tarball (upstream bug #454078) -- cgit v1.2.3 From 94db6144eaaa8d8cd641c081184f6431d8c01971 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 24 Aug 2007 09:06:31 +0000 Subject: automake-native 1.10: add DEFAULT_PREFERENCE = "-1" --- packages/automake/automake-native_1.10.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/automake/automake-native_1.10.bb b/packages/automake/automake-native_1.10.bb index 92c861f49c..a7857c562d 100644 --- a/packages/automake/automake-native_1.10.bb +++ b/packages/automake/automake-native_1.10.bb @@ -1,3 +1,5 @@ PV := "${PV}" require automake-native.inc + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 65b177e69a5590bdb756c5a9a489fbd22af8ebf0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 24 Aug 2007 09:08:32 +0000 Subject: libtool-native 1.5.24: DEFAULT_PREFERENCE = "-1" --- packages/libtool/libtool-native_1.5.24.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/libtool/libtool-native_1.5.24.bb b/packages/libtool/libtool-native_1.5.24.bb index fdc334fef2..3587dd8034 100644 --- a/packages/libtool/libtool-native_1.5.24.bb +++ b/packages/libtool/libtool-native_1.5.24.bb @@ -1,5 +1,6 @@ SECTION = "devel" require libtool_${PV}.bb +DEFAULT_PREFERENCE = "-1" PR = "r0" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" -- cgit v1.2.3 From dcd4e58eabeb0069c479480624487ce1edc36d88 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 24 Aug 2007 11:36:57 +0000 Subject: grub: rdepend on diffutils to get 'cmp' command needed by grub-install --- packages/grub/grub_0.97.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/grub/grub_0.97.bb b/packages/grub/grub_0.97.bb index 044ecba577..028a1a1a06 100644 --- a/packages/grub/grub_0.97.bb +++ b/packages/grub/grub_0.97.bb @@ -2,7 +2,8 @@ DESCRIPTION = "GRUB is the GRand Unified Bootloader" HOMEPAGE = "http://www.gnu.org/software/grub" SECTION = "bootloaders" PRIORITY = "optional" -PR = "r1" +RDEPENDS = "diffutils" +PR = "r2" SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz" -- cgit v1.2.3 From 42a725fcf4791de81c412ee45eb151222a8d47fb Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 24 Aug 2007 12:47:11 +0000 Subject: gtk+ 2.10.14: fix combo-arrow-size.patch (from Poky) - closes #2845 --- packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch | 27 +++++++++++------------ packages/gtk+/gtk+_2.10.14.bb | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) (limited to 'packages') diff --git a/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch b/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch index d44c454ce3..ec408a5f28 100644 --- a/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch +++ b/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch @@ -1,11 +1,8 @@ Index: gtk/gtkcombobox.c =================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkcombobox.c,v -retrieving revision 1.185 -diff -u -p -r1.185 gtkcombobox.c ---- gtk/gtkcombobox.c 12 Oct 2006 13:48:07 -0000 1.185 -+++ gtk/gtkcombobox.c 1 Nov 2006 19:01:09 -0000 -@@ -756,6 +756,25 @@ gtk_combo_box_class_init (GtkComboBoxCla +--- gtk/gtkcombobox.c.orig 2007-08-21 11:10:15.000000000 +0000 ++++ gtk/gtkcombobox.c 2007-08-21 11:13:00.000000000 +0000 +@@ -692,6 +692,25 @@ FALSE, GTK_PARAM_READABLE)); @@ -31,26 +28,27 @@ diff -u -p -r1.185 gtkcombobox.c g_type_class_add_private (object_class, sizeof (GtkComboBoxPrivate)); } -@@ -1897,7 +1916,12 @@ gtk_combo_box_size_request (GtkWidget +@@ -1926,8 +1945,13 @@ { - gint width, height; + GtkComboBox *combo_box = GTK_COMBO_BOX (widget); gint focus_width, focus_pad; + gint font_size; + gint arrow_size; - GtkRequisition bin_req; + GtkAllocation child; + GtkRequisition req; + PangoContext *context; + PangoFontMetrics *metrics; + PangoFontDescription *font_desc; + gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL; - GtkComboBox *combo_box = GTK_COMBO_BOX (widget); - -@@ -1910,7 +1934,20 @@ gtk_combo_box_size_request (GtkWidget + widget->allocation = *allocation; +@@ -1935,8 +1959,21 @@ gtk_widget_style_get (GTK_WIDGET (widget), "focus-line-width", &focus_width, "focus-padding", &focus_pad, + "arrow-size", &arrow_size, NULL); -+ + + font_desc = GTK_BIN (widget)->child->style->font_desc; + context = gtk_widget_get_pango_context (widget); + metrics = pango_context_get_metrics (context, font_desc, @@ -62,6 +60,7 @@ diff -u -p -r1.185 gtkcombobox.c + arrow_size = MAX (arrow_size, font_size); + + gtk_widget_set_size_request (combo_box->priv->arrow, arrow_size, arrow_size); - ++ if (!combo_box->priv->tree_view) { + if (combo_box->priv->cell_view) diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb index 947cf19077..ef783b01f0 100644 --- a/packages/gtk+/gtk+_2.10.14.bb +++ b/packages/gtk+/gtk+_2.10.14.bb @@ -1,6 +1,6 @@ require gtk-2.10.inc -PR = "r6" +PR = "r7" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ -- cgit v1.2.3 From 866529bae981b5cdf8700ffaba239fba4e41859b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 24 Aug 2007 13:02:10 +0000 Subject: linux: select proper PATA driver for Alix board --- packages/linux/linux/alix/defconfig | 11 +++-------- packages/linux/linux_2.6.22.bb | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux/alix/defconfig b/packages/linux/linux/alix/defconfig index c1c82931bb..6d4ac6a735 100644 --- a/packages/linux/linux/alix/defconfig +++ b/packages/linux/linux/alix/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.22 -# Tue Aug 7 15:04:11 2007 +# Fri Aug 24 14:54:56 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -197,11 +197,6 @@ CONFIG_VM86=y CONFIG_NOHIGHMEM=y # CONFIG_HIGHMEM4G is not set # CONFIG_HIGHMEM64G is not set -# CONFIG_VMSPLIT_3G is not set -# CONFIG_VMSPLIT_3G_OPT is not set -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_2G_OPT is not set -# CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y @@ -615,14 +610,14 @@ CONFIG_ATA_ACPI=y # CONFIG_SATA_VITESSE is not set # CONFIG_SATA_INIC162X is not set # CONFIG_PATA_ALI is not set -# CONFIG_PATA_AMD is not set +CONFIG_PATA_AMD=y # CONFIG_PATA_ARTOP is not set # CONFIG_PATA_ATIIXP is not set # CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_CMD64X is not set # CONFIG_PATA_CS5520 is not set # CONFIG_PATA_CS5530 is not set -CONFIG_PATA_CS5535=y +# CONFIG_PATA_CS5535 is not set # CONFIG_PATA_CYPRESS is not set # CONFIG_PATA_EFAR is not set # CONFIG_ATA_GENERIC is not set diff --git a/packages/linux/linux_2.6.22.bb b/packages/linux/linux_2.6.22.bb index b4e18dd5e1..6791e33014 100644 --- a/packages/linux/linux_2.6.22.bb +++ b/packages/linux/linux_2.6.22.bb @@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_alix = "1" DEFAULT_PREFERENCE_avr32 = "1" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \ file://defconfig \ -- cgit v1.2.3 From c748887a42f92eff887578ce1341e5b95cc50b05 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Fri, 24 Aug 2007 13:16:38 +0000 Subject: gnuplot: remove stale patch, fixes #2300 --- packages/gnuplot/gnuplot_4.2.0.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'packages') diff --git a/packages/gnuplot/gnuplot_4.2.0.bb b/packages/gnuplot/gnuplot_4.2.0.bb index c6f51c4f15..d750aac66a 100644 --- a/packages/gnuplot/gnuplot_4.2.0.bb +++ b/packages/gnuplot/gnuplot_4.2.0.bb @@ -8,7 +8,6 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \ file://subdirs.patch;patch=1 \ - file://matrix.patch;patch=1 \ file://gnuplot.desktop \ file://gnuplot.png" -- cgit v1.2.3 From 79f6416b33eda3443ce39d938664353847f8305b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 24 Aug 2007 13:49:55 +0000 Subject: powertop: update to 1.8 --- packages/powertop/powertop_1.5.bb | 17 ----------------- packages/powertop/powertop_1.8.bb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 packages/powertop/powertop_1.5.bb create mode 100644 packages/powertop/powertop_1.8.bb (limited to 'packages') diff --git a/packages/powertop/powertop_1.5.bb b/packages/powertop/powertop_1.5.bb deleted file mode 100644 index ab84161ddc..0000000000 --- a/packages/powertop/powertop_1.5.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "PowerTOP, a tool that helps you find what software is using the most power." -HOMEPAGE = "http://www.linuxpowertop.org/" -LICENSE = "GPLv2" -DEPENDS = "ncurses" - -SRC_URI = "http://www.linuxpowertop.org/download/powertop-${PV}.tar.gz" - -CFLAGS += "${LDFLAGS}" - -do_configure() { - # We do not build ncurses with wide char support - sed -i -e "s/lncursesw/lncurses/" ${S}/Makefile -} - -do_install() { - oe_runmake install DESTDIR=${D} -} diff --git a/packages/powertop/powertop_1.8.bb b/packages/powertop/powertop_1.8.bb new file mode 100644 index 0000000000..ab84161ddc --- /dev/null +++ b/packages/powertop/powertop_1.8.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "PowerTOP, a tool that helps you find what software is using the most power." +HOMEPAGE = "http://www.linuxpowertop.org/" +LICENSE = "GPLv2" +DEPENDS = "ncurses" + +SRC_URI = "http://www.linuxpowertop.org/download/powertop-${PV}.tar.gz" + +CFLAGS += "${LDFLAGS}" + +do_configure() { + # We do not build ncurses with wide char support + sed -i -e "s/lncursesw/lncurses/" ${S}/Makefile +} + +do_install() { + oe_runmake install DESTDIR=${D} +} -- cgit v1.2.3 From 77613beb09608ba214db174b0c589924acf30c7e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 24 Aug 2007 13:51:59 +0000 Subject: less: update to 406 (from Poky), drop older ones --- packages/less/less-381/.mtn2git_empty | 0 packages/less/less-381/configure.patch | 243 --------------------------------- packages/less/less-382/.mtn2git_empty | 0 packages/less/less-382/configure.patch | 243 --------------------------------- packages/less/less_381.bb | 14 -- packages/less/less_406.bb | 20 +++ 6 files changed, 20 insertions(+), 500 deletions(-) delete mode 100644 packages/less/less-381/.mtn2git_empty delete mode 100644 packages/less/less-381/configure.patch delete mode 100644 packages/less/less-382/.mtn2git_empty delete mode 100644 packages/less/less-382/configure.patch delete mode 100644 packages/less/less_381.bb create mode 100644 packages/less/less_406.bb (limited to 'packages') diff --git a/packages/less/less-381/.mtn2git_empty b/packages/less/less-381/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/less/less-381/configure.patch b/packages/less/less-381/configure.patch deleted file mode 100644 index 2f054ba639..0000000000 --- a/packages/less/less-381/configure.patch +++ /dev/null @@ -1,243 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- less-381/./configure.ac~configure -+++ less-381/./configure.ac -@@ -9,7 +9,7 @@ - # contact the author, see the README file. - - # Autoconf initialization. --AC_INIT(less, 1) -+AC_INIT([less],[1]) - AC_CONFIG_SRCDIR([forwback.c]) - AC_CONFIG_HEADER([defines.h]) - -@@ -56,8 +56,7 @@ - TERMLIBS="-lxcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -69,8 +68,7 @@ - TERMLIBS="-lncurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -82,8 +80,7 @@ - TERMLIBS="-lcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -96,8 +93,7 @@ - TERMLIBS="-lcurses -ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -111,8 +107,7 @@ - TERMLIBS="-ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -124,8 +119,7 @@ - TERMLIBS="-lcurses -ltermlib" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -200,14 +194,11 @@ - # Checks for identifiers. - AC_TYPE_OFF_T - AC_MSG_CHECKING(for void) --AC_TRY_COMPILE(, [void *foo = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void *foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for const) --AC_TRY_COMPILE(, [const int foo = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[const int foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for time_t) --AC_TRY_COMPILE([#include ], [time_t t = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[time_t t = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)],[AC_MSG_RESULT(no)]) - - # Checks for library functions. - AC_TYPE_SIGNAL -@@ -217,14 +208,13 @@ - AC_CHECK_FUNC(tcgetattr, AC_DEFINE(HAVE_TERMIOS_FUNCS)) - - AC_MSG_CHECKING(for fileno) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_STDIO_H - #include --#endif], [static int x; x = fileno(stdin);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)], [AC_MSG_RESULT(no)]) -+#endif]], [[static int x; x = fileno(stdin);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for strerror) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_STDIO_H - #include - #endif -@@ -233,68 +223,56 @@ - #endif - #if HAVE_ERRNO_H - #include --#endif], [static char *x; x = strerror(0);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)], [AC_MSG_RESULT(no)]) -+#endif]], [[static char *x; x = strerror(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sys_errlist) --AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = sys_errlist;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)], [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern char *sys_errlist[]; static char **x; x = sys_errlist;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sigset_t) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include --], [sigset_t s; s = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)], [AC_MSG_RESULT(no)]) -+]], [[sigset_t s; s = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sigemptyset) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include --], [sigset_t s; sigemptyset(&s);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)], [AC_MSG_RESULT(no)]) -+]], [[sigset_t s; sigemptyset(&s);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)],[AC_MSG_RESULT(no)]) - - have_errno=no - AC_MSG_CHECKING(for errno) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_ERRNO_H - #include --#endif], [static int x; x = errno;], -- [AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes]) -+#endif]], [[static int x; x = errno;]])],[AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes],[]) - if test $have_errno = no; then --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_ERRNO_H - #include --#endif], [extern int errno; static int x; x = errno;], -- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)], -- [AC_MSG_RESULT(no)]) -+#endif]], [[extern int errno; static int x; x = errno;]])],[AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)],[AC_MSG_RESULT(no)]) - fi - - AC_MSG_CHECKING(for locale) --AC_TRY_LINK([#include --#include ], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include -+#include ]], [[setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for ctype functions) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_CTYPE_H - #include --#endif], [static int x; x = isupper(x); x = tolower(x); x = toupper(x);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)], [AC_MSG_RESULT(no)]) -+#endif]], [[static int x; x = isupper(x); x = tolower(x); x = toupper(x);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)],[AC_MSG_RESULT(no)]) - - # Checks for external variable ospeed in the termcap library. - have_ospeed=no - AC_MSG_CHECKING(termcap for ospeed) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include - #if HAVE_TERMIOS_H - #include - #endif - #if HAVE_TERMCAP_H - #include --#endif], [ospeed = 0;], --[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes]) -+#endif]], [[ospeed = 0;]])],[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes],[]) - if test $have_ospeed = no; then --AC_TRY_LINK(, [extern short ospeed; ospeed = 0;], -- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)], -- [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern short ospeed; ospeed = 0;]])],[AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)],[AC_MSG_RESULT(no)]) - fi - - # Checks for regular expression functions. -@@ -311,7 +289,7 @@ - if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then - # Some versions of Solaris have a regcomp() function, but it doesn't work! - # So we run a test program. If we're cross-compiling, do it the old way. --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - main() { regex_t r; regmatch_t rm; char *text = "xabcy"; -@@ -322,19 +300,16 @@ - #else - if (rm.rm_sp != text + 1) exit(1); /* check for correct offset */ - #endif --exit(0); }], -- have_posix_regex=yes, have_posix_regex=no, have_posix_regex=unknown) -+exit(0); }]])],[have_posix_regex=yes],[have_posix_regex=no],[have_posix_regex=unknown]) - if test $have_posix_regex = yes; then - AC_MSG_RESULT(using POSIX regcomp) - AC_DEFINE(HAVE_POSIX_REGCOMP) - have_regex=yes - elif test $have_posix_regex = unknown; then -- AC_TRY_LINK([ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include --#include ], -- [regex_t *r; regfree(r);], -- AC_MSG_RESULT(using POSIX regcomp) -- AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes) -+#include ]], [[regex_t *r; regfree(r);]])],[AC_MSG_RESULT(using POSIX regcomp) -+ AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes],[]) - else - AC_MSG_RESULT(no) - fi -@@ -357,9 +332,8 @@ - - if test $have_regex = no; then - if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then --AC_TRY_LINK([ --#include "regexp.h"], [regcomp("");], --AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -+#include "regexp.h"]], [[regcomp("");]])],[AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes],[]) - fi - fi - diff --git a/packages/less/less-382/.mtn2git_empty b/packages/less/less-382/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/less/less-382/configure.patch b/packages/less/less-382/configure.patch deleted file mode 100644 index 2f054ba639..0000000000 --- a/packages/less/less-382/configure.patch +++ /dev/null @@ -1,243 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- less-381/./configure.ac~configure -+++ less-381/./configure.ac -@@ -9,7 +9,7 @@ - # contact the author, see the README file. - - # Autoconf initialization. --AC_INIT(less, 1) -+AC_INIT([less],[1]) - AC_CONFIG_SRCDIR([forwback.c]) - AC_CONFIG_HEADER([defines.h]) - -@@ -56,8 +56,7 @@ - TERMLIBS="-lxcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -69,8 +68,7 @@ - TERMLIBS="-lncurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -82,8 +80,7 @@ - TERMLIBS="-lcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -96,8 +93,7 @@ - TERMLIBS="-lcurses -ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -111,8 +107,7 @@ - TERMLIBS="-ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -124,8 +119,7 @@ - TERMLIBS="-lcurses -ltermlib" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -200,14 +194,11 @@ - # Checks for identifiers. - AC_TYPE_OFF_T - AC_MSG_CHECKING(for void) --AC_TRY_COMPILE(, [void *foo = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void *foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for const) --AC_TRY_COMPILE(, [const int foo = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[const int foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for time_t) --AC_TRY_COMPILE([#include ], [time_t t = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[time_t t = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIME_T)],[AC_MSG_RESULT(no)]) - - # Checks for library functions. - AC_TYPE_SIGNAL -@@ -217,14 +208,13 @@ - AC_CHECK_FUNC(tcgetattr, AC_DEFINE(HAVE_TERMIOS_FUNCS)) - - AC_MSG_CHECKING(for fileno) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_STDIO_H - #include --#endif], [static int x; x = fileno(stdin);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)], [AC_MSG_RESULT(no)]) -+#endif]], [[static int x; x = fileno(stdin);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FILENO)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for strerror) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_STDIO_H - #include - #endif -@@ -233,68 +223,56 @@ - #endif - #if HAVE_ERRNO_H - #include --#endif], [static char *x; x = strerror(0);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)], [AC_MSG_RESULT(no)]) -+#endif]], [[static char *x; x = strerror(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STRERROR)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sys_errlist) --AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = sys_errlist;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)], [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern char *sys_errlist[]; static char **x; x = sys_errlist;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sigset_t) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include --], [sigset_t s; s = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)], [AC_MSG_RESULT(no)]) -+]], [[sigset_t s; s = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)],[AC_MSG_RESULT(no)]) - - AC_MSG_CHECKING(for sigemptyset) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include --], [sigset_t s; sigemptyset(&s);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)], [AC_MSG_RESULT(no)]) -+]], [[sigset_t s; sigemptyset(&s);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)],[AC_MSG_RESULT(no)]) - - have_errno=no - AC_MSG_CHECKING(for errno) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_ERRNO_H - #include --#endif], [static int x; x = errno;], -- [AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes]) -+#endif]], [[static int x; x = errno;]])],[AC_MSG_RESULT(yes - in errno.h); AC_DEFINE(HAVE_ERRNO) have_errno=yes],[]) - if test $have_errno = no; then --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_ERRNO_H - #include --#endif], [extern int errno; static int x; x = errno;], -- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)], -- [AC_MSG_RESULT(no)]) -+#endif]], [[extern int errno; static int x; x = errno;]])],[AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_ERRNO) AC_DEFINE(MUST_DEFINE_ERRNO)],[AC_MSG_RESULT(no)]) - fi - - AC_MSG_CHECKING(for locale) --AC_TRY_LINK([#include --#include ], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include -+#include ]], [[setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for ctype functions) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if HAVE_CTYPE_H - #include --#endif], [static int x; x = isupper(x); x = tolower(x); x = toupper(x);], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)], [AC_MSG_RESULT(no)]) -+#endif]], [[static int x; x = isupper(x); x = tolower(x); x = toupper(x);]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_UPPER_LOWER)],[AC_MSG_RESULT(no)]) - - # Checks for external variable ospeed in the termcap library. - have_ospeed=no - AC_MSG_CHECKING(termcap for ospeed) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include - #if HAVE_TERMIOS_H - #include - #endif - #if HAVE_TERMCAP_H - #include --#endif], [ospeed = 0;], --[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes]) -+#endif]], [[ospeed = 0;]])],[AC_MSG_RESULT(yes - in termcap.h); AC_DEFINE(HAVE_OSPEED) have_ospeed=yes],[]) - if test $have_ospeed = no; then --AC_TRY_LINK(, [extern short ospeed; ospeed = 0;], -- [AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)], -- [AC_MSG_RESULT(no)]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern short ospeed; ospeed = 0;]])],[AC_MSG_RESULT(yes - must define); AC_DEFINE(HAVE_OSPEED) AC_DEFINE(MUST_DEFINE_OSPEED)],[AC_MSG_RESULT(no)]) - fi - - # Checks for regular expression functions. -@@ -311,7 +289,7 @@ - if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then - # Some versions of Solaris have a regcomp() function, but it doesn't work! - # So we run a test program. If we're cross-compiling, do it the old way. --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - main() { regex_t r; regmatch_t rm; char *text = "xabcy"; -@@ -322,19 +300,16 @@ - #else - if (rm.rm_sp != text + 1) exit(1); /* check for correct offset */ - #endif --exit(0); }], -- have_posix_regex=yes, have_posix_regex=no, have_posix_regex=unknown) -+exit(0); }]])],[have_posix_regex=yes],[have_posix_regex=no],[have_posix_regex=unknown]) - if test $have_posix_regex = yes; then - AC_MSG_RESULT(using POSIX regcomp) - AC_DEFINE(HAVE_POSIX_REGCOMP) - have_regex=yes - elif test $have_posix_regex = unknown; then -- AC_TRY_LINK([ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include --#include ], -- [regex_t *r; regfree(r);], -- AC_MSG_RESULT(using POSIX regcomp) -- AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes) -+#include ]], [[regex_t *r; regfree(r);]])],[AC_MSG_RESULT(using POSIX regcomp) -+ AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes],[]) - else - AC_MSG_RESULT(no) - fi -@@ -357,9 +332,8 @@ - - if test $have_regex = no; then - if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then --AC_TRY_LINK([ --#include "regexp.h"], [regcomp("");], --AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -+#include "regexp.h"]], [[regcomp("");]])],[AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes],[]) - fi - fi - diff --git a/packages/less/less_381.bb b/packages/less/less_381.bb deleted file mode 100644 index 6702292423..0000000000 --- a/packages/less/less_381.bb +++ /dev/null @@ -1,14 +0,0 @@ -SECTION = "console/utils" -DEPENDS = "ncurses" -DESCRIPTION = "Less is a program similar to more, i.e. a terminal \ -based program for viewing text files and the output from other \ -programs. Less offers many features beyond those that more does." -LICENSE = "GPL" -SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz \ - file://configure.patch;patch=1" - -inherit autotools - -do_install () { - oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install -} diff --git a/packages/less/less_406.bb b/packages/less/less_406.bb new file mode 100644 index 0000000000..c8ef2fc6e6 --- /dev/null +++ b/packages/less/less_406.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Less is a program similar to more, i.e. a terminal \ +based program for viewing text files and the output from other \ +programs. Less offers many features beyond those that more does." +HOMEPAGE = "http://www.greenwoodsoftware.com/" +SECTION = "console/utils" +LICENSE = "BSD" +DEPENDS = "ncurses" + +SRC_URI = "http://www.greenwoodsoftware.com/less/less-406.tar.gz " + +inherit autotools update-alternatives + +do_install () { + oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install + mv ${D}${bindir}/less ${D}${bindir}/less.${PN} +} + +ALTERNATIVE_NAME = "less" +ALTERNATIVE_PATH = "less.${PN}" +ALTERNATIVE_PRIORITY = "100" -- cgit v1.2.3 From 9e9e2859d9f8876ad5b37f94f33c768d2164d81d Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 24 Aug 2007 21:38:23 +0000 Subject: midpath: major rework of midpath * new releas 0.1 * introduce midpath.inc * split midpath-cldc and midpath-cldc-sdl from midpath * seperate out kxml2 from midpath * split midpath-test from midpath * change jar-installdir to /usr/share/java --- packages/midpath/files/.mtn2git_empty | 0 packages/midpath/files/shellscript.patch | 27 +++++++ packages/midpath/midpath-alsa_0.1.bb | 43 +++++++++++ packages/midpath/midpath-alsa_svn.bb | 42 ----------- packages/midpath/midpath-cldc-native_0.1.bb | 14 ++++ packages/midpath/midpath-cldc-sdl_0.1.bb | 43 +++++++++++ packages/midpath/midpath-cldc-x11_0.1.bb | 40 ++++++++++ packages/midpath/midpath-cldc-x11_svn.bb | 43 ----------- packages/midpath/midpath-cldc_0.1.bb | 37 +++++++++ packages/midpath/midpath-gtk_0.1.bb | 42 +++++++++++ packages/midpath/midpath-gtk_svn.bb | 43 ----------- packages/midpath/midpath-native_svn.bb | 34 --------- packages/midpath/midpath-qt3x11_0.1.bb | 48 ++++++++++++ packages/midpath/midpath-qt3x11_svn.bb | 48 ------------ packages/midpath/midpath-qte_0.1.bb | 46 +++++++++++ packages/midpath/midpath-qte_svn.bb | 46 ----------- packages/midpath/midpath-test_0.1.bb | 46 +++++++++++ packages/midpath/midpath.inc | 22 ++++++ packages/midpath/midpath_0.1.bb | 61 +++++++++++++++ packages/midpath/midpath_svn.bb | 113 ---------------------------- 20 files changed, 469 insertions(+), 369 deletions(-) create mode 100644 packages/midpath/files/.mtn2git_empty create mode 100644 packages/midpath/files/shellscript.patch create mode 100644 packages/midpath/midpath-alsa_0.1.bb delete mode 100644 packages/midpath/midpath-alsa_svn.bb create mode 100644 packages/midpath/midpath-cldc-native_0.1.bb create mode 100644 packages/midpath/midpath-cldc-sdl_0.1.bb create mode 100644 packages/midpath/midpath-cldc-x11_0.1.bb delete mode 100644 packages/midpath/midpath-cldc-x11_svn.bb create mode 100644 packages/midpath/midpath-cldc_0.1.bb create mode 100644 packages/midpath/midpath-gtk_0.1.bb delete mode 100644 packages/midpath/midpath-gtk_svn.bb delete mode 100644 packages/midpath/midpath-native_svn.bb create mode 100644 packages/midpath/midpath-qt3x11_0.1.bb delete mode 100644 packages/midpath/midpath-qt3x11_svn.bb create mode 100644 packages/midpath/midpath-qte_0.1.bb delete mode 100644 packages/midpath/midpath-qte_svn.bb create mode 100644 packages/midpath/midpath-test_0.1.bb create mode 100644 packages/midpath/midpath.inc create mode 100644 packages/midpath/midpath_0.1.bb delete mode 100644 packages/midpath/midpath_svn.bb (limited to 'packages') diff --git a/packages/midpath/files/.mtn2git_empty b/packages/midpath/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/midpath/files/shellscript.patch b/packages/midpath/files/shellscript.patch new file mode 100644 index 0000000000..17c39d0810 --- /dev/null +++ b/packages/midpath/files/shellscript.patch @@ -0,0 +1,27 @@ +Index: midpath-0.1/bin/midpath-test-cacao-cldc.sh +=================================================================== +--- midpath-0.1.orig/bin/midpath-test-cacao-cldc.sh 2007-07-03 22:09:33.000000000 +0200 ++++ midpath-0.1/bin/midpath-test-cacao-cldc.sh 2007-08-24 22:31:32.000000000 +0200 +@@ -3,19 +3,13 @@ + # Adapt the next line to your environment + JAVA_CMD=cacao + +-if [ "$MIDPATH_HOME" = "" ]; then +- MIDPATH_HOME=$(pwd)/.. +-fi ++MIDPATH_HOME= + + # Set the classpath +-BCP=$MIDPATH_HOME/dist/cldc1.1.jar:$MIDPATH_HOME/dist/midpath.jar:$MIDPATH_HOME/resources-embedded:$MIDPATH_HOME/dist/sdljava-cldc.jar:$MIDPATH_HOME/dist/escher-x11-cldc.jar:$MIDPATH_HOME/dist/kxml2-2.3.0.jar ++BCP=$MIDPATH_HOME/cldc1.1.jar:$MIDPATH_HOME/midpath.jar:$MIDPATH_HOME/resources-embedded:$MIDPATH_HOME/sdljava-cldc.jar:$MIDPATH_HOME/escher-x11-cldc.jar:$MIDPATH_HOME/kxml2-2.3.0.jar + # Add the MIDlet jar to the classpath (must be loaded by the main + # classloader yet) +-BCP=$BCP:$MIDPATH_HOME/dist/midpath-tests.jar +- +-# Path of the native libraries +-JLP=$MIDPATH_HOME/dist +-export LD_LIBRARY_PATH=$JLP ++BCP=$BCP:$MIDPATH_HOME/midpath-tests.jar + + CLASS=org.thenesis.midpath.main.StandardMIDletLauncher + # The classname of the MIDlet (we have to set it manually yet) diff --git a/packages/midpath/midpath-alsa_0.1.bb b/packages/midpath/midpath-alsa_0.1.bb new file mode 100644 index 0000000000..940a1ea8a2 --- /dev/null +++ b/packages/midpath/midpath-alsa_0.1.bb @@ -0,0 +1,43 @@ + +require midpath_${PV}.bb + +DEPENDS += "alsa-lib" +RDEPENDS = "alsa-lib" + +do_configure() { + cd ${S}/native/alsa + sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|sound.backend:NULL|sound.backend:ALSA|" configuration.cfg +} + +do_compile() { + +mkdir -p ${S}/dist + +# Build native code + +# Build the ALSA native part +cd ${S}/native/alsa +make || exit 1 + +} + +do_install() { + install -d ${D}${libdir} + install -m 0644 ${S}/native/alsa/libmidpathalsa.so ${D}${libdir} + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + : +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/libmidpathalsa.so \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " + +CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/midpath/midpath-alsa_svn.bb b/packages/midpath/midpath-alsa_svn.bb deleted file mode 100644 index 7d230f3cd0..0000000000 --- a/packages/midpath/midpath-alsa_svn.bb +++ /dev/null @@ -1,42 +0,0 @@ - -require midpath_${PV}.bb - -DEPENDS += "alsa-lib" -RDEPENDS = "alsa-lib" - -do_configure() { - cd ${S}/native/alsa - sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile - cd ${S}/resources-embedded/com/sun/midp/configuration - sed -i -e "s|sound.backend:NULL|sound.backend:ALSA|" configuration.cfg -} - -do_compile() { - -mkdir -p ${S}/dist - -# Build native code - -# Build the ALSA native part -cd ${S}/native/alsa -make || exit 1 -cp *.so ${S}/dist - -} - -do_install() { - install -d ${D}${libdir} - install -m 0644 dist/libmidpathalsa.so ${D}${libdir} - install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration - install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ -} - -do_stage() { - : -} - -PACKAGES = "${PN}" - -FILES_${PN} = "${libdir}/libmidpathalsa.so \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ - " diff --git a/packages/midpath/midpath-cldc-native_0.1.bb b/packages/midpath/midpath-cldc-native_0.1.bb new file mode 100644 index 0000000000..27700d2e61 --- /dev/null +++ b/packages/midpath/midpath-cldc-native_0.1.bb @@ -0,0 +1,14 @@ + +inherit native + +require midpath-cldc_${PV}.bb + + +PROVIDES = "virtual/cldc-api-1.1-native" +RPROVIDES = " " + +PACKAGES = " " + +do_install() { + : +} diff --git a/packages/midpath/midpath-cldc-sdl_0.1.bb b/packages/midpath/midpath-cldc-sdl_0.1.bb new file mode 100644 index 0000000000..d00cbfc619 --- /dev/null +++ b/packages/midpath/midpath-cldc-sdl_0.1.bb @@ -0,0 +1,43 @@ + +require midpath.inc + +do_configure() { + + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|ui.backend:AWT|ui.backend:SDL|" \ + -e "s|bitsPerPixel:32|bitsPerPixel:16|" \ + configuration.cfg + +} + + +do_compile() { + +mkdir -p ${S}/dist + +# Build SDLJava for CLDC +cd ${S}/external/sdljava-cldc +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH} -sourcepath ${S}/external/sdljava-cldc -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1" JAR_FILE="sdljava-cldc.jar" JAR_FLAGS="cvf" || exit 1 + +} + +do_install() { + install -d ${D}${datadir}/java + install -m 0644 ${S}/external/sdljava-cldc/sdljava-cldc.jar ${D}${datadir}/java + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + install -d ${STAGING_DATADIR}/java + install -m 0644 ${S}/external/sdljava-cldc/sdljava-cldc.jar ${STAGING_DATADIR}/java +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${datadir}/java/sdljava-cldc.jar \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " + +CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/midpath/midpath-cldc-x11_0.1.bb b/packages/midpath/midpath-cldc-x11_0.1.bb new file mode 100644 index 0000000000..30ca378436 --- /dev/null +++ b/packages/midpath/midpath-cldc-x11_0.1.bb @@ -0,0 +1,40 @@ + +require midpath.inc + +DEPENDS += " virtual/libx11 virtual/cldc-api-1.1" + +do_configure() { + + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|ui.backend:AWT|ui.backend:X11|" configuration.cfg + +} + +do_compile() { + +mkdir -p ${S}/dist + +# Build Escher X11 library +cd ${S}/external/escher-cldc/core +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/escher-cldc/core -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="escher-x11-cldc.jar" JAR_FLAGS="cvf" || exit 1 + +} + +do_install() { + install -d ${D}${datadir} + install -m 0644 ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${D}${datadir} + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + install -d ${STAGING_DATADIR}/java + install -m 0644 ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${STAGING_DATADIR}/java +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${datadir}/java/escher-x11-cldc.jar \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " diff --git a/packages/midpath/midpath-cldc-x11_svn.bb b/packages/midpath/midpath-cldc-x11_svn.bb deleted file mode 100644 index 1aac20265b..0000000000 --- a/packages/midpath/midpath-cldc-x11_svn.bb +++ /dev/null @@ -1,43 +0,0 @@ - -require midpath_${PV}.bb - -DEPENDS += "virtual/libx11 virtual/cldc-api-1.1" -RDEPENDS = "libx11" - -CLDC_PATH = ${STAGING_LIBDIR}/java/cldc1.1.jar - -do_configure() { - - cd ${S}/resources-embedded/com/sun/midp/configuration - sed -i -e "s|ui.backend:AWT|ui.backend:X11|" configuration.cfg - -} - -do_compile() { - -mkdir -p ${S}/dist - -# Build Escher X11 library -cd ${S}/external/escher-cldc/core -make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/escher-cldc/core -source 1.3 -target 1.1" || exit 1 -make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="escher-x11-cldc.jar" JAR_FLAGS="cvf" || exit 1 -cp ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${S}/dist - -} - -do_install() { - install -d ${D}${libdir} - install -m 0644 dist/escher-x11-cldc.jar ${D}${libdir} - install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration - install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ -} - -do_stage() { - : -} - -PACKAGES = "${PN}" - -FILES_${PN} = "${libdir}/java/escher-x11-cldc.jar \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ - " diff --git a/packages/midpath/midpath-cldc_0.1.bb b/packages/midpath/midpath-cldc_0.1.bb new file mode 100644 index 0000000000..24ffc61332 --- /dev/null +++ b/packages/midpath/midpath-cldc_0.1.bb @@ -0,0 +1,37 @@ + +require midpath.inc + +PROVIDES = "virtual/cldc-api-1.1" + +do_compile() { + +mkdir -p ${S}/dist + +# Build CLDC1.1 +# Build base classes +cd ${S}/external/cldc1.1/src +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" || exit 1 +make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes || exit 1 +# Build CLDC extra classes for MIDP2 +cd ${S}/src/cldc-glue +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1" +make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes +# Make a jar +${FASTJAR_CMD} cvf ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes . + + +} + +do_install() { + install -d ${D}${datadir}/java + install -m 0644 dist/cldc1.1.jar ${D}${datadir}/java +} + +do_stage() { + install -d ${STAGING_DATADIR}/java + install -m 0644 dist/cldc1.1.jar ${STAGING_DATADIR}/java +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${datadir}/java/cldc1.1.jar" diff --git a/packages/midpath/midpath-gtk_0.1.bb b/packages/midpath/midpath-gtk_0.1.bb new file mode 100644 index 0000000000..680b4e259d --- /dev/null +++ b/packages/midpath/midpath-gtk_0.1.bb @@ -0,0 +1,42 @@ + +require midpath.inc + +DEPENDS += "gtk+" + +do_configure() { + + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|ui.backend:AWT|ui.backend:GTK|" configuration.cfg + + cd ${S}/native/gtk + sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile + +} + +do_compile() { + +mkdir -p ${S}/dist + +# Build the GTK native part +cd ${S}/native/gtk +make || exit 1 + +} + +do_install() { + install -d ${D}${libdir} + install -m 0644 ${S}/native/gtk/libmidpathgtk.so ${D}${libdir} + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + : +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/libmidpathgtk.so \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " +CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/midpath/midpath-gtk_svn.bb b/packages/midpath/midpath-gtk_svn.bb deleted file mode 100644 index 3ee0d40f3d..0000000000 --- a/packages/midpath/midpath-gtk_svn.bb +++ /dev/null @@ -1,43 +0,0 @@ - -require midpath_${PV}.bb - -DEPENDS += "gtk+" -RDEPENDS = "gtk+" - -do_configure() { - - cd ${S}/resources-embedded/com/sun/midp/configuration - sed -i -e "s|ui.backend:AWT|ui.backend:GTK|" configuration.cfg - - cd ${S}/native/gtk - sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile - -} - -do_compile() { - -mkdir -p ${S}/dist - -# Build the GTK native part -cd ${S}/native/gtk -make || exit 1 -cp *.so ${S}/dist - -} - -do_install() { - install -d ${D}${libdir} - install -m 0644 dist/libmidpathgtk.so ${D}${libdir} - install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration - install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ -} - -do_stage() { - : -} - -PACKAGES = "${PN}" - -FILES_${PN} = "${libdir}/libmidpathgtk.so \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ - " diff --git a/packages/midpath/midpath-native_svn.bb b/packages/midpath/midpath-native_svn.bb deleted file mode 100644 index dfc9ca6c4e..0000000000 --- a/packages/midpath/midpath-native_svn.bb +++ /dev/null @@ -1,34 +0,0 @@ - -inherit native - -require midpath_${PV}.bb - -DEPENDS = "ecj-native fastjar-native classpath-minimal-native" -PROVIDES = "virtual/cldc-api-1.1-native" - -PACKAGES = " " - - -do_configure() { - : -} - -do_compile() { -mkdir -p ${S}/dist - -# Build CLDC1.1 -# Build base classes -cd ${S}/external/cldc1.1/src -make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" || exit 1 -make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes || exit 1 -# Build CLDC extra classes for MIDP2 -cd ${S}/src/cldc-glue -make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1" -make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes -# Make a jar -fastjar cvf ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes . -} - -do_install() { - : -} diff --git a/packages/midpath/midpath-qt3x11_0.1.bb b/packages/midpath/midpath-qt3x11_0.1.bb new file mode 100644 index 0000000000..1d44706db9 --- /dev/null +++ b/packages/midpath/midpath-qt3x11_0.1.bb @@ -0,0 +1,48 @@ + +require midpath.inc + +DEPENDS += " qt-mt" +RCONFILCTS = "midpath-qte" + +inherit qt3x11 + +do_configure() { + + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|ui.backend:AWT|ui.backend:QT|" configuration.cfg + + cd ${S}/native/qt + sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" \ + -e "s|\`pkg\-config \-\-cflags qt\-mt\`|\-I${QTDIR}/include/ -DQT_THREAD_SUPPORT|" \ + -e "s|\`pkg\-config \-\-libs qt\-mt\`|\-L${QTDIR}/lib \-lqt-mt -lsupc++|" \ + Makefile +} + +do_compile() { + +mkdir -p ${S}/dist + +# Build the QT native part +cd ${S}/native/qt +make || exit 1 + +} + +do_install() { + install -d ${D}${libdir} + install -m 0644 ${S}/native/qt/libmidpathqt.so ${D}${libdir} + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + : +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/libmidpathqt.so \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " + +CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/midpath/midpath-qt3x11_svn.bb b/packages/midpath/midpath-qt3x11_svn.bb deleted file mode 100644 index 30e855a636..0000000000 --- a/packages/midpath/midpath-qt3x11_svn.bb +++ /dev/null @@ -1,48 +0,0 @@ - -require midpath_${PV}.bb - -DEPENDS += "qt-mt" -RDEPENDS = "qt-mt" -RCONFILCTS = "midpath-qte" - -inherit qt3x11 - -do_configure() { - - cd ${S}/resources-embedded/com/sun/midp/configuration - sed -i -e "s|ui.backend:AWT|ui.backend:QT|" configuration.cfg - - cd ${S}/native/qt - sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" \ - -e "s|\`pkg\-config \-\-cflags qt\-mt\`|\-I${QTDIR}/include/ -DQT_THREAD_SUPPORT|" \ - -e "s|\`pkg\-config \-\-libs qt\-mt\`|\-L${QTDIR}/lib \-lqt-mt -lsupc++|" \ - Makefile -} - -do_compile() { - -mkdir -p ${S}/dist - -# Build the QT native part -cd ${S}/native/qt -make || exit 1 -cp *.so ${S}/dist - -} - -do_install() { - install -d ${D}${libdir} - install -m 0644 dist/libmidpathqt.so ${D}${libdir} - install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration - install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ -} - -do_stage() { - : -} - -PACKAGES = "${PN}" - -FILES_${PN} = "${libdir}/libmidpathqt.so \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ - " diff --git a/packages/midpath/midpath-qte_0.1.bb b/packages/midpath/midpath-qte_0.1.bb new file mode 100644 index 0000000000..e37825bf57 --- /dev/null +++ b/packages/midpath/midpath-qte_0.1.bb @@ -0,0 +1,46 @@ + +require midpath.inc + +DEPENDS += " qte-mt" +RCONFLICTS = "midpath-qt3x11" + +do_configure() { + + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|ui.backend:AWT|ui.backend:QT|" configuration.cfg + + cd ${S}/native/qt + sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal -DQWS|" \ + -e "s|\`pkg\-config \-\-cflags qt\-mt\`|\-I${QTDIR}/include/ -DQWS -DQT_THREAD_SUPPORT|" \ + -e "s|\`pkg\-config \-\-libs qt\-mt\`|\-L${QTDIR}/lib \-lqte-mt -lsupc++|" \ + Makefile +} + +do_compile() { + +mkdir -p ${S}/dist + +# Build the QT native part +cd ${S}/native/qt +make || exit 1 + +} + +do_install() { + install -d ${D}${libdir} + install -m 0644 ${S}/native/qt/libmidpathqt.so ${D}${libdir} + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + : +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/libmidpathqt.so \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " + +CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/midpath/midpath-qte_svn.bb b/packages/midpath/midpath-qte_svn.bb deleted file mode 100644 index 478883e559..0000000000 --- a/packages/midpath/midpath-qte_svn.bb +++ /dev/null @@ -1,46 +0,0 @@ - -require midpath_${PV}.bb - -DEPENDS += "qte-mt" -RDEPENDS = "qte-mt" -RCONFLICTS = "midpath-qt3x11" - -do_configure() { - - cd ${S}/resources-embedded/com/sun/midp/configuration - sed -i -e "s|ui.backend:AWT|ui.backend:QT|" configuration.cfg - - cd ${S}/native/qt - sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal -DQWS|" \ - -e "s|\`pkg\-config \-\-cflags qt\-mt\`|\-I${QTDIR}/include/ -DQWS -DQT_THREAD_SUPPORT|" \ - -e "s|\`pkg\-config \-\-libs qt\-mt\`|\-L${QTDIR}/lib \-lqte-mt -lsupc++|" \ - Makefile -} - -do_compile() { - -mkdir -p ${S}/dist - -# Build the QT native part -cd ${S}/native/qt -make || exit 1 -cp *.so ${S}/dist - -} - -do_install() { - install -d ${D}${libdir} - install -m 0644 dist/libmidpathqt.so ${D}${libdir} - install -d ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration - install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${libdir}/java/resources-embedded/com/sun/midp/configuration/ -} - -do_stage() { - : -} - -PACKAGES = "${PN}" - -FILES_${PN} = "${libdir}/libmidpathqt.so \ - ${libdir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ - " diff --git a/packages/midpath/midpath-test_0.1.bb b/packages/midpath/midpath-test_0.1.bb new file mode 100644 index 0000000000..14bfdc97f0 --- /dev/null +++ b/packages/midpath/midpath-test_0.1.bb @@ -0,0 +1,46 @@ + +require midpath.inc + +SRC_URI += "file://shellscript.patch;patch=1" + +DEPENDS += " midpath" +RDEPENDS += " midpath" + +CLDC_PATH = ${STAGING_DATADIR}/java/cldc1.1.jar + +do_configure() { + + cd ${S}/bin + sed -i -e "s|MIDPATH_HOME=|MIDPATH_HOME=${datadir}/java|" \ + midpath-test-cacao-cldc.sh + +} + +do_compile() { + +cd ${S}/tests +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${STAGING_DATADIR}/java/midpath.jar:${CLDC_PATH} -sourcepath ${S}/tests -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${STAGING_DATADIR}/java/midpath.jar:${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="midpath-tests.jar" JAR_FLAGS="cvf" || exit 1 + +} + +do_install() { + install -d ${D}${bindir} +# install -m 0755 bin/graphical_launcher-j2se.sh ${D}${bindir} +# install -m 0755 bin/midpath-test.sh ${D}${bindir} + install -m 0755 bin/midpath-test-cacao-cldc.sh ${D}${bindir} + install -d ${D}${datadir}/java + install -m 0644 ${S}/tests/midpath-tests.jar ${D}${datadir}/java +} + +do_stage() { + : +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${datadir}/java/midpath-tests.jar \ +# ${bindir}/graphical_launcher-j2se.sh \ +# ${bindir}/midpath-test.sh \ + ${bindir}/midpath-test-cacao-cldc.sh \ + " diff --git a/packages/midpath/midpath.inc b/packages/midpath/midpath.inc new file mode 100644 index 0000000000..7f6e4f3d31 --- /dev/null +++ b/packages/midpath/midpath.inc @@ -0,0 +1,22 @@ +DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation" +HOMEPAGE = "http://midpath.thenesis.org/" +LICENSE = "GPL" +PRIORITY = "optional" +SECTION = "interpreters" +PR = "r0" + +SRC_URI = "http://downloads.sourceforge.net/midpath/midpath-${PV}.tar.gz" + +S = "${WORKDIR}/midpath-${PV}" + +DEPENDS = "ecj-native fastjar-native classpath-minimal" + +JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/ecj" + +FASTJAR_CMD = "${STAGING_BINDIR_NATIVE}/fastjar" + +JAVA_PATH = "${STAGING_DATADIR}/java" + +GNU_CLASSPATH_PATH = "${JAVA_PATH}/classpath-minimal/glibj.zip" + +CLDC_PATH = ${JAVA_PATH}/cldc1.1.jar diff --git a/packages/midpath/midpath_0.1.bb b/packages/midpath/midpath_0.1.bb new file mode 100644 index 0000000000..3501144701 --- /dev/null +++ b/packages/midpath/midpath_0.1.bb @@ -0,0 +1,61 @@ + +require midpath.inc + +DEPENDS += " kxml2 midpath-cldc midpath-cldc-x11 midpath-cldc-sdl" +RSUGGESTS += " kxml2" + +do_compile() { + +mkdir -p ${S}/dist + +# Build MP3 library +cd ${S}/external/jlayerme-cldc/src +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/jlayerme-cldc/src -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="jlayerme-cldc.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/external/jlayerme-cldc/src/jlayerme-cldc.jar ${S}/dist + +# Build OGG library +cd ${S}/external/jorbis-cldc/src +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/jorbis-cldc/src -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="jorbis-cldc.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/external/jorbis-cldc/src/jorbis-cldc.jar ${S}/dist + +# Build Bluetooth library +cd ${S}/external/javabluetooth/src +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${GNU_CLASSPATH_PATH}:${CLDC_PATH}:${S}/lib/RXTXcomm.jar -sourcepath ${S}/external/javabluetooth/src -source 1.3 -target 1.1" || exit 1 +make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${GNU_CLASSPATH_PATH}:${CLDC_PATH}:${S}/lib/RXTXcomm.jar -source 1.3 -target 1.1" JAR_FILE="jsr82-bluetooth.jar" JAR_FLAGS="cvf" || exit 1 +cp ${S}/external/javabluetooth/src/jsr82-bluetooth.jar ${S}/dist + +# Build MIDPath +cd ${S}/src/core +make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH}:${JAVA_PATH}/sdljava-cldc.jar:${JAVA_PATH}/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${JAVA_PATH}/kxml2-2.3.0.jar:${S}/lib/swt.jar -sourcepath ${S}/src/core -source 1.3 -target 1.1" || exit 1 +make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH}:${JAVA_PATH}/sdljava-cldc.jar:${JAVA_PATH}/dist/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${JAVA_PATH}/lib/kxml2-2.3.0.jar:${S}/lib/swt.jar -source 1.3 -target 1.1" CLASS_DIR=${S}/src/core/classes || exit 1 +# Compile JVM.java separately as it can't be compiled against cldc.jar +${JAVAC_CMD} -bootclasspath ${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1 -d ${S}/src/core/classes com/sun/cldchi/jvm/JVM.java +${FASTJAR_CMD} cvf ${S}/dist/midpath.jar -C ${S}/src/core/classes . + +} + +do_install() { + install -d ${D}${datadir}/java + install -m 0644 dist/midpath.jar ${D}${datadir}/java + install -d ${D}${datadir}/java/resources-embedded + cp -rf resources-embedded/ ${D}${datadir}/java/ +} + +do_stage() { + install -d ${STAGING_DATADIR}/java + install -m 0644 dist/midpath.jar ${STAGING_DATADIR}/java +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${datadir}/java/midpath.jar \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/ \ + ${datadir}/java/resources-embedded/com/