[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-134-ge07b585
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-134-ge07b585
|
From: Julien B a. A. <ar...@us...> - 2010-01-25 09:26:54
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e07b5858f9630769061ef5997e81ff63c38b6f3a (commit)
via ef33830ac9ab028accdaa3b3636a9593fc3a3870 (commit)
via c5aa5d79b8207b7ea87709248455317f75f76391 (commit)
via c774781035db50a1ff5f2c8023961d95d7696fad (commit)
via 9df95950ec12161e9501ec20cbdcdeb08c399b54 (commit)
via 42f0fb9cac86c821c51c43b2c92975b892e81332 (commit)
via ef383acdc98a15172faaa73fb53be3d17e263ca8 (commit)
via 964f77568dab5808f6a85c260a59efaaefa55358 (commit)
via e7e0f350d66db3289bac08a99a244e55628472c7 (commit)
via a5ffa4995ed7287855530f6e8f17741d99f93fa6 (commit)
from 3326f16cdf5f0f6587339e9e554c361bd8449927 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e07b5858f9630769061ef5997e81ff63c38b6f3a
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 10:25:37 2010 +0100
[BUILDROOT] Cleanup patches after some packages moved in package/armadeus/
commit ef33830ac9ab028accdaa3b3636a9593fc3a3870
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 09:51:31 2010 +0100
Typo
commit c5aa5d79b8207b7ea87709248455317f75f76391
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 09:27:54 2010 +0100
[BUILDROOT] Move freescale-tools package to package/armadeus/
commit c774781035db50a1ff5f2c8023961d95d7696fad
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 09:22:09 2010 +0100
[BUILDROOT] Move imxregs package to package/armadeus/
commit 9df95950ec12161e9501ec20cbdcdeb08c399b54
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 09:18:33 2010 +0100
[BUILDROOT] Move fpgaregs package to package/armadeus/
commit 42f0fb9cac86c821c51c43b2c92975b892e81332
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 09:11:25 2010 +0100
[BUILDROOT] Move ch7024ctrl & max5821ctrl packages to package/armadeus/
commit ef383acdc98a15172faaa73fb53be3d17e263ca8
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 09:06:19 2010 +0100
[BUILDROOT] Move ad9889ctrl package to package/armadeus/
commit 964f77568dab5808f6a85c260a59efaaefa55358
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 22 17:04:39 2010 +0100
[TEST] Add default capture volume to test_audio.sh
commit e7e0f350d66db3289bac08a99a244e55628472c7
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 22 17:03:24 2010 +0100
Fixes patches/buildroot/cleanup_buildroot.sh
commit a5ffa4995ed7287855530f6e8f17741d99f93fa6
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 22 14:47:42 2010 +0100
[BUILDROOT] Adds Flite speech synthesis engine
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 5 +
.../package/{ => armadeus}/ad9889ctrl/Config.in | 0
.../package/{ => armadeus}/ad9889ctrl/ad9889.mk | 0
.../package/{ => armadeus}/ch7024ctrl/Config.in | 0
.../{ => armadeus}/ch7024ctrl/ch70241ctrl.mk | 0
.../package/{ => armadeus}/fpgaregs/Config.in | 0
.../package/{ => armadeus}/fpgaregs/fpgaregs.mk | 0
...-misc-20071002-put_correct_path_to_libvpu.patch | 0
.../02-misc-20071002-remove_index_in_libvpu.patch | 0
.../03-misc-20071002-add_support_for_apf27.patch | 0
...1002-compile_vpu_tools_with_debug_symbols.patch | 0
...002-makes_rtp_lib_compatible_with_rfc3984.patch | 0
.../{ => armadeus}/freescale-tools/tools.mk | 0
buildroot/package/{ => armadeus}/imxregs/Config.in | 0
.../package/{ => armadeus}/imxregs/imxregs.mk | 0
.../package/{ => armadeus}/max5821ctrl/Config.in | 0
.../{ => armadeus}/max5821ctrl/max5821ctrl.mk | 0
buildroot/package/fbgrab/Config.in | 2 +-
patches/buildroot/005-imxregs.patch | 10 ---
patches/buildroot/006-lcd4linux.patch | 10 ++-
patches/buildroot/008-fpgaregs.patch | 10 ---
patches/buildroot/018-allegro.patch | 12 ++-
patches/buildroot/021-sdl-water-config.patch | 10 ++-
patches/buildroot/026-jffs2root.patch | 9 +-
patches/buildroot/031-max5821-ch7024.patch | 18 -----
patches/buildroot/034-slideshow.patch | 8 +-
.../buildroot/040-mplayer-remove-ivtv-output.patch | 8 +-
patches/buildroot/041-fbgrab.patch | 10 ++-
patches/buildroot/042-socketcan.patch | 8 +-
...ownload_minor_patches_from_kernel_org_too.patch | 8 +-
...s_building_when_modules_compilation_fails.patch | 6 +-
patches/buildroot/055-pyserial.patch | 8 +-
patches/buildroot/057-pymysql.patch | 8 +-
patches/buildroot/070-add_ad9889ctl_package.patch | 10 ---
patches/buildroot/083-adds_pygame_package.patch | 12 ++--
patches/buildroot/085-adds_gpm_package.patch | 16 ++--
patches/buildroot/087-dont_hide_all_editors.patch | 10 +-
patches/buildroot/097-adds_flite_package.patch | 79 ++++++++++++++++++++
patches/buildroot/cleanup_buildroot.sh | 5 +-
target/test/test_audio.sh | 2 +
40 files changed, 171 insertions(+), 113 deletions(-)
rename buildroot/package/{ => armadeus}/ad9889ctrl/Config.in (100%)
rename buildroot/package/{ => armadeus}/ad9889ctrl/ad9889.mk (100%)
rename buildroot/package/{ => armadeus}/ch7024ctrl/Config.in (100%)
rename buildroot/package/{ => armadeus}/ch7024ctrl/ch70241ctrl.mk (100%)
rename buildroot/package/{ => armadeus}/fpgaregs/Config.in (100%)
rename buildroot/package/{ => armadeus}/fpgaregs/fpgaregs.mk (100%)
rename buildroot/package/{ => armadeus}/freescale-tools/01-misc-20071002-put_correct_path_to_libvpu.patch (100%)
rename buildroot/package/{ => armadeus}/freescale-tools/02-misc-20071002-remove_index_in_libvpu.patch (100%)
rename buildroot/package/{ => armadeus}/freescale-tools/03-misc-20071002-add_support_for_apf27.patch (100%)
rename buildroot/package/{ => armadeus}/freescale-tools/04-misc-20071002-compile_vpu_tools_with_debug_symbols.patch (100%)
rename buildroot/package/{ => armadeus}/freescale-tools/06-misc-20071002-makes_rtp_lib_compatible_with_rfc3984.patch (100%)
rename buildroot/package/{ => armadeus}/freescale-tools/tools.mk (100%)
rename buildroot/package/{ => armadeus}/imxregs/Config.in (100%)
rename buildroot/package/{ => armadeus}/imxregs/imxregs.mk (100%)
rename buildroot/package/{ => armadeus}/max5821ctrl/Config.in (100%)
rename buildroot/package/{ => armadeus}/max5821ctrl/max5821ctrl.mk (100%)
delete mode 100644 patches/buildroot/005-imxregs.patch
delete mode 100644 patches/buildroot/008-fpgaregs.patch
delete mode 100644 patches/buildroot/020-ipkg.patch
delete mode 100644 patches/buildroot/031-max5821-ch7024.patch
delete mode 100644 patches/buildroot/047-madplay-make_it_compile_with_alsa.patch
delete mode 100644 patches/buildroot/070-add_ad9889ctl_package.patch
create mode 100644 patches/buildroot/097-adds_flite_package.patch
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index 5a277c0..355644b 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -1,8 +1,13 @@
menu "Armadeus specific tools/utilities"
+source package/armadeus/ad9889ctrl/Config.in
source package/armadeus/as_devices/Config.in
+source package/armadeus/ch7024ctrl/Config.in
source package/armadeus/demos/Config.in
+source package/armadeus/fpgaregs/Config.in
+source package/armadeus/imxregs/Config.in
source package/armadeus/imxssi/Config.in
+source package/armadeus/max5821ctrl/Config.in
source package/armadeus/testsuite/Config.in
endmenu
diff --git a/buildroot/package/ad9889ctrl/Config.in b/buildroot/package/armadeus/ad9889ctrl/Config.in
similarity index 100%
rename from buildroot/package/ad9889ctrl/Config.in
rename to buildroot/package/armadeus/ad9889ctrl/Config.in
diff --git a/buildroot/package/ad9889ctrl/ad9889.mk b/buildroot/package/armadeus/ad9889ctrl/ad9889.mk
similarity index 100%
rename from buildroot/package/ad9889ctrl/ad9889.mk
rename to buildroot/package/armadeus/ad9889ctrl/ad9889.mk
diff --git a/buildroot/package/ch7024ctrl/Config.in b/buildroot/package/armadeus/ch7024ctrl/Config.in
similarity index 100%
rename from buildroot/package/ch7024ctrl/Config.in
rename to buildroot/package/armadeus/ch7024ctrl/Config.in
diff --git a/buildroot/package/ch7024ctrl/ch70241ctrl.mk b/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
similarity index 100%
rename from buildroot/package/ch7024ctrl/ch70241ctrl.mk
rename to buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
diff --git a/buildroot/package/fpgaregs/Config.in b/buildroot/package/armadeus/fpgaregs/Config.in
similarity index 100%
rename from buildroot/package/fpgaregs/Config.in
rename to buildroot/package/armadeus/fpgaregs/Config.in
diff --git a/buildroot/package/fpgaregs/fpgaregs.mk b/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
similarity index 100%
rename from buildroot/package/fpgaregs/fpgaregs.mk
rename to buildroot/package/armadeus/fpgaregs/fpgaregs.mk
diff --git a/buildroot/package/freescale-tools/01-misc-20071002-put_correct_path_to_libvpu.patch b/buildroot/package/armadeus/freescale-tools/01-misc-20071002-put_correct_path_to_libvpu.patch
similarity index 100%
rename from buildroot/package/freescale-tools/01-misc-20071002-put_correct_path_to_libvpu.patch
rename to buildroot/package/armadeus/freescale-tools/01-misc-20071002-put_correct_path_to_libvpu.patch
diff --git a/buildroot/package/freescale-tools/02-misc-20071002-remove_index_in_libvpu.patch b/buildroot/package/armadeus/freescale-tools/02-misc-20071002-remove_index_in_libvpu.patch
similarity index 100%
rename from buildroot/package/freescale-tools/02-misc-20071002-remove_index_in_libvpu.patch
rename to buildroot/package/armadeus/freescale-tools/02-misc-20071002-remove_index_in_libvpu.patch
diff --git a/buildroot/package/freescale-tools/03-misc-20071002-add_support_for_apf27.patch b/buildroot/package/armadeus/freescale-tools/03-misc-20071002-add_support_for_apf27.patch
similarity index 100%
rename from buildroot/package/freescale-tools/03-misc-20071002-add_support_for_apf27.patch
rename to buildroot/package/armadeus/freescale-tools/03-misc-20071002-add_support_for_apf27.patch
diff --git a/buildroot/package/freescale-tools/04-misc-20071002-compile_vpu_tools_with_debug_symbols.patch b/buildroot/package/armadeus/freescale-tools/04-misc-20071002-compile_vpu_tools_with_debug_symbols.patch
similarity index 100%
rename from buildroot/package/freescale-tools/04-misc-20071002-compile_vpu_tools_with_debug_symbols.patch
rename to buildroot/package/armadeus/freescale-tools/04-misc-20071002-compile_vpu_tools_with_debug_symbols.patch
diff --git a/buildroot/package/freescale-tools/06-misc-20071002-makes_rtp_lib_compatible_with_rfc3984.patch b/buildroot/package/armadeus/freescale-tools/06-misc-20071002-makes_rtp_lib_compatible_with_rfc3984.patch
similarity index 100%
rename from buildroot/package/freescale-tools/06-misc-20071002-makes_rtp_lib_compatible_with_rfc3984.patch
rename to buildroot/package/armadeus/freescale-tools/06-misc-20071002-makes_rtp_lib_compatible_with_rfc3984.patch
diff --git a/buildroot/package/freescale-tools/tools.mk b/buildroot/package/armadeus/freescale-tools/tools.mk
similarity index 100%
rename from buildroot/package/freescale-tools/tools.mk
rename to buildroot/package/armadeus/freescale-tools/tools.mk
diff --git a/buildroot/package/imxregs/Config.in b/buildroot/package/armadeus/imxregs/Config.in
similarity index 100%
rename from buildroot/package/imxregs/Config.in
rename to buildroot/package/armadeus/imxregs/Config.in
diff --git a/buildroot/package/imxregs/imxregs.mk b/buildroot/package/armadeus/imxregs/imxregs.mk
similarity index 100%
rename from buildroot/package/imxregs/imxregs.mk
rename to buildroot/package/armadeus/imxregs/imxregs.mk
diff --git a/buildroot/package/max5821ctrl/Config.in b/buildroot/package/armadeus/max5821ctrl/Config.in
similarity index 100%
rename from buildroot/package/max5821ctrl/Config.in
rename to buildroot/package/armadeus/max5821ctrl/Config.in
diff --git a/buildroot/package/max5821ctrl/max5821ctrl.mk b/buildroot/package/armadeus/max5821ctrl/max5821ctrl.mk
similarity index 100%
rename from buildroot/package/max5821ctrl/max5821ctrl.mk
rename to buildroot/package/armadeus/max5821ctrl/max5821ctrl.mk
diff --git a/buildroot/package/fbgrab/Config.in b/buildroot/package/fbgrab/Config.in
index a8222b6..fec378d 100644
--- a/buildroot/package/fbgrab/Config.in
+++ b/buildroot/package/fbgrab/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_FBGRAB
default n
help
FBGrab is a framebuffer screenshot program,
- capturing the linux frambuffer and converting
+ capturing the linux framebuffer and converting
it to a png-picture.
http://hem.bredband.net/gmogmo/fbgrab/
diff --git a/patches/buildroot/005-imxregs.patch b/patches/buildroot/005-imxregs.patch
deleted file mode 100644
index 83cfa56..0000000
--- a/patches/buildroot/005-imxregs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- buildroot/package/Config.in.ref 2008-11-03 15:35:36.000000000 +0100
-+++ buildroot/package/Config.in 2008-11-03 15:35:57.000000000 +0100
-@@ -259,6 +259,7 @@ endif
- source "package/hwdata/Config.in"
- source "package/i2c-tools/Config.in"
- source "package/input-tools/Config.in"
-+source "package/imxregs/Config.in"
- source "package/iostat/Config.in"
- source "package/libaio/Config.in"
- source "package/libraw1394/Config.in"
diff --git a/patches/buildroot/006-lcd4linux.patch b/patches/buildroot/006-lcd4linux.patch
index 70b5302..f4eebfd 100644
--- a/patches/buildroot/006-lcd4linux.patch
+++ b/patches/buildroot/006-lcd4linux.patch
@@ -1,8 +1,10 @@
---- buildroot/package/Config.in.ref 2008-11-03 15:37:20.000000000 +0100
-+++ buildroot/package/Config.in 2008-11-03 15:39:41.000000000 +0100
-@@ -261,6 +261,7 @@ source "package/i2c-tools/Config.in"
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-01-25 10:03:35.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 10:03:44.000000000 +0100
+@@ -260,6 +260,7 @@
+ source "package/i2c-tools/Config.in"
source "package/input-tools/Config.in"
- source "package/imxregs/Config.in"
source "package/iostat/Config.in"
+source "package/lcd4linux/Config.in"
source "package/libaio/Config.in"
diff --git a/patches/buildroot/008-fpgaregs.patch b/patches/buildroot/008-fpgaregs.patch
deleted file mode 100644
index 674e6c5..0000000
--- a/patches/buildroot/008-fpgaregs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- buildroot/package/Config.in.ref 2008-11-03 15:40:51.000000000 +0100
-+++ buildroot/package/Config.in 2008-11-03 15:41:51.000000000 +0100
-@@ -249,6 +249,7 @@ source "package/e2fsprogs/Config.in"
- source "package/eeprog/Config.in"
- source "package/fconfig/Config.in"
- source "package/fis/Config.in"
-+source "package/fpgaregs/Config.in"
- source "package/fuse/Config.in"
- source "package/gadgetfs-test/Config.in"
- source "package/hal/Config.in"
diff --git a/patches/buildroot/018-allegro.patch b/patches/buildroot/018-allegro.patch
index 09ae899..0beb789 100644
--- a/patches/buildroot/018-allegro.patch
+++ b/patches/buildroot/018-allegro.patch
@@ -1,10 +1,12 @@
---- buildrootref/package/Config.in 2007-10-13 18:33:51.000000000 +0200
-+++ buildroot/package/Config.in 2007-10-13 18:32:21.000000000 +0200
-@@ -298,6 +298,7 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-01-25 10:04:00.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 10:04:02.000000000 +0100
+@@ -311,6 +311,7 @@
source "package/dialog/Config.in"
comment "graphic libraries"
+source "package/allegro/Config.in"
source "package/directfb/Config.in"
- source "package/fusion/Config.in"
- source "package/imagemagick/Config.in"
+ source "package/directfb-examples/Config.in"
+ source "package/fbdump/Config.in"
diff --git a/patches/buildroot/020-ipkg.patch b/patches/buildroot/020-ipkg.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/021-sdl-water-config.patch b/patches/buildroot/021-sdl-water-config.patch
index 8792da9..6a62a88 100644
--- a/patches/buildroot/021-sdl-water-config.patch
+++ b/patches/buildroot/021-sdl-water-config.patch
@@ -1,11 +1,13 @@
---- buildroot/package/Config.in.ref 2008-11-03 16:19:23.000000000 +0100
-+++ buildroot/package/Config.in 2008-11-03 16:20:11.000000000 +0100
-@@ -332,6 +332,8 @@ source "package/sdl_mixer/Config.in"
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-01-25 10:04:02.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 10:04:10.000000000 +0100
+@@ -330,6 +330,8 @@
source "package/sdl_net/Config.in"
source "package/sdl_ttf/Config.in"
source "package/tiff/Config.in"
+comment "Demos"
+source "package/sdlwater/Config.in"
-
+
comment "busybox graphic applications"
comment "--> May be broken in busybox"
diff --git a/patches/buildroot/026-jffs2root.patch b/patches/buildroot/026-jffs2root.patch
index d483f31..5173e2c 100644
--- a/patches/buildroot/026-jffs2root.patch
+++ b/patches/buildroot/026-jffs2root.patch
@@ -1,7 +1,8 @@
-diff -purN -x .svn -x '*~' buildrootref/target/jffs2/jffs2root.mk buildroot/target/jffs2/jffs2root.mk
---- buildrootref/target/jffs2/jffs2root.mk 2007-10-15 22:41:05.000000000 +0200
-+++ buildroot/target/jffs2/jffs2root.mk 2007-10-15 21:06:03.000000000 +0200
-@@ -57,7 +57,10 @@ endif
+Index: buildroot/target/jffs2/jffs2root.mk
+===================================================================
+--- buildroot.orig/target/jffs2/jffs2root.mk 2010-01-25 10:03:35.000000000 +0100
++++ buildroot/target/jffs2/jffs2root.mk 2010-01-25 10:04:15.000000000 +0100
+@@ -58,7 +58,10 @@
ifneq ($(BR2_HAVE_INFOPAGES),y)
@rm -rf $(TARGET_DIR)/usr/info
endif
diff --git a/patches/buildroot/031-max5821-ch7024.patch b/patches/buildroot/031-max5821-ch7024.patch
deleted file mode 100644
index d2c6cf9..0000000
--- a/patches/buildroot/031-max5821-ch7024.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- buildrootref/package/Config.in 2007-11-13 22:23:14.000000000 +0100
-+++ buildroot/package/Config.in 2007-11-13 22:25:34.000000000 +0100
-@@ -220,6 +220,7 @@
-
- if BR2_BLOCKDEV_SUPPORT
- source "package/acpid/Config.in"
-+source "package/ch7024ctrl/Config.in"
- source "package/dbus/Config.in"
- source "package/dbus-glib/Config.in"
- source "package/dm/Config.in"
-@@ -240,6 +241,7 @@
- source "package/libusb/Config.in"
- source "package/lm-sensors/Config.in"
- source "package/lvm2/Config.in"
-+source "package/max5821ctrl/Config.in"
- source "package/mdadm/Config.in"
- source "package/memtester/Config.in"
- source "package/mkdosfs/Config.in"
diff --git a/patches/buildroot/034-slideshow.patch b/patches/buildroot/034-slideshow.patch
index a5306ec..1f01072 100644
--- a/patches/buildroot/034-slideshow.patch
+++ b/patches/buildroot/034-slideshow.patch
@@ -1,6 +1,8 @@
---- buildroot/package/Config.in.ref 2008-11-03 16:25:31.000000000 +0100
-+++ buildroot/package/Config.in 2008-11-03 16:26:00.000000000 +0100
-@@ -333,6 +333,7 @@ source "package/sdl_image/Config.in"
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-01-25 10:04:10.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 10:04:25.000000000 +0100
+@@ -329,6 +329,7 @@
source "package/sdl_mixer/Config.in"
source "package/sdl_net/Config.in"
source "package/sdl_ttf/Config.in"
diff --git a/patches/buildroot/040-mplayer-remove-ivtv-output.patch b/patches/buildroot/040-mplayer-remove-ivtv-output.patch
index f1da1bc..c164824 100644
--- a/patches/buildroot/040-mplayer-remove-ivtv-output.patch
+++ b/patches/buildroot/040-mplayer-remove-ivtv-output.patch
@@ -1,6 +1,8 @@
---- buildroot.org/package/mplayer/mplayer.mk 2008-04-01 17:17:27.000000000 +0200
-+++ buildroot/package/mplayer/mplayer.mk 2008-04-13 21:29:14.000000000 +0200
-@@ -45,6 +45,7 @@
+Index: buildroot/package/mplayer/mplayer.mk
+===================================================================
+--- buildroot.orig/package/mplayer/mplayer.mk 2010-01-25 10:03:35.000000000 +0100
++++ buildroot/package/mplayer/mplayer.mk 2010-01-25 10:05:07.000000000 +0100
+@@ -46,6 +46,7 @@
$(MPLAYER_ENDIAN) \
--disable-mpdvdkit \
--disable-tv \
diff --git a/patches/buildroot/041-fbgrab.patch b/patches/buildroot/041-fbgrab.patch
index 78fa930..6f61b0b 100644
--- a/patches/buildroot/041-fbgrab.patch
+++ b/patches/buildroot/041-fbgrab.patch
@@ -1,7 +1,9 @@
---- buildroot/package/Config.org 2008-05-15 16:01:44.000000000 +0200
-+++ buildroot/package/Config.in 2008-05-15 16:02:59.000000000 +0200
-@@ -316,6 +316,7 @@ comment "busybox graphic applications"
- comment "--> (May be broken in busybox)"
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-01-25 10:04:25.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 10:05:15.000000000 +0100
+@@ -338,6 +338,7 @@
+ comment "--> May be broken in busybox"
source "package/fbv/Config.in"
source "package/fbset/Config.in"
+source "package/fbgrab/Config.in"
diff --git a/patches/buildroot/042-socketcan.patch b/patches/buildroot/042-socketcan.patch
index 191097d..7ae5af2 100644
--- a/patches/buildroot/042-socketcan.patch
+++ b/patches/buildroot/042-socketcan.patch
@@ -1,6 +1,8 @@
---- buildroot/package/Config.in.org 2008-07-16 11:53:26.000000000 +0200
-+++ buildroot/package/Config.in 2008-07-16 11:53:59.000000000 +0200
-@@ -188,6 +188,7 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-01-25 10:05:15.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 10:05:22.000000000 +0100
+@@ -207,6 +207,7 @@
source "package/rsync/Config.in"
source "package/samba/Config.in"
source "package/socat/Config.in"
diff --git a/patches/buildroot/047-madplay-make_it_compile_with_alsa.patch b/patches/buildroot/047-madplay-make_it_compile_with_alsa.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch b/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
index 6a8679d..66ae854 100644
--- a/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
+++ b/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
@@ -6,9 +6,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/target/linux/Makefile.in.advanced
===================================================================
---- buildroot/target/linux/Makefile.in.advanced (revision 24024)
-+++ buildroot/target/linux/Makefile.in.advanced (copie de travail)
-@@ -203,9 +203,11 @@
+--- buildroot.orig/target/linux/Makefile.in.advanced 2010-01-25 10:04:56.000000000 +0100
++++ buildroot/target/linux/Makefile.in.advanced 2010-01-25 10:06:08.000000000 +0100
+@@ -205,9 +205,11 @@
ifneq ($(strip $(LINUX26_PATCH_SOURCE)),)
$(DL_DIR)/$(LINUX26_PATCH_SOURCE):
$(WGET) -P $(DL_DIR) $(LINUX26_PATCH_SITE)/$(LINUX26_PATCH_SOURCE)
@@ -21,7 +21,7 @@ Index: buildroot/target/linux/Makefile.in.advanced
rm -rf $(LINUX26_DIR)
@echo "*** Unpacking kernel source"
$(LINUX26_BZCAT) $(DL_DIR)/$(LINUX26_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) -
-@@ -451,7 +453,7 @@
+@@ -456,7 +458,7 @@
linux26-modules: cross-depmod26 $(PROJECT_BUILD_DIR)/autotools-stamps/linux_modules_target_installed
diff --git a/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch b/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch
index 1b4020a..6e18d3f 100644
--- a/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch
+++ b/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch
@@ -6,9 +6,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/target/linux/Makefile.in.advanced
===================================================================
---- buildroot/target/linux/Makefile.in.advanced (revision 24036)
-+++ buildroot/target/linux/Makefile.in.advanced (copie de travail)
-@@ -397,10 +397,10 @@
+--- buildroot.orig/target/linux/Makefile.in.advanced 2010-01-25 10:06:08.000000000 +0100
++++ buildroot/target/linux/Makefile.in.advanced 2010-01-25 10:06:22.000000000 +0100
+@@ -404,10 +404,10 @@
# Make Linux depend on modules only if enabled in the .config.
@if [ $(shell grep -c "CONFIG_MODULES=y" $(LINUX26_DIR)/.config) != 0 ] ; then \
echo "*** Installing Linux kernel modules" ; \
diff --git a/patches/buildroot/055-pyserial.patch b/patches/buildroot/055-pyserial.patch
index 95863b9..a20008d 100644
--- a/patches/buildroot/055-pyserial.patch
+++ b/patches/buildroot/055-pyserial.patch
@@ -1,6 +1,8 @@
---- buildroot/package/Config.org 2008-12-03 10:26:11.000000000 +0100
-+++ buildroot/package/Config.in 2008-12-02 16:33:32.000000000 +0100
-@@ -466,6 +466,7 @@ if BR2_SCRIPTING_SUPPORT
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-01-25 10:05:22.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 10:06:55.000000000 +0100
+@@ -462,6 +462,7 @@
source "package/lua/Config.in"
source "package/microperl/Config.in"
source "package/python/Config.in"
diff --git a/patches/buildroot/057-pymysql.patch b/patches/buildroot/057-pymysql.patch
index ee173a7..564840c 100644
--- a/patches/buildroot/057-pymysql.patch
+++ b/patches/buildroot/057-pymysql.patch
@@ -1,6 +1,8 @@
---- buildroot/package/Config.in.old 2008-12-10 10:18:00.000000000 +0100
-+++ buildroot/package/Config.in 2008-12-10 10:18:38.000000000 +0100
-@@ -467,6 +467,7 @@ source "package/lua/Config.in"
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-01-25 10:06:55.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 10:07:05.000000000 +0100
+@@ -463,6 +463,7 @@
source "package/microperl/Config.in"
source "package/python/Config.in"
source "package/pyserial/Config.in"
diff --git a/patches/buildroot/070-add_ad9889ctl_package.patch b/patches/buildroot/070-add_ad9889ctl_package.patch
deleted file mode 100644
index 85e7c8c..0000000
--- a/patches/buildroot/070-add_ad9889ctl_package.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- buildroot/package/Config.in.ori 2009-01-14 18:27:51.000000000 +0100
-+++ buildroot/package/Config.in 2009-01-13 11:16:07.000000000 +0100
-@@ -243,6 +243,7 @@
-
- if BR2_BLOCKDEV_SUPPORT
- source "package/acpid/Config.in"
-+source "package/ad9889ctrl/Config.in"
- source "package/ch7024ctrl/Config.in"
- source "package/dbus/Config.in"
- source "package/dbus-glib/Config.in"
diff --git a/patches/buildroot/083-adds_pygame_package.patch b/patches/buildroot/083-adds_pygame_package.patch
index 10e9e65..654355d 100644
--- a/patches/buildroot/083-adds_pygame_package.patch
+++ b/patches/buildroot/083-adds_pygame_package.patch
@@ -13,7 +13,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/pygame/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Config.in 2009-09-21 16:54:56.000000000 +0200
++++ buildroot/package/pygame/Config.in 2010-01-25 10:08:53.000000000 +0100
@@ -0,0 +1,92 @@
+config BR2_PACKAGE_PYGAME
+ bool "pygame"
@@ -110,7 +110,7 @@ Index: buildroot/package/pygame/Config.in
Index: buildroot/package/pygame/pygame.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/pygame.mk 2009-09-21 17:59:21.000000000 +0200
++++ buildroot/package/pygame/pygame.mk 2010-01-25 10:08:53.000000000 +0100
@@ -0,0 +1,100 @@
+#
+# Pygame
@@ -214,9 +214,9 @@ Index: buildroot/package/pygame/pygame.mk
+endif
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2009-08-26 19:05:02.000000000 +0200
-+++ buildroot/package/Config.in 2009-08-26 19:06:38.000000000 +0200
-@@ -341,6 +341,7 @@
+--- buildroot.orig/package/Config.in 2010-01-25 10:08:06.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 10:08:53.000000000 +0100
+@@ -326,6 +326,7 @@
source "package/libungif/Config.in"
source "package/lite/Config.in"
source "package/pixman/Config.in"
@@ -227,7 +227,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/pygame/Setup
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Setup 2009-08-28 23:02:30.000000000 +0200
++++ buildroot/package/pygame/Setup 2010-01-25 10:08:53.000000000 +0100
@@ -0,0 +1,64 @@
+#This Setup file is used by the setup.py script to configure the
+#python extensions. You will likely use the "config.py" which will
diff --git a/patches/buildroot/085-adds_gpm_package.patch b/patches/buildroot/085-adds_gpm_package.patch
index c81f81a..8277304 100644
--- a/patches/buildroot/085-adds_gpm_package.patch
+++ b/patches/buildroot/085-adds_gpm_package.patch
@@ -5,7 +5,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/gpm/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/Config.in 2009-12-03 12:15:44.000000000 +0100
++++ buildroot/package/gpm/Config.in 2010-01-25 10:00:14.000000000 +0100
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_GPM
+ bool "gpm mouse server"
@@ -17,7 +17,7 @@ Index: buildroot/package/gpm/Config.in
Index: buildroot/package/gpm/gpm.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm.mk 2009-12-03 11:58:49.000000000 +0100
++++ buildroot/package/gpm/gpm.mk 2010-01-25 10:00:14.000000000 +0100
@@ -0,0 +1,18 @@
+#############################################################
+#
@@ -40,7 +40,7 @@ Index: buildroot/package/gpm/gpm.mk
Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch 2009-12-03 11:33:41.000000000 +0100
++++ buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch 2010-01-25 10:00:14.000000000 +0100
@@ -0,0 +1,77 @@
+
+Replaces all "obsolete" functions (at least to compile for uClibc).
@@ -121,10 +121,10 @@ Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
+ gpm_report (GPM_PR_WARN,"Flag value (%s) for parameter %s is invalid",
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2009-12-03 11:19:50.000000000 +0100
-+++ buildroot/package/Config.in 2009-12-03 11:22:53.000000000 +0100
-@@ -259,6 +259,7 @@
- source "package/fpgaregs/Config.in"
+--- buildroot.orig/package/Config.in 2010-01-25 10:00:14.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 10:02:52.000000000 +0100
+@@ -255,6 +255,7 @@
+ source "package/fis/Config.in"
source "package/fuse/Config.in"
source "package/gadgetfs-test/Config.in"
+source "package/gpm/Config.in"
@@ -134,7 +134,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch 2009-12-03 11:33:54.000000000 +0100
++++ buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch 2010-01-25 10:00:14.000000000 +0100
@@ -0,0 +1,30 @@
+GPM asks "install" to strip the executables while installing it.
+This doesn't seems cross-compiling friendly, so remove the option (-s) and let
diff --git a/patches/buildroot/087-dont_hide_all_editors.patch b/patches/buildroot/087-dont_hide_all_editors.patch
index 33aaaff..f494eca 100644
--- a/patches/buildroot/087-dont_hide_all_editors.patch
+++ b/patches/buildroot/087-dont_hide_all_editors.patch
@@ -8,9 +8,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2009-10-22 12:17:45.000000000 +0200
-+++ buildroot/package/Config.in 2009-10-22 12:19:20.000000000 +0200
-@@ -134,14 +134,9 @@
+--- buildroot.orig/package/Config.in 2010-01-25 10:09:17.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 10:09:29.000000000 +0100
+@@ -125,14 +125,9 @@
source "package/database/Config.in"
@@ -27,8 +27,8 @@ Index: buildroot/package/Config.in
default y
Index: buildroot/package/editors/Config.in
===================================================================
---- buildroot.orig/package/editors/Config.in 2009-10-22 12:17:58.000000000 +0200
-+++ buildroot/package/editors/Config.in 2009-10-22 12:19:45.000000000 +0200
+--- buildroot.orig/package/editors/Config.in 2010-01-25 10:02:52.000000000 +0100
++++ buildroot/package/editors/Config.in 2010-01-25 10:09:29.000000000 +0100
@@ -8,5 +8,8 @@
source "package/editors/ed/Config.in"
source "package/editors/nano/Config.in"
diff --git a/patches/buildroot/097-adds_flite_package.patch b/patches/buildroot/097-adds_flite_package.patch
new file mode 100644
index 0000000..ab466c0
--- /dev/null
+++ b/patches/buildroot/097-adds_flite_package.patch
@@ -0,0 +1,79 @@
+Add Flite package (speech synthesis engine).
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/audio/Config.in
+===================================================================
+--- buildroot.orig/package/audio/Config.in 2010-01-22 13:52:37.000000000 +0100
++++ buildroot/package/audio/Config.in 2010-01-22 13:53:01.000000000 +0100
+@@ -18,4 +18,5 @@
+ source "package/audio/mpg123/Config.in"
+ source "package/audio/speex/Config.in"
+ source "package/audio/festival/Config.in"
++source "package/audio/flite/Config.in"
+ endif
+Index: buildroot/package/audio/flite/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/audio/flite/Config.in 2010-01-22 13:55:42.000000000 +0100
+@@ -0,0 +1,11 @@
++config BR2_PACKAGE_FLITE
++ bool "flite"
++ help
++ Flite: a small, fast run time synthesis engine.
++ Flite (festival-lite) is a small, fast run-time synthesis engine
++ developed at CMU and primarily designed for small embedded machines
++ and/or large servers. Flite is designed as an alternative synthesis
++ engine to Festival for voices built using the FestVox suite of voice
++ building tools.
++
++ http://www.speech.cs.cmu.edu/flite
+Index: buildroot/package/audio/flite/flite.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/audio/flite/flite.mk 2010-01-22 14:44:19.000000000 +0100
+@@ -0,0 +1,44 @@
++#############################################################
++#
++# flite
++#
++#############################################################
++
++FLITE_VERSION:=1.4
++FLITE_SOURCE:=flite-$(FLITE_VERSION)-release.tar.bz2
++FLITE_SITE:=http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)/
++FLITE_INSTALL_STAGING:=YES
++FLITE_INSTALL_TARGET:=YES
++
++FLITE_CONF_OPT = --enable-shared
++FLITE_INSTALL_STAGING_OPT = INSTALLBINDIR=$(STAGING_DIR)/usr/bin INSTALLLIBDIR=$(STAGING_DIR)/usr/lib INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite install
++FLITE_INSTALL_TARGET_OPT = INSTALLBINDIR=$(TARGET_DIR)/usr/bin INSTALLLIBDIR=$(TARGET_DIR)/usr/lib INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite install
++
++$(eval $(call AUTOTARGETS,package,flite))
++
++# Flite (strange) archive format makes Buildroot failed to extract it (--strip-components).
++# So do it manually:
++$(FLITE_TARGET_EXTRACT): $(FLITE_TARGET_SOURCE)
++ $(call MESSAGE,"Extracting")
++ $(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
++ $(TAR) -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ $(Q)mv $(@D)/.stamp* $(BUILD_DIR)/flite-$(FLITE_VERSION)-release/
++ $(Q)rm -rf $(@D)
++ $(Q)mv $(BUILD_DIR)/flite-$(FLITE_VERSION)-release $(@D)
++# some packages have messed up permissions inside
++ $(Q)chmod -R ug+rw $(@D)
++ touch $@
++
++$(FLITE_HOOK_POST_INSTALL): $(FLITE_TARGET_INSTALL_TARGET)
++ rm -f $(TARGET_DIR)/usr/lib/libflite*.a
++ifeq ($(BR2_ENABLE_DEBUG),)
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libflite*.so.$(FLITE_VERSION)
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/flite*
++endif
++ touch $@
++
++# Flite has no uninstall target
++$(FLITE_TARGET_UNINSTALL):
++ $(call MESSAGE,"Uninstalling")
++ rm -f $(TARGET_DIR)/usr/lib/libflite*
++ rm -f $(TARGET_DIR)/usr/bin/flite*
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 991cd50..42898d2 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -8,6 +8,7 @@ rm -rf buildroot/package/games/quake-pak/
rm -rf buildroot/package/games/sdlquake/
rm -rf buildroot/package/gpm/
rm -rf buildroot/package/pygame/
-rm -f buildroot/package/proftpd/proftpd-1.3.2-fix-kernel-header-capability-version.patch
+rm -f buildroot/package/proftpd/proftpd-1.3.2-fix-kernel-header-capability-version.patch
rm -rf buildroot/package/uucp/
-rm -f buildroot/package/audio/libsndfile/libsndfile-1.0.*-srconly.patch
+rm -f buildroot/package/audio/libsndfile/libsndfile-1.0.*-srconly.patch
+rm -rf buildroot/package/audio/flite/
diff --git a/target/test/test_audio.sh b/target/test/test_audio.sh
index 9bfaaf5..80eb2dd 100755
--- a/target/test/test_audio.sh
+++ b/target/test/test_audio.sh
@@ -55,6 +55,8 @@ test_audio()
execute_for_target end_of_test_for_apf9328 continue_for_apf27
ask_user "Please connect a microphone to the Audio In connector (bottom on APF27). Then press ENTER."
+ amixer cset numid=6 on
+ amixer cset numid=5 30
ask_user "You will now have to speak in the MIC. The sampled sound will then be played back. Press ENTER when ready to speak."
# Stereo 16bits @ 16KHz
arecord -r 16000 -f S16_LE -c 2 $TEMP_FILE & pid=$!
hooks/post-receive
--
armadeus
|
