Author: alexander Date: 2007-09-28 10:04:00 -0600 (Fri, 28 Sep 2007) New Revision: 2083
Modified: trunk/packages/linux/Makefile trunk/packages/linux/config.x86 trunk/packages/linux64/Makefile trunk/packages/linux64/config.x86_64 Log: Added a snapshot of speakup (kernel only) compatible with linux-2.6.22. Tested with "modprobe speakup_dummy" and observing the output on /dev/ttyS0. So, hardware (at least, serial) synths should work right now if one appends "load=speakup_synthname" to the kernel command line. TODO: * Add userspace components for a software synth * Add a bootscript that adjusts accessibility settings and loads modules * Adjust langconf so that it allows to use only en_??.ISO-8859-1 locales with speakup BUGS: * Copy-and-paste produces garbage. Modified: trunk/packages/linux/Makefile =================================================================== --- trunk/packages/linux/Makefile 2007-09-27 14:56:51 UTC (rev 2082) +++ trunk/packages/linux/Makefile 2007-09-28 16:04:00 UTC (rev 2083) @@ -63,6 +63,11 @@ URL-$(FILE9)= http://www.hauke-m.de/fileadmin/rtl-wifi/$(FILE9) SHA-$(FILE9)= 001787fe6556cdfe02ec77665e83f7747d71b953 +# Git snapshot - stable versions are incompatible with linux-2.6.22 +DIR10= speakup-20070928 +FILE10= $(DIR10).tar.gz +URL-$(FILE10)= http://www.linuxfromscratch.org/~alexander/$(FILE10) +SHA-$(FILE10)= 101a7fcae2cbf2dbad81d91ff7cb262d6857d104 # Targets @@ -72,12 +77,13 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(PATCH1) +stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(PATCH1) $(std_build) compile-stage2: tar xf ../$(FILE5) ; cd $(DIR5) ; make KSRC=.. patch_kernel tar xf ../$(FILE6) ; cd $(DIR6) ; echo "Y" | make KSRC=.. patch_kernel + tar xf ../$(FILE10) ; cd $(DIR10) ; ./install-spkglue `pwd`/.. ; ./install-speakup `pwd`/.. zcat ../$(PATCH1) | patch -Np1 patch -Np1 -i ../$(PATCH3) install -d /boot/isolinux @@ -108,7 +114,7 @@ make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-tools install-tools ; \ cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS).tgz . ; cd .. ; \ cd DESTDIR-tools ; tar zcvf ../../$(DIR8)-tools.tgz . - rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9) + rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9) $(DIR10) ../debian-style-headers.sh mv *.tgz /drivers Modified: trunk/packages/linux/config.x86 =================================================================== --- trunk/packages/linux/config.x86 2007-09-27 14:56:51 UTC (rev 2082) +++ trunk/packages/linux/config.x86 2007-09-28 16:04:00 UTC (rev 2083) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.22.5 -# Sat Sep 22 17:26:17 2007 +# Fri Sep 28 20:25:12 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -1690,6 +1690,27 @@ CONFIG_LOGO_LINUX_CLUT224=y # +# Speakup console speech +# +CONFIG_SPEAKUP=y +CONFIG_SPEAKUP_CORE=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_ACNTPC=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_DECPC=m +CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_KEYPC=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m + +# # Sound # CONFIG_SOUND=m Modified: trunk/packages/linux64/Makefile =================================================================== --- trunk/packages/linux64/Makefile 2007-09-27 14:56:51 UTC (rev 2082) +++ trunk/packages/linux64/Makefile 2007-09-28 16:04:00 UTC (rev 2083) @@ -70,6 +70,11 @@ URL-$(FILE9)= http://www.hauke-m.de/fileadmin/rtl-wifi/$(FILE9) SHA-$(FILE9)= 001787fe6556cdfe02ec77665e83f7747d71b953 +# Git snapshot - stable versions are incompatible with linux-2.6.22 +DIR10= speakup-20070928 +FILE10= $(DIR10).tar.gz +URL-$(FILE10)= http://www.linuxfromscratch.org/~alexander/$(FILE10) +SHA-$(FILE10)= 101a7fcae2cbf2dbad81d91ff7cb262d6857d104 # Targets @@ -79,12 +84,13 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)' -stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(PATCH1) +stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10) $(PATCH1) $(std_build) compile-stage2: tar xf ../$(FILE5) ; cd $(DIR5) ; make KSRC=.. patch_kernel tar xf ../$(FILE6) ; cd $(DIR6) ; echo "Y" | make KSRC=.. patch_kernel + tar xf ../$(FILE10) ; cd $(DIR10) ; ./install-spkglue `pwd`/.. ; ./install-speakup `pwd`/.. zcat ../$(PATCH1) | patch -Np1 patch -Np1 -i ../$(PATCH3) install -d /boot/isolinux @@ -134,7 +140,7 @@ cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS).tgz . ; cd .. ; \ cd DESTDIR-tools ; tar zcvf ../../$(DIR8)-tools.tgz . cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux - rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9) + rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9) $(DIR10) ../debian-style-headers.sh endif mv *.tgz /drivers Modified: trunk/packages/linux64/config.x86_64 =================================================================== --- trunk/packages/linux64/config.x86_64 2007-09-27 14:56:51 UTC (rev 2082) +++ trunk/packages/linux64/config.x86_64 2007-09-28 16:04:00 UTC (rev 2083) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.22.5 -# Mon Sep 17 18:40:16 2007 +# Fri Sep 28 20:25:12 2007 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -1537,6 +1537,27 @@ CONFIG_LOGO_LINUX_CLUT224=y # +# Speakup console speech +# +CONFIG_SPEAKUP=y +CONFIG_SPEAKUP_CORE=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_ACNTPC=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_DECPC=m +CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_KEYPC=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m + +# # Sound # CONFIG_SOUND=m -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
