diff options
32 files changed, 301 insertions, 66 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 9c1208c690..86f3eaa1fb 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -23,7 +23,7 @@ FEED_URIS += " \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" SRCDATE = "20060518" -#SRCDATE_handhelds-pxa-2.6 = "20060516" +SRCDATE_handhelds-pxa-2.6 = "20060622" CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf new file mode 100644 index 0000000000..e1805c0d0f --- /dev/null +++ b/conf/distro/generic-unstable.conf @@ -0,0 +1,28 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Bleeding Edge +#@DESCRIPTION: An experimental distribution configuration +#@-------------------------------------------------------------------- + +require conf/distro/generic.conf + +# +# Binutils & Compiler +# +PREFERRED_VERSION_gcc = "4.1.1" +PREFERRED_VERSION_gcc-cross = "4.1.1" +PREFERRED_VERSION_gcc-cross-initial = "4.1.1" +PREFERRED_VERSION_binutils = "2.16.91.0.7" +PREFERRED_VERSION_binutils-cross = "2.16.91.0.7" +PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" + +# +# Target OS, FPU system and libc +# +TARGET_OS = "linux" +TARGET_FPU = "soft" +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_VERSION_glibc = "2.4" +PREFERRED_VERSION_glibc-intermediate = "2.4" diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index f7da451e65..8a9d427c9f 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -68,9 +68,9 @@ TARGET_OS = "linux" #<>What we want on the bootstrap image (extra) #<> #<> -BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev kernel-modules \ +BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \ e2tools e2fsprogs" -BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev kernel-modules \ +BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-tools coreutils udev \ e2tools e2fsprogs" #<> diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 800cd77540..288f3ebaa9 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -15,7 +15,7 @@ BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d) BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus" BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" -PXA270_MODULES = "g_ether snd_pcm_oss snd_mixer_oss hidp" +PXA270_MODULES = "g_ether g_serial snd_pcm_oss snd_mixer_oss hidp i2c-core i2c-pxa i2c-sensor" SERIAL_CONSOLE = "115200 tts/0" @@ -30,14 +30,16 @@ include conf/machine/include/tune-xscale.conf #include conf/machine/include/tune-iwmmxt.conf BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}" -UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds" +UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds firmware-class" module_autoload_htcuniversal_power = "htcuniversal_power" module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_firmware-class = "firmware-class" module_autoload_acx = "acx" +module_autoload_htcuniversal-acx = "htcuniversal_acx" module_autoload_htcuniversal-bt = "htcuniversal_bt" module_autoload_htcuniversal-power = "htcuniversal_power" diff --git a/conf/machine/include/smartphone-common.conf b/conf/machine/include/smartphone-common.conf index 2ff8d4bc47..bd5983cdc0 100644 --- a/conf/machine/include/smartphone-common.conf +++ b/conf/machine/include/smartphone-common.conf @@ -3,6 +3,7 @@ ipsec \ nvrd \ mip6-mn \ tun \ +nls-base nls-cp437 nls-iso8859-1 \ fat vfat \ loop \ rfcomm bnep l2cap sco hci_uart hidp \ diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index f5cc893c9c..9ed313334b 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -22,7 +22,8 @@ MODUTILS = "26" PCMCIA_MANAGER = "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" +BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" +BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ @@ -41,8 +42,12 @@ include conf/machine/include/tune-xscale.conf #include conf/machine/include/tune-iwmmxt.conf BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" -HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ - hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" + +# These modules are now compiled into the kernel: +#HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \ +# hx4700_pcmcia hx4700_ts hx4700_power" + +HX4700_MODULES = "i2c-pxa hx4700_voltage hx4700_acx snd_hx4700_audio" module_autoload_evdev = "evdev" diff --git a/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch b/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch new file mode 100644 index 0000000000..a909513b1c --- /dev/null +++ b/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch @@ -0,0 +1,13 @@ +diff -ruN asterisk-1.2.0-old/include/asterisk/compat.h asterisk-1.2.0-new/include/asterisk/compat.h +--- asterisk-1.2.0-old/include/asterisk/compat.h 2005-11-08 05:13:19.000000000 +0100 ++++ asterisk-1.2.0-new/include/asterisk/compat.h 2005-12-04 05:32:31.000000000 +0100 +@@ -75,7 +75,9 @@ + #define HAVE_STRTOQ + + #ifdef _BSD_SOURCE ++#ifndef __UCLIBC__ + #define HAVE_GETLOADAVG ++#endif /* __UCLIBC__ */ + #endif + + #ifdef __linux__ diff --git a/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch b/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch new file mode 100644 index 0000000000..23657bcc76 --- /dev/null +++ b/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch @@ -0,0 +1,18 @@ +diff -ruN asterisk-1.0.7-old/dns.c asterisk-1.0.7-new/dns.c +--- asterisk-1.0.7-old/dns.c 2004-06-22 22:11:15.000000000 +0200 ++++ asterisk-1.0.7-new/dns.c 2005-03-19 17:38:06.000000000 +0100 +@@ -153,7 +153,13 @@ + + #if defined(res_ninit) + #define HAS_RES_NINIT +-#else ++#endif ++ ++#ifdef __UCLIBC__ ++#undef HAS_RES_NINIT ++#endif ++ ++#ifndef HAS_RES_NINIT + AST_MUTEX_DEFINE_STATIC(res_lock); + #if 0 + #warning "Warning, res_ninit is missing... Could have reentrancy issues" diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb index b08e178388..46f24c0e35 100644 --- a/packages/asterisk/asterisk_1.2.9.1.bb +++ b/packages/asterisk/asterisk_1.2.9.1.bb @@ -2,9 +2,11 @@ DESCRIPTION="The Asterisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt" -PR = "r4" +PR = "r5" SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ + file://uclibc-compat-getloadavg.patch;patch=1 \ + file://uclibc-dsn.patch;patch=1 \ file://asterisk.patch;patch=1" diff --git a/packages/linux/linux-openzaurus_2.6.16+git.bb b/packages/linux/linux-openzaurus_2.6.16+git.bb index 9977b7e2a7..a268ea2dfa 100644 --- a/packages/linux/linux-openzaurus_2.6.16+git.bb +++ b/packages/linux/linux-openzaurus_2.6.16+git.bb @@ -16,21 +16,20 @@ DEFAULT_PREFERENCE = "-1" # Hacks should clearly named and at the bottom # ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;tag=553698f944ed715dfe023b4cef07601f0ce735f0 \ + ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \ + ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \ + ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1;status=merged \ + ${RPSRC}/zaurus_reboot-r3.patch;patch=1;status=merged \ + ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1;status=merged \ + ${RPSRC}/poodle_ssp-r1.patch;patch=1;status=merged \ + ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \ ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \ ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \ - ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \ - ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \ ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \ + ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=pending \ file://00-hostap.patch;patch=1;status=pending \ file://10-pcnet.patch;patch=1;status=pending \ - ${RPSRC}/zaurus_reboot-r3.patch;patch=1 \ - ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \ - ${RPSRC}/poodle_ssp-r1.patch;patch=1 \ - ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ - ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \ - ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \ -# ${RPSRC}/alsa/asoc-v0.10rc8.patch;patch=1 \ +# ${RPSRC}/alsa/asoc-v0.10-oz-r0.patch;patch=1 \ ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \ ${RPSRC}/asoc_fixups-r1.patch;patch=1 \ ${RPSRC}/hx2750_base-r25.patch;patch=1 \ @@ -49,12 +48,15 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi ${DOSRC}/kexec-arm-r2.patch;patch=1 \ ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \ ${RPSRC}/poodle_pm-r1.patch;patch=1 \ + ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ file://add-oz-release-string.patch;patch=1;status=unmergable \ + ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \ + ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \ ${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \ file://pxa-serial-hack.patch;patch=1;status=hack \ @@ -78,15 +80,10 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi # http://tglx.de/projects/armirq/2.6.17-rc3/patch-2.6.17-rc3-armirq4.patch;patch=1 \ # ${RPSRC}/../pxa27x_overlay-r0.patch;patch=1 \ -# These patches would really help collie/poodle but we -# need someone to maintain them -# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 -# (Pavel Machek's git tree has updated versions of this?) -# Also parts were recently committed to mainline by rmk (drivers/mfd/) -# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 -# (This is mostly in mainline now?) -# ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ -# ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \ +# Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/) +# (Pavel Machek's git tree has updated versions of this?) +# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 + SRC_URI_append_tosa = "\ ${CHSRC}/usb-ohci-hooks-r1.patch;patch=1 \ diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index c35d1d8e75..08a64160c1 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -67,8 +67,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \ file://00-hostap.patch;patch=1;status=pending \ file://10-pcnet.patch;patch=1;status=pending \ - ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \ - ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \ ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \ ${RPSRC}/asoc_fixups-r0.patch;patch=1 \ ${RPSRC}/hx2750_base-r24.patch;patch=1 \ @@ -80,11 +78,11 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/input_power-r4.patch;patch=1 \ ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ - ${RPSRC}/collie_frontlight-r1.patch;patch=1 \ - ${RPSRC}/zaurus_reboot-r0.patch;patch=1 \ + ${RPSRC}/collie_frontlight-r1.patch;patch=1;status=pending \ + ${RPSRC}/zaurus_reboot-r0.patch;patch=1;status=merged \ ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \ ${RPSRC}/pm_changes-r1.patch;patch=1 \ - ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ + ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \ ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \ ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ ${DOSRC}/kexec-arm-r2.patch;patch=1 \ @@ -97,6 +95,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ file://add-oz-release-string.patch;patch=1;status=unmergable \ + ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \ + ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \ ${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \ ${RPSRC}/poodle_ts_hack-r0.patch;patch=1;status=hack \ diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index dae8e49e68..cb3f0a6313 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" @@ -16,21 +16,20 @@ DEFAULT_PREFERENCE = "-1" # Hacks should clearly named and at the bottom # ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ + ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \ + ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \ + ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1;status=merged \ + ${RPSRC}/zaurus_reboot-r3.patch;patch=1;status=merged \ + ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1;status=merged \ + ${RPSRC}/poodle_ssp-r1.patch;patch=1;status=merged \ + ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \ ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \ ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \ - ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \ - ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \ ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \ + ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=pending \ file://00-hostap.patch;patch=1;status=pending \ file://10-pcnet.patch;patch=1;status=pending \ - ${RPSRC}/zaurus_reboot-r3.patch;patch=1 \ - ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \ - ${RPSRC}/poodle_ssp-r1.patch;patch=1 \ - ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ - ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \ - ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \ -# ${RPSRC}/alsa/asoc-v0.10rc8.patch;patch=1 \ +# ${RPSRC}/alsa/asoc-v0.10-oz-r0.patch;patch=1 \ ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \ ${RPSRC}/asoc_fixups-r1.patch;patch=1 \ ${RPSRC}/hx2750_base-r25.patch;patch=1 \ @@ -49,12 +48,15 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${DOSRC}/kexec-arm-r2.patch;patch=1 \ ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \ ${RPSRC}/poodle_pm-r1.patch;patch=1 \ + ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ file://add-oz-release-string.patch;patch=1;status=unmergable \ + ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \ + ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \ ${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \ file://pxa-serial-hack.patch;patch=1;status=hack \ @@ -78,15 +80,10 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ # http://tglx.de/projects/armirq/2.6.17-rc3/patch-2.6.17-rc3-armirq4.patch;patch=1 \ # ${RPSRC}/../pxa27x_overlay-r0.patch;patch=1 \ -# These patches would really help collie/poodle but we -# need someone to maintain them -# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 -# (Pavel Machek's git tree has updated versions of this?) -# Also parts were recently committed to mainline by rmk (drivers/mfd/) -# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 -# (This is mostly in mainline now?) -# ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ -# ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \ +# Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/) +# (Pavel Machek's git tree has updated versions of this?) +# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 + SRC_URI_append_tosa = "\ ${CHSRC}/usb-ohci-hooks-r1.patch;patch=1 \ diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch b/packages/mplayer/files/Makefile.patch index da316ad129..da316ad129 100644 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch +++ b/packages/mplayer/files/Makefile.patch diff --git a/packages/mplayer/files/libfaad-fixed.patch b/packages/mplayer/files/libfaad-fixed.patch new file mode 100644 index 0000000000..2b85179038 --- /dev/null +++ b/packages/mplayer/files/libfaad-fixed.patch @@ -0,0 +1,16 @@ +--- mplayer-1.1.5/libfaad2/Makefile.orig 2006-05-12 14:45:49.000000000 +0100 ++++ mplayer-1.1.5/libfaad2/Makefile 2006-05-12 14:46:36.000000000 +0100 +@@ -6,11 +6,11 @@ + SRCS = bits.c cfft.c common.c decoder.c drc.c error.c filtbank.c hcr.c huffman.c ic_predict.c is.c lt_predict.c mdct.c mp4.c ms.c output.c pns.c ps_dec.c ps_syntax.c pulse.c rvlc.c sbr_dct.c sbr_dec.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c specrec.c ssr.c ssr_fb.c ssr_ipqf.c syntax.c tns.c + OBJS = $(SRCS:.c=.o) + +-CFLAGS = -I. $(OPTFLAGS) ++#CFLAGS = -I. $(OPTFLAGS) + + # Uncomment this to use the FIXED_POINT implementation of FAAD2. + # This should improve performance, especially for SBR files. +-#CFLAGS = -I. $(OPTFLAGS) -DFIXED_POINT ++CFLAGS = -I. $(OPTFLAGS) -DFIXED_POINT + + .SUFFIXES: .c .o + diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c b/packages/mplayer/files/vo_w100.c index 702707c656..702707c656 100644 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c +++ b/packages/mplayer/files/vo_w100.c diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h b/packages/mplayer/files/vo_w100_api.h index 59cf58be26..59cf58be26 100644 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h +++ b/packages/mplayer/files/vo_w100_api.h diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h b/packages/mplayer/files/vo_w100_fb.h index 39318c645b..39318c645b 100644 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h +++ b/packages/mplayer/files/vo_w100_fb.h diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch b/packages/mplayer/files/w100-Makefile.patch index 01899556d3..01899556d3 100644 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch +++ b/packages/mplayer/files/w100-Makefile.patch diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch b/packages/mplayer/files/w100-configure.patch index 03610610e4..03610610e4 100644 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch +++ b/packages/mplayer/files/w100-configure.patch diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch b/packages/mplayer/files/w100-mplayer.patch index 4bed6326d1..4bed6326d1 100644 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch +++ b/packages/mplayer/files/w100-mplayer.patch diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch b/packages/mplayer/files/w100-video_out.patch index 9855853fe6..9855853fe6 100644 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch +++ b/packages/mplayer/files/w100-video_out.patch diff --git a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb b/packages/mplayer/mplayer_1.0pre8.bb index 9298f0645c..a55c59dc96 100644 --- a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb +++ b/packages/mplayer/mplayer_1.0pre8.bb @@ -5,8 +5,7 @@ HOMEPAGE = "http://www.mplayerhq.hu/" DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common" RDEPENDS = "mplayer-common" LICENSE = "GPL" -SRC_URI = "http://www.xora.org.uk/oe/mplayer_20060519.tar.bz2 \ - http://www.xora.org.uk/oe/ffmpeg_20060519.tar.bz2 \ +SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://vo_w100.c \ file://vo_w100_api.h \ file://vo_w100_fb.h \ @@ -25,7 +24,7 @@ PARALLEL_MAKE = "" DEPENDS_append_c7x0 = " sharp-aticore-oss" -S = "${WORKDIR}/mplayer_20060519" +S = "${WORKDIR}/MPlayer-${PV}" PACKAGES =+ "mencoder" @@ -60,7 +59,6 @@ EXTRA_OECONF = " \ EXTRA_OECONF_append_c7x0 = " --enable-w100 " do_configure() { - cp -r ${WORKDIR}/ffmpeg_20060519/libavcodec ${WORKDIR}/ffmpeg_20060519/libavutil ${WORKDIR}/ffmpeg_20060519/libavformat ${S} cp ${WORKDIR}/vo_w100.c ${S}/libvo cp ${WORKDIR}/vo_w100_api.h ${S}/libvo cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb new file mode 100644 index 0000000000..7af431430b --- /dev/null +++ b/packages/mplayer/mplayer_svn.bb @@ -0,0 +1,74 @@ +DESCRIPTION = "Open Source multimedia player." +SECTION = "opie/multimedia" +PRIORITY = "optional" +HOMEPAGE = "http://www.mplayerhq.hu/" +DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common" +RDEPENDS = "mplayer-common" +LICENSE = "GPL" +SRC_URI = "svn://svn.mplayerhq.hu/;module=mplayer \ + file://vo_w100.c \ + file://vo_w100_api.h \ + file://vo_w100_fb.h \ + file://Makefile.patch;patch=1 \ + file://w100-configure.patch;patch=1 \ + file://w100-Makefile.patch;patch=1 \ + file://w100-video_out.patch;patch=1 \ + file://w100-mplayer.patch;patch=1" + +MAINTAINER="Graeme Gregory <dp@xora.org.uk>" +RCONFLICTS_${PN} = "mplayer-atty" +RREPLACES_${PN} = "mplayer-atty" + +PV = "1.0pre8+svn${SRCDATE}" +PR = "r0" +DEFAULT_PREFERENCE = "-1" + +PARALLEL_MAKE = "" + +DEPENDS_append_c7x0 = " sharp-aticore-oss" + +S = "${WORKDIR}/mplayer/trunk/" + +PACKAGES =+ "mencoder" + +FILES_${PN} = "${bindir}/mplayer" +FILES_mencoder = "${bindir}/mencoder" + +inherit autotools + +EXTRA_OECONF = " \ + --prefix=/usr \ + --mandir=${mandir} \ + --target=${TARGET_SYS} \ + \ + --enable-mencoder \ + --disable-gui \ + --enable-largefiles \ + --disable-linux-devfs \ + --disable-lirc \ + --disable-lircc \ + --disable-tv \ + --enable-rtc \ + --disable-smb \ + --disable-win32 \ + \ + --enable-tremor-low \ + --disable-mp3lib \ + \ + --disable-x11 \ + --enable-sdl \ + --enable-fbdev " + +EXTRA_OECONF_append_c7x0 = " --enable-w100 " + +do_configure() { + cp ${WORKDIR}/vo_w100.c ${S}/libvo + cp ${WORKDIR}/vo_w100_api.h ${S}/libvo + cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo + ./configure ${EXTRA_OECONF} +} + +do_compile () { + oe_runmake +} + diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty +++ b/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/opie b/packages/opie-taskbar/opie-taskbar/htcuniversal/opie new file mode 100644 index 0000000000..fc39fff358 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar/htcuniversal/opie @@ -0,0 +1,82 @@ +#!/bin/sh +# +[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root +[ -z $HOME ] && export HOME=/home/$LOGNAME + +export QTDIR=/opt/QtPalmtop +export OPIEDIR=/opt/QtPalmtop +export QPEDIR=/opt/QtPalmtop +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib +export PATH=$PATH:$OPIEDIR/bin +export QWS_MOUSE_PROTO=TPanel:`detect-stylus --device` +export QWS_KEYBOARD=USB:/dev/input/event1 + +if [ ! -x "$OPIEDIR/bin/qpe" ] ; then + echo Opie not installed + exit 0 +fi + +. /etc/profile + +for conf in $OPIEDIR/etc/skel/*.conf; do + conf_basename=`basename $conf` + if [ ! -e "$HOME/Settings/$conf_basename" ] ; then + echo "Copying default $conf_basename into $HOME/Settings/" + mkdir -p $HOME/Settings/ + cat $conf >$HOME/Settings/$conf_basename + fi +done + +if [ ! -e "$HOME/systeminfo/linkver" ] ; then + mkdir -p $HOME/systeminfo/ + echo "1.13" >$HOME/systeminfo/linkver +fi + +if [ ! -e "/opt/Qtopia" ] ; then + ln -sf /opt/QtPalmtop /opt/Qtopia +fi + +case $1 in +'start') + /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 + + if [ -x "$OPIEDIR/bin/opie-login" ]; then + echo Starting Opie-login.... + $OPIEDIR/bin/opie-login -terminal 2 + else + $OPIEDIR/bin/opie-reorgfiles + if [ -x /usr/bin/ssh-agent ]; then + SSHAGENT=/usr/bin/ssh-agent + else + SSHAGENT="" + fi + + if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then + export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh + fi + echo Starting Opie.... + $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 + fi + + ;; + +'stop') + echo "Stopping Opie..." + killall qpe 2>/dev/null + killall opie-login 2>/dev/null + killall quicklauncher 2>/dev/null + + ;; + +'restart') + $0 stop && $0 start + + ;; + +*) + echo "usage: $0 { start | stop | restart }" + + ;; + +esac + diff --git a/packages/opie-taskbar/opie-taskbar_1.2.1.bb b/packages/opie-taskbar/opie-taskbar_1.2.1.bb index 1c6f764867..359ea213ec 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.1.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.1.bb @@ -1,5 +1,5 @@ include ${PN}.inc -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 1fe08a8c1b..f1874cf82a 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ diff --git a/packages/tinymail/tinymail_svn.bb b/packages/tinymail/tinymail_svn.bb index a8888f6537..5b7d4c37a1 100644 --- a/packages/tinymail/tinymail_svn.bb +++ b/packages/tinymail/tinymail_svn.bb @@ -5,7 +5,9 @@ LICENSE = "GPL" MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>" PV = "0.0+svn${SRCDATE}" -PR = "r0" +PR = "r1" + +EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none" SRC_URI = "svn://svn.cronos.be/svn/tinymail;module=trunk;proto=https \ file://gtk-doc.m4 \ diff --git a/packages/tslib/tslib/htcuniversal/tslib.sh b/packages/tslib/tslib/htcuniversal/tslib.sh index 39f3ebab10..c19d3491cb 100644 --- a/packages/tslib/tslib/htcuniversal/tslib.sh +++ b/packages/tslib/tslib/htcuniversal/tslib.sh @@ -3,6 +3,3 @@ TSLIB_TSDEVICE=`detect-stylus --device` TSLIB_CONFFILE=/etc/ts.conf -# this one is for making opie happy... -QWS_MOUSE_PROTO=TPanel:`detect-stylus --device` -export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index c96ceab50b..bd3478191e 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -1,11 +1,11 @@ DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library." HOMEPAGE = "http://cvs.arm.linux.org.uk/" -AUTHOR = "Russel King. Plugins by Chris Larson et. al." +AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" LICENSE = "LGPL" PV = "0.0+cvs${SRCDATE}" -PR = "r38" +PR = "r39" SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ file://usec_fix.patch;patch=1 \ diff --git a/packages/vnc/tightvnc/Makefile b/packages/vnc/tightvnc/Makefile index a684e9c987..16420423f2 100644 --- a/packages/vnc/tightvnc/Makefile +++ b/packages/vnc/tightvnc/Makefile @@ -18,5 +18,5 @@ vncviewer.c \ ../libvncauth/d3des.c tightvncviewer : $(SOURCES) - $(CC) $(CFLAGS) $(LDFLAGS) -I. -I../include -I../libvncauth/ -lX11 -lXaw -ljpeg -lz -o tightvncviewer $(SOURCES) + $(CC) $(CFLAGS) $(LDFLAGS) -I. -I../include -I../libvncauth/ -lX11 -lXaw6 -ljpeg -lz -o tightvncviewer $(SOURCES) diff --git a/site/mipsel-linux-uclibc b/site/mipsel-linux-uclibc index cdf6fc5cf3..075b77ee5b 100644 --- a/site/mipsel-linux-uclibc +++ b/site/mipsel-linux-uclibc @@ -134,3 +134,6 @@ samba_cv_sysquotas_file=${samba_cv_sysquotas_file=lib/sysquotas_4A.c} # This cached value needs a local patch to pick it up, upstream 3.0.14a # doesn't cache it. samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes} + +# rp-pppoe +rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} |