From 53a171468916a10de6b48671f9bd850585e43c04 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 12 Sep 2007 13:42:39 +0000 Subject: gpe-session-scripts-phone: Minor session update to avoid session restart. --- packages/gpephone/gpe-session-scripts-phone/phonesession | 9 +++++---- packages/gpephone/gpe-session-scripts-phone_0.67.bb | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession index ee187e2fb0..2f573a13fa 100755 --- a/packages/gpephone/gpe-session-scripts-phone/phonesession +++ b/packages/gpephone/gpe-session-scripts-phone/phonesession @@ -47,8 +47,6 @@ gpe-phonepanel& gpe-applauncher& matchbox-window-manager -use_titlebar no& -# start device support daemon -machined # Start E-Sound Server esd -nobeeps -as 2& @@ -65,5 +63,8 @@ gsmMux -d -p /dev/ttyS0 -m cms92 -f 128 -b 115200 -c /dev/ptmx /dev/ptmx & #save session bus address to a file echo $DBUS_SESSION_BUS_ADDRESS > /tmp/dbusaddress -# Start PhoneServer - do not stop, it keeps the session running -exec phoneserver +# Start PhoneServer +phoneserver& + +# start device support daemon +exec machined -n diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb index 4cedeaa7f8..ac867a9c02 100644 --- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb +++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb @@ -14,7 +14,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \ file://disable-composite.xsettings \ file://standard-apps.patch;patch=1" -PR = "r8" +PR = "r9" S = "${WORKDIR}/gpe-session-scripts-${PV}" -- cgit v1.2.3 From e31096d1a0fce8c7e58756ebde4917960ee35449 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 12 Sep 2007 16:16:05 +0000 Subject: gpe-applauncher: Make a separate package for the machine specific configuration files. --- packages/gpephone/gpe-applauncher/.mtn2git_empty | 0 packages/gpephone/gpe-applauncher_0.10.bb | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 packages/gpephone/gpe-applauncher/.mtn2git_empty diff --git a/packages/gpephone/gpe-applauncher/.mtn2git_empty b/packages/gpephone/gpe-applauncher/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/gpe-applauncher_0.10.bb b/packages/gpephone/gpe-applauncher_0.10.bb index fbc47bd091..94f26c5589 100644 --- a/packages/gpephone/gpe-applauncher_0.10.bb +++ b/packages/gpephone/gpe-applauncher_0.10.bb @@ -2,11 +2,24 @@ LICENSE = "GPL" DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" + +PACKAGES += "gpe-applauncher-config" +PACKAGE_ARCH_gpe-applauncher-config_fic-gta01 = "${MACHINE_ARCH}" DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client" +RDEPENDS_${PN} += "gpe-applauncher-config" GPE_TARBALL_SUFFIX= "bz2" inherit gpephone autotools -FILES_${PN} += '${datadir}/themes' +SRC_URI += "file://hotkeys.conf" + +FILES_${PN} = '${datadir} ${bindir}' +FILES_gpe-applauncher-config = '${sysconfdir}/gpe/' + +do_configure_append () { + install ${WORKDIR}/hotkeys.conf ${S} +} -- cgit v1.2.3 From 77d7c7c9e58d1f042a270e70cd1d73a53bd63a28 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 12 Sep 2007 18:07:27 +0000 Subject: task-sdk-extra: Some updates, add libraries, drop obsolete. --- packages/tasks/task-sdk-extra.bb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/tasks/task-sdk-extra.bb b/packages/tasks/task-sdk-extra.bb index 33f8e3a5e8..efb12c3cfb 100644 --- a/packages/tasks/task-sdk-extra.bb +++ b/packages/tasks/task-sdk-extra.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages" -PR = "r7" +PR = "r8" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -18,6 +18,7 @@ RDEPENDS_task-sdk-x11 = "\ libmatchbox-dev \ matchbox-desktop-dev \ pango-dev \ + renderproto-dev \ startup-notification-dev" RDEPENDS_task-sdk-x11-ext = "\ @@ -28,10 +29,7 @@ RDEPENDS_task-sdk-x11-ext = "\ libxrender-dev \ libxsettings-client-dev \ randrext-dev \ - resourceext-dev \ - libx11-dev \ libxau-dev \ - libxcalibrate-dev \ xcalibrateext-dev \ libxcomposite-dev \ libxdamage-dev \ @@ -53,5 +51,6 @@ RDEPENDS_task-sdk-gpe = "\ libgpevtype-dev \ libgpelaunch-dev \ libgpewidget-dev \ - libhandoff-dev" + libhandoff-dev \ + gconf-dbus-dev" -- cgit v1.2.3 From 994d2692779a49840c5bd1c4796c45944462c13f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 13 Sep 2007 10:40:05 +0000 Subject: moko-autorev: add also libraries: libmoko* and libgsmd --- conf/distro/include/moko-autorev.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 5a1dc34784..bc4e763a19 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -1,3 +1,8 @@ +SRCREV_pn-libgsmd ?= "${AUTOREV}" +SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}" +SRCREV_pn-libmokojournal2 ?= "${AUTOREV}" +SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}" +SRCREV_pn-libmokoui2 ?= "${AUTOREV}" SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}" SRCREV_pn-openmoko-calculator ?= "${AUTOREV}" SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}" -- cgit v1.2.3 From 52fa2af356f28464f5c7c48b7d9c6ab4c12b3c3d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Sep 2007 07:58:49 +0000 Subject: gdk-pixbuf-csource-native: add a workaround for #3000 --- packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb b/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb index f3b7b0e6c8..51fb846ce9 100644 --- a/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb +++ b/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb @@ -5,6 +5,11 @@ S = "${WORKDIR}/gtk+-${PV}" FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files" SRC_URI += "file://reduce-dependencies.patch;patch=1" +#clear recommends for uclibc builds +RRECOMMENDS = " " +RRECOMMENDS_${PN}_linux = " " +RRECOMMENDS_${PN}_linux-gnueabi = " " + EXTRA_OECONF = "\ --without-x \ --with-gdktarget=linux-fb \ -- cgit v1.2.3 From 0f80b18e9e7dc3a40b0a009a7ab59e7e984136da Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 14 Sep 2007 11:46:06 +0000 Subject: tune-geodelx: added tuning for AMD GeodeLX cpu Starting from GCC 4.3 it will have own -mcpu flag. With older versions optimizations for AMD K6-2 are best. --- conf/machine/include/tune-geodelx.conf | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 conf/machine/include/tune-geodelx.conf diff --git a/conf/machine/include/tune-geodelx.conf b/conf/machine/include/tune-geodelx.conf new file mode 100644 index 0000000000..335fadec6e --- /dev/null +++ b/conf/machine/include/tune-geodelx.conf @@ -0,0 +1,6 @@ +# Geode CPU has it's own target in GCC 4.3 +# in older versions k6-2 is closest +# +TARGET_CC_ARCH = "-march=k6-2" +PACKAGE_ARCH = "geode" + -- cgit v1.2.3 From 382cd505caf66d1777e487640b819a73a3facdee Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 14 Sep 2007 11:49:13 +0000 Subject: alix: use tuning for GeodeLX cpu, switch to i586 According to Jordan Crouse (Geode maintainer in Linux) GeodeLX is i586 not i686. Also optimizations for AMD K6-2 are due to his suggestions. My ALIX.1c board runs with Geode optimized packages for over week without problems. --- conf/machine/alix.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf index 77312791dc..29af29a3b8 100644 --- a/conf/machine/alix.conf +++ b/conf/machine/alix.conf @@ -5,9 +5,9 @@ # http://pcengines.ch/alix1c.htm # i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html -TARGET_ARCH = "i686" +TARGET_ARCH = "i586" -PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586" +PACKAGE_EXTRA_ARCHS = "x86 i386 i486 geode" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" @@ -17,6 +17,8 @@ GLIBC_EXTRA_OECONF = "--with-tls" MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi" +require conf/machine/include/tune-geodelx.conf + IMAGE_FSTYPES += "tar.gz" MACHINE_EXTRA_RRECOMMENDS = "\ -- cgit v1.2.3 From eb1c5ce759640e621bacfe6969743ca15dcd3aec Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 14 Sep 2007 12:19:10 +0000 Subject: gpe-applauncher: add 0.11 --- packages/gpephone/gpe-applauncher_0.11.bb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 packages/gpephone/gpe-applauncher_0.11.bb diff --git a/packages/gpephone/gpe-applauncher_0.11.bb b/packages/gpephone/gpe-applauncher_0.11.bb new file mode 100644 index 0000000000..396981659b --- /dev/null +++ b/packages/gpephone/gpe-applauncher_0.11.bb @@ -0,0 +1,27 @@ +LICENSE = "GPL" +DESCRIPTION = "A cellphone application launcher." +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" + +PACKAGES += "gpe-applauncher-config" +PACKAGE_ARCH_gpe-applauncher-config_fic-gta01 = "${MACHINE_ARCH}" + +DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client" +RDEPENDS_${PN} += "gpe-applauncher-config" + +GPE_TARBALL_SUFFIX= "bz2" +inherit gpephone autotools + +SRC_URI += "file://hotkeys.conf" + +EXTRA_OECONF = "--disable-gridlayout" + +FILES_${PN} = '${datadir} ${bindir}' +FILES_gpe-applauncher-config = '${sysconfdir}/gpe/' + +do_configure_append () { + install ${WORKDIR}/hotkeys.conf ${S} +} -- cgit v1.2.3 From 11708d352d0844ceb309221b5660d8c7c7ec790e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Sep 2007 13:12:58 +0000 Subject: sane-srcrevs: bump libgsmd --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 4180cd5a29..c16385da7f 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -18,7 +18,7 @@ SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "606" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-hildon-1 ?= "13708" -SRCREV_pn-libgsmd ?= "2806" +SRCREV_pn-libgsmd ?= "2957" SRCREV_pn-libmokogsmd2 ?= "2950" SRCREV_pn-libmokojournal2 ?= "2780" SRCREV_pn-libmokopanelui2 ?= "2958" -- cgit v1.2.3 From 7f948b0144585fb7368da2c7c4d901e08c2bb50b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Sep 2007 13:16:05 +0000 Subject: vte: add rdependency on termcap --- packages/vte/vte_0.16.8.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vte/vte_0.16.8.bb b/packages/vte/vte_0.16.8.bb index 71ca0a04bd..213bd0afbe 100644 --- a/packages/vte/vte_0.16.8.bb +++ b/packages/vte/vte_0.16.8.bb @@ -1,6 +1,7 @@ DESCRIPTION = "vte is a virtual terminal emulator" LICENSE = "LGPL" -PR = "r2" +RDEPENDS = "termcap" +PR = "r3" inherit gnome -- cgit v1.2.3 From 270f600e7bfb078e0d568ae8c2c0727f9e140af3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Sep 2007 13:16:41 +0000 Subject: add termcap, the terminal capabilities file. at least vte needs this to operate correctly (backspace et. al.) --- packages/termcap/.mtn2git_empty | 0 packages/termcap/termcap_11.0.1.bb | 16 ++++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/termcap/.mtn2git_empty create mode 100644 packages/termcap/termcap_11.0.1.bb diff --git a/packages/termcap/.mtn2git_empty b/packages/termcap/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/termcap/termcap_11.0.1.bb b/packages/termcap/termcap_11.0.1.bb new file mode 100644 index 0000000000..81953021e0 --- /dev/null +++ b/packages/termcap/termcap_11.0.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Terminal Capabilities File" +SECTION = "base" +HOMEPAGE = "http://www.catb.org/~esr/terminfo/" +LICENSE = "PD" + +SRC_URI = "http://www.catb.org/~esr/terminfo/termtypes.tc.gz" +S = "${WORKDIR}" + +do_install() { + install -d ${D}${sysconfdir} + install -m 0644 termtypes.tc ${D}${sysconfdir}/termcap +} + +PACKAGES = "termcap" +FILES_termcap = "${sysconfdir}" + -- cgit v1.2.3 From 7415d2302d03920cf4da0865063f05025754ac1f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Sep 2007 13:22:24 +0000 Subject: linux-ezx: improve rokre6 support --- .../linux/linux-ezx-2.6.21/patches/e6-eoc.patch | 82 ++++++++++++++ .../linux/linux-ezx-2.6.21/patches/e6-mci.patch | 124 +++++++++++++++++++++ .../linux/linux-ezx-2.6.21/patches/e6-pcap.patch | 83 ++++++++++++++ .../linux/linux-ezx-2.6.21/patches/e6-ts.patch | 38 +++++++ .../linux/linux-ezx-2.6.21/patches/ezx-eoc.patch | 21 ++-- packages/linux/linux-ezx-2.6.21/rokre6/defconfig | 1 + packages/linux/linux-ezx_2.6.21.bb | 6 +- 7 files changed, 342 insertions(+), 13 deletions(-) create mode 100644 packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch create mode 100644 packages/linux/linux-ezx-2.6.21/patches/e6-mci.patch create mode 100644 packages/linux/linux-ezx-2.6.21/patches/e6-pcap.patch create mode 100644 packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch diff --git a/packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch b/packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch new file mode 100644 index 0000000000..79c60c8ca2 --- /dev/null +++ b/packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch @@ -0,0 +1,82 @@ +Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c +=================================================================== +--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c 2007-09-07 22:15:52.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c 2007-09-09 13:29:56.000000000 -0300 +@@ -25,6 +25,7 @@ + #include + + #include "generic.h" ++#include "ezx-eoc.h" + + extern void ezx_lcd_power(int, struct fb_var_screeninfo *); + extern void ezx_backlight_power(int); +@@ -227,11 +228,69 @@ + .resource = pcap_ts_resources, + }; + ++ ++/* EOC */ ++static const unsigned int tab_init_eoc_reg[][2] = ++{ ++ {POWER_IC_REG_EOC_INT_MASK, 0x00000FEF}, ++ {POWER_IC_REG_EOC_POWER_CONTROL_0, 0x00000C00}, ++ {POWER_IC_REG_EOC_POWER_CONTROL_1, 0x0000000C}, ++ {POWER_IC_REG_EOC_CONN_CONTROL, 0x00021044}, ++}; ++ ++static void dump_eoc_registers(void) ++{ ++ int i, val = 0; ++ ++ printk("========DUMP EOC=========\n"); ++ for (i = 0; i < POWER_IC_REG_EOC_NUM; i++) { ++ eoc_reg_read(i, &val); ++ printk("eoc_registers[%d] = 0x%08X\n", i, val); ++ } ++ printk("========END DUMP=========\n"); ++} ++ ++/* ++ * FIXME: The same about the PCAP driver applies here. ++ * This is the initial state only. ++ * Which bits does the change to USB/UART/AUDIO mode? ++ * I think that this is causing the crash on pxa27x-udc ++ * you are setting the 'port connected' bit, and thats why ++ * you are getting interrupts early. ++ * --WM ++ */ ++ ++static int __init e6_eoc_init(void) ++{ ++ int i; ++ ++ for (i = 0; i < sizeof(tab_init_eoc_reg)/sizeof(unsigned int)/2; i++) ++ { ++ eoc_reg_write(tab_init_eoc_reg[i][0], tab_init_eoc_reg[i][1]); ++ } ++ dump_eoc_registers(); ++ return 0; ++} ++ ++static struct ezx_eoc_platform_data e6_eoc_platform_data = { ++ .init = e6_eoc_init, ++}; ++ ++struct platform_device e6_eoc_device = { ++ .name = "ezx-eoc", ++ .id = -1, ++ .dev = { ++ .platform_data = &e6_eoc_platform_data, ++ }, ++}; ++ + static struct platform_device *devices[] __initdata = { + &e6_pcap_device, + &pcap_ts_device, ++ &e6_eoc_device, + }; + ++ + static void __init e6_init(void) + { + set_pxa_fb_info(&e6_fb_info); diff --git a/packages/linux/linux-ezx-2.6.21/patches/e6-mci.patch b/packages/linux/linux-ezx-2.6.21/patches/e6-mci.patch new file mode 100644 index 0000000000..08a6f97820 --- /dev/null +++ b/packages/linux/linux-ezx-2.6.21/patches/e6-mci.patch @@ -0,0 +1,124 @@ +Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c +=================================================================== +--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c 2007-09-07 11:51:55.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c 2007-09-07 11:54:52.000000000 -0300 +@@ -13,6 +13,8 @@ + #include + #include + #include ++#include ++#include + + #include + #include +@@ -20,12 +22,102 @@ + #include + #include + #include ++#include + + #include "generic.h" + + extern void ezx_lcd_power(int, struct fb_var_screeninfo *); + extern void ezx_backlight_power(int); + ++#ifdef CONFIG_EZX_PCAP ++extern int ezx_pcap_mmcsd_power(int); ++extern void ezx_pcap_mmcsd_voltage(u_int32_t); ++#else ++#define ezx_pcap_mmcsd_voltage(x) {} ++#define ezx_pcap_mmcsd_power(x) {} ++#endif ++ ++static struct pxamci_platform_data e6_mci_platform_data; ++ ++static u_int8_t mmc_voltage[] = { ++ [MMC_VDD_160] = 5, ++ [MMC_VDD_170] = 5, ++ [MMC_VDD_180] = 6, ++ [MMC_VDD_190] = 6, ++ [MMC_VDD_200] = 7, ++ [MMC_VDD_210] = 7, ++ [MMC_VDD_220] = 8, ++ [MMC_VDD_230] = 8, ++ [MMC_VDD_240] = 9, ++ [MMC_VDD_250] = 9, ++ [MMC_VDD_260] = 10, ++ [MMC_VDD_270] = 10, ++ [MMC_VDD_280] = 11, ++ [MMC_VDD_290] = 11, ++ [MMC_VDD_300] = 12, ++ [MMC_VDD_310] = 12, ++ [MMC_VDD_320] = 13, ++ [MMC_VDD_330] = 13, ++ [MMC_VDD_340] = 14, ++ [MMC_VDD_350] = 14, ++ [MMC_VDD_360] = 15, ++}; ++ ++static int e6_mci_init(struct device *dev, ++ irqreturn_t (*ezx_detect_int)(int, void *), ++ void *data) ++{ ++ int err; ++ ++ /* Setup GPIO for PXA27x MMC/SD controller */ ++ pxa_gpio_mode(GPIO32_MMCCLK_MD); ++ pxa_gpio_mode(GPIO112_MMCCMD_MD); ++ pxa_gpio_mode(GPIO92_MMCDAT0_MD); ++ pxa_gpio_mode(GPIO109_MMCDAT1_MD); ++ pxa_gpio_mode(GPIO110_MMCDAT2_MD); ++ pxa_gpio_mode(GPIO111_MMCDAT3_MD); ++ ++ ezx_pcap_mmcsd_power(1); ++ ++ e6_mci_platform_data.detect_delay = msecs_to_jiffies(250); ++ ++ err = request_irq(0x49, ezx_detect_int, SA_INTERRUPT, ++ "MMC card detect", data); ++ if (err) { ++ printk(KERN_ERR "ezx_mci_detect: MMC/SD: can't request " ++ "MMC card detect IRQ\n"); ++ return -1; ++ } ++ ++ set_irq_type(0x0b, IRQT_BOTHEDGE); ++ ++ return 0; ++} ++ ++static void e6_mci_setpower(struct device *dev, unsigned int vdd) ++{ ++ if (vdd <= MMC_VDD_360) ++ ezx_pcap_mmcsd_voltage(mmc_voltage[vdd]); ++ ++ ezx_pcap_mmcsd_power(1); ++} ++ ++static void e6_mci_exit(struct device *dev, void *data) ++{ ++ ezx_pcap_mmcsd_power(0); ++ free_irq(0x49, data); ++} ++ ++static struct pxamci_platform_data e6_mci_platform_data = { ++ .ocr_mask = MMC_VDD_160_165|MMC_VDD_18_19|MMC_VDD_20_21 ++ |MMC_VDD_22_23|MMC_VDD_24_25|MMC_VDD_26_27 ++ |MMC_VDD_28_29|MMC_VDD_30_31|MMC_VDD_32_33 ++ |MMC_VDD_34_35|MMC_VDD_35_36, ++ .init = e6_mci_init, ++ .setpower = e6_mci_setpower, ++ .exit = e6_mci_exit, ++}; ++ + static struct pxafb_mode_info mode_e6 = { + .pixclock = 192308, + .xres = 240, +@@ -118,6 +210,7 @@ + static void __init e6_init(void) + { + set_pxa_fb_info(&e6_fb_info); ++ pxa_set_mci_info(&e6_mci_platform_data); + + platform_add_devices(devices, ARRAY_SIZE(devices)); + } diff --git a/packages/linux/linux-ezx-2.6.21/patches/e6-pcap.patch b/packages/linux/linux-ezx-2.6.21/patches/e6-pcap.patch new file mode 100644 index 0000000000..a11adbc02e --- /dev/null +++ b/packages/linux/linux-ezx-2.6.21/patches/e6-pcap.patch @@ -0,0 +1,83 @@ +Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c +=================================================================== +--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c 2007-09-07 11:32:32.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c 2007-09-07 11:51:55.000000000 -0300 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "generic.h" + +@@ -48,7 +49,70 @@ + .pxafb_lcd_power = &ezx_lcd_power, + }; + ++/* PCAP */ ++static int __init e6_pcap_init(void) ++{ ++ /* ++ * FIXME: this is the PCAP INITIAL STATE. ++ * most of these writes should NOT be done here ++ * * voltage regulators, voltage enablers should be set by the ++ * driver which uses the connected hardware. Otherwise you ++ * drain power unnecessarily. ++ * * interrupt related registers should be set by the irq functions ++ * only. I think that the INT_SEL register selects on which irq ++ * pin the (ap/bp) the irq goes. This should go on ezx-pcap.c, but ++ * only if it actually makes any difference. ++ * * Only power state automatic changes should be done here. ++ * (*LOWPWR, *STBY, LOWPWR*) ++ * * I removed some writes which i consider extremelly wrong. And ++ * which i think will not break anything (they were overwritten ++ * later anyway). ++ * ++ * --WM ++ */ ++ ezx_pcap_write(PCAP_REG_INT_SEL, 0x0); /* wrong */ ++ ezx_pcap_write(PCAP_REG_SWCTRL, 0x2ee6); /* partially wrong */ ++ ezx_pcap_write(PCAP_REG_VREG1, 0x15778e3); /* wrong */ ++ ezx_pcap_write(PCAP_REG_VREG2, 0x810234); /* partially wrong */ ++ ezx_pcap_write(PCAP_REG_AUXVREG, 0x1024bec); /* wrong */ ++ ezx_pcap_write(PCAP_REG_PWR, 0x94108); /* partially wrong */ ++ ezx_pcap_write(PCAP_REG_AUXVREG_MASK, 0x214d48); /* wrong */ ++ ezx_pcap_write(PCAP_REG_BUSCTRL, 0x2a0); /* wrong */ ++ ezx_pcap_write(PCAP_REG_LOWPWR, 0x1d9610c); ++ ezx_pcap_write(PCAP_REG_PERIPH, 0x0); /* wrong */ ++ ezx_pcap_write(PCAP_REG_GP, 0x107); /* probably unnecessary */ ++ ++ return 0; ++} ++ ++static struct pcap_platform_data e6_pcap_platform_data = { ++ .port = 1, ++ .cs = GPIO_SPI_CE, ++ .flags = PCAP_CS_AH | PCAP_MCI_SD, ++ .clk = 1, ++ .init = e6_pcap_init, ++}; ++ ++static struct resource e6_pcap_resources[] = { ++ [0] = { ++ .start = IRQ_GPIO1, ++ .end = IRQ_GPIO1, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++struct platform_device e6_pcap_device = { ++ .name = "ezx-pcap", ++ .id = -1, ++ .num_resources = ARRAY_SIZE(e6_pcap_resources), ++ .resource = e6_pcap_resources, ++ .dev = { ++ .platform_data = &e6_pcap_platform_data, ++ }, ++}; ++ + static struct platform_device *devices[] __initdata = { ++ &e6_pcap_device, + }; + + static void __init e6_init(void) diff --git a/packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch b/packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch new file mode 100644 index 0000000000..6472f77886 --- /dev/null +++ b/packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch @@ -0,0 +1,38 @@ +Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c +=================================================================== +--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c 2007-09-07 11:54:52.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c 2007-09-07 11:55:10.000000000 -0300 +@@ -203,8 +203,33 @@ + }, + }; + ++/* PCAP_TS */ ++struct resource pcap_ts_resources[] = { ++ [0] = { ++ .start = EZX_IRQ_ADCDONE, ++ .end = EZX_IRQ_ADCDONE, ++ .flags = IORESOURCE_IRQ, ++ }, ++ [1] = { ++ .start = EZX_IRQ_TS, ++ .end = EZX_IRQ_TS, ++ .flags = IORESOURCE_IRQ, ++ } ++}; ++ ++struct platform_device pcap_ts_device = { ++ .name = "pcap-ts", ++ .id = -1, ++ .dev = { ++ .parent = &e6_pcap_device.dev, ++ }, ++ .num_resources = ARRAY_SIZE(pcap_ts_resources), ++ .resource = pcap_ts_resources, ++}; ++ + static struct platform_device *devices[] __initdata = { + &e6_pcap_device, ++ &pcap_ts_device, + }; + + static void __init e6_init(void) diff --git a/packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch b/packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch index f21894e904..77c79fd107 100644 --- a/packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch +++ b/packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch @@ -1,8 +1,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c 2007-09-09 13:33:19.000000000 -0300 -@@ -0,0 +1,270 @@ ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c 2007-09-11 20:14:33.000000000 -0300 +@@ -0,0 +1,267 @@ +/* + * EZX EOC Driver for Motorola EZX phones + * @@ -182,11 +182,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c + + eoc_i2c_client = new_client; + -+ if (pdata && pdata->init) { ++ if (pdata && pdata->init) + pdata->init(); -+ } -+ else -+ return -EINVAL; + + eoc_switch_to_default(); + @@ -276,7 +273,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.h 2007-09-07 22:15:52.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.h 2007-09-09 21:46:27.000000000 -0300 @@ -0,0 +1,33 @@ +/* + * linux/arch/arm/mach-pxa/ezx-eoc.h @@ -313,15 +310,15 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.h +#endif /* __EZX_EOC_H__ */ Index: linux-2.6.21/arch/arm/mach-pxa/Kconfig =================================================================== ---- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig 2007-09-07 22:15:52.000000000 -0300 -+++ linux-2.6.21/arch/arm/mach-pxa/Kconfig 2007-09-07 22:15:52.000000000 -0300 +--- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig 2007-09-09 21:46:27.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/Kconfig 2007-09-09 21:46:27.000000000 -0300 @@ -108,6 +108,12 @@ config EZX_PCAP bool "PCAP Support" +config EZX_EOC + tristate "EOC i2c driver of Motorola EZX phones" -+ depends on I2C && EXPERIMENTAL && PXA_EZX_A1200 ++ depends on I2C && EXPERIMENTAL + help + EOC i2c driver of Motorola EZX phones + @@ -330,8 +327,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/Kconfig depends on EZX_PCAP Index: linux-2.6.21/arch/arm/mach-pxa/Makefile =================================================================== ---- linux-2.6.21.orig/arch/arm/mach-pxa/Makefile 2007-09-07 22:15:52.000000000 -0300 -+++ linux-2.6.21/arch/arm/mach-pxa/Makefile 2007-09-07 22:15:52.000000000 -0300 +--- linux-2.6.21.orig/arch/arm/mach-pxa/Makefile 2007-09-09 21:46:27.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/Makefile 2007-09-09 21:46:27.000000000 -0300 @@ -27,6 +27,7 @@ obj-$(CONFIG_EZX_BP) += ezx-bp.o obj-$(CONFIG_EZX_PCAP) += ezx-pcap.o diff --git a/packages/linux/linux-ezx-2.6.21/rokre6/defconfig b/packages/linux/linux-ezx-2.6.21/rokre6/defconfig index 8a1f55c252..95a5a25297 100755 --- a/packages/linux/linux-ezx-2.6.21/rokre6/defconfig +++ b/packages/linux/linux-ezx-2.6.21/rokre6/defconfig @@ -152,6 +152,7 @@ CONFIG_PXA_EZX=y CONFIG_PXA_EZX_E6=y CONFIG_EZX_BP=y CONFIG_EZX_PCAP=y +CONFIG_EZX_EOC=y CONFIG_EZX_EMU=y CONFIG_EZX_EMU_USB=y # CONFIG_EZX_EMU_UART is not set diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb index 892d4f2249..366c71fccd 100644 --- a/packages/linux/linux-ezx_2.6.21.bb +++ b/packages/linux/linux-ezx_2.6.21.bb @@ -4,7 +4,7 @@ AUTHOR = "Harald Welte and the OpenEZX Team " HOMEPAGE = "http://www.openezx.org" LICENSE = "GPL" EZX = "ezxdev" -PR = "${EZX}-r11" +PR = "${EZX}-r12" inherit kernel @@ -22,9 +22,11 @@ SRC_URI = " \ file://patches/a780-pcap.patch;patch=1 \ file://patches/e680-pcap.patch;patch=1 \ file://patches/a1200-pcap.patch;patch=1 \ + file://patches/e6-pcap.patch;patch=1 \ file://patches/a780-mci.patch;patch=1 \ file://patches/e680-mci.patch;patch=1 \ file://patches/a1200-mci.patch;patch=1 \ + file://patches/e6-mci.patch;patch=1 \ file://patches/pxa27x-udc-support.2.patch;patch=1 \ file://patches/ezx-emu.patch;patch=1 \ file://patches/a780-emu.patch;patch=1 \ @@ -38,8 +40,10 @@ SRC_URI = " \ file://patches/a780-ts.patch;patch=1 \ file://patches/e680-ts.patch;patch=1 \ file://patches/a1200-ts.patch;patch=1 \ + file://patches/e6-ts.patch;patch=1 \ file://patches/ezx-eoc.patch;patch=1 \ file://patches/a1200-eoc.patch;patch=1 \ + file://patches/e6-eoc.patch;patch=1 \ file://patches/ezx-backlight.patch;patch=1 \ file://patches/a780-flip.patch;patch=1 \ file://patches/e680-locksw.patch;patch=1 \ -- cgit v1.2.3 From a5780430c6d3ebe2617217067bbeb5ee5a7152c8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Sep 2007 13:37:16 +0000 Subject: sane-srcrevs: bump openmoko-icons2 --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index c16385da7f..24cdfae0cd 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -50,7 +50,7 @@ SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "2873" SRCREV_pn-openmoko-footer ?= "2354" SRCREV_pn-openmoko-icon-theme-standard ?= "2232" -SRCREV_pn-openmoko-icon-theme-standard2 ?= "2840" +SRCREV_pn-openmoko-icon-theme-standard2 ?= "2967" SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" SRCREV_pn-openmoko-mediaplayer2 ?= "2952" -- cgit v1.2.3 From 1d43112a5df095fecb9c76edc20702160d314ea2 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Fri, 14 Sep 2007 13:56:37 +0000 Subject: exmap-console : Add dependency on glib-2.0. --- packages/exmap-console/exmap-console.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/exmap-console/exmap-console.inc b/packages/exmap-console/exmap-console.inc index 6744aed49f..ac56f2e1b9 100644 --- a/packages/exmap-console/exmap-console.inc +++ b/packages/exmap-console/exmap-console.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Console based version of exmap, a memory usage analysis tool" HOMEPAGE = "http://projects.o-hand.com/exmap-console" SECTION = "devel" LICENSE = "GPL" -DEPENDS = "virtual/kernel readline" +DEPENDS = "virtual/kernel readline glib-2.0" SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz" -- cgit v1.2.3 From dbd17d3b77062f0a1dfc1275b8a0ebc777ca1ea9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Sep 2007 15:14:18 +0000 Subject: add ttf-liberation fonts --- packages/ttf-fonts/ttf-liberation_0.2.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/ttf-fonts/ttf-liberation_0.2.bb diff --git a/packages/ttf-fonts/ttf-liberation_0.2.bb b/packages/ttf-fonts/ttf-liberation_0.2.bb new file mode 100644 index 0000000000..b3c96000fe --- /dev/null +++ b/packages/ttf-fonts/ttf-liberation_0.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Liberation fonts - TTF Version" +LICENSE = "Liberation" +HOMEPAGE = "https://www.redhat.com/promo/fonts/" + +require ttf.inc + +SRC_URI = "https://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz" +S = "${WORKDIR}/liberation-fonts-${PV}" + +PACKAGES = "ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif" +FILES_ttf-liberation-mono = "${datadir}/fonts/truetype/*Mono*" +FILES_ttf-liberation-sans = "${datadir}/fonts/truetype/*Sans*" +FILES_ttf-liberation-serif = "${datadir}/fonts/truetype/*Serif*" -- cgit v1.2.3 From 25eb7666838876c213122135cd80630b20105463 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Sep 2007 15:15:49 +0000 Subject: openmoko-terminal2: add rdependency on ttf-liberation-mono --- packages/openmoko2/openmoko-terminal2_svn.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/openmoko2/openmoko-terminal2_svn.bb b/packages/openmoko2/openmoko-terminal2_svn.bb index 1c27a07d76..f90e99e9f1 100644 --- a/packages/openmoko2/openmoko-terminal2_svn.bb +++ b/packages/openmoko2/openmoko-terminal2_svn.bb @@ -1,7 +1,8 @@ DESCRIPTION = "The OpenMoko Command Line Console" SECTION = "openmoko/applications" DEPENDS = "vte libmokoui2" +RDEPENDS = "ttf-liberation-mono" PV = "2.1.0+${SVNREV}" -PR = "r1" +PR = "r2" inherit openmoko2 -- cgit v1.2.3 From 8982693b0022f8fcaec12151a1e5bbf28ae4e7eb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Sep 2007 15:58:16 +0000 Subject: ecore, edje: try to repair PV going backwards --- packages/efl1/ecore.inc | 2 +- packages/efl1/edje_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index 42b4ccb7a2..86c87214cf 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -5,7 +5,7 @@ LICENSE = "MIT" DEPENDS = "curl directfb eet evas tslib" # optional # DEPENDS += "openssl virtual/libiconv" -PV = "0.9.9+cvs${SRCDATE}" +PV = "0.9.9.041+cvs${SRCDATE}" inherit efl_library diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb index 79336b74b5..0a5521f929 100644 --- a/packages/efl1/edje_cvs.bb +++ b/packages/efl1/edje_cvs.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Edje is a complex graphical design & layout library." # can also install vim data files DEPENDS = "eet evas ecore embryo edje-native" LICENSE = "MIT" -PV = "0.5.0+cvs${SRCDATE}" +PV = "0.5.0.41+cvs${SRCDATE}" PR = "r0" inherit efl_library -- cgit v1.2.3 From 299229062faeb88f10f2433fbb158b490d3203c1 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 14 Sep 2007 16:13:59 +0000 Subject: gpe-applauncher: add svn recipe, ship device specific softkey configuration. --- .../gpe-applauncher/fic-gta01/.mtn2git_empty | 0 .../gpe-applauncher/fic-gta01/hotkeys.conf | 20 +++++++++++++ .../gpe-applauncher/fic-gta01/softkeys.conf | 25 ++++++++++++++++ packages/gpephone/gpe-applauncher/hotkeys.conf | 20 +++++++++++++ packages/gpephone/gpe-applauncher/softkeys.conf | 25 ++++++++++++++++ packages/gpephone/gpe-applauncher_0.11.bb | 8 +++-- packages/gpephone/gpe-applauncher_svn.bb | 35 ++++++++++++++++++++++ 7 files changed, 130 insertions(+), 3 deletions(-) create mode 100644 packages/gpephone/gpe-applauncher/fic-gta01/.mtn2git_empty create mode 100644 packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf create mode 100644 packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf create mode 100644 packages/gpephone/gpe-applauncher/hotkeys.conf create mode 100644 packages/gpephone/gpe-applauncher/softkeys.conf create mode 100644 packages/gpephone/gpe-applauncher_svn.bb diff --git a/packages/gpephone/gpe-applauncher/fic-gta01/.mtn2git_empty b/packages/gpephone/gpe-applauncher/fic-gta01/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf b/packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf new file mode 100644 index 0000000000..34bd6a22b7 --- /dev/null +++ b/packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf @@ -0,0 +1,20 @@ +# We have two types of sections in here: +# 'System' defines the bindings for buit-in functions +# Each 'Application' section defines a binding of an application (desktop file) +# to a key. + +[System] +homescreen_show=k +homescreen_toggle=F5 +system_controls=Execute + +[Application0] +key=F7 +application=abook +hold=false + +[Application1] +key=F8 +application=gpe-taskmanager +hold=false + diff --git a/packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf b/packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf new file mode 100644 index 0000000000..f9fde86d2d --- /dev/null +++ b/packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf @@ -0,0 +1,25 @@ +# This an example configuration file for GPE Application launcher softkeys. +# All sizes and positions have pixels as units. +# The align setting is a positive value from 0 (left) to 10 (right). + +[Key 1] +label = left +width = 180 +height = 36 +xpos = 5 +ypos = 5 +xpos_menu = 5 +ypos_menu = 30 +align = 1 +key = F3 + +[Key 2] +label = right +width = 180 +height = 36 +xpos = 295 +ypos = 5 +xpos_menu = 5 +ypos_menu = 30 +align = 9 +key = F4 diff --git a/packages/gpephone/gpe-applauncher/hotkeys.conf b/packages/gpephone/gpe-applauncher/hotkeys.conf new file mode 100644 index 0000000000..f8007ddbb5 --- /dev/null +++ b/packages/gpephone/gpe-applauncher/hotkeys.conf @@ -0,0 +1,20 @@ +# We have two types of sections in here: +# 'System' defines the bindings for buit-in functions +# Each 'Application' section defines a binding of an application (desktop file) +# to a key. + +[System] +homescreen_show=k +homescreen_toggle=F5 +system_controls=F6 + +[Application0] +key=F7 +application=abook +hold=false + +[Application1] +key=F8 +application=gpe-taskmanager +hold=false + diff --git a/packages/gpephone/gpe-applauncher/softkeys.conf b/packages/gpephone/gpe-applauncher/softkeys.conf new file mode 100644 index 0000000000..3e9a6c8882 --- /dev/null +++ b/packages/gpephone/gpe-applauncher/softkeys.conf @@ -0,0 +1,25 @@ +# This an example configuration file for GPE Application launcher softkeys. +# All sizes and positions have pixels as units. +# The align setting is a positive value from 0 (left) to 10 (right). + +[Key 1] +label = left +width = 100 +height = 22 +xpos = 0 +ypos = 1 +xpos_menu = 1 +ypos_menu = 1 +align = 1 +key = F3 + +[Key 2] +label = right +width = 100 +height = 22 +xpos = 140 +ypos = 1 +xpos_menu = 1 +ypos_menu = 1 +align = 9 +key = F4 diff --git a/packages/gpephone/gpe-applauncher_0.11.bb b/packages/gpephone/gpe-applauncher_0.11.bb index 396981659b..1efcd793e0 100644 --- a/packages/gpephone/gpe-applauncher_0.11.bb +++ b/packages/gpephone/gpe-applauncher_0.11.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" @@ -15,7 +15,8 @@ RDEPENDS_${PN} += "gpe-applauncher-config" GPE_TARBALL_SUFFIX= "bz2" inherit gpephone autotools -SRC_URI += "file://hotkeys.conf" +SRC_URI += "file://hotkeys.conf \ + file://softkeys.conf" EXTRA_OECONF = "--disable-gridlayout" @@ -23,5 +24,6 @@ FILES_${PN} = '${datadir} ${bindir}' FILES_gpe-applauncher-config = '${sysconfdir}/gpe/' do_configure_append () { - install ${WORKDIR}/hotkeys.conf ${S} + install ${WORKDIR}/hotkeys.conf ${S} + install ${WORKDIR}/softkeys.conf ${S} } diff --git a/packages/gpephone/gpe-applauncher_svn.bb b/packages/gpephone/gpe-applauncher_svn.bb new file mode 100644 index 0000000000..4fe82877e3 --- /dev/null +++ b/packages/gpephone/gpe-applauncher_svn.bb @@ -0,0 +1,35 @@ +LICENSE = "GPL" +DESCRIPTION = "A cellphone application launcher." +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" +PV = "0.11+svn-${SRCREV}" + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" +DEFAULT_PREFERENCE = "-1" + +inherit gpephone autotools +SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source;module=${PN}" + +S = "${WORKDIR}/${PN}" + + +PACKAGES += "gpe-applauncher-config" +PACKAGE_ARCH_gpe-applauncher-config_fic-gta01 = "${MACHINE_ARCH}" + +DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client" +RDEPENDS_${PN} += "gpe-applauncher-config" + + +SRC_URI += "file://hotkeys.conf \ + file://softkeys.conf" + +EXTRA_OECONF = "--disable-gridlayout" + +FILES_${PN} = '${datadir} ${bindir}' +FILES_gpe-applauncher-config = '${sysconfdir}/gpe/' + +do_configure_append () { + install ${WORKDIR}/hotkeys.conf ${S} + install ${WORKDIR}/softkeys.conf ${S} +} -- cgit v1.2.3 From 002f742e3fa99e02ee347032c7fb9e9187e25131 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Sep 2007 18:15:35 +0000 Subject: efl: more PV unbreaking --- packages/efl1/eet_cvs.bb | 2 +- packages/efl1/efreet_cvs.bb | 2 +- packages/efl1/embryo_cvs.bb | 2 +- packages/efl1/evas.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb index 2c9c641b6c..cd12daf245 100644 --- a/packages/efl1/eet_cvs.bb +++ b/packages/efl1/eet_cvs.bb @@ -4,7 +4,7 @@ each chunk (very much like a zip file) and allow fast \ random-access reading of the file later on." DEPENDS = "zlib jpeg" LICENSE = "BSD" -PV = "0.9.10+cvs${SRCDATE}" +PV = "0.9.10.041+cvs${SRCDATE}" PR = "r0" inherit efl_library diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb index dba9a3c9fb..3f903d3484 100644 --- a/packages/efl1/efreet_cvs.bb +++ b/packages/efl1/efreet_cvs.bb @@ -2,7 +2,7 @@ DESCRIPTION = "An implementation of freedesktop.org specs for the \ Enlightenment Foundation Libraries" DEPENDS = "ecore" LICENSE = "BSD" -PV = "0.0.3+cvs${SRCDATE}" +PV = "0.0.3.003+cvs${SRCDATE}" PR = "r0" inherit efl_library diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb index 45b75f503d..dcba8557a8 100644 --- a/packages/efl1/embryo_cvs.bb +++ b/packages/efl1/embryo_cvs.bb @@ -4,7 +4,7 @@ CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ Embryo allows scripting capabilities in places that otherwise wouldn't support \ basic programming structures such as in Edje EDCs." LICENSE = "MIT" -PV = "0.9.1+cvs${SRCDATE}" +PV = "0.9.1.041+cvs${SRCDATE}" PR = "r0" inherit efl_library diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index e83dd11c4e..840f2929c5 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -5,7 +5,7 @@ your CPU or graphics hardware are too slow." LICENSE = "MIT" # can also depend on valgrind (?) DEPENDS = "libsdl-x11 directfb eet freetype jpeg virtual/libx11 libxext" -PV = "0.9.9+cvs${SRCDATE}" +PV = "0.9.9.041+cvs${SRCDATE}" inherit efl_library -- cgit v1.2.3 From 5029cab313e9450764fafcb904d8c2cb9183bd86 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Sep 2007 21:41:23 +0000 Subject: sane-srcrevs: bump openmoko-terminal2 --- conf/distro/include/sane-srcrevs.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 24cdfae0cd..145e97e1c1 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -1,4 +1,4 @@ -#Ggenerated with +# Generated with # bitbake -s | grep svnr | awk '{print "SRCREV_pn-" $1 "=" $2}' | \ # sed -e s:\+:\=:g -e s:svnr::g| awk -F "=" '{print $1 " ?=\" " $3}' | \ # awk -F "-r" '{print $1"\""}' @@ -72,7 +72,7 @@ SRCREV_pn-openmoko-stylus-demo-simple ?= "1818" SRCREV_pn-openmoko-taskmanager ?= "1663" SRCREV_pn-openmoko-tasks ?= "320" SRCREV_pn-openmoko-tasks2 ?= "320" -SRCREV_pn-openmoko-terminal2 ?= "2964" +SRCREV_pn-openmoko-terminal2 ?= "2972" SRCREV_pn-openmoko-theme-standard ?= "2370" SRCREV_pn-openmoko-theme-standard-qvga ?= "2370" SRCREV_pn-openmoko-theme-standard2 ?= "2964" -- cgit v1.2.3 From 27ab7ce48eec89445196c7aa1ca9de605a959ca2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 14 Sep 2007 22:07:43 +0000 Subject: Delete the fcntl2 patch. Its committed upstream. --- packages/glibc/eglibc-svn/export-fcntl2.patch | 11 ----------- packages/glibc/eglibc_svn.bb | 1 - 2 files changed, 12 deletions(-) delete mode 100644 packages/glibc/eglibc-svn/export-fcntl2.patch diff --git a/packages/glibc/eglibc-svn/export-fcntl2.patch b/packages/glibc/eglibc-svn/export-fcntl2.patch deleted file mode 100644 index 0bf6c57852..0000000000 --- a/packages/glibc/eglibc-svn/export-fcntl2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libc/io/Makefile.orig 2007-08-07 17:41:33.000000000 -0700 -+++ libc/io/Makefile 2007-08-07 17:42:25.000000000 -0700 -@@ -23,7 +23,7 @@ subdir := io - - headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \ - sys/statvfs.h bits/statvfs.h fcntl.h sys/fcntl.h bits/fcntl.h \ -- poll.h sys/poll.h bits/poll.h \ -+ poll.h sys/poll.h bits/poll.h bits/fcntl2.h \ - utime.h ftw.h fts.h sys/sendfile.h - - routines := \ diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index 0b69283681..1fe67d46fe 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -5,7 +5,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.6+svnr${SRCREV}" PR = "r1" SRC_URI = "svn://svn.eglibc.org;module=trunk \ - file://export-fcntl2.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/trunk/libc" -- cgit v1.2.3 From c3108f77dd5f260dbc7eb4f119301601a4dbc522 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 14 Sep 2007 22:46:24 +0000 Subject: openocd: Converted to SRCREV and added to *-*revs?.inc --- conf/distro/include/insane-srcrevs.inc | 2 ++ conf/distro/include/moko-autorev.inc | 2 ++ conf/distro/include/sane-srcrevs.inc | 2 ++ packages/openocd/openocd_svn.bb | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc index bbb62b9398..14d6336b96 100644 --- a/conf/distro/include/insane-srcrevs.inc +++ b/conf/distro/include/insane-srcrevs.inc @@ -70,6 +70,8 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}" SRCREV_pn-openmoko-today ?= "${AUTOREV}" SRCREV_pn-openmoko-today2 ?= "${AUTOREV}" SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}" +SRCREV_pn-openocd ?= "${AUTOREV}" +SRCREV_pn-openocd-native ?= "${AUTOREV}" SRCREV_pn-psplash ?= "${AUTOREV}" SRCREV_pn-settings-daemon ?= "${AUTOREV}" SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 5206d26cdd..59024535f0 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -49,3 +49,5 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}" SRCREV_pn-openmoko-today ?= "${AUTOREV}" SRCREV_pn-openmoko-today2 ?= "${AUTOREV}" SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}" +SRCREV_pn-openocd ?= "${AUTOREV}" +SRCREV_pn-openocd-native ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 145e97e1c1..1d9140b026 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -80,6 +80,8 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964" SRCREV_pn-openmoko-today ?= "2556" SRCREV_pn-openmoko-today2 ?= "2955" SRCREV_pn-openmoko-today2-folders ?= "2680" +SRCREV_pn-openocd ?= "206" +SRCREV_pn-openocd-native ?= "206" SRCREV_pn-psplash ?= "249" SRCREV_pn-settings-daemon ?= "1615" SRCREV_pn-sjf2410-linux-native ?= "933" diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb index 9824fd3d79..2815324521 100644 --- a/packages/openocd/openocd_svn.bb +++ b/packages/openocd/openocd_svn.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing" HOMEPAGE = "http://openocd.berlios.de/" LICENSE = "GPL" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+r${SRCREV}" +PR = "r1" inherit autotools -- cgit v1.2.3 From 186a45fd71bcccee57ff9db736461c41cc07dce4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 15 Sep 2007 07:11:49 +0000 Subject: sane-srcrevs: fix webkit entry, it uses SRCREV_FORMAT, which the generator script doesn't pickup --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 1d9140b026..04fa08c1f4 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -86,5 +86,5 @@ SRCREV_pn-psplash ?= "249" SRCREV_pn-settings-daemon ?= "1615" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "44" -SRCREV_pn-webkit-gtk ?= "25507" +SRCREV_pn-webkit-gtk ?= "25582-r25571" SRCREV_pn-xoo ?= "1623" -- cgit v1.2.3 From bed278e04d2202cc4f83ce84bc688cb286c0ca25 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 15 Sep 2007 07:43:27 +0000 Subject: h2200 defconfig: CONFIG_TOUCHSCREEN_ADC=y --- packages/linux/linux-handhelds-2.6/h2200/defconfig | 2 +- packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6/h2200/defconfig index 9b72b0bd9d..0f122c023c 100644 --- a/packages/linux/linux-handhelds-2.6/h2200/defconfig +++ b/packages/linux/linux-handhelds-2.6/h2200/defconfig @@ -864,7 +864,7 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set -# CONFIG_TOUCHSCREEN_ADC is not set +CONFIG_TOUCHSCREEN_ADC=y CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=y # CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_INPUT_MISC=y diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb index b34d4630a0..ec5844bfb5 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From eb968b7b4d2633cd9d3a952d0f6bfa11e7ba8f63 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 15 Sep 2007 08:08:05 +0000 Subject: gconf-dbus: DEPENDS += virtual/libintl --- packages/gnome/gconf-dbus_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index 5a5e78a207..fce1746b22 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -1,5 +1,5 @@ SECTION = "x11/utils" -DEPENDS = "intltool-native glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native" +DEPENDS = "intltool-native virtual/libintl glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native" DESCRIPTION = "Settings daemon using DBUS for communication." LICENSE = "GPL" PROVIDES = "gconf" -- cgit v1.2.3 From dcdf8689c0589d5f18dd5770b4c8a2e8af09696a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 15 Sep 2007 13:12:59 +0000 Subject: glibc-package.bbclass: fix do_prep_locale_tree * there are both libgcc_s.so and libgcc_s.so.${someversion} in ${CROSS_DIR}/${TARGET_SYS}/lib --- packages/glibc/glibc-package.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 63feb46f34..ba105d02c3 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -147,8 +147,11 @@ do_prep_locale_tree() { gunzip $i done ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib - if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then - cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib + if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then + cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib + fi + if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then + cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib fi install -m 0755 ${D}${bindir}/localedef $treedir/bin } -- cgit v1.2.3 From cfcea6955f995b66b7835cbbcb8ed5d5d5beed06 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 15 Sep 2007 14:18:03 +0000 Subject: pointercal: add file for a780 --- packages/pointercal/files/a780/.mtn2git_empty | 0 packages/pointercal/files/a780/pointercal | 1 + packages/pointercal/pointercal_0.0.bb | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 packages/pointercal/files/a780/.mtn2git_empty create mode 100644 packages/pointercal/files/a780/pointercal diff --git a/packages/pointercal/files/a780/.mtn2git_empty b/packages/pointercal/files/a780/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/pointercal/files/a780/pointercal b/packages/pointercal/files/a780/pointercal new file mode 100644 index 0000000000..8b0651dd21 --- /dev/null +++ b/packages/pointercal/files/a780/pointercal @@ -0,0 +1 @@ +-19857 -412 18085522 189 -23922 22734294 65536 diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb index 87e4acafb9..a50281b682 100644 --- a/packages/pointercal/pointercal_0.0.bb +++ b/packages/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -PR = "r2" +PR = "r3" SRC_URI = "file://pointercal" S = "${WORKDIR}" -- cgit v1.2.3 From 93482d727f92786b8d160805902a2db39997a002 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 15 Sep 2007 14:57:12 +0000 Subject: kdrive-1.3-18bpp.patch: add, but not activate a patch to have 18bpp support in kdrive 1.3 * people with 18bpp hardware (motorola a1200, motorola rokre6, gumstix lcd) should test this and activate it if it works --- .../xserver-kdrive-1.3.0.0/kdrive-1.3-18bpp.patch | 419 +++++++++++++++++++++ 1 file changed, 419 insertions(+) create mode 100644 packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-1.3-18bpp.patch diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-1.3-18bpp.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-1.3-18bpp.patch new file mode 100644 index 0000000000..714536934c --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kdrive-1.3-18bpp.patch @@ -0,0 +1,419 @@ +diff -Nurd xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c xorg-server-1.3.0.0.patched/hw/kdrive/fbdev/fbdev.c +--- xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2006-11-16 19:01:23.000000000 +0100 ++++ xorg-server-1.3.0.0.patched/hw/kdrive/fbdev/fbdev.c 2007-09-15 16:53:20.152045000 +0200 +@@ -213,6 +213,24 @@ + + /* Now get the new screeninfo */ + ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var); ++ /* Special treatment of 18bpp */ ++ if ((priv->var.red.length == 6) && (priv->var.green.length == 6) && ++ (priv->var.blue.length == 6)) ++ { ++ priv->var.red.length = 8; ++ if (priv->var.red.offset != 0) ++ priv->var.red.offset = 16; ++ priv->var.green.length = 8; ++ priv->var.green.offset = 8; ++ priv->var.blue.length = 8; ++ if (priv->var.blue.offset != 0) ++ priv->var.blue.offset = 16; ++ priv->var.bits_per_pixel = 32; ++ priv->Have18Bpp = TRUE; ++ } ++ else ++ priv->Have18Bpp = FALSE; ++ + depth = priv->var.bits_per_pixel; + gray = priv->var.grayscale; + +@@ -334,7 +352,7 @@ + KdMouseMatrix m; + FbdevPriv *priv = screen->card->driver; + +- if (scrpriv->randr != RR_Rotate_0) ++ if (scrpriv->randr != RR_Rotate_0 || priv->Have18Bpp) + scrpriv->shadow = TRUE; + else + scrpriv->shadow = FALSE; +@@ -398,6 +416,354 @@ + return TRUE; + } + ++void ++shadowUpdatePacked18 (ScreenPtr pScreen, ++ shadowBufPtr pBuf) ++{ ++ RegionPtr damage = shadowDamage (pBuf); ++ PixmapPtr pShadow = pBuf->pPixmap; ++ int nbox = REGION_NUM_RECTS (damage); ++ BoxPtr pbox = REGION_RECTS (damage); ++ FbBits *shaBase, *shaLine, *sha; ++ FbStride shaStride; ++ int scrBase, scrLine, scr; ++ int shaBpp; ++ int shaXoff, shaYoff; /* XXX assumed to be zero */ ++ int x, y, w, h, width; ++ int i; ++ char *winBase = NULL, *win; ++ CARD32 winSize; ++ ++ fbGetDrawable (&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff, shaYoff); ++ while (nbox--) ++ { ++ x = pbox->x1 * shaBpp; ++ y = pbox->y1; ++ w = (pbox->x2 - pbox->x1) * shaBpp; ++ h = pbox->y2 - pbox->y1; ++ ++ scrLine = (x >> FB_SHIFT); ++ shaLine = shaBase + y * shaStride + (x >> FB_SHIFT); ++ ++ x &= FB_MASK; ++ w = (w + x + FB_MASK) >> FB_SHIFT; ++ ++ while (h--) ++ { ++ winSize = 0; ++ scrBase = 0; ++ width = w; ++ scr = scrLine; ++ sha = shaLine; ++ while (width) { ++ /* how much remains in this window */ ++ i = scrBase + winSize - scr; ++ if (i <= 0 || scr < scrBase) ++ { ++ winBase = (char *) (*pBuf->window) (pScreen, ++ y, ++ scr * 3, ++ SHADOW_WINDOW_WRITE, ++ &winSize, ++ pBuf->closure); ++ if(!winBase) ++ return; ++ scrBase = scr; ++ winSize /= 3; ++ i = winSize; ++ } ++ win = winBase + (scr - scrBase); ++ if (i > width) ++ i = width; ++ width -= i; ++ scr += i; ++#define PickBit(a,i) (((a) >> (i)) & 1) ++ while (i--) ++ { ++ FbBits bits = *sha++; ++ *win++ = ((bits & 0xFC) >> 2) | ++ ((bits & 0xC00) >> 4); ++ *win++ = ((bits & 0xF000) >> 12) | ++ ((bits & 0x3C0000) >> 14); ++ *win++ = (bits & 0xC00000) >> 22; ++ } ++ } ++ shaLine += shaStride; ++ y++; ++ } ++ pbox++; ++ } ++} ++ ++#define LEFT_TO_RIGHT 1 ++#define RIGHT_TO_LEFT -1 ++#define TOP_TO_BOTTOM 2 ++#define BOTTOM_TO_TOP -2 ++ ++void ++shadowUpdateRotatePacked18 (ScreenPtr pScreen, ++ shadowBufPtr pBuf) ++{ ++ RegionPtr damage = shadowDamage (pBuf); ++ PixmapPtr pShadow = pBuf->pPixmap; ++ int nbox = REGION_NUM_RECTS (damage); ++ BoxPtr pbox = REGION_RECTS (damage); ++ FbBits *shaBits; ++ FbStride shaStride; ++ int shaBpp; ++ int shaXoff, shaYoff; ++ int box_x1, box_x2, box_y1, box_y2; ++ int sha_x1 = 0, sha_y1 = 0; ++ int scr_x1 = 0, scr_x2 = 0, scr_y1 = 0, scr_y2 = 0, scr_w, scr_h; ++ int scr_x, scr_y; ++ int w; ++ int pixelsPerBits; ++ int pixelsMask; ++ FbStride shaStepOverY = 0, shaStepDownY = 0; ++ FbStride shaStepOverX = 0, shaStepDownX = 0; ++ FbBits *shaLine, *sha; ++ int shaHeight = pShadow->drawable.height; ++ int shaWidth = pShadow->drawable.width; ++ FbBits shaMask; ++ int shaFirstShift, shaShift; ++ int o_x_dir; ++ int o_y_dir; ++ int x_dir; ++ int y_dir; ++ ++ fbGetDrawable (&pShadow->drawable, shaBits, shaStride, shaBpp, shaXoff, shaYoff); ++ pixelsPerBits = (sizeof (FbBits) * 8) / shaBpp; ++ pixelsMask = ~(pixelsPerBits - 1); ++ shaMask = FbBitsMask (FB_UNIT-shaBpp, shaBpp); ++ /* ++ * Compute rotation related constants to walk the shadow ++ */ ++ o_x_dir = LEFT_TO_RIGHT; ++ o_y_dir = TOP_TO_BOTTOM; ++ if (pBuf->randr & SHADOW_REFLECT_X) ++ o_x_dir = -o_x_dir; ++ if (pBuf->randr & SHADOW_REFLECT_Y) ++ o_y_dir = -o_y_dir; ++ switch (pBuf->randr & (SHADOW_ROTATE_ALL)) { ++ case SHADOW_ROTATE_0: /* upper left shadow -> upper left screen */ ++ default: ++ x_dir = o_x_dir; ++ y_dir = o_y_dir; ++ break; ++ case SHADOW_ROTATE_90: /* upper right shadow -> upper left screen */ ++ x_dir = o_y_dir; ++ y_dir = -o_x_dir; ++ break; ++ case SHADOW_ROTATE_180: /* lower right shadow -> upper left screen */ ++ x_dir = -o_x_dir; ++ y_dir = -o_y_dir; ++ break; ++ case SHADOW_ROTATE_270: /* lower left shadow -> upper left screen */ ++ x_dir = -o_y_dir; ++ y_dir = o_x_dir; ++ break; ++ } ++ switch (x_dir) { ++ case LEFT_TO_RIGHT: ++ shaStepOverX = shaBpp; ++ shaStepOverY = 0; ++ break; ++ case TOP_TO_BOTTOM: ++ shaStepOverX = 0; ++ shaStepOverY = shaStride; ++ break; ++ case RIGHT_TO_LEFT: ++ shaStepOverX = -shaBpp; ++ shaStepOverY = 0; ++ break; ++ case BOTTOM_TO_TOP: ++ shaStepOverX = 0; ++ shaStepOverY = -shaStride; ++ break; ++ } ++ switch (y_dir) { ++ case TOP_TO_BOTTOM: ++ shaStepDownX = 0; ++ shaStepDownY = shaStride; ++ break; ++ case RIGHT_TO_LEFT: ++ shaStepDownX = -shaBpp; ++ shaStepDownY = 0; ++ break; ++ case BOTTOM_TO_TOP: ++ shaStepDownX = 0; ++ shaStepDownY = -shaStride; ++ break; ++ case LEFT_TO_RIGHT: ++ shaStepDownX = shaBpp; ++ shaStepDownY = 0; ++ break; ++ } ++ ++ while (nbox--) ++ { ++ box_x1 = pbox->x1; ++ box_y1 = pbox->y1; ++ box_x2 = pbox->x2; ++ box_y2 = pbox->y2; ++ pbox++; ++ ++ /* ++ * Compute screen and shadow locations for this box ++ */ ++ switch (x_dir) { ++ case LEFT_TO_RIGHT: ++ scr_x1 = box_x1 & pixelsMask; ++ scr_x2 = (box_x2 + pixelsPerBits - 1) & pixelsMask; ++ ++ sha_x1 = scr_x1; ++ break; ++ case TOP_TO_BOTTOM: ++ scr_x1 = box_y1 & pixelsMask; ++ scr_x2 = (box_y2 + pixelsPerBits - 1) & pixelsMask; ++ ++ sha_y1 = scr_x1; ++ break; ++ case RIGHT_TO_LEFT: ++ scr_x1 = (shaWidth - box_x2) & pixelsMask; ++ scr_x2 = (shaWidth - box_x1 + pixelsPerBits - 1) & pixelsMask; ++ ++ sha_x1 = (shaWidth - scr_x1 - 1); ++ break; ++ case BOTTOM_TO_TOP: ++ scr_x1 = (shaHeight - box_y2) & pixelsMask; ++ scr_x2 = (shaHeight - box_y1 + pixelsPerBits - 1) & pixelsMask; ++ ++ sha_y1 = (shaHeight - scr_x1 - 1); ++ break; ++ } ++ switch (y_dir) { ++ case TOP_TO_BOTTOM: ++ scr_y1 = box_y1; ++ scr_y2 = box_y2; ++ ++ sha_y1 = scr_y1; ++ break; ++ case RIGHT_TO_LEFT: ++ scr_y1 = (shaWidth - box_x2); ++ scr_y2 = (shaWidth - box_x1); ++ ++ sha_x1 = box_x2 - 1; ++ break; ++ case BOTTOM_TO_TOP: ++ scr_y1 = shaHeight - box_y2; ++ scr_y2 = shaHeight - box_y1; ++ ++ sha_y1 = box_y2 - 1; ++ break; ++ case LEFT_TO_RIGHT: ++ scr_y1 = box_x1; ++ scr_y2 = box_x2; ++ ++ sha_x1 = box_x1; ++ break; ++ } ++ scr_w = ((scr_x2 - scr_x1) * shaBpp) >> FB_SHIFT; ++ scr_h = scr_y2 - scr_y1; ++ scr_y = scr_y1; ++ ++ /* shift amount for first pixel on screen */ ++ shaFirstShift = FB_UNIT - ((sha_x1 * shaBpp) & FB_MASK) - shaBpp; ++ ++ /* pointer to shadow data first placed on screen */ ++ shaLine = (shaBits + ++ sha_y1 * shaStride + ++ ((sha_x1 * shaBpp) >> FB_SHIFT)); ++ ++ /* ++ * Copy the bits, always write across the physical frame buffer ++ * to take advantage of write combining. ++ */ ++ while (scr_h--) ++ { ++ int p; ++ FbBits bits; ++ char *win; ++ int i; ++ CARD32 winSize; ++ ++ sha = shaLine; ++ shaShift = shaFirstShift; ++ w = scr_w; ++ scr_x = scr_x1 * shaBpp >> FB_SHIFT; ++ ++ while (w) ++ { ++ /* ++ * Map some of this line ++ */ ++ win = (char *) (*pBuf->window) (pScreen, ++ scr_y, ++ scr_x * 3, ++ SHADOW_WINDOW_WRITE, ++ &winSize, ++ pBuf->closure); ++ i = winSize / 3; ++ if (i > w) ++ i = w; ++ w -= i; ++ scr_x += i; ++ /* ++ * Copy the portion of the line mapped ++ */ ++ while (i--) ++ { ++ bits = 0; ++ p = pixelsPerBits; ++ /* ++ * Build one word of output from multiple inputs ++ * ++ * Note that for 90/270 rotations, this will walk ++ * down the shadow hitting each scanline once. ++ * This is probably not very efficient. ++ */ ++ while (p--) ++ { ++ bits = FbScrLeft(bits, shaBpp); ++ bits |= FbScrRight (*sha, shaShift) & shaMask; ++ ++ shaShift -= shaStepOverX; ++ if (shaShift >= FB_UNIT) ++ { ++ shaShift -= FB_UNIT; ++ sha--; ++ } ++ else if (shaShift < 0) ++ { ++ shaShift += FB_UNIT; ++ sha++; ++ } ++ sha += shaStepOverY; ++ } ++ *win++ = ((bits & 0xFC) >> 2) | ++ ((bits & 0xC00) >> 4); ++ *win++ = ((bits & 0xF000) >> 12) | ++ ((bits & 0x3C0000) >> 14); ++ *win++ = (bits & 0xC00000) >> 22; ++ } ++ } ++ scr_y++; ++ shaFirstShift -= shaStepDownX; ++ if (shaFirstShift >= FB_UNIT) ++ { ++ shaFirstShift -= FB_UNIT; ++ shaLine--; ++ } ++ else if (shaFirstShift < 0) ++ { ++ shaFirstShift += FB_UNIT; ++ shaLine++; ++ } ++ shaLine += shaStepDownY; ++ } ++ } ++} ++ + Bool + fbdevSetShadow (ScreenPtr pScreen) + { +@@ -418,7 +784,14 @@ + + window = fbdevWindowLinear; + update = 0; +- if (scrpriv->randr) ++ if (priv->Have18Bpp) ++ { ++ if (scrpriv->randr != RR_Rotate_0) ++ update = shadowUpdateRotatePacked18; ++ else ++ update = shadowUpdatePacked18; ++ } ++ else if (scrpriv->