diff options
45 files changed, 20711 insertions, 86 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index a6f06f0dc9..cfa44f1360 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9118,6 +9118,10 @@ sha256=559b5d857b4fbc31418bc677f3391182ba1c357cabb8dfee04a1e709a7a63d01 md5=e5dcae40b2c291126843680dbed924a8 sha256=ede0203f1eec22b3ed4a91c7b769e437859e5bc4b89a8f8e80b3f7ca62317098 +[http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.28/gnome-python-2.28.0.tar.bz2] +md5=b627abbb0ed912e221cc072e3dd6f9d6 +sha256=f2c984587450086dff8eb0a72a8d8c616d51fecfcc790601c35641be140efa0c + [http://ftp.gnome.org/pub/GNOME/sources/gnome-python-desktop/2.23/gnome-python-desktop-2.23.0.tar.bz2] md5=d8f8e61d99402e8b0a82d3c8d6e873be sha256=7ad66f99a1bad1ae0bbb02bd7a7cf8ed17fdc3fd104fa5c68e04961459ad5c50 @@ -21790,6 +21794,10 @@ sha256=c746693328bfed7838a1f3bfac41b13d7f39a81ac961559cd0daf700fc677da7 md5=431e7d4632163b93d1ee43cd071a389c sha256=db0ab6f998bc5750aba2dfa96c8932f673914d8bf804a2c1c769b4a6e3f192d2 +[ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.20/pygobject-2.20.0.tar.bz2] +md5=10e1fb79be3d698476a28b1e1b0c5640 +sha256=41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81 + [http://downloads.sourceforge.net/pygoogle/pygoogle-0.6.tar.gz] md5=334e2d9e5a765ffa9769e2c4cdfcd110 sha256=ad3f4530977a15e52b379ef301a4a80cf69a883f24dd6cebc5b47b3009c092a4 diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 36c556a679..0bce352a7a 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -28,8 +28,8 @@ PREFERRED_VERSION_pango = "1.24.4" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" -PREFERRED_VERSION_python = "2.6.1" -PREFERRED_VERSION_samba = "3.3.0" +PREFERRED_VERSION_python = "2.6.2" +PREFERRED_VERSION_samba = "3.3.9" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" PREFERRED_VERSION_udev = "141" diff --git a/recipes/angstrom/angstrom-led-config.bb b/recipes/angstrom/angstrom-led-config.bb index 464979b39c..2dbfd01952 100644 --- a/recipes/angstrom/angstrom-led-config.bb +++ b/recipes/angstrom/angstrom-led-config.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Configuration files for runtime LED configuration" #PV = "${DISTRO_VERSION}" -PR = "r5" +PR = "r6" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit update-rc.d diff --git a/recipes/angstrom/angstrom-led-config/omap3-pandora/leds b/recipes/angstrom/angstrom-led-config/omap3-pandora/leds new file mode 100644 index 0000000000..7d20e14c27 --- /dev/null +++ b/recipes/angstrom/angstrom-led-config/omap3-pandora/leds @@ -0,0 +1,8 @@ +#file format: name trigger +pandora::keypad_bl +pandora::power default-on +pandora::charger +pandora::sd1 mmc0 +pandora::sd2 mmc1 +pandora::bluetooth bluetooth +pandora::wifi wifi
\ No newline at end of file diff --git a/recipes/aufs/aufs_cvs.bb b/recipes/aufs/aufs_cvs.bb index 815a24fda4..6a0e952379 100644 --- a/recipes/aufs/aufs_cvs.bb +++ b/recipes/aufs/aufs_cvs.bb @@ -2,7 +2,6 @@ DESCRIPTION = "Aufs is a stackable unification filesystem such as Unionfs, which HOMEPAGE = "http://aufs.sourceforge.net/" LICENSE = "GPL" PV = "cvs${SRCDATE}" -PR = "r3" RSUGGESTS_${PN} = "${PN}-tools" @@ -12,6 +11,8 @@ S = "${WORKDIR}/aufs" SRC_URI = "cvs://anonymous@aufs.cvs.sourceforge.net/cvsroot/aufs;module=aufs;date=${SRCDATE}" +TARGET_CC_ARCH += "${LDFLAGS}" + EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} -f local.mk" # We need to check the architecture and the kernel version to @@ -42,6 +43,10 @@ do_compile_prepend() { cd ${S} } +do_compile(){ + LDFLAGS="" + oe_runmake +} do_install() { install -d ${D}/${sbindir} @@ -52,7 +57,6 @@ do_install() { install -m 0644 aufs.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/extra/ } - FILES_${PN} = "/lib/modules" PACKAGES += "${PN}-tools" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes/base-files/base-files/omap3-pandora/fstab b/recipes/base-files/base-files/omap3-pandora/fstab new file mode 100644 index 0000000000..a4c86104e1 --- /dev/null +++ b/recipes/base-files/base-files/omap3-pandora/fstab @@ -0,0 +1,13 @@ +# stock fstab - you probably want to override this with a machine specific one + +rootfs / auto defaults,noatime 1 1 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 +usbfs /proc/bus/usb usbfs defaults 0 0 +tmpfs /var/volatile tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /media/ram tmpfs defaults 0 0 + +# uncomment this if your device has a SD/MMC/Transflash slot +#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 + diff --git a/recipes/base-files/base-files/omap3-pandora/profile b/recipes/base-files/base-files/omap3-pandora/profile new file mode 100644 index 0000000000..5797535093 --- /dev/null +++ b/recipes/base-files/base-files/omap3-pandora/profile @@ -0,0 +1,34 @@ +# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) +# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). + +PATH="/usr/local/bin:/usr/bin:/bin" +EDITOR="/bin/vi" # needed for packages like cron +test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. + +if [ ! -e /etc/localtime ]; then + TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html + # for an explanation of how to set this to your local timezone. + export TZ +fi + +if [ "`id -u`" -eq 0 ]; then + PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin: +fi +if [ "$PS1" ]; then +# works for bash and ash (no other shells known to be in use here) + PS1='\u@\h:\w\$ ' +fi + +if [ -d /etc/profile.d ]; then + for i in /etc/profile.d/*.sh; do + if [ -r $i ]; then + . $i + fi + done + unset i +fi + +export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM + +umask 022 + diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb index 5e78797e2a..483aef7ecd 100644 --- a/recipes/base-files/base-files_3.0.14.bb +++ b/recipes/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r88" +PR = "r89" LICENSE = "GPL" SRC_URI = " \ diff --git a/recipes/devicekit/devicekit-power_009.bb b/recipes/devicekit/devicekit-power_009.bb index 58f638cbf2..0622d4aa7c 100644 --- a/recipes/devicekit/devicekit-power_009.bb +++ b/recipes/devicekit/devicekit-power_009.bb @@ -7,6 +7,10 @@ S = "${WORKDIR}/DeviceKit-power-${PV}" inherit autotools pkgconfig +do_configure_prepend() { + sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am +} + do_stage() { autotools_stage_all } diff --git a/recipes/devicekit/devicekit_003.bb b/recipes/devicekit/devicekit_003.bb index a57ca88675..3439290b07 100644 --- a/recipes/devicekit/devicekit_003.bb +++ b/recipes/devicekit/devicekit_003.bb @@ -2,13 +2,16 @@ DESCRIPTION = "DeviceKit is a simple system service that a) can enumerate device LICENSE = "GPLv2" DEPENDS = "udev dbus-glib glib-2.0" +PR = "r1" + SRC_URI = "http://hal.freedesktop.org/releases/DeviceKit-${PV}.tar.gz" S = "${WORKDIR}/DeviceKit-${PV}" +do_configure_prepend() { + sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am +} + inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" FILES_${PN} += "${datadir}/dbus-1/" - - - diff --git a/recipes/fbset/fbset-modes.bb b/recipes/fbset/fbset-modes.bb index 403751c90a..0f57609ab7 100644 --- a/recipes/fbset/fbset-modes.bb +++ b/recipes/fbset/fbset-modes.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Default display timings and resolutions for fbset" PV = "0.1.0" -PR = "r3" +PR = "r4" SRC_URI = "file://fb.modes" diff --git a/recipes/fbset/fbset-modes/omap3-pandora/fb.modes b/recipes/fbset/fbset-modes/omap3-pandora/fb.modes new file mode 100644 index 0000000000..0c87401b5f --- /dev/null +++ b/recipes/fbset/fbset-modes/omap3-pandora/fb.modes @@ -0,0 +1,6 @@ +mode "800x480-65" + # D: 36.001 MHz, H: 34.124 kHz, V: 64.998 Hz + geometry 800 480 800 480 16 + timings 27777 40 214 10 34 1 1 + rgba 5/11,6/5,5/0,0/0 +endmode diff --git a/recipes/gnome/gnome-python_2.26.1.bb b/recipes/gnome/gnome-python_2.26.1.bb index 1027437b7a..54523f898f 100644 --- a/recipes/gnome/gnome-python_2.26.1.bb +++ b/recipes/gnome/gnome-python_2.26.1.bb @@ -3,13 +3,18 @@ LICENSE = "LGPL" DEPENDS = "libgnomeui pyorbit python-pygtk" RDEPENDS = "pyorbit" +PR = "r1" + inherit gnome distutils-base pkgconfig -do_configure() { - sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac - export HOST_SYS=${HOST_SYS} - export BUILD_SYS=${BUILD_SYS} - autotools_do_configure + +do_configure_prepend() { + export HOST_SYS=${HOST_SYS} + export BUILD_SYS=${BUILD_SYS} + sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=defsdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=argtypesdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/argtypes/\":g \ + ${S}/configure.ac } do_stage() { diff --git a/recipes/gnome/gnome-python_2.28.0.bb b/recipes/gnome/gnome-python_2.28.0.bb new file mode 100644 index 0000000000..54523f898f --- /dev/null +++ b/recipes/gnome/gnome-python_2.28.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "GNOME Python miscellaneous bindings" +LICENSE = "LGPL" +DEPENDS = "libgnomeui pyorbit python-pygtk" +RDEPENDS = "pyorbit" + +PR = "r1" + +inherit gnome distutils-base pkgconfig + + +do_configure_prepend() { + export HOST_SYS=${HOST_SYS} + export BUILD_SYS=${BUILD_SYS} + sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=defsdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=argtypesdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/argtypes/\":g \ + ${S}/configure.ac +} + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${datadir}" +FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug" + + diff --git a/recipes/keymaps/files/omap3-pandora/keymap-extension-2.6.map b/recipes/keymaps/files/omap3-pandora/keymap-extension-2.6.map new file mode 100644 index 0000000000..05e0b7b0cf --- /dev/null +++ b/recipes/keymaps/files/omap3-pandora/keymap-extension-2.6.map @@ -0,0 +1,192 @@ +keymaps 0-2,4,8,12 + +# Notes: +# FN is setup as AltGr. +# AltGr locking not yet working. + +# Default Shift AltGr Control Alt Ctrl+Alt + +# DPad/Buttons in keyboard mode (On Input2). + +# DPad - URDL +keycode 103 = Up Up Prior +keycode 106 = Right Right Incr_Console +keycode 108 = Down Down Next +keycode 105 = Left Left Decr_Console + +# Buttons - URDL +#keycode 307 = +#keycode 304 = +#keycode 305 = +#keycode 308 = + +# Left Trigger +#keycode 310 = + +# Right Trigger +#keycode 311 = + +# Special keys. +keycode 29 = Control +keycode 56 = Alt +keycode 464 = AltGr AltGr AltGr_Lock + + +keycode 14 = BackSpace Delete Insert + +keycode 28 = Return Return Return Return Return Return +keycode 40 = apostrophe quotedbl tilde +keycode 42 = Shift VoidSymbol Caps_Lock + +keycode 51 = comma less semicolon +keycode 52 = period greater colon + +keycode 53 = slash question Num_Lock + +keycode 57 = space bar Tab + + +# Number Bar + +keycode 2 = one VoidSymbol F1 +keycode 3 = two VoidSymbol F2 +keycode 4 = three VoidSymbol F3 +keycode 5 = four asciitilde F4 +keycode 6 = five VoidSymbol F5 +keycode 7 = six VoidSymbol F6 +keycode 8 = seven ampersand F7 +keycode 9 = eight asterisk F8 +keycode 10 = nine VoidSymbol F9 +keycode 11 = zero VoidSymbol F10 + + +# QWERTY Keypad + +keycode 16 = +q +Q Escape Control_q Meta_q +keycode 17 = +w +W at Control_w Meta_w +keycode 18 = +e +E three Control_e Meta_e +keycode 19 = +r +R four Control_r Meta_r +keycode 20 = +t +T five Control_t Meta_t +keycode 21 = +y +Y six Control_y Meta_y +keycode 22 = +u +U seven Control_u Meta_u +keycode 23 = +i +I eight Control_i Meta_i +keycode 24 = +o +O F11 Control_o Meta_o +keycode 25 = +p +P F12 Control_p Meta_p + +keycode 30 = +a +A exclam Control_a Meta_a +keycode 31 = +s +S quotedbl Control_s Meta_s +keycode 32 = +d +D numbersign Control_d Meta_d +keycode 33 = +f +F plus Control_f Meta_f +keycode 34 = +g +G equals Control_g Meta_g +keycode 35 = +h +H underscore Control_h Meta_h +keycode 36 = +j +J ampersand Control_j Meta_j +keycode 37 = +k +K sterling Control_k Meta_k +keycode 38 = +l +L yen Control_l Meta_l + +keycode 44 = +z +Z VoidSymbol Control_z Meta_z +keycode 45 = +x +X question Control_x Meta_x +keycode 46 = +c +C Control_c Control_c Meta_c +keycode 47 = +v +V Control_v Control_v Meta_v +keycode 48 = +b +B minus Control_b Meta_b +keycode 49 = +n +N dollar Control_n Meta_n +keycode 50 = +m +M equal Control_m Meta_m + + +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" +string F6 = "\033[17~" +string F7 = "\033[18~" +string F8 = "\033[19~" +string F9 = "\033[20~" +string F10 = "\033[21~" +string F11 = "\033[23~" +string F12 = "\033[24~" +string F13 = "\033[25~" +string F14 = "\033[26~" +string F15 = "\033[28~" +string F16 = "\033[29~" +string F17 = "\033[31~" +string F18 = "\033[32~" +string F19 = "\033[33~" +string F20 = "\033[34~" +string F33 = "\033[49~" +string Find = "\033[1~" +string Insert = "\033[2~" +string Remove = "\033[3~" +string Select = "\033[4~" +string Prior = "\033[5~" +string Next = "\033[6~" +string Macro = "\033[M" +string Pause = "\033[P" + +compose '`' 'A' to 'À' +compose '`' 'a' to 'à' +compose '\'' 'A' to 'Á' +compose '\'' 'a' to 'á' +compose '^' 'A' to 'Â' +compose '^' 'a' to 'â' +compose '~' 'A' to 'Ã' +compose '~' 'a' to 'ã' +compose '"' 'A' to 'Ä' +compose '"' 'a' to 'ä' +compose 'O' 'A' to 'Å' +compose 'o' 'a' to 'å' +compose '0' 'A' to 'Å' +compose '0' 'a' to 'å' +compose 'A' 'A' to 'Å' +compose 'a' 'a' to 'å' +compose 'A' 'E' to 'Æ' +compose 'a' 'e' to 'æ' +compose ',' 'C' to 'Ç' +compose ',' 'c' to 'ç' +compose '`' 'E' to 'È' +compose '`' 'e' to 'è' +compose '\'' 'E' to 'É' +compose '\'' 'e' to 'é' +compose '^' 'E' to 'Ê' +compose '^' 'e' to 'ê' +compose '"' 'E' to 'Ë' +compose '"' 'e' to 'ë' +compose '`' 'I' to 'Ì' +compose '`' 'i' to 'ì' +compose '\'' 'I' to 'Í' +compose '\'' 'i' to 'í' +compose '^' 'I' to 'Î' +compose '^' 'i' to 'î' +compose '"' 'I' to 'Ï' +compose '"' 'i' to 'ï' +compose '-' 'D' to 'Ð' +compose '-' 'd' to 'ð' +compose '~' 'N' to 'Ñ' +compose '~' 'n' to 'ñ' +compose '`' 'O' to 'Ò' +compose '`' 'o' to 'ò' +compose '\'' 'O' to 'Ó' +compose '\'' 'o' to 'ó' +compose '^' 'O' to 'Ô' +compose '^' 'o' to 'ô' +compose '~' 'O' to 'Õ' +compose '~' 'o' to 'õ' +compose '"' 'O' to 'Ö' +compose '"' 'o' to 'ö' +compose '/' 'O' to 'Ø' +compose '/' 'o' to 'ø' +compose '`' 'U' to 'Ù' +compose '`' 'u' to 'ù' +compose '\'' 'U' to 'Ú' +compose '\'' 'u' to 'ú' +compose '^' 'U' to 'Û' +compose '^' 'u' to 'û' +compose '"' 'U' to 'Ü' +compose '"' 'u' to 'ü' +compose '\'' 'Y' to 'Ý' +compose '\'' 'y' to 'ý' +compose 'T' 'H' to 'Þ' +compose 't' 'h' to 'þ' +compose 's' 's' to 'ß' +compose '"' 'y' to 'ÿ' +compose 's' 'z' to 'ß' +compose 'i' 'j' to 'ÿ' diff --git a/recipes/keymaps/keymaps_1.0.bb b/recipes/keymaps/keymaps_1.0.bb index 4a31fefd2b..3cd1f5a7f1 100644 --- a/recipes/keymaps/keymaps_1.0.bb +++ b/recipes/keymaps/keymaps_1.0.bb @@ -3,7 +3,7 @@ SECTION = "base" RDEPENDS_${PN} = "initscripts console-tools" LICENSE = "GPL" PACKAGE_ARCH = "${MACHINE}" -PR = "r21" +PR = "r23" inherit update-rc.d @@ -18,6 +18,7 @@ SRC_URI_append_poodle = " file://keymap-2.6.map" SRC_URI_append_h2200 = " file://keymap-2.6.map" SRC_URI_append_htcuniversal = " file://keymap-2.6.map" SRC_URI_append_qemux86 = " file://keymap-2.6.map" +SRC_URI_append_omap3-pandora = " file://keymap-extension-2.6.map" SRC_URI_append_jornada6xx = " file://keymap-620lx-660lx \ file://keymap-br.map \ @@ -35,7 +36,7 @@ do_install () { install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/ case ${MACHINE} in - c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200 | htcuniversal | qemux86 ) + c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200 | htcuniversal | qemux86 | omap3-pandora ) install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} ;; *) diff --git a/recipes/libsdl/libsdl-gfx_2.0.11.bb b/recipes/libsdl/libsdl-gfx_2.0.11.bb index 712675771a..265d694427 100644 --- a/recipes/libsdl/libsdl-gfx_2.0.11.bb +++ b/recipes/libsdl/libsdl-gfx_2.0.11.bb @@ -9,6 +9,8 @@ S = "${WORKDIR}/SDL_gfx-${PV}" inherit autotools +TARGET_CC_ARCH += "${LDFLAGS}" + EXTRA_OECONF = "--disable-mmx" do_stage() { diff --git a/recipes/netbase/netbase/omap3-pandora/hosts b/recipes/netbase/netbase/omap3-pandora/hosts index 04026bdd8d..fd8b774641 100644 --- a/recipes/netbase/netbase/omap3-pandora/hosts +++ b/recipes/netbase/netbase/omap3-pandora/hosts @@ -1,2 +1,2 @@ -127.0.0.1 localhost.localdomain localhost openpandora +127.0.0.1 localhost.localdomain localhost openpandora omap3-pandora diff --git a/recipes/pointercal/files/omap3-pandora/pointercal b/recipes/pointercal/files/omap3-pandora/pointercal Binary files differnew file mode 100644 index 0000000000..8052257fb2 --- /dev/null +++ b/recipes/pointercal/files/omap3-pandora/pointercal diff --git a/recipes/pointercal/pointercal_0.0.bb b/recipes/pointercal/pointercal_0.0.bb index d212817fc4..259ddcae17 100644 --- a/recipes/pointercal/pointercal_0.0.bb +++ b/recipes/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -PR = "r17" +PR = "r18" SRC_URI = "file://pointercal" S = "${WORKDIR}" diff --git a/recipes/psplash/psplash-omap3pandora/configurability.patch b/recipes/psplash/psplash-omap3pandora/configurability.patch new file mode 100644 index 0000000000..c9688655c9 --- /dev/null +++ b/recipes/psplash/psplash-omap3pandora/configurability.patch @@ -0,0 +1,290 @@ +Index: psplash/psplash.c +=================================================================== +--- psplash.orig/psplash.c 2007-12-06 11:14:23.000000000 +0000 ++++ psplash/psplash.c 2007-12-06 11:19:12.000000000 +0000 +@@ -44,17 +44,17 @@ + + /* Clear */ + +- psplash_fb_draw_rect (fb, +- 0, +- fb->height - (fb->height/6) - h, ++ psplash_fb_draw_rect (fb, ++ 0, ++ fb->height - (fb->height/PSPLASH_TEXT_DIVIDER) - h, + fb->width, + h, +- 0xec, 0xec, 0xe1); ++ PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B); + + psplash_fb_draw_text (fb, +- (fb->width-w)/2, +- fb->height - (fb->height/6) - h, +- 0x6d, 0x6d, 0x70, ++ (fb->width-w)/2, ++ fb->height - (fb->height/PSPLASH_TEXT_DIVIDER) - h, ++ PSPLASH_TEXT_COLOR_R, PSPLASH_TEXT_COLOR_G, PSPLASH_TEXT_COLOR_B, + &radeon_font, + msg); + } +@@ -66,36 +66,36 @@ + + /* 4 pix border */ + x = ((fb->width - BAR_IMG_WIDTH)/2) + 4 ; +- y = fb->height - (fb->height/6) + 4; +- width = BAR_IMG_WIDTH - 8; ++ y = fb->height - (fb->height/PSPLASH_PROGRESS_DIVIDER) + 4; ++ width = BAR_IMG_WIDTH - 8; + height = BAR_IMG_HEIGHT - 8; + + if (value > 0) + { + barwidth = (CLAMP(value,0,100) * width) / 100; +- psplash_fb_draw_rect (fb, x + barwidth, y, ++ psplash_fb_draw_rect (fb, x + barwidth, y, + width - barwidth, height, +- 0xec, 0xec, 0xe1); ++ PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B); + psplash_fb_draw_rect (fb, x, y, barwidth, +- height, 0x6d, 0x6d, 0x70); ++ height, PSPLASH_PROGRESS_COLOR_R, PSPLASH_PROGRESS_COLOR_G, PSPLASH_PROGRESS_COLOR_B); + } + else + { + barwidth = (CLAMP(-value,0,100) * width) / 100; +- psplash_fb_draw_rect (fb, x, y, ++ psplash_fb_draw_rect (fb, x, y, + width - barwidth, height, +- 0xec, 0xec, 0xe1); ++ PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B); + psplash_fb_draw_rect (fb, x + width - barwidth, + y, barwidth, height, +- 0x6d, 0x6d, 0x70); ++ PSPLASH_PROGRESS_COLOR_R, PSPLASH_PROGRESS_COLOR_G, PSPLASH_PROGRESS_COLOR_B); + } + +- DBG("value: %i, width: %i, barwidth :%i\n", value, ++ DBG("value: %i, width: %i, barwidth :%i\n", value, + width, barwidth); + } + +-static int +-parse_command (PSplashFB *fb, char *string, int length) ++static int ++parse_command (PSplashFB *fb, char *string, int length) + { + char *command; + int parsed=0; +@@ -103,21 +103,21 @@ + parsed = strlen(string)+1; + + DBG("got cmd %s", string); +- ++ + if (strcmp(string,"QUIT") == 0) + return 1; + + command = strtok(string," "); + +- if (!strcmp(command,"PROGRESS")) ++ if (!strcmp(command,"PROGRESS")) + { + psplash_draw_progress (fb, atoi(strtok(NULL,"\0"))); +- } +- else if (!strcmp(command,"MSG")) ++ } ++ else if (!strcmp(command,"MSG")) + { + psplash_draw_msg (fb, strtok(NULL,"\0")); +- } +- else if (!strcmp(command,"QUIT")) ++ } ++ else if (!strcmp(command,"QUIT")) + { + return 1; + } +@@ -125,8 +125,8 @@ + return 0; + } + +-void +-psplash_main (PSplashFB *fb, |