diff options
239 files changed, 13847 insertions, 1075 deletions
diff --git a/classes/efl1.bbclass b/classes/efl1.bbclass deleted file mode 100644 index 9fc5f2c44e..0000000000 --- a/classes/efl1.bbclass +++ /dev/null @@ -1,36 +0,0 @@ -inherit autotools pkgconfig - -do_prepsources () { - make clean distclean || true -} -addtask prepsources after do_fetch before do_unpack - -SECTION = "e/libs" -HOMEPAGE = "http://www.enlightenment.org" -SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}" -SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -libdirectory = "src/lib" -libraries = "lib${SRCNAME}" -headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h" - -def efl_is_native(d): - import bb - return ["","-native"][bb.data.inherits_class('native', d)] - -do_stage() { - autotools_stage_all -} - -efl_stage_bin() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - make DESTDIR="${STAGE_TEMP}" install - cp -pPR ${STAGE_TEMP}/${bindir}/* ${STAGING_BINDIR_CROSS} - rm -rf ${STAGE_TEMP} -} - -PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-examples" -FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig/* ${libdir}/lib*.?a ${libdir}/lib*.a" -FILES_${PN}-examples = "${bindir} ${datadir}" diff --git a/classes/efl_base.bbclass b/classes/efl_base.bbclass new file mode 100644 index 0000000000..7f170d70f2 --- /dev/null +++ b/classes/efl_base.bbclass @@ -0,0 +1,20 @@ +inherit autotools pkgconfig + +#do_prepsources () { +# make clean distclean || true +#} +#addtask prepsources after do_fetch before do_unpack + +SECTION = "e/libs" +HOMEPAGE = "http://www.enlightenment.org" +SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}" +SRC_URI = "http://download.enlightenment.org/snapshots/2007-07-10/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +do_stage() { + autotools_stage_all +} + +PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev" +FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig/* ${libdir}/lib*.?a ${libdir}/lib*.a" + diff --git a/classes/efl_library.bbclass b/classes/efl_library.bbclass new file mode 100644 index 0000000000..c2b6938e47 --- /dev/null +++ b/classes/efl_library.bbclass @@ -0,0 +1,9 @@ +inherit efl_base + +SRC_URI = "${E_CVS};module=e17/libs/${SRCNAME}" +S = "${WORKDIR}/${SRCNAME}" + +PACKAGES =+ "${PN}-tests" +FILES_${PN}-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}" +FILES_${PN}-dev += "${bindir}/*-config ${libdir}/${PN}/*.a ${libdir}/${PN}/*.la ${libdir}/${PN}/*/*.a ${libdir}/${PN}/*/*.la" +FILES_${PN} = "${libdir}/*.so*" diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass index 1b87004143..e3c92b8572 100644 --- a/classes/rm_work.bbclass +++ b/classes/rm_work.bbclass @@ -18,5 +18,12 @@ do_rm_work () { done } +addtask rmall after do_rm_work +do_rmall[recrdeptask] = "do_rm_work" +do_rmall() { + : +} + + addtask rm_work before do_build addtask rm_work after do_populate_staging diff --git a/conf/checksums.ini b/conf/checksums.ini index 219fb74b0c..37beaf8349 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3986,14 +3986,6 @@ sha256=cc70d2ff8a2cafe3c7cce10dc5e90146111bc686ed6e08fc753e950c7050611e md5=bed4259905a7d7bc070c6319142b2075 sha256=bfa7def7d0f1190a111bde232920d2b3481d3932e2d1056573b3a9c4801c602a -[http://ftp.funet.fi/pub/CPAN/src/perl-5.8.4.tar.gz] -md5=912050a9cb6b0f415b76ba56052fb4cf -sha256=89dcc463f88e0b785ee2cf2662d97c6b7d045393283664876370970a09b8cbef - -[http://ftp.funet.fi/pub/CPAN/src/perl-5.8.7.tar.gz] -md5=dacefa1fe3c5b6d7bbc334ad94826131 -sha256=916d7e1393ed09ca4c61b3c1ecb5f5564266c955db81ff587d2da8af7a7abaab - [http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-2.6.1.tar.bz2] md5=194fab4e2e87c7ae3c7fea926fd281bc sha256=31d894960e0d2eba8fa2746e4fde31983a1e49dc856a880adb59d5f251a690cf diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 52a475f8f6..34a02514d3 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -98,6 +98,7 @@ PACKAGE_EXTRA_ARCHS_collie = "arm-oabi" PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi" PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi" PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi" +PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi" FEED_URIS += " \ no-arch##${ANGSTROM_URI}/unstable/feed/all \ @@ -127,7 +128,7 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh11" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh12" RDEPENDS_kernel-base_hx4700 = "" RDEPENDS_kernel-base_htcuniversal = "" @@ -149,6 +150,10 @@ PREFERRED_VERSION_pango = "1.16.4" PREFERRED_VERSION_atk = "1.10.3" PREFERRED_VERSION_gtk+ = "2.10.12" +# newer poppler cvs breaks some apps, fix until popper 6 and apps +# catch up with api changes +PREFERRED_VERSION_poppler = "0.5.4" + # older gtk-webcore releases don't work on ARM/EABI # We need to switch to a fixed SRCDATE or release as soon as possible PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}" @@ -160,7 +165,7 @@ PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -PREFERRED_VERSION_xserver-kdrive ?= "1.2.0" +PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0" PREFERRED_VERSION_libxrandr ?= "1.2.1" PREFERRED_VERSION_xrandr ?= "1.2.0" PREFERRED_VERSION_randrproto ?= "1.2.1" @@ -303,7 +308,7 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" #EXTRA_STUFF_append_akita += "altboot" #EXTRA_STUFF_append_poodle += "altboot" #EXTRA_STUFF_append_tosa += "altboot" -EXTRA_STUFF_append_spitz += "altboot" +#EXTRA_STUFF_append_spitz += "altboot" # do some task-base stuff here diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc index 55a4c79e75..a7a63374b5 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc @@ -3,7 +3,7 @@ QTE_VERSION ?= "2.3.10" PALMTOP_USE_MULTITHREADED_QT ?= "yes" -OPIE_SRCDATE ?= "20070703" +OPIE_SRCDATE ?= "20070717" OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}" OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 1d80cad05b..7e344b01db 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -50,22 +50,49 @@ SRCDATE_gconf-dbus ?= "20070512" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" -# Enlightenment (libs) -SRCDATE_edb ?= "20070601" -SRCDATE_enhanve ?= "20070601" -SRCDATE_engrave ?= "20070601" -SRCDATE_exml ?= "20070601" +# Enlightenment Foundation Libraries +# Caution: This is not alphabetically, but (roughly) dependency-sorted. +# Please leave it like that. +SRCDATE_edb-native = "20070721" +SRCDATE_edb ?= "20070721" +SRCDATE_eet-native = "20070721" +SRCDATE_eet ?= "20070721" +SRCDATE_evas-native ?= "20070721" +SRCDATE_evas ?= "20070721" +SRCDATE_ecore-native ?= "20070721" +SRCDATE_ecore ?= "20070721" +SRCDATE_edbus ?= "20070721" +SRCDATE_embryo-native ?= "20070721" +SRCDATE_embryo ?= "20070721" +SRCDATE_edje-native ?= "20070721" +SRCDATE_edje ?= "20070721" +SRCDATE_emotion ?= "20070721" +SRCDATE_etk-native ?= "20070721" +SRCDATE_etk ?= "20070721" +SRCDATE_ewl ?= "20070721" +SRCDATE_epeg ?= "20070721" +SRCDATE_epsilon ?= "20070721" +SRCDATE_epdf ?= "20070721" +SRCDATE_esmart ?= "20070721" +SRCDATE_efreet ?= "20070721" +SRCDATE_exml ?= "20070721" +SRCDATE_enhance ?= "20070721" +SRCDATE_engrave ?= "20070721" +SRCDATE_evolve-native ?= "20070721" +SRCDATE_evolve ?= "20070721" -# Enlightenment (apps) -SRCDATE_edje-viewer = "20070601" -SRCDATE_emphasis = "20070601" -SRCDATE_ephoto = "20070601" -SRCDATE_examine = "20070601" -SRCDATE_expedite = "20070601" -SRCDATE_elitaire = "20070504" -SRCDATE_entice = "20070601" -SRCDATE_e-utils = "20070601" -SRCDTE_exhibit = "20070601" +# Enlightenment Applications +SRCDATE_edje-viewer ?= "20070601" +SRCDATE_edje-editor ?= "20070721" +SRCDATE_emphasis ?= "20070601" +SRCDATE_ephoto ?= "20070601" +SRCDATE_examine ?= "20070601" +SRCDATE_exhibit ?= "20070721" +SRCDATE_expedite ?= "20070601" +SRCDATE_elitaire ?= "20070504" +SRCDATE_entice ?= "20070601" +SRCDATE_e-utils ?= "20070601" +SRCDATE_enna ?= "20070721" # Misc apps, sorted by alphabet SRCDATE_avetanabt ?= "20060814" @@ -108,5 +135,5 @@ SRCDATE_yamonenv ?= "20060814" SRCDATE_zroadmap ?= "20060814" # Freedesktop.org -SRCDATE_poppler = "20070708" +SRCDATE_poppler0.6 = "20070708" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index c2970d2b99..bb1605e41b 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -111,7 +111,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.5" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" diff --git a/conf/machine/acern30.conf b/conf/machine/acern30.conf index 4255769478..de450b14d1 100644 --- a/conf/machine/acern30.conf +++ b/conf/machine/acern30.conf @@ -13,7 +13,9 @@ require conf/machine/include/tune-arm920t.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen" # diff --git a/conf/machine/asus620.conf b/conf/machine/asus620.conf index e7a46fed67..6c159a5f0c 100644 --- a/conf/machine/asus620.conf +++ b/conf/machine/asus620.conf @@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" # diff --git a/conf/machine/asus730.conf b/conf/machine/asus730.conf index 85ca5d106a..7d8d8815f0 100644 --- a/conf/machine/asus730.conf +++ b/conf/machine/asus730.conf @@ -16,7 +16,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "64" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "bigscreen" +MACHINE_GUI_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "480" +MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" # diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf index 1bd08e13ab..32d7a2cdca 100644 --- a/conf/machine/aximx50.conf +++ b/conf/machine/aximx50.conf @@ -16,7 +16,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "256" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS ?= "smallscreen" +MACHINE_GUI_CLASS ?= "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS ?= "240" +MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" # diff --git a/conf/machine/aximx50v.conf b/conf/machine/aximx50v.conf index 9b38da782e..2c84768498 100644 --- a/conf/machine/aximx50v.conf +++ b/conf/machine/aximx50v.conf @@ -4,4 +4,6 @@ require conf/machine/aximx50.conf -GUI_MACHINE_CLASS = "bigscreen" +MACHINE_GUI_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "480" +MACHINE_DISPLAY_HEIGHT_PIXELS = "640" diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index dab556006b..063a68481a 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -21,7 +21,7 @@ ROOT_FLASH_SIZE ?= "32" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000 --no-cleanmarkers;\ sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ - -e 0x20000 -p\ + -e 0x20000 -p; \ cd ${DEPLOY_DIR_IMAGE}; \ rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \ ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \ diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 912cbc5c77..32f59aabd1 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t" -PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" +PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_xserver = "xserver-kdrive" #don't try to access tty1 diff --git a/conf/machine/eteng500.conf b/conf/machine/eteng500.conf index 59eafda6f2..7734461a03 100644 --- a/conf/machine/eteng500.conf +++ b/conf/machine/eteng500.conf @@ -13,7 +13,9 @@ require conf/machine/include/tune-arm920t.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" # diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 574e10fae0..131b6512e0 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf VOLATILE_STORAGE_SIZE = "64" ROOT_FLASH_SIZE = "16" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" # diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 1a63643868..3afec8be27 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -10,13 +10,15 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" # Set features for task-base +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen" # Some extra configuration VOLATILE_STORAGE_SIZE = "64" ROOT_FLASH_SIZE = "32" -GUI_MACHINE_CLASS = "smallscreen" SERIAL_CONSOLE = "115200 ttySAC2 vt100" USE_VT = "0" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 56f1d17c04..ecaebb8535 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -14,9 +14,9 @@ require conf/machine/include/tune-xscale.conf #Set some hints for metadata VOLATILE_STORAGE_SIZE = "64" ROOT_FLASH_SIZE = "32" -GUI_MACHINE_CLASS = "smallscreen" - -#Set features for task-base +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen" # diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 953c90590d..fe204f0be4 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -14,7 +14,9 @@ require conf/machine/include/tune-strongarm.conf ROOT_FLASH_SIZE = "16" # h3630 have 32Mb only VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" # diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 32b6a8ea8a..8612be2ddc 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen" # diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index f48f560d0f..c28e651b47 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" # @@ -24,6 +26,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ + kernel-module-h4000-pcmcia \ kernel-module-i2c-pxa \ kernel-module-acx \ " diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index 8645df3555..87cc4c6210 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen" # diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index ecc658982b..a44d2d328f 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -12,7 +12,9 @@ PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t" #Use OMAP 1510 cpu specifig arm9tdmi options for gcc require conf/machine/include/tune-arm9tdmi.conf -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" # diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf index 181e54de5d..7cd36f16ae 100644 --- a/conf/machine/htcalpine.conf +++ b/conf/machine/htcalpine.conf @@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" # diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf index 0906b0f682..b46ac688cc 100644 --- a/conf/machine/htcapache.conf +++ b/conf/machine/htcapache.conf @@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" # diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf index 261ebb8916..5150b86b77 100644 --- a/conf/machine/htcblueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "128" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" # diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf index d75a573f65..1edd224496 100644 --- a/conf/machine/htchimalaya.conf +++ b/conf/machine/htchimalaya.conf @@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" # diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf index 872942e17a..5fb2bb4cd4 100644 --- a/conf/machine/htcsable.conf +++ b/conf/machine/htcsable.conf @@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "240" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" # diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index e2e7f2f2d1..bd2e1439a5 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -14,7 +14,9 @@ require conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first #require conf/machine/include/tune-iwmmxt.conf -GUI_MACHINE_CLASS = "bigscreen" +MACHINE_GUI_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "480" +MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone" # diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf index 6108796aad..f7b0a89ee1 100644 --- a/conf/machine/htcwallaby.conf +++ b/conf/machine/htcwallaby.conf @@ -12,7 +12,9 @@ require conf/machine/include/tune-strongarm.conf ROOT_FLASH_SIZE = "16" VOLATILE_STORAGE_SIZE = "32" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone" # diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index ffffc3a569..279b273a70 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -25,7 +25,9 @@ PCMCIA_MANAGER = "pcmciautils" SERIAL_CONSOLE = "115200 ttyS0" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 5483a3337f..d7f852079a 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -16,7 +16,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "80" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "bigscreen" +MACHINE_GUI_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "480" +MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" # @@ -25,7 +27,9 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PCMCIA_MANAGER = "pcmciautils" MODUTILS = "26" + XSERVER = "xserver-kdrive-w100" +PREFERRED_VERSION_xserver-kdrive = "1.2.0" PREFERRED_VERSION_orinoco-modules = "0.15rc1" diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf index 2ddb808836..565f37b43f 100644 --- a/conf/machine/include/palm.conf +++ b/conf/machine/include/palm.conf @@ -7,8 +7,6 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" SERIAL_CONSOLE = "115200 ttyS0" -GUI_MACHINE_CLASS = "bigscreen" - # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/looxc550.conf b/conf/machine/looxc550.conf index ad195b9436..c191349498 100644 --- a/conf/machine/looxc550.conf +++ b/conf/machine/looxc550.conf @@ -12,7 +12,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "bigscreen" +MACHINE_GUI_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "480" +MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" # diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index aa30d3164e..fab936707b 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -16,7 +16,9 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "80" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost" # diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf index b64a66ff60..7adb352ba4 100644 --- a/conf/machine/palmld.conf +++ b/conf/machine/palmld.conf @@ -6,6 +6,9 @@ require conf/machine/include/palm.conf ROOT_FLASH_SIZE = "100" +MACHINE_GUI_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "320" +MACHINE_DISPLAY_HEIGHT_PIXELS = "480" MACHINE_FEATURES += "pcmcia wifi" diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf index 90690fd5f4..46e5fafdb5 100644 --- a/conf/machine/palmt650.conf +++ b/conf/machine/palmt650.conf @@ -1,15 +1,17 @@ #@TYPE: Machine #@NAME: Palm Treo 650 -#@DESCRIPTION: Machine configuration for the Palm TX +#@DESCRIPTION: Machine configuration for the Palm Treo 650 require conf/machine/include/palm.conf ROOT_FLASH_SIZE = "100" -SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLE = "115200 ttyS1" GUI_MACHINE_CLASS = "bigscreen" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ kernel-module-pxapwm-bl \ kernel-module-wm97xx-ts" + +module_autoload_g_ether = "g_ether" diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf new file mode 100644 index 0000000000..f4fcb405c5 --- /dev/null +++ b/conf/machine/palmtc.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: Palm TC +#@DESCRIPTION: Machine configuration for the Palm TX + +require conf/machine/include/palm.conf + +MACHINE_FEATURES += "wifi" + +ROOT_FLASH_SIZE = "100" + +SERIAL_CONSOLE = "115200 ttyS0" + +GUI_MACHINE_CLASS = "bigscreen" + +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxapwm-bl" + diff --git a/conf/machine/palmtt.conf b/conf/machine/palmtt.conf new file mode 100644 index 0000000000..72b1f310ad --- /dev/null +++ b/conf/machine/palmtt.conf @@ -0,0 +1,18 @@ +#@TYPE: Machine +#@NAME: Palm Tungsten T +#@DESCRIPTION: Machine configuration for Palm Zire 71 + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv5te" + +MACHINE_GUI_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "320" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" + +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-palm-omap1" + +SERIAL_CONSOLE ?= "115200 ttyS0" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" + +require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/palmtt2.conf b/conf/machine/palmtt2.conf new file mode 100644 index 0000000000..2c62a04903 --- /dev/null +++ b/conf/machine/palmtt2.conf @@ -0,0 +1,2 @@ +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Palm Tungsten T2,\n* because \ +its very similar to the Palm Tungsten T. Use MACHINE = \"palmtt\".\n*\n*\n')}" diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf index 4eb804aba0..d9b934a306 100644 --- a/conf/machine/palmtx.conf +++ b/conf/machine/palmtx.conf @@ -4,14 +4,15 @@ require conf/machine/include/palm.conf +MACHINE_GUI_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "320" +MACHINE_DISPLAY_HEIGHT_PIXELS = "480" MACHINE_FEATURES += "pcmcia wifi" ROOT_FLASH_SIZE = "100" SERIAL_CONSOLE = "115200 ttyS0" -GUI_MACHINE_CLASS = "bigscreen" - MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ kernel-module-pxapwm-bl \ kernel-module-wm97xx-ts \ diff --git a/conf/machine/palmz31.conf b/conf/machine/palmz31.conf new file mode 100644 index 0000000000..da074a80bf --- /dev/null +++ b/conf/machine/palmz31.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: Palm Zire 31 +#@DESCRIPTION: Machine configuration for the Palm Zire 31 + +require conf/machine/include/palm.conf + +ROOT_FLASH_SIZE = "16" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "160" +MACHINE_DISPLAY_HEIGHT_PIXELS = "160" + +SERIAL_CONSOLE = "115200 ttyS0" + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +require conf/machine/include/tune-thumb.conf + +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \ + kernel-module-i2c-algo-pxa \ + kernel-module-i2c-dev \ + kernel-module-wm97xx-ts \ + kernel-module-palmz31-battery" + +module_autoload_g_ether = "g_ether" diff --git a/conf/machine/palmz71.conf b/conf/machine/palmz71.conf new file mode 100644 index 0000000000..4be181e961 --- /dev/null +++ b/conf/machine/palmz71.conf @@ -0,0 +1,15 @@ +#@TYPE: Machine +#@NAME: Palm Zire 71 +#@DESCRIPTION: Machine configuration for Palm Zire 71 + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv5te" + +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-palm-omap1" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" + +SERIAL_CONSOLE ?= "115200 ttyS0" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" + +require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf index 2e787a89f3..a654877d36 100644 --- a/conf/machine/palmz72.conf +++ b/conf/machine/palmz72.conf @@ -5,11 +5,12 @@ require conf/machine/include/palm.conf ROOT_FLASH_SIZE = "100" +MACHINE_GUI_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "320" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" SERIAL_CONSOLE = "115200 ttyS0" -GUI_MACHINE_CLASS = "bigscreen" - # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-thumb.conf diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf index 097ee9c017..d49679e820 100644 --- a/conf/machine/rx1950.conf +++ b/conf/machine/rx1950.conf @@ -13,7 +13,9 @@ require conf/machine/include/tune-arm920t.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" # diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf index 0506a1f083..f0bd1fefd2 100644 --- a/conf/machine/rx3000.conf +++ b/conf/machine/rx3000.conf @@ -13,7 +13,9 @@ require conf/machine/include/tune-arm920t.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" # diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 6b08ec1aa9..81c789dcc4 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -11,3 +11,8 @@ PACKAGE_EXTRA_ARCHS += "iwmmxt" IMAGE_FSTYPES += "tar.gz" ROOT_FLASH_SIZE = "100" + +MACHINE_GUI_CLASS=bigscreen +MACHINE_DISPLAY_WIDTH_PIXELS=480 +MACHINE_DISPLAY_HEIGHT_PIXELS=640 +MACHINE_DISPLAY_ORIENTATION=270 diff --git a/contrib/python/generate-manifest.py b/contrib/python/generate-manifest.py index 0267a3e980..730c883bd3 100755 --- a/contrib/python/generate-manifest.py +++ b/contrib/python/generate-manifest.py @@ -208,6 +208,9 @@ if __name__ == "__main__": m.addPackage( 0, "python-db", "Python File-Based Database Support", "python-core", "anydbm.* dumbdbm.* whichdb.* " ) + m.addPackage( 0, "python-debugger", "Python Debugger", "python-core, python-io, python-lang, python-re, python-stringold, python-shell", + "bdb.* pdb.*" ) + m.addPackage( 0, "python-distutils", "Python Distribution Utilities", "python-core", "config distutils" ) # package @@ -286,7 +289,7 @@ if __name__ == "__main__": "lib-dynload/resource.so" ) m.addPackage( 0, "python-shell", "Python Shell-Like Functionality", "python-core, python-re", - "commands.* dircache.* fnmatch.* glob.* popen2.* shutil.*" ) + "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shutil.*" ) m.addPackage( 0, "python-robotparser", "Python robots.txt parser", "python-core, python-netclient", "robotparser.*") diff --git a/packages/abiword/abiword-embedded_2.4.5.bb b/packages/abiword/abiword-embedded_2.4.5.bb deleted file mode 100644 index 9381bbd8a7..0000000000 --- a/packages/abiword/abiword-embedded_2.4.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -require abiword.inc - -EXTRA_OECONF += "--enable-embedded" - -RCONFLICTS = "abiword" -RPROVIDES += "abiword" - -do_compile_prepend() { - cp ${S}/src/af/xap/unix/hildon/xap_EmbeddedFeatures.h ${S}/src/af/xap/unix/ - cp ${S}/src/wp/ap/unix/hildon/ap_EmbeddedFeatures.h ${S}/src/wp/ap/unix/ -} - diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb deleted file mode 100644 index 0715026684..0000000000 --- a/packages/abiword/abiword-plugins_2.4.5.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"" -HOMEPAGE = "http://www.abiword.org"" -SECTION = "x11/office" -LICENSE = "GPLv2" -DEPENDS = "libwpd librsvg goffice poppler" -RDEPENDS='abiword' -PR = "r1" - -SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ - file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" -S = "${WORKDIR}/abiword-${PV}/abiword-plugins" - -inherit autotools - -PARALLEL_MAKE="" - -EXTRA_OECONF = "--without-libwmf" - -PACKAGES_DYNAMIC = "abiword-plugin-*" - -python populate_packages_prepend () { - abiword_libdir = bb.data.expand('${libdir}/AbiWord-2.4/plugins', d) - - do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') -} - diff --git a/packages/abiword/abiword-plugins_2.4.6.bb b/packages/abiword/abiword-plugins_2.4.6.bb index 21ac8ea909..84de68c1a0 100644 --- a/packages/abiword/abiword-plugins_2.4.6.bb +++ b/packages/abiword/abiword-plugins_2.4.6.bb @@ -13,7 +13,7 @@ inherit autotools PARALLEL_MAKE="" -EXTRA_OECONF = "--without-libwmf" +EXTRA_OECONF = "--without-libwmf --without-inter7eps" PACKAGES_DYNAMIC = "abiword-plugin-*" diff --git a/packages/abiword/abiword_2.4.5.bb b/packages/abiword/abiword_2.4.5.bb deleted file mode 100644 index b97556b735..0000000000 --- a/packages/abiword/abiword_2.4.5.bb +++ /dev/null @@ -1,4 +0,0 @@ -require abiword.inc - -RCONFLICTS = "abiword-embedded" - diff --git a/packages/bluez/bluez-gnome_cvs.bb b/packages/bluez/bluez-gnome_git.bb index 448e157f3d..ac772f8825 100644 --- a/packages/bluez/bluez-gnome_cvs.bb +++ b/packages/bluez/bluez-gnome_git.bb @@ -3,10 +3,11 @@ LICENSE = "GPL+LGPL" DEPENDS = "dbus-glib gconf libnotify gtk+" -SRC_URI = "cvs://anonymous@cvs.bluez.org/cvsroot/bluez;module=gnome" +SRC_URI = "git://people.freedesktop.org/~hadess/bluez-gnome;protocol=git \ + file://pkgconfig-add-gthread.patch;patch=1 " -PV = "0.6+cvs${SRCDATE}" -S = "${WORKDIR}/gnome" +PV = "0.9+git${SRCDATE}" +S = "${WORKDIR}/git" inherit autotools pkgconfig gconf diff --git a/packages/bluez/bluez-utils_3.12.bb b/packages/bluez/bluez-utils_3.12.bb index 4710aa6779..754097acce 100644 --- a/packages/bluez/bluez-utils_3.12.bb +++ b/packages/bluez/bluez-utils_3.12.bb @@ -5,12 +5,12 @@ DEPENDS += "glib-2.0" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ " -PR = "r3" +PR = "r4" EXTRA_OECONF = " \ --enable-bccmd \ --enable-hid2hci \ - --disable-alsa \ + --enable-alsa \ --enable-cups \ --enable-glib \ --disable-sdpd \ @@ -59,7 +59,7 @@ EXTRA_OECONF = " \ # --disable-hid2hci -PACKAGES =+ "${PN}-compat" +PACKAGES =+ "${PN}-compat ${PN}-alsa" CONFFILES_${PN} = " \ ${sysconfdir}/bluetooth/hcid.conf \ @@ -83,6 +83,8 @@ FILES_${PN} = " \ FILES_${PN}-dbg += " \ ${libdir}/bluetooth/.debug \ + ${libdir}/cups/backend/.debug \ + ${libdir}/alsa-lib/.debug \ " FILES_${PN}-compat = " \ @@ -104,6 +106,8 @@ FILES_${PN}-compat = " \ ${sysconfdir}/bluetooth/rfcomm.conf \ " +FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*" + FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" RDEPENDS_bluez-cups-backend = "cups" diff --git a/packages/bluez/files/pkgconfig-add-gthread.patch b/packages/bluez/files/pkgconfig-add-gthread.patch new file mode 100644 index 0000000000..2dde6b81f5 --- /dev/null +++ b/packages/bluez/files/pkgconfig-add-gthread.patch @@ -0,0 +1,50 @@ +Index: git/configure.in +=================================================================== +--- git.orig/configure.in 2007-07-17 17:25:52.000000000 +0100 ++++ git/configure.in 2007-07-17 17:25:52.000000000 +0100 +@@ -75,6 +75,10 @@ + AC_SUBST(OPENOBEX_CFLAGS) + AC_SUBST(OPENOBEX_LIBS) + ++PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.10, dummy=yes, dummy=no) ++AC_SUBST(GTHREAD_CFLAGS) ++AC_SUBST(GTHREAD_LIBS) ++ + AC_ARG_BLUEZ + + AC_OUTPUT(Makefile compat/Makefile common/Makefile applet/Makefile properties/Makefile sendto/Makefile wizard/Makefile proximity/Makefile po/Makefile.in) +Index: git/applet/Makefile.am +=================================================================== +--- git.orig/applet/Makefile.am 2007-07-17 17:25:52.000000000 +0100 ++++ git/applet/Makefile.am 2007-07-17 17:25:52.000000000 +0100 +@@ -4,12 +4,12 @@ + bluetooth_applet_SOURCES = main.c + + bluetooth_applet_LDADD = $(top_builddir)/compat/libcompat.a $(top_builddir)/common/libcommon.a \ +- @NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ ++ @NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @GTHREAD_LIBS@ + + nodist_bluetooth_applet_SOURCES = $(top_builddir)/common/passkey-agent-glue.h \ + $(top_builddir)/common/auth-agent-glue.h + +-AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\" ++AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ @GTHREAD_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\" + + INCLUDES = -I$(top_builddir)/common -I$(top_srcdir)/compat + +Index: git/properties/Makefile.am +=================================================================== +--- git.orig/properties/Makefile.am 2007-07-17 17:28:11.000000000 +0100 ++++ git/properties/Makefile.am 2007-07-17 17:28:44.000000000 +0100 +@@ -4,9 +4,9 @@ + bluetooth_properties_SOURCES = main.c + + bluetooth_properties_LDADD = $(top_builddir)/common/libcommon.a \ +- @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ ++ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @GTHREAD_LIBS@ + +-AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ ++AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @GTHREAD_CFLAGS@ + + INCLUDES = -I$(top_srcdir)/common + diff --git a/packages/efl++/.mtn2git_empty b/packages/brutefir/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/efl++/.mtn2git_empty +++ b/packages/brutefir/.mtn2git_empty diff --git a/packages/brutefir/brutefir_1.0i.bb b/packages/brutefir/brutefir_1.0i.bb new file mode 100644 index 0000000000..0323ced0fb --- /dev/null +++ b/packages/brutefir/brutefir_1.0i.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "BruteFIR is a software convolution engine, a program for applying long FIR filters to multi-channel digital audio, either offline or in realtime." +LICENSE = "GPLv2" + +DEPENDS = "fftw fftwf fftwl" + +PR = "r1" + +# The unbreak-makefile disables the SSE2, MMX and jack support, feel free +# to add back SSE and MMX after fixing the makefile to not use uname to check for cpu + +SRC_URI = "http://www.ludd.luth.se/~torger/files/brutefir-${PV}.tar.gz \ + file://unbreak-makefile.patch;patch=1 \ + " + +do_configure() { + sed -i -e s:-L/usr/local/lib:-L${STAGING_LIBDIR}:g Makefile + sed -i -e s:-I/usr/local/include:-I${STAGING_INCDIR}:g Makefile +} + +do_install() { + install -d ${D}${bindir} + install -m 755 *.bf* ${D}${bindir} + install -m 755 brutefir ${D}${bindir} +} + diff --git a/packages/efl++/files/.mtn2git_empty b/packages/brutefir/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/efl++/files/.mtn2git_empty +++ b/packages/brutefir/files/.mtn2git_empty diff --git a/packages/brutefir/files/unbreak-makefile.patch b/packages/brutefir/files/unbreak-makefile.patch new file mode 100644 index 0000000000..2a437a2308 --- /dev/null +++ b/packages/brutefir/files/unbreak-makefile.patch @@ -0,0 +1,38 @@ +--- /tmp/Makefile 2007-07-19 18:54:47.000000000 +0200 ++++ brutefir-1.0i/Makefile 2007-07-19 18:55:44.775215000 +0200 +@@ -36,8 +36,6 @@ + BRUTEFIR_LIBS = $(FFTW_LIB) -lm + BRUTEFIR_OBJS = brutefir.o fftw_convolver.o bfconf.o bfrun.o firwindow.o \ + emalloc.o shmalloc.o dai.o bfconf_lexical.o inout.o dither.o delay.o +-BRUTEFIR_IA32_OBJS = convolver_sse2.o convolver_sse.o \ +-convolver_3dnow.o convolver_x87.o + + BFIO_FILE_OBJS = bfio_file.fpic.o + +@@ -46,8 +44,6 @@ + + BFIO_OSS_OBJS = bfio_oss.fpic.o emalloc.fpic.o + +-BFIO_JACK_LIBS = -ljack +-BFIO_JACK_OBJS = bfio_jack.fpic.o emalloc.fpic.o inout.fpic.o + + BFLOGIC_CLI_OBJS = bflogic_cli.fpic.o inout.fpic.o + BFLOGIC_EQ_OBJS = bflogic_eq.fpic.o emalloc.fpic.o shmalloc.fpic.o +@@ -78,7 +74,6 @@ + # assume that we have alsa, osss and jack + LIB_TARGETS += alsa.bfio + LIB_TARGETS += oss.bfio +-LIB_TARGETS += jack.bfio + endif + + # Solaris +@@ -133,9 +128,6 @@ + oss.bfio: $(BFIO_OSS_OBJS) + $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc + +-jack.bfio: $(BFIO_JACK_OBJS) +- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc +- + file.bfio: $(BFIO_FILE_OBJS) + $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc + diff --git a/packages/clutter/clutter_svn.bb b/packages/clutter/clutter_svn.bb index 9939221d8d..8a2a1fa1ed 100644 --- a/packages/clutter/clutter_svn.bb +++ b/packages/clutter/clutter_svn.bb @@ -1,6 +1,6 @@ require clutter.inc -PV = "0.2.0+svn${SRCDATE}" +PV = "0.3.1+svn${SRCDATE}" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http" diff --git a/packages/coreutils/coreutils-5.3.0/futimens.patch b/packages/coreutils/coreutils-5.3.0/futimens.patch new file mode 100644 index 0000000000..3cb2b6ab32 --- /dev/null +++ b/packages/coreutils/coreutils-5.3.0/futimens.patch @@ -0,0 +1,44 @@ +Index: coreutils-5.3.0/lib/utimens.c +=================================================================== +--- coreutils-5.3.0.orig/lib/utimens.c 2005-01-03 22:19:15.000000000 +0000 ++++ coreutils-5.3.0/lib/utimens.c 2007-07-01 19:12:32.000000000 +0000 +@@ -55,8 +55,8 @@ + If TIMESPEC is null, set the time stamps to the current time. */ + + int +-futimens (int fd ATTRIBUTE_UNUSED, +- char const *file, struct timespec const timespec[2]) ++gl_futimens (int fd ATTRIBUTE_UNUSED, ++ char const *file, struct timespec const timespec[2]) + { + /* There's currently no interface to set file timestamps with + nanosecond resolution, so do the best we can, discarding any +@@ -117,5 +117,5 @@ + int + utimens (char const *file, struct timespec const timespec[2]) + { +- return futimens (-1, file, timespec); ++ return gl_futimens (-1, file, timespec); + } +Index: coreutils-5.3.0/lib/utimens.h +=================================================================== +--- coreutils-5.3.0.orig/lib/utimens.h 2004-11-23 20:54:33.000000000 +0000 ++++ coreutils-5.3.0/lib/utimens.h 2007-07-01 19:12:37.000000000 +0000 +@@ -1,3 +1,3 @@ + #include "timespec.h" +-int futimens (int, char const *, struct timespec const [2]); ++int gl_futimens (int, char const *, struct timespec const [2]); + int utimens (char const *, struct timespec const [2]); +Index: coreutils-5.3.0/src/touch.c +=================================================================== +--- coreutils-5.3.0.orig/src/touch.c 2004-11-23 20:54:35.000000000 +0000 ++++ coreutils-5.3.0/src/touch.c 2007-07-01 19:11:52.000000000 +0000 +@@ -191,7 +191,7 @@ + t = timespec; + } + +- ok = (futimens (fd, file, t) == 0); ++ ok = (gl_futimens (fd, file, t) == 0); + if (fd != -1) + ok &= (close (fd) == 0); + diff --git a/packages/coreutils/coreutils_5.3.0.bb b/packages/coreutils/coreutils_5.3.0.bb index 61d25543ab..42ac2c15af 100644 --- a/packages/coreutils/coreutils_5.3.0.bb +++ b/packages/coreutils/coreutils_5.3.0.bb @@ -1,12 +1,13 @@ require coreutils.inc -PR = "r1" +PR = "r2" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ file://install-cross.patch;patch=1;pnum=0 \ file://man.patch;patch=1 \ file://rename-tee-for-glibc2.5.patch;patch=1 \ - file://uptime-pow-lib.patch;patch=1" + file://uptime-pow-lib.patch;patch=1 \ + file://futimens.patch;patch=1" # [ gets a special treatment and is not included in this bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \ diff --git a/packages/cups/cups_1.2.10.bb b/packages/cups/cups_1.2.10.bb index 8201dd9201..2e4498255c 100644 --- a/packages/cups/cups_1.2.10.bb +++ b/packages/cups/cups_1.2.10.bb @@ -2,7 +2,7 @@ DESCRIPTION = "An Internet printing system for Unix." SECTION = "console/utils" LICENSE = "GPL LGPL" DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \ " @@ -46,6 +46,9 @@ do_compile () { fakeroot do_install () { oe_runmake "DSTROOT=${D}" install + + # This directory gets installed with perms 511, which makes packaging fail + chmod 0711 "${D}/${localstatedir}/run/cups/certs" } do_stage () { @@ -56,6 +59,12 @@ do_stage () { oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR} } +python do_package_append() { + # Change permissions back the way they were, they probably had a reason... + workdir = bb.data.getVar('WORKDIR', d, 1) + os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir) +} + FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ ${libdir}/cups/cgi-bin/.debug \ ${libdir}/cups/filter/.debug \ @@ -71,6 +80,4 @@ FILES_${PN} += "${datadir}/doc/cups/images \ ${datadir}/icons/ \ " - - - +LEAD_SONAME = "libcups.so.*"
\ No newline at end of file diff --git a/packages/e17/edje-editor_cvs.bb b/packages/e17/edje-editor_cvs.bb new file mode 100644 index 0000000000..72c83dc56e --- /dev/null +++ b/packages/e17/edje-editor_cvs.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Edje-Editor is just that." +LICENSE = "MIT" +DEPENDS = "etk" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" + +inherit e + +SRC_URI = "${E_CVS};module=e17/proto/edje_editor" +S = "${WORKDIR}/edje_editor" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/enna/.mtn2git_empty b/packages/e17/enna/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/e17/enna/.mtn2git_empty diff --git a/packages/e17/enna/locale-is-broken.patch b/packages/e17/enna/locale-is-broken.patch new file mode 100644 index 0000000000..40904e14dd --- /dev/null +++ b/packages/e17/enna/locale-is-broken.patch @@ -0,0 +1,13 @@ +Index: enna/Makefile.am +=================================================================== +--- enna.orig/Makefile.am ++++ enna/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ## Created by Anjuta + +-SUBDIRS = src po data ++SUBDIRS = src data + + EXTRA_DIST = config.rpath $(ennadoc_DATA) + diff --git a/packages/e17/enna_svn.bb b/packages/e17/enna_svn.bb new file mode 100644 index 0000000000..49e1caeab0 --- /dev/null +++ b/packages/e17/enna_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Enna is a media center application based on EFL" +LICENSE = "GPL" +DEPENDS = "curl dbus eet evas edje ecore edbus emotion libmusicbrainz libxml2 taglibc" +SECTION = "x11/multimedia" +PV = "0.2.0+svn${SRCDATE}" + +inherit e + +SRC_URI = "svn://enna.svn.sourceforge.net/svnroot/enna/trunk;module=enna;proto=http \ + file://locale-is-broken.patch;patch=1" +S = "${WORKDIR}/enna" + +do_configure_prepend() { + touch po/Makefile.in.in +} + diff --git a/packages/e17/exhibit_cvs.bb b/packages/e17/exhibit_cvs.bb new file mode 100644 index 0000000000..1c3c836955 --- /dev/null +++ b/packages/e17/exhibit_cvs.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Exhibit is the ETK picture viewer" +DEPENDS = "evas ecore edje etk epsilon engrave" +LICENSE = "MIT" +PV = "0.0.0+cvs${SRCDATE}" +PR = "r0" + +inherit e + +SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/exhibit" +S = "${WORKDIR}/${PN}" diff --git a/packages/efl++/efl++-fb_cvs.bb b/packages/efl++/efl++-fb_cvs.bb deleted file mode 100644 index 8706a32033..0000000000 --- a/packages/efl++/efl++-fb_cvs.bb +++ /dev/null @@ -1,9 +0,0 @@ -require efl++.inc - -PV = "0.1.0+cvs${SRCDATE}" - -SRC_URI = "cvs://anonymous@projects.linuxtogo.org/cvsroot/eflpp;module=efl++" -S = "${WORKDIR}/efl++" - - - diff --git a/packages/efl++/efl++-x11_cvs.bb b/packages/efl++/efl++-x11_cvs.bb deleted file mode 100644 index 4beb8c555e..0000000000 --- a/packages/efl++/efl++-x11_cvs.bb +++ /dev/null @@ -1,10 +0,0 @@ -require efl++.inc - -EXTRA_QMAKEVARS_POST += "CONFIG+=eflecorex11" -PV = "0.1.0+cvs${SRCDATE}" - -SRC_URI = "cvs://anonymous@projects.linuxtogo.org/cvsroot/eflpp;module=efl++" -S = "${WORKDIR}/efl++" - - - diff --git a/packages/efl++/efl++.inc b/packages/efl++/efl++.inc deleted file mode 100644 index 52cea6e2aa..0000000000 --- a/packages/efl++/efl++.inc +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION = "C++ Bindings for the Enlightenment Foundation Libraries" -SECTION = "e/libs" -LICENSE = "LGPL" -AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -HOMEPAGE = "http://www.Vanille.de/projects/efl++.html" -DEPENDS = "virtual/evas virtual/ecore etk edje libsigc++-2.0" -PROVIDES = "virtual/efl++" - -SRC_URI = "http://www.Vanille.de/download/efl/efl++_${PV}.tar.bz2 \ - file://fix-src.pro.patch;patch=1 \ - file://disable-smart.patch;patch=1" -S = "${WORKDIR}/efl++-${PV}" - -inherit qmake qt4x11 - -PARALLEL_MAKE = "" -QMAKE_PROFILES = "efl++.pro" -EXTRA_QMAKEVARS_POST = "DESTDIR=${S}" -export OE_QMAKE_LINK="${CXX}" -export EDIR="${S}" - -do_configure_prepend() { - rm include.pro - cat <<EOF >include.pro -include ( common.pro ) - -LIBS += -L${EDIR} - -EFLCONFIG = console release eflbasic angstrom -INCLUDEPATH += ${EDIR}/src/common ${EDIR}/src/extra ${EDIR}/src/misc -INCLUDEPATH += ${EDIR}/src/evas ${EDIR}/src/ecore ${EDIR}/src/edje -INCLUDEPATH += ${EDIR}/src/esmart ${EDIR}/src/ewl - -DEFINES += DATADIR=\"${datadir}/efl++/\" - -EOF -} - -do_stage() { - for i in src/common/*.h src/evas/*.h src/ecore/*.h src/edje/*.h - do - install -m 0644 $i ${STAGING_INCDIR} - done - oe_libinstall -so -C ${S} libefl++ ${STAGING_LIBDIR} -} - -do_install() { - oe_libinstall -so -C ${S} libefl++ ${D}${libdir} - install -d ${D}${bindir} - install *-* ${D}${bindir} - install -d ${D}${datadir}/efl++ - cp -pPR data/* ${D}${datadir}/efl++ -} - -PACKAGES =+ "efl++-examples" -FILES_${PN} = "${libdir}" -FILES_efl++-examples = "${bindir} ${datadir}" diff --git a/packages/efl++/files/disable-smart.patch b/packages/efl++/files/disable-smart.patch deleted file mode 100644 index cdb157cdef..0000000000 --- a/packages/efl++/files/disable-smart.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- efl++-0.1.0/src/evas/evas.cpp~disable-smart -+++ efl++-0.1.0/src/evas/evas.cpp -@@ -7,9 +7,13 @@ - /* EFL */ - extern "C" { - #include <Edje.h> -+#ifdef EFL_SUPPORT_ESMART - #include <Esmart/Esmart_Container.h> - #include <Esmart/Esmart_Text_Entry.h> -+#endif -+#ifdef EFL_SUPPORT_EMOTION - #include <Emotion.h> -+#endif - } - - /* STD */ diff --git a/packages/efl++/files/fix-src.pro.patch b/packages/efl++/files/fix-src.pro.patch deleted file mode 100644 index 234d38af3d..0000000000 --- a/packages/efl++/files/fix-src.pro.patch +++ /dev/null @@ -1,15 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- efl++-0.1.0/src/src.pro~fix-src.pro -+++ efl++-0.1.0/src/src.pro -@@ -30,6 +30,7 @@ - include ( emotion/emotion.pro ) - LIBS += -lemotion - DEFINES += EFL_SUPPORT_EMOTION -+} - - eflesmart { - include ( esmart/esmart.pro ) diff --git a/packages/efl1/ecore-native_0.9.9.038.bb b/packages/efl1/ecore-native_cvs.bb index 8026adb49c..92a30397e1 100644 --- a/packages/efl1/ecore-native_0.9.9.038.bb +++ b/packages/efl1/ecore-native_cvs.bb @@ -1,14 +1,15 @@ require ecore.inc inherit native DEPENDS = "eet-native evas-native" -PR = "r1" +PR = "r2" EXTRA_OECONF = "\ --enable-ecore-txt \ --disable-ecore-x-xcb \ --disable-ecore-x \ --enable-ecore-job \ - --enable-ecore-directfb \ + --disable-ecore-directfb \ + --disable-ecore-sdl \ --enable-ecore-fb \ --enable-ecore-evas \ --disable-ecore-evas-gl \ @@ -18,7 +19,6 @@ EXTRA_OECONF = "\ --enable-abstract-sockets \ --enable-ecore-con \ --enable-ecore-ipc \ - --enable-ecore-dbus \ --enable-ecore-file \ --enable-inotify \ --disable-poll \ diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index 7f67d2f281..9e1bc18f5c 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -2,32 +2,26 @@ DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \ foundation libraries. It makes makes doing selections, drag and drop, event loops, \ timeouts and idle handlers fast, optimized, and convenient." LICENSE = "MIT" -DEPENDS = "curl dbus directfb eet evas tslib" +DEPENDS = "curl directfb eet evas tslib" # optional -# DEPENDS += "openssl iconv" +# DEPENDS += "openssl virtual/libiconv" +PV = "0.9.9+cvs${SRCDATE}" -inherit efl1 +inherit efl_library -SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \ - file://configure-abstract-sockets.patch;patch=1 \ - file://fix-tslib-configure.patch;patch=1 \ - file://fix-directfb-include.patch;patch=1" +SRC_URI += "\ + file://fix-tslib-configure.patch;patch=1 \ + file://fix-directfb-include.patch;patch=1 \ +" -S = "${WORKDIR}/ecore-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" -EXTRA_OECONF = "<override me>" - -do_stage() { - autotools_stage_all -} - PACKAGES += "\ ${PN}-con \ ${PN}-config \ - ${PN}-dbus \ ${PN}-desktop \ ${PN}-directfb \ + ${PN}-sdl \ ${PN}-evas \ ${PN}-fb \ ${PN}-file \ @@ -36,17 +30,16 @@ PACKAGES += "\ ${PN}-txt \ ${PN}-x \ " -FILES_${PN} = "${libdir}/libecore.so*" -FILES_${PN}-con = "${libdir}/libecore_con.so*" -FILES_${PN}-config = "${libdir}/libecore_config.so*" -FILES_${PN}-dbus = "${libdir}/libecore_dbus.so*" -FILES_${PN}-desktop = "${libdir}/libecore_desktop.so*" -FILES_${PN}-directfb = "${libdir}/libecore_directfb.so*" -FILES_${PN}-evas = "${libdir}/libecore_evas.so*" -FILES_${PN}-fb = "${libdir}/libecore_fb.so*" -FILES_${PN}-file = "${libdir}/libecore_file.so*" -FILES_${PN}-ipc = "${libdir}/libecore_ipc.so*" -FILES_${PN}-job = "${libdir}/libecore_job.so*" -FILES_${PN}-txt = "${libdir}/libecore_txt.so*" -FILES_${PN}-x = "${libdir}/libecore_x.so*" - +FILES_${PN} = "${libdir}/libecore.so.*" +FILES_${PN}-con = "${libdir}/libecore_con.so.*" +FILES_${PN}-config = "${libdir}/libecore_config.so.*" +FILES_${PN}-desktop = "${libdir}/libecore_desktop.so.*" +FILES_${PN}-directfb = "${libdir}/libecore_directfb.so.*" +FILES_${PN}-sdl = "${libdir}/libecore_sdl.so.*" +FILES_${PN}-evas = "${libdir}/libecore_evas.so.*" +FILES_${PN}-fb = "${libdir}/libecore_fb.so.*" +FILES_${PN}-file = "${libdir}/libecore_file.so.*" +FILES_${PN}-ipc = "${libdir}/libecore_ipc.so.*" +FILES_${PN}-job = "${libdir}/libecore_job.so.*" +FILES_${PN}-txt = "${libdir}/libecore_txt.so.*" +FILES_${PN}-x = "${libdir}/libecore_x.so.*" diff --git a/packages/efl1/ecore/configure-abstract-sockets.patch b/packages/efl1/ecore/configure-abstract-sockets.patch deleted file mode 100644 index 359203b163..0000000000 --- a/packages/efl1/ecore/configure-abstract-sockets.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: ecore-0.9.9.038/configure.in -=================================================================== ---- ecore-0.9.9.038.orig/configure.in -+++ ecore-0.9.9.038/configure.in -@@ -541,10 +541,7 @@ AC_ARG_ENABLE(abstract-sockets, - [ want_abstract_sockets="yes"] - ) - if test "x$want_abstract_sockets" = "xyes"; then -- AC_ABSTRACT_SOCKET_TEST( -- [AC_DEFINE(HAVE_ABSTRACT_SOCKETS, 1, [Have abstract sockets namespace])], -- [] -- ) -+ HAVE_ABSTRACT_SOCKETS = 1 - fi - - ECORE_CHECK_MODULE([Con], [yes]) diff --git a/packages/efl1/ecore_0.9.9.038.bb b/packages/efl1/ecore_cvs.bb index d61aeab3a1..dd6c467c54 100644 --- a/packages/efl1/ecore_0.9.9.038.bb +++ b/packages/efl1/ecore_cvs.bb @@ -1,5 +1,5 @@ require ecore.inc -PR = "r1" +PR = "r5" EXTRA_OECONF = "\ --enable-ecore-txt \ @@ -7,6 +7,7 @@ EXTRA_OECONF = "\ --enable-ecore-x \ --enable-ecore-job \ --enable-ecore-directfb \ + --enable-ecore-sdl \ --enable-ecore-fb \ --enable-ecore-evas \ --disable-ecore-evas-gl \ @@ -16,7 +17,6 @@ EXTRA_OECONF = "\ --enable-abstract-sockets \ --enable-ecore-con \ --enable-ecore-ipc \ - --enable-ecore-dbus \ --enable-ecore-file \ --enable-inotify \ --disable-poll \ diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb index 365f857e1c..b7c85e8663 100644 --- a/packages/efl1/edb_cvs.bb +++ b/packages/efl1/edb_cvs.bb @@ -2,13 +2,4 @@ DESCRIPTION = "Edb is a database library" LICENSE = "MIT" PV = "0.0.0+cvs${SRCDATE}" -inherit efl1 - -SRC_URI = "${E_CVS};module=e17/libs/edb" -S = "${WORKDIR}/edb" - -PACKAGES =+ "${PN}-tests" -FILES_${PN}-tests = "${bindir}/*_* ${datadir}" -FILES_${PN}-dev += "${bindir}/*-config" -FILES_${PN} = "${libdir}/*.so*" - +inherit efl_library diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb new file mode 100644 index 0000000000..db1547c3d4 --- /dev/null +++ b/packages/efl1/edbus_cvs.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "DBus and HAL convenience wrappers for EFL" +DEPENDS = "dbus ecore" +LICENSE = "MIT" +PR = "r0" + +inherit efl_library + +SRC_URI = "${E_CVS};module=e17/proto/e_dbus" +S = "${WORKDIR}/e_dbus" + +# TODO increase package granularity + diff --git a/packages/efl1/edje-native_0.5.0.038.bb b/packages/efl1/edje-native_cvs.bb index 8f3ef51fa7..2c52b69a0c 100644 --- a/packages/efl1/edje-native_0.5.0.038.bb +++ b/packages/efl1/edje-native_cvs.bb @@ -1,6 +1,6 @@ require edje_${PV}.bb inherit native -PR = "r4" +PR = "r0" DEPENDS = "evas-native ecore-native eet-native embryo-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" @@ -10,7 +10,3 @@ do_configure_prepend() { sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c } - -do_stage_append() { - efl_stage_bin -} diff --git a/packages/efl1/edje_0.5.0.038.bb b/packages/efl1/edje_0.5.0.038.bb deleted file mode 100644 index 7db9951e8d..0000000000 --- a/packages/efl1/edje_0.5.0.038.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Edje is a complex graphical design & layout library." -# can also install vim data files -DEPENDS = "eet evas ecore embryo edje-native" -LICENSE = "MIT" -PR = "r7" - -inherit efl1 lib_package - -SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101" - -do_configure_prepend() { - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 -} - -FILES_${PN}-dev =+ "${bindir} ${datadir}" -FILES_${PN}-examples = "" -FILES_${PN}-bin = "" - diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb new file mode 100644 index 0000000000..79336b74b5 --- /dev/null +++ b/packages/efl1/edje_cvs.bb @@ -0,0 +1,11 @@ +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}" +PR = "r0" + +inherit efl_library + +# NOTE: Packaging needs work. edje_cc should actually be in the -dev package etc. + diff --git a/packages/efl1/eet-native_0.9.10.038.bb b/packages/efl1/eet-native_cvs.bb index 9e2426ca9f..de162df5d5 100644 --- a/packages/efl1/eet-native_0.9.10.038.bb +++ b/packages/efl1/eet-native_cvs.bb @@ -1,4 +1,3 @@ -require eet_${PV}.bb +require eet_cvs.bb inherit native DEPENDS = "zlib-native jpeg-native" - diff --git a/packages/efl1/eet_0.9.10.038.bb b/packages/efl1/eet_cvs.bb index 08935df750..2c9c641b6c 100644 --- a/packages/efl1/eet_0.9.10.038.bb +++ b/packages/efl1/eet_cvs.bb @@ -4,8 +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}" PR = "r0" -inherit efl1 - -SRC_URI = "http://download.enlightenment.org/snapshots/2007-05-06/eet-${PV}.tar.gz" +inherit efl_library diff --git a/packages/efl1/eflpp_cvs.bb b/packages/efl1/eflpp_cvs.bb new file mode 100644 index 0000000000..c8c613d75e --- /dev/null +++ b/packages/efl1/eflpp_cvs.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "EFLpp are C++ bindings to the EFL" +AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" +HOMEPAGE = "http://www.vanille-media.de/site/index.php/projects/efl/" +LICENSE = "LGPL" +DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0" +PV = "0.1.0+cvs${SRCDATE}" + +inherit efl_library + +SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME}" diff --git a/packages/efl1/efreet_0.0.3.002.bb b/packages/efl1/efreet_cvs.bb index b387ee89a0..dba9a3c9fb 100644 --- a/packages/efl1/efreet_0.0.3.002.bb +++ b/packages/efl1/efreet_cvs.bb @@ -2,9 +2,11 @@ DESCRIPTION = "An implementation of freedesktop.org specs for the \ Enlightenment Foundation Libraries" DEPENDS = "ecore" LICENSE = "BSD" +PV = "0.0.3+cvs${SRCDATE}" PR = "r0" -inherit efl1 +inherit efl_library + +PACKAGES =+ "${PN}-mime" +FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*" -PACKAGES =+ "efreet-tests" -FILES_efreet-tests = "${bindir}/*_* ${datadir}" diff --git a/packages/efl1/embryo-native_0.9.1.038.bb b/packages/efl1/embryo-native_cvs.bb index 2fc3faddfd..2fc3faddfd 100644 --- a/packages/efl1/embryo-native_0.9.1.038.bb +++ b/packages/efl1/embryo-native_cvs.bb diff --git a/packages/efl1/embryo_0.9.1.038.bb b/packages/efl1/embryo_cvs.bb index 0728ef563b..45b75f503d 100644 --- a/packages/efl1/embryo_0.9.1.038.bb +++ b/packages/efl1/embryo_cvs.bb @@ -4,8 +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}" PR = "r0" -inherit efl1 lib_package - -FILES_${PN}-examples = "${datadir}/${PN}/examples" +inherit efl_library diff --git a/packages/efl1/emotion_0.0.1.006.bb b/packages/efl1/emotion_cvs.bb index bdfcbebee1..84302e4793 100644 --- a/packages/efl1/emotion_0.0.1.006.bb +++ b/packages/efl1/emotion_cvs.bb @@ -3,11 +3,10 @@ LICENSE = "MIT" # we no longer build the libxine backend, since the gstreamer backend seems more promising DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base" RRECOMMENDS_${PN} = "emotion-backend-gstreamer" +PV = "0.0.1+cvs${SRCDATE}" PR = "r0" -inherit efl1 - -SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/emotion-${PV}.tar.gz" +inherit efl_library EXTRA_OECONF = "--disable-xine --enable-gstreamer" diff --git a/packages/efl1/engrave_cvs.bb b/packages/efl1/engrave_cvs.bb index 169ba856a7..689e254fc1 100644 --- a/packages/efl1/engrave_cvs.bb +++ b/packages/efl1/engrave_cvs.bb @@ -4,13 +4,4 @@ LICENSE = "MIT" DEPENDS = "evas ecore" PV = "0.0.0+cvs${SRCDATE}" -inherit efl1 - -SRC_URI = "${E_CVS};module=e17/libs/engrave" -S = "${WORKDIR}/engrave" - -PACKAGES =+ "${PN}-tests" -FILES_${PN}-tests = "${bindir}/*_* ${datadir}" -FILES_${PN}-dev += "${bindir}/*-config" -FILES_${PN} = "${libdir}/*.so*" - +inherit efl_library diff --git a/packages/efl1/enhance_cvs.bb b/packages/efl1/enhance_cvs.bb index 8e30cf0033..728beb61ec 100644 --- a/packages/efl1/enhance_cvs.bb +++ b/packages/efl1/enhance_cvs.bb @@ -3,13 +3,4 @@ LICENSE = "MIT" DEPENDS = "exml" PV = "0.0.0+cvs${SRCDATE}" -inherit efl1 - -SRC_URI = "${E_CVS};module=e17/libs/enhance" -S = "${WORKDIR}/enhance" - -PACKAGES =+ "${PN}-tests" -FILES_${PN}-tests = "${bindir}/*_* ${datadir}" -FILES_${PN}-dev += "${bindir}/*-config" -FILES_${PN} = "${libdir}/*.so*" - +inherit efl_library diff --git a/packages/efl1/epdf/.mtn2git_empty b/packages/efl1/epdf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/efl1/epdf/.mtn2git_empty diff --git a/packages/efl1/epdf/fix-plugin-path-check.patch b/packages/efl1/epdf/fix-plugin-path-check.patch new file mode 100644 index 0000000000..dd5469c286 --- /dev/null +++ b/packages/efl1/epdf/fix-plugin-path-check.patch @@ -0,0 +1,24 @@ +Index: epdf/configure.in +=================================================================== +--- epdf.orig/configure.in ++++ epdf/configure.in +@@ -27,8 +27,8 @@ PKG_CHECK_MODULES(EWL, + [ + have_ewl="yes" + requirements="$requirements ewl" +- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`" +- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`" ++ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/" ++ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/" + AC_SUBST(EWL_TEST_LIBS_DIR) + AC_SUBST(EWL_TEST_SOURCE_DIR) + ], +@@ -55,7 +55,7 @@ PKG_CHECK_MODULES(EPSILON, + [ + have_epsilon="yes" + requirements="$requirements epsilon imlib2" +- EPSILON_PLUGINS_DIR="`$PKG_CONFIG --variable=pluginsdir epsilon`" ++ EPSILON_PLUGINS_DIR="/usr/lib/epsilon/plugins/" + AC_SUBST(EPSILON_PLUGINS_DIR) + ], + [ diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb index d9206dc4e4..2681b941d2 100644 --- a/packages/efl1/epdf_cvs.bb +++ b/packages/efl1/epdf_cvs.bb @@ -1,15 +1,22 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler" LICENSE = "BSD" -DEPENDS = "poppler evas ecore etk ewl" +DEPENDS = "poppler0.6 evas ecore etk ewl" PV = "0.1.0+cvs${SRCDATE}" -inherit efl1 +inherit efl_library -SRC_URI = "${E_CVS};module=e17/proto/epdf" -S = "${WORKDIR}/epdf" +SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \ + file://fix-plugin-path-check.patch;HACK=1;patch=1" -PACKAGES =+ "${PN}-tests" -FILES_${PN}-tests = "${bindir}/*_* ${datadir}" -FILES_${PN}-dev += "${bindir}/*-config" -FILES_${PN} = "${libdir}/*.so*" +# add ewl additions +FILES_${PN}-dev += "${libdir}/ewl/tests/*.a ${libdir}/ewl/tests/*.la" +FILES_${PN}-dbg += "${libdir}/ewl/tests/.debug" + +# add epsilon additions +FILES_${PN}-dev += "${libdir}/epsilon/plugins/epdf_thumbnailer.a ${libdir}/epsilon/plugins/epdf_thumbnailer.la" +FILES_${PN}-dbg += "${libdir}/epsilon/plugins/.debug" + +PACKAGES += "${PN}-ewl-widget epsilon-plugin-${PN}" +FILES_${PN}-ewl-widget = "${libdir}/ewl/tests/libewl_pdf*.so*" +FILES_epsilon-plugin-${PN} = "${libdir}/epsilon/plugins/epdf_thumbnailer.so*" diff --git a/packages/efl1/epeg_0.9.0.009.bb b/packages/efl1/epeg_cvs.bb index 6a99269291..3991dd3d21 100644 --- a/packages/efl1/epeg_0.9.0.009.bb +++ b/packages/efl1/epeg_cvs.bb @@ -1,8 +1,7 @@ DESCRIPTION = "Epeg is a small library for handling thumbnails." LICENSE = "MIT" DEPENDS = "jpeg" +PV = "0.9.0+cvs${SRCDATE}" +PR = "r0" -inherit efl1 - -FILES_${PN} = "${libdir}/lib*.so*" -FILES_${PN}-dev += "${bindir}/*-config" +inherit efl_library diff --git a/packages/efl1/epsilon_0.3.0.009.bb b/packages/efl1/epsilon_0.3.0.009.bb deleted file mode 100644 index ffda151f8b..0000000000 --- a/packages/efl1/epsilon_0.3.0.009.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \ -that is compliant with the freedesktop.org Thumbnail Managing Standard." -LICENSE = "BSD" -# can also depend on xine for movie thumbnails -DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native" -PR = "r1" - -inherit efl1 - -PACKAGES =+ "epsilon-tests" -FILES_epsilon-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}" -FILES_${PN} = "${libdir}/lib*.so*" diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb index 4199288115..be2934dec8 100644 --- a/packages/efl1/epsilon_cvs.bb +++ b/packages/efl1/epsilon_cvs.bb @@ -2,16 +2,13 @@ DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \ that is compliant with the freedesktop.org Thumbnail Managing Standard." LICENSE = "BSD" # can also depend on xine for movie thumbnails -DEPENDS = "imlib2 epeg epdf libpng evas ecore edje perl-native" -PV = "0.3.0.009+cvs${SRCDATE}" +DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native" +PV = "0.3.0+cvs${SRCDATE}" -inherit efl1 +inherit efl_library -SRC_URI = "${E_CVS};module=e17/libs/epsilon" -S = "${WORKDIR}/epsilon" +# a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well +EXTRA_OECONF = "--disable-xine" -PACKAGES =+ "epsilon-tests" -FILES_epsilon-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}" -FILES_${PN} = "${libdir}/lib*.so* ${libdir}/${PN}/plugins/*.so" FILES_${PN}-dev += "${libdir}/${PN}/*/*.a ${libdir}/${PN}/*/*.la" FILES_${PN}-dbg += "${libdir}/${PN}/plugins/.debug/*.so" diff --git a/packages/efl1/esmart_0.9.0.009.bb b/packages/efl1/esmart_cvs.bb index 928a8c1afd..17e1f42b95 100644 --- a/packages/efl1/esmart_0.9.0.009.bb +++ b/packages/efl1/esmart_cvs.bb @@ -1,10 +1,11 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects" LICENSE = "MIT" DEPENDS = "evas ecore edje imlib2 epsilon libtool" +PV = "0.9.0+cvs${SRCDATE}" -inherit efl1 +inherit efl_library -S = "${WORKDIR}/esmart-${PV}" +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" PACKAGES =+ "${PN}-textentry \ ${PN}-thumb \ @@ -13,6 +14,7 @@ PACKAGES =+ "${PN}-textentry \ ${PN}-file-dialog \ ${PN}-draggies \ ${PN}-trans-x11" + FILES_${PN}-dbg += "${libdir}/.debug/ ${libdir}/esmart/*/.debug/" FILES_${PN}-textentry = "${libdir}/libesmart_text_entry*.so*" FILES_${PN}-thumb = "${libdir}/libesmart_thumb*.so*" diff --git a/packages/efl1/etk-native/.mtn2git_empty b/packages/efl1/etk-native/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/efl1/etk-native/.mtn2git_empty diff --git a/packages/efl1/etk-native_cvs.bb b/packages/efl1/etk-native_cvs.bb new file mode 100644 index 0000000000..6770be4ab3 --- /dev/null +++ b/packages/efl1/etk-native_cvs.bb @@ -0,0 +1,10 @@ +require etk_cvs.bb +inherit native +DEPENDS = "evas-native ecore-native edje-native" + +SRC_URI += "file://no-tests.patch;patch=1" + +do_stage_append() { + mv ${STAGING_DIR}/include/etk ${STAGING_INCDIR} +} + diff --git a/packages/efl1/etk_0.1.0.004.bb b/packages/efl1/etk_cvs.bb index c693f17ce5..ad959edef6 100644 --- a/packages/efl1/etk_0.1.0.004.bb +++ b/packages/efl1/etk_cvs.bb @@ -1,9 +1,12 @@ DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries." DEPENDS = "evas ecore edje" LICENSE = "MIT" -PR = "r2" +PV = "0.1.0+cvs${SRCDATE}" +PR = "r0" -inherit efl1 +inherit efl_library + +# TODO package engines seperatly (do_split_packages) PACKAGES =+ "etk-engines" FILES_${PN} = "${libdir}/libetk.so*" diff --git a/packages/efl1/evas-native_0.9.9.038.bb b/packages/efl1/evas-native_cvs.bb index e79695c1f2..8b8694899e 100644 --- a/packages/efl1/evas-native_0.9.9.038.bb +++ b/packages/efl1/evas-native_cvs.bb @@ -1,13 +1,14 @@ require evas.inc inherit native DEPENDS = "freetype-native libpng-native jpeg-native eet-native" -PR = "r9" +PR = "r0" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ - --disable-fb \ + --disable-fb \ --disable-directfb \ + --disable-sdl \ --enable-buffer \ --disable-software-ddraw \ --disable-software-qtopia \ diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index f3d78f0255..6fb6d7f60e 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -4,29 +4,18 @@ down to using normal X11 primitives such as pixmaps, lines and rectangles if \ your CPU or graphics hardware are too slow." LICENSE = "MIT" # can also depend on valgrind (?) -DEPENDS = "directfb eet freetype jpeg virtual/libx11 libxext" +DEPENDS = "libsdl-x11 directfb eet freetype jpeg virtual/libx11 libxext" +PV = "0.9.9+cvs${SRCDATE}" -inherit efl1 +inherit efl_library export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" -SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \ - file://fix-configure.patch;patch=1 \ - ${E_CVS};module=e17/libs/evas/m4;date=20060101" - -S = "${WORKDIR}/evas-${PV}" +SRC_URI += "file://fix-configure.patch;patch=1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" EXTRA_OECONF = "<override me>" -do_configure_prepend() { - if [ -e "${WORKDIR}/m4" ]; then - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 - fi -} - python populate_packages_prepend () { for plugin_type in "engines loaders savers".split(): bb.note( "splitting packages for evas %s..." % plugin_type ) @@ -35,23 +24,13 @@ python populate_packages_prepend () { do_split_packages(d, basedir, '^(.*)', output_pattern = 'evas-' + plugin_type[:-1] + "-%s", description = 'Evas module %s', - allow_dirs=True, recursive=False ) + allow_dirs=True, recursive=False, extra_depends="" ) } do_install_append() { find "${D}" -name .debug -type d | xargs -iBLAH rm -rf "BLAH" } -#do_stage_append() { -# cd src -# modules=`find modules -name ".libs"` -# for module in $modules -# do -# install -d ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH} -# install -m 0755 $module/module.so ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH}/module.so -# done -#} - FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la" FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/" FILES_${PN} = "${libdir}/libevas*.so*" diff --git a/packages/efl1/evas_0.9.9.038.bb b/packages/efl1/evas_cvs.bb index 79fdd42173..b80ff8bcba 100644 --- a/packages/efl1/evas_0.9.9.038.bb +++ b/packages/efl1/evas_cvs.bb @@ -1,16 +1,17 @@ require evas.inc -PR = "r9" +PR = "r0" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ --enable-fb \ --enable-directfb \ + --enable-sdl \ --enable-buffer \ --disable-software-ddraw \ --disable-software-qtopia \ --enable-software-x11 \ - --enable-software-16-x11 \ + --disable-software-16-x11 \ --disable-software-xcb \ --disable-gl-x11 \ --enable-xrender-x11 \ diff --git a/packages/efl1/evolve-native_cvs.bb b/packages/efl1/evolve-native_cvs.bb new file mode 100644 index 0000000000..8478b6b0d8 --- /dev/null +++ b/packages/efl1/evolve-native_cvs.bb @@ -0,0 +1,6 @@ +require evolve_cvs.bb +inherit native +DEPENDS = "etk-native" + +# needs ecore-x :/ +BROKEN = "1" diff --git a/packages/efl1/evolve_cvs.bb b/packages/efl1/evolve_cvs.bb new file mode 100644 index 0000000000..272d90002e --- /dev/null +++ b/packages/efl1/evolve_cvs.bb @@ -0,0 +1,6 @@ +DESCRIPTION = "Evolve allows you to write ETK designs using a C-like language" +LICENSE = "MIT" +DEPENDS = "etk evolve-native" +PV = "0.0.0+cvs${SRCDATE}" + +inherit efl_library diff --git a/packages/efl1/ewl_0.5.1.009.bb b/packages/efl1/ewl_0.5.1.009.bb deleted file mode 100644 index 9d60a67b82..0000000000 --- a/packages/efl1/ewl_0.5.1.009.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "The Enlightened Widget Library, \ -a simple-to-use general purpose widget library \ -based on the enlightenment foundation libraries." -DEPENDS = "evas ecore edje emotion efreet" -RSUGGESTS_${PN} += "ewl-themes" -LICENSE = "MIT" -PR = "r0" - -inherit efl1 - -SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/ewl-${PV}.tar.gz" diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb new file mode 100644 index 0000000000..2ac7c65279 --- /dev/null +++ b/packages/efl1/ewl_cvs.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "The Enlightened Widget Library, \ +a simple-to-use general purpose widget library \ +based on the enlightenment foundation libraries." +DEPENDS = "evas ecore edje emotion efreet" +RSUGGESTS_${PN} += "ewl-themes" +LICENSE = "MIT" +PV = "0.5.1+cvs${SRCDATE}" +PR = "r0" + +inherit efl_library + +# TODO package engines more granular +PACKAGES += "${PN}-plugins ${PN}-engines" + +FILES_${PN} += "${sysconfdir}/ewl/*" +FILES_${PN}-tests += "${libdir}/ewl/tests/*.so*" +FILES_${PN}-dev += "${libdir}/ewl/*/*.a ${libdir}/ewl/*/*.la" +FILES_${PN}-dbg += "${libdir}/ewl/*/.debug" + +FILES_${PN}-engines = "${libdir}/ewl/engines/*.so*" +FILES_${PN}-plugins = "${libdir}/ewl/plugins/*.so*" diff --git a/packages/efl1/exml_cvs.bb b/packages/efl1/exml_cvs.bb index 5ffdaef266..add3053a02 100644 --- a/packages/efl1/exml_cvs.bb +++ b/packages/efl1/exml_cvs.bb @@ -2,12 +2,5 @@ DESCRIPTION = "Exml is a generic XML parser wrapper." LICENSE = "MIT" DEPENDS = "libxml2 libxslt ecore" -inherit efl1 +inherit efl_library -SRC_URI = "${E_CVS};module=e17/libs/exml" -S = "${WORKDIR}/exml" - -PACKAGES =+ "${PN}-tests" -FILES_${PN}-tests = "${bindir}/*_* ${datadir}" -FILES_${PN}-dev += "${bindir}/*-config" -FILES_${PN} = "${libdir}/*.so*" diff --git a/packages/efl1/imlib2_1.4.0.001.bb b/packages/efl1/imlib2_1.4.0.002.bb index 88b532c374..a50eca9623 100644 --- a/packages/efl1/imlib2_1.4.0.001.bb +++ b/packages/efl1/imlib2_1.4.0.002.bb @@ -2,10 +2,9 @@ DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipu LICENSE = "BSD" # can also depend on tiff34, ungif or gif, z, bz2, id3tag DEPENDS = "freetype libpng jpeg" +PR = "r0" -inherit efl1 - -PR = "r1" +inherit efl_library PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters" FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" diff --git a/packages/fftw/benchfft_3.1.bb b/packages/fftw/benchfft_3.1.bb new file mode 100644 index 0000000000..8d2d8b7f34 --- /dev/null +++ b/packages/fftw/benchfft_3.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "FFTW benchmarks" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPLv2" + +SRC_URI = "http://www.fftw.org/benchfft/benchfft-${PV}.tar.gz" + +EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + diff --git a/packages/fftw/fftw.inc b/packages/fftw/fftw.inc new file mode 100644 index 0000000000..8929bec2c6 --- /dev/null +++ b/packages/fftw/fftw.inc @@ -0,0 +1,23 @@ +DESCRIPTION = "FFTW" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" + +PR = "r1" + +SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz" + +S = "${WORKDIR}/fftw-${PV}" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + + +PACKAGES =+ "lib${PN}" + +FILES_lib${PN} = "${libdir}/lib*.so.*" + +# rename binary in /bin and use u-a tpo choose between different precision implementations? diff --git a/packages/fftw/fftw_3.1.2.bb b/packages/fftw/fftw_3.1.2.bb index 58603ef24c..bb58aac8e1 100644 --- a/packages/fftw/fftw_3.1.2.bb +++ b/packages/fftw/fftw_3.1.2.bb @@ -1,15 +1,5 @@ -DESCRIPTION = "FFTW" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL" +require fftw.inc -SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz" +EXTRA_OECONF = "--disable-fortran --enable-shared" -EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/packages/fftw/fftwf_3.1.2.bb b/packages/fftw/fftwf_3.1.2.bb new file mode 100644 index 0000000000..a0bba2c968 --- /dev/null +++ b/packages/fftw/fftwf_3.1.2.bb @@ -0,0 +1,4 @@ +require fftw.inc + +EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared" + diff --git a/packages/fftw/fftwl_3.1.2.bb b/packages/fftw/fftwl_3.1.2.bb new file mode 100644 index 0000000000..9097d5f1bc --- /dev/null +++ b/packages/fftw/fftwl_3.1.2.bb @@ -0,0 +1,5 @@ +require fftw.inc + +EXTRA_OECONF = "--disable-fortran --enable-long-double --enable-shared" + + diff --git a/packages/geoclue/geoclue_git.bb b/packages/geoclue/geoclue_git.bb index 376abdc326..515cfdab1c 100644 --- a/packages/geoclue/geoclue_git.bb +++ b/packages/geoclue/geoclue_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GeoClue is a project that provide all kinds of geography information to an application" HOMEPAGE = "http://live.gnome.org/GeoClue" -DEPENDS = "gpsd libxml2 libsoup dbus-glib" +DEPENDS = "libgpsmgr libgpsbt gtk+ gpsd libxml2 gconf-dbus libsoup dbus-glib" PV = "0.0+git${SRCDATE}" PR = "r0" @@ -13,6 +13,11 @@ SRC_URI = "git://anongit.freedesktop.org/git/geoclue;protocol=git" S = "${WORKDIR}/git" + +LDFLAGS_append = " -lgthread-2.0 " + +EXTRA_OECONF = " --enable-applet=no " + do_install_append() { mkdir -p ${D}/usr/share/ cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share diff --git a/packages/gettext/gettext_0.14.1.bb b/packages/gettext/gettext_0.14.1.bb index 1cc272bf14..4e25c0e829 100644 --- a/packages/gettext/gettext_0.14.1.bb +++ b/packages/gettext/gettext_0.14.1.bb @@ -17,7 +17,7 @@ PARALLEL_MAKE = "" inherit autotools -EXTRA_OECONF += "--without-lisp" +EXTRA_OECONF += "--without-lisp --disable-csharp" acpaths = '-I ${S}/autoconf-lib-link/m4/ \ -I ${S}/gettext-runtime/m4 \ -I ${S}/gettext-tools/m4' diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb new file mode 100644 index 0000000000..4d4b80efbc --- /dev/null +++ b/packages/gnome/gnome-desktop_2.18.3.bb @@ -0,0 +1,25 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" +PR = "r2" +DESCRIPTION = "GNOME library for reading .desktop files" +inherit gnome pkgconfig + +DEPENDS = "gnome-common gnome-doc-utils libgnomeui" + +SRC_URI += "file://scrollkeeper.patch;patch=1 \ + file://no-desktop-docs.patch;patch=1;pnum=0" + +EXTRA_OECONF = "--disable-scrollkeeper" + +EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros" + +do_configure_prepend () { + cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S} +} + +FILES_${PN} += "${datadir}/gnome-about" + + +do_stage () { + autotools_stage_all +} diff --git a/packages/gnome/gnome-vfs-obexftp_0.4.bb b/packages/gnome/gnome-vfs-obexftp_0.4.bb new file mode 100644 index 0000000000..3035e8f020 --- /dev/null +++ b/packages/gnome/gnome-vfs-obexftp_0.4.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "obex plugin for gnome-vfs" +LICENSE = "GPLv2" +DEPENDS = "openobex gnome-vfs bluez-utils" + +PR = "r1" + +inherit gnome + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs-obexftp/${PV}/${PN}-${PV}.tar.bz2" + +FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug" +FILES_${PN} += "${libdir}/gnome-vfs-2.0/modules/*.so" + diff --git a/packages/gstreamer/gst-plugins-base_0.10.12.bb b/packages/gstreamer/gst-plugins-base_0.10.12.bb index 69a9a6e515..33b189a0ff 100644 --- a/packages/gstreamer/gst-plugins-base_0.10.12.bb +++ b/packages/gstreamer/gst-plugins-base_0.10.12.bb @@ -1,5 +1,12 @@ require gst-plugins.inc PROVIDES += "gst-plugins" -PR = "r1" + +# gst-plugins-base only builds the alsa plugin +# if alsa has been built and is present. You will +# not get an error if this is not present, just +# a missing alsa plugin +DEPENDS += "alsa-lib" + +PR = "r2" diff --git a/packages/gtk+/gtk+-2.10.14/.mtn2git_empty b/packages/gtk+/gtk+-2.10.14/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/.mtn2git_empty diff --git a/packages/gtk+/gtk+-2.10.14/automake-lossage.patch b/packages/gtk+/gtk+-2.10.14/automake-lossage.patch new file mode 100644 index 0000000000..0d423ddbb9 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/automake-lossage.patch @@ -0,0 +1,24 @@ +--- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100 ++++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100 +@@ -52,21 +52,5 @@ + + dist-hook: html + cp -Rp $(srcdir)/html $(distdir) +-else +-html: +- echo "***" +- echo "*** Warning: Tutorial not built" +- echo "***" +- +-pdf: +- echo "***" +- echo "*** Warning: Tutorial not built" +- echo "***" +- +-dist-hook: +- echo "***" +- echo "*** Warning: Tutorial not built" +- echo "*** DISTRIBUTION IS INCOMPLETE" +- echo "***" + endif + diff --git a/packages/gtk+/gtk+-2.10.14/disable-print.patch b/packages/gtk+/gtk+-2.10.14/disable-print.patch new file mode 100644 index 0000000000..1067773f12 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/disable-print.patch @@ -0,0 +1,50 @@ +--- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 ++++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200 +@@ -1539,26 +1539,27 @@ + # Printing system checks + ################################################################ + +-AC_PATH_PROG(CUPS_CONFIG, cups-config, no) +-if test "x$CUPS_CONFIG" != "xno"; then +- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` +- CUPS_LIBS=`cups-config --libs` +- +- CUPS_API_VERSION=`cups-config --api-version` +- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` +- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` +- +- if test $CUPS_API_MAJOR -gt 1 -o \ +- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then +- AC_DEFINE(HAVE_CUPS_API_1_2) +- fi +- +- AC_SUBST(CUPS_API_MAJOR) +- AC_SUBST(CUPS_API_MINOR) +- AC_SUBST(CUPS_CFLAGS) +- AC_SUBST(CUPS_LIBS) +-fi +-AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") ++#AC_PATH_PROG(CUPS_CONFIG, cups-config, no) ++#if test "x$CUPS_CONFIG" != "xno"; then ++# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` ++# CUPS_LIBS=`cups-config --libs` ++# ++# CUPS_API_VERSION=`cups-config --api-version` ++# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` ++# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` ++# ++# if test $CUPS_API_MAJOR -gt 1 -o \ ++# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then ++# AC_DEFINE(HAVE_CUPS_API_1_2) ++# fi ++# ++# AC_SUBST(CUPS_API_MAJOR) ++# AC_SUBST(CUPS_API_MINOR) ++# AC_SUBST(CUPS_CFLAGS) ++# AC_SUBST(CUPS_LIBS) ++#fi ++#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") ++AM_CONDITIONAL(HAVE_CUPS,false) + + gtk_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" diff --git a/packages/gtk+/gtk+-2.10.14/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.14/disable-tooltips.patch new file mode 100644 index 0000000000..d71d839c3c --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/disable-tooltips.patch @@ -0,0 +1,11 @@ +--- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100 ++++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100 +@@ -118,7 +118,7 @@ + tooltips->tips_data_list = NULL; + + tooltips->delay = DEFAULT_DELAY; +- tooltips->enabled = TRUE; ++ tooltips->enabled = FALSE; + tooltips->timer_tag = 0; + tooltips->use_sticky_delay = FALSE; + tooltips->last_popdown.tv_sec = -1; diff --git a/packages/gtk+/gtk+-2.10.14/gnome-bug-341177.patch b/packages/gtk+/gtk+-2.10.14/gnome-bug-341177.patch new file mode 100644 index 0000000000..c31868462a --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/gnome-bug-341177.patch @@ -0,0 +1,217 @@ +diff -uprN gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c +--- gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c Tue Jul 12 18:58:57 2005 ++++ gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c Tue May 9 17:30:53 2006 +@@ -71,35 +71,24 @@ get_check_shift (int check_size) + return check_shift; + } + +-static void +-pixops_scale_nearest (guchar *dest_buf, +- int render_x0, +- int render_y0, +- int render_x1, +- int render_y1, +- int dest_rowstride, +- int dest_channels, +- gboolean dest_has_alpha, +- const guchar *src_buf, +- int src_width, +- int src_height, +- int src_rowstride, +- int src_channels, +- gboolean src_has_alpha, +- double scale_x, +- double scale_y) +-{ +- int i; +- int x; +- int x_step = (1 << SCALE_SHIFT) / scale_x; +- int y_step = (1 << SCALE_SHIFT) / scale_y; +- int xmax, xstart, xstop, x_pos, y_pos; +- const guchar *p; ++typedef struct { guchar a,b,c; } b3; ++extern void BUG_bad_size_of_struct_b3(void); + +-#define INNER_LOOP(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL) \ ++#define INNER_LOOP_PREP() \ ++ do { \ ++ x = render_x0 * x_step + x_step / 2; \ + xmax = x + (render_x1 - render_x0) * x_step; \ + xstart = MIN (0, xmax); \ + xstop = MIN (src_width << SCALE_SHIFT, xmax); \ ++ } while(0) ++ ++#define INNER_LOOP_BODY(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL)\ ++ do { \ ++ y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; \ ++ y_pos = CLAMP (y_pos, 0, src_height - 1); \ ++ src = src_buf + y_pos * src_rowstride; \ ++ dest = dest_buf + i * dest_rowstride; \ ++ x = render_x0 * x_step + x_step / 2; \ + p = src + (CLAMP (x, xstart, xstop) >> SCALE_SHIFT) * SRC_CHANNELS; \ + while (x < xstart) \ + { \ +@@ -121,42 +110,58 @@ pixops_scale_nearest (guchar *des + ASSIGN_PIXEL; \ + dest += DEST_CHANNELS; \ + x += x_step; \ +- } ++ } \ ++ } while(0) + +- for (i = 0; i < (render_y1 - render_y0); i++) +- { +- const guchar *src; +- guchar *dest; +- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; +- y_pos = CLAMP (y_pos, 0, src_height - 1); +- src = src_buf + y_pos * src_rowstride; +- dest = dest_buf + i * dest_rowstride; ++static void ++pixops_scale_nearest (guchar *dest_buf, ++ int render_x0, ++ int render_y0, ++ int render_x1, ++ int render_y1, ++ int dest_rowstride, ++ int dest_channels, ++ gboolean dest_has_alpha, ++ const guchar *src_buf, ++ int src_width, ++ int src_height, ++ int src_rowstride, ++ int src_channels, ++ gboolean src_has_alpha, ++ double scale_x, ++ double scale_y) ++{ ++ int i; ++ int x; ++ int x_step = (1 << SCALE_SHIFT) / scale_x; ++ int y_step = (1 << SCALE_SHIFT) / scale_y; ++ int xmax, xstart, xstop, x_pos, y_pos; ++ const guchar *p; + +- x = render_x0 * x_step + x_step / 2; ++ const guchar *src; ++ guchar *dest; + +- if (src_channels == 3) +- { +- if (dest_channels == 3) +- { +- INNER_LOOP (3, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]); +- } +- else +- { +- INNER_LOOP (3, 4, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2];dest[3]=0xff); +- } +- } +- else if (src_channels == 4) +- { +- if (dest_channels == 3) +- { +- INNER_LOOP (4, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]); +- } +- else +- { +- guint32 *p32; +- INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p)); +- } +- } ++ if(sizeof(b3) != 3) BUG_bad_size_of_struct_b3(); ++ ++ INNER_LOOP_PREP(); ++ ++ if (src_channels == 3) ++ { ++ if (dest_channels == 3) ++ for (i = 0; i < (render_y1 - render_y0); i++) ++ INNER_LOOP_BODY (3, 3, *(b3*)dest = *(b3*)p); ++ else ++ for (i = 0; i < (render_y1 - render_y0); i++) ++ INNER_LOOP_BODY (3, 4, (*(b3*)dest = *(b3*)p, dest[3]=0xff) ); ++ } ++ else if (src_channels == 4) ++ { ++ if (dest_channels == 3) ++ for (i = 0; i < (render_y1 - render_y0); i++) ++ INNER_LOOP_BODY (4, 3, *(b3*)dest = *(b3*)p); ++ else ++ for (i = 0; i < (render_y1 - render_y0); i++) ++ INNER_LOOP_BODY (4, 4, *(guint32*)dest = *((guint32*)p)); + } + } + +@@ -187,18 +192,14 @@ pixops_composite_nearest (guchar + const guchar *p; + unsigned int a0; + ++ INNER_LOOP_PREP(); ++ + for (i = 0; i < (render_y1 - render_y0); i++) + { + const guchar *src; + guchar *dest; +- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; +- y_pos = CLAMP (y_pos, 0, src_height - 1); +- src = src_buf + y_pos * src_rowstride; +- dest = dest_buf + i * dest_rowstride; +- +- x = render_x0 * x_step + x_step / 2; + +- INNER_LOOP(src_channels, dest_channels, ++ INNER_LOOP_BODY(src_channels, dest_channels, + if (src_has_alpha) + a0 = (p[3] * overall_alpha) / 0xff; + else +@@ -209,9 +210,7 @@ pixops_composite_nearest (guchar + case 0: + break; + case 255: +- dest[0] = p[0]; +- dest[1] = p[1]; +- dest[2] = p[2]; ++ *(b3*)dest = *(b3*)p; + if (dest_has_alpha) + dest[3] = 0xff; + break; +@@ -279,17 +278,12 @@ pixops_composite_color_nearest (guchar + const guchar *p; + unsigned int a0; + ++ INNER_LOOP_PREP(); ++ + for (i = 0; i < (render_y1 - render_y0); i++) + { + const guchar *src; + guchar *dest; +- y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; +- y_pos = CLAMP (y_pos, 0, src_height - 1); +- src = src_buf + y_pos * src_rowstride; +- dest = dest_buf + i * dest_rowstride; +- +- x = render_x0 * x_step + x_step / 2; +- + + if (((i + check_y) >> check_shift) & 1) + { +@@ -313,7 +307,7 @@ pixops_composite_color_nearest (guchar + } + + j = 0; +- INNER_LOOP(src_channels, dest_channels, ++ INNER_LOOP_BODY(src_channels, dest_channels, + if (src_has_alpha) + a0 = (p[3] * overall_alpha + 0xff) >> 8; + else +@@ -372,7 +366,8 @@ pixops_composite_color_nearest (guchar + ); + } + } +-#undef INNER_LOOP ++#undef INNER_LOOP_BODY ++#undef INNER_LOOP_PREP + + static void + composite_pixel (guchar *dest, int dest_x, int dest_channels, int dest_has_alpha, diff --git a/packages/gtk+/gtk+-2.10.14/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.14/gtk+-handhelds.patch new file mode 100644 index 0000000000..1ea86ce6b2 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/gtk+-handhelds.patch @@ -0,0 +1,149 @@ +Index: gtk+-2.10.6/gtk/gtkarrow.c +=================================================================== +--- gtk+-2.10.6.orig/gtk/gtkarrow.c 2006-05-14 05:25:28.000000000 +0100 ++++ gtk+-2.10.6/gtk/gtkarrow.c 2006-11-14 12:03:45.000000000 +0000 +@@ -31,7 +31,7 @@ + #include "gtkintl.h" + #include "gtkalias.h" + +-#define MIN_ARROW_SIZE 15 ++#define MIN_ARROW_SIZE 7 + + enum { + PROP_0, +@@ -53,6 +53,8 @@ + guint prop_id, + GValue *value, + GParamSpec *pspec); ++static void gtk_arrow_size_request (GtkWidget *arrow, ++ GtkRequisition *requisition); + + + G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC) +@@ -88,6 +90,7 @@ + GTK_PARAM_READWRITE)); + + widget_class->expose_event = gtk_arrow_expose; ++ widget_class->size_request = gtk_arrow_size_request; + } + + static void +@@ -143,13 +146,18 @@ + } + + static void ++gtk_arrow_size_request (GtkWidget *arrow, ++ GtkRequisition *requisition) ++{ ++ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; ++ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; ++} ++ ++static void + gtk_arrow_init (GtkArrow *arrow) + { + GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW); + +- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; +- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; +- + arrow->arrow_type = GTK_ARROW_RIGHT; + arrow->shadow_type = GTK_SHADOW_OUT; + } +Index: gtk+-2.10.6/gtk/gtkentry.c +=================================================================== +--- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-11-14 12:03:45.000000000 +0000 ++++ gtk+-2.10.6/gtk/gtkentry.c 2006-11-14 12:07:02.000000000 +0000 +@@ -577,6 +577,18 @@ + 0.0, + GTK_PARAM_READWRITE)); + ++ // Added by gtk+-handhelds.patch ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_int ("min_width", ++ P_("Minimum width"), ++ P_("Minimum width of the entry field"), ++ 0, ++ G_MAXINT, ++ MIN_ENTRY_WIDTH, ++ G_PARAM_READABLE)); ++ ++ ++ + /** + * GtkEntry:truncate-multiline: + * +@@ -1286,7 +1298,7 @@ + { + GtkEntry *entry = GTK_ENTRY (widget); + PangoFontMetrics *metrics; +- gint xborder, yborder; ++ gint xborder, yborder, min_width; + GtkBorder inner_border; + PangoContext *context; + +@@ -1302,8 +1314,10 @@ + _gtk_entry_get_borders (entry, &xborder, &yborder); + _gtk_entry_effective_inner_border (entry, &inner_border); + ++ gtk_widget_style_get (widget, "min_width", &min_width, NULL); ++ + if (entry->width_chars < 0) +- requisition->width = MIN_ENTRY_WIDTH + xborder * 2 + inner_border.left + inner_border.right; ++ requisition->width = min_width + xborder * 2 + inner_border.left + inner_border.right; + else + { + gint char_width = pango_font_metrics_get_approximate_char_width (metrics); +Index: gtk+-2.10.6/gtk/gtkrange.c +=================================================================== +--- gtk+-2.10.6.orig/gtk/gtkrange.c 2006-11-14 12:03:44.000000000 +0000 ++++ gtk+-2.10.6/gtk/gtkrange.c 2006-11-14 12:07:40.000000000 +0000 +@@ -197,6 +197,7 @@ + static gboolean gtk_range_key_press (GtkWidget *range, + GdkEventKey *event); + ++static GdkAtom recognize_protocols_atom, atom_atom; + + static guint signals[LAST_SIGNAL]; + +@@ -213,6 +214,9 @@ + object_class = (GtkObjectClass*) class; + widget_class = (GtkWidgetClass*) class; + ++ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE); ++ atom_atom = gdk_atom_intern ("ATOM", FALSE); ++ + gobject_class->set_property = gtk_range_set_property; + gobject_class->get_property = gtk_range_get_property; + gobject_class->finalize = gtk_range_finalize; +@@ -1020,6 +1024,12 @@ + &attributes, attributes_mask); + gdk_window_set_user_data (range->event_window, range); + ++ gdk_property_change (range->event_window, ++ recognize_protocols_atom, ++ atom_atom, ++ 32, GDK_PROP_MODE_REPLACE, ++ NULL, 0); ++ + widget->style = gtk_style_attach (widget->style, widget->window); + } + +@@ -1569,7 +1579,7 @@ + + /* ignore presses when we're already doing something else. */ + if (range->layout->grab_location != MOUSE_OUTSIDE) +- return FALSE; ++ return TRUE; + + range->layout->mouse_x = event->x; + range->layout->mouse_y = event->y; +@@ -1778,7 +1788,7 @@ + return TRUE; + } + +- return FALSE; ++ return TRUE; + } + + /** diff --git a/packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch b/packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch new file mode 100644 index 0000000000..df29656343 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch @@ -0,0 +1,10 @@ +--- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 ++++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 +@@ -1623,6 +1623,7 @@ + + /* We have to clear the layout, fonts etc. may have changed */ + gtk_label_clear_layout (label); ++ gtk_widget_queue_resize (GTK_WIDGET (label)); + } + + static void diff --git a/packages/gtk+/gtk+-2.10.14/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.14/hardcoded_libtool.patch new file mode 100644 index 0000000000..6adb0cfef6 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/hardcoded_libtool.patch @@ -0,0 +1,29 @@ +--- /tmp/configure.in 2007-01-08 17:50:49.000000000 +0100 ++++ gtk+-2.10.7/configure.in 2007-01-08 17:52:33.495251000 +0100 +@@ -371,7 +371,7 @@ + case $enable_explicit_deps in + auto) + export SED +- deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh` ++ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo $deplibs_check_method') | sh` + if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then + enable_explicit_deps=yes + else +@@ -773,7 +773,7 @@ + dnl Now we check to see if our libtool supports shared lib deps + dnl (in a rather ugly way even) + if $dynworks; then +- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" ++ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" + pixbuf_deplibs_check=`$pixbuf_libtool_config | \ + grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ + sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` +@@ -1611,7 +1611,7 @@ + # We are using gmodule-no-export now, but I'm leaving the stripping + # code in place for now, since pango and atk still require gmodule. + export SED +-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + if test -n "$export_dynamic"; then + GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` + GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` diff --git a/packages/gtk+/gtk+-2.10.14/integer-pixops.patch b/packages/gtk+/gtk+-2.10.14/integer-pixops.patch new file mode 100644 index 0000000000..490a60dd8a --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/integer-pixops.patch @@ -0,0 +1,348 @@ +--- /tmp/config.h.in 2006-12-23 00:00:38.000000000 +0100 ++++ gtk+-2.10.6/config.h.in 2006-12-23 00:01:05.632227000 +0100 +@@ -253,3 +253,7 @@ + + /* Define to `int' if <sys/types.h> doesn't define. */ + #undef uid_t ++ ++/* Define to use integer math rather than floating point where possible. */ ++#undef ENABLE_INTEGER_PIXOPS ++ +--- /tmp/configure.in 2006-12-23 00:02:16.000000000 +0100 ++++ gtk+-2.10.6/configure.in 2006-12-23 00:05:11.172227000 +0100 +@@ -203,6 +203,15 @@ + [AC_HELP_STRING([--disable-rebuilds], + [disable all source autogeneration rules])],, + [enable_rebuilds=yes]) ++AC_ARG_ENABLE(integer-pixops, ++ [AC_HELP_STRING([--enable-integer-pixops], ++ [use integer math where possible])],, ++ [enable_integer_pixops=no]) ++ ++if test "x$enable_integer_pixops" = "xyes"; then ++ AC_DEFINE(ENABLE_INTEGER_PIXOPS) ++fi ++ + AC_ARG_ENABLE(visibility, + [AC_HELP_STRING([--disable-visibility], + [don't use ELF visibility attributes])],, +--- /tmp/pixops.c 2006-12-23 10:04:02.000000000 +0100 ++++ gtk+-2.10.6/gdk-pixbuf/pixops/pixops.c 2006-12-23 10:04:21.772227000 +0100 +@@ -28,6 +28,10 @@ + #define SUBSAMPLE_MASK ((1 << SUBSAMPLE_BITS)-1) + #define SCALE_SHIFT 16 + ++#ifdef ENABLE_INTEGER_PIXOPS ++#define FRAC 0x10000ULL ++#endif ++ + typedef struct _PixopsFilter PixopsFilter; + typedef struct _PixopsFilterDimension PixopsFilterDimension; + +@@ -972,6 +976,29 @@ + (*pixel_func) (dest, dest_x, dest_channels, dest_has_alpha, src_has_alpha, check_size, color1, color2, r, g, b, a); + } + ++#ifdef ENABLE_INTEGER_PIXOPS ++ ++static void ++correct_total (int *weights, ++ int n_x, ++ int n_y, ++ int total, ++ unsigned long overall_alpha) ++{ ++ int correction = (int)(overall_alpha - total); ++ int i; ++ for (i = n_x * n_y - 1; i >= 0; i--) ++ { ++ if (*(weights + i) + correction >= 0) ++ { ++ *(weights + i) += correction; ++ break; ++ } ++ } ++} ++ ++#else ++ + static void + correct_total (int *weights, + int n_x, +@@ -998,6 +1025,8 @@ + } + } + ++#endif ++ + static int * + make_filter_table (PixopsFilter *filter) + { +@@ -1026,7 +1055,11 @@ + *(pixel_weights + n_x * i + j) = weight; + } + +- correct_total (pixel_weights, n_x, n_y, total, filter->overall_alpha); ++#ifdef ENABLE_INTEGER_PIXOPS ++ correct_total (pixel_weights, n_x, n_y, total, overall_alpha * FRAC); ++#else ++ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); ++#endif + } + + return weights; +@@ -1178,6 +1211,93 @@ + /* Compute weights for reconstruction by replication followed by + * sampling with a box filter + */ ++#ifdef ENABLE_INTEGER_PIXOPS ++ ++static void ++tile_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d) ++{ ++ int i_offset, j_offset; ++ unsigned long x_scale = x_scale_d * FRAC; ++ unsigned long y_scale = y_scale_d * FRAC; ++ unsigned long overall_alpha = overall_alpha_d * FRAC; ++ unsigned long x_scale_r = FRAC / x_scale; ++ unsigned long y_scale_r = FRAC / y_scale; ++ ++ int n_x = ceil(1/x_scale_d + 1); ++ int n_y = ceil(1/y_scale_d + 1); ++ ++ filter->x_offset = 0; ++ filter->y_offset = 0; ++ filter->n_x = n_x; ++ filter->n_y = n_y; ++ filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); ++ ++ for (i_offset=0; i_offset<SUBSAMPLE; i_offset++) ++ for (j_offset=0; j_offset<SUBSAMPLE; j_offset++) ++ { ++ int *pixel_weights = filter->weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; ++ unsigned long x = j_offset * FRAC / SUBSAMPLE; ++ unsigned long y = i_offset * FRAC / SUBSAMPLE; ++ int i,j; ++ int total = 0; ++ ++ for (i = 0; i < n_y; i++) ++ { ++ unsigned long tw, th; ++ ++ if (i < y) ++ { ++ ++ if (i + FRAC > y) ++ th = MIN(i+FRAC, y + y_scale_r) - y; ++ else ++ th = 0; ++ } ++ else ++ { ++ if (y + FRAC/y_scale > i) ++ th = MIN(i+FRAC, y + y_scale_r) - i; ++ else ++ th = 0; ++ } ++ ++ for (j = 0; j < n_x; j++) ++ { ++ int weight; ++ ++ if (j < x) ++ { ++ if (j + FRAC > x) ++ tw = MIN(j+FRAC, x + x_scale_r) - x; ++ else ++ tw = 0; ++ } ++ else ++ { ++ if (x + FRAC/x_scale > j) ++ tw = MIN(j+FRAC, x + x_scale_r) - j; ++ else ++ tw = 0; ++ } ++ ++ { ++ unsigned long lweight = (tw * x_scale) / FRAC; ++ lweight = (lweight * th) / FRAC; ++ lweight = (lweight * y_scale) / FRAC; ++ lweight = (lweight * overall_alpha) / FRAC; ++ weight = lweight; ++ } ++ total += weight; ++ *(pixel_weights + n_x * i + j) = weight; ++ } ++ } ++ ++ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); ++ } ++} ++ ++#else ++ + static void + tile_make_weights (PixopsFilterDimension *dim, + double scale) +@@ -1216,10 +1336,151 @@ + } + } + ++#endif ++ + /* Compute weights for a filter that, for minification + * is the same as 'tiles', and for magnification, is bilinear + * reconstruction followed by a sampling with a delta function. + */ ++#ifdef ENABLE_INTEGER_PIXOPS ++ ++static void ++bilinear_magnify_make_weights (PixopsFilter *filter, double x_scale_d, double y_scale_d, double overall_alpha_d) ++{ ++ int i_offset, j_offset; ++ unsigned long *x_weights, *y_weights; ++ int n_x, n_y; ++ unsigned long x_scale = x_scale_d * FRAC; ++ unsigned long y_scale = y_scale_d * FRAC; ++ unsigned long overall_alpha = overall_alpha_d * FRAC; ++ unsigned long x_scale_r = (FRAC / x_scale_d); ++ unsigned long y_scale_r = (FRAC / y_scale_d); ++ ++ if (x_scale > FRAC) /* Bilinear */ ++ { ++ n_x = 2; ++ filter->x_offset = 0.5 * (1/x_scale_d - 1); ++ } ++ else /* Tile */ ++ { ++ n_x = ceil(1.0 + 1.0/x_scale_d); ++ filter->x_offset = 0.0; ++ } ++ ++ if (y_scale > FRAC) /* Bilinear */ ++ { ++ n_y = 2; ++ filter->y_offset = 0.5 * (1/y_scale_d - 1); ++ } ++ else /* Tile */ ++ { ++ n_y = ceil(1.0 + 1.0/y_scale_d); ++ filter->y_offset = 0.0; ++ } ++ ++ filter->n_y = n_y; ++ filter->n_x = n_x; ++ filter->weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); ++ ++ x_weights = g_new (unsigned long, n_x); ++ y_weights = g_new (unsigned long, n_y); ++ ++ for (i_offset=0; i_offset<SUBSAMPLE; i_offset++) ++ for (j_offset=0; j_offset<SUBSAMPLE; j_offset++) ++ { ++ int *pixel_weights = filter->weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; ++ unsigned long x = j_offset * FRAC / SUBSAMPLE; ++ unsigned long y = i_offset * FRAC / SUBSAMPLE; ++ int i,j; ++ int total = 0; ++ ++ if (x_scale > FRAC) /* Bilinear */ ++ { ++ for (i = 0; i < n_x; i++) ++ { ++ /* x_weights[i] = ((i == 0) ? (1 - x) : x) / x_scale; */ ++ unsigned long w = (((i == 0) ? (FRAC - x) : x) * x_scale_r); ++ x_weights[i] = w / FRAC; ++ } ++ } ++ else /* Tile */ ++ { ++ /* x ++ * ---------|--.-|----|--.-|------- SRC ++ * ------------|---------|--------- DEST ++ */ ++ for (i = 0; i < n_x; i++) ++ { ++ if (i < x) ++ { ++ if (i + 1 > x) ++ x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (x * FRAC); ++ else ++ x_weights[i] = 0; ++ } ++ else ++ { ++ if (x + 1/x_scale > i) ++ x_weights[i] = MIN(FRAC*(i+1), FRAC * x + (((unsigned long long)(FRAC * FRAC)) / (unsigned long)x_scale)) - (i * FRAC); ++ else ++ x_weights[i] = 0; ++ } ++ } ++ } ++ ++ if (y_scale > FRAC) /* Bilinear */ ++ { ++ for (i = 0; i < n_y; i++) ++ { ++ unsigned long w = ((unsigned long)((i == 0) ? (FRAC - y) : y) * y_scale_r); ++ y_weights[i] = w / FRAC; ++ } ++ } ++ else /* Tile */ ++ { ++ /* y ++ * ---------|--.-|----|--.-|------- SRC ++ * ------------|---------|--------- DEST ++ */ ++ for (i = 0; i < n_y; i++) ++ { ++ if (i < y) ++ { ++ if (i + 1 > y) ++ y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (y * FRAC); ++ else ++ y_weights[i] = 0; ++ } ++ else ++ { ++ if (y + 1/y_scale > i) ++ y_weights[i] = MIN(FRAC*(i+1), FRAC * y + (FRAC * FRAC / (unsigned long)y_scale)) - (i * FRAC); ++ else ++ y_weights[i] = 0; ++ } ++ } ++ } ++ ++ for (i = 0; i < n_y; i++) ++ for (j = 0; j < n_x; j++) ++ { ++ unsigned long long weight = (x_weights[j] * x_scale) / FRAC; ++ weight = (weight * y_weights[i]) / FRAC; ++ weight = (weight * y_scale) / FRAC; ++ weight = (weight * overall_alpha) / FRAC; ++ *(pixel_weights + n_x * i + j) = (unsigned long)weight; ++ total += (unsigned long)weight; ++ } ++ ++ correct_total (pixel_weights, n_x, n_y, total, overall_alpha); ++ } ++ ++ g_free (x_weights); ++ g_free (y_weights); ++} ++ ++#else ++ + static void + bilinear_magnify_make_weights (PixopsFilterDimension *dim, + double scale) +@@ -1283,6 +1544,8 @@ + } + } + ++#endif ++ + /* Computes the integral from b0 to b1 of + * + * f(x) = x; 0 <= x < 1 diff --git a/packages/gtk+/gtk+-2.10.14/menu-deactivate.patch b/packages/gtk+/gtk+-2.10.14/menu-deactivate.patch new file mode 100644 index 0000000000..cfb8849e9f --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/menu-deactivate.patch @@ -0,0 +1,51 @@ +--- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200 ++++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200 +@@ -42,7 +42,7 @@ + #include "gtkintl.h" + #include "gtkalias.h" + +-#define MENU_SHELL_TIMEOUT 500 ++#define MENU_SHELL_TIMEOUT 2000 + + #define PACK_DIRECTION(m) \ + (GTK_IS_MENU_BAR (m) \ +@@ -203,6 +203,8 @@ + + G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) + ++static int last_crossing_time; ++ + static void + gtk_menu_shell_class_init (GtkMenuShellClass *klass) + { +@@ -517,6 +519,7 @@ + gtk_grab_add (GTK_WIDGET (menu_shell)); + menu_shell->have_grab = TRUE; + menu_shell->active = TRUE; ++ last_crossing_time = 0; + } + } + +@@ -669,6 +672,13 @@ + menu_shell->activate_time = 0; + deactivate = FALSE; + } ++ ++ if (last_crossing_time != 0 ++ && ((event->time - last_crossing_time) < 500)) ++ { ++ last_crossing_time = 0; ++ deactivate = FALSE; ++ } + + if (deactivate) + { +@@ -716,6 +726,8 @@ + { + menu_item = gtk_get_event_widget ((GdkEvent*) event); + ++ last_crossing_time = event->time; ++ + if (!menu_item || + (GTK_IS_MENU_ITEM (menu_item) && + !_gtk_menu_item_is_selectable (menu_item))) diff --git a/packages/gtk+/gtk+-2.10.14/migration.patch b/packages/gtk+/gtk+-2.10.14/migration.patch new file mode 100644 index 0000000000..4ee786e688 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/migration.patch @@ -0,0 +1,611 @@ +Index: configure.in +=================================================================== +--- configure.in.orig 2006-10-03 17:54:09.000000000 +0100 ++++ configure.in 2006-10-30 12:58:33.000000000 +0000 +@@ -1529,6 +1529,16 @@ + GTK_EXTRA_CFLAGS="$msnative_struct" + fi + ++AC_ARG_ENABLE(display-migration, ++ [AC_HELP_STRING([--enable-display-migration], ++ [include support for GPE_CHANGE_DISPLAY protocol])], ++ enable_migration=yes, enable_migration=no) ++if test "$enable_migration" = "yes"; then ++ AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled]) ++ GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt" ++fi ++AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes") ++ + AC_SUBST(GTK_PACKAGES) + AC_SUBST(GTK_EXTRA_LIBS) + AC_SUBST(GTK_EXTRA_CFLAGS) +Index: gtk/Makefile.am +=================================================================== +--- gtk/Makefile.am.orig 2006-10-02 18:27:53.000000000 +0100 ++++ gtk/Makefile.am 2006-10-30 12:59:14.000000000 +0000 +@@ -589,6 +589,11 @@ + gtkwindow-decorate.c \ + gtkwindow.c \ + $(gtk_clipboard_dnd_c_sources) ++ ++if ENABLE_MIGRATION ++gtk_base_c_sources += gtkmigration.c ++endif ++ + gtk_c_sources = $(gtk_base_c_sources) + gtk_all_c_sources = $(gtk_base_c_sources) + +Index: gtk/gtkmain.c +=================================================================== +--- gtk/gtkmain.c.orig 2006-09-03 06:31:21.000000000 +0100 ++++ gtk/gtkmain.c 2006-10-30 12:56:34.000000000 +0000 +@@ -507,6 +507,10 @@ + _gtk_accel_map_init (); + _gtk_rc_init (); + ++#ifdef ENABLE_MIGRATION ++ gtk_migration_init (); ++#endif ++ + /* Set the 'initialized' flag. + */ + gtk_initialized = TRUE; +Index: gtk/gtkmigration.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gtk/gtkmigration.c 2006-10-30 12:56:34.000000000 +0000 +@@ -0,0 +1,529 @@ ++/* ++ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ */ ++ ++#include <stdlib.h> ++#include <ctype.h> ++#include <libintl.h> ++#include <string.h> ++#include <assert.h> ++ ++#include <X11/X.h> ++#include <X11/Xlib.h> ++#include <X11/Xatom.h> ++ ++#include <gcrypt.h> ++ ++#include "gtk.h" ++#include "gdk.h" ++#include "x11/gdkx.h" ++ ++#define _(x) gettext(x) ++ ++static GdkAtom string_gdkatom, display_change_gdkatom; ++static GdkAtom rsa_challenge_gdkatom; ++ ++#define DISPLAY_CHANGE_SUCCESS 0 ++#define DISPLAY_CHANGE_UNABLE_TO_CONNECT 1 ++#define DISPLAY_CHANGE_NO_SUCH_SCREEN 2 ++#define DISPLAY_CHANGE_AUTHENTICATION_BAD 3 ++#define DISPLAY_CHANGE_INDETERMINATE_ERROR 4 ++ ++static gboolean no_auth; ++ ++static GSList *all_widgets; ++ ++static gboolean gtk_migration_initialised; ++ ++#define CHALLENGE_LEN 64 ++ ++gchar *gtk_migration_auth_challenge_string; ++ ++static unsigned char challenge_bytes[CHALLENGE_LEN]; ++static unsigned long challenge_seq; ++ ++#define hexbyte(x) ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0') ++ ++struct rsa_key ++{ ++ gcry_mpi_t n, e, d, p, q, u; ++}; ++ ++static gcry_mpi_t ++mpi_from_sexp (gcry_sexp_t r, char *tag) ++{ ++ gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0); ++ return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG); ++} ++ ++static char * ++hex_from_mpi (gcry_mpi_t m) ++{ ++ char *buf; ++ gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m); ++ return buf; ++} ++ ++static void ++gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result) ++{ ++ size_t dlen = strlen (display); ++ gchar *buf = g_malloc (dlen + 1 + len); ++ strcpy (buf, display); ++ memcpy (buf + dlen + 1, challenge, len); ++ gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1); ++ g_free (buf); ++} ++ ++static int ++do_encode_md (const unsigned char *digest, size_t digestlen, int algo, ++ unsigned int nbits, gcry_mpi_t *r_val) ++{ ++ int nframe = (nbits+7) / 8; ++ unsigned char *frame; ++ int i, n; ++ unsigned char asn[100]; ++ size_t asnlen; ++ ++ asnlen = sizeof(asn); ++ if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen)) ++ return -1; ++ ++ if (digestlen + asnlen + 4 > nframe ) ++ return -1; ++ ++ /* We encode the MD in this way: ++ * ++ * 0 1 PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes) ++ * ++ * PAD consists of FF bytes. ++ */ ++ frame = g_malloc (nframe); ++ n = 0; ++ frame[n++] = 0; ++ frame[n++] = 1; /* block type */ ++ i = nframe - digestlen - asnlen -3 ; ++ assert ( i > 1 ); ++ memset ( frame+n, 0xff, i ); n += i; ++ frame[n++] = 0; ++ memcpy ( frame+n, asn, asnlen ); n += asnlen; ++ memcpy ( frame+n, digest, digestlen ); n += digestlen; ++ assert ( n == nframe ); ++ ++ gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe); ++ g_free (frame); ++ return 0; ++} ++ ++static gboolean ++gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf) ++{ ++ gcry_mpi_t mpi, mpi2; ++ gcry_sexp_t data, sig, key; ++ int rc; ++ ++ do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi); ++ ++ gcry_sexp_build (&data, NULL, "(data (value %m))", mpi); ++ ++ gcry_mpi_release (mpi); ++ ++ gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e); ++ ++ if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL)) ++ { ++ gcry_sexp_release (data); ++ return FALSE; ++ } ++ ++ gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2); ++ ++ rc = gcry_pk_verify (sig, data, key); ++ ++ gcry_sexp_release (data); ++ gcry_sexp_release (key); ++ gcry_sexp_release (sig); ++ gcry_mpi_release (mpi2); ++ ++ if (rc) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++static void ++gtk_migration_auth_update_challenge (void) ++{ ++ int i; ++ unsigned char *p; ++ ++ if (gtk_migration_auth_challenge_string == NULL) ++ gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9); ++ ++ p = gtk_migration_auth_challenge_string; ++ ++ for (i = 0; i < CHALLENGE_LEN; i++) ++ { ++ *p++ = hexbyte (challenge_bytes[i] >> 4); ++ *p++ = hexbyte (challenge_bytes[i] & 15); ++ } ++ ++ sprintf (p, "%08lx", challenge_seq++); ++} ++ ++static void ++gtk_migration_auth_generate_challenge (void) ++{ ++ gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM); ++ gtk_migration_auth_update_challenge (); ++} ++ ++static struct rsa_key * ++parse_pubkey (char *s) ++{ ++ struct rsa_key *r; ++ gcry_mpi_t n, e; ++ gchar *sp; ++ ++ sp = strtok (s, " \n"); ++ gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL); ++ sp = strtok (NULL, " \n"); ++ gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL); ++ ++ r = g_malloc0 (sizeof (struct rsa_key)); ++ r->e = e; ++ r->n = n; ++ return r; ++} ++ ++static struct rsa_key * ++lookup_pubkey (u_int32_t id) ++{ ++ const gchar *home_dir = g_get_home_dir (); ++ gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir); ++ FILE *fp = fopen (filename, "r"); ++ struct rsa_key *r = NULL; ++ ++ if (fp) ++ { ++ while (!feof (fp)) ++ { ++ char buffer[4096]; ++ if (fgets (buffer, 4096, fp)) ++ { ++ char *p; ++ u_int32_t this_id = strtoul (buffer, &p, 16); ++ if (p != buffer && *p == ' ') ++ { ++#ifdef DEBUG ++ fprintf (stderr, "found id %x\n", this_id); ++#endif ++ if (this_id == id) ++ { ++ r = parse_pubkey (++p); ++ break; ++ } ++ } ++ } ++ } ++ fclose (fp); ++ } ++ ++ g_free (filename); ++ return r; ++} ++ ++static void ++free_pubkey (struct rsa_key *k) ++{ ++ gcry_mpi_release (k->n); ++ gcry_mpi_release (k->e); ++ ++ g_free (k); ++} ++ ++static gboolean ++gtk_migration_auth_validate_request (char *display, char *data) ++{ ++ u_int32_t key_id; ++ char *ep; ++ char *p; ++ struct rsa_key *k; ++ char hash[20]; ++ gboolean rc; ++ ++ p = strchr (data, ' '); ++ if (p == NULL) ++ return FALSE; ++ *p++ = 0; ++ ++ key_id = strtoul (data, &ep, 16); ++ if (*ep) ++ return FALSE; ++ ++ k = lookup_pubkey (key_id); ++ if (k == NULL) ++ return FALSE; ++ ++ gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, ++ strlen (gtk_migration_auth_challenge_string), hash); ++ ++ rc = gtk_migration_crypt_check_signature (k, hash, p); ++ ++ free_pubkey (k); ++ ++ return rc; ++} ++ ++static int ++do_change_display (GtkWidget *w, char *display_name) ++{ ++ GdkDisplay *newdisplay; ++ guint screen_nr = 1; ++ guint i; ++ ++ if (display_name[0] == 0) ++ return DISPLAY_CHANGE_INDETERMINATE_ERROR; ++ ++ i = strlen (display_name) - 1; ++ while (i > 0 && isdigit (display_name[i])) ++ i--; ++ ++ if (display_name[i] == '.') ++ { ++ screen_nr = atoi (display_name + i + 1); ++ display_name[i] = 0; ++ } ++ ++ newdisplay = gdk_display_open (display_name); ++ if (newdisplay) ++ { ++ GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr); ++ if (screen) ++ { ++ gtk_window_set_screen (GTK_WINDOW (w), screen); ++ gdk_display_manager_set_default_display (gdk_display_manager_get (), ++ newdisplay); ++ return DISPLAY_CHANGE_SUCCESS; ++ } ++ else ++ return DISPLAY_CHANGE_NO_SUCH_SCREEN; ++ } ++ ++ return DISPLAY_CHANGE_UNABLE_TO_CONNECT; ++} ++ ++static void ++set_challenge_on_window (GdkWindow *window) ++{ ++ gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom, ++ 8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, ++ strlen (gtk_migration_auth_challenge_string)); ++} ++ ++static void ++update_challenge_on_windows (void) ++{ ++ GSList *i; ++ ++ gtk_migration_auth_update_challenge (); ++ ++ for (i = all_widgets; i; i = i->next) ++ { ++ GtkWidget *w = GTK_WIDGET (i->data); ++ if (w->window) ++ set_challenge_on_window (w->window); ++ } ++} ++ ++static void ++reset_state (GdkWindow *window) ++{ ++ gdk_property_change (window, display_change_gdkatom, string_gdkatom, ++ 8, GDK_PROP_MODE_REPLACE, NULL, 0); ++} ++ ++static void ++generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code) ++{ ++ XClientMessageEvent ev; ++ Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, ++ display_change_gdkatom); ++ ++ memset (&ev, 0, sizeof (ev)); ++ ++ ev.type = ClientMessage; ++ ev.window = window; ++ ev.message_type = atom; ++ ev.format = 32; ++ ++ ev.data.l[0] = window; ++ ev.data.l[1] = code; ++ ++ XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev); ++} ++ ++static int ++handle_request (GdkWindow *gwindow, char *prop) ++{ ++ GtkWidget *widget; ++ char *target, *auth_method, *auth_data; ++ char *p; ++ ++ target = prop; ++ auth_method = "NULL"; ++ auth_data = NULL; ++ ++ p = strchr (prop, ' '); ++ if (p) ++ { ++ *p = 0; ++ auth_method = ++p; ++ ++ p = strchr (p, ' '); ++ if (p) ++ { ++ *p = 0; ++ auth_data = ++p; ++ } ++ } ++ ++ if (no_auth == FALSE) ++ { ++ if (!strcasecmp (auth_method, "null")) ++ return DISPLAY_CHANGE_AUTHENTICATION_BAD; ++ else if (!strcasecmp (auth_method, "rsa-sig")) ++ { ++ if (gtk_migration_auth_validate_request (target, auth_data) == FALSE) ++ return DISPLAY_CHANGE_AUTHENTICATION_BAD; ++ } ++ else ++ return DISPLAY_CHANGE_AUTHENTICATION_BAD; ++ } ++ ++ gdk_window_get_user_data (gwindow, (gpointer*) &widget); ++ ++ if (widget) ++ return do_change_display (widget, target); ++ ++ return DISPLAY_CHANGE_INDETERMINATE_ERROR; ++} ++ ++static GdkFilterReturn ++filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p) ++{ ++ XPropertyEvent *xev = (XPropertyEvent *)xevp; ++ ++ if (xev->type == PropertyNotify) ++ { ++ GdkDisplay *gdisplay; ++ Atom atom; ++ ++ gdisplay = gdk_x11_lookup_xdisplay (xev->display); ++ if (gdisplay) ++ { ++ atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom); ++ ++ if (xev->atom == atom) ++ { ++ GdkWindow *gwindow; ++ ++ gwindow = gdk_window_lookup_for_display (gdisplay, xev->window); ++ ++ if (gwindow) ++ { ++ GdkAtom actual_type; ++ gint actual_format; ++ gint actual_length; ++ unsigned char *prop = NULL; ++ ++ if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom, ++ 0, G_MAXLONG, FALSE, &actual_type, &actual_format, ++ &actual_length, &prop)) ++ { ++ if (actual_length != 0) ++ { ++ if (actual_type == string_gdkatom && actual_length > 8) ++ { ++ gchar *buf = g_malloc (actual_length + 1); ++ int rc; ++ ++ memcpy (buf, prop, actual_length); ++ buf[actual_length] = 0; ++ ++ rc = handle_request (gwindow, buf); ++ ++ g_free (buf); ++ generate_response (gdisplay, xev->display, xev->window, rc); ++ ++ if (rc == DISPLAY_CHANGE_SUCCESS) ++ update_challenge_on_windows (); ++ } ++ ++ reset_state (gwindow); ++ } ++ } ++ ++ if (prop) ++ g_free (prop); ++ } ++ } ++ ++ return GDK_FILTER_REMOVE; ++ } ++ } ++ ++ return GDK_FILTER_CONTINUE; ++} ++ ++static void ++unrealize_window (GtkWidget *w) ++{ ++ all_widgets = g_slist_remove (all_widgets, w); ++} ++ ++void ++gtk_migration_mark_window (GtkWidget *w) ++{ ++ if (! gtk_migration_initialised) ++ { ++ g_warning ("gtk_migration not initialised yet"); ++ return; ++ } ++ ++ if (GTK_WIDGET_REALIZED (w)) ++ { ++ GdkWindow *window = w->window; ++ ++ gdk_window_add_filter (window, filter_func, NULL); ++ ++ reset_state (window); ++ set_challenge_on_window (window); ++ ++ all_widgets = g_slist_append (all_widgets, w); ++ ++ g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL); ++ } ++ else ++ g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL); ++} ++ ++void ++gtk_migration_init (void) ++{ ++ if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL) ++ no_auth = TRUE; ++ ++ string_gdkatom = gdk_atom_intern ("STRING", FALSE); ++ display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE); ++ rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE); ++ ++ gtk_migration_auth_generate_challenge (); ++ ++ gtk_migration_initialised = TRUE; ++} +Index: gtk/gtkwindow.c +=================================================================== +--- gtk/gtkwindow.c.orig 2006-10-03 16:51:46.000000000 +0100 ++++ gtk/gtkwindow.c 2006-10-30 12:56:34.000000000 +0000 +@@ -50,6 +50,9 @@ + #include "x11/gdkx.h" + #endif + ++extern void gtk_migration_mark_window (GtkWidget *w); ++ ++ + enum { + SET_FOCUS, + FRAME_EVENT, +@@ -823,6 +826,10 @@ + + g_signal_connect (window->screen, "composited_changed", + G_CALLBACK (gtk_window_on_composited_changed), window); ++ ++#ifdef ENABLE_MIGRATION ++ gtk_migration_mark_window (window); ++#endif + } + + static void diff --git a/packages/gtk+/gtk+-2.10.14/no-demos.patch b/packages/gtk+/gtk+-2.10.14/no-demos.patch new file mode 100644 index 0000000000..0fc4c48d1a --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/no-demos.patch @@ -0,0 +1,10 @@ +--- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 ++++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 +@@ -1,6 +1,6 @@ + ## Makefile.am for GTK+ + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 diff --git a/packages/gtk+/gtk+-2.10.14/no-xwc.patch b/packages/gtk+/gtk+-2.10.14/no-xwc.patch new file mode 100644 index 0000000000..affb4a303e --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/no-xwc.patch @@ -0,0 +1,151 @@ +diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c +--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 ++++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 +@@ -576,12 +576,14 @@ + GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); + } + } ++#ifdef HAVE_XWC + else if (font->type == GDK_FONT_FONTSET) + { + XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font); + XmbDrawString (xdisplay, impl->xid, + fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length); + } ++#endif + else + g_error("undefined font type\n"); + } +@@ -613,6 +615,7 @@ + GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length); + g_free (text_8bit); + } ++#ifdef HAVE_XWC + else if (font->type == GDK_FONT_FONTSET) + { + if (sizeof(GdkWChar) == sizeof(wchar_t)) +@@ -633,6 +636,7 @@ + g_free (text_wchar); + } + } ++#endif + else + g_error("undefined font type\n"); + } +diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c +--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 ++++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 +@@ -525,10 +525,12 @@ + width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); + } + break; ++#ifdef HAVE_XWC + case GDK_FONT_FONTSET: + fontset = (XFontSet) private->xfont; + width = XmbTextEscapement (fontset, text, text_length); + break; ++#endif + default: + width = 0; + } +@@ -578,6 +580,7 @@ + width = 0; + } + break; ++#ifdef HAVE_XWC + case GDK_FONT_FONTSET: + if (sizeof(GdkWChar) == sizeof(wchar_t)) + { +@@ -595,6 +598,7 @@ + g_free (text_wchar); + } + break; ++#endif + default: + width = 0; + } +@@ -667,6 +671,7 @@ + if (descent) + *descent = overall.descent; + break; ++#ifdef HAVE_XWC + case GDK_FONT_FONTSET: + fontset = (XFontSet) private->xfont; + XmbTextExtents (fontset, text, text_length, &ink, &logical); +@@ -681,6 +686,7 @@ + if (descent) + *descent = ink.y + ink.height; + break; ++#endif + } + + } +@@ -753,6 +759,7 @@ + *descent = overall.descent; + break; + } ++#ifdef HAVE_XWC + case GDK_FONT_FONTSET: + fontset = (XFontSet) private->xfont; + +@@ -780,6 +787,7 @@ + if (descent) + *descent = ink.y + ink.height; + break; ++#endif + } + + } +diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c +--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 ++++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 +@@ -48,6 +48,7 @@ + void + _gdk_x11_initialize_locale (void) + { ++#ifdef HAVE_XWC + wchar_t result; + gchar *current_locale; + static char *last_locale = NULL; +@@ -93,7 +94,8 @@ + GDK_NOTE (XIM, + g_message ("%s multi-byte string functions.", + gdk_use_mb ? "Using" : "Not using")); +- ++#endif ++ + return; + } + +@@ -136,6 +138,7 @@ + { + gchar *mbstr; + ++#ifdef HAVE_XWC + if (gdk_use_mb) + { + GdkDisplay *display = find_a_display (); +@@ -178,6 +181,7 @@ + XFree (tpr.value); + } + else ++#endif + { + gint length = 0; + gint i; +@@ -210,6 +214,7 @@ + gint + gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max) + { ++#ifdef HAVE_XWC + if (gdk_use_mb) + { + GdkDisplay *display = find_a_display (); +@@ -242,6 +247,7 @@ + return len_cpy; + } + else ++#endif + { + gint i; + diff --git a/packages/gtk+/gtk+-2.10.14/plana-pixops.patch b/packages/gtk+/gtk+-2.10.14/plana-pixops.patch new file mode 100644 index 0000000000..21fe4879c5 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/plana-pixops.patch @@ -0,0 +1,569 @@ +diff -urN gtk+-2.10.9.orig/config.h.in gtk+-2.10.9-integer-pixops/config.h.in +--- gtk+-2.10.9.orig/config.h.in 2007-01-22 09:01:23.000000000 -0700 ++++ gtk+-2.10.9-integer-pixops/config.h.in 2007-02-10 12:15:39.000000000 -0700 +@@ -259,3 +259,7 @@ + + /* Define to `int' if <sys/types.h> doesn't define. */ + #undef uid_t ++ ++/* Define to use integer math rather than floating point where possible. */ ++#undef ENABLE_INTEGER_PIXOPS ++ +diff -urN gtk+-2.10.9.orig/configure.in gtk+-2.10.9-integer-pixops/configure.in +--- gtk+-2.10.9.orig/configure.in 2007-01-22 08:59:41.000000000 -0700 ++++ gtk+-2.10.9-integer-pixops/configure.in 2007-02-10 12:15:39.000000000 -0700 +@@ -203,6 +203,15 @@ + [AC_HELP_STRING([--disable-rebuilds], + [disable all source autogeneration rules])],, + [enable_rebuilds=yes]) ++AC_ARG_ENABLE(integer-pixops, ++ [AC_HELP_STRING([--enable-integer-pixops], ++ [use integer math where possible])],, ++ [enable_integer_pixops=no]) ++ ++if test "x$enable_integer_pixops" = "xyes"; then ++ AC_DEFINE(ENABLE_INTEGER_PIXOPS) ++fi ++ + AC_ARG_ENABLE(visibility, + [AC_HELP_STRING([--disable-visibility], + [don't use ELF visibility attributes])],, +diff -urN gtk+-2.10.9.orig/gdk-pixbuf/pixops/pixops.c gtk+-2.10.9-integer-pixops/gdk-pixbuf/pixops/pixops.c +--- gtk+-2.10.9.orig/gdk-pixbuf/pixops/pixops.c 2007-01-22 08:50:43.000000000 -0700 ++++ gtk+-2.10.9-integer-pixops/gdk-pixbuf/pixops/pixops.c 2007-02-12 01:00:23.000000000 -0700 +@@ -28,21 +28,42 @@ + #define SUBSAMPLE_MASK ((1 << SUBSAMPLE_BITS)-1) + #define SCALE_SHIFT 16 + ++/* TODO: Add a FLOOR() and CEIL() macro to handle normalized values) */ ++/* TODO: Get rid of standard C numeric types (ie. int). Replace with glib types */ ++#ifdef ENABLE_INTEGER_PIXOPS ++/* The bigger the value of FRAC is, the better the accuracy. Be wary of ++ overflows, though */ ++#define FRAC 0x10000ULL ++#define NORMALIZE(d) (d * FRAC) ++#define UNNORMALIZE(t,i) ((t)(i) / FRAC) ++#define FLOOR(i) (int)((i) / FRAC) ++#define CEIL(i) (((i) - 1) / FRAC + 1) ++#define DOUBLE_TYPE gint32 ++#define BIG_DOUBLE_TYPE gint64 ++#else ++#define NORMALIZE(d) (d) ++#define UNNORMALIZE(t,i) (t)(i) ++#define FLOOR(i) floor(i) ++#define CEIL(i) ceil(i) ++#define DOUBLE_TYPE double ++#define BIG_DOUBLE_TYPE double ++#endif ++ + typedef struct _PixopsFilter PixopsFilter; + typedef struct _PixopsFilterDimension PixopsFilterDimension; + + struct _PixopsFilterDimension + { + int n; +- double offset; +- double *weights; ++ BIG_DOUBLE_TYPE offset; ++ DOUBLE_TYPE *weights; + }; + + struct _PixopsFilter + { + PixopsFilterDimension x; + PixopsFilterDimension y; +- double overall_alpha; ++ gint32 overall_alpha; /* Normalized: alpha * 255; Not sure why original devs chose 255 */ + }; + + typedef guchar *(*PixopsLineFunc) (int *weights, int n_x, int n_y, +@@ -86,13 +107,13 @@ + int src_rowstride, + int src_channels, + gboolean src_has_alpha, +- double scale_x, +- double scale_y) ++ DOUBLE_TYPE scale_x, ++ DOUBLE_TYPE scale_y) + { + int i; + int x; +- int x_step = (1 << SCALE_SHIFT) / scale_x; +- int y_step = (1 << SCALE_SHIFT) / scale_y; ++ int x_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_x; ++ int y_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_y; + int xmax, xstart, xstop, x_pos, y_pos; + const guchar *p; + +@@ -175,14 +196,14 @@ + int src_rowstride, + int src_channels, + gboolean src_has_alpha, +- double scale_x, +- double scale_y, ++ DOUBLE_TYPE scale_x, ++ DOUBLE_TYPE scale_y, + int overall_alpha) + { + int i; + int x; +- int x_step = (1 << SCALE_SHIFT) / scale_x; +- int y_step = (1 << SCALE_SHIFT) / scale_y; ++ int x_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_x; ++ int y_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_y; + int xmax, xstart, xstop, x_pos, y_pos; + const guchar *p; + unsigned int a0; +@@ -260,8 +281,8 @@ + int src_rowstride, + int src_channels, + gboolean src_has_alpha, +- double scale_x, +- double scale_y, ++ DOUBLE_TYPE scale_x, ++ DOUBLE_TYPE scale_y, + int overall_alpha, + int check_x, + int check_y, +@@ -271,8 +292,8 @@ + { + int i, j; + int x; +- int x_step = (1 << SCALE_SHIFT) / scale_x; +- int y_step = (1 << SCALE_SHIFT) / scale_y; ++ int x_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_x; ++ int y_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_y; + int r1, g1, b1, r2, g2, b2; + int check_shift = get_check_shift (check_size); + int xmax, xstart, xstop, x_pos, y_pos; +@@ -977,9 +998,9 @@ + int n_x, + int n_y, + int total, +- double overall_alpha) ++ gint32 overall_alpha) + { +- int correction = (int)(0.5 + 65536 * overall_alpha) - total; ++ int correction = (int)(0.5 + 65536 / 255 * overall_alpha) - total; + int remaining, c, d, i; + + if (correction != 0) +@@ -1009,7 +1030,7 @@ + for (i_offset=0; i_offset < SUBSAMPLE; i_offset++) + for (j_offset=0; j_offset < SUBSAMPLE; j_offset++) + { +- double weight; ++ DOUBLE_TYPE weight; + int *pixel_weights = weights + ((i_offset*SUBSAMPLE) + j_offset) * n_x * n_y; + int total = 0; + int i, j; +@@ -1017,13 +1038,15 @@ + for (i=0; i < n_y; i++) + for (j=0; j < n_x; j++) + { +- weight = filter->x.weights[(j_offset * n_x) + j] * ++ weight = UNNORMALIZE(DOUBLE_TYPE, filter->x.weights[(j_offset * n_x) + j] * + filter->y.weights[(i_offset * n_y) + i] * +- filter->overall_alpha * 65536 + 0.5; ++ filter->overall_alpha * 65536 / 255) + NORMALIZE(0.5); ++ /* Wonder how I should treat the "+ 0.5" for scientific ++ rouding off */ + +- total += (int)weight; ++ total += UNNORMALIZE(int, weight); + +- *(pixel_weights + n_x * i + j) = weight; ++ *(pixel_weights + n_x * i + j) = UNNORMALIZE(int, weight); + } + + correct_total (pixel_weights, n_x, n_y, total, filter->overall_alpha); +@@ -1047,8 +1070,8 @@ + int src_rowstride, + int src_channels, + gboolean src_has_alpha, +- double scale_x, +- double scale_y, ++ DOUBLE_TYPE scale_x, ++ DOUBLE_TYPE scale_y, + int check_x, + int check_y, + int check_size, +@@ -1064,12 +1087,13 @@ + guchar **line_bufs = g_new (guchar *, filter->y.n); + int *filter_weights = make_filter_table (filter); + +- int x_step = (1 << SCALE_SHIFT) / scale_x; /* X step in source (fixed point) */ +- int y_step = (1 << SCALE_SHIFT) / scale_y; /* Y step in source (fixed point) */ ++ int x_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_x; /* X step in source (fixed point) */ ++ int y_step = NORMALIZE((1 << SCALE_SHIFT)) / scale_y; /* Y step in source (fixed point) */ + + int check_shift = check_size ? get_check_shift (check_size) : 0; + +- int scaled_x_offset = floor (filter->x.offset * (1 << SCALE_SHIFT)); ++ /* Possible overflow when scale-shifting which is why offset is BIG_DOUBLE_TYPE */ ++ int scaled_x_offset = FLOOR(filter->x.offset * (1 << SCALE_SHIFT)); + + /* Compute the index where we run off the end of the source buffer. The furthest + * source pixel we access at index i is: +@@ -1087,7 +1111,7 @@ + int run_end_index = MYDIV (run_end_x + x_step - 1, x_step) - render_x0; + run_end_index = MIN (run_end_index, render_x1 - render_x0); + +- y = render_y0 * y_step + floor (filter->y.offset * (1 << SCALE_SHIFT)); ++ y = render_y0 * y_step + FLOOR(filter->y.offset * (1 << SCALE_SHIFT)); + for (i = 0; i < (render_y1 - render_y0); i++) + { + int dest_x; +@@ -1180,37 +1204,37 @@ + */ + static void + tile_make_weights (PixopsFilterDimension *dim, +- double scale) ++ DOUBLE_TYPE scale) + { +- int n = ceil (1 / scale + 1); +- double *pixel_weights = g_new (double, SUBSAMPLE * n); ++ int n = CEIL(NORMALIZE(NORMALIZE(1)) / scale + NORMALIZE(1)); /* Another possible overflow */ ++ DOUBLE_TYPE *pixel_weights = g_new (DOUBLE_TYPE, SUBSAMPLE * n); + int offset; + int i; +- ++ + dim->n = n; +- dim->offset = 0; ++ dim->offset = NORMALIZE(0); + dim->weights = pixel_weights; + + for (offset = 0; offset < SUBSAMPLE; offset++) + { +- double x = (double)offset / SUBSAMPLE; +- double a = x + 1 / scale; ++ DOUBLE_TYPE x = (DOUBLE_TYPE)NORMALIZE(offset) / SUBSAMPLE; ++ DOUBLE_TYPE a = x + NORMALIZE(NORMALIZE(1)) / scale; + + for (i = 0; i < n; i++) + { +- if (i < x) ++ if (NORMALIZE(i) < x) + { +- if (i + 1 > x) +- *(pixel_weights++) = (MIN (i + 1, a) - x) * scale; ++ if (NORMALIZE(i + 1) > x) ++ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, (MIN(NORMALIZE(i + 1), a) - x) * scale); + else +- *(pixel_weights++) = 0; ++ *(pixel_weights++) = NORMALIZE(0); + } + else + { +- if (a > i) +- *(pixel_weights++) = (MIN (i + 1, a) - i) * scale; ++ if (a > NORMALIZE(i)) ++ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, (MIN(NORMALIZE(i + 1), a) - i) * scale); + else +- *(pixel_weights++) = 0; ++ *(pixel_weights++) = NORMALIZE(0); + } + } + } +@@ -1222,41 +1246,44 @@ + */ + static void + bilinear_magnify_make_weights (PixopsFilterDimension *dim, +- double scale) ++ DOUBLE_TYPE scale) + { +- double *pixel_weights; ++ DOUBLE_TYPE *pixel_weights; + int n; + int offset; + int i; + +- if (scale > 1.0) /* Linear */ ++ if (scale > NORMALIZE(1.0)) /* Linear */ + { + n = 2; +- dim->offset = 0.5 * (1 / scale - 1); ++ dim->offset = NORMALIZE(NORMALIZE(0.5) / (scale - NORMALIZE(1))); + } + else /* Tile */ + { +- n = ceil (1.0 + 1.0 / scale); +- dim->offset = 0.0; ++ n = CEIL(NORMALIZE(1.0) + NORMALIZE(NORMALIZE(1.0)) / scale); ++ dim->offset = NORMALIZE(0.0); + } +- ++ + dim->n = n; +- dim->weights = g_new (double, SUBSAMPLE * n); ++ dim->weights = g_new (DOUBLE_TYPE, SUBSAMPLE * n); + + pixel_weights = dim->weights; + + for (offset=0; offset < SUBSAMPLE; offset++) + { +- double x = (double)offset / SUBSAMPLE; ++ DOUBLE_TYPE x = (DOUBLE_TYPE)NORMALIZE(offset) / SUBSAMPLE; + +- if (scale > 1.0) /* Linear */ ++ if (scale > NORMALIZE(1.0)) /* Linear */ + { + for (i = 0; i < n; i++) +- *(pixel_weights++) = (((i == 0) ? (1 - x) : x) / scale) * scale; ++ /* In the original, what is the point of dividing by scale then multiplying by scale? */ ++ /* *(pixel_weights++) = (((i == 0) ? (1 - x) : x) / scale) * scale;*/ ++ /* *(pixel_weights++) = i == 0 ? NORMALIZE(1) - x : x; */ ++ *(pixel_weights++) = (((i == 0) ? NORMALIZE(1) - x : x) / scale) * scale; + } + else /* Tile */ + { +- double a = x + 1 / scale; ++ DOUBLE_TYPE a = x + NORMALIZE(NORMALIZE(1)) / scale; + + /* x + * ---------|--.-|----|--.-|------- SRC +@@ -1264,19 +1291,19 @@ + */ + for (i = 0; i < n; i++) + { +- if (i < x) ++ if (NORMALIZE(i) < x) + { +- if (i + 1 > x) +- *(pixel_weights++) = (MIN (i + 1, a) - x) * scale; ++ if (NORMALIZE(i + 1) > x) ++ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, (MIN(NORMALIZE(i + 1), a) - x) * scale); + else +- *(pixel_weights++) = 0; ++ *(pixel_weights++) = NORMALIZE(0); + } + else + { +- if (a > i) +- *(pixel_weights++) = (MIN (i + 1, a) - i) * scale; ++ if (a > NORMALIZE(i)) ++ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, (MIN(NORMALIZE(i + 1), a) - i) * scale); + else +- *(pixel_weights++) = 0; ++ *(pixel_weights++) = NORMALIZE(0); + } + } + } +@@ -1291,14 +1318,14 @@ + * We combine two of these to compute the convolution of + * a box filter with a triangular spike. + */ +-static double +-linear_box_half (double b0, double b1) ++static DOUBLE_TYPE ++linear_box_half (DOUBLE_TYPE b0, DOUBLE_TYPE b1) + { +- double a0, a1; +- double x0, x1; ++ DOUBLE_TYPE a0, a1; ++ DOUBLE_TYPE x0, x1; + +- a0 = 0.; +- a1 = 1.; ++ a0 = NORMALIZE(0.); ++ a1 = NORMALIZE(1.); + + if (a0 < b0) + { +@@ -1308,7 +1335,7 @@ + x1 = MIN (a1, b1); + } + else +- return 0; ++ return NORMALIZE(0); + } + else + { +@@ -1318,10 +1345,10 @@ + x1 = MIN (a1, b1); + } + else +- return 0; ++ return NORMALIZE(0); + } + +- return 0.5 * (x1*x1 - x0*x0); ++ return UNNORMALIZE(DOUBLE_TYPE, NORMALIZE(0.5) * UNNORMALIZE(DOUBLE_TYPE, (x1*x1 - x0*x0))); + } + + /* Compute weights for reconstructing with bilinear +@@ -1329,28 +1356,28 @@ + */ + static void + bilinear_box_make_weights (PixopsFilterDimension *dim, +- double scale) ++ DOUBLE_TYPE scale) + { +- int n = ceil (1/scale + 3.0); +- double *pixel_weights = g_new (double, SUBSAMPLE * n); +- double w; ++ int n = CEIL(NORMALIZE(NORMALIZE(1))/scale + NORMALIZE(3.0)); ++ DOUBLE_TYPE *pixel_weights = g_new (DOUBLE_TYPE, SUBSAMPLE * n); ++ DOUBLE_TYPE w; + int offset, i; + +- dim->offset = -1.0; ++ dim->offset = NORMALIZE(-1.0); + dim->n = n; + dim->weights = pixel_weights; + + for (offset = 0; offset < SUBSAMPLE; offset++) + { +- double x = (double)offset / SUBSAMPLE; +- double a = x + 1 / scale; ++ DOUBLE_TYPE x = (DOUBLE_TYPE)NORMALIZE(offset) / SUBSAMPLE; ++ DOUBLE_TYPE a = x + NORMALIZE(NORMALIZE(1)) / scale; + + for (i = 0; i < n; i++) + { +- w = linear_box_half (0.5 + i - a, 0.5 + i - x); +- w += linear_box_half (1.5 + x - i, 1.5 + a - i); ++ w = linear_box_half (NORMALIZE(0.5) + NORMALIZE(i) - a, NORMALIZE(0.5) + NORMALIZE(i) - x); ++ w += linear_box_half (NORMALIZE(1.5) - NORMALIZE(i) + x, NORMALIZE(1.5) - NORMALIZE(i) + a); + +- *(pixel_weights++) = w * scale; ++ *(pixel_weights++) = UNNORMALIZE(DOUBLE_TYPE, w * scale); + } + } + } +@@ -1358,8 +1385,8 @@ + static void + make_weights (PixopsFilter *filter, + PixopsInterpType interp_type, +- double scale_x, +- double scale_y) ++ DOUBLE_TYPE scale_x, ++ DOUBLE_TYPE scale_y) + { + switch (interp_type) + { +@@ -1399,8 +1426,8 @@ + int src_rowstride, + int src_channels, + gboolean src_has_alpha, +- double scale_x, +- double scale_y, ++ double scale_x_d, ++ double scale_y_d, + PixopsInterpType interp_type, + int overall_alpha, + int check_x, +@@ -1409,6 +1436,8 @@ + guint32 color1, + guint32 color2) + { ++ DOUBLE_TYPE scale_x = NORMALIZE(scale_x_d); ++ DOUBLE_TYPE scale_y = NORMALIZE(scale_y_d); + PixopsFilter filter; + PixopsLineFunc line_func; + +@@ -1419,7 +1448,7 @@ + g_return_if_fail (!(dest_channels == 3 && dest_has_alpha)); + g_return_if_fail (!(src_channels == 3 && src_has_alpha)); + +- if (scale_x == 0 || scale_y == 0) ++ if (scale_x == NORMALIZE(0) || scale_y == NORMALIZE(0)) + return; + + if (!src_has_alpha && overall_alpha == 255) +@@ -1427,7 +1456,7 @@ + _pixops_scale (dest_buf, render_x0, render_y0, render_x1, render_y1, + dest_rowstride, dest_channels, dest_has_alpha, + src_buf, src_width, src_height, src_rowstride, src_channels, +- src_has_alpha, scale_x, scale_y, interp_type); ++ src_has_alpha, UNNORMALIZE(double, scale_x), UNNORMALIZE(double, scale_y), interp_type); + return; + } + +@@ -1441,7 +1470,8 @@ + return; + } + +- filter.overall_alpha = overall_alpha / 255.; ++ /* filter.overall_alpha = overall_alpha / 255.; /* Why is it 255 instead of 256? */ ++ filter.overall_alpha = overall_alpha; + make_weights (&filter, interp_type, scale_x, scale_y); + + #ifdef USE_MMX +@@ -1501,11 +1531,13 @@ + int src_rowstride, + int src_channels, + gboolean src_has_alpha, +- double scale_x, +- double scale_y, ++ double scale_x_d, ++ double scale_y_d, + PixopsInterpType interp_type, + int overall_alpha) + { ++ DOUBLE_TYPE scale_x = NORMALIZE(scale_x_d); ++ DOUBLE_TYPE scale_y = NORMALIZE(scale_y_d); + PixopsFilter filter; + PixopsLineFunc line_func; + +@@ -1516,7 +1548,7 @@ + g_return_if_fail (!(dest_channels == 3 && dest_has_alpha)); + g_return_if_fail (!(src_channels == 3 && src_has_alpha)); + +- if (scale_x == 0 || scale_y == 0) ++ if (scale_x == NORMALIZE(0) || scale_y == NORMALIZE(0)) + return; + + if (!src_has_alpha && overall_alpha == 255) +@@ -1524,7 +1556,7 @@ + _pixops_scale (dest_buf, render_x0, render_y0, render_x1, render_y1, + dest_rowstride, dest_channels, dest_has_alpha, + src_buf, src_width, src_height, src_rowstride, src_channels, +- src_has_alpha, scale_x, scale_y, interp_type); ++ src_has_alpha, UNNORMALIZE(double, scale_x), UNNORMALIZE(double, scale_y), interp_type); + return; + } + +@@ -1537,7 +1569,7 @@ + return; + } + +- filter.overall_alpha = overall_alpha / 255.; ++ filter.overall_alpha = overall_alpha; + make_weights (&filter, interp_type, scale_x, scale_y); + + if (filter.x.n == 2 && filter.y.n == 2 && +@@ -1578,10 +1610,12 @@ + int src_rowstride, + int src_channels, + gboolean src_has_alpha, +- double scale_x, +- double scale_y, ++ double scale_x_d, ++ double scale_y_d, + PixopsInterpType interp_type) + { ++ DOUBLE_TYPE scale_x = NORMALIZE(scale_x_d); ++ DOUBLE_TYPE scale_y = NORMALIZE(scale_y_d); + PixopsFilter filter; + PixopsLineFunc line_func; + +@@ -1593,7 +1627,7 @@ + g_return_if_fail (!(src_channels == 3 && src_has_alpha)); + g_return_if_fail (!(src_has_alpha && !dest_has_alpha)); + +- if (scale_x == 0 || scale_y == 0) ++ if (scale_x == NORMALIZE(0) || scale_y == NORMALIZE(0)) + return; + + if (interp_type == PIXOPS_INTERP_NEAREST) +@@ -1605,7 +1639,7 @@ + return; + } + +- filter.overall_alpha = 1.0; ++ filter.overall_alpha = 255; + make_weights (&filter, interp_type, scale_x, scale_y); + + if (filter.x.n == 2 && filter.y.n == 2 && dest_channels == 3 && src_channels == 3) diff --git a/packages/gtk+/gtk+-2.10.14/run-iconcache.patch b/packages/gtk+/gtk+-2.10.14/run-iconcache.patch new file mode 100644 index 0000000000..ac15e9ab24 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/run-iconcache.patch @@ -0,0 +1,19 @@ +--- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100 ++++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100 +@@ -1128,11 +1128,11 @@ + ./gtk-update-icon-cache + endif + +-gtkbuiltincache.h: @REBUILD@ stamp-icons +- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) +- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ +- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ +- mv gtkbuiltincache.h.tmp gtkbuiltincache.h ++#gtkbuiltincache.h: @REBUILD@ stamp-icons ++# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) ++# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ ++# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ ++# mv gtkbuiltincache.h.tmp gtkbuiltincache.h + + EXTRA_DIST += \ + $(STOCK_ICONS) \ diff --git a/packages/gtk+/gtk+-2.10.14/scroll-timings.patch b/packages/gtk+/gtk+-2.10.14/scroll-timings.patch new file mode 100644 index 0000000000..3f823a7880 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/scroll-timings.patch @@ -0,0 +1,11 @@ +--- gtk+-2.10.0/gtk/gtkrange.c.orig 2006-07-05 12:41:39.000000000 +0200 ++++ gtk+-2.10.0/gtk/gtkrange.c 2006-07-05 12:41:58.000000000 +0200 +@@ -39,7 +39,7 @@ + #include "gtkalias.h" + + #define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */ +-#define UPDATE_DELAY 300 /* Delay for queued update */ ++#define UPDATE_DELAY 1000 /* Delay for queued update */ + + enum { + PROP_0, diff --git a/packages/gtk+/gtk+-2.10.14/single-click.patch b/packages/gtk+/gtk+-2.10.14/single-click.patch new file mode 100644 index 0000000000..250f1629f5 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/single-click.patch @@ -0,0 +1,56 @@ +Index: gtk+-2.10.6/gtk/gtkcalendar.c +=================================================================== +--- gtk+-2.10.6.orig/gtk/gtkcalendar.c ++++ gtk+-2.10.6/gtk/gtkcalendar.c +@@ -2482,9 +2482,11 @@ calendar_main_button_press (GtkCalendar + } + + calendar_select_and_focus_day (calendar, day); +- } ++ ++ // This change causes the calendar to disappear after choosing a day ++/* } + else if (event->type == GDK_2BUTTON_PRESS) +- { ++ {*/ + priv->in_drag = 0; + if (day_month == MONTH_CURRENT) + g_signal_emit (calendar, +Index: gtk+-2.10.6/gtk/gtkfilesel.c +=================================================================== +--- gtk+-2.10.6.orig/gtk/gtkfilesel.c ++++ gtk+-2.10.6/gtk/gtkfilesel.c +@@ -2426,6 +2426,33 @@ gtk_file_selection_file_changed (GtkTree + if (fs->last_selected != NULL) + g_free (fs->last_selected); + ++ // Single-click directory entry ++ if (new_names->len == 1) ++ { ++ GtkTreeView *tree_view; ++ GtkTreeModel *model; ++ GtkTreePath *path; ++ GtkTreeIter iter; ++ gboolean is_file; ++ ++ tree_view = gtk_tree_selection_get_tree_view (selection); ++ ++ if (gtk_tree_selection_get_selected (selection, &model, &iter)) ++ { ++ path = gtk_tree_model_get_path (model, &iter); ++ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); ++ ++ if (!is_file) ++ { ++ gtk_file_selection_dir_activate (tree_view, path, ++ gtk_tree_view_get_column (tree_view, DIR_COLUMN), ++ user_data); ++ } ++ ++ gtk_tree_path_free (path); ++ } ++ } ++ + fs->last_selected = g_strdup (g_ptr_array_index (new_names, index)); + filename = get_real_filename (fs->last_selected, FALSE); + diff --git a/packages/gtk+/gtk+-2.10.14/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.10.14/small-gtkfilesel.patch new file mode 100644 index 0000000000..20bf4cf366 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/small-gtkfilesel.patch @@ -0,0 +1,267 @@ +diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c +--- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 ++++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 +@@ -68,6 +68,7 @@ + #include "gtkprivate.h" + #include "gtkscrolledwindow.h" + #include "gtkstock.h" ++#include "gtksignal.h" + #include "gtktreeselection.h" + #include "gtktreeview.h" + #include "gtkvbox.h" +@@ -77,6 +78,7 @@ + #include "gtkmessagedialog.h" + #include "gtkdnd.h" + #include "gtkeventbox.h" ++#include "gtkimage.h" + + #undef GTK_DISABLE_DEPRECATED + #include "gtkoptionmenu.h" +@@ -245,7 +247,8 @@ + }; + + enum { +- DIR_COLUMN ++ DIR_COLUMN, ++ ISFILE_COLUMN + }; + + enum { +@@ -400,6 +403,12 @@ + GtkTreePath *path, + GtkTreeViewColumn *column, + gpointer user_data); ++ ++static void gtk_file_selection_activate (GtkTreeView *tree_view, ++ GtkTreePath *path, ++ GtkTreeViewColumn *column, ++ gpointer user_data); ++ + static void gtk_file_selection_file_changed (GtkTreeSelection *selection, + gpointer user_data); + static void gtk_file_selection_dir_activate (GtkTreeView *tree_view, +@@ -419,6 +428,7 @@ + static void gtk_file_selection_create_dir (GtkWidget *widget, gpointer data); + static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data); + static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data); ++static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle *prev_style); + + static void free_selected_names (GPtrArray *names); + +@@ -578,6 +588,23 @@ + G_PARAM_WRITABLE)); + object_class->destroy = gtk_file_selection_destroy; + widget_class->map = gtk_file_selection_map; ++ widget_class->style_set = gtk_file_selection_style_set; ++ ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_boolean ("show_fileops_default", ++ _("Show fileop buttons by default"), ++ _("Whether file operation buttons are shown by default"), ++ TRUE, ++ G_PARAM_READABLE)); ++ ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_int ("border_width", ++ _("Border width"), ++ _("Width of border around the main dialog area"), ++ 0, ++ G_MAXINT, ++ 10, ++ G_PARAM_READABLE)); + } + + static void gtk_file_selection_set_property (GObject *object, +@@ -649,7 +676,29 @@ + gtk_widget_grab_default (widget); + return FALSE; + } +- ++ ++static void ++gtk_file_selection_style_set (GtkWidget *filesel, ++ GtkStyle *prev_style) ++{ ++ gboolean show_fileops; ++ gint border_width; ++ ++ gtk_widget_style_get (filesel, ++ "show_fileops_default", ++ &show_fileops, ++ "border_width", ++ &border_width, ++ NULL); ++ ++ gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width); ++ ++ if (show_fileops) ++ gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel)); ++ else ++ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel)); ++} ++ + static void + gtk_file_selection_init (GtkFileSelection *filesel) + { +@@ -674,17 +723,15 @@ + + /* The dialog-sized vertical box */ + filesel->main_vbox = dialog->vbox; +- gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); + + /* The horizontal box containing create, rename etc. buttons */ + filesel->button_area = gtk_hbutton_box_new (); + gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START); +- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); + gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, + FALSE, FALSE, 0); + gtk_widget_show (filesel->button_area); + +- gtk_file_selection_show_fileop_buttons (filesel); ++ gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL); + + /* hbox for pulldown menu */ + pulldown_hbox = gtk_hbox_new (TRUE, 5); +@@ -723,25 +770,32 @@ + + /* The directories list */ + +- model = gtk_list_store_new (1, G_TYPE_STRING); ++ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */ + filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); + g_object_unref (model); + +- column = gtk_tree_view_column_new_with_attributes (_("Folders"), ++ column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL, + gtk_cell_renderer_text_new (), + "text", DIR_COLUMN, + NULL); + label = gtk_label_new_with_mnemonic (_("Fol_ders")); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list); + gtk_widget_show (label); +- gtk_tree_view_column_set_widget (column, label); ++ ++ /* gtk_tree_view_column_set_widget (column, label); */ ++ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE); ++ + gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); + gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column); + + gtk_widget_set_size_request (filesel->dir_list, + DIR_LIST_WIDTH, DIR_LIST_HEIGHT); + g_signal_connect (filesel->dir_list, "row_activated", +- G_CALLBACK (gtk_file_selection_dir_activate), filesel); ++ G_CALLBACK (gtk_file_selection_activate), filesel); ++ ++ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed", ++ G_CALLBACK (gtk_file_selection_file_changed), filesel); ++ + + /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */ + +@@ -758,41 +812,6 @@ + gtk_widget_show (filesel->dir_list); + gtk_widget_show (scrolled_win); + +- /* The files list */ +- model = gtk_list_store_new (1, G_TYPE_STRING); +- filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); +- g_object_unref (model); +- +- column = gtk_tree_view_column_new_with_attributes (_("Files"), +- gtk_cell_renderer_text_new (), +- "text", FILE_COLUMN, +- NULL); +- label = gtk_label_new_with_mnemonic (_("_Files")); +- gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list); +- gtk_widget_show (label); +- gtk_tree_view_column_set_widget (column, label); +- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); +- gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column); +- +- gtk_widget_set_size_request (filesel->file_list, +- FILE_LIST_WIDTH, FILE_LIST_HEIGHT); +- g_signal_connect (filesel->file_list, "row_activated", +- G_CALLBACK (gtk_file_selection_file_activate), filesel); +- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed", +- G_CALLBACK (gtk_file_selection_file_changed), filesel); +- +- /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */ +- +- scrolled_win = gtk_scrolled_window_new (NULL, NULL); +- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); +- gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list); +- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), +- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); +- gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0); +- gtk_container_add (GTK_CONTAINER (list_container), scrolled_win); +- gtk_widget_show (filesel->file_list); +- gtk_widget_show (scrolled_win); +- + /* action area for packing buttons into. */ + filesel->action_area = gtk_hbox_new (TRUE, 0); + gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, +@@ -2008,6 +2027,23 @@ + } + + static void ++gtk_file_selection_activate (GtkTreeView *tree_view, ++ GtkTreePath *path, ++ GtkTreeViewColumn *column, ++ gpointer user_data) ++{ ++ GtkTreeModel *model = gtk_tree_view_get_model (tree_view); ++ GtkTreeIter iter; ++ gboolean is_file; ++ ++ gtk_tree_model_get_iter (model, &iter, path); ++ gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1); ++ ++ if (! is_file) ++ gtk_file_selection_dir_activate (tree_view, path, column, user_data); ++} ++ ++static void + gtk_file_selection_file_activate (GtkTreeView *tree_view, + GtkTreePath *path, + GtkTreeViewColumn *column, +@@ -2103,7 +2139,6 @@ + PossibleCompletion* poss; + GtkTreeIter iter; + GtkListStore *dir_model; +- GtkListStore *file_model; + gchar* filename; + gchar* rem_path = rel_path; + gchar* sel_text; +@@ -2125,10 +2160,8 @@ + g_assert (cmpl_state->reference_dir); + + dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list))); +- file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list))); + + gtk_list_store_clear (dir_model); +- gtk_list_store_clear (file_model); + + /* Set the dir list to include ./ and ../ */ + gtk_list_store_append (dir_model, &iter); +@@ -2150,13 +2183,17 @@ + strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0) + { + gtk_list_store_append (dir_model, &iter); +- gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1); ++ gtk_list_store_set (dir_model, &iter, ++ DIR_COLUMN, filename, ++ ISFILE_COLUMN, FALSE, -1); + } + } + else + { +- gtk_list_store_append (file_model, &iter); +- gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1); ++ gtk_list_store_append (dir_model, &iter); ++ gtk_list_store_set (dir_model, &iter, ++ DIR_COLUMN, filename, ++ ISFILE_COLUMN, TRUE, -1); + } + } + diff --git a/packages/gtk+/gtk+-2.10.14/spinbutton.patch b/packages/gtk+/gtk+-2.10.14/spinbutton.patch new file mode 100644 index 0000000000..c26dc6d93c --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/spinbutton.patch @@ -0,0 +1,130 @@ +Index: gtk+-2.10.6/gtk/gtkspinbutton.c +=================================================================== +--- gtk+-2.10.6.orig/gtk/gtkspinbutton.c ++++ gtk+-2.10.6/gtk/gtkspinbutton.c +@@ -682,7 +682,7 @@ gtk_spin_button_size_allocate (GtkWidget + + spin = GTK_SPIN_BUTTON (widget); + arrow_size = spin_button_get_arrow_size (spin); +- panel_width = arrow_size + 2 * widget->style->xthickness; ++ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness; + + widget->allocation = *allocation; + +@@ -815,19 +815,16 @@ gtk_spin_button_draw_arrow (GtkSpinButto + { + width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness; + ++ y = widget->style->ythickness; ++ height = widget->requisition.height - (2 * y); ++ + if (arrow_type == GTK_ARROW_UP) + { + x = 0; +- y = 0; +- +- height = widget->requisition.height / 2; + } + else + { +- x = 0; +- y = widget->requisition.height / 2; +- +- height = (widget->requisition.height + 1) / 2; ++ x = width; + } + + if (spin_button_at_limit (spin_button, arrow_type)) +@@ -857,32 +854,17 @@ gtk_spin_button_draw_arrow (GtkSpinButto + shadow_type = GTK_SHADOW_OUT; + } + } +- ++ + gtk_paint_box (widget->style, spin_button->panel, + state_type, shadow_type, + NULL, widget, +- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down", ++ NULL, + x, y, width, height); + + height = widget->requisition.height; + +- if (arrow_type == GTK_ARROW_DOWN) +- { +- y = height / 2; +- height = height - y - 2; +- } +- else +- { +- y = 2; +- height = height / 2 - 2; +- } +- + width -= 3; +- +- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) +- x = 2; +- else +- x = 1; ++ height -= 3; + + w = width / 2; + w -= w % 2 - 1; /* force odd */ +@@ -1062,7 +1044,7 @@ gtk_spin_button_button_press (GtkWidget + if (GTK_ENTRY (widget)->editable) + gtk_spin_button_update (spin); + +- if (event->y <= widget->requisition.height / 2) ++ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness)) + { + if (event->button == 1) + start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment); +@@ -1097,44 +1079,11 @@ gtk_spin_button_button_release (GtkWidge + + arrow_size = spin_button_get_arrow_size (spin); + +- if (event->button == spin->button) +- { +- int click_child = spin->click_child; ++ gtk_spin_button_stop_spinning (spin); + +- gtk_spin_button_stop_spinning (spin); +- +- if (event->button == 3) +- { +- if (event->y >= 0 && event->x >= 0 && +- event->y <= widget->requisition.height && +- event->x <= arrow_size + 2 * widget->style->xthickness) +- { +- if (click_child == GTK_ARROW_UP && +- event->y <= widget->requisition.height / 2) +- { +- gdouble diff; +- +- diff = spin->adjustment->upper - spin->adjustment->value; +- if (diff > EPSILON) +- gtk_spin_button_real_spin (spin, diff); +- } +- else if (click_child == GTK_ARROW_DOWN && +- event->y > widget->requisition.height / 2) +- { +- gdouble diff; +- +- diff = spin->adjustment->value - spin->adjustment->lower; +- if (diff > EPSILON) +- gtk_spin_button_real_spin (spin, -diff); +- } +- } +- } +- spin_button_redraw (spin); ++ spin_button_redraw (spin); + +- return TRUE; +- } +- else +- return GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->button_release_event (widget, event); ++ return TRUE; + } + + static gint diff --git a/packages/gtk+/gtk+-2.10.14/xsettings.patch b/packages/gtk+/gtk+-2.10.14/xsettings.patch new file mode 100644 index 0000000000..b63e262d34 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.14/xsettings.patch @@ -0,0 +1,16 @@ +--- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 ++++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 +@@ -2827,10 +2827,9 @@ + { + GdkScreenX11 *screen = data; + +- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) +- return GDK_FILTER_REMOVE; +- else +- return GDK_FILTER_CONTINUE; ++ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); ++ ++ return GDK_FILTER_CONTINUE; + } + + static void diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb new file mode 100644 index 0000000000..4e85db45af --- /dev/null +++ b/packages/gtk+/gtk+_2.10.14.bb @@ -0,0 +1,29 @@ +require gtk-2.10.inc + +PR = "r0" + +# disable per default - untested and not all patches included. +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ + file://no-xwc.patch;patch=1 \ + file://automake-lossage.patch;patch=1 \ + file://disable-tooltips.patch;patch=1 \ + file://gtklabel-resize-patch;patch=1 \ + file://menu-deactivate.patch;patch=1 \ + file://xsettings.patch;patch=1 \ + file://scroll-timings.patch;patch=1 \ + file://small-gtkfilesel.patch;patch=1 \ + file://migration.patch;patch=1;pnum=0 \ + file://run-iconcache.patch;patch=1 \ + file://hardcoded_libtool.patch;patch=1 \ + file://no-demos.patch;patch=1 \ + file://single-click.patch;patch=1 \ + file://spinbutton.patch;patch=1 \ + file://gtk+-handhelds.patch;patch=1 \ + file://filesel-fix-segfault.patch;patch=1 \ + " + +#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +require gtk-fpu.inc +EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}" diff --git a/packages/gtk-engines/gtk-engines_2.6.5.bb b/packages/gtk-engines/gtk-engines_2.6.5.bb index e795791cfc..0dc9a95ecc 100644 --- a/packages/gtk-engines/gtk-engines_2.6.5.bb +++ b/packages/gtk-engines/gtk-engines_2.6.5.bb @@ -15,7 +15,7 @@ RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial" SRC_URI = "${GNOME_MIRROR}/${PN}/2.6/${PN}-${PV}.tar.bz2" -inherit autotools pkgconfig +inherit autotools pkgconfig gtk-binver PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" diff --git a/packages/gtk-webcore/midori_0.0.3.bb b/packages/gtk-webcore/midori_0.0.3.bb new file mode 100644 index 0000000000..7f5fb6cd74 --- /dev/null +++ b/packages/gtk-webcore/midori_0.0.3.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Midori is a lightweight web browser." +LICENSE = "GPLv2" + +DEPENDS = "osb-jscore osb-nrcit osb-nrcore libsexy" + +inherit autotools pkgconfig + +SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz" + + + diff --git a/packages/images/devimage-image.bb b/packages/images/devimage-image.bb index a70130180c..e8177433be 100644 --- a/packages/images/devimage-image.bb +++ b/packages/images/devimage-image.bb @@ -3,7 +3,7 @@ # only shell and dropbear are loaded by default. # Allows to login via serial and real console or SSH LICENSE = "MIT" -PR = "r2" +PR = "r2.2" DEVIMAGE_EXTRA_RDEPENDS ?= "" RDEPENDS = "devimage busybox dropbear udev \ diff --git a/packages/images/initramfs-image.bb b/packages/images/initramfs-image.bb index 1b60405e74..95e3f84082 100644 --- a/packages/images/initramfs-image.bb +++ b/packages/images/initramfs-image.bb @@ -1,15 +1,17 @@ # Sample initramfs image LICENSE = "MIT" -PR = "r0" +PR = "r2" -#RDEPENDS = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1" -RDEPENDS = "initramfs-nfsboot busybox-static kernel-module-uinput" +RDEPENDS = "initramfs-module-block initramfs-module-loop initramfs-module-nfs" export IMAGE_BASENAME = "initramfs-image" export IMAGE_LINGUAS = "" PACKAGE_INSTALL = "${RDEPENDS}" -# Install only ${PACKAGE_INSTALL}, not even deps -PACKAGE_INSTALL_NO_DEPS = "1" + +# Remove any kernel-image that the kernel-module-* packages may have pulled in. +PACKAGE_REMOVE = "kernel-image-* update-modules" +ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \ + remove ${PACKAGE_REMOVE};" inherit image diff --git a/packages/images/initramfs-minimal-image.bb b/packages/images/initramfs-minimal-image.bb new file mode 100644 index 0000000000..1b60405e74 --- /dev/null +++ b/packages/images/initramfs-minimal-image.bb @@ -0,0 +1,15 @@ +# Sample initramfs image +LICENSE = "MIT" +PR = "r0" + +#RDEPENDS = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1" +RDEPENDS = "initramfs-nfsboot busybox-static kernel-module-uinput" + +export IMAGE_BASENAME = "initramfs-image" +export IMAGE_LINGUAS = "" + +PACKAGE_INSTALL = "${RDEPENDS}" +# Install only ${PACKAGE_INSTALL}, not even deps +PACKAGE_INSTALL_NO_DEPS = "1" + +inherit image diff --git a/packages/initrdscripts/files/blockboot.sh b/packages/initrdscripts/files/blockboot.sh new file mode 100644 index 0000000000..567f7e29b3 --- /dev/null +++ b/packages/initrdscripts/files/blockboot.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# Allow booting from a normal block device. + +if [ -e "$ROOT_DEVICE" ]; then + echo "booting from: $ROOT_DEVICE" + mount "$ROOT_DEVICE" /mnt + BOOT_ROOT=/mnt +fi diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh new file mode 100644 index 0000000000..8c9803f21b --- /dev/null +++ b/packages/initrdscripts/files/init.sh @@ -0,0 +1,65 @@ +#!/bin/sh + +MODULE_DIR=/initrd.d +BOOT_ROOT= +ROOT_DEVICE=/dev/null + +early_setup() { + mkdir /proc + mount -t proc proc /proc + mkdir /mnt + + echo -n "creating device nodes: " + grep '^ *[0-9]' /proc/partitions | while read major minor blocks dev + do + if [ ! -e /dev/$dev ]; then + echo -n "$dev " + [ -e /dev/$dev ] || mknod /dev/$dev b $major $minor + fi + done + echo +} + +read_args() { + CMDLINE=`cat /proc/cmdline` + for arg in $CMDLINE; do + optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'` + case $arg in + root=*) + ROOT_DEVICE=$optarg ;; + rootdelay=*) + rootdelay=$optarg ;; + esac + done +} + +load_modules() { + for module in $MODULE_DIR/*; do + source $module + done +} + +boot_root() { + cd $BOOT_ROOT + exec switch_root -c /dev/console $BOOT_ROOT /sbin/init +} + +boot_failed() { + echo "No valid root device was specified. Please add root=/dev/something to" + echo "the kernel command-line and try again." + echo + exec sh +} + +echo "Starting initramfs boot..." +early_setup +read_args + +if [ -n "$rootdelay" ]; then + echo "Waiting $rootdelay seconds for devices to settle..." + sleep $rootdelay +fi + +load_modules +[ -n "$BOOT_ROOT" ] && boot_root +boot_failed diff --git a/packages/initrdscripts/files/loopboot.sh b/packages/initrdscripts/files/loopboot.sh new file mode 100644 index 0000000000..55a1948db8 --- /dev/null +++ b/packages/initrdscripts/files/loopboot.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +if [ "$ROOT_DEVICE" = "/dev/loop" ]; then + loop_mount() { + loopdev=/dev/loop$loop_num + mountpt=/mnt/loop$loop_num + + [ -e $loopdev ] || mknod $loopdev b 7 $loop_num + + # if only one argument was specified, let it be path not dev + if [ -z "$path" ] && [ -n "$dev" ]; then + path="$dev" + dev="" + fi + [ -z "$offset" ] && offset=0 + + if [ -n "$dev" ]; then + hostpt=`expr "$dev" : '.*/\([^/]*\)'` + [ -z "$hostpt" ] && hostpt="$dev" + + echo "Mounting $dev on $hostpt" + mkdir $hostpt + mount $dev $hostpt + cd $hostpt + fi + + echo "Loopback setup of $path (offset $offset)" + losetup -o "$offset" "$loopdev" "$path" + + echo "Mounting $loopdev on $mountpt" + mkdir "$mountpt" + mount "$loopdev" "$mountpt" + cd "$mountpt" + BOOT_ROOT="$mountpt" + loop_num=`expr "$loop_num" + 1` + } + + modprobe vfat + modprobe loop + + loop_num=0 + + for arg in $CMDLINE; do + optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'` + echo $arg xxx $optarg + case $arg in + looproot=*) + dev=`expr "$optarg" : '\([^:]*\).*'` + path=`expr "$optarg" : '[^:]*:\([^:]*\).*'` + offset=`expr "$optarg" : '[^:]*:[^:]*:\([^:]*\).*'` + loop_mount ;; + esac + done +fi diff --git a/packages/initrdscripts/files/nfsboot.sh b/packages/initrdscripts/files/nfsboot.sh index bb689fa3b8..5129a53ebb 100644 --- a/packages/initrdscripts/files/nfsboot.sh +++ b/packages/initrdscripts/files/nfsboot.sh @@ -1,10 +1,43 @@ #!/bin/sh -echo "Starting initramfs boot..." -mkdir /proc -mount -t proc proc /proc -ifconfig eth0 192.168.20.230 -mkdir /mnt -mount -t nfs 192.168.20.210:/home/nfs/Angstrom-opie-image-test-h4000 /mnt -cd /mnt -exec switch_root -c /dev/console /mnt /sbin/init +if [ "$ROOT_DEVICE" = "/dev/nfs" ]; then + + # These correspond to what kernel itself uses + # DO NOT CHANGE! + NFS_OPTIONS="-o nfsvers=2,nolock" + + for arg in $CMDLINE; do + echo $arg + optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'` + echo $optarg + case $arg in + nfsroot=*) + nfsroot=$optarg ;; + ip=*) + ip=$optarg ;; + esac + done + + echo $ip | (IFS=: read client_ip server_ip gw_ip netmask hostname device autoconf; \ + echo client_ip=$client_ip; + echo server_ip=$server_ip; + echo gw_ip=$gw_ip; + echo netmask=$netmask; + echo hostname=$hostname; + echo device=$device; + echo autoconf=$autoconf; + + case "$device" in + usb*) + echo "USB" + modprobe g_ether + ;; + esac + + ifconfig $device $client_ip + ) + + echo "booting from NFS: $nfsroot" + mount -t nfs $NFS_OPTIONS $nfsroot /mnt + BOOT_ROOT=/mnt +fi diff --git a/packages/initrdscripts/initramfs-jffs2/.mtn2git_empty b/packages/initrdscripts/initramfs-jffs2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/initrdscripts/initramfs-jffs2/.mtn2git_empty diff --git a/packages/initrdscripts/initramfs-jffs2/jffs2boot.sh b/packages/initrdscripts/initramfs-jffs2/jffs2boot.sh new file mode 100644 index 0000000000..81077eeae5 --- /dev/null +++ b/packages/initrdscripts/initramfs-jffs2/jffs2boot.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +echo "Starting initrd boot..." +mkdir /proc +mount -t proc proc /proc + +modprobe mtdram total_size=24576 erase_size=256 +sleep 1 + +ID=`grep "mtdram test device" /proc/mtd | cut -d: -f1| cut -b4-` + +cat /initrd.jffs2 >/dev/mtdblock$ID + +mkdir /mnt +mount -t jffs2 /dev/mtdblock$ID /mnt + +cd /mnt +exec switch_root -c /dev/console /mnt /sbin/init diff --git a/packages/initrdscripts/initramfs-jffs2_0.1.bb b/packages/initrdscripts/initramfs-jffs2_0.1.bb new file mode 100644 index 0000000000..78034c99c9 --- /dev/null +++ b/packages/initrdscripts/initramfs-jffs2_0.1.bb @@ -0,0 +1,8 @@ +SRC_URI = "file://jffs2boot.sh" +PR = "r0" + +do_install() { + install -m 0755 ${WORKDIR}/jffs2boot.sh ${D}/init +} + +FILES_${PN} += " /init " diff --git a/packages/initrdscripts/initramfs-module-block_0.1.bb b/packages/initrdscripts/initramfs-module-block_0.1.bb new file mode 100644 index 0000000000..afd9fd592a --- /dev/null +++ b/packages/initrdscripts/initramfs-module-block_0.1.bb @@ -0,0 +1,10 @@ +SRC_URI = "file://blockboot.sh" +PR = "r1" +RDEPENDS = "initramfs-uniboot" +DESCRIPTION = "An initramfs module for booting off normal block devices." + +do_install() { + install -m 0755 ${WORKDIR}/blockboot.sh ${D}/initrd.d/block +} + +FILES_${PN} += " /initrd.d/block " diff --git a/packages/initrdscripts/initramfs-module-loop_0.1.bb b/packages/initrdscripts/initramfs-module-loop_0.1.bb new file mode 100644 index 0000000000..9a07f5f22c --- /dev/null +++ b/packages/initrdscripts/initramfs-module-loop_0.1.bb @@ -0,0 +1,12 @@ +SRC_URI = "file://loopboot.sh" +PR = "r2" +DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \ + mounting it." +RDEPENDS = "initramfs-uniboot" +RRECOMMENDS = "kernel-module-loop kernel-module-vfat" + +do_install() { + install -m 0755 ${WORKDIR}/loopboot.sh ${D}/initrd.d/loop +} + +FILES_${PN} += " /initrd.d/loop " diff --git a/packages/initrdscripts/initramfs-module-nfs_0.1.bb b/packages/initrdscripts/initramfs-module-nfs_0.1.bb new file mode 100644 index 0000000000..3382e2983b --- /dev/null +++ b/packages/initrdscripts/initramfs-module-nfs_0.1.bb @@ -0,0 +1,11 @@ +SRC_URI = "file://nfsboot.sh" +PR = "r3" +DESCRIPTION = "An initramfs module for booting via NFS." +RDEPENDS = "initramfs-uniboot" +RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs" + +do_install() { + install -m 0755 ${WORKDIR}/nfsboot.sh ${D}/initrd.d/nfs +} + +FILES_${PN} += " /initrd.d/nfs " diff --git a/packages/initrdscripts/initramfs-nfsboot_0.1.bb b/packages/initrdscripts/initramfs-nfsboot_0.1.bb deleted file mode 100644 index 1a4d48813b..0000000000 --- a/packages/initrdscripts/initramfs-nfsboot_0.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -SRC_URI = "file://nfsboot.sh" -PR = "r0" - -do_install() { - install -m 0755 ${WORKDIR}/nfsboot.sh ${D}/init -} - -FILES_${PN} += " /init " diff --git a/packages/initrdscripts/initramfs-uniboot_0.2.bb b/packages/initrdscripts/initramfs-uniboot_0.2.bb new file mode 100644 index 0000000000..46ba06ff9a --- /dev/null +++ b/packages/initrdscripts/initramfs-uniboot_0.2.bb @@ -0,0 +1,11 @@ +SRC_URI = "file://init.sh" +PR = "r1" +DESCRIPTON = "A modular initramfs init script system." +RDEPENDS = "busybox-static" +RRECOMMENDS = "kernel-module-uinput" + +do_install() { + install -m 0755 ${WORKDIR}/init.sh ${D}/init +} + +FILES_${PN} += " /init " diff --git a/packages/jack/jack_0.99.0.bb b/packages/jack/jack_0.103.0.bb index a4988fdef0..9bb7c0f532 100644 --- a/packages/jack/jack_0.99.0.bb +++ b/packages/jack/jack_0.103.0.bb @@ -7,6 +7,8 @@ PRIORITY = "optional" LICENSE = "GPL LGPL" PR = "r0" +DEPENDS = "alsa-lib" + SRC_URI = "${SOURCEFORGE_MIRROR}/jackit/jack-audio-connection-kit-${PV}.tar.gz" S = "${WORKDIR}/jack-audio-connection-kit-${PV}" @@ -16,18 +18,15 @@ EXTRA_OECONF = "--enable-timestamps --disable-capabilities --disable-oldtrans \ --disable-portaudio --disable-coreaudio --enable-oss --enable-alsa" EXTRA_OEMAKE = 'transform="s,^,,"' +LDFLAGS_append = " -L${STAGING_LIBDIR}" -do_configure() { - gnu-configize - oe_runconf -} - -do_install_append() { - install -d ${D}${docdir} - mv -f ${D}${datadir}/jack-audio-connection-kit ${D}${docdir}/ -} +PACKAGES =+ "libjack jack-server jack-examples" -PACKAGES = "libjack jack-server jack-examples jack-doc jack-dev" FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" FILES_jack-server = "${bindir}/jackd" -FILES_jack-examples = "${bindir}" +FILES_jack-examples = "${bindir}/*" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/libopieobex/files/.mtn2git_empty b/packages/libopieobex/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libopieobex/files/.mtn2git_empty diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb index 471df694cb..1dcce8b68c 100644 --- a/packages/libopieobex/libopieobex0_cvs.bb +++ b/packages/libopieobex/libopieobex0_cvs.bb @@ -1,6 +1,6 @@ require libopieobex0.inc PV = "${OPIE_CVS_PV}" -PR = r1 +PR = "r6" SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/libsdl/files/kernel-asm-page.patch b/packages/libsdl/files/kernel-asm-page.patch new file mode 100644 index 0000000000..42bceadfdc --- /dev/null +++ b/packages/libsdl/files/kernel-asm-page.patch @@ -0,0 +1,13 @@ +diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c +index 4e3d662..de38a3c 100644 +--- a/src/video/Xext/Xxf86dga/XF86DGA.c ++++ b/src/video/Xext/Xxf86dga/XF86DGA.c +@@ -18,7 +18,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc + #define HAS_MMAP_ANON + #include <sys/types.h> + #include <sys/mman.h> +-#include <asm/page.h> /* PAGE_SIZE */ ++#include <unistd.h> + #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */ + #define HAS_GETPAGESIZE + #endif /* linux */ diff --git a/packages/libsdl/libsdl-directfb_1.2.9.bb b/packages/libsdl/libsdl-directfb_1.2.9.bb index aa089e0ecb..73e94e9d22 100644 --- a/packages/libsdl/libsdl-directfb_1.2.9.bb +++ b/packages/libsdl/libsdl-directfb_1.2.9.bb @@ -5,17 +5,27 @@ DEPENDS = "alsa-lib directfb" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" -PR = "r1" +PR = "r3" DEFAULT_PREFERENCE = "-1" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ - file://extra-keys.patch;patch=1 \ - file://directfb_obsolete_calls.patch;patch=1 \ - file://acinclude.m4" + file://agawa-piro-mickey-1.2.9.patch;patch=1 \ + file://pygame-1.2.9.patch;patch=1 \ + file://mouse-1.2.9.patch;patch=1 \ + file://kill-stdc++-1.2.9.patch;patch=1 \ + file://ipaq-1.2.9.patch;patch=1 \ + file://SDL-Akita-1.2.9.patch;patch=1 \ + file://fixlibs-1.2.9.patch;patch=1 \ + file://no-PAGE_SIZE.patch;patch=1 \ + file://explicit-extern-C.patch;patch=1 \ + file://acinclude.m4 \ + file://directfb_obsolete_calls.patch;patch=1" S = "${WORKDIR}/SDL-${PV}" inherit autotools binconfig +CFLAGS_append += " -I${STAGING_INCDIR}/directfb -I${STAGING_INCDIR}/directfb-internal" + EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \ --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ @@ -30,9 +40,12 @@ FILES_${PN}-dev += "${bindir}/*config" do_configure_prepend() { rm -f ${S}/acinclude.m4 - cp ${WORKDIR}/acinclude.m4 ${S}/ + cp ${WORKDIR}/acinclude.m4 ${S}/ + if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ] + then + sed -i s,-lqte,-lqte-mt, src/Makefile + fi } - do_configure_append () { cd ${S} diff --git a/packages/libsdl/libsdl-native_1.2.11.bb b/packages/libsdl/libsdl-native_1.2.11.bb index 3c3f17d1d2..d75eec53e8 100644 --- a/packages/libsdl/libsdl-native_1.2.11.bb +++ b/packages/libsdl/libsdl-native_1.2.11.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Simple DirectMedia Layer - native Edition" HOMEPAGE = "http://www.libsdl.org" SECTION = "libs" LICENSE = "LGPL" -PR = "r1" +PR = "r2" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ - file://acinclude.m4" + file://acinclude.m4 \ + file://kernel-asm-page.patch;patch=1 " S = "${WORKDIR}/SDL-${PV}" inherit autotools binconfig pkgconfig native diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb index 563f21440e..7a90cdd5c9 100644 --- a/packages/linphone/linphone_1.6.0.bb +++ b/packages/linphone/linphone_1.6.0.bb @@ -16,9 +16,9 @@ RDEPENDS_liblinphone = "libquickstream libmediastreamer libortp libosip2" RDEPENDS_libquickstream = "speex libmediastreamer libasound" RDEPENDS_libmediastreamer = "speex libogg libasound libortp" -PROVIDES = "linphone linphonec liblinphone" +PROVIDES += "linphone linphonec liblinphone" -PR = "r2" +PR = "r3" SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-${PV}.tar.gz \ http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;patch=1" @@ -61,9 +61,9 @@ PACKAGES += "linphonec linphone-rings liblinphone libquickstream libmediastreame FILES_${PN} = "${bindir}/linphone ${datadir}/pixmaps ${datadir}/applications ${datadir}/gnome/apps" FILES_${PN}c = "${bindir}/linphonec ${bindir}/sipomatic ${datadir}/sounds/linphone/ringback.wav" FILES_${PN}-rings = "${datadir}/sounds/linphone/rings" -FILES_liblinphone = "${libdir}/liblinphone.so*" -FILES_libquickstream = "${libdir}/libquickstream.so*" -FILES_libmediastreamer = "${libdir}/libmediastreamer.so*" -FILES_libortp = "${libdir}/libortp.so*" -FILES_${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}" +FILES_liblinphone = "${libdir}/liblinphone.so.*" +FILES_libquickstream = "${libdir}/libquickstream.so.*" +FILES_libmediastreamer = "${libdir}/libmediastreamer.so.*" +FILES_libortp = "${libdir}/libortp.so.*" +FILES_${PN}-dev += "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}" diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb index 52b87d0ef6..3b576e8059 100644 --- a/packages/linux/compulab-pxa270_2.6.16.bb +++ b/packages/linux/compulab-pxa270_2.6.16.bb @@ -66,8 +66,8 @@ python do_compulab_image() { do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile -addtask compulab_image before do_build after do_deploy +addtask deploy before do_install after do_compile +addtask compulab_image before do_install after do_deploy COMPATIBLE_MACHINE = "compulab-pxa270" diff --git a/packages/linux/ixp4xx-kernel_2.6.21.5.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb index 9c8fdc463c..ae029136a9 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.5.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.6.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "889" +IXP4XX_KERNEL_SVN_REV = "911" # # The directory containing the patches to be applied is # specified below diff --git a/packages/linux/linux-hackndev-2.6/palmt650/defconfig b/packages/linux/linux-hackndev-2.6/palmt650/defconfig index 1bff4e6ee4..a013bee63e 100644 --- a/packages/linux/linux-hackndev-2.6/palmt650/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmt650/defconfig @@ -1,11 +1,14 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20-hnd0 -# Sun May 20 18:04:54 2007 +# Linux kernel version: 2.6.21-hnd2 +# Thu Jul 19 11:45:05 2007 # CONFIG_ARM=y -# CONFIG_GENERIC_TIME is not set +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set CONFIG_GENERIC_HARDIRQS=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y @@ -15,6 +18,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y CONFIG_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -35,27 +39,30 @@ CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_IPC_NS is not set -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set # CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_EMBEDDED=y -CONFIG_UID16=y +# CONFIG_UID16 is not set CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -# CONFIG_ELF_CORE is not set +CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -90,8 +97,8 @@ CONFIG_BLOCK=y # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y -# CONFIG_IOSCHED_DEADLINE is not set -CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set @@ -122,6 +129,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set @@ -130,6 +138,8 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set +# CONFIG_BOARD_IRQ_MAP_SMALL is not set +# CONFIG_BOARD_IRQ_MAP_BIG is not set # # Intel PXA2xx Implementations @@ -158,6 +168,7 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set # CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_AXIMX5 is not set # CONFIG_MACH_X50 is not set @@ -177,9 +188,12 @@ CONFIG_MACH_XSCALE_PALMTREO650_PM=y # CONFIG_MACH_ZIRE31 is not set # CONFIG_GPIOED is not set # CONFIG_GPIOEDNG is not set +# CONFIG_MACH_GHI270HG is not set +# CONFIG_MACH_GHI270 is not set # CONFIG_PXA_SHARPSL is not set # CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA27x=y +# CONFIG_PXA27x_VOLTAGE is not set # # Linux As Bootloader @@ -203,18 +217,10 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_ARM_THUMB=y # CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set CONFIG_IWMMXT=y # CONFIG_ARMBOOT_PROC is not set CONFIG_XSCALE_PMU=y -# CONFIG_KEXEC is not set - -# -# Compaq/iPAQ Drivers -# - -# -# Compaq/HP iPAQ Drivers -# # # Bus support @@ -229,7 +235,7 @@ CONFIG_XSCALE_PMU=y # Kernel Features # CONFIG_PREEMPT=y -# CONFIG_NO_IDLE_HZ is not set +CONFIG_NO_IDLE_HZ=y CONFIG_HZ=100 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y @@ -241,6 +247,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 CONFIG_ALIGNMENT_TRAP=y # @@ -248,13 +255,28 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=32M" +CONFIG_CMDLINE="keepinitrd" # CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +# CONFIG_TXTOFFSET_DELTA is not set # # CPU Frequency scaling # -# CONFIG_CPU_FREQ is not set +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_PXA=y +CONFIG_PXA25x_ALTERNATE_FREQS=y # # Floating point emulation @@ -280,9 +302,9 @@ CONFIG_BINFMT_ELF=y CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set -# CONFIG_DPM_DEBUG is not set -# CONFIG_PM_SYSFS_DEPRECATED is not set -CONFIG_APM=y +CONFIG_DPM_DEBUG=y +CONFIG_PM_SYSFS_DEPRECATED=y +CONFIG_APM_EMULATION=y # # Networking @@ -293,20 +315,21 @@ CONFIG_NET=y # Networking options # # CONFIG_NETDEBUG is not set -CONFIG_PACKET=m -# CONFIG_PACKET_MMAP is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y CONFIG_UNIX=y -CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set -# CONFIG_XFRM_SUB_POLICY is not set # CONFIG_NET_KEY is not set CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set +CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set # CONFIG_ARPD is not set # CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set @@ -314,20 +337,39 @@ CONFIG_IP_FIB_HASH=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set # CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set # CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +# CONFIG_IP_NF_QUEUE is not set +# CONFIG_IP_NF_IPTABLES is not set +# CONFIG_IP_NF_ARPTABLES is not set # # DCCP Configuration (EXPERIMENTAL) @@ -365,84 +407,121 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -CONFIG_IRDA=y - -# -# IrDA protocols -# -# CONFIG_IRLAN is not set -# CONFIG_IRNET is not set -CONFIG_IRCOMM=m -# CONFIG_IRDA_ULTRA is not set +# CONFIG_IRDA is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m # -# IrDA options +# Bluetooth device drivers # -# CONFIG_IRDA_CACHE_LAST_LSAP is not set -# CONFIG_IRDA_FAST_RR is not set -# CONFIG_IRDA_DEBUG is not set +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_BCM2035UART is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_IEEE80211 is not set # -# Infrared-port device drivers +# Device Drivers # # -# SIR device drivers +# Generic Driver Options # -# CONFIG_IRTTY_SIR is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set # -# Dongle support +# Connector - unified userspace <-> kernelspace linker # +# CONFIG_CONNECTOR is not set # -# Old SIR device drivers +# Memory Technology Devices (MTD) # -# CONFIG_IRPORT_SIR is not set +CONFIG_MTD=m +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=0 +# CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_PARTITIONS is not set # -# Old Serial dongle support +# User Modules And Translation Layers # +CONFIG_MTD_CHAR=m +# CONFIG_MTD_BLKDEVS is not set +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set # -# FIR device drivers +# RAM/ROM/Flash chip drivers # -CONFIG_PXA_FICP=y -CONFIG_BT=y -# CONFIG_BT_L2CAP is not set -# CONFIG_BT_SCO is not set +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set # -# Bluetooth device drivers +# Mapping drivers for chip access # -CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y -# CONFIG_BT_HCIUART_BCSP is not set -# CONFIG_BT_BCM2035UART is not set -# CONFIG_BT_HCIVHCI is not set -# CONFIG_IEEE80211 is not set +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set # -# Device Drivers +# Self-contained MTD device drivers # +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 +# CONFIG_MTD_BLOCK2MTD is not set # -# Generic Driver Options +# Disk-On-Chip Device Drivers # -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER is not set -# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set # -# Connector - unified userspace <-> kernelspace linker +# NAND Flash Device Drivers # -# CONFIG_CONNECTOR is not set +# CONFIG_MTD_NAND is not set # -# Memory Technology Devices (MTD) +# OneNAND Flash Device Drivers # -# CONFIG_MTD is not set +# CONFIG_MTD_ONENAND is not set # # Parallel port support @@ -452,19 +531,16 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # # Plug and Play support # +# CONFIG_PNPACPI is not set # # Block devices # # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP=m # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_NBD is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=4096 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y +# CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -515,16 +591,11 @@ CONFIG_NETDEVICES=y # # PHY device support # -# CONFIG_PHYLIB is not set # # Ethernet (10 or 100Mbit) # -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -# CONFIG_SMC91X is not set -# CONFIG_DM9000 is not set -# CONFIG_SMC911X is not set +# CONFIG_NET_ETHERNET is not set # # Ethernet (1000 Mbit) @@ -547,17 +618,17 @@ CONFIG_MII=y # Wan interfaces # # CONFIG_WAN is not set -CONFIG_PPP=y +CONFIG_PPP=m # CONFIG_PPP_MULTILINK is not set # CONFIG_PPP_FILTER is not set -# CONFIG_PPP_ASYNC is not set +CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set -# CONFIG_PPP_DEFLATE is not set -# CONFIG_PPP_BSDCOMP is not set -# CONFIG_PPP_MPPE is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m # CONFIG_PPPOE is not set # CONFIG_SLIP is not set -CONFIG_SLHC=y +CONFIG_SLHC=m # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -579,11 +650,10 @@ CONFIG_INPUT=y # # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set -CONFIG_INPUT_TSDEV=y -CONFIG_INPUT_TSDEV_SCREEN_X=320 -CONFIG_INPUT_TSDEV_SCREEN_Y=320 +# CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set +# CONFIG_INPUT_LED_TRIGGER is not set # # Input Device Drivers @@ -595,12 +665,17 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_GPIO_KEYS is not set +# CONFIG_GPIODEV_KEYS is not set +# CONFIG_GPIODEV_DIAGONAL is not set CONFIG_KEYBOARD_PXA27x=y -# CONFIG_INPUT_MOUSE is not set +CONFIG_KEYBOARD_GPIO=y +CONFIG_INPUT_MOUSE=y +# CONFIG_MOUSE_PS2 is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_NAVPOINT is not set +# CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set @@ -612,20 +687,18 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set # CONFIG_TOUCHSCREEN_UCB1400 is not set # CONFIG_TOUCHSCREEN_PALMTC is not set -CONFIG_TOUCHSCREEN_WM97XX=y +CONFIG_TOUCHSCREEN_WM97XX=m # CONFIG_TOUCHSCREEN_WM9705 is not set CONFIG_TOUCHSCREEN_WM9712=y # CONFIG_TOUCHSCREEN_WM9713 is not set # CONFIG_TOUCHSCREEN_WM97XX_PXA is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m # # Hardware I/O ports # -CONFIG_SERIO=y -CONFIG_SERIO_SERPORT=y -# CONFIG_SERIO_LIBPS2 is not set -# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO is not set # CONFIG_GAMEPORT is not set # @@ -640,10 +713,7 @@ CONFIG_HW_CONSOLE=y # # Serial drivers # -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250 is not set # # Non-8250 serial port support @@ -651,12 +721,13 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_PXA_COUNT=4 -# CONFIG_SERIAL_PXA_IR is not set +CONFIG_SERIAL_PXA_IR=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_RS232_SERIAL is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=16 +CONFIG_LEGACY_PTY_COUNT=32 # # IPMI @@ -667,11 +738,11 @@ CONFIG_LEGACY_PTY_COUNT=16 # Watchdog Cards # # CONFIG_WATCHDOG is not set -CONFIG_HW_RANDOM=m +# CONFIG_HW_RANDOM is not set # CONFIG_NVRAM is not set - # CONFIG_DTLK is not set # CONFIG_R3964 is not set +# CONFIG_TIHTC is not set # CONFIG_RAW_DRIVER is not set # @@ -687,18 +758,8 @@ CONFIG_HW_RANDOM=m # # SPI support # -CONFIG_SPI=y -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_BITBANG is not set -CONFIG_SPI_PXA2XX=y - -# -# SPI Protocol Masters -# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set # # Dallas's 1-wire bus @@ -708,19 +769,13 @@ CONFIG_SPI_PXA2XX=y # # Hardware Monitoring support # -CONFIG_HWMON=y +# CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ABITUGURU is not set -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_LM70 is not set -# CONFIG_SENSORS_PC87427 is not set -# CONFIG_SENSORS_VT1211 is not set -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Hardware Monitoring - Battery -# -CONFIG_BATTERY_MONITOR=y +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=y +CONFIG_APM_POWER=y +# CONFIG_BATTERY_DS2760 is not set # CONFIG_ADC_BATTERY is not set # @@ -729,32 +784,34 @@ CONFIG_BATTERY_MONITOR=y # CONFIG_L3 is not set # -# SoC drivers -# -# CONFIG_SOC_MQ11XX is not set -# CONFIG_SOC_T7L66XB is not set -# CONFIG_SOC_TC6387XB is not set -# CONFIG_SOC_TC6393XB is not set -# CONFIG_SOC_SAMCOP is not set -# CONFIG_SOC_HAMCOP is not set -# CONFIG_HTC_ASIC2 is not set -# CONFIG_HTC_ASIC3 is not set -# CONFIG_HTC_ASIC3_DS1WM is not set -# CONFIG_SOC_TSC2200 is not set - -# # Misc devices # -CONFIG_TEST=m # CONFIG_BATTCHARGE_MONITOR is not set # # Multimedia Capabilities Port drivers # -# CONFIG_MCP is not set +CONFIG_ADC=y # CONFIG_ADC_ADS7846_SSP is not set +# CONFIG_ADC_TSC2200_SSP is not set # CONFIG_ADC_AD7877 is not set -# CONFIG_TIFM_CORE is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_ASIC2 is not set +# CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_ASIC3_DS1WM is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set +# CONFIG_SOC_MQ11XX is not set +# CONFIG_SOC_T7L66XB is not set +# CONFIG_SOC_TC6387XB is not set +# CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_TSC2101 is not set +# CONFIG_SOC_TSC2200 is not set # # LED devices @@ -775,31 +832,12 @@ CONFIG_LEDS_TRIGGER_TIMER=y # CONFIG_LEDS_TRIGGER_HWTIMER is not set # CONFIG_LEDS_TRIGGER_MMC_CARD is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set -# CONFIG_LEDS_TRIGGER_SHARED is not set +CONFIG_LEDS_TRIGGER_SHARED=y # # Multimedia devices # -CONFIG_VIDEO_DEV=y -CONFIG_VIDEO_V4L1=y -CONFIG_VIDEO_V4L1_COMPAT=y -CONFIG_VIDEO_V4L2=y - -# -# Video Capture Adapters -# - -# -# Video Capture Adapters -# -CONFIG_VIDEO_ADV_DEBUG=y -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -# CONFIG_VIDEO_VIVI is not set -# CONFIG_VIDEO_CPIA is not set - -# -# Radio Adapters -# +# CONFIG_VIDEO_DEV is not set # # Digital Video Broadcasting Devices @@ -809,19 +847,30 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y # # Graphics support # -CONFIG_FIRMWARE_EDID=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CORGI=y +# CONFIG_BACKLIGHT_PXAPWM is not set CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# # CONFIG_FB_IMAGEON is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y -CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_PXA_PARAMETERS is not set # CONFIG_FB_MBX is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VSFB is not set @@ -832,15 +881,15 @@ CONFIG_FB_PXA_PARAMETERS=y # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y -CONFIG_FONT_8x8=y +# CONFIG_FONT_8x8 is not set # CONFIG_FONT_8x16 is not set # CONFIG_FONT_6x11 is not set # CONFIG_FONT_7x14 is not set # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set -# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_MINI_4x6=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set @@ -849,12 +898,6 @@ CONFIG_FONT_8x8=y # Logo configuration # # CONFIG_LOGO is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_DEVICE=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CORGI=y -CONFIG_BACKLIGHT_PXAPWM=y # # Sound @@ -864,28 +907,25 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y -CONFIG_SND_SEQUENCER=y -# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y -# CONFIG_SND_SEQUENCER_OSS is not set # CONFIG_SND_DYNAMIC_MINORS is not set -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_VERBOSE_PROCFS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set # # Generic devices # -CONFIG_SND_AC97_CODEC=y +CONFIG_SND_AC97_CODEC=m # CONFIG_SND_DUMMY is not set -# CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set @@ -894,8 +934,8 @@ CONFIG_SND_AC97_CODEC=y # ALSA ARM devices # # CONFIG_SND_PXA2xx_I2SOUND is not set -CONFIG_SND_PXA2XX_PCM=y -CONFIG_SND_PXA2XX_AC97=y +CONFIG_SND_PXA2XX_PCM=m +CONFIG_SND_PXA2XX_AC97=m # # SoC audio support @@ -906,12 +946,13 @@ CONFIG_SND_PXA2XX_AC97=y # Open Sound System # # CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=y +CONFIG_AC97_BUS=m # # HID Devices # -CONFIG_HID=y +CONFIG_HID=m +# CONFIG_HID_DEBUG is not set # # USB support @@ -947,12 +988,13 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_DUALSPEED is not set # CONFIG_USB_ZERO is not set CONFIG_USB_ETH=y -# CONFIG_USB_ETH_RNDIS is not set +CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FILE_STORAGE is not set # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set +# CONFIG_USB_PXA2XX_GPIO is not set # # MMC/SD Card support @@ -961,7 +1003,6 @@ CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y CONFIG_MMC_PXA=y -# CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_TMIO is not set # CONFIG_MMC_SAMCOP is not set @@ -969,27 +1010,29 @@ CONFIG_MMC_PXA=y # Real Time Clock # CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=m +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" CONFIG_RTC_EPOCH=1970 +CONFIG_RTC_DEBUG=y # # RTC interfaces # -CONFIG_RTC_INTF_SYSFS=m -CONFIG_RTC_INTF_PROC=m -CONFIG_RTC_INTF_DEV=m +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set # # RTC drivers # +# CONFIG_RTC_DRV_CMOS is not set # CONFIG_RTC_DRV_DS1553 is not set # CONFIG_RTC_DRV_DS1742 is not set -# CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_M48T86 is not set -CONFIG_RTC_DRV_SA1100=m +CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_TEST is not set -# CONFIG_RTC_DRV_MAX6902 is not set # CONFIG_RTC_DRV_V3020 is not set # @@ -1008,11 +1051,12 @@ CONFIG_EXT2_FS=y # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set -# CONFIG_INOTIFY is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y -CONFIG_AUTOFS_FS=y -CONFIG_AUTOFS4_FS=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set # @@ -1024,9 +1068,9 @@ CONFIG_AUTOFS4_FS=y # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set @@ -1048,16 +1092,15 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_AUFS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set -CONFIG_SQUASHFS=y -CONFIG_SQUASHFS_EMBEDDED=y -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -# CONFIG_SQUASHFS_VMALLOC is not set +# CONFIG_SQUASHFS is not set # CONFIG_SQUASHFS_LZMA is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set @@ -1069,14 +1112,17 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # # Network File Systems # -CONFIG_NFS_FS=m -# CONFIG_NFS_V3 is not set +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_LOCKD=m +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m +CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set @@ -1096,7 +1142,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set @@ -1110,7 +1156,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_863 is not set # CONFIG_NLS_CODEPAGE_864 is not set # CONFIG_NLS_CODEPAGE_865 is not set -CONFIG_NLS_CODEPAGE_866=y +# CONFIG_NLS_CODEPAGE_866 is not set # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_950 is not set @@ -1119,10 +1165,10 @@ CONFIG_NLS_CODEPAGE_866=y # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y +# CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set @@ -1132,7 +1178,7 @@ CONFIG_NLS_ISO8859_2=y # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set # CONFIG_NLS_ISO8859_15 is not set -CONFIG_NLS_KOI8_R=y +# CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=y @@ -1149,18 +1195,40 @@ CONFIG_NLS_UTF8=y # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_SMALLOOPS is not set -# CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +CONFIG_DEBUG_VM=y +# CONFIG_DEBUG_LIST is not set CONFIG_FRAME_POINTER=y -# CONFIG_DEBUG_USER is not set +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_ERRORS=y +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set # # Security options @@ -1180,20 +1248,22 @@ CONFIG_CRYPTO_MANAGER=m # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set -# CONFIG_CRYPTO_SHA1 is not set +CONFIG_CRYPTO_SHA1=m # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_TGR192 is not set # CONFIG_CRYPTO_GF128MUL is not set CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_CBC is not set +CONFIG_CRYPTO_PCBC=m # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_SERPENT is not set -CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_AES is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set # CONFIG_CRYPTO_TEA is not set @@ -1203,6 +1273,7 @@ CONFIG_CRYPTO_ARC4=m # CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_TEST is not set # @@ -1217,6 +1288,8 @@ CONFIG_CRC_CCITT=y # CONFIG_CRC16 is not set CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set -CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m CONFIG_PLIST=y -CONFIG_IOMAP_COPY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y diff --git a/packages/linux/linux-hackndev-2.6/palmtc/.mtn2git_empty b/packages/linux/linux-hackndev-2.6/palmtc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-hackndev-2.6/palmtc/.mtn2git_empty diff --git a/packages/linux/linux-hackndev-2.6/palmtc/defconfig b/packages/linux/linux-hackndev-2.6/palmtc/defconfig new file mode 100644 index 0000000000..7c1030d9cd --- /dev/null +++ b/packages/linux/linux-hackndev-2.6/palmtc/defconfig @@ -0,0 +1,1208 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.20-hnd0 +# Mon Apr 23 22:34:55 2007 +# +CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +# CONFIG_INITRAMFS_SOURCE is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_KMOD is not set + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_TOSHIBA_TMIO_OHCI is not set +# CONFIG_ARCH_ESERIES is not set +# CONFIG_MACH_A620 is not set +# CONFIG_MACH_A716 is not set +# CONFIG_MACH_A730 is not set +# CONFIG_ARCH_H1900 is not set +# CONFIG_ARCH_H2200 is not set +# CONFIG_MACH_H3900 is not set +# CONFIG_MACH_H4000 is not set +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_HX2750 is not set +# CONFIG_ARCH_H5400 is not set +# CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_HTCUNIVERSAL is not set +# CONFIG_MACH_HTCALPINE is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_HTCAPACHE is not set +# CONFIG_MACH_BLUEANGEL is not set +# CONFIG_MACH_HTCBEETLES is not set +# CONFIG_MACH_HW6900 is not set +# CONFIG_ARCH_AXIMX3 is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_X50 is not set +# CONFIG_ARCH_ROVERP1 is not set +# CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_XSCALE_PALMTREO650 is not set +# CONFIG_MACH_XSCALE_TREO680 is not set +# CONFIG_MACH_T700WX is not set +# CONFIG_MACH_TUNGE2 is not set +# CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_XSCALE_PALMTT5 is not set +# CONFIG_MACH_XSCALE_PALMTX is not set +# CONFIG_MACH_PALMZ72 is not set +CONFIG_MACH_OMAP_PALMTC=y +CONFIG_PALMTC_KEYBOARD=m +# CONFIG_PALMTC_UCB1400 is not set +CONFIG_PALMTC_PCMCIA=m +# CONFIG_MACH_ZIRE31 is not set +CONFIG_GPIOED=m +CONFIG_GPIOEDNG=m +# CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set +CONFIG_PXA25x=y + +# +# Linux As Bootloader +# +# CONFIG_LAB is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_IWMMXT=y +# CONFIG_ARMBOOT_PROC is not set +CONFIG_XSCALE_PMU=y +# CONFIG_KEXEC is not set + +# +# Compaq/iPAQ Drivers +# + +# +# Compaq/HP iPAQ Drivers +# + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=m +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_PCMCIA_PXA2XX=m + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="" +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set +# CONFIG_DPM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=m +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=m +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +# CONFIG_IRTTY_SIR is not set + +# +# Dongle support +# + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_PXA_FICP=m +# CONFIG_BT is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_LIBERTAS is not set +# CONFIG_HERMES is not set +# CONFIG_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_CS=m +# CONFIG_ACX is not set +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=320 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_GPIO_KEYS is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# 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_DEBOUNCE is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +CONFIG_TOUCHSCREEN_PALMTC=m +CONFIG_TOUCHSCREEN_WM97XX=m +# CONFIG_TOUCHSCREEN_WM9705 is not set +CONFIG_TOUCHSCREEN_WM9712=y +# CONFIG_TOUCHSCREEN_WM9713 is not set +# CONFIG_TOUCHSCREEN_WM97XX_PXA is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=m +# CONFIG_SERIAL_8250_CS is not set +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_PXA_COUNT=4 +# CONFIG_SERIAL_PXA_IR is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=m +# CONFIG_NVRAM is not set + +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# Hardware Monitoring - Battery +# +CONFIG_BATTERY_MONITOR=m +# CONFIG_ADC_BATTERY is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set + +# +# SoC drivers +# +# CONFIG_SOC_MQ11XX is not set +# CONFIG_SOC_T7L66XB is not set +# CONFIG_SOC_TC6387XB is not set +# CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set +# CONFIG_HTC_ASIC2 is not set +# CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_ASIC3_DS1WM is not set +# CONFIG_SOC_TSC2200 is not set + +# +# Misc devices +# +# CONFIG_BATTCHARGE_MONITOR is not set + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set +# CONFIG_ADC_ADS7846_SSP is not set +# CONFIG_ADC_AD7877 is not set +# CONFIG_TIFM_CORE is not set + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m + +# +# LED drivers +# + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_HWTIMER=m +CONFIG_LEDS_TRIGGER_MMC_CARD=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +# CONFIG_LEDS_TRIGGER_SHARED is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FIRMWARE_EDID=y +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +CONFIG_FB_TILEBLITTING=y +# CONFIG_FB_IMAGEON is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_MBX is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_VSFB is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_DEVICE=y +# CONFIG_BACKLIGHT_CORGI is not set +CONFIG_BACKLIGHT_PXAPWM=m + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_AC97_CODEC=m +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +# CONFIG_SND_PXA2xx_I2SOUND is not set +CONFIG_SND_PXA2XX_PCM=m +CONFIG_SND_PXA2XX_AC97=m + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set + +# +# SoC audio support +# +# CONFIG_SND_SOC is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID Devices +# +CONFIG_HID=m + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +CONFIG_USB_GADGET_PXA2XX=y +CONFIG_USB_PXA2XX=m +# CONFIG_USB_PXA2XX_SMALL is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_SX2 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_MQ11XX is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=m +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_CHAR is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_PXA=y +# CONFIG_MMC_TIFM_SD is not set +# CONFIG_MMC_TMIO is not set +# CONFIG_MMC_SAMCOP is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=m +CONFIG_RTC_EPOCH=1970 + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=m +CONFIG_RTC_INTF_PROC=m +CONFIG_RTC_INTF_DEV=m +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set + +# +# RTC drivers +# +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_SA1100=m +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=y +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_SQUASHFS_LZMA is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +# CONFIG_UNION_FS is not set + +# +# Network File Systems +# +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf-8" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +CONFIG_NLS_CODEPAGE_852=y +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +CONFIG_NLS_CODEPAGE_1250=y +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=y +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_SMALLOOPS is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_MANAGER=m +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_DEFLATE is not set +CONFIG_CRYPTO_MICHAEL_MIC=m +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb index a7bc30b5e6..f480f68a34 100644 --- a/packages/linux/linux-hackndev-2.6_svn.bb +++ b/packages/linux/linux-hackndev-2.6_svn.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." HOMEPAGE = "http://www.hackndev.com/" SECTION = "kernel" LICENSE = "GPL" -PR = "r6" +PR = "r8" -COMPATIBLE_MACHINE = "(palmtt3|palmtx|palmld|palmz72|palmtt5|palmt650)" +COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)" SRC_URI = "svn://hackndev.svn.sourceforge.net/svnroot/hackndev/linux4palm/linux;module=trunk;proto=https \ file://defconfig" diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index 9e0a6dd893..b2a71a84be 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -3,7 +3,7 @@ DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer h LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE ?= '(asus620|asus730|aximx50|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcalpine|htcapache|htcblueangel|htchermes|htchimalaya|htcuniversal|htcwallaby|hx4700|looxc550|jornada56x|magician|rx1950|rx3000)' +COMPATIBLE_MACHINE ?= '(asus620|asus730|aximx50|aximx50v|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcalpine|htcapache|htcblueangel|htchermes|htchimalaya|htcuniversal|htcwallaby|hx4700|looxc550|jornada56x|magician|rx1950|rx3000)' # SRC_URI *must* be overriden in includer, but this is a good reference SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/linux/linux-handhelds-2.6/asus730/defconfig b/packages/linux/linux-handhelds-2.6/asus730/defconfig new file mode 100644 index 0000000000..29729e0123 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6/asus730/defconfig @@ -0,0 +1,1377 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.21-hh11 +# Wed Jul 11 07:31:35 2007 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +# CONFIG_UID16 is not set +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_BOARD_IRQ_MAP_SMALL is not set +# CONFIG_BOARD_IRQ_MAP_BIG is not set + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_TOSHIBA_TMIO_OHCI is not set +# CONFIG_ARCH_ESERIES is not set +# CONFIG_MACH_A620 is not set +# CONFIG_MACH_A716 is not set +CONFIG_MACH_A730=y +# CONFIG_ASUS730_WM9712 is not set +# CONFIG_ARCH_H1900 is not set +# CONFIG_ARCH_H2200 is not set +# CONFIG_MACH_H3900 is not set +# CONFIG_MACH_H4000 is not set +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_HX2750 is not set +# CONFIG_ARCH_H5400 is not set +# CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_HTCUNIVERSAL is not set +# CONFIG_MACH_HTCALPINE is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_HTCAPACHE is not set +# CONFIG_MACH_BLUEANGEL is not set +# CONFIG_MACH_HTCBEETLES is not set +# CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set +# CONFIG_ARCH_AXIMX3 is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_X50 is not set +# CONFIG_ARCH_ROVERP1 is not set +# CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_RECON is not set +# CONFIG_MACH_GHI270HG is not set +# CONFIG_MACH_GHI270 is not set +# CONFIG_MACH_LOOXC550 is not set +# CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set +CONFIG_PXA27x=y +# CONFIG_PXA27x_VOLTAGE is not set + +# +# Linux As Bootloader +# +# CONFIG_LAB is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set +CONFIG_IWMMXT=y +CONFIG_XSCALE_PMU=y + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +CONFIG_PCMCIA_DEBUG=y +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_PCMCIA_PXA2XX=y + +# +# Kernel Features +# +CONFIG_PREEMPT=y +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="keepinitrd" +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +# CONFIG_TXTOFFSET_DELTA is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_PXA=y +CONFIG_PXA25x_ALTERNATE_FREQS=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set +CONFIG_DPM_DEBUG=y +CONFIG_PM_SYSFS_DEPRECATED=y +CONFIG_APM_EMULATION=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +# CONFIG_IP_NF_QUEUE is not set +# CONFIG_IP_NF_IPTABLES is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=y + +# +# IrDA protocols +# +CONFIG_IRLAN=y +# CONFIG_IRNET is not set +CONFIG_IRCOMM=y +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=y + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_PXA_FICP=y +CONFIG_BT=y +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +# CONFIG_BT_HCIUART is not set +# CONFIG_BT_HCIDTL1 is not set +# CONFIG_BT_HCIBT3C is not set +# CONFIG_BT_HCIBLUECARD is not set +# CONFIG_BT_HCIBTUART is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=0 +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_SHARPSL is not set +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# +# CONFIG_PNPACPI is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set +# CONFIG_INPUT_LED_TRIGGER is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_GPIODEV_KEYS is not set +# CONFIG_GPIODEV_DIAGONAL is not set +# CONFIG_KEYBOARD_PXA27x is not set +# CONFIG_KEYBOARD_GPIO is not set +CONFIG_INPUT_MOUSE=y +# CONFIG_MOUSE_PS2 is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_NAVPOINT is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_PXA_COUNT=4 +CONFIG_SERIAL_PXA_IR=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_RS232_SERIAL is not set +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=32 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +# CONFIG_SA1100_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_TIHTC is not set + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +CONFIG_I2C=y +# CONFIG_I2C_CHARDEV is not set + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +CONFIG_I2C_PXA=y +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +CONFIG_SENSORS_PCA9535=y +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set +# CONFIG_POWER_SUPPLY is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set + +# +# Misc devices +# + +# +# Multimedia Capabilities Port drivers +# +CONFIG_ADC=y +# CONFIG_ADC_ADS7846_SSP is not set +# CONFIG_ADC_TSC2200_SSP is not set +# CONFIG_ADC_AD7877 is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_ASIC2 is not set +# CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_ASIC3_DS1WM is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set +# CONFIG_SOC_MQ11XX is not set +# CONFIG_SOC_T7L66XB is not set +# CONFIG_SOC_TC6387XB is not set +# CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_TSC2101 is not set +# CONFIG_SOC_TSC2200 is not set + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +# CONFIG_LEDS_TRIGGER_HWTIMER is not set +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +CONFIG_LEDS_TRIGGER_SHARED=y + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CORGI=y +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_IMAGEON is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_MBX is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_VSFB is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_AC97_CODEC=m +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +CONFIG_SND_PXA2XX_PCM=m +CONFIG_SND_PXA2XX_AC97=m +# CONFIG_SND_RECON is not set + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set + +# +# SoC audio support +# +# CONFIG_SND_SOC is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID Devices +# +CONFIG_HID=m +# CONFIG_HID_DEBUG is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +CONFIG_USB_GADGET_PXA27X=y +CONFIG_USB_PXA27X=y +# CONFIG_USB_PXA27X_DMA is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_MQ11XX is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_CHAR is not set +# CONFIG_USB_PXA2XX_GPIO is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_PXA=y +# CONFIG_MMC_TMIO is not set +# CONFIG_MMC_SAMCOP is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_DEBUG=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set + +# +# RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_SA1100=y +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +CONFIG_NLS_CODEPAGE_1250=y +CONFIG_NLS_CODEPAGE_1251=y +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +CONFIG_PRINTK_TIME=y +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +CONFIG_DEBUG_VM=y +# CONFIG_DEBUG_LIST is not set +CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_ERRORS=y +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=y +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +# CONFIG_CRYPTO_CBC is not set +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_LRW is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y diff --git a/packages/linux/linux-handhelds-2.6/h2200/hamcop-h11.patch b/packages/linux/linux-handhelds-2.6/h2200/hamcop-h11.patch new file mode 100644 index 0000000000..6d96cf435c --- /dev/null +++ b/packages/linux/linux-handhelds-2.6/h2200/hamcop-h11.patch @@ -0,0 +1,20 @@ +--- include/linux/soc/hamcop_base.h.orig 2007-07-20 13:18:06.338543484 +0300 ++++ include/linux/soc/hamcop_base.h 2007-07-20 13:19:02.853764103 +0300 +@@ -24,6 +24,8 @@ + #ifndef HAMCOP_BASE_H + #define HAMCOP_BASE_H + ++#include <linux/gpiodev.h> ++ + struct hamcop_platform_data + { + struct gpiodev_ops gpiodev_ops; +@@ -33,7 +35,7 @@ + + u16 clocksleep; + u16 pllcontrol; +-} ++}; + + extern void hamcop_set_gpio_a (struct device *dev, u32 mask, u16 bits); + extern void hamcop_set_gpio_b (struct device *dev, u32 mask, u16 bits); diff --git a/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig b/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig new file mode 100644 index 0000000000..fbca916965 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig @@ -0,0 +1,1275 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.21-hh11 +# Wed Jul 11 07:31:42 2007 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +# CONFIG_UID16 is not set +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_BOARD_IRQ_MAP_SMALL is not set +CONFIG_BOARD_IRQ_MAP_BIG=y + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_TOSHIBA_TMIO_OHCI is not set +# CONFIG_ARCH_ESERIES is not set +# CONFIG_MACH_A620 is not set +# CONFIG_MACH_A716 is not set +# CONFIG_MACH_A730 is not set +# CONFIG_ARCH_H1900 is not set +# CONFIG_ARCH_H2200 is not set +# CONFIG_MACH_H3900 is not set +# CONFIG_MACH_H4000 is not set +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_HX2750 is not set +# CONFIG_ARCH_H5400 is not set +CONFIG_MACH_HIMALAYA=y +# CONFIG_MACH_HIMALAYA_ASIC3 is not set +# CONFIG_MACH_HIMALAYA_ROM is not set +# CONFIG_MACH_HTCUNIVERSAL is not set +# CONFIG_MACH_HTCALPINE is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_HTCAPACHE is not set +# CONFIG_MACH_BLUEANGEL is not set +# CONFIG_MACH_HTCBEETLES is not set +# CONFIG_MACH_HW6900 is not set +# CONFIG_MACH_HTCATHENA is not set +# CONFIG_ARCH_AXIMX3 is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_X50 is not set +# CONFIG_ARCH_ROVERP1 is not set +# CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_T3XSCALE is not set +# CONFIG_MACH_RECON is not set +# CONFIG_MACH_GHI270HG is not set +# CONFIG_MACH_GHI270 is not set +# CONFIG_MACH_LOOXC550 is not set +# CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set +CONFIG_PXA25x=y +CONFIG_PXA26x=y + +# +# Linux As Bootloader +# +# CONFIG_LAB is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set +# CONFIG_IWMMXT is not set +CONFIG_XSCALE_PMU=y + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_PREEMPT=y +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="keepinitrd" +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +# CONFIG_TXTOFFSET_DELTA is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_PXA=y +CONFIG_PXA25x_ALTERNATE_FREQS=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +# CONFIG_PM_DEBUG is not set +CONFIG_DPM_DEBUG=y +CONFIG_PM_SYSFS_DEPRECATED=y +CONFIG_APM_EMULATION=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +# CONFIG_IP_NF_QUEUE is not set +# CONFIG_IP_NF_IPTABLES is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=y + +# +# IrDA protocols +# +CONFIG_IRLAN=y +# CONFIG_IRNET is not set +CONFIG_IRCOMM=y +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=y + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_PXA_FICP=y +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIVHCI is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=0 +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# +# CONFIG_PNPACPI is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set +# CONFIG_INPUT_LED_TRIGGER is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_GPIODEV_KEYS is not set +# CONFIG_GPIODEV_DIAGONAL is not set +CONFIG_KEYBOARD_GPIO=y +CONFIG_INPUT_MOUSE=y +# CONFIG_MOUSE_PS2 is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_NAVPOINT is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# 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_DEBOUNCE=y +# CONFIG_TOUCHSCREEN_UCB1400 is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_PXA_COUNT=4 +CONFIG_SERIAL_PXA_IR=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_RS232_SERIAL is not set +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=32 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +# CONFIG_SA1100_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_TIHTC is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set +# CONFIG_POWER_SUPPLY is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set + +# +# Misc devices +# + +# +# Multimedia Capabilities Port drivers +# +CONFIG_ADC=y +CONFIG_ADC_ADS7846_SSP=y +# CONFIG_ADC_TSC2200_SSP is not set +# CONFIG_ADC_AD7877 is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_ASIC2 is not set +# CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_ASIC3_DS1WM is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set +# CONFIG_SOC_MQ11XX is not set +# CONFIG_SOC_T7L66XB is not set +# CONFIG_SOC_TC6387XB is not set +# CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_TSC2101 is not set +# CONFIG_SOC_TSC2200 is not set + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +# CONFIG_LEDS_TRIGGER_HWTIMER is not set +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +CONFIG_LEDS_TRIGGER_SHARED=y + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_CORGI=y +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_IMAGEON is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_PXA is not set +# CONFIG_FB_MBX is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_VSFB is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +CONFIG_FONT_MINI_4x6=y +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +# CONFIG_SND is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# HID Devices +# +CONFIG_HID=m +# CONFIG_HID_DEBUG is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +CONFIG_USB_GADGET_PXA2XX=y +CONFIG_USB_PXA2XX=y +# CONFIG_USB_PXA2XX_SMALL is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_MQ11XX is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_CHAR is not set +# CONFIG_USB_PXA2XX_GPIO is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +# CONFIG_MMC_PXA is not set +# CONFIG_MMC_TMIO is not set +# CONFIG_MMC_SAMCOP is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_DEBUG=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set + +# +# RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_SA1100=y +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +CONFIG_NLS_CODEPAGE_1250=y +CONFIG_NLS_CODEPAGE_1251=y +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +CONFIG_PRINTK_TIME=y +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +CONFIG_DEBUG_VM=y +# CONFIG_DEBUG_LIST is not set +CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_ERRORS=y +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=y +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +# CONFIG_CRYPTO_CBC is not set +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_LRW is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb index ec5844bfb5..34e08451cc 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb @@ -1,11 +1,12 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://hamcop-h11.patch;patch=1;pnum=0 \ file://defconfig" require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh12.bb index 275602762d..ec5844bfb5 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh12.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r2" +PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh7.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb index b34d4630a0..b34d4630a0 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh7.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/.mtn2git_empty b/packages/linux/linux-palm-omap1-2.6.22-omap1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/.mtn2git_empty diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/.mtn2git_empty b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/.mtn2git_empty diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/defconfig b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/defconfig new file mode 100644 index 0000000000..72d52d2dcd --- /dev/null +++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/defconfig @@ -0,0 +1,882 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.22-omap1 +# Sat Jul 14 20:09:05 2007 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +# CONFIG_BLK_DEV_INITRD is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 + +# +# Loadable module support +# +# CONFIG_MODULES is not set + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP1=y +# CONFIG_ARCH_OMAP2 is not set +# CONFIG_ARCH_OMAP3 is not set + +# +# OMAP Feature Selections +# +# CONFIG_OMAP_RESET_CLOCKS is not set +# CONFIG_OMAP_BOOT_TAG is not set +# CONFIG_OMAP_GPIO_SWITCH is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +CONFIG_OMAP_MCBSP=y +CONFIG_OMAP_MMU_FWK=y +CONFIG_OMAP_MBOX_FWK=y +CONFIG_OMAP_MPU_TIMER=y +# CONFIG_OMAP_32K_TIMER is not set +# CONFIG_OMAP_LL_DEBUG_UART1 is not set +CONFIG_OMAP_LL_DEBUG_UART2=y +# CONFIG_OMAP_LL_DEBUG_UART3 is not set +CONFIG_OMAP_SERIAL_WAKE=y +CONFIG_OMAP_DSP=y +# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set +# CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set +CONFIG_OMAP_DSP_FBEXPORT=y + +# +# OMAP Core Type +# +# CONFIG_ARCH_OMAP730 is not set +CONFIG_ARCH_OMAP15XX=y +# CONFIG_ARCH_OMAP16XX is not set + +# +# OMAP Board Type +# +# CONFIG_MACH_OMAP_INNOVATOR is not set +# CONFIG_MACH_VOICEBLUE is not set +# CONFIG_MACH_OMAP_PALMTE is not set +# CONFIG_MACH_OMAP_PALMZ71 is not set +CONFIG_MACH_OMAP_PALMTT=y +# CONFIG_MACH_SX1 is not set +# CONFIG_MACH_AMS_DELTA is not set +# CONFIG_MACH_OMAP_GENERIC is not set + +# +# OMAP CPU Speed +# +CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y +# CONFIG_OMAP_ARM_168MHZ is not set +# CONFIG_OMAP_ARM_150MHZ is not set +# CONFIG_OMAP_ARM_120MHZ is not set +# CONFIG_OMAP_ARM_60MHZ is not set +# CONFIG_OMAP_ARM_30MHZ is not set +# CONFIG_MACH_OMAP_APOLLON_PLUS is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM925T=y +CONFIG_CPU_32v4T=y +CONFIG_CPU_ABRT_EV4T=y +CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_CACHE_V4WT=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_OUTER_CACHE is not set + +# +# Bus support +# +# CONFIG_ARCH_SUPPORTS_MSI is not set + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_TICK_ONESHOT is not set +# CONFIG_NO_HZ is not set +# CONFIG_HIGH_RES_TIMERS is not set +# CONFIG_PREEMPT is not set +CONFIG_HZ=100 +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="root=/dev/mmcblk0p2 rw init=/init" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=y +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +# CONFIG_PM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set +# CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set +# CONFIG_MTD is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# +# CONFIG_PNPACPI is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Network device support +# +# CONFIG_NETDEVICES is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=320 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +# CONFIG_TOUCHSCREEN_TSC2102 is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_I2C is not set + +# +# SPI support +# +CONFIG_SPI=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=y +CONFIG_SPI_OMAP_UWIRE=y + +# +# SPI Protocol Masters +# +# CONFIG_SPI_AT25 is not set +# CONFIG_SPI_TSC2101 is not set +# CONFIG_SPI_TSC2102 is not set +# CONFIG_SPI_TSC2301 is not set +# CONFIG_SPI_SPIDEV is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +# CONFIG_LEDS_OMAP_DEBUG is not set +CONFIG_LEDS_OMAP=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +CONFIG_DAB=y + +# +# Graphics support +# +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_OMAP=y + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_VGASTATE is not set +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_OMAP=y +# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 +# CONFIG_FB_OMAP_DMA_TUNE is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_LOGO is not set + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# HID Devices +# +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# Enable Host or Gadget support to see Inventra options +# + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set +# CONFIG_MMC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_OMAP=y + +# +# CBUS support +# +# CONFIG_CBUS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_INOTIFY is not set +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +# CONFIG_MSDOS_FS is not set +# CONFIG_VFAT_FS is not set +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +# CONFIG_TMPFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set + +# +# Native Language Support +# +# CONFIG_NLS is not set + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_ENABLE_MUST_CHECK is not set +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/.mtn2git_empty b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/.mtn2git_empty diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/defconfig b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/defconfig new file mode 100644 index 0000000000..72d52d2dcd --- /dev/null +++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/defconfig @@ -0,0 +1,882 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.22-omap1 +# Sat Jul 14 20:09:05 2007 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +# CONFIG_BLK_DEV_INITRD is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 + +# +# Loadable module support +# +# CONFIG_MODULES is not set + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP1=y +# CONFIG_ARCH_OMAP2 is not set +# CONFIG_ARCH_OMAP3 is not set + +# +# OMAP Feature Selections +# +# CONFIG_OMAP_RESET_CLOCKS is not set +# CONFIG_OMAP_BOOT_TAG is not set +# CONFIG_OMAP_GPIO_SWITCH is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +CONFIG_OMAP_MCBSP=y +CONFIG_OMAP_MMU_FWK=y +CONFIG_OMAP_MBOX_FWK=y +CONFIG_OMAP_MPU_TIMER=y +# CONFIG_OMAP_32K_TIMER is not set +# CONFIG_OMAP_LL_DEBUG_UART1 is not set +CONFIG_OMAP_LL_DEBUG_UART2=y +# CONFIG_OMAP_LL_DEBUG_UART3 is not set +CONFIG_OMAP_SERIAL_WAKE=y +CONFIG_OMAP_DSP=y +# CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set +# CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set +CONFIG_OMAP_DSP_FBEXPORT=y + +# +# OMAP Core Type +# +# CONFIG_ARCH_OMAP730 is not set +CONFIG_ARCH_OMAP15XX=y +# CONFIG_ARCH_OMAP16XX is not set + +# +# OMAP Board Type +# +# CONFIG_MACH_OMAP_INNOVATOR is not set +# CONFIG_MACH_VOICEBLUE is not set +# CONFIG_MACH_OMAP_PALMTE is not set +# CONFIG_MACH_OMAP_PALMZ71 is not set +CONFIG_MACH_OMAP_PALMTT=y +# CONFIG_MACH_SX1 is not set +# CONFIG_MACH_AMS_DELTA is not set +# CONFIG_MACH_OMAP_GENERIC is not set + +# +# OMAP CPU Speed +# +CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y +# CONFIG_OMAP_ARM_168MHZ is not set +# CONFIG_OMAP_ARM_150MHZ is not set +# CONFIG_OMAP_ARM_120MHZ is not set +# CONFIG_OMAP_ARM_60MHZ is not set +# CONFIG_OMAP_ARM_30MHZ is not set +# CONFIG_MACH_OMAP_APOLLON_PLUS is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM925T=y +CONFIG_CPU_32v4T=y +CONFIG_CPU_ABRT_EV4T=y +CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_CACHE_V4WT=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_OUTER_CACHE is not set + +# +# Bus support +# +# CONFIG_ARCH_SUPPORTS_MSI is not set + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_TICK_ONESHOT is not set +# CONFIG_NO_HZ is not set +# CONFIG_HIGH_RES_TIMERS is not set +# CONFIG_PREEMPT is not set +CONFIG_HZ=100 +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="root=/dev/mmcblk0p2 rw init=/init" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=y +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +# CONFIG_PM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set +# CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set +# CONFIG_MTD is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# +# CONFIG_PNPACPI is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Network device support +# +# CONFIG_NETDEVICES is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=320 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +# CONFIG_TOUCHSCREEN_TSC2102 is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_I2C is not set + +# +# SPI support +# +CONFIG_SPI=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=y +CONFIG_SPI_OMAP_UWIRE=y + +# +# SPI Protocol Masters +# +# CONFIG_SPI_AT25 is not set +# CONFIG_SPI_TSC2101 is not set +# CONFIG_SPI_TSC2102 is not set +# CONFIG_SPI_TSC2301 is not set +# CONFIG_SPI_SPIDEV is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# LED devices +# +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +# CONFIG_LEDS_OMAP_DEBUG is not set +CONFIG_LEDS_OMAP=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +CONFIG_DAB=y + +# +# Graphics support +# +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_OMAP=y + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_VGASTATE is not set +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_OMAP=y +# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 +# CONFIG_FB_OMAP_DMA_TUNE is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_LOGO is not set + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# HID Devices +# +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# Enable Host or Gadget support to see Inventra options +# + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set +# CONFIG_MMC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_OMAP=y + +# +# CBUS support +# +# CONFIG_CBUS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_INOTIFY is not set +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +# CONFIG_MSDOS_FS is not set +# CONFIG_VFAT_FS is not set +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +# CONFIG_TMPFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set + +# +# Native Language Support +# +# CONFIG_NLS is not set + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_ENABLE_MUST_CHECK is not set +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/.mtn2git_empty b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/.mtn2git_empty diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/defconfig b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/defconfig new file mode 100644 index 0000000000..6901a43736 --- /dev/null +++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/defconfig @@ -0,0 +1,875 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.22-omap1 +# Sat Jul 14 19:19:02 2007 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="-z71" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +# CONFIG_BLK_DEV_INITRD is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 + +# +# Loadable module support +# +# CONFIG_MODULES is not set + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set +CONFIG_ARCH_OMAP=y + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP1=y +# CONFIG_ARCH_OMAP2 is not set +# CONFIG_ARCH_OMAP3 is not set + +# +# OMAP Feature Selections +# +# CONFIG_OMAP_RESET_CLOCKS is not set +# CONFIG_OMAP_BOOT_TAG is not set +# CONFIG_OMAP_GPIO_SWITCH is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +CONFIG_OMAP_MCBSP=y +# CONFIG_OMAP_MMU_FWK is not set +# CONFIG_OMAP_MBOX_FWK is not set +CONFIG_OMAP_MPU_TIMER=y +# CONFIG_OMAP_32K_TIMER is not set +CONFIG_OMAP_LL_DEBUG_UART1=y +# CONFIG_OMAP_LL_DEBUG_UART2 is not set +# CONFIG_OMAP_LL_DEBUG_UART3 is not set +CONFIG_OMAP_SERIAL_WAKE=y +# CONFIG_OMAP_DSP is not set + +# +# OMAP Core Type +# +# CONFIG_ARCH_OMAP730 is not set +CONFIG_ARCH_OMAP15XX=y +# CONFIG_ARCH_OMAP16XX is not set + +# +# OMAP Board Type +# +# CONFIG_MACH_OMAP_INNOVATOR is not set +# CONFIG_MACH_VOICEBLUE is not set +# CONFIG_MACH_OMAP_PALMTE is not set +CONFIG_MACH_OMAP_PALMZ71=y +# CONFIG_MACH_OMAP_PALMTT is not set +# CONFIG_MACH_SX1 is not set +# CONFIG_MACH_AMS_DELTA is not set +# CONFIG_MACH_OMAP_GENERIC is not set + +# +# OMAP CPU Speed +# +CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y +# CONFIG_OMAP_ARM_168MHZ is not set +# CONFIG_OMAP_ARM_150MHZ is not set +# CONFIG_OMAP_ARM_120MHZ is not set +# CONFIG_OMAP_ARM_60MHZ is not set +# CONFIG_OMAP_ARM_30MHZ is not set +# CONFIG_MACH_OMAP_APOLLON_PLUS is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM925T=y +CONFIG_CPU_32v4T=y +CONFIG_CPU_ABRT_EV4T=y +CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_CACHE_V4WT=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +# CONFIG_ARM_THUMB is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_OUTER_CACHE is not set + +# +# Bus support +# +# CONFIG_ARCH_SUPPORTS_MSI is not set + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_TICK_ONESHOT is not set +# CONFIG_NO_HZ is not set +# CONFIG_HIGH_RES_TIMERS is not set +# CONFIG_PREEMPT is not set +CONFIG_HZ=100 +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=y +CONFIG_BINFMT_MISC=y + +# +# Power management options +# +# CONFIG_PM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set +# CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set +# CONFIG_MTD is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# +# CONFIG_PNPACPI is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Network device support +# +# CONFIG_NETDEVICES is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=320 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +# CONFIG_TOUCHSCREEN_TSC2102 is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=16 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_I2C is not set + +# +# SPI support +# +CONFIG_SPI=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=y +CONFIG_SPI_OMAP_UWIRE=y + +# +# SPI Protocol Masters +# +# CONFIG_SPI_AT25 is not set +# CONFIG_SPI_TSC2101 is not set +# CONFIG_SPI_TSC2102 is not set +# CONFIG_SPI_TSC2301 is not set +# CONFIG_SPI_SPIDEV is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +CONFIG_DAB=y + +# +# Graphics support +# +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_BACKLIGHT_OMAP=y + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_VGASTATE is not set +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_OMAP=y +# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 +# CONFIG_FB_OMAP_DMA_TUNE is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_LOGO is not set + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# HID Devices +# +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# Enable Host or Gadget support to see Inventra options +# + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=y + +# +# MMC/SD Host Controller Drivers +# +CONFIG_MMC_OMAP=y + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_OMAP=y + +# +# CBUS support +# +# CONFIG_CBUS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_INOTIFY is not set +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +# CONFIG_MSDOS_FS is not set +# CONFIG_VFAT_FS is not set +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +# CONFIG_TMPFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +# CONFIG_NLS is not set + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/packages/linux/linux-palm-omap1_2.6.22-omap1.bb b/packages/linux/linux-palm-omap1_2.6.22-omap1.bb new file mode 100644 index 0000000000..fdfe740770 --- /dev/null +++ b/packages/linux/linux-palm-omap1_2.6.22-omap1.bb @@ -0,0 +1,46 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for OMAP1-based Palm devicess" +LICENSE = "GPL" + +COMPATIBLE_MACHINE = "(palmz71|palmtt|palmtt2)" + +inherit kernel + +DEPENDS = "" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \ + http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2;patch=1 \ + file://defconfig" + +S = "${WORKDIR}/linux-2.6.22" + +PR = "r2" + +do_configure() { + + if [ -f ${WORKDIR}/defconfig ]; then + install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No configuration for ${MACHINE} available." + else + die "No configuration for ${MACHINE} available." + fi + + + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + yes '' | oe_runmake oldconfig + +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile diff --git a/packages/linux/linux/ep93xx/.mtn2git_empty b/packages/linux/linux/ep93xx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux/ep93xx/.mtn2git_empty diff --git a/packages/linux/linux/ep93xx/defconfig b/packages/linux/linux/ep93xx/defconfig new file mode 100644 index 0000000000..e42a804b5a --- /dev/null +++ b/packages/linux/linux/ep93xx/defconfig @@ -0,0 +1,1176 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.18-rc1-git9 +# Sat Jul 15 20:13:41 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_RUNTIME_PHYS_OFFSET=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_EMBEDDED=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_RT_MUTEXES=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +# CONFIG_BLK_DEV_IO_TRACE is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +CONFIG_ARCH_EP93XX=y +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set + +# +# Cirrus EP93xx Implementation Options +# +CONFIG_CRUNCH=y + +# +# EP93xx Platforms +# +CONFIG_MACH_EDB9302=y +CONFIG_MACH_EDB9315=y +CONFIG_MACH_EDB9315A=y +CONFIG_MACH_GESBC9312=y +# CONFIG_MACH_MICRO9 is not set +CONFIG_MACH_TS72XX=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM920T=y +CONFIG_CPU_32v4=y +CONFIG_CPU_ABRT_EV4T=y +CONFIG_CPU_CACHE_V4WT=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +CONFIG_ARM_VIC=y + +# +# Bus support +# +CONFIG_ARM_AMBA=y + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyAM0,57600 root=/dev/nfs ip=bootp" +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +CONFIG_FPE_NWFPE_XP=y +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +# CONFIG_PM is not set +# CONFIG_APM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +CONFIG_NET_KEY=y +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +CONFIG_IPV6=y +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=y +CONFIG_INET6_XFRM_MODE_TUNNEL=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_GEOMETRY is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_OTP is not set +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +CONFIG_MTD_ROM=y +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_START=0x0 +CONFIG_MTD_PHYSMAP_LEN=0x0 +CONFIG_MTD_PHYSMAP_BANKWIDTH=1 +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND_TS7250=y +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +# CONFIG_SCSI_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI Transport Attributes +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_SATA is not set +# CONFIG_SCSI_DEBUG is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +CONFIG_EP93XX_ETH=y +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +# CONFIG_INPUT is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +# CONFIG_VT is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_AMBA_PL010=y +CONFIG_SERIAL_AMBA_PL010_CONSOLE=y +# CONFIG_SERIAL_AMBA_PL011 is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_EP93XX_WATCHDOG=y + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=y +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set +# CONFIG_I2C_EP93XX is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +CONFIG_I2C_DEBUG_CORE=y +CONFIG_I2C_DEBUG_ALGO=y +CONFIG_I2C_DEBUG_BUS=y +CONFIG_I2C_DEBUG_CHIP=y + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_V4L2=y + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB is not set + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +CONFIG_USB_DEBUG=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +CONFIG_USB_DYNAMIC_MINORS=y +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y + +# +# Input core support is needed for USB HID input layer or HIDBP support +# +# CONFIG_USB_HIDDEV is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +CONFIG_USB_PEGASUS=y +CONFIG_USB_RTL8150=y +# CONFIG_USB_USBNET is not set +# CONFIG_USB_MON is not set + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ANYDATA is not set +# CONFIG_USB_SERIAL_ARK3116 is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_CP2101 is not set +# CONFIG_USB_SERIAL_CYPRESS_M8 is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_FUNSOFT is not set +# CONFIG_USB_SERIAL_VISOR is not set +# CONFIG_USB_SERIAL_IPAQ is not set +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_EDGEPORT_TI is not set +# CONFIG_USB_SERIAL_GARMIN is not set +# CONFIG_USB_SERIAL_IPW is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_KOBIL_SCT is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_NAVMAN is not set +CONFIG_USB_SERIAL_PL2303=y +# CONFIG_USB_SERIAL_HP4X is not set +# CONFIG_USB_SERIAL_SAFE is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set +# CONFIG_USB_SERIAL_TI is not set +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OPTION is not set +# CONFIG_USB_SERIAL_OMNINET is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGETKIT is not set +# CONFIG_USB_PHIDGETSERVO is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set + +# +# RTC drivers +# +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +CONFIG_RTC_DRV_M48T86=y +CONFIG_RTC_DRV_EP93XX=y +# CONFIG_RTC_DRV_PL031 is not set +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +CONFIG_DEBUG_SLAB=y +# CONFIG_DEBUG_SLAB_LEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +CONFIG_DEBUG_SPINLOCK=y +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_RWSEMS is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_WAITQ=y +CONFIG_DEBUG_ERRORS=y +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y diff --git a/packages/meta/meta-gpephone.bb b/packages/meta/meta-gpephone.bb index a0bd51e5fc..c159333539 100644 --- a/packages/meta/meta-gpephone.bb +++ b/packages/meta/meta-gpephone.bb @@ -7,6 +7,6 @@ RDEPENDS = "\ gpephone-task-base \ gpephone-task-settings \ gpephone-task-pim \ - gpeph-task-connectivity" + gpephone-task-connectivity" inherit meta
\ No newline at end of file diff --git a/packages/musicbrainz/libmusicbrainz_2.1.2.bb b/packages/musicbrainz/libmusicbrainz_2.1.4.bb index 43632d8670..7ab0997218 100644 --- a/packages/musicbrainz/libmusicbrainz_2.1.2.bb +++ b/packages/musicbrainz/libmusicbrainz_2.1.4.bb @@ -1,15 +1,13 @@ -DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. The library allows you to access the data held on the MusicBrainz server." +DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \ +It allows you to access the data held on the MusicBrainz server." HOMEPAGE = "http://musicbrainz.org" LICENSE = "LGPL" DEPENDS = "expat" -SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.2.tar.gz" +SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz" inherit autotools pkgconfig do_stage() { -autotools_stage_all + autotools_stage_all } - - - diff --git a/packages/musicbrainz/libmusicbrainz_3.0.1.bb b/packages/musicbrainz/libmusicbrainz_3.0.1.bb new file mode 100644 index 0000000000..51717f052d --- /dev/null +++ b/packages/musicbrainz/libmusicbrainz_3.0.1.bb @@ -0,0 +1,16 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \ +It allows you to access the data held on the MusicBrainz server." +HOMEPAGE = "http://musicbrainz.org" +LICENSE = "LGPL" +DEPENDS = "expat" + +SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + diff --git a/packages/openobex/openobex-1.3/.mtn2git_empty b/packages/openobex/openobex-1.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openobex/openobex-1.3/.mtn2git_empty diff --git a/packages/openobex/openobex-1.3/libusb_crosscompile_check.patch b/packages/openobex/openobex-1.3/libusb_crosscompile_check.patch new file mode 100644 index 0000000000..ca5bc0041a --- /dev/null +++ b/packages/openobex/openobex-1.3/libusb_crosscompile_check.patch @@ -0,0 +1,11 @@ +--- /tmp/acinclude.m4 2007-07-19 15:11:49.000000000 +0200 ++++ openobex-1.3/acinclude.m4 2007-07-19 15:13:06.925215000 +0200 +@@ -128,7 +128,7 @@ + + if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then + AC_DEFINE(HAVE_USB, 1, [Define if system supports USB and it's enabled]) +- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="$REQUIRES libusb") ++ REQUIRES="libusb" + fi + + AM_CONDITIONAL(APPS, test "${apps_enable}" = "yes") diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb index e6ec335978..358415d9b0 100644 --- a/packages/openobex/openobex_1.2.bb +++ b/packages/openobex/openobex_1.2.bb @@ -8,7 +8,7 @@ LICENSE = "GPL" PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ - file://disable-cable-test.patch;patch=1" \ + file://disable-cable-test.patch;patch=1 \ file://libusb_crosscompile_check.patch;patch=1" inherit autotools binconfig pkgconfig diff --git a/packages/openobex/openobex_1.3.bb b/packages/openobex/openobex_1.3.bb new file mode 100644 index 0000000000..606f8de1c3 --- /dev/null +++ b/packages/openobex/openobex_1.3.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "The Openobex project is an open source implementation of the \ +Object Exchange (OBEX) protocol." +HOMEPAGE = "http://openobex.triq.net" +SECTION = "libs" +PROVIDES = "openobex-apps" +DEPENDS = "libusb bluez-libs" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ + file://disable-cable-test.patch;patch=1 \ + file://libusb_crosscompile_check.patch;patch=1" + +inherit autotools binconfig pkgconfig + +EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \ + --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.." + +do_stage() { + oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR} + ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.2.so + install -d ${STAGING_INCDIR}/openobex + install -m 0644 include/*.h ${STAGING_INCDIR}/openobex/ + install -d ${STAGING_DIR}/aclocal + install -m 0644 openobex.m4 ${STAGING_DATADIR}/aclocal/ +} + +# how to stop shlibrename from renaming -apps? +PACKAGES += "openobex-apps" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/openobex-config" +FILES_${PN}-apps = "${bindir}/*" +DEBIAN_NOAUTONAME_${PN}-apps = "1" diff --git a/packages/opie-eye/opie-eye.inc b/packages/opie-eye/opie-eye.inc index dc89d72ab4..925f9aa59c 100644 --- a/packages/opie-eye/opie-eye.inc +++ b/packages/opie-eye/opie-eye.inc @@ -19,8 +19,8 @@ do_compile_append() { } do_install() { - install -d ${D}${palmtopdir}/bin - install -m 0755 opie-eye_slave ${D}${palmtopdir}/bin/ + install -d ${D}${bindir} + install -m 0755 opie-eye_slave ${D}${bindir} install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ } diff --git a/packages/opie-eye/opie-eye_cvs.bb b/packages/opie-eye/opie-eye_cvs.bb index 6eee0c6d8e..ed73d8c7ee 100644 --- a/packages/opie-eye/opie-eye_cvs.bb +++ b/packages/opie-eye/opie-eye_cvs.bb @@ -1,6 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/opie-eye \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc index 2e84210718..576220d2f0 100644 --- a/packages/opie-taskbar/opie-taskbar-images.inc +++ b/packages/opie-taskbar/opie-taskbar-images.inc @@ -5,7 +5,7 @@ LICENSE = "GPL" RPROVIDES = "${PN}" APPNAME = "qpe" -S = "${WORKDIR}/launcher" +S = "${WORKDIR}/pics" # Wallpaper and welcome splash PIXMAP_SIZE = "" @@ -18,24 +18,28 @@ PIXMAP_SIZE_asus730 = "-480x640" PIXMAP_SIZE_htcuniversal= "-480x640" PIXMAP_SIZE_hx4700 = "-480x640" -PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-240x320" - -#inherit opie +PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320" do_install() { install -d ${D}${palmtopdir}/pics/launcher install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-240x320.jpg install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-240x320.jpg + # TODO: those should be correct images for the resolution: + install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x240.jpg + install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x240.jpg for res in 480x640 640x480 800x600 ; do install -m 0644 ${WORKDIR}/pics/launcher/firstuse-${res}.jpg ${D}${palmtopdir}/pics/launcher/firstuse-${res}.jpg install -m 0644 ${WORKDIR}/pics/launcher/opie-background-${res}.jpg ${D}${palmtopdir}/pics/launcher/opie-background-${res}.jpg done + # TODO: those should be correct images for the resoltion: + install -m 0644 ${WORKDIR}/pics/launcher/firstuse-800x600.jpg ${D}${palmtopdir}/pics/launcher/firstuse-600x800.jpg + install -m 0644 ${WORKDIR}/pics/launcher/opie-background-800x600.jpg ${D}${palmtopdir}/pics/launcher/opie-background-600x800.jpg } python do_package_prepend () { - reslist = ['240x320','480x640','640x480', '800x600'] + reslist = ['240x320','320x240', '480x640','640x480', '800x600','600x800'] dir = bb.data.expand('${palmtopdir}/pics/launcher/', d) ft = bb.data.expand('${palmtopdir}/pics/*/*-%s.*', d) pn = bb.data.getVar('PN', d, 1) diff --git a/packages/opie-taskbar/opie-taskbar-images_cvs.bb b/packages/opie-taskbar/opie-taskbar-images_cvs.bb index 718160cb4d..33588d9e12 100644 --- a/packages/opie-taskbar/opie-taskbar-images_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r4" +PR = "r5" SRC_URI = "${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-taskbar/opie-taskbar/01-1px-gap.patch b/packages/opie-taskbar/opie-taskbar/01-1px-gap.patch deleted file mode 100644 index bfb4d1d234..0000000000 --- a/packages/opie-taskbar/opie-taskbar/01-1px-gap.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naru launcher.orig/serverinterface.cpp launcher/serverinterface.cpp ---- launcher.orig/serverinterface.cpp 2003-08-28 16:45:00.000000000 +0200 -+++ launcher/serverinterface.cpp 2007-07-05 13:02:08.000000000 +0200 -@@ -113,7 +113,7 @@ - mwr.setTop( w->geometry().bottom() + 1 ); - break; - case ServerInterface::Bottom: -- w->setGeometry( mwr.left(), mwr.bottom() - sh.height(), -+ w->setGeometry( mwr.left(), mwr.bottom() - sh.height() + 1, - mwr.width(), sh.height() ); - mwr.setBottom( w->geometry().top() - 1 ); - break; diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index a2d69a7af1..3bda5c4f40 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r14" +PR = "r15" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -13,6 +13,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ file://no-builtin-qss-startup.patch;patch=1 \ file://kbdlocks-runtime.patch;patch=1 \ file://restart-from-bindir.patch;patch=1 \ - file://01-1px-gap.patch;patch=1 \ file://server.pro \ " diff --git a/packages/poppler/poppler_cvs.bb b/packages/poppler/poppler0.6_cvs.bb index ca4b8d6a03..ca4b8d6a03 100644 --- a/packages/poppler/poppler_cvs.bb +++ b/packages/poppler/poppler0.6_cvs.bb diff --git a/packages/python/python-2.4.4-manifest.inc b/packages/python/python-2.4.4-manifest.inc index d8a62c63da..d08235e42e 100644 --- a/packages/python/python-2.4.4-manifest.inc +++ b/packages/python/python-2.4.4-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-manifest.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Thu Jun 21 09:51:32 2007 +### AUTO-GENERATED by './generate-manifest.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Sat Jul 21 14:25:07 2007 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -8,9 +8,9 @@ ######################################################################################################################## -PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-profile="Python Basic Profiling Support" PR_python-profile="ml2" @@ -237,10 +237,15 @@ PR_python-compile="ml2" RDEPENDS_python-compile="python-core" FILES_python-compile="${libdir}/python2.4/py_compile.* ${libdir}/python2.4/compileall.* " +DESCRIPTION_python-debugger="Python Debugger" +PR_python-debugger="ml2" +RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" +FILES_python-debugger="${libdir}/python2.4/bdb.* ${libdir}/python2.4/pdb.* " + DESCRIPTION_python-shell="Python Shell-Like Functionality" PR_python-shell="ml2" RDEPENDS_python-shell="python-core python-re" -FILES_python-shell="${libdir}/python2.4/commands.* ${libdir}/python2.4/dircache.* ${libdir}/python2.4/fnmatch.* ${libdir}/python2.4/glob.* ${libdir}/python2.4/popen2.* ${libdir}/python2.4/shutil.* " +FILES_python-shell="${libdir}/python2.4/cmd.* ${libdir}/python2.4/commands.* ${libdir}/python2.4/dircache.* ${libdir}/python2.4/fnmatch.* ${libdir}/python2.4/glob.* ${libdir}/python2.4/popen2.* ${libdir}/python2.4/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" PR_python-bsddb="ml2" diff --git a/packages/qte/qte-2.3.10/c700-hardware.patch b/packages/qte/qte-2.3.10/deprecated/c700-hardware.patch index fa4bd25f37..fa4bd25f37 100644 --- a/packages/qte/qte-2.3.10/c700-hardware.patch +++ b/packages/qte/qte-2.3.10/deprecated/c700-hardware.patch diff --git a/packages/qte/qte-2.3.10/simpad-defaultkbd.patch b/packages/qte/qte-2.3.10/deprecated/simpad-defaultkbd.patch index 3e5450a4da..3e5450a4da 100644 --- a/packages/qte/qte-2.3.10/simpad-defaultkbd.patch +++ b/packages/qte/qte-2.3.10/deprecated/simpad-defaultkbd.patch diff --git a/packages/qte/qte-2.3.10/simpad.patch b/packages/qte/qte-2.3.10/deprecated/simpad.patch index 8a728ef74a..8a728ef74a 100644 --- a/packages/qte/qte-2.3.10/simpad.patch +++ b/packages/qte/qte-2.3.10/deprecated/simpad.patch diff --git a/packages/qte/qte-2.3.10/kernel-keymap-tosa.patch b/packages/qte/qte-2.3.10/kernel-keymap-tosa.patch deleted file mode 100644 index ca445f4d1d..0000000000 --- a/packages/qte/qte-2.3.10/kernel-keymap-tosa.patch +++ /dev/null @@ -1,81 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp~kernel-keymap-tosa -+++ qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp -@@ -355,14 +355,24 @@ - { Qt::Key_CapsLock, 0xffff , 0xffff , 0xffff }, // 3c 60 - { Qt::Key_At, '@' , 's' , 'S'-64 }, // 3d - { Qt::Key_Question, '?' , '?' , 0xffff }, // 3e -+#ifdef QT_QWS_SL6000 -+ { Qt::Key_Comma, ',' , ';' , 0xffff }, // 3f -+ { Qt::Key_Period, '.' , ':' , 0xffff }, // 40 -+#else - { Qt::Key_Comma, ',' , ',' , 0xffff }, // 3f - { Qt::Key_Period, '.' , '.' , 0xffff }, // 40 -+#endif - { Qt::Key_Tab, 9 , '\\' , 0xffff }, // 41 - { Qt::Key_X, 0xffff , 'x' , 'X'-64 }, // 42 - { Qt::Key_C, 0xffff , 'c' , 'C'-64 }, // 43 - { Qt::Key_V, 0xffff , 'v' , 'V'-64 }, // 44 -+#ifdef QT_QWS_SL6000 -+ { Qt::Key_Slash, '/' , '?' , 0xffff }, // 45 -+ { Qt::Key_Apostrophe, '\'' , '"' , 0xffff }, // 46 70 -+#else - { Qt::Key_Slash, '/' , '/' , 0xffff }, // 45 - { Qt::Key_Apostrophe, '\'' , '\'' , 0xffff }, // 46 70 -+#endif - { Qt::Key_Semicolon, ';' , ';' , 0xffff }, // 47 - { Qt::Key_QuoteDbl, '\"' , '\"' , 0xffff }, // 48 - { Qt::Key_Colon, ':' , ':' , 0xffff }, // 49 -@@ -572,6 +582,32 @@ - static const int keyMSize = sizeof(keyM)/sizeof(QWSServer::KeyMap)-1; - static QIntDict<QWSServer::KeyMap> *overrideMap = 0; - -+#if defined(QT_QWS_SL6000) -+/* Translation table to obtain a 'legacy' keycode corresponding to -+ Fn+key on tosa -+ Other devices obviously send different keycodes while Fn is down, tosa sends -+ the same keys as usual bracketed by Fn-down/Fn-up. -+ This table is used while Fn is down to obtain the key-code the SL-5xxx would -+ send, so the rest of keyboard processing does not need to be adjusted. */ -+static const uchar sl6kFnTrans[] = { 0x00, -+ 0x5e, 0x3a, 0x43, 0x4a, 0x2b, 0x4b, 0x4c, 0x4d, 0x30, 0x4e, 0x4f, 0x50, -+ // !, -, cpy, #, 3, $, %, _, 8, &, *, (, -+ 0x53, 0x3b, 0x31, 0x32, 0x29, 0x2c, 0x3d, 0x2d, 0x2f, 0x44, 0x2a, 0x42, -+ // =, +, 9, 0, 1, 4, @, 5, 7, pste, 2, cut, -+ // padding for keycodes which don't ever get directly sent on tosa -+ // except for y->6, ret->'>', BS->DEL -+ 0x2e, 0x00, 0x00, 0x57, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // 6, _Z, shft, ret, F11, fn, BS?, F31, lght, cncl, lft, up, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // dn, rght, OK, home, 1, 2, 3, 4, 5, 6, 7, 8, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // 9, 0, UNK, UNK, UNK, UNK, UNK, UNK, UNK, -, +, caps, -+ // here are a few translatable codes again... -+ 0x00, 0x00, 0x54, 0x56, 0x3c, 0x00, 0x00, 0x00, 0x70, 0x55 }; -+ // @, ?, ,, ., tab, cut, cpy, pste, /, ' -+static const int sl6kFnSize = sizeof(sl6kFnTrans); -+#endif -+ - /*! - Changes the mapping of the keyboard; adding the scancode to Unicode - mappings from \a map. The server takes over ownership of \a map -@@ -882,6 +918,15 @@ - int keypad = 0; - - #ifndef QT_QWS_USE_KEYCODES -+#if defined(QT_QWS_SL6000) -+ qDebug("Key pressed: %x", code); -+ if (fn) -+ if (code < sl6kFnSize) { -+ code = sl6kFnTrans[code]; -+ qDebug("Translated Fn: %x", code); -+ } else -+ qDebug("Untranslatable Fn: %x", code); -+#endif - #if defined(QT_QWS_IPAQ) - // map ipaq 'action' key (0x60, 0xe0) - if ((code & 0x7f) == 0x60) { diff --git a/packages/qte/qte-2.3.10/key.patch b/packages/qte/qte-2.3.10/key.patch index 9092accd2c..d3cf4f76e7 100644 --- a/packages/qte/qte-2.3.10/key.patch +++ b/packages/qte/qte-2.3.10/key.patch @@ -72,19 +72,3 @@ Index: qt-2.3.10/src/kernel/qkeyboard_qws.cpp } #ifndef QT_QWS_USE_KEYCODES extended = 0; -@@ -2056,6 +2062,7 @@ - press ? "press" : "release", - repeatable ? "true":"false" ); - -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) - if ( qt_screen->isTransformed() && k >= Qt::Key_Left && k <= Qt::Key_Down ) - { - qDebug( "SimpadButtonsHandler() - We are transformed! Correcting..." ); -@@ -2063,6 +2070,7 @@ - k = xform_dirkey( k ); - qDebug( "SimpadButtonsHandler() - Old Key: %d - New Key %d", oldK, k ); - } -+#endif - - if ( repeatable && press ) - repeater->start( repeatdelay, true ); diff --git a/packages/qte/qte-2.3.10/remove-unused-kbdhandler.patch b/packages/qte/qte-2.3.10/remove-unused-kbdhandler.patch new file mode 100644 index 0000000000..2bebb020f3 --- /dev/null +++ b/packages/qte/qte-2.3.10/remove-unused-kbdhandler.patch @@ -0,0 +1,420 @@ +--- qt-2.3.10.orig/src/kernel/qkeyboard_qws.cpp.org 2007-07-19 11:00:39.000000000 +0300 ++++ qt-2.3.10/src/kernel/qkeyboard_qws.cpp 2007-07-19 12:14:48.000000000 +0300 +@@ -853,417 +853,6 @@ + + void QWSPC101KeyboardHandler::doKey(uchar code) + { +- const QWSServer::KeyMap *currentKey = 0; +- int keyCode = Qt::Key_unknown; +- bool release = false; +- int keypad = 0; +- +-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) // need autorepeat implemented here? +- bool repeatable = TRUE; +- +-#ifndef QT_QWS_USE_KEYCODES +-#if defined(QT_QWS_IPAQ) +- // map ipaq 'action' key (0x60, 0xe0) +- if ((code & 0x7f) == 0x60) { +-#if defined(QT_KEYPAD_MODE) +- // to keycode for select (keypad mode) +- code = (code & 0x80) | 116; +-#else +- // to keycode for space. (no keypad mode0 +- code = (code & 0x80) | 57; +-#endif +- } +-#endif +- +-#if !defined(QT_QWS_SL5XXX) +- if (code == 224 +-#if defined(QT_QWS_IPAQ) +- && !ipaq_return_pressed +-#endif +- ) { +- // extended +- extended = 1; +- return; +- } +- else if (code == 225) { +- // extended 2 +- extended = 2; +- return; +- } +-#endif +-#endif +- +- +- /*------------------------------------------------------------------ +- First find the Qt KeyCode +- ------------------------------------------------------------------*/ +- +- if (code & 0x80) { +- release = true; +- code &= 0x7f; +- } +- +-#ifndef QT_QWS_USE_KEYCODES +- if (extended == 1) { +- currentKey = overrideMap ? overrideMap->find( code+0xe000 ) : 0; +- if ( currentKey ) +- keyCode = currentKey->key_code; +- else +- switch (code) { +- case 72: +- keyCode = Qt::Key_Up; +- break; +- case 75: +- keyCode = Qt::Key_Left; +- break; +- case 77: +- keyCode = Qt::Key_Right; +- break; +- case 80: +- keyCode = Qt::Key_Down; +- break; +- case 82: +- keyCode = Qt::Key_Insert; +- break; +- case 71: +- keyCode = Qt::Key_Home; +- break; +- case 73: +- keyCode = Qt::Key_Prior; +- break; +- case 83: +- keyCode = Qt::Key_Delete; +- break; +- case 79: +- keyCode = Qt::Key_End; +- break; +- case 81: +- keyCode = Qt::Key_Next; +- break; +- case 28: +- keyCode = Qt::Key_Enter; +- break; +- case 53: +- keyCode = Qt::Key_Slash; +- break; +- case 0x1d: +- keyCode = Qt::Key_Control; +- break; +- case 0x2a: +- keyCode = Qt::Key_SysReq; +- break; +- case 0x38: +- keyCode = Qt::Key_Alt; +- break; +- case 0x5b: +- keyCode = Qt::Key_Super_L; +- break; +- case 0x5c: +- keyCode = Qt::Key_Super_R; +- break; +- case 0x5d: +- keyCode = Qt::Key_Menu; +- break; +- } +- } else if ( extended == 2 ) { +- switch (code) { +- case 0x1d: +- return; +- case 0x45: +- keyCode = Qt::Key_Pause; +- break; +- } +- } else +-#endif +- { +-#if defined(QT_QWS_SL5XXX) +- if ( fn && !meta && (code >= 0x42 && code <= 0x52) ) { +- ushort unicode=0xffff; +- int scan=0; +- if ( code == 0x42 ) { unicode='X'-'@'; scan=Key_X; } // Cut +- else if ( code == 0x43 ) { unicode='C'-'@'; scan=Key_C; } // Copy +- else if ( code == 0x44 ) { unicode='V'-'@'; scan=Key_V; } // Paste +- else if ( code == 0x52 ) { unicode='Z'-'@'; scan=Key_Z; } // Undo +- if ( scan ) { +- processKeyEvent( unicode, scan, ControlButton, !release, FALSE ); +- return; +- } +- } +-#endif +- currentKey = overrideMap ? overrideMap->find( code ) : 0; +- if ( !currentKey && code < keyMSize ) { +- currentKey = &QWSServer::keyMap()[code]; +- } +- if ( currentKey ) +- keyCode = currentKey->key_code; +- +-#if defined(QT_QWS_IPAQ) +- switch (code) { +-#if defined(QT_QWS_SL5XXX) +-#if defined(QT_KEYPAD_MODE) +- case 0x7a: +- keyCode = Key_Call; +- repeatable = FALSE; +- break; +- case 0x7b: +- keyCode = Key_Context1; +- repeatable = FALSE; +- break; +- case 0x7c: +- keyCode = Key_Back; +- repeatable = FALSE; +- break; +- case 0x7d: +- keyCode = Key_Hangup; +- repeatable = FALSE; +- break; +-#else +- case 0x7a: case 0x7b: case 0x7c: case 0x7d: +- keyCode = code - 0x7a + Key_F9; +- repeatable = FALSE; +- break; +-#endif +- case 0x79: +- keyCode = Key_F34; +- repeatable = FALSE; +- break; +-#endif +- +- case 0x74: // kernel KEY_POWER +- keyCode = Key_F34; +- repeatable = FALSE; +- break; +- case 89: // kernel KEY_RO +- keyCode = Key_F24; +- repeatable = FALSE; +- break; +- +- case 0x78: +-# if defined(QT_QWS_IPAQ) +- keyCode = Key_F24; // record +-# else +- keyCode = Key_Escape; +-# endif +- repeatable = FALSE; +- break; +- case 0x60: +- keyCode = Key_Return; +-# ifdef QT_QWS_IPAQ +- ipaq_return_pressed = !release; +-# endif +- break; +- case 0x67: +- keyCode = Key_Right; +- break; +- case 0x69: +- keyCode = Key_Up; +- break; +- case 0x6a: +- keyCode = Key_Down; +- break; +- case 0x6c: +- keyCode = Key_Left; +- break; +- } +-#endif +- +- /*------------------------------------------------------------------ +- Then do special processing of magic keys +- ------------------------------------------------------------------*/ +- +- +-#if defined(QT_QWS_SL5XXX) +- if ( release && ( keyCode == Key_F34 || keyCode == Key_F35 ) ) +- return; // no release for power and light keys +- if ( keyCode >= Key_F1 && keyCode <= Key_F35 +- || keyCode == Key_Escape || keyCode == Key_Home +- || keyCode == Key_Shift || keyCode == Key_Meta ) +- repeatable = FALSE; +-#endif +- +-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) +- if ( qt_screen->isTransformed() +- && keyCode >= Qt::Key_Left && keyCode <= Qt::Key_Down ) +- { +- keyCode = xform_dirkey(keyCode); +- } +-#endif +- +-#endif +- /* +- Translate shift+Key_Tab to Key_Backtab +- */ +- if (( keyCode == Key_Tab ) && shift ) +- keyCode = Key_Backtab; +-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) +- } +-#endif +- +-#ifndef QT_QWS_USE_KEYCODES +- /* +- Keypad consists of extended keys 53 and 28, +- and non-extended keys 55 and 71 through 83. +- */ +- if (( extended == 1 ) ? (code == 53 || code == 28) : +- (code == 55 || ( code >= 71 && code <= 83 )) ) +- keypad = Qt::Keypad; +-#else +- if ( code == 55 || code >= 71 && code <= 83 || code == 96 +- || code == 98 || code == 118 ) +- keypad = Qt::Keypad; +-#endif +- +- // Virtual console switching +- int term = 0; +- if (ctrl && alt && keyCode >= Qt::Key_F1 && keyCode <= Qt::Key_F10) +- term = keyCode - Qt::Key_F1 + 1; +- else if (ctrl && alt && keyCode == Qt::Key_Left) +- term = QMAX(vtQws - 1, 1); +- else if (ctrl && alt && keyCode == Qt::Key_Right) +- term = QMIN(vtQws + 1, 10); +- if (term && !release) { +- ctrl = false; +- alt = false; +-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) +- ioctl(kbdFD, VT_ACTIVATE, term); +-#endif +- return; +- } +- +-#if defined(QT_QWS_SL5XXX) +- // Ctrl-Alt-Delete exits qws +- if (ctrl && alt && keyCode == Qt::Key_Delete) { +- qApp->quit(); +- } +-#else +- // Ctrl-Alt-Backspace exits qws +- if (ctrl && alt && keyCode == Qt::Key_Backspace) { +- qApp->quit(); +- } +-#endif +- +-#if defined(QT_QWS_SL5XXX) +- if (keyCode == Qt::Key_F22) { /* Fn key */ +- fn = !release; +- } else if ( keyCode == Key_NumLock ) { +- if ( release ) +- numLock = !numLock; +- } else +-#endif +- +- if (keyCode == Qt::Key_Alt) { +- alt = !release; +- } else if (keyCode == Qt::Key_Control) { +- ctrl = !release; +- } else if (keyCode == Qt::Key_Shift) { +- shift = !release; +-#if defined(QT_QWS_SL5XXX) +- } else if (keyCode == Qt::Key_Meta) { +- meta = !release; +-#endif +- } else if ( keyCode == Qt::Key_CapsLock && release ) { +- caps = !caps; +-#if defined(_OS_LINUX_) && !defined(QT_QWS_SL5XXX) +- char leds; +- ioctl(0, KDGETLED, &leds); +- leds = leds & ~LED_CAP; +- if ( caps ) leds |= LED_CAP; +- ioctl(0, KDSETLED, leds); +-#endif +- } +- +- /*------------------------------------------------------------------ +- Then find the Unicode value and send the event +- ------------------------------------------------------------------*/ +- //If we map the keyboard to a non-latin1 layout, we may have +- //valid keys with unknown key codes. +- if ( currentKey || keyCode != Qt::Key_unknown ) { +- bool bAlt = alt; +- bool bCtrl = ctrl; +- bool bShift = shift; +- int unicode = 0xffff; +- if ( currentKey ) { +-#if !defined(QT_QWS_SL5XXX) +- bool bCaps = shift || +- (caps ? QChar(QWSServer::keyMap()[code].unicode).isLetter() : FALSE); +-#else +- bool bCaps = caps ^ shift; +- if (fn) { +- if ( shift ) { +- bCaps = bShift = FALSE; +- bCtrl = TRUE; +- } +- if ( meta ) { +- bCaps = bShift = TRUE; +- bAlt = TRUE; +- } +- } else if ( meta ) { +- bCaps = bShift = TRUE; +- } +- if ( code > 40 && caps ) { +- // fn-keys should only react to shift, not caps +- bCaps = bShift = shift; +- } +- if ( numLock ) { +- if ( keyCode != Key_Space && keyCode != Key_Tab ) +- bCaps = bShift = FALSE; +- } +- if ( keyCode == Key_Delete && (bAlt || bCtrl) ) { +- keyCode = Key_BraceLeft; +- unicode = '['; +- bCaps = bShift = bAlt = bCtrl = FALSE; +- } else if (keyCode == Qt::Key_F31 && bCtrl) { +- keyCode = Key_QuoteLeft; +- unicode = '`'; +- } else +-#endif +- +- if (bCtrl) +- unicode = currentKey->ctrl_unicode; +- else if (bCaps) +- unicode = currentKey->shift_unicode; +- else +- unicode = currentKey->unicode; +-#ifndef QT_QWS_USE_KEYCODES +- } else if ( extended == 1 ) { +- if ( keyCode == Qt::Key_Slash ) +- unicode = '/'; +- else if ( keyCode == Qt::Key_Enter ) +- unicode = 0xd; +-#endif +- } +- +- modifiers = 0; +- if ( bAlt ) modifiers |= AltButton; +- if ( bCtrl ) modifiers |= ControlButton; +- if ( bShift ) modifiers |= ShiftButton; +- if ( keypad ) modifiers |= Keypad; +- +- // looks wrong -- WWA +- bool repeat = FALSE; +- if (prevuni == unicode && prevkey == keyCode && !release) +- repeat = TRUE; +- +- processKeyEvent( unicode, keyCode, modifiers, !release, repeat ); +- +- if (!release) { +- prevuni = unicode; +- prevkey = keyCode; +- } else { +- prevkey = prevuni = 0; +- } +- +-#ifdef QT_QWS_AUTOREPEAT_MANUALLY +- if ( repeatable && !release ) +- rep->start(prevuni,prevkey,modifiers); +- else +- rep->stop(); +-#endif +- +- } +-#ifndef QT_QWS_USE_KEYCODES +- extended = 0; +-#endif + } + + diff --git a/packages/qte/qte-2.3.10/kernel-keymap-CXK.patch b/packages/qte/qte-2.3.10/spitz-adhoc-keypad-rotate.patch index a32207dc14..a32207dc14 100644 --- a/packages/qte/qte-2.3.10/kernel-keymap-CXK.patch +++ b/packages/qte/qte-2.3.10/spitz-adhoc-keypad-rotate.patch diff --git a/packages/qte/qte-2.3.12/kernel-keymap-tosa.patch b/packages/qte/qte-2.3.12/kernel-keymap-tosa.patch deleted file mode 100644 index ca445f4d1d..0000000000 --- a/packages/qte/qte-2.3.12/kernel-keymap-tosa.patch +++ /dev/null @@ -1,81 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp~kernel-keymap-tosa -+++ qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp -@@ -355,14 +355,24 @@ - { Qt::Key_CapsLock, 0xffff , 0xffff , 0xffff }, // 3c 60 - { Qt::Key_At, '@' , 's' , 'S'-64 }, // 3d - { Qt::Key_Question, '?' , '?' , 0xffff }, // 3e -+#ifdef QT_QWS_SL6000 -+ { Qt::Key_Comma, ',' , ';' , 0xffff }, // 3f -+ { Qt::Key_Period, '.' , ':' , 0xffff }, // 40 -+#else - { Qt::Key_Comma, ',' , ',' , 0xffff }, // 3f - { Qt::Key_Period, '.' , '.' , 0xffff }, // 40 -+#endif - { Qt::Key_Tab, 9 , '\\' , 0xffff }, // 41 - { Qt::Key_X, 0xffff , 'x' , 'X'-64 }, // 42 - { Qt::Key_C, 0xffff , 'c' , 'C'-64 }, // 43 - { Qt::Key_V, 0xffff , 'v' , 'V'-64 }, // 44 -+#ifdef QT_QWS_SL6000 -+ { Qt::Key_Slash, '/' , '?' , 0xffff }, // 45 -+ { Qt::Key_Apostrophe, '\'' , '"' , 0xffff }, // 46 70 -+#else - { Qt::Key_Slash, '/' , '/' , 0xffff }, // 45 - { Qt::Key_Apostrophe, '\'' , '\'' , 0xffff }, // 46 70 -+#endif - { Qt::Key_Semicolon, ';' , ';' , 0xffff }, // 47 - { Qt::Key_QuoteDbl, '\"' , '\"' , 0xffff }, // 48 - { Qt::Key_Colon, ':' , ':' , 0xffff }, // 49 -@@ -572,6 +582,32 @@ - static const int keyMSize = sizeof(keyM)/sizeof(QWSServer::KeyMap)-1; - static QIntDict<QWSServer::KeyMap> *overrideMap = 0; - -+#if defined(QT_QWS_SL6000) -+/* Translation table to obtain a 'legacy' keycode corresponding to -+ Fn+key on tosa -+ Other devices obviously send different keycodes while Fn is down, tosa sends -+ the same keys as usual bracketed by Fn-down/Fn-up. -+ This table is used while Fn is down to obtain the key-code the SL-5xxx would -+ send, so the rest of keyboard processing does not need to be adjusted. */ -+static const uchar sl6kFnTrans[] = { 0x00, -+ 0x5e, 0x3a, 0x43, 0x4a, 0x2b, 0x4b, 0x4c, 0x4d, 0x30, 0x4e, 0x4f, 0x50, -+ // !, -, cpy, #, 3, $, %, _, 8, &, *, (, -+ 0x53, 0x3b, 0x31, 0x32, 0x29, 0x2c, 0x3d, 0x2d, 0x2f, 0x44, 0x2a, 0x42, -+ // =, +, 9, 0, 1, 4, @, 5, 7, pste, 2, cut, -+ // padding for keycodes which don't ever get directly sent on tosa -+ // except for y->6, ret->'>', BS->DEL -+ 0x2e, 0x00, 0x00, 0x57, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // 6, _Z, shft, ret, F11, fn, BS?, F31, lght, cncl, lft, up, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // dn, rght, OK, home, 1, 2, 3, 4, 5, 6, 7, 8, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // 9, 0, UNK, UNK, UNK, UNK, UNK, UNK, UNK, -, +, caps, -+ // here are a few translatable codes again... -+ 0x00, 0x00, 0x54, 0x56, 0x3c, 0x00, 0x00, 0x00, 0x70, 0x55 }; -+ // @, ?, ,, ., tab, cut, cpy, pste, /, ' -+static const int sl6kFnSize = sizeof(sl6kFnTrans); -+#endif -+ - /*! - Changes the mapping of the keyboard; adding the scancode to Unicode - mappings from \a map. The server takes over ownership of \a map -@@ -882,6 +918,15 @@ - int keypad = 0; - - #ifndef QT_QWS_USE_KEYCODES -+#if defined(QT_QWS_SL6000) -+ qDebug("Key pressed: %x", code); -+ if (fn) -+ if (code < sl6kFnSize) { -+ code = sl6kFnTrans[code]; -+ qDebug("Translated Fn: %x", code); -+ } else -+ qDebug("Untranslatable Fn: %x", code); -+#endif - #if defined(QT_QWS_IPAQ) - // map ipaq 'action' key (0x60, 0xe0) - if ((code & 0x7f) == 0x60) { diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 79a77ba47a..fa9ddaea7a 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -25,12 +25,10 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://no-moc.patch;patch=1 \ file://gcc3.patch;patch=1 \ file://gcc4.patch;patch=1 \ - file://c700-hardware.patch;patch=1 \ file://encoding.patch;patch=1 \ file://fix-qgfxraster.patch;patch=1 \ file://qt-visibility.patch;patch=1 \ file://tslib.patch;patch=1 \ - file://simpad.patch;patch=1 \ file://handhelds.patch;patch=1 \ file://qiconview-speed.patch;patch=1 \ file://qtabbar.patch;patch=1 \ @@ -43,12 +41,12 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://key.patch;patch=1 \ file://bidimetrics.patch;patch=5 \ file://fix-native-build.patch;patch=1 \ - file://simpad-defaultkbd.patch;patch=1 \ file://fix-errno-exception-spec.patch;patch=1 \ file://keyboardless-buttonmap.patch;patch=1 \ file://kernel-keymap.patch;patch=1 \ file://kernel-keymap-corgi.patch;patch=1 \ file://kernel-asm-page.patch;patch=1 \ + file://remove-unused-kbdhandler.patch;patch=1 \ file://sharp_char.h \ file://switches.h " @@ -61,9 +59,8 @@ W100_ACCEL_PATCHES = "file://c7x0-w100-accel.patch;patch=1 \ file://suspend-resume-hooks.patch;patch=1" SRC_URI_append_c7x0 = "${W100_ACCEL_PATCHES} " -SRC_URI_append_spitz = "file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_akita = "file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_tosa = "file://kernel-keymap-tosa.patch;patch=1 " +SRC_URI_append_spitz = "file://spitz-adhoc-keypad-rotate.patch;patch=1 " +SRC_URI_append_akita = "file://spitz-adhoc-keypad-rotate.patch;patch=1 " # "ipaqs" used to have this, but later were proven to at least work # without it. Review again and see if has interesting bits to be applied @@ -90,39 +87,9 @@ EXTRA_OEMAKE = "-e" # # add device flags here # -EXTRA_DEFINES = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE" -EXTRA_DEFINES_a780 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_e680 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h1910 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h1940 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h2200 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h3600 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h3900 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h3900 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h4000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h5000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h6300 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_hx2000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_hx4700 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_rx3000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_asus716 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_asus730 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_htcuniversal = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_htcblueangel = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_htchimalaya = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_magician = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_jornada6xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_jornada7xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_palmld = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_palmtx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS" -EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700" -EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK" -EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK" -EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SL6000" +EXTRA_DEFINES = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SLCXK" +EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SLCXK" # # don't touch anything below here diff --git a/packages/qte/qte-common_2.3.12.inc b/packages/qte/qte-common_2.3.12.inc index cf812de460..4bb42a91c0 100644 --- a/packages/qte/qte-common_2.3.12.inc +++ b/packages/qte/qte-common_2.3.12.inc @@ -38,7 +38,7 @@ SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1;pnum=0 file:// SRC_URI_append_poodle = "file://kernel-keymap.patch;patch=1;pnum=0 " SRC_URI_append_a780 = "file://kernel-keymap.patch;patch=1;pnum=0 " SRC_URI_append_e680 = "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_tosa = "file://kernel-keymap.patch;patch=1;pnum=0 " 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 " SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index 428b9735d1..0af996559e 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r17" +PR = "r24" EXTRA_OECONF += "-thread" diff --git a/packages/sylpheed/claws-mail.inc b/packages/sylpheed/claws-mail.inc new file mode 100644 index 0000000000..e62ca9036a --- /dev/null +++ b/packages/sylpheed/claws-mail.inc @@ -0,0 +1,54 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent" +DEPENDS = "gtk+ libetpan openssl aspell" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2 \ + file://desktop.patch;patch=1 \ + file://streamline-ui.patch;patch=1 \ + " + +FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" + +EXTRA_OECONF = "--disable-aspell-test \ + --enable--aspell \ + --disable-manual \ + --disable-crash-dialog \ + --disable-jpilot \ + --disable-trayicon-plugin \ + --disable-spamassassin-plugin \ + --disable-bogofilter-plugin \ + --disable-pgpcore-plugin \ + --disable-pgpmime-plugin \ + --disable-pgpinline-plugin \ + --disable-dillo-viewer-plugin \ + --disable-clamav-plugin \ + --disable-gnomeprint \ + --disable-valgrind \ + " + +CFLAGS += "-D_GNU_SOURCE" + +inherit autotools pkgconfig + + +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 claws-mail.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps + install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/ + mv ${D}${bindir}/${TARGET_SYS}-claws-mail ${D}${bindir}/${PN} +} + +do_stage () { + autotools_stage_all +} + diff --git a/packages/sylpheed/claws-mail_2.9.1.bb b/packages/sylpheed/claws-mail_2.9.1.bb new file mode 100644 index 0000000000..f8a8396b95 --- /dev/null +++ b/packages/sylpheed/claws-mail_2.9.1.bb @@ -0,0 +1 @@ +require claws-mail.inc diff --git a/packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb b/packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb new file mode 100644 index 0000000000..5ca95d9dfb --- /dev/null +++ b/packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb @@ -0,0 +1,20 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent plugins" +DEPENDS = "claws-mail gtkhtml2 curl" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-${PV}.tar.gz" + +inherit autotools pkgconfig + +S = "${WORKDIR}/gtkhtml2_viewer-${PV}" + +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + +FILES_${PN} = "${libdir}/claws-mail/plugins/*.so" + diff --git a/packages/sylpheed/claws-plugin-mailmbox_1.13.bb b/packages/sylpheed/claws-plugin-mailmbox_1.13.bb new file mode 100644 index 0000000000..03e939ead3 --- /dev/null +++ b/packages/sylpheed/claws-plugin-mailmbox_1.13.bb @@ -0,0 +1,20 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent plugins" +DEPENDS = "claws-mail" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz" + +inherit autotools pkgconfig + +S = "${WORKDIR}/mailmbox-${PV}" + +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + +FILES_${PN} = "${libdir}/claws-mail/plugins/*.so" +FILES_${PN}-dbg = "${libdir}/claws-mail/plugins/.debug" diff --git a/packages/sylpheed/claws-plugin-rssyl_0.13.bb b/packages/sylpheed/claws-plugin-rssyl_0.13.bb new file mode 100644 index 0000000000..29fc245ac4 --- /dev/null +++ b/packages/sylpheed/claws-plugin-rssyl_0.13.bb @@ -0,0 +1,20 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent plugins" +DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz" + +inherit autotools pkgconfig + +S = "${WORKDIR}/rssyl-${PV}" + +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + +FILES_${PN} = "${libdir}/claws-mail/plugins/*.so" + diff --git a/packages/sylpheed/files/desktop.patch b/packages/sylpheed/files/desktop.patch new file mode 100644 index 0000000000..c5ed7a9c7d --- /dev/null +++ b/packages/sylpheed/files/desktop.patch @@ -0,0 +1,19 @@ +Index: claws-mail-2.9.1/claws-mail.desktop +=================================================================== +--- claws-mail-2.9.1.orig/claws-mail.desktop 2007-04-24 17:40:20.000000000 +0100 ++++ claws-mail-2.9.1/claws-mail.desktop 2007-04-25 07:08:36.000000000 +0100 +@@ -1,11 +1,11 @@ + [Desktop Entry] + Encoding=UTF-8 +-Name=Claws Mail ++Name=Mail + Exec=claws-mail + Icon=claws-mail +-Info="Claws Mail" ++Info=Email Application + Categories=GTK;Network;Email; +-Comment="Gtk+ based Mail Client" ++Comment=Email Application + Terminal=false + Type=Application + StartupNotify=true diff --git a/packages/sylpheed/files/streamline-ui.patch b/packages/sylpheed/files/streamline-ui.patch new file mode 100644 index 0000000000..29a52ff795 --- /dev/null +++ b/packages/sylpheed/files/streamline-ui.patch @@ -0,0 +1,1008 @@ +Index: claws-mail-2.9.1/src/mainwindow.c +=================================================================== +--- claws-mail-2.9.1.orig/src/mainwindow.c 2007-04-25 07:40:10.000000000 +0100 ++++ claws-mail-2.9.1/src/mainwindow.c 2007-04-25 10:26:40.000000000 +0100 +@@ -189,9 +189,6 @@ + static void toggle_statusbar_cb (MainWindow *mainwin, + guint action, + GtkWidget *widget); +-static void set_layout_cb (MainWindow *mainwin, +- guint action, +- GtkWidget *widget); + + static void addressbook_open_cb (MainWindow *mainwin, + guint action, +@@ -538,94 +535,24 @@ + {N_("/_Edit/_Search folder..."), "<shift><control>F", search_cb, 1, NULL}, + {N_("/_Edit/_Quick search"), "slash", mainwindow_quicksearch, 0, NULL}, + {N_("/_View"), NULL, NULL, 0, "<Branch>"}, +- {N_("/_View/Show or hi_de"), NULL, NULL, 0, "<Branch>"}, +- {N_("/_View/Show or hi_de/_Message view"), +- "V", toggle_message_cb, 0, "<ToggleItem>"}, +- {N_("/_View/Show or hi_de/_Toolbar"), +- NULL, NULL, 0, "<Branch>"}, +- {N_("/_View/Show or hi_de/_Toolbar/Text _below icons"), +- NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"}, +- {N_("/_View/Show or hi_de/_Toolbar/Text be_side icons"), +- NULL, toggle_toolbar_cb, TOOLBAR_BOTH_HORIZ, "/View/Show or hide/Toolbar/Text below icons"}, +- {N_("/_View/Show or hi_de/_Toolbar/_Icons only"), +- NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Text below icons"}, +- {N_("/_View/Show or hi_de/_Toolbar/_Text only"), +- NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Text below icons"}, +- {N_("/_View/Show or hi_de/_Toolbar/_Hide"), +- NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Text below icons"}, +- {N_("/_View/Show or hi_de/Status _bar"), +- NULL, toggle_statusbar_cb, 0, "<ToggleItem>"}, + {N_("/_View/Set displayed _columns"), NULL, NULL, 0, "<Branch>"}, + {N_("/_View/Set displayed _columns/in _Folder list..."), NULL, set_folder_display_item_cb, 0, NULL}, + {N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL}, + + {N_("/_View/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/La_yout"), NULL, NULL, 0, "<Branch>"}, +- {N_("/_View/Layout/_Standard"), NULL, set_layout_cb, NORMAL_LAYOUT, "<RadioItem>"}, +- {N_("/_View/Layout/_Three columns"), NULL, set_layout_cb, VERTICAL_LAYOUT, "/View/Layout/Standard"}, +- {N_("/_View/Layout/_Wide message"), NULL, set_layout_cb, WIDE_LAYOUT, "/View/Layout/Standard"}, +- {N_("/_View/Layout/W_ide message list"),NULL, set_layout_cb, WIDE_MSGLIST_LAYOUT, "/View/Layout/Standard"}, +- {N_("/_View/Layout/S_mall screen"), NULL, set_layout_cb, SMALL_LAYOUT, "/View/Layout/Standard"}, +- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"}, + {N_("/_View/_Sort"), NULL, NULL, 0, "<Branch>"}, +- {N_("/_View/_Sort/by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"}, +- {N_("/_View/_Sort/by S_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _Date"), NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _From"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _To"), NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by S_ubject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _color label"), +- NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by _status"), NULL, sort_summary_cb, SORT_BY_STATUS, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by a_ttachment"), +- NULL, sort_summary_cb, SORT_BY_MIME, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by score"), NULL, sort_summary_cb, SORT_BY_SCORE, "/View/Sort/by number"}, +- {N_("/_View/_Sort/by locked"), NULL, sort_summary_cb, SORT_BY_LOCKED, "/View/Sort/by number"}, +- {N_("/_View/_Sort/D_on't sort"), NULL, sort_summary_cb, SORT_BY_NONE, "/View/Sort/by number"}, ++ {N_("/_View/_Sort/by _Date"), NULL, sort_summary_cb, SORT_BY_DATE, "<RadioItem>"}, ++ {N_("/_View/_Sort/by _From"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by Date"}, ++ {N_("/_View/_Sort/by _To"), NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by Date"}, ++ {N_("/_View/_Sort/by S_ubject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by Date"}, + {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"}, + {N_("/_View/_Sort/Ascending"), NULL, sort_summary_type_cb, SORT_ASCENDING, "<RadioItem>"}, + {N_("/_View/_Sort/Descending"), NULL, sort_summary_type_cb, SORT_DESCENDING, "/View/Sort/Ascending"}, +- {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Sort/_Attract by subject"), +- NULL, attract_by_subject_cb, 0, NULL}, + {N_("/_View/Th_read view"), "<control>T", thread_cb, 0, "<ToggleItem>"}, + {N_("/_View/E_xpand all threads"), NULL, expand_threads_cb, 0, NULL}, + {N_("/_View/Co_llapse all threads"), NULL, collapse_threads_cb, 0, NULL}, + {N_("/_View/_Hide read messages"), NULL, hide_read_messages, 0, "<ToggleItem>"}, + +- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to"), NULL, NULL, 0, "<Branch>"}, +- {N_("/_View/_Go to/_Previous message"), "P", prev_cb, 0, NULL}, +- {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL}, +- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to/P_revious unread message"), +- "<shift>P", prev_unread_cb, 0, NULL}, +- {N_("/_View/_Go to/N_ext unread message"), +- "<shift>N", next_unread_cb, 0, NULL}, +- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to/Previous ne_w message"), NULL, prev_new_cb, 0, NULL}, +- {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_cb, 0, NULL}, +- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to/Previous _marked message"), +- NULL, prev_marked_cb, 0, NULL}, +- {N_("/_View/_Go to/Next m_arked message"), +- NULL, next_marked_cb, 0, NULL}, +- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to/Previous _labeled message"), +- NULL, prev_labeled_cb, 0, NULL}, +- {N_("/_View/_Go to/Next la_beled message"), +- NULL, next_labeled_cb, 0, NULL}, +- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to/Last read message"), +- NULL, last_read_cb, 0, NULL}, +- {N_("/_View/_Go to/Parent message"), +- "<control>Up", parent_cb, 0, NULL}, +- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/_Go to/Next unread _folder"), "<shift>G", goto_unread_folder_cb, 0, NULL}, +- {N_("/_View/_Go to/_Other folder..."), "G", goto_folder_cb, 0, NULL}, +- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"}, +- + #define ENC_SEPARATOR \ + {N_("/_View/Character _encoding/---"), NULL, NULL, 0, "<Separator>"} + #define ENC_ACTION(action) \ +@@ -742,7 +669,6 @@ + #undef DEC_ACTION + + {N_("/_View/---"), NULL, NULL, 0, "<Separator>"}, +- {N_("/_View/Open in new _window"), "<control><alt>N", open_msg_cb, 0, NULL}, + {N_("/_View/Mess_age source"), "<control>U", view_source_cb, 0, NULL}, + {N_("/_View/All headers"), "<control>H", show_all_header_cb, 0, "<ToggleItem>"}, + {N_("/_View/Quotes"), NULL, NULL, 0, "<Branch>"}, +@@ -1137,23 +1063,14 @@ + gint i; + guint n_menu_entries; + +- static GdkGeometry geometry; +- + debug_print("Creating main window...\n"); + mainwin = g_new0(MainWindow, 1); + + /* main window */ + window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow"); +- gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION); ++ gtk_window_set_title(GTK_WINDOW(window), _("Mail")); + gtk_window_set_resizable(GTK_WINDOW(window), TRUE); + +- if (!geometry.min_height) { +- geometry.min_width = 320; +- geometry.min_height = 200; +- } +- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry, +- GDK_HINT_MIN_SIZE); +- + g_signal_connect(G_OBJECT(window), "delete_event", + G_CALLBACK(main_window_close_cb), mainwin); + MANAGE_WINDOW_SIGNALS_CONNECT(window); +@@ -1184,21 +1101,9 @@ + /* gtk_widget_show(gtk_item_factory_get_item(ifactory,"/Message/Mailing-List")); + main_create_mailing_list_menu (mainwin, NULL); */ + +- menu_set_sensitive(ifactory, "/Help/Manual", manual_available(MANUAL_MANUAL_LOCAL)); +- +- if (prefs_common.toolbar_detachable) { +- handlebox = gtk_handle_box_new(); +- gtk_widget_show(handlebox); +- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0); +- g_signal_connect(G_OBJECT(handlebox), "child_attached", +- G_CALLBACK(toolbar_child_attached), mainwin); +- g_signal_connect(G_OBJECT(handlebox), "child_detached", +- G_CALLBACK(toolbar_child_detached), mainwin); +- } else { +- handlebox = gtk_hbox_new(FALSE, 0); +- gtk_widget_show(handlebox); +- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0); +- } ++ handlebox = gtk_hbox_new(FALSE, 0); ++ gtk_widget_show(handlebox); ++ gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0); + /* link window to mainwin->window to avoid gdk warnings */ + mainwin->window = window; + +@@ -1405,36 +1310,6 @@ + (ifactory, "/View/Character encoding/Auto detect"); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE); + +- switch (prefs_common.toolbar_style) { +- case TOOLBAR_NONE: +- menuitem = gtk_item_factory_get_item +- (ifactory, "/View/Show or hide/Toolbar/Hide"); +- break; +- case TOOLBAR_ICON: +- menuitem = gtk_item_factory_get_item +- (ifactory, "/View/Show or hide/Toolbar/Icons only"); +- break; +- case TOOLBAR_TEXT: +- menuitem = gtk_item_factory_get_item +- (ifactory, "/View/Show or hide/Toolbar/Text only"); +- break; +- case TOOLBAR_BOTH: +- menuitem = gtk_item_factory_get_item +- (ifactory, "/View/Show or hide/Toolbar/Text below icons"); +- break; +- case TOOLBAR_BOTH_HORIZ: +- menuitem = gtk_item_factory_get_item +- (ifactory, +- "/View/Show or hide/Toolbar/Text beside icons"); +- } +- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE); +- +- gtk_widget_hide(mainwin->hbox_stat); +- menuitem = gtk_item_factory_get_item +- (ifactory, "/View/Show or hide/Status bar"); +- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), +- prefs_common.show_statusbar); +- + /* set account selection menu */ + ac_menu = gtk_item_factory_get_widget + (ifactory, "/Configuration/Change current account"); +@@ -2284,16 +2159,6 @@ + {"/View/Expand all threads" , M_MSG_EXIST}, + {"/View/Collapse all threads" , M_MSG_EXIST}, + {"/View/Hide read messages" , M_HIDE_READ_MSG}, +- {"/View/Go to/Previous message" , M_MSG_EXIST}, +- {"/View/Go to/Next message" , M_MSG_EXIST}, +- {"/View/Go to/Previous unread message" , M_MSG_EXIST}, +- {"/View/Go to/Previous new message" , M_MSG_EXIST}, +- {"/View/Go to/Previous marked message" , M_MSG_EXIST}, +- {"/View/Go to/Previous labeled message", M_MSG_EXIST}, +- {"/View/Go to/Next labeled message", M_MSG_EXIST}, +- {"/View/Go to/Last read message" , M_SINGLE_TARGET_EXIST}, +- {"/View/Go to/Parent message" , M_SINGLE_TARGET_EXIST}, +- {"/View/Open in new window" , M_SINGLE_TARGET_EXIST}, + {"/View/Message source" , M_SINGLE_TARGET_EXIST}, + {"/View/All headers" , M_SINGLE_TARGET_EXIST}, + {"/View/Quotes" , M_SINGLE_TARGET_EXIST}, +@@ -2379,40 +2244,20 @@ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \ + } + +- SET_CHECK_MENU_ACTIVE("/View/Show or hide/Message view", +- messageview_is_visible(mainwin->messageview)); +- + summaryview = mainwin->summaryview; +- menu_path = "/View/Sort/Don't sort"; ++ menu_path = "/View/Sort/by Date"; + + switch (summaryview->sort_key) { +- case SORT_BY_NUMBER: +- menu_path = "/View/Sort/by number"; break; +- case SORT_BY_SIZE: +- menu_path = "/View/Sort/by Size"; break; +- case SORT_BY_DATE: +- menu_path = "/View/Sort/by Date"; break; + case SORT_BY_FROM: + menu_path = "/View/Sort/by From"; break; + case SORT_BY_TO: + menu_path = "/View/Sort/by To"; break; + case SORT_BY_SUBJECT: + menu_path = "/View/Sort/by Subject"; break; +- case SORT_BY_LABEL: +- menu_path = "/View/Sort/by color label"; break; +- case SORT_BY_MARK: +- menu_path = "/View/Sort/by mark"; break; +- case SORT_BY_STATUS: +- menu_path = "/View/Sort/by status"; break; +- case SORT_BY_MIME: +- menu_path = "/View/Sort/by attachment"; break; +- case SORT_BY_SCORE: +- menu_path = "/View/Sort/by score"; break; +- case SORT_BY_LOCKED: +- menu_path = "/View/Sort/by locked"; break; + case SORT_BY_NONE: ++ case SORT_BY_DATE: + default: +- menu_path = "/View/Sort/Don't sort"; break; ++ menu_path = "/View/Sort/by Date"; break; + } + SET_CHECK_MENU_ACTIVE(menu_path, TRUE); + +@@ -2735,8 +2580,6 @@ + gtk_widget_destroy(mainwin->hpaned); + } + +- menu_set_sensitive(ifactory, "/View/Show or hide/Message view", +- (layout_mode != WIDE_MSGLIST_LAYOUT && layout_mode != SMALL_LAYOUT)); + switch (layout_mode) { + case VERTICAL_LAYOUT: + case NORMAL_LAYOUT: +@@ -2877,37 +2720,6 @@ + + prefs_common.layout_mode = layout_mode; + +- menuitem = gtk_item_factory_get_item +- (ifactory, "/View/Show or hide/Message view"); +- gtk_check_menu_item_set_active +- (GTK_CHECK_MENU_ITEM(menuitem), +- messageview_is_visible(mainwin->messageview)); +- +-#define SET_CHECK_MENU_ACTIVE(path, active) \ +-{ \ +- menuitem = gtk_item_factory_get_widget(ifactory, path); \ +- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \ +-} +- +- switch (prefs_common.layout_mode) { +- case NORMAL_LAYOUT: +- SET_CHECK_MENU_ACTIVE("/View/Layout/Standard", TRUE); +- break; +- case VERTICAL_LAYOUT: +- SET_CHECK_MENU_ACTIVE("/View/Layout/Three columns", TRUE); +- break; +- case WIDE_LAYOUT: +- SET_CHECK_MENU_ACTIVE("/View/Layout/Wide message", TRUE); +- break; +- case WIDE_MSGLIST_LAYOUT: +- SET_CHECK_MENU_ACTIVE("/View/Layout/Wide message list", TRUE); +- break; +- case SMALL_LAYOUT: +- SET_CHECK_MENU_ACTIVE("/View/Layout/Small screen", TRUE); +- break; +- } +-#undef SET_CHECK_MENU_ACTIVE +- + if (folderwin) { + g_signal_connect + (G_OBJECT(folderwin), "size_allocate", +@@ -3116,12 +2928,6 @@ + summary_toggle_view(mainwin->summaryview); + } + +-static void toggle_toolbar_cb(MainWindow *mainwin, guint action, +- GtkWidget *widget) +-{ +- toolbar_toggle(action, mainwin); +-} +- + static void main_window_reply_cb(MainWindow *mainwin, guint action, + GtkWidget *widget) + { +Index: claws-mail-2.9.1/src/prefs_common.c +=================================================================== +--- claws-mail-2.9.1.orig/src/prefs_common.c 2007-04-25 07:40:10.000000000 +0100 ++++ claws-mail-2.9.1/src/prefs_common.c 2007-04-25 07:42:17.000000000 +0100 +@@ -262,7 +262,7 @@ + {"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL, + NULL, NULL, NULL}, + +-#ifndef MAEMO ++#if 0 + {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL, + NULL, NULL, NULL}, + #else +@@ -300,7 +300,7 @@ + &prefs_common.normalfont_gtk1, P_STRING, NULL, NULL, NULL}, + + /* new fonts */ +-#ifndef MAEMO ++#if 0 + {"widget_font_gtk2", NULL, + &SPECIFIC_PREFS.widgetfont, P_STRING, NULL, NULL, NULL}, + {"message_font_gtk2", "Monospace 9", +@@ -416,7 +416,7 @@ + + {"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL, + NULL, NULL, NULL}, +-#ifndef MAEMO ++#if 0 + {"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM, + NULL, NULL, NULL}, + #else +@@ -544,7 +544,7 @@ + {"folder_col_pos_total", "3", + &prefs_common.folder_col_pos[F_COL_TOTAL], P_INT, NULL, NULL, NULL}, + +-#ifndef MAEMO ++#if 0 + {"folder_col_size_folder", "120", + &prefs_common.folder_col_size[F_COL_FOLDER], P_INT, NULL, NULL, NULL}, + {"folder_col_size_new", "32", +@@ -702,7 +702,7 @@ + &SPECIFIC_PREFS.mime_open_cmd, P_STRING, NULL, NULL, NULL}, + + /* Interface */ +-#ifndef MAEMO ++#if 0 + {"layout_mode", "0", &prefs_common.layout_mode, P_INT, + NULL, NULL, NULL}, + #else +Index: claws-mail-2.9.1/src/toolbar.c +=================================================================== +--- claws-mail-2.9.1.orig/src/toolbar.c 2007-04-25 07:40:10.000000000 +0100 ++++ claws-mail-2.9.1/src/toolbar.c 2007-04-25 07:42:17.000000000 +0100 +@@ -841,26 +841,17 @@ + gtk_widget_hide(handlebox_wid); + break; + case TOOLBAR_ICON: +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid), +- GTK_TOOLBAR_ICONS); +- break; + case TOOLBAR_TEXT: +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid), +- GTK_TOOLBAR_TEXT); +- break; + case TOOLBAR_BOTH: +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid), +- GTK_TOOLBAR_BOTH); +- break; + case TOOLBAR_BOTH_HORIZ: + gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid), +- GTK_TOOLBAR_BOTH_HORIZ); ++ GTK_TOOLBAR_ICONS); + break; + default: + return; + } + +- prefs_common.toolbar_style = (ToolbarStyle)action; ++ prefs_common.toolbar_style = (ToolbarStyle)TOOLBAR_ICON; + gtk_widget_set_size_request(handlebox_wid, 1, -1); + + if (prefs_common.toolbar_style != TOOLBAR_NONE) { +@@ -1594,7 +1585,7 @@ + gtk_container_add(GTK_CONTAINER(container), toolbar); + gtk_container_set_border_width(GTK_CONTAINER(container), 2); + gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL); +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH); ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); + + for (cur = toolbar_list; cur != NULL; cur = cur->next) { + +Index: claws-mail-2.9.1/src/gtk/prefswindow.c +=================================================================== +--- claws-mail-2.9.1.orig/src/gtk/prefswindow.c 2007-04-25 07:40:10.000000000 +0100 ++++ claws-mail-2.9.1/src/gtk/prefswindow.c 2007-04-25 10:30:15.000000000 +0100 +@@ -343,6 +343,10 @@ + gint x = gdk_screen_width(); + gint y = gdk_screen_height(); + static GdkGeometry geometry; ++ gint col_count = g_slist_length (prefs_pages); ++ ++ if (col_count > 1) ++ col_count = 2; + + prefswindow = g_new0(PrefsWindow, 1); + +@@ -360,39 +364,52 @@ + gtk_window_set_resizable (GTK_WINDOW(prefswindow->window), TRUE); + gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4); + +- prefswindow->table1 = gtk_table_new(2, 2, FALSE); ++ prefswindow->table1 = gtk_table_new(col_count, col_count, FALSE); + gtk_widget_show(prefswindow->table1); + gtk_container_add(GTK_CONTAINER(prefswindow->window), prefswindow->table1); + +- prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); +- gtk_widget_show(prefswindow->scrolledwindow1); +- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); +- gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->scrolledwindow1, 0, 1, 0, 1, GTK_FILL, GTK_FILL | GTK_EXPAND, 2, 2); +- +- prefswindow->tree_view = prefswindow_tree_view_create(prefswindow); +- gtk_widget_show(prefswindow->tree_view); +- gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1), +- prefswindow->tree_view); +- +- prefswindow->frame = gtk_frame_new(NULL); +- gtk_widget_show(prefswindow->frame); +- gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN); +- gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->frame, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2); +- +- prefswindow->table2 = gtk_table_new(1, 2, FALSE); +- gtk_widget_show(prefswindow->table2); +- gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2); +- +- prefswindow->labelframe = gtk_frame_new(NULL); +- gtk_widget_show(prefswindow->labelframe); +- gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->labelframe), GTK_SHADOW_OUT); +- gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->labelframe, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 1, 1); +- +- prefswindow->pagelabel = gtk_label_new(""); +- gtk_widget_show(prefswindow->pagelabel); +- gtk_label_set_justify(GTK_LABEL(prefswindow->pagelabel), GTK_JUSTIFY_LEFT); +- gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0); +- gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel); ++ if (col_count > 1) ++ { ++ prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); ++ gtk_widget_show(prefswindow->scrolledwindow1); ++ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); ++ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->scrolledwindow1, 0, 1, 0, 1, GTK_FILL, GTK_FILL | GTK_EXPAND, 2, 2); ++ ++ prefswindow->tree_view = prefswindow_tree_view_create(prefswindow); ++ gtk_widget_show(prefswindow->tree_view); ++ gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1), ++ prefswindow->tree_view); ++ ++ prefswindow->frame = gtk_frame_new(NULL); ++ gtk_widget_show(prefswindow->frame); ++ gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN); ++ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->frame, col_count - 1, col_count, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2); ++ ++ prefswindow->table2 = gtk_table_new(1, 2, FALSE); ++ gtk_widget_show(prefswindow->table2); ++ gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2); ++ } ++ else ++ { ++ prefswindow->table2 = gtk_table_new(1, 2, FALSE); ++ gtk_widget_show(prefswindow->table2); ++ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->table2, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2); ++ } ++ ++ ++ if (col_count > 1) ++ { ++ prefswindow->labelframe = gtk_frame_new(NULL); ++ gtk_widget_show(prefswindow->labelframe); ++ gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->labelframe), GTK_SHADOW_OUT); ++ gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->labelframe, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 1, 1); ++ ++ prefswindow->pagelabel = gtk_label_new(""); ++ gtk_widget_show(prefswindow->pagelabel); ++ gtk_label_set_justify(GTK_LABEL(prefswindow->pagelabel), GTK_JUSTIFY_LEFT); ++ gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0); ++ gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel); ++ } + + prefswindow->scrolledwindow2 = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_show(prefswindow->scrolledwindow2); +@@ -411,9 +428,38 @@ + gtk_widget_show(prefswindow->empty_page); + gtk_container_add(GTK_CONTAINER(prefswindow->notebook), prefswindow->empty_page); + +- prefswindow_build_tree(prefswindow->tree_view, prefs_pages); ++ if (col_count > 1) ++ { ++ prefswindow_build_tree(prefswindow->tree_view, prefs_pages); ++ ++ gtk_widget_grab_focus(prefswindow->tree_view); ++ } ++ else ++ { ++ PrefsPage * page = prefs_pages->data; ++ gint pagenum; ++ GtkAdjustment *adj; ++ ++ if (!page->page_open) ++ { ++ page->create_widget(page, ++ GTK_WINDOW(prefswindow->window), ++ prefswindow->data); ++ gtk_container_add(GTK_CONTAINER(prefswindow->notebook), ++ page->widget); ++ page->page_open = TRUE; ++ } ++ ++ pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(prefswindow->notebook), ++ page->widget); ++ gtk_notebook_set_current_page(GTK_NOTEBOOK(prefswindow->notebook), ++ pagenum); + +- gtk_widget_grab_focus(prefswindow->tree_view); ++ adj = gtk_scrolled_window_get_vadjustment( ++ GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2)); ++ gtk_adjustment_set_value(adj, 0); ++ ++ } + + gtkut_stock_button_set_create(&prefswindow->confirm_area, + &prefswindow->apply_btn, GTK_STOCK_APPLY, +@@ -440,28 +486,6 @@ + G_CALLBACK(prefswindow_key_pressed), &(prefswindow->window)); + #endif + +- /* connect to callback only if we hhave non-NULL pointers to store size to */ +- if (prefswindow->save_width && prefswindow->save_height) { +- g_signal_connect(G_OBJECT(prefswindow->window), "size_allocate", +- G_CALLBACK(prefs_size_allocate_cb), prefswindow); +- } +- +- if (!geometry.min_height) { +- +- if (x < 800 && y < 600) { +- geometry.min_width = 600; +- geometry.min_height = 440; +- } else { +- geometry.min_width = 700; +- geometry.min_height = 550; +- } +- } +- gtk_window_set_geometry_hints(GTK_WINDOW(prefswindow->window), NULL, &geometry, +- GDK_HINT_MIN_SIZE); +- if (prefswindow->save_width && prefswindow->save_height) { +- gtk_widget_set_size_request(prefswindow->window, *(prefswindow->save_width), +- *(prefswindow->save_height)); +- } + + gtk_widget_show(prefswindow->window); + #ifdef MAEMO +Index: claws-mail-2.9.1/src/compose.c +=================================================================== +--- claws-mail-2.9.1.orig/src/compose.c 2007-04-25 07:40:10.000000000 +0100 ++++ claws-mail-2.9.1/src/compose.c 2007-04-25 10:18:13.000000000 +0100 +@@ -352,9 +352,6 @@ + + /* callback functions */ + +-static gboolean compose_edit_size_alloc (GtkEditable *widget, +- GtkAllocation *allocation, +- GtkSHRuler *shruler); + static void account_activated (GtkComboBox *optmenu, + gpointer data); + static void attach_selected (GtkTreeView *tree_view, +@@ -439,9 +436,6 @@ + guint action, + GtkWidget *widget); + +-static void compose_toggle_ruler_cb (gpointer data, +- guint action, +- GtkWidget *widget); + static void compose_toggle_sign_cb (gpointer data, + guint action, + GtkWidget *widget); +@@ -788,7 +782,6 @@ + ENC_ACTION(C_WINDOWS_874)}, + + {N_("/_Tools"), NULL, NULL, 0, "<Branch>"}, +- {N_("/_Tools/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"}, + {N_("/_Tools/_Address book"), "<shift><control>A", compose_address_cb , 0, NULL}, + {N_("/_Tools/_Template"), NULL, NULL, 0, "<Branch>"}, + {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"}, +@@ -2067,7 +2060,6 @@ + menu_set_sensitive(ifactory, "/Message/Insert signature", FALSE); + menu_set_sensitive(ifactory, "/Edit", FALSE); + menu_set_sensitive(ifactory, "/Options", FALSE); +- menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE); + menu_set_sensitive(ifactory, "/Tools/Actions", FALSE); + + if (compose->toolbar->draft_btn) +@@ -5684,7 +5676,7 @@ + g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus", + G_CALLBACK(compose_grab_focus_cb), compose); + gtk_widget_show(combo); +- gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_SHRINK, GTK_FILL, 0, 0); ++ gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_FILL, GTK_FILL, 0, 0); + if (compose->header_last) { + const gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry)); + string = headers; +@@ -5778,7 +5770,7 @@ + + static GtkWidget *compose_create_header(Compose *compose) + { +- GtkWidget *from_optmenu_hbox; ++ GtkWidget *from_optmenu; + GtkWidget *header_scrolledwin; + GtkWidget *header_table; + +@@ -5788,18 +5780,20 @@ + header_scrolledwin = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_show(header_scrolledwin); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(header_scrolledwin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); +- + header_table = gtk_table_new(2, 2, FALSE); ++ gtk_table_set_col_spacings (GTK_TABLE (header_table), BORDER_WIDTH); + gtk_widget_show(header_table); + gtk_container_set_border_width(GTK_CONTAINER(header_table), BORDER_WIDTH); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table); +- gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_ETCHED_IN); ++ gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_NONE); + count = 0; + + /* option menu for selecting accounts */ +- from_optmenu_hbox = compose_account_option_menu_create(compose); +- gtk_table_attach(GTK_TABLE(header_table), from_optmenu_hbox, +- 0, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); ++ from_optmenu = compose_account_option_menu_create(compose); ++ gtk_table_attach(GTK_TABLE(header_table), from_optmenu, ++ 0, 1, count, count + 1, GTK_FILL, GTK_FILL, 0, 0); ++ gtk_table_attach(GTK_TABLE(header_table), compose->from_name, ++ 1, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + count++; + + compose->header_table = header_table; +@@ -6140,15 +6134,12 @@ + GtkWidget *vbox2; + + GtkWidget *label; +- GtkWidget *subject_hbox; +- GtkWidget *subject_frame; ++ GtkWidget *edit_frame; + GtkWidget *subject_entry; + GtkWidget *subject; + GtkWidget *paned; + + GtkWidget *edit_vbox; +- GtkWidget *ruler_hbox; +- GtkWidget *ruler; + GtkWidget *scrolledwin; + GtkWidget *text; + GtkTextBuffer *buffer; +@@ -6169,8 +6160,6 @@ + GtkAspell * gtkaspell = NULL; + #endif + +- static GdkGeometry geometry; +- + g_return_val_if_fail(account != NULL, NULL); + + debug_print("Creating compose window...\n"); +@@ -6190,28 +6179,6 @@ + + window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "compose"); + +- gtk_window_set_resizable(GTK_WINDOW(window), TRUE); +- gtk_widget_set_size_request(window, -1, prefs_common.compose_height); +- +- if (!geometry.max_width) { +- geometry.max_width = gdk_screen_width(); +- geometry.max_height = gdk_screen_height(); +- } +- +- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, +- &geometry, GDK_HINT_MAX_SIZE); +- if (!geometry.min_width) { +- geometry.min_width = 600; +- geometry.min_height = 480; +- } +- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, +- &geometry, GDK_HINT_MIN_SIZE); +- +-#ifndef MAEMO +- if (compose_force_window_origin) +- gtk_widget_set_uposition(window, prefs_common.compose_x, +- prefs_common.compose_y); +-#endif + g_signal_connect(G_OBJECT(window), "delete_event", + G_CALLBACK(compose_delete_cb), compose); + MANAGE_WINDOW_SIGNALS_CONNECT(window); +@@ -6227,11 +6194,7 @@ + n_menu_entries, "<Compose>", compose); + gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); + +- if (prefs_common.toolbar_detachable) { +- handlebox = gtk_handle_box_new(); +- } else { +- handlebox = gtk_hbox_new(FALSE, 0); +- } ++ handlebox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0); + + gtk_widget_realize(handlebox); +@@ -6244,7 +6207,6 @@ + + /* Notebook */ + notebook = gtk_notebook_new(); +- gtk_widget_set_size_request(notebook, -1, 130); + gtk_widget_show(notebook); + + /* header labels and entries */ +@@ -6258,18 +6220,10 @@ + /* Others Tab */ + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), + compose_create_others(compose), +- gtk_label_new_with_mnemonic(_("Othe_rs"))); ++ gtk_label_new_with_mnemonic(_("Othe_r"))); + + /* Subject */ +- subject_hbox = gtk_hbox_new(FALSE, 0); +- gtk_widget_show(subject_hbox); +- +- subject_frame = gtk_frame_new(NULL); +- gtk_frame_set_shadow_type(GTK_FRAME(subject_frame), GTK_SHADOW_NONE); +- gtk_box_pack_start(GTK_BOX(subject_hbox), subject_frame, TRUE, TRUE, 0); +- gtk_widget_show(subject_frame); +- +- subject = gtk_hbox_new(FALSE, HSPACING_NARROW); ++ subject = gtk_hbox_new(FALSE, BORDER_WIDTH); + gtk_container_set_border_width(GTK_CONTAINER(subject), 0); + gtk_widget_show(subject); + +@@ -6283,20 +6237,16 @@ + G_CALLBACK(compose_grab_focus_cb), compose); + gtk_widget_show(subject_entry); + compose->subject_entry = subject_entry; +- gtk_container_add(GTK_CONTAINER(subject_frame), subject); + +- edit_vbox = gtk_vbox_new(FALSE, 0); ++ edit_vbox = gtk_vbox_new(FALSE, BORDER_WIDTH); ++ gtk_container_set_border_width(GTK_CONTAINER(edit_vbox), BORDER_WIDTH); + +- gtk_box_pack_start(GTK_BOX(edit_vbox), subject_hbox, FALSE, FALSE, 0); ++ gtk_box_pack_start(GTK_BOX(edit_vbox), subject, FALSE, FALSE, 0); + +- /* ruler */ +- ruler_hbox = gtk_hbox_new(FALSE, 0); +- gtk_box_pack_start(GTK_BOX(edit_vbox), ruler_hbox, FALSE, FALSE, 0); +- +- ruler = gtk_shruler_new(); +- gtk_ruler_set_range(GTK_RULER(ruler), 0.0, 100.0, 1.0, 100.0); +- gtk_box_pack_start(GTK_BOX(ruler_hbox), ruler, TRUE, TRUE, +- BORDER_WIDTH); ++ edit_frame = gtk_frame_new(NULL); ++ gtk_frame_set_shadow_type(GTK_FRAME(edit_frame), GTK_SHADOW_IN); ++ gtk_widget_show(edit_frame); ++ gtk_container_add(GTK_CONTAINER(edit_frame), edit_vbox); + + /* text widget */ + scrolledwin = gtk_scrolled_window_new(NULL, NULL); +@@ -6317,9 +6267,6 @@ + + gtk_container_add(GTK_CONTAINER(scrolledwin), text); + +- g_signal_connect_after(G_OBJECT(text), "size_allocate", +- G_CALLBACK(compose_edit_size_alloc), +- ruler); + g_signal_connect(G_OBJECT(buffer), "changed", + G_CALLBACK(compose_changed_cb), compose); + g_signal_connect(G_OBJECT(text), "grab_focus", +@@ -6363,7 +6310,7 @@ + gtk_widget_set_size_request(edit_vbox, -1, mode == COMPOSE_NEW ? 250 : 230); + #endif + gtk_paned_add1(GTK_PANED(paned), notebook); +- gtk_paned_add2(GTK_PANED(paned), edit_vbox); ++ gtk_paned_add2(GTK_PANED(paned), edit_frame); + gtk_widget_show_all(paned); + + +@@ -6408,8 +6355,6 @@ + + compose->notebook = notebook; + compose->edit_vbox = edit_vbox; +- compose->ruler_hbox = ruler_hbox; +- compose->ruler = ruler; + compose->scrolledwin = scrolledwin; + compose->text = text; + +@@ -6531,13 +6476,6 @@ + + compose_list = g_list_append(compose_list, compose); + +- if (!prefs_common.show_ruler) +- gtk_widget_hide(ruler_hbox); +- +- menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Show ruler"); +- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), +- prefs_common.show_ruler); +- + /* Priority */ + compose->priority = PRIORITY_NORMAL; + compose_update_priority_menu_item(compose); +@@ -6568,7 +6506,6 @@ + static GtkWidget *compose_account_option_menu_create(Compose *compose) + { + GList *accounts; +- GtkWidget *hbox; + GtkWidget *optmenu; + GtkWidget *optmenubox; + GtkListStore *menu; +@@ -6584,7 +6521,6 @@ + optmenu = gtkut_sc_combobox_create(optmenubox, FALSE); + menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu))); + +- hbox = gtk_hbox_new(FALSE, 6); + from_name = gtk_entry_new(); + + g_signal_connect_after(G_OBJECT(from_name), "grab_focus", +@@ -6623,9 +6559,6 @@ + G_CALLBACK(account_activated), + compose); + +- gtk_box_pack_start(GTK_BOX(hbox), optmenubox, FALSE, FALSE, 0); +- gtk_box_pack_start(GTK_BOX(hbox), from_name, TRUE, TRUE, 0); +- + gtk_tooltips_set_tip(compose->tooltips, optmenubox, + _("Account to use for this email"), NULL); + gtk_tooltips_set_tip(compose->tooltips, from_name, +@@ -6633,7 +6566,7 @@ + + compose->from_name = from_name; + +- return hbox; ++ return optmenubox; + } + + static void compose_set_priority_cb(gpointer data, +@@ -7851,32 +7784,6 @@ + + /* callback functions */ + +-/* compose_edit_size_alloc() - called when resized. don't know whether Gtk +- * includes "non-client" (windows-izm) in calculation, so this calculation +- * may not be accurate. +- */ +-static gboolean compose_edit_size_alloc(GtkEditable *widget, +- GtkAllocation *allocation, +- GtkSHRuler *shruler) +-{ +- if (prefs_common.show_ruler) { +- gint char_width = 0, char_height = 0; +- gint line_width_in_chars; +- +- gtkut_get_font_size(GTK_WIDGET(widget), +- &char_width, &char_height); +- line_width_in_chars = +- (allocation->width - allocation->x) / char_width; +- +- /* got the maximum */ +- gtk_ruler_set_range(GTK_RULER(shruler), +- 0.0, line_width_in_chars, 0, +- /*line_width_in_chars*/ char_width); +- } +- +- return TRUE; +-} +- + static void account_activated(GtkComboBox *optmenu, gpointer data) + { + Compose *compose = (Compose *)data; +@@ -9040,21 +8947,6 @@ + compose_update_privacy_system_menu_item(compose, warn); + } + +-static void compose_toggle_ruler_cb(gpointer data, guint action, +- GtkWidget *widget) +-{ +- Compose *compose = (Compose *)data; +- +- if (GTK_CHECK_MENU_ITEM(widget)->active) { +- gtk_widget_show(compose->ruler_hbox); +- prefs_common.show_ruler = TRUE; +- } else { +- gtk_widget_hide(compose->ruler_hbox); +- gtk_widget_queue_resize(compose->edit_vbox); +- prefs_common.show_ruler = FALSE; +- } +-} +- + static void compose_attach_drag_received_cb (GtkWidget *widget, + GdkDragContext *context, + gint x, +Index: claws-mail-2.9.1/src/folderview.c +=================================================================== +--- claws-mail-2.9.1.orig/src/folderview.c 2007-04-03 19:10:25.000000000 +0100 ++++ claws-mail-2.9.1/src/folderview.c 2007-04-25 10:28:00.000000000 +0100 +@@ -73,6 +73,11 @@ + #define COL_FOLDER_WIDTH 150 + #define COL_NUM_WIDTH 32 + ++/* added dummy column to stop the last column from ++ * resizing insanely in small screen view ++ */ ++#define _N_FOLDER_COLS (N_FOLDER_COLS + 1) ++ + static GList *folderview_list = NULL; + + static GtkStyle *normal_style; +@@ -448,7 +453,7 @@ + gint *col_pos; + FolderColumnState *col_state; + FolderColumnType type; +- gchar *titles[N_FOLDER_COLS]; ++ gchar *titles[_N_FOLDER_COLS]; + gint i; + GtkWidget *scrolledwin = folderview->scrolledwin; + +@@ -471,8 +476,9 @@ + titles[col_pos[F_COL_UNREAD]] = _("Unread"); + /* TRANSLATORS: This in Number sign in American style */ + titles[col_pos[F_COL_TOTAL]] = _("#"); ++ titles[F_COL_DUMMY] = ""; + +- ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER], ++ ctree = gtk_sctree_new_with_titles(_N_FOLDER_COLS, col_pos[F_COL_FOLDER], + titles); + + gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE); +@@ -510,6 +516,9 @@ + (GTK_CLIST(ctree), i, col_state[i].visible); + } + ++ GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button, ++ GTK_CAN_FOCUS); ++ + g_signal_connect(G_OBJECT(ctree), "key_press_event", + G_CALLBACK(folderview_key_pressed), + folderview); +@@ -605,9 +614,6 @@ + (GTK_SCROLLED_WINDOW(scrolledwin), + GTK_POLICY_AUTOMATIC, + prefs_common.folderview_vscrollbar_policy); +- gtk_widget_set_size_request(scrolledwin, +- prefs_common.folderview_width, +- prefs_common.folderview_height); + + folderview->scrolledwin = scrolledwin; + ctree = folderview_ctree_create(folderview); +@@ -2268,7 +2274,7 @@ + static void folderview_create_folder_node(FolderView *folderview, FolderItem *item) + { + GtkCTree *ctree = GTK_CTREE(folderview->ctree); +- gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"}; ++ gchar *text[_N_FOLDER_COLS] = {NULL, "0", "0", "0", ""}; + GtkCTreeNode *node, *parent_node; + gint *col_pos = folderview->col_pos; + FolderItemUpdateData hookdata; +Index: claws-mail-2.9.1/src/folderview.h +=================================================================== +--- claws-mail-2.9.1.orig/src/folderview.h 2007-03-22 17:22:52.000000000 +0000 ++++ claws-mail-2.9.1/src/folderview.h 2007-04-25 10:16:55.000000000 +0100 +@@ -37,7 +37,8 @@ + F_COL_FOLDER, + F_COL_NEW, + F_COL_UNREAD, +- F_COL_TOTAL ++ F_COL_TOTAL, ++ F_COL_DUMMY + } FolderColumnType; + + #define N_FOLDER_COLS 4 diff --git a/packages/taglib/taglib_1.4.bb b/packages/taglib/taglib_1.4.bb index 48aa375048..7d560ef620 100644 --- a/packages/taglib/taglib_1.4.bb +++ b/packages/taglib/taglib_1.4.bb @@ -28,11 +28,11 @@ do_stage_append() { do install $i ${STAGING_INCDIR}/taglib/ done - for i in `find taglib -name "*.tcc"` - do - install $i ${STAGING_INCDIR}/taglib/ - done - oe_libinstall -so -C taglib libtag ${STAGING_LIBDIR} + for i in `find taglib -name "*.tcc"` + do + install $i ${STAGING_INCDIR}/taglib/ + done + oe_libinstall -so -C taglib libtag ${STAGING_LIBDIR} } do_install() { diff --git a/packages/taglib/taglibc_1.4.bb b/packages/taglib/taglibc_1.4.bb index ecfc27fafb..8845c988c0 100644 --- a/packages/taglib/taglibc_1.4.bb +++ b/packages/taglib/taglibc_1.4.bb @@ -29,5 +29,5 @@ do_stage_append() { } do_install() { - oe_libinstall -so -C bindings/c libtag_c ${D}${libdir} + oe_libinstall -so -C bindings/c libtag_c ${D}${libdir} } diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb index cec095c0ff..5399c12025 100644 --- a/packages/tasks/task-gpe.bb +++ b/packages/tasks/task-gpe.bb @@ -112,7 +112,7 @@ RDEPENDS_gpe-task-apps-extra = "\ RDEPENDS_gpe-task-web = "\ gpe-irc \ minimo \ - gaim" + pidgin" RDEPENDS_gpe-task-desktopapps = "\ firefox \ diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb index 1bdea2ed4d..018ed9a9c8 100644 --- a/packages/tasks/task-opie.bb +++ b/packages/tasks/task-opie.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" LICENSE = "MIT" PROVIDES = "task-opie-everything" -PR = "r10" +PR = "r11" PACKAGES = "task-opie-base \ task-opie-base-applets task-opie-base-apps \ @@ -26,10 +26,11 @@ PACKAGES += "task-opie-everything" # Dependencies to get the launcher up and running # RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-qss opie-quicklauncher \ - opie-taskbar opie-taskbar-images-240x320 opie-pics opie-sounds opie-freetype \ + opie-taskbar opie-pics opie-sounds opie-freetype \ ttf-dejavu-sans ttf-dejavu-sans-mono" -# TODO: Instead of opie-taskbar-images-240x320 version for target machine should be used, pending -# mechanism to specify screen size for all machines. +# Recommend both landscape and portrait backgrounds +RRECOMMENDS_task-opie-base = "opie-taskbar-images-${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \ + opie-taskbar-images-${MACHINE_DISPLAY_HEIGHT_PIXELS}x${MACHINE_DISPLAY_WIDTH_PIXELS}" # # things for reasonable bootstrap image diff --git a/packages/uclibc/uclibc-0.9.29/palmld/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/palmld/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/palmld/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/palmld/uClibc.machine b/packages/uclibc/uclibc-0.9.29/palmld/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/palmld/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/palmz31/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/palmz31/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/palmz31/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/palmz31/uClibc.machine b/packages/uclibc/uclibc-0.9.29/palmz31/uClibc.machine new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/palmz31/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/palmz72/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/palmz72/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/palmz72/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/palmz72/uClibc.machine b/packages/uclibc/uclibc-0.9.29/palmz72/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/palmz72/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch b/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch index bad2d95967..0d3187417a 100644 --- a/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch +++ b/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch @@ -2,10 +2,10 @@ diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp index c2e7d9b..8d39585 100644 --- a/src/kernel/qpixmapcache.cpp +++ b/src/kernel/qpixmapcache.cpp -@@ -123,9 +123,13 @@ void cleanup_pixmap_cache(); +@@ -123,9 +123,12 @@ void cleanup_pixmap_cache(); #ifdef THROW_AWAY_UNUSED_PAGES # include <sys/mman.h> // madvise - # include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN +-# include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN +# include <unistd.h> // getpagesize() +# if (!defined(PAGE_ALIGN)) && defined(PAGE_SIZE) && defined(PAGE_MASK) +# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb index cda233554c..4d6b16a3b3 100644 --- a/packages/uicmoc/uicmoc-native_2.3.10.bb +++ b/packages/uicmoc/uicmoc-native_2.3.10.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" PRIORITY = "optional" LICENSE = "GPL QPL" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://fix-makefile.patch;patch=1 \ diff --git a/packages/webkit/webkit/Makefile.shared b/packages/webkit/webkit/Makefile.shared index df3389ca3b..a036aacc50 100644 --- a/packages/webkit/webkit/Makefile.shared +++ b/packages/webkit/webkit/Makefile.shared @@ -1,20 +1,21 @@ -XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) +SCRIPTS_PATH ?= ../WebKitTools/Scripts +XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) all: ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) debug d development dev develop: force - ../WebKitTools/Scripts/set-webkit-configuration --debug + $(SCRIPTS_PATH)/set-webkit-configuration --debug ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) release r deployment dep deploy: force - ../WebKitTools/Scripts/set-webkit-configuration --release + $(SCRIPTS_PATH)/set-webkit-configuration --release ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) universal u: force ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} ) clean: - ( xcodebuild -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) force: ; diff --git a/packages/webkit/webkit/WebKit.pri b/packages/webkit/webkit/WebKit.pri index 00a72dc3d5..4db63eb54f 100644 --- a/packages/webkit/webkit/WebKit.pri +++ b/packages/webkit/webkit/WebKit.pri @@ -1,7 +1,10 @@ # Include file to make it easy to include WebKit into Qt projects -isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release +isEmpty(OUTPUT_DIR) { + CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release + CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug +} !gdk-port:CONFIG += qt-port qt-port:DEFINES += BUILDING_QT__=1 @@ -9,7 +12,7 @@ qt-port:!building-libs:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit gdk-port:CONFIG += link_pkgconfig gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__ -gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng +gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng -lcurl gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) DEFINES += USE_SYSTEM_MALLOC @@ -32,6 +35,7 @@ INCLUDEPATH += \ $$BASE_DIR/JavaScriptCore/bindings \ $$BASE_DIR/JavaScriptCore/bindings/c \ $$BASE_DIR/JavaScriptCore/wtf \ + $$BASE_DIR/JavaScriptCore/ForwardingHeaders \ $$BASE_DIR/WebCore \ $$BASE_DIR/WebCore/ForwardingHeaders \ $$BASE_DIR/WebCore/platform \ diff --git a/packages/webkit/webkit/WebKit.pro b/packages/webkit/webkit/WebKit.pro index 335d11e6e7..712eeadb78 100644 --- a/packages/webkit/webkit/WebKit.pro +++ b/packages/webkit/webkit/WebKit.pro @@ -3,6 +3,7 @@ CONFIG += ordered !gdk-port:CONFIG += qt-port qt-port:SUBDIRS += WebKitQt/Plugins SUBDIRS += \ + JavaScriptCore/pcre/dftables.pro \ WebCore \ JavaScriptCore/kjs/testkjs.pro diff --git a/packages/xqt2/xqt2_20060509.bb b/packages/xqt2/xqt2_20060509.bb index f1c839da86..12e210d036 100644 --- a/packages/xqt2/xqt2_20060509.bb +++ b/packages/xqt2/xqt2_20060509.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" SECTION = "opie/applications" APPTYPE = "binary" APPNAME = "Xqt" -PR = "r1" +PR = "r2" inherit palmtop @@ -102,8 +102,6 @@ do_install() { install -d ${D}${palmtopdir}/apps/Applications/ install -m 0644 ${WORKDIR}/xqt2/xfree86/files/Xqt.desktop ${D}${palmtopdir}/apps/Applications - install -d ${D}${palmtopdir}/bin/ - install -m 0755 ${D}${bindir}/Xqt ${D}${palmtopdir}/bin/Xqt install -d ${D}${palmtopdir}/pics install -m 0644 programs/Xserver/hw/xqt/Xqt.png ${D}${palmtopdir}/pics } |