From 6f9f72482b87f44d433d725e79d2f04f648333a4 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 14 May 2006 11:07:59 +0000 Subject: zaurusd: Add empty Poodle configuration --- packages/zaurusd/files/add-poodle.patch | 34 +++++++++++++++++++++++++++++++++ packages/zaurusd/zaurusd_svn.bb | 5 +++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 packages/zaurusd/files/add-poodle.patch diff --git a/packages/zaurusd/files/add-poodle.patch b/packages/zaurusd/files/add-poodle.patch new file mode 100644 index 0000000000..4f91413668 --- /dev/null +++ b/packages/zaurusd/files/add-poodle.patch @@ -0,0 +1,34 @@ +diff -Nur zaurusd.orig/config/mach-config/mach-poodle-functions zaurusd/config/mach-config/mach-poodle-functions +--- zaurusd.orig/config/mach-config/mach-poodle-functions 1970-01-01 01:00:00.000000000 +0100 ++++ zaurusd/config/mach-config/mach-poodle-functions 2006-05-14 12:43:01.000000000 +0200 +@@ -0,0 +1,3 @@ ++#HAVE_INPUT_SWITCHES=1 ++#HAVE_ALSA_MIXER=1 ++ +diff -Nur zaurusd.orig/config/mach-config/mach-poodle-vars zaurusd/config/mach-config/mach-poodle-vars +--- zaurusd.orig/config/mach-config/mach-poodle-vars 1970-01-01 01:00:00.000000000 +0100 ++++ zaurusd/config/mach-config/mach-poodle-vars 2006-05-14 12:42:42.000000000 +0200 +@@ -0,0 +1,9 @@ ++MACHINE=poodle ++ ++export SWITCH_EVENT_ZMIXER=1 ++SWITCH_EVENT_DEVICE=/dev/input/event0 ++ ++#TSKEYS_CONF=@appconfdir@/tskeys/zaurus-clamshell.conf ++#TSKEYS_DEVICE=/dev/input/event1 ++ ++ALSA_MIXER_INIT=@appconfdir@/alsa/poodle-default.state +\ Kein Zeilenumbruch am Dateiende. +diff -Nur zaurusd.orig/scripts/detect-machine zaurusd/scripts/detect-machine +--- zaurusd.orig/scripts/detect-machine 2006-05-07 13:39:11.000000000 +0200 ++++ zaurusd/scripts/detect-machine 2006-05-14 12:40:38.000000000 +0200 +@@ -27,6 +27,9 @@ + "SHARP Tosa") + MACHINE=tosa + ;; ++ "SHARP Poodle") ++ MACHINE=poodle ++ ;; + "Simpad") + ;; + "HP iPAQ H2200") diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index ec385d4934..89291c4101 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -4,10 +4,11 @@ MAINTAINER = "Richard Purdie " LICENSE = "GPL" DEPENDS = "tslib" PV = "0.0+svn${SRCDATE}" -PR = "r4" +PR = "r5" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ - file://zaurus-hinge.in" + file://zaurus-hinge.in \ + file://add-poodle.patch;patch=1" S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From e4213c34a7bae23b5ad85061980748840b7bc243 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 14 May 2006 11:12:46 +0000 Subject: base-files: Adjust Poodle fstab for kernel 2.6 --- packages/base-files/base-files/poodle/fstab | 5 +++++ packages/base-files/base-files_3.0.14.bb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab index 31e2edb831..06b9672504 100644 --- a/packages/base-files/base-files/poodle/fstab +++ b/packages/base-files/base-files/poodle/fstab @@ -2,6 +2,11 @@ /dev/mtdblock3 /home jffs2 defaults,noatime 1 2 proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto 0 0 + +# SD/MMC in kernel 2.6 +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 + +# SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 tmpfs /var tmpfs defaults 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 8fec5b01d4..cbf0cc772a 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r49" +PR = "r50" LICENSE = "GPL" SRC_URI = " \ -- cgit v1.2.3 From bae7cf3b8bc319c27e9c369c22e19e9936ac0640 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 14 May 2006 12:26:26 +0000 Subject: linux: locomo: Raise initial LCD brighness from 2 to 3 --- .../linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch | 11 +++++++++++ packages/linux/linux-openzaurus_2.6.16.bb | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch b/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch new file mode 100644 index 0000000000..6408ef9551 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch @@ -0,0 +1,11 @@ +--- linux-2.6.16/drivers/video/backlight/locomolcd.c.orig 2006-05-14 13:24:01.354435088 +0200 ++++ linux-2.6.16/drivers/video/backlight/locomolcd.c 2006-05-14 13:24:11.920828752 +0200 +@@ -201,7 +201,7 @@ + return PTR_ERR (locomolcd_bl_device); + + /* Set up frontlight so that screen is readable */ +- locomobl_data.brightness = 2; ++ locomobl_data.brightness = 3; + locomolcd_set_intensity(locomolcd_bl_device); + + return 0; diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index 3ad68d1a69..a34cab430e 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r23" +PR = "r24" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -95,6 +95,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ file://locomo-kbd-hotkeys.patch;patch=1 \ file://locomo-sysrq+keyrepeat.patch;patch=1 \ + file://locomo-lcd-def-bightness.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-ipaq-pxa270 \ file://defconfig-collie \ -- cgit v1.2.3 From f257c2fdee665a18e811218fbb8281d3efb01526 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 14 May 2006 21:48:46 +0000 Subject: qte: Enable kernel-keymap.patch for Poodle, fixing the broken keymap with kernel 2.6 --- packages/qte/qte-common_2.3.10.inc | 1 + packages/qte/qte_2.3.10.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 822ee2402f..6b30bb6fe1 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -46,6 +46,7 @@ SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1;pnum=0 file:// file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " +SRC_URI_append_poodle = "file://kernel-keymap.patch;patch=1;pnum=0 " SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 " SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index 25741931e6..89c997d40c 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -1,3 +1,3 @@ require qte-common_${PV}.inc -PR = "r40" +PR = "r41" -- cgit v1.2.3 From 5abfcfa3d510fb03649098272cee1be90f9a42d2 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 15 May 2006 11:13:14 +0000 Subject: opie-taskbar: Poodle: Fix cursor rotation for kernel 2.6 images. Might also be useful for Collie and Tosa with kernel 2.6 --- packages/opie-taskbar/opie-taskbar/opie_defaults | 7 +++++++ packages/opie-taskbar/opie-taskbar_1.2.1.bb | 2 +- packages/opie-taskbar/opie-taskbar_cvs.bb | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/opie-taskbar/opie-taskbar/opie_defaults b/packages/opie-taskbar/opie-taskbar/opie_defaults index 38a18e6a9f..f560889927 100644 --- a/packages/opie-taskbar/opie-taskbar/opie_defaults +++ b/packages/opie-taskbar/opie-taskbar/opie_defaults @@ -1,5 +1,12 @@ #!/bin/sh +MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\(.*\)/\1/;s/^\ //p"`" +KVER="`uname -r | sed -n "s/\([0-9]\)\.\([0-9]\)\..*/\1.\2/p"`" + +case "$MACHINE" in +*Poodle) test "$KVER" = "2.6" && export QWS_CURSOR_ROTATION=90;; +esac + export PATH="$PATH:/opt/QtPalmtop/bin" export QTDIR="/opt/QtPalmtop" diff --git a/packages/opie-taskbar/opie-taskbar_1.2.1.bb b/packages/opie-taskbar/opie-taskbar_1.2.1.bb index a3b05d4294..1c6f764867 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.1.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.1.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 49ca24b725..1fe08a8c1b 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ -- cgit v1.2.3 From d78bc9181ae95a0241d6444aa12c4960fbc2ecd8 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 16 May 2006 03:04:45 +0000 Subject: etox: drop deprecated package --- packages/efl/ewl_0.0.4.007.bb | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 packages/efl/ewl_0.0.4.007.bb diff --git a/packages/efl/ewl_0.0.4.007.bb b/packages/efl/ewl_0.0.4.007.bb deleted file mode 100644 index 85b85e0c05..0000000000 --- a/packages/efl/ewl_0.0.4.007.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "The Enlightened Widget Library, \ -a simple-to-use general purpose widget library based on the enlightenment foundation libraries." -# as of recent CVS HEAD, ewl no longer needs etox and no longer needs edb -DEPENDS = "edb virtual/evas virtual/ecore edje emotion" -RDEPENDS += "libewl-themes" -LICENSE = "MIT" -PR = "r1" - -inherit efl - -SRC_URI += "file://ewl-configure.patch;patch=1 \ - file://fix-ecore.patch;patch=1 \ - file://ecore-flags.patch;patch=1 \ - file://no-examples.patch;patch=1 \ - file://minmax.patch;patch=1" - -do_stage_append() { - for i in src/lib/ewl_*.h - do - install -m 0644 $i ${STAGING_INCDIR} - done -} - -- cgit v1.2.3 From 864afef4ce76d5f182a6fd5165bb1ddf73df0bd7 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 16 May 2006 04:45:45 +0000 Subject: e-modules: drop, this is part of e-wm now --- packages/e17/e-modules_20060128.bb | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 packages/e17/e-modules_20060128.bb diff --git a/packages/e17/e-modules_20060128.bb b/packages/e17/e-modules_20060128.bb deleted file mode 100644 index 85929a6967..0000000000 --- a/packages/e17/e-modules_20060128.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Enlightenment Window Manager Extra Modules" -DEPENDS = "ecore-x11 evas-x11 esmart-x11 edje eet e" -LICENSE = "MIT" -PR = "r1" - -inherit e - -SRC_URI = "${E_CVS};module=e17/apps/e_modules;date=${PV}" -S = "${WORKDIR}/e_modules" - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" - -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' -} \ No newline at end of file -- cgit v1.2.3 From ae7110b371cfa2773dc80ba545bbf5ff99440733 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 16 May 2006 06:13:14 +0000 Subject: efl: fix SRC_URI for m4 dirs, fix ewl compilation --- packages/efl/ecore.inc | 2 +- packages/efl/esmart.inc | 2 +- packages/efl/evas.inc | 2 +- packages/efl/ewl/ecore-flags.patch | 146 ------------------------------------- packages/efl/ewl/fix-ecore.patch | 11 --- packages/efl/ewl_0.0.4.007.bb | 30 ++++++++ 6 files changed, 33 insertions(+), 160 deletions(-) delete mode 100644 packages/efl/ewl/ecore-flags.patch delete mode 100644 packages/efl/ewl/fix-ecore.patch create mode 100644 packages/efl/ewl_0.0.4.007.bb diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc index 3e7b5299ea..cea3114dc7 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -12,7 +12,7 @@ inherit efl SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \ file://configure.patch;patch=1 \ file://fix-tslib-configure.patch;patch=1 \ - cvs://anonymous@thinktux.net/root;module=e17/libs/ecore/m4;date=20060101" + ${E_CVS};module=e17/libs/ecore/m4;date=20060101" S = "${WORKDIR}/ecore-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" diff --git a/packages/efl/esmart.inc b/packages/efl/esmart.inc index b1b82d5ed1..9b8114de53 100644 --- a/packages/efl/esmart.inc +++ b/packages/efl/esmart.inc @@ -6,7 +6,7 @@ PROVIDES += "virtual/esmart" inherit efl SRC_URI = "http://enlightenment.freedesktop.org/files/esmart-${PV}.tar.gz \ - cvs://anonymous@thinktux.net/root;module=e17/libs/esmart/m4;date=20060101" + ${E_CVS};module=e17/libs/esmart/m4;date=20060101" do_configure_prepend() { install -d "${S}/m4" diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 07574daa38..e93803982e 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -13,7 +13,7 @@ export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix( SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \ file://fix-configure-${PV}.patch;patch=1 \ - cvs://anonymous@thinktux.net/root;module=e17/libs/evas/m4;date=20060101" + ${E_CVS};module=e17/libs/evas/m4;date=20060101" S = "${WORKDIR}/evas-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" diff --git a/packages/efl/ewl/ecore-flags.patch b/packages/efl/ewl/ecore-flags.patch deleted file mode 100644 index 9c4f5afc78..0000000000 --- a/packages/efl/ewl/ecore-flags.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff -Nur ewl-0.0.4.004~/src/lib/ewl_config.c ewl-0.0.4.004/src/lib/ewl_config.c ---- ewl-0.0.4.004~/src/lib/ewl_config.c 2005-09-29 18:02:24.000000000 -0700 -+++ ewl-0.0.4.004/src/lib/ewl_config.c 2005-09-29 18:03:10.000000000 -0700 -@@ -210,8 +210,8 @@ - - cc = ewl_config_int_get("/ewl/theme/color_classes/count"); - prop = ecore_config_get("/ewl/theme/color_classes/count"); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - for (i = 0; i < cc; i++) { - char *name; -@@ -221,8 +221,8 @@ - "/ewl/theme/color_classes/%d/name", i); - name = ewl_config_str_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - if (name) { - int r, g, b, a; -@@ -233,85 +233,85 @@ - "/ewl/theme/color_classes/%d/r", i); - r = ewl_config_int_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - snprintf(key, PATH_MAX, - "/ewl/theme/color_classes/%d/g", i); - g = ewl_config_int_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - snprintf(key, PATH_MAX, - "/ewl/theme/color_classes/%d/b", i); - b = ewl_config_int_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - snprintf(key, PATH_MAX, - "/ewl/theme/color_classes/%d/a", i); - a = ewl_config_int_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - snprintf(key, PATH_MAX, - "/ewl/theme/color_classes/%d/r2", i); - r2 = ewl_config_int_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - snprintf(key, PATH_MAX, - "/ewl/theme/color_classes/%d/g2", i); - g2 = ewl_config_int_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - snprintf(key, PATH_MAX, - "/ewl/theme/color_classes/%d/b2", i); - b2 = ewl_config_int_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - snprintf(key, PATH_MAX, - "/ewl/theme/color_classes/%d/a2", i); - a2 = ewl_config_int_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - snprintf(key, PATH_MAX, - "/ewl/theme/color_classes/%d/r3", i); - r3 = ewl_config_int_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - snprintf(key, PATH_MAX, - "/ewl/theme/color_classes/%d/g3", i); - g3 = ewl_config_int_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - snprintf(key, PATH_MAX, - "/ewl/theme/color_classes/%d/b3", i); - b3 = ewl_config_int_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - snprintf(key, PATH_MAX, - "/ewl/theme/color_classes/%d/a3", i); - a3 = ewl_config_int_get(key); - prop = ecore_config_get(key); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - - edje_color_class_set(name, r, g, b, a, - r2, g2, b2, a2, -@@ -389,8 +389,8 @@ - - for(i = 0; keys[i] != NULL; i++) { - prop = ecore_config_get(keys[i]); -- prop->flags &= ~PF_MODIFIED; -- prop->flags |= PF_SYSTEM; -+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; -+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; - } - - ecore_config_listen("ewl_debug_enable", "/ewl/debug/enable", diff --git a/packages/efl/ewl/fix-ecore.patch b/packages/efl/ewl/fix-ecore.patch deleted file mode 100644 index 7a514a1740..0000000000 --- a/packages/efl/ewl/fix-ecore.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur ewl-0.0.4.004~/src/lib/Ewl.h ewl-0.0.4.004/src/lib/Ewl.h ---- ewl-0.0.4.004~/src/lib/Ewl.h.in 2005-09-29 17:44:59.000000000 -0700 -+++ ewl-0.0.4.004/src/lib/Ewl.h.in 2005-09-29 17:46:57.000000000 -0700 -@@ -257,6 +257,7 @@ - #include - #include - #include -+#include - #include - - #include diff --git a/packages/efl/ewl_0.0.4.007.bb b/packages/efl/ewl_0.0.4.007.bb new file mode 100644 index 0000000000..e89b668b93 --- /dev/null +++ b/packages/efl/ewl_0.0.4.007.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "The Enlightened Widget Library, \ +a simple-to-use general purpose widget library based on the enlightenment foundation libraries." +# as of recent CVS HEAD, ewl no longer needs etox and no longer needs edb +DEPENDS = "edb virtual/evas virtual/ecore edje" +# emotion +RDEPENDS += "ewl-themes" +LICENSE = "MIT" +PR = "r1" + +inherit efl + +SRC_URI += "file://ewl-configure.patch;patch=1 \ + file://no-examples.patch;patch=1 \ + file://minmax.patch;patch=1 \ + ${E_CVS};module=e17/libs/evas/m4;date=20060501" + +do_configure_prepend() { + if [ -e "${WORKDIR}/m4" ]; then + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 + fi +} + +do_stage_append() { + for i in src/lib/ewl_*.h + do + install -m 0644 $i ${STAGING_INCDIR} + done +} -- cgit v1.2.3 From 685c8e72f6a9d57ead1acac859c02f71a1aa9a13 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 16 May 2006 06:16:24 +0000 Subject: emotion: switch to CVS --- packages/efl/emotion_0.0.1.004.bb | 16 ---------------- packages/efl/emotion_20060501.bb | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 16 deletions(-) delete mode 100644 packages/efl/emotion_0.0.1.004.bb create mode 100644 packages/efl/emotion_20060501.bb diff --git a/packages/efl/emotion_0.0.1.004.bb b/packages/efl/emotion_0.0.1.004.bb deleted file mode 100644 index 886f0e8b3f..0000000000 --- a/packages/efl/emotion_0.0.1.004.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Emotion is a multimedia library based on libxine" -LICENSE = "MIT" -DEPENDS = "eet virtual/evas edje virtual/ecore embryo virtual/libxine" -RDEPENDS += "libemotion-themes libemotion-plugins" -PR = "r2" - -#FIXME: Needs patch not to build the examples when building against ecore-fb, because the examples depend on ecore-x11 - -inherit efl - -PACKAGES += "emotion-plugins" -FILES_emotion-plugins = "${libdir}/xine/plugins/1.1.0/*.so ${libdir}/emotion/*.so" - -do_compile_prepend() { - find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g' -} \ No newline at end of file diff --git a/packages/efl/emotion_20060501.bb b/packages/efl/emotion_20060501.bb new file mode 100644 index 0000000000..c6a0b7b8e0 --- /dev/null +++ b/packages/efl/emotion_20060501.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Emotion is a multimedia library based on libxine" +LICENSE = "MIT" +DEPENDS = "eet virtual/evas edje virtual/ecore embryo virtual/libxine" +#RPROVIDES += "emotion-themes emotion-plugins" +RDEPENDS += "emotion-themes emotion-plugins" + +PR = "r2" + +#FIXME: Needs patch not to build the examples when building against ecore-fb, because the examples depend on ecore-x11 + +inherit efl + +SRC_URI = "${E_CVS};module=e17/libs/emotion;date=${PV}" +S = "${WORKDIR}/emotion" + +PACKAGES += "emotion-plugins" +FILES_emotion-plugins = "${libdir}/xine/plugins/1.1.0/*.so ${libdir}/emotion/*.so" + +do_compile_prepend() { + find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g' +} \ No newline at end of file -- cgit v1.2.3 From 0ca7c9ab9c14e2ea675cdfd882cef2379c9ba295 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Tue, 16 May 2006 06:25:41 +0000 Subject: engrave: re-add --- packages/efl/engrave_20060128.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 packages/efl/engrave_20060128.bb diff --git a/packages/efl/engrave_20060128.bb b/packages/efl/engrave_20060128.bb new file mode 100644 index 0000000000..63eb24eb1f --- /dev/null +++ b/packages/efl/engrave_20060128.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Engrave is an Edje Editing Library" +LICENSE = "MIT" +# also requires yacc and lex on host +DEPENDS = "virtual/evas virtual/ecore" + +inherit efl + +SRC_URI = "${E_CVS};module=e17/libs/engrave;date=${PV}" +S = "${WORKDIR}/engrave" + +do_stage_append() { + for i in src/lib/engrave*.h + do + install -m 0644 $i ${STAGING_INCDIR} + done +} + -- cgit v1.2.3 From 7427aed03625d508965a1f8ba702307db822f602 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 May 2006 06:54:22 +0000 Subject: intltool(-native): update to 0.35.0 --- packages/intltool/intltool-native_0.35.0.bb | 4 ++++ packages/intltool/intltool_0.35.0.bb | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/intltool/intltool-native_0.35.0.bb create mode 100644 packages/intltool/intltool_0.35.0.bb diff --git a/packages/intltool/intltool-native_0.35.0.bb b/packages/intltool/intltool-native_0.35.0.bb new file mode 100644 index 0000000000..f200d26dd1 --- /dev/null +++ b/packages/intltool/intltool-native_0.35.0.bb @@ -0,0 +1,4 @@ +SECTION = "devel" +include intltool_${PV}.bb +inherit native +DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool_0.35.0.bb b/packages/intltool/intltool_0.35.0.bb new file mode 100644 index 0000000000..7a28fee18a --- /dev/null +++ b/packages/intltool/intltool_0.35.0.bb @@ -0,0 +1,12 @@ +SECTION = "devel" +DESCRIPTION = "Utility scripts for internationalizing XML" +LICENSE = "GPL" + +SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2" +S = "${WORKDIR}/intltool-${PV}" + +inherit autotools pkgconfig + +do_stage() { + install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ +} -- cgit v1.2.3 From 2d3ea38a2a7fa9189532b0ed9fcee5fffb1eb832 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 May 2006 08:53:24 +0000 Subject: angstrom 2006.9: add multiple tarball stashes till we get our own --- conf/distro/angstrom-2006.9.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 9b03d70219..58d6c2ad38 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -25,6 +25,9 @@ FEED_URIS += " \ SRCDATE = "20060425" SRCDATE_handhelds-pxa-2.6 = "20060506" +CVS_TARBALL_STASH = "\ +http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ +http://www.oesources.org/source/current/" # Opie #use 1337 mt version of opie to have a webbrowser @@ -83,7 +86,7 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.4" PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" PREFERRED_VERSION_dbus ?= "0.61" -PREFERRED_VERSION_gstreamer ?= "0.10.5" +PREFERRED_VERSION_gstreamer ?= "0.10.6" PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" -- cgit v1.2.3 From 00aacb88f5d354c0ca0ea385566f936a6f17bea7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 16 May 2006 09:06:48 +0000 Subject: htb-init, miau: fix SF.net mirror --- packages/htb-init/htb-init_0.8.5.bb | 2 +- packages/miau/miau_0.5.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/htb-init/htb-init_0.8.5.bb b/packages/htb-init/htb-init_0.8.5.bb index f0f79ba6ed..c7fdbed80f 100644 --- a/packages/htb-init/htb-init_0.8.5.bb +++ b/packages/htb-init/htb-init_0.8.5.bb @@ -4,7 +4,7 @@ MAINTAINER = "Bruno Randolf " LICENSE = "GPL" PR = "r1" -SRC_URI = "http://aleron.dl.sourceforge.net/sourceforge/htbinit/htb.init-v${PV} \ +SRC_URI = "${SOURCEFORGE_MIRROR}/htbinit/htb.init-v${PV} \ file://htb.init+ingress+predef+verbose.diff;patch=1;pnum=0 \ file://htb-basic-verbose.diff;patch=1;pnum=0" RRECOMMENDS = "kernel-module-sch-ingress kernel-module-cls-route kernel-module-cls-u32 kernel-module-cls-fw kernel-module-sch-sfq kernel-module-sch-htb" diff --git a/packages/miau/miau_0.5.3.bb b/packages/miau/miau_0.5.3.bb index 5644c1141e..4f2b52dfa1 100644 --- a/packages/miau/miau_0.5.3.bb +++ b/packages/miau/miau_0.5.3.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://sf.net/project/miau/" LICENSE = "GPL" PR = "r2" -SRC_URI = "http://aleron.dl.sourceforge.net/sourceforge/miau/miau-${PV}.tar.gz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/miau/miau-${PV}.tar.gz \ file://paths.patch;patch=1 \ file://miau.init" S = "${WORKDIR}/miau-${PV}" -- cgit v1.2.3 From 07c03792bd271d55d131fd8ed870682f40ae33bc Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 16 May 2006 09:13:21 +0000 Subject: netcat: use SOURCEFORGE_MIRROR - file is available on heanet (default mirror) --- packages/netcat/netcat_0.7.1.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/netcat/netcat_0.7.1.bb b/packages/netcat/netcat_0.7.1.bb index 65e8785e08..3ed1c3d6c4 100644 --- a/packages/netcat/netcat_0.7.1.bb +++ b/packages/netcat/netcat_0.7.1.bb @@ -5,7 +5,6 @@ MAINTAINER = "Justin Patrin " SECTION = "console/networking" PR = "r1" -# Note: ${SOURCEFORGE_MIRROR} wasn't working -SRC_URI = "http://osdn.dl.sourceforge.net/sourceforge/netcat/netcat-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2" inherit autotools -- cgit v1.2.3 From a7cb94acc502086b55b16e227611be7b337011a3 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 16 May 2006 09:16:52 +0000 Subject: wireless-tools: fix SRC_URI --- packages/wireless-tools/wireless-tools_26.bb | 2 +- packages/wireless-tools/wireless-tools_27.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wireless-tools/wireless-tools_26.bb b/packages/wireless-tools/wireless-tools_26.bb index f0f29bf608..6dd54a8773 100644 --- a/packages/wireless-tools/wireless-tools_26.bb +++ b/packages/wireless-tools/wireless-tools_26.bb @@ -7,7 +7,7 @@ MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" PR = "r6" -SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \ +SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \ file://man.patch;patch=1 \ file://wireless-tools.if-pre-up" S = "${WORKDIR}/wireless_tools.${PV}" diff --git a/packages/wireless-tools/wireless-tools_27.bb b/packages/wireless-tools/wireless-tools_27.bb index e40c788e92..c3d654b0c9 100644 --- a/packages/wireless-tools/wireless-tools_27.bb +++ b/packages/wireless-tools/wireless-tools_27.bb @@ -7,7 +7,7 @@ MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" PR = "r1" -SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \ +SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \ file://man.patch;patch=1 \ file://fixheaders.patch;patch=1 \ file://wireless-tools.if-pre-up" -- cgit v1.2.3 From 08680cb961a9f1af036c8346a80b1706ec06e17c Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 16 May 2006 09:46:35 +0000 Subject: lua-native: Change include order to fix staging. --- packages/lua/lua-native_5.0.2.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/lua/lua-native_5.0.2.bb b/packages/lua/lua-native_5.0.2.bb index 6a742e4a13..16ae4290c8 100644 --- a/packages/lua/lua-native_5.0.2.bb +++ b/packages/lua/lua-native_5.0.2.bb @@ -1,6 +1,6 @@ include lua.inc -PR = "r1" +PR = "r2" DEPENDS += "readline-native" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \ file://debian.patch;patch=1 \ @@ -10,5 +10,6 @@ SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \ S = "${WORKDIR}/lua-${PV}" FILESPATH = "${FILE_DIRNAME}/lua-${PV}:${FILE_DIRNAME}/lua:${FILE_DIRNAME}/files" -include lua-build.inc inherit native +include lua-build.inc + -- cgit v1.2.3 From 3fc764005b9a40e9d378871fd85ef35876e63a2d Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 16 May 2006 09:54:54 +0000 Subject: lua-gtk2: Add GTK bindings for LUA. --- packages/lua/lua-gtk2/.mtn2git_empty | 0 packages/lua/lua-gtk2/lua-gtk2-0.3_fixbuild.patch | 352 ++++++++++++++++++++++ packages/lua/lua-gtk2_0.3.bb | 24 ++ 3 files changed, 376 insertions(+) create mode 100644 packages/lua/lua-gtk2/.mtn2git_empty create mode 100644 packages/lua/lua-gtk2/lua-gtk2-0.3_fixbuild.patch create mode 100644 packages/lua/lua-gtk2_0.3.bb diff --git a/packages/lua/lua-gtk2/.mtn2git_empty b/packages/lua/lua-gtk2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/lua/lua-gtk2/lua-gtk2-0.3_fixbuild.patch b/packages/lua/lua-gtk2/lua-gtk2-0.3_fixbuild.patch new file mode 100644 index 0000000000..1115b6ffb6 --- /dev/null +++ b/packages/lua/lua-gtk2/lua-gtk2-0.3_fixbuild.patch @@ -0,0 +1,352 @@ +diff -NbBur lua-gtk2-0.3_orig/configure lua-gtk2-0.3/configure +--- lua-gtk2-0.3_orig/configure 2005-08-16 19:32:07.000000000 +0200 ++++ lua-gtk2-0.3/configure 2006-05-14 02:52:39.000000000 +0200 +@@ -2,25 +2,19 @@ + + # examine system + +-CFLAGS="$(pkg-config gtk+-2.0 --cflags) $(pkg-config lua50 --cflags) -I build-linux -I src" ++CFLAGS="-g -Wall -DLINUX -Os -fomit-frame-pointer -Wall $(pkg-config gtk+-2.0 --cflags) $(pkg-config lua50 --cflags) -I build-linux -I src" + VERSION="0.3" +- +-if which gcc-4.0 > /dev/null; then +- GCC=gcc-4.0 +-elif which gcc > /dev/null; then +- GCC=gcc +-else +- @echo "No GCC found." +- exit 1 +-fi +- +-if true; then +- CFLAGS2="-DLINUX" +- LIBS="" # -lgtk-x11-2.0" +-else +- CFLAGS2="-DWIN32" +- LIBS="" +-fi ++PREFIX="/usr/local" ++GCC=arm-linux-gcc ++HGCC=gcc ++ ++#if true; then ++# CFLAGS2="-DLINUX" ++# LIBS="" # -lgtk-x11-2.0" ++#else ++# CFLAGS2="-DWIN32" ++# LIBS="" ++#fi + + + # build makefile +@@ -28,13 +22,14 @@ + cat > Makefile < /dev/null; then ++ GCC=gcc-4.0 ++elif which gcc > /dev/null; then ++ GCC=gcc ++else ++ @echo "No GCC found." ++ exit 1 ++fi ++ ++if true; then ++ CFLAGS2="-DLINUX" ++ LIBS="" # -lgtk-x11-2.0" ++else ++ CFLAGS2="-DWIN32" ++ LIBS="" ++fi ++ ++ ++# build makefile ++ ++cat > Makefile < \$@ ++ ++data/gtkdata.structs.c: ++ (cd data; ../script/gen-list.pl) ++ ++build-linux/%.o: build-linux/%.c ++ @echo \$@ ++ @\${CC} \${CFLAGS} -c -o \$@ \$< ++ ++build-linux/%.o: src/%.c ++ @echo \$@ ++ @\${CC} \${CFLAGS} -c -o \$@ \$< ++ ++build-linux/%.s: src/%.c ++ @echo \$@ ++ @\${CC} \${CFLAGS} -S -o \$@ \$< ++ ++build-linux/%.luac: src/%.lua ++ @echo \$@ ++ @luac -s -o \$@ \$< ++ ++clean: ++ rm -f \${ODIR}libluagtk2.so \${ODIR}generate \${ODIR}_*.c \${ODIR}*.o ++ rm -f \${ODIR}file2c \${ODIR}override.luac \${ODIR}main ++ ++install: all ++ mkdir -p ~/.lua50 ++ cp gtk2.lua ~/.lua50 ++ ln -sf \$(PWD)/build-linux/libluagtk2.so ~/.lua50 ++ ++tar: ++ (cd ..; ln -s lua-gtk2 lua-gtk2-\${VERSION}; tar czvhf lua-gtk2-\${VERSION}.tar.gz \\ ++ lua-gtk2-\${VERSION} --exclude old --exclude "build-*" --exclude foreign --exclude lua50 \\ ++ --exclude test-dll; rm lua-gtk2-\${VERSION}) ++ ++EOF ++ ++mkdir -p build-linux build-win32 ++ +diff -NbBur lua-gtk2-0.3_orig/gtk2.lua lua-gtk2-0.3/gtk2.lua +--- lua-gtk2-0.3_orig/gtk2.lua 2005-08-16 19:26:14.000000000 +0200 ++++ lua-gtk2-0.3/gtk2.lua 1970-01-01 01:00:00.000000000 +0100 +@@ -1,16 +0,0 @@ +- +--- if compiled in, _gtk is set. +-if _gtk == nil then +- +- local init, err = loadlib(os.getenv("HOME") .. "/.lua50/libluagtk2.so", +- "luaopen_gtk2") +- if err then +- print(err) +- return +- end +- gtk = init() +- +-else +- gtk = _gtk +-end +- +diff -NbBur lua-gtk2-0.3_orig/gtk2.lua.in lua-gtk2-0.3/gtk2.lua.in +--- lua-gtk2-0.3_orig/gtk2.lua.in 1970-01-01 01:00:00.000000000 +0100 ++++ lua-gtk2-0.3/gtk2.lua.in 2006-05-15 01:20:24.000000000 +0200 +@@ -0,0 +1,16 @@ ++ ++-- if compiled in, _gtk is set. ++if _gtk == nil then ++ ++ local init, err = loadlib("PREFIX/lib/lua50/libluagtk2.so", ++ "luaopen_gtk2") ++ if err then ++ print(err) ++ return ++ end ++ gtk = init() ++ ++else ++ gtk = _gtk ++end ++ +diff -NbBur lua-gtk2-0.3_orig/Makefile lua-gtk2-0.3/Makefile +--- lua-gtk2-0.3_orig/Makefile 2005-08-16 19:32:08.000000000 +0200 ++++ lua-gtk2-0.3/Makefile 2006-05-16 03:09:41.000000000 +0200 +@@ -1,31 +1,46 @@ + # automatically generated makefile + +-# CFLAGS :=-DLINUX -Os -fomit-frame-pointer -Wall -DXTHREADS -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include//lua50 -I build-linux -I src +-# CFLAGS :=-DLINUX -O2 -fomit-frame-pointer -Wall -DXTHREADS -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include//lua50 -I build-linux -I src +-CFLAGS :=-DLINUX -g -Wall -DXTHREADS -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include//lua50 -I build-linux -I src ++PACKAGE_CFLAGS =-g -Wall -DLINUX -Os -fomit-frame-pointer -Wall -DXTHREADS -DXUSE_MTSAFE_API `pkg-config --cflags gtk+-2.0` + HASH :=hash2 + ODIR :=build-linux/ + VERSION :=0.3 +-CC :=gcc-4.0 ++CC :=arm-linux-gcc ++HGCC :=gcc ++PREFIX := /usr/local ++LIBDIR := $(PREFIX)/lib/ + +-all: ${ODIR}libluagtk2.so ${ODIR}main ++all: ${ODIR}libluagtk2.so ${ODIR}main gtk2.lua + +-Makefile: configure +- ./configure ++%.lua %.lua.in: ++ sed 's:PREFIX:$(PREFIX):' < '$@.in' > $@ + + ${ODIR}libluagtk2.so: ${ODIR}libluagtk2.o ${ODIR}${HASH}.o ${ODIR}hash.o ${ODIR}_funclist.o ${ODIR}_structlist.o ${ODIR}_enumlist.o ${ODIR}_override.o + @echo $@ +- @${CC} -shared -o $@ $^ /usr/lib/libffi.a ++ @${CC} -shared -o $@ $^ ${LIBDIR}/libffi.a + +-${ODIR}generate: ${ODIR}generate.o ${ODIR}${HASH}.o ++${ODIR}file2c: ++ @echo $@ ++ @${HGCC} -o $@ src/file2c.c ++ ++${ODIR}generate.o: ++ @echo $@ ++ @${HGCC} -c -o $@ src/generate.c ++ ++${ODIR}${HASH}_host.o: ++ @echo $@ ++ @${HGCC} -c -o $@ src/${HASH}.c ++ ++${ODIR}generate: ${ODIR}generate.o ${ODIR}${HASH}_host.o ++ @echo $@ ++ @${HGCC} -Wall -g -o $@ $^ + + ${ODIR}main.o: src/main.c + @echo $@ +- @${CC} -Wall -c -g -o $@ $^ -I /usr/include/lua50 ++ @${HGCC} $(CFLAGS) -Wall -c -g -o $@ $^ -I /usr/include/lua50 + + ${ODIR}main: ${ODIR}main.o + @echo $@ +- @${CC} -o $@ $^ -llua50 -llualib50 ++ @${HGCC} $(CFLAGS) $(PACKAGE_CFLAGS) -o $@ $^ -llua -llualib + + ${ODIR}libluagtk2.o: src/libluagtk2.c ${ODIR}_typelist.c src/structinfo.h src/hash.h + +@@ -52,15 +67,15 @@ + + build-linux/%.o: build-linux/%.c + @echo $@ +- @${CC} ${CFLAGS} -c -o $@ $< ++ @${CC} $(PACKAGE_CFLAGS) $(CFLAGS) -c -o $@ $< + + build-linux/%.o: src/%.c + @echo $@ +- @${CC} ${CFLAGS} -c -o $@ $< ++ @${CC} $(PACKAGE_CFLAGS) $(CFLAGS) -c -o $@ $< + + build-linux/%.s: src/%.c + @echo $@ +- @${CC} ${CFLAGS} -S -o $@ $< ++ @${CC} $(PACKAGE_CFLAGS) $(CFLAGS) -S -o $@ $< + + build-linux/%.luac: src/%.lua + @echo $@ +@@ -68,12 +83,13 @@ + + clean: + rm -f ${ODIR}libluagtk2.so ${ODIR}generate ${ODIR}_*.c ${ODIR}*.o +- rm -f ${ODIR}file2c ${ODIR}override.luac ${ODIR}main ++ rm -f ${ODIR}file2c ${ODIR}override.luac ${ODIR}main gtk2.lua + + install: all +- mkdir -p ~/.lua50 +- cp gtk2.lua ~/.lua50 +- ln -sf $(PWD)/build-linux/libluagtk2.so ~/.lua50 ++ install -d $(DESTDIR)/$(PREFIX)/share/lua ++ install gtk2.lua $(DESTDIR)/$(PREFIX)/share/lua ++ install -d $(DESTDIR)/$(PREFIX)/lib/lua50 ++ install $(PWD)/build-linux/libluagtk2.so $(DESTDIR)/$(PREFIX)/lib/lua50 + + tar: + (cd ..; ln -s lua-gtk2 lua-gtk2-${VERSION}; tar czvhf lua-gtk2-${VERSION}.tar.gz \ +diff -NbBur lua-gtk2-0.3_orig/src/libluagtk2.c lua-gtk2-0.3/src/libluagtk2.c +--- lua-gtk2-0.3_orig/src/libluagtk2.c 2005-08-16 18:22:00.000000000 +0200 ++++ lua-gtk2-0.3/src/libluagtk2.c 2006-05-15 01:31:09.000000000 +0200 +@@ -27,9 +27,9 @@ + + static const char *dll_list[] = { + #ifdef LINUX +- "/usr/lib/libgtk-x11-2.0.so", +- "/usr/lib/libgdk-x11-2.0.so", +- "/usr/lib/libpango-1.0.so", ++ "/usr/lib/libgtk-x11-2.0.so.0", ++ "/usr/lib/libgdk-x11-2.0.so.0", ++ "/usr/lib/libpango-1.0.so.0", + #endif + #ifdef WIN32 + "C:/GTK/bin/libgtk-win32-2.0-0.dll", diff --git a/packages/lua/lua-gtk2_0.3.bb b/packages/lua/lua-gtk2_0.3.bb new file mode 100644 index 0000000000..4071bb1f04 --- /dev/null +++ b/packages/lua/lua-gtk2_0.3.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "GTK bindings for LUA" +LICENSE = "GPL2" +PRIORITY = "optional" +DEPENDS = "gtk+ lua-native perl-native readline libffi" +RDEPENDS = "lua" +MAINTAINER = "Florian Boor " +SECTION = "libs" + +inherit gpe + +SRC_URI = "http://luaforge.net/frs/download.php/989/${P}.tar.gz \ + file://lua-gtk2-0.3_fixbuild.patch;patch=1" + +FILES_${PN} = "${datadir}/lua ${libdir}/lua50" + +CFLAGS_append = " -I '${S}/build-linux' -I src -DLINUX -I${STAGING_INCDIR} -L${STAGING_LIBDIR} -L${STAGING_LIBDIR}/../../${BUILD_SYS}/lib" + +do_compile () { + oe_runmake PREFIX='${prefix}' HGCC='${BUILD_CC}' LIBDIR='${STAGING_LIBDIR}' ODIR='build-linux/' CFLAGS='${CFLAGS}' +} + +do_configure_append () { + cd ${S} && mkdir build-linux +} -- cgit v1.2.3 From 47443d61cbea3bfc3476422f36969be6d81d4d24 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 16 May 2006 09:56:33 +0000 Subject: linux: locomo: Fix up some typos and disable printk --- .../linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch | 10 +++++----- packages/linux/linux-openzaurus_2.6.16.bb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch b/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch index 365ee1366e..94dabf4384 100644 --- a/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch +++ b/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch @@ -11,13 +11,13 @@ -#define LOCOMO_KEY_MAIL KEY_F10 -#define LOCOMO_KEY_OK KEY_F11 +#define LOCOMO_KEY_CALENDER KEY_LEFTCTRL -+#define LOCOMO_KEY_ADDRESS KEY_LEFTALT /* Needed SysRQ */ -+#define LOCOMO_KEY_HOME KEY_SYSRQ /* Need that for SysRQ */ ++#define LOCOMO_KEY_ADDRESS KEY_LEFTALT /* Needed for SysRQ */ ++#define LOCOMO_KEY_HOME KEY_SYSRQ /* Needed for SysRQ */ #define LOCOMO_KEY_MENU KEY_F12 +#define LOCOMO_KEY_MAIL KEY_F10 -+#define LOCOMO_KEY_OK KEY_F11 /* Don't hardwire to KP_RETURN */ ++#define LOCOMO_KEY_OK KEY_F11 /* Don't hardwire to KEY_RETURN */ +#define LOCOMO_KEY_CANCEL KEY_POWER -+#define LOCOMO_KEY_CENTER KEY_F5 /* Don't hardwire to KP_RETURN */ ++#define LOCOMO_KEY_CENTER KEY_F5 /* Don't hardwire to KEY_RETURN */ + +#define LOCOMO_KEY_FN KEY_F9 @@ -60,7 +60,7 @@ scancode = SCANCODE(col, row); if (rowd & KB_ROWMASK(row)) { - /* printk(KERN_ERR "locomokbd: COL [%i] ROW [%i] scancode [%i] keycode [%i]\n",col,row,scancode,locomokbd->keycode[scancode]); */ -+ printk(KERN_ERR "locomokbd: ROW [%i] COL [%i] scancode [%i] keycode [%i]\n",row,col,scancode,locomokbd->keycode[scancode]); ++ /* printk(KERN_ERR "locomokbd: ROW [%i] COL [%i] scancode [%i] keycode [%i]\n",row,col,scancode,locomokbd->keycode[scancode]); */ num_pressed += 1; input_report_key(locomokbd->input, locomokbd->keycode[scancode], 1); } else { diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index a34cab430e..1a75f350b8 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r24" +PR = "r25" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ -- cgit v1.2.3 From 39deb7c94e862b2c709487fa94ad54bbd3cfc358 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 May 2006 10:03:02 +0000 Subject: angstrom: adjust angstrom uri --- conf/distro/angstrom.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf index a94fcee140..403b13934f 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/angstrom.conf @@ -5,8 +5,8 @@ DISTRO = "angstrom" DISTRO_NAME = "Angstrom" -#we'll use this till we get a real domain -ANGSTROM_URI = "http://ewi546.ewi.utwente.nl/angstrom" +#Use this variable in feeds and other parts that need a URI +ANGSTROM_URI = "http://www.angstrom-distribution.org/" #Set the default maintainer to angstrom-dev MAINTAINER = "Angstrom Developers " -- cgit v1.2.3 From 641ecff78a3222facdc0b527966e7b3ee95123dc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 May 2006 10:12:40 +0000 Subject: angstrom-2006.9: slide hh.org pxa kernel cvsdate forward a bit --- conf/distro/angstrom-2006.9.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 58d6c2ad38..405a48721f 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -23,7 +23,7 @@ FEED_URIS += " \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" SRCDATE = "20060425" -SRCDATE_handhelds-pxa-2.6 = "20060506" +SRCDATE_handhelds-pxa-2.6 = "20060516" CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ -- cgit v1.2.3 From 4a9541b06b24af6ec9850fe907a7d5ca57e67212 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 May 2006 11:57:41 +0000 Subject: add wifiradar, closes #992 --- packages/wifi-radar/.mtn2git_empty | 0 packages/wifi-radar/files/.mtn2git_empty | 0 packages/wifi-radar/files/wifi-radar.patch | 37 ++++++++++++++++++++++ .../wifi-radar/files/wifi-radar_destktop.patch | 13 ++++++++ packages/wifi-radar/wifi-radar_1.9.6.bb | 35 ++++++++++++++++++++ 5 files changed, 85 insertions(+) create mode 100644 packages/wifi-radar/.mtn2git_empty create mode 100644 packages/wifi-radar/files/.mtn2git_empty create mode 100644 packages/wifi-radar/files/wifi-radar.patch create mode 100644 packages/wifi-radar/files/wifi-radar_destktop.patch create mode 100644 packages/wifi-radar/wifi-radar_1.9.6.bb diff --git a/packages/wifi-radar/.mtn2git_empty b/packages/wifi-radar/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wifi-radar/files/.mtn2git_empty b/packages/wifi-radar/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wifi-radar/files/wifi-radar.patch b/packages/wifi-radar/files/wifi-radar.patch new file mode 100644 index 0000000000..da34dfb50c --- /dev/null +++ b/packages/wifi-radar/files/wifi-radar.patch @@ -0,0 +1,37 @@ +--- wifi-radar-1.9.6/wifi-radar 2006-03-28 00:41:40.000000000 +0200 ++++ wifi-radar-1.9.6/wifi-radar.new 2006-05-14 22:50:25.000000000 +0200 +@@ -73,7 +73,7 @@ + # + # List of supported DHCP clients in order of preference + # +-POSSIBLE_DHCP_CLIENTS = "dhcpcd dhclient pump" ++POSSIBLE_DHCP_CLIENTS = "udhcpc dhcpcd dhclient pump" + DHCP_TIMEOUT = 30 + HOSTNAME = socket.gethostname() + +@@ -81,7 +81,13 @@ + DHCP_COMMAND = which( i ) + if DHCP_COMMAND: + +- if i == "dhcpcd": ++ if i == "udhcpc": ++ DHCP_PIDFILE = "/var/run/udhcpc.%s.pid" % INTERFACE ++ DHCP_ARGS = "-p " + DHCP_PIDFILE + " -i" ++ DHCP_KILL_COMMAND = "" # no kill command available ++ break ++ ++ elif i == "dhcpcd": + DHCP_PIDFILE = "/var/run/dhcpcd-%s.pid" % INTERFACE + # + # See "man dhcpcd-bin" or "man dhcpcd" for additional options. +@@ -138,8 +144,8 @@ + # WPA_SUPPLICANT + WPA_SUPPLICANT_COMMAND = "/usr/sbin/wpa_supplicant" + WPA_SUPPLICANT_KILL_COMMAND="" +-WPA_SUPPLICANT_CONF="/etc/wpa_supplicant/wpa_supplicant.conf" +-WPA_DRIVER="ipw" ++WPA_SUPPLICANT_CONF="/etc/wpa_supplicant.conf" ++WPA_DRIVER="hostap" + WPA_SUPPLICANT_PIDFILE = "/var/run/wpa_supplicant.pid" + WPA_SUPPLICANT_ARGS = "-B -i " + INTERFACE + " -c " + WPA_SUPPLICANT_CONF + " -D " + WPA_DRIVER + " -p " + WPA_SUPPLICANT_PIDFILE + diff --git a/packages/wifi-radar/files/wifi-radar_destktop.patch b/packages/wifi-radar/files/wifi-radar_destktop.patch new file mode 100644 index 0000000000..ce0dd91464 --- /dev/null +++ b/packages/wifi-radar/files/wifi-radar_destktop.patch @@ -0,0 +1,13 @@ +--- wifi-radar-1.9.6/wifi-radar.desktop 2006-02-08 23:27:46.000000000 +0100 ++++ wifi-radar-1.9.6/wifi-radar.desktop.new 2006-05-14 22:06:29.000000000 +0200 +@@ -5,8 +5,8 @@ + Name=Wifi-radar + GenericName=Wireless tool + Comment=Tool for connecting to wireless networks +-Icon=wifi-radar.svg ++Icon=wifi-radar.png + FilePattern=wifi-radar + TryExec=wifi-radar +-Exec=gksudo -S wifi-radar ++Exec=wifi-radar + Categories=Application;Network; diff --git a/packages/wifi-radar/wifi-radar_1.9.6.bb b/packages/wifi-radar/wifi-radar_1.9.6.bb new file mode 100644 index 0000000000..70e913e086 --- /dev/null +++ b/packages/wifi-radar/wifi-radar_1.9.6.bb @@ -0,0 +1,35 @@ +SECTION = "x11/network" +DESCRIPTION="WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles." +HOMEPAGE="http://www.bitbuilder.com/wifi_radar/" +LICENSE = "GPL" + +PACKAGE_ARCH = "all" + +RDEPENDS = "python-core python-pygtk2 python-re python-io" + +SRC_URI="http://wifi-radar.systemimager.org/pub/${PN}-${PV}.tar.bz2 \ + file://wifi-radar.patch;patch=1 \ + file://wifi-radar_destktop.patch;patch=1 " + + +S = "${WORKDIR}/${PN}-${PV}" + +do_install() { + oe_runmake sbindir=${D}${sbindir} initdir=${D}${sysconfdir}/init.d sysconfdir=${D}${sysconfdir} mandir=${D}${mandir} pixmapsdir=${D}${datadir}/pixmaps appsdir=${D}${datadir}/applications install + + #sbindir = /usr/sbin + #initdir = /etc/init.d + #sysconfdir = /etc/wifi-radar + #mandir = /usr/share/man + #pixmapsdir = /usr/share/pixmaps + #appsdir = /usr/share/applications +} + +pkg_postinst() { +#!/bin/sh +# post installation script +echo "*******************************************" +echo "Please edit /etc/wifi-radar.conf" +echo "to match your wifi card name (wlan0, eth0, ...)" +echo "*******************************************" +} -- cgit v1.2.3 From b02718fad962cc918d7b871a94a0dc19bad64433 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 May 2006 12:05:22 +0000 Subject: libxss: fix XORG_PN --- packages/xlibs/libxss_1.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xlibs/libxss_1.0.1.bb b/packages/xlibs/libxss_1.0.1.bb index fa6cb61ec7..92dd4c82c4 100644 --- a/packages/xlibs/libxss_1.0.1.bb +++ b/packages/xlibs/libxss_1.0.1.bb @@ -7,7 +7,7 @@ DEPENDS = "libx11 libxext xextproto scrnsaverproto" PROVIDES = "libxss" RREPLACES = "libxss" -XORG_PN = "libXscrnSaver" +XORG_PN = "libXScrnSaver" include xorg-xlibs.inc -- cgit v1.2.3 From 01a4a1d8ecd20547b0d291afcb2c0c6ff1b05a51 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 16 May 2006 12:09:34 +0000 Subject: libopie: Poodle: Fix Calendar and Address hotkeys for kernel 2.6 --- packages/libopie/libopie2/poodle-2.6-hotkeys.patch | 16 ++++++++++++++++ packages/libopie/libopie2_1.2.1.bb | 4 +++- packages/libopie/libopie2_cvs.bb | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 packages/libopie/libopie2/poodle-2.6-hotkeys.patch diff --git a/packages/libopie/libopie2/poodle-2.6-hotkeys.patch b/packages/libopie/libopie2/poodle-2.6-hotkeys.patch new file mode 100644 index 0000000000..748f316a33 --- /dev/null +++ b/packages/libopie/libopie2/poodle-2.6-hotkeys.patch @@ -0,0 +1,16 @@ +--- libopie2/opiecore/device/odevice_zaurus.cpp.orig 2006-05-16 13:53:40.190417936 +0200 ++++ libopie2/opiecore/device/odevice_zaurus.cpp 2006-05-16 13:53:56.606922248 +0200 +@@ -61,11 +61,11 @@ + using namespace Opie::Core::Internal; + + struct z_button z_buttons [] = { +- { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), ++ { Qt::Key_Control, QT_TRANSLATE_NOOP("Button", "Calendar Button"), + "devicebuttons/z_calendar", + "datebook", "nextView()", + "today", "raise()" }, +- { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), ++ { Qt::Key_Alt, QT_TRANSLATE_NOOP("Button", "Contacts Button"), + "devicebuttons/z_contact", + "addressbook", "raise()", + "addressbook", "beamBusinessCard()" }, diff --git a/packages/libopie/libopie2_1.2.1.bb b/packages/libopie/libopie2_1.2.1.bb index dbda15360c..7037f48d06 100644 --- a/packages/libopie/libopie2_1.2.1.bb +++ b/packages/libopie/libopie2_1.2.1.bb @@ -1,7 +1,9 @@ include ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ file://openzaurus-branding.patch;patch=1 \ file://include.pro" + +SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 8d5ff7486b..a7c7e1003c 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -4,3 +4,5 @@ PV = "${OPIE_CVS_PV}" SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \ file://include.pro" + +SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" -- cgit v1.2.3 From 6177f56680b59b0b131aa8a5844599b7b5c77455 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 May 2006 14:44:43 +0000 Subject: epdfview: add 0.1.4 * requires gtk 2.8.x to build --- packages/epdfview/epdfview_0.1.4.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/epdfview/epdfview_0.1.4.bb diff --git a/packages/epdfview/epdfview_0.1.4.bb b/packages/epdfview/epdfview_0.1.4.bb new file mode 100644 index 0000000000..357129c16b --- /dev/null +++ b/packages/epdfview/epdfview_0.1.4.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "A minimal PDF viewer based on gtk and poppler" +MAINTAINER = "Graeme Gregory " +HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/" +LICENSE = "GPLv2" +DEPENDS = "poppler gtk+" + +SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2" + +PR="r0" + +inherit autotools + +do_compile_append () { + sed -i 's|\$.*prefix./|/usr/|' data/epdfview.desktop +} + -- cgit v1.2.3 From 2a48078e1d5d82661ab8df6823e1154287f4e202 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 16 May 2006 16:56:42 +0000 Subject: glibc-cvs-2.3.5: apply superh fcntl patch for sh3|sh4. closes #955 --- packages/glibc/glibc-cvs-2.3.5/superh-fcntl.patch | 40 +++++++++++++++++++++++ packages/glibc/glibc_2.3.5+cvs20050627.bb | 9 +++-- 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 packages/glibc/glibc-cvs-2.3.5/superh-fcntl.patch diff --git a/packages/glibc/glibc-cvs-2.3.5/superh-fcntl.patch b/packages/glibc/glibc-cvs-2.3.5/superh-fcntl.patch new file mode 100644 index 0000000000..364b9e1b32 --- /dev/null +++ b/packages/glibc/glibc-cvs-2.3.5/superh-fcntl.patch @@ -0,0 +1,40 @@ +--- sysdeps/unix/sysv/linux/sh/bits/fcntl.h_orig 2006-05-16 16:58:30.000000000 +0000 ++++ sysdeps/unix/sysv/linux/sh/bits/fcntl.h 2006-05-16 16:58:49.000000000 +0000 +@@ -90,6 +90,12 @@ + # define F_GETSIG 11 /* Get number of signal to be sent. */ + #endif + ++#ifdef __USE_GNU ++# define F_SETLEASE 1024 /* Set a lease. */ ++# define F_GETLEASE 1025 /* Enquire what lease is active. */ ++# define F_NOTIFY 1026 /* Request notifications on a directory */ ++#endif ++ + /* For F_[GET|SET]FL. */ + #define FD_CLOEXEC 1 /* actually anything with low bit set goes */ + +@@ -111,6 +117,24 @@ + # define LOCK_UN 8 /* remove lock */ + #endif + ++#ifdef __USE_GNU ++# define LOCK_MAND 32 /* this is a mandatory flock: */ ++# define LOCK_READ 64 /* ...which allows concurrent read operations. */ ++# define LOCK_WRITE 128 /* ...which allows concurrent write operations. */ ++# define LOCK_RW 192 /* ...which allows concurrent read & write operations. */ ++#endif ++ ++#ifdef __USE_GNU ++/* Types of directory notifications that may be requested with F_NOTIFY. */ ++# define DN_ACCESS 0x00000001 /* File Acessed. */ ++# define DN_MODIFY 0x00000002 /* File Modified. */ ++# define DN_CREATE 0x00000004 /* File created. */ ++# define DN_DELETE 0x00000008 /* File removed. */ ++# define DN_RENAME 0x00000010 /* File renamed. */ ++# define DN_ATTRIB 0x00000020 /* File changed attributes. */ ++# define DN_MULTISHOT 0x80000000 /* Don't remove notifier. */ ++#endif ++ + struct flock + { + short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */ diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 61e3e84d6d..9794dea6b3 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell " FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r4" +PR = "r5" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -60,8 +60,11 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat # seems to fail on tls platforms SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1" -# Build fails on sh4 unless no-z-defs is defined -SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" +# Build fails on sh3 and sh4 without additional patches +SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1 \ + file://superh-fcntl.patch;patch=1" +SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1 \ + file://superh-fcntl.patch;patch=1" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -- cgit v1.2.3 From 50cd19b937ebb215bb453311f8f0dfacf8e11f84 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 16 May 2006 16:57:48 +0000 Subject: jamvm: add sh3sh4 support patch. bug #958, not closed yet. NOTE: do we really need all those versions? how about a .inc file? --- packages/jamvm/jamvm/sh3sh4-support.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/jamvm/jamvm/sh3sh4-support.patch diff --git a/packages/jamvm/jamvm/sh3sh4-support.patch b/packages/jamvm/jamvm/sh3sh4-support.patch new file mode 100644 index 0000000000..8fa0d8c161 --- /dev/null +++ b/packages/jamvm/jamvm/sh3sh4-support.patch @@ -0,0 +1,11 @@ +--- configure.ac_orig 2006-05-10 21:48:31.000000000 +0000 ++++ configure.ac 2006-05-10 21:49:56.000000000 +0000 +@@ -66,6 +66,8 @@ + arm*-*-linux*) host_cpu=arm host_os=linux ;; + arm*-*-openbsd*) host_cpu=arm host_os=linux libdl_needed=no ;; + arm*-*-freebsd*) host_cpu=arm host_os=linux libdl_needed=no ;; ++sh3-*-linux*) host_cpu=sh3 host_os=linux libdl_needed=no ;; ++sh4-*-linux*) host_cpu=sh4 host_os=linux libdl_needed=no ;; + powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;; + powerpc*-*-openbsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;; + powerpc*-*-freebsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;; -- cgit v1.2.3 From e92f4a1696636d816383d46e640376dc146d13ef Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 16 May 2006 17:41:13 +0000 Subject: vmedit: Add version 0.01. --- packages/vmedit/.mtn2git_empty | 0 packages/vmedit/vmedit_0.01.bb | 13 +++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 packages/vmedit/.mtn2git_empty create mode 100644 packages/vmedit/vmedit_0.01.bb diff --git a/packages/vmedit/.mtn2git_empty b/packages/vmedit/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/vmedit/vmedit_0.01.bb b/packages/vmedit/vmedit_0.01.bb new file mode 100644 index 0000000000..4ad97a4835 --- /dev/null +++ b/packages/vmedit/vmedit_0.01.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +inherit gpe + +DEPENDS = "gtk+ libgpewidget" +MAINTAINER = "Florian Boor " +SECTION = "gpe" +DESCRIPTION = "This is a small GTK based multi-tab text editor." + +SRC_URI="http://194.213.43.198/${PN}/${P}.tar.gz" + +do_install () { + oe_runmake install-program DESTDIR=${D} PREFIX=${prefix} +} -- cgit v1.2.3 From da7ee091b175034051e718e71d81f58e9d82f42a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 16 May 2006 17:47:44 +0000 Subject: glibc 2.3.5+cvs fix pnum=0 patch (tss...) --- packages/glibc/glibc_2.3.5+cvs20050627.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 9794dea6b3..86ddc91fd0 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell " FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r5" +PR = "r6" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -62,9 +62,9 @@ SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1" # Build fails on sh3 and sh4 without additional patches SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1 \ - file://superh-fcntl.patch;patch=1" + file://superh-fcntl.patch;patch=1;pnum=0" SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1 \ -