[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-196-g7718727
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-196-g7718727
|
From: Julien B a. A. <ar...@us...> - 2010-02-12 10:37:33
|
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 771872735971272857069582eb36aed183c65015 (commit)
via a291b08a1667b1e6347c4f3efae69daccfd9569e (commit)
via b098a787a6c154cf68814cf47412fd2f2d3df10a (commit)
via a5d6e85f0f3d1794e5b13aed945ce685e58455d2 (commit)
via 0c41d8768f45d1189ea2251058b6a381f06f59b9 (commit)
via ce1530321cc9f5b546e8a0a0dd01289bdbf1aadb (commit)
from ac1dc3aa6157acaf797cfa640dbee0bc00a3e261 (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 771872735971272857069582eb36aed183c65015
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 12 11:02:48 2010 +0100
[BUILDROOT] [2010.02] Add fixes to correctly build rsync and alsamixer
commit a291b08a1667b1e6347c4f3efae69daccfd9569e
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 12 10:35:10 2010 +0100
[BUILDROOT] [2010.02] Updates apf27_defconfig
commit b098a787a6c154cf68814cf47412fd2f2d3df10a
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 15:30:04 2010 +0100
Updates buildroot/.gitignore
commit a5d6e85f0f3d1794e5b13aed945ce685e58455d2
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 15:28:50 2010 +0100
[TOOLS] Improves quiltify.sh for new BR handling and modify main Makefile accordingly
commit 0c41d8768f45d1189ea2251058b6a381f06f59b9
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 15:25:22 2010 +0100
[BUILDROOT] [2010.02] Updates apf27_defconfig
commit ce1530321cc9f5b546e8a0a0dd01289bdbf1aadb
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 11 15:24:12 2010 +0100
[BUILDROOT] Moves buildroot/package/audio/madplay/madplay-audio-alsa.patch as a BR patch
-----------------------------------------------------------------------
Summary of changes:
Makefile | 15 +-
buildroot/.gitignore | 3 +
buildroot/configs/apf27_defconfig | 23 ++-
.../package/audio/madplay/madplay-audio-alsa.patch | 172 ------------------
...r-add_patch_for_recent_alsa_compatibility.patch | 187 ++++++++++++++++++++
...r-add_patch_for_recent_alsa_compatibility.patch | 187 ++++++++++++++++++++
...pdates_source_repository_and_bump_version.patch | 32 ++++
...libform_libmenu_and_libpanel_from_ncurses.patch | 36 ++++
patches/buildroot/2010.02/cleanup_buildroot.sh | 1 +
patches/buildroot/cleanup_buildroot.sh | 2 +-
scripts/quiltify.sh | 2 +-
11 files changed, 469 insertions(+), 191 deletions(-)
delete mode 100644 buildroot/package/audio/madplay/madplay-audio-alsa.patch
create mode 100644 patches/buildroot/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
create mode 100644 patches/buildroot/2010.02/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
create mode 100644 patches/buildroot/2010.02/102-rsync-updates_source_repository_and_bump_version.patch
create mode 100644 patches/buildroot/2010.02/103-alsamixer-now_requires_libform_libmenu_and_libpanel_from_ncurses.patch
diff --git a/Makefile b/Makefile
index 592a7a3..3375976 100644
--- a/Makefile
+++ b/Makefile
@@ -23,27 +23,25 @@
#--------------------------------------------------------------
include ./Makefile.in
+ARMADEUS_TOPDIR:=$(shell pwd)
+export ARMADEUS_TOPDIR
#--- User configurable stuff:
#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
#BUILDROOT_VERSION:=20100211
-#BUILDROOT_PATCH_DIR = patches/buildroot/2010.02
+#BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2010.02
BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
BUILDROOT_VERSION:=20081103
-BUILDROOT_PATCH_DIR = patches/buildroot
+BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot
#--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
-
-ARMADEUS_TOPDIR:=$(shell pwd)
-export ARMADEUS_TOPDIR
-
BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
-BUILDROOT_DIR = buildroot
+#BUILDROOT_DIR is defined in ./Makefile.in
PATCH_DIR = patches
BUILDROOT_FILE_PATH:=downloads
TAR_OPTIONS=--exclude=.svn --exclude=.git --exclude=.gitignore -xf
-ARMADEUS_ENV_FILE=armadeus_env.sh
+ARMADEUS_ENV_FILE:=$(ARMADEUS_TOPDIR)/armadeus_env.sh
ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
@@ -186,6 +184,7 @@ buildroot-dirclean:
# Generate shell's most useful variables:
shell_env:
@echo ARMADEUS_BUILDROOT_DIR=$(BUILDROOT_DIR) > $(ARMADEUS_ENV_FILE)
+ @echo ARMADEUS_BUILDROOT_PATCH_DIR=$(BUILDROOT_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_DIR=$(ARMADEUS_LINUX_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_PATCH_DIR=$(ARMADEUS_LINUX_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_DIR=$(ARMADEUS_U_BOOT_DIR) >> $(ARMADEUS_ENV_FILE)
diff --git a/buildroot/.gitignore b/buildroot/.gitignore
index 0cf1f5b..ac6d14b 100644
--- a/buildroot/.gitignore
+++ b/buildroot/.gitignore
@@ -3,6 +3,7 @@
/build_*
/dl
/docs/
+/output/
/project_*
/project/
/toolchain_*
@@ -13,6 +14,8 @@
/Config.in
/Makefile
/TODO
+/CHANGES
+/COPYING
*.depend
*.o
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index fbfb306..58b647f 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,9 +1,9 @@
#
# Automatically generated make config: don't edit
-# Tue Feb 9 11:51:05 2010
+# Thu Feb 11 12:18:28 2010
#
BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2010.02-git"
+BR2_VERSION="2010.02-rc1"
# BR2_alpha is not set
BR2_arm=y
# BR2_armeb is not set
@@ -92,7 +92,7 @@ BR2_GIT="git clone"
BR2_ZCAT="gzip -d -c"
BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
-BR2_DL_DIR="/local/downloads"
+BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_COPYTO=""
#
@@ -495,8 +495,6 @@ BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTESTER is not set
BR2_PACKAGE_MTD=y
-BR2_PACKAGE_MTD_UTILS=y
-# BR2_PACKAGE_MTD_UTILS_GIT is not set
#
# MTD tools selection
@@ -526,6 +524,17 @@ BR2_PACKAGE_MTD_NANDWRITE=y
# BR2_PACKAGE_MTD_RFDFORMAT is not set
# BR2_PACKAGE_MTD_SERVE_IMAGE is not set
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_MTD_UBIATTACH=y
+BR2_PACKAGE_MTD_UBICRC32=y
+BR2_PACKAGE_MTD_UBIDETACH=y
+BR2_PACKAGE_MTD_UBIFORMAT=y
+BR2_PACKAGE_MTD_UBIMKVOL=y
+BR2_PACKAGE_MTD_UBINFO=y
+BR2_PACKAGE_MTD_UBINIZE=y
+BR2_PACKAGE_MTD_UBIRENAME=y
+BR2_PACKAGE_MTD_UBIRMVOL=y
+BR2_PACKAGE_MTD_UBIRSVOL=y
+BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
# BR2_PACKAGE_PCIUTILS is not set
@@ -577,10 +586,6 @@ BR2_PACKAGE_ALSA_UTILS_ARECORD=y
# BR2_PACKAGE_ALSA_UTILS_ASEQDUMP is not set
# BR2_PACKAGE_ALSA_UTILS_ASEQNET is not set
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-
-#
-# asterisk - disabled (required openssl and mpg123)
-#
# BR2_PACKAGE_AUMIX is not set
# BR2_PACKAGE_FLAC is not set
# BR2_PACKAGE_GSTREAMER is not set
diff --git a/buildroot/package/audio/madplay/madplay-audio-alsa.patch b/buildroot/package/audio/madplay/madplay-audio-alsa.patch
deleted file mode 100644
index 0647dba..0000000
--- a/buildroot/package/audio/madplay/madplay-audio-alsa.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-* needed for madplay to compile when ALSA is configured with
- --with-versioned=no option.
-* fix allocation of buffer, buffer_size is number of frames
-* use default 16 bit depth (some hardware has small buffers, 16/24 bit
- difference is very small)
-
---- madplay-0.15.2b.org/audio_alsa.c 2004-02-23 22:35:23.000000000 +0100
-+++ madplay-0.15.2b/audio_alsa.c 2009-01-19 19:18:36.000000000 +0100
-@@ -28,31 +28,30 @@
-
- #include <errno.h>
-
--#define ALSA_PCM_OLD_HW_PARAMS_API
--#define ALSA_PCM_OLD_SW_PARAMS_API
- #include <alsa/asoundlib.h>
-
- #include <mad.h>
-
- #include "audio.h"
-
--char *buf = NULL;
--int paused = 0;
-+#define BUFFER_TIME_MAX 500000
-+unsigned char *buf = NULL;
-+int paused = 0;
-+
-+unsigned int rate = 0;
-+unsigned int channels = -1;
-+unsigned int bitdepth = -1;
-+unsigned int sample_size= -1;
-
--int rate = -1;
--int channels = -1;
--int bitdepth = -1;
--int sample_size = -1;
--
--int buffer_time = 500000;
--int period_time = 100000;
-+unsigned int buffer_time;
-+unsigned int period_time;
- char *defaultdev = "plughw:0,0";
-
- snd_pcm_hw_params_t *alsa_hwparams;
- snd_pcm_sw_params_t *alsa_swparams;
-
- snd_pcm_sframes_t buffer_size;
--snd_pcm_sframes_t period_size;
-+snd_pcm_uframes_t period_size;
-
- snd_pcm_format_t alsa_format = -1;
- snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
-@@ -66,7 +65,7 @@
- snd_pcm_hw_params_t *params,
- snd_pcm_access_t access)
- {
-- int err, dir;
-+ int err;
-
- /* choose all parameters */
- err = snd_pcm_hw_params_any(handle,params);
-@@ -74,6 +73,12 @@
- printf("Access type not available for playback: %s\n", snd_strerror(err));
- return err;
- }
-+ /* set the access type */
-+ err = snd_pcm_hw_params_set_access(handle, params, alsa_access);
-+ if (err < 0) {
-+ printf("Sample format not available for playback: %s\n", snd_strerror(err));
-+ return err;
-+ }
- /* set the sample format */
- err = snd_pcm_hw_params_set_format(handle, params, alsa_format);
- if (err < 0) {
-@@ -87,29 +92,42 @@
- return err;
- }
- /* set the stream rate */
-- err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
-+ err = snd_pcm_hw_params_set_rate(handle, params, rate, 0);
- if (err < 0) {
- printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
- return err;
- }
-- if (err != rate) {
-+ /*if (err != rate) {
- printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
- return -EINVAL;
-+ }*/
-+ err = snd_pcm_hw_params_get_buffer_time_max(params, &buffer_time, NULL);
-+ if (err < 0) {
-+ printf("Unable to retrieve buffer time: %s\n", snd_strerror(err));
-+ return err;
- }
-+ if (buffer_time > BUFFER_TIME_MAX)
-+ buffer_time = BUFFER_TIME_MAX;
- /* set buffer time */
-- err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
-+ err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, NULL);
- if (err < 0) {
- printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
- return err;
- }
-- buffer_size = snd_pcm_hw_params_get_buffer_size(params);
-+ if (period_time * 4 > buffer_time)
-+ period_time = buffer_time / 4;
- /* set period time */
-- err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
-+ err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, NULL);
- if (err < 0) {
- printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
- return err;
- }
-- period_size = snd_pcm_hw_params_get_period_size(params, &dir);
-+ /* retrieve buffer size */
-+ err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
-+ if (err < 0) {
-+ printf("Unable to retrieve buffer size: %s\n", snd_strerror(err));
-+ return err;
-+ }
- /* write the parameters to device */
- err = snd_pcm_hw_params(handle, params);
- if (err < 0) {
-@@ -123,6 +141,7 @@
- int set_swparams(snd_pcm_t *handle,
- snd_pcm_sw_params_t *params)
- {
-+ unsigned int start_threshold;
- int err;
-
- /* get current swparams */
-@@ -136,13 +155,7 @@
- if (err < 0) {
- printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
- return err;
-- }
-- /* allow transfer when at least period_size samples can be processed */
-- err = snd_pcm_sw_params_set_avail_min(handle, params, period_size);
-- if (err < 0) {
-- printf("Unable to set avail min for playback: %s\n", snd_strerror(err));
-- return err;
-- }
-+ }
- /* align all transfers to 1 samples */
- err = snd_pcm_sw_params_set_xfer_align(handle, params, 1);
- if (err < 0) {
-@@ -190,7 +203,7 @@
- rate = config->speed;
-
- if ( bitdepth == 0 )
-- config->precision = bitdepth = 32;
-+ config->precision = bitdepth = 16;
-
- switch (bitdepth)
- {
-@@ -241,7 +254,7 @@
- return -1;
- }
-
-- buf = malloc(buffer_size);
-+ buf = malloc(buffer_size * sample_size);
- if (buf == NULL) {
- audio_error="unable to allocate output buffer table";
- return -1;
-@@ -279,7 +292,7 @@
- int play(struct audio_play *play)
- {
- int err, len;
-- char *ptr;
-+ unsigned char *ptr;
-
- ptr = buf;
- len = play->nsamples;
diff --git a/patches/buildroot/101-mplayer-add_patch_for_recent_alsa_compatibility.patch b/patches/buildroot/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
new file mode 100644
index 0000000..aa5d93b
--- /dev/null
+++ b/patches/buildroot/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
@@ -0,0 +1,187 @@
+Can't remember where I found these changes but they are mandatory, otherwise
+you will get this when compiling:
+audio_alsa.c:(.text+0x1d8): undefined reference to `snd_pcm_hw_params_set_rate_near@ALSA_0.9'
+audio_alsa.c:(.text+0x230): undefined reference to `snd_pcm_hw_params_set_buffer_time_near@ALSA_0.9'
+audio_alsa.c:(.text+0x258): undefined reference to `snd_pcm_hw_params_get_buffer_size@ALSA_0.9'
+audio_alsa.c:(.text+0x274): undefined reference to `snd_pcm_hw_params_set_period_time_near@ALSA_0.9'
+audio_alsa.c:(.text+0x2a4): undefined reference to `snd_pcm_hw_params_get_period_size@ALSA_0.9'
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/audio/madplay/madplay-audio-alsa.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/audio/madplay/madplay-audio-alsa.patch 2010-02-11 15:17:41.000000000 +0100
+@@ -0,0 +1,172 @@
++* needed for madplay to compile when ALSA is configured with
++ --with-versioned=no option.
++* fix allocation of buffer, buffer_size is number of frames
++* use default 16 bit depth (some hardware has small buffers, 16/24 bit
++ difference is very small)
++
++--- madplay-0.15.2b.org/audio_alsa.c 2004-02-23 22:35:23.000000000 +0100
+++++ madplay-0.15.2b/audio_alsa.c 2009-01-19 19:18:36.000000000 +0100
++@@ -28,31 +28,30 @@
++
++ #include <errno.h>
++
++-#define ALSA_PCM_OLD_HW_PARAMS_API
++-#define ALSA_PCM_OLD_SW_PARAMS_API
++ #include <alsa/asoundlib.h>
++
++ #include <mad.h>
++
++ #include "audio.h"
++
++-char *buf = NULL;
++-int paused = 0;
+++#define BUFFER_TIME_MAX 500000
+++unsigned char *buf = NULL;
+++int paused = 0;
+++
+++unsigned int rate = 0;
+++unsigned int channels = -1;
+++unsigned int bitdepth = -1;
+++unsigned int sample_size= -1;
++
++-int rate = -1;
++-int channels = -1;
++-int bitdepth = -1;
++-int sample_size = -1;
++-
++-int buffer_time = 500000;
++-int period_time = 100000;
+++unsigned int buffer_time;
+++unsigned int period_time;
++ char *defaultdev = "plughw:0,0";
++
++ snd_pcm_hw_params_t *alsa_hwparams;
++ snd_pcm_sw_params_t *alsa_swparams;
++
++ snd_pcm_sframes_t buffer_size;
++-snd_pcm_sframes_t period_size;
+++snd_pcm_uframes_t period_size;
++
++ snd_pcm_format_t alsa_format = -1;
++ snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
++@@ -66,7 +65,7 @@
++ snd_pcm_hw_params_t *params,
++ snd_pcm_access_t access)
++ {
++- int err, dir;
+++ int err;
++
++ /* choose all parameters */
++ err = snd_pcm_hw_params_any(handle,params);
++@@ -74,6 +73,12 @@
++ printf("Access type not available for playback: %s\n", snd_strerror(err));
++ return err;
++ }
+++ /* set the access type */
+++ err = snd_pcm_hw_params_set_access(handle, params, alsa_access);
+++ if (err < 0) {
+++ printf("Sample format not available for playback: %s\n", snd_strerror(err));
+++ return err;
+++ }
++ /* set the sample format */
++ err = snd_pcm_hw_params_set_format(handle, params, alsa_format);
++ if (err < 0) {
++@@ -87,29 +92,42 @@
++ return err;
++ }
++ /* set the stream rate */
++- err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
+++ err = snd_pcm_hw_params_set_rate(handle, params, rate, 0);
++ if (err < 0) {
++ printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
++ return err;
++ }
++- if (err != rate) {
+++ /*if (err != rate) {
++ printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
++ return -EINVAL;
+++ }*/
+++ err = snd_pcm_hw_params_get_buffer_time_max(params, &buffer_time, NULL);
+++ if (err < 0) {
+++ printf("Unable to retrieve buffer time: %s\n", snd_strerror(err));
+++ return err;
++ }
+++ if (buffer_time > BUFFER_TIME_MAX)
+++ buffer_time = BUFFER_TIME_MAX;
++ /* set buffer time */
++- err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
+++ err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, NULL);
++ if (err < 0) {
++ printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
++ return err;
++ }
++- buffer_size = snd_pcm_hw_params_get_buffer_size(params);
+++ if (period_time * 4 > buffer_time)
+++ period_time = buffer_time / 4;
++ /* set period time */
++- err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
+++ err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, NULL);
++ if (err < 0) {
++ printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
++ return err;
++ }
++- period_size = snd_pcm_hw_params_get_period_size(params, &dir);
+++ /* retrieve buffer size */
+++ err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
+++ if (err < 0) {
+++ printf("Unable to retrieve buffer size: %s\n", snd_strerror(err));
+++ return err;
+++ }
++ /* write the parameters to device */
++ err = snd_pcm_hw_params(handle, params);
++ if (err < 0) {
++@@ -123,6 +141,7 @@
++ int set_swparams(snd_pcm_t *handle,
++ snd_pcm_sw_params_t *params)
++ {
+++ unsigned int start_threshold;
++ int err;
++
++ /* get current swparams */
++@@ -136,13 +155,7 @@
++ if (err < 0) {
++ printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
++ return err;
++- }
++- /* allow transfer when at least period_size samples can be processed */
++- err = snd_pcm_sw_params_set_avail_min(handle, params, period_size);
++- if (err < 0) {
++- printf("Unable to set avail min for playback: %s\n", snd_strerror(err));
++- return err;
++- }
+++ }
++ /* align all transfers to 1 samples */
++ err = snd_pcm_sw_params_set_xfer_align(handle, params, 1);
++ if (err < 0) {
++@@ -190,7 +203,7 @@
++ rate = config->speed;
++
++ if ( bitdepth == 0 )
++- config->precision = bitdepth = 32;
+++ config->precision = bitdepth = 16;
++
++ switch (bitdepth)
++ {
++@@ -241,7 +254,7 @@
++ return -1;
++ }
++
++- buf = malloc(buffer_size);
+++ buf = malloc(buffer_size * sample_size);
++ if (buf == NULL) {
++ audio_error="unable to allocate output buffer table";
++ return -1;
++@@ -279,7 +292,7 @@
++ int play(struct audio_play *play)
++ {
++ int err, len;
++- char *ptr;
+++ unsigned char *ptr;
++
++ ptr = buf;
++ len = play->nsamples;
diff --git a/patches/buildroot/2010.02/101-mplayer-add_patch_for_recent_alsa_compatibility.patch b/patches/buildroot/2010.02/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
new file mode 100644
index 0000000..c97e5b7
--- /dev/null
+++ b/patches/buildroot/2010.02/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
@@ -0,0 +1,187 @@
+Can't remember where I found these changes but they are mandatory, otherwise
+you will get this when compiling:
+audio_alsa.c:(.text+0x1d8): undefined reference to `snd_pcm_hw_params_set_rate_near@ALSA_0.9'
+audio_alsa.c:(.text+0x230): undefined reference to `snd_pcm_hw_params_set_buffer_time_near@ALSA_0.9'
+audio_alsa.c:(.text+0x258): undefined reference to `snd_pcm_hw_params_get_buffer_size@ALSA_0.9'
+audio_alsa.c:(.text+0x274): undefined reference to `snd_pcm_hw_params_set_period_time_near@ALSA_0.9'
+audio_alsa.c:(.text+0x2a4): undefined reference to `snd_pcm_hw_params_get_period_size@ALSA_0.9'
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/multimedia/madplay/madplay-audio-alsa.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/multimedia/madplay/madplay-audio-alsa.patch 2010-02-11 15:17:41.000000000 +0100
+@@ -0,0 +1,172 @@
++* needed for madplay to compile when ALSA is configured with
++ --with-versioned=no option.
++* fix allocation of buffer, buffer_size is number of frames
++* use default 16 bit depth (some hardware has small buffers, 16/24 bit
++ difference is very small)
++
++--- madplay-0.15.2b.org/audio_alsa.c 2004-02-23 22:35:23.000000000 +0100
+++++ madplay-0.15.2b/audio_alsa.c 2009-01-19 19:18:36.000000000 +0100
++@@ -28,31 +28,30 @@
++
++ #include <errno.h>
++
++-#define ALSA_PCM_OLD_HW_PARAMS_API
++-#define ALSA_PCM_OLD_SW_PARAMS_API
++ #include <alsa/asoundlib.h>
++
++ #include <mad.h>
++
++ #include "audio.h"
++
++-char *buf = NULL;
++-int paused = 0;
+++#define BUFFER_TIME_MAX 500000
+++unsigned char *buf = NULL;
+++int paused = 0;
+++
+++unsigned int rate = 0;
+++unsigned int channels = -1;
+++unsigned int bitdepth = -1;
+++unsigned int sample_size= -1;
++
++-int rate = -1;
++-int channels = -1;
++-int bitdepth = -1;
++-int sample_size = -1;
++-
++-int buffer_time = 500000;
++-int period_time = 100000;
+++unsigned int buffer_time;
+++unsigned int period_time;
++ char *defaultdev = "plughw:0,0";
++
++ snd_pcm_hw_params_t *alsa_hwparams;
++ snd_pcm_sw_params_t *alsa_swparams;
++
++ snd_pcm_sframes_t buffer_size;
++-snd_pcm_sframes_t period_size;
+++snd_pcm_uframes_t period_size;
++
++ snd_pcm_format_t alsa_format = -1;
++ snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
++@@ -66,7 +65,7 @@
++ snd_pcm_hw_params_t *params,
++ snd_pcm_access_t access)
++ {
++- int err, dir;
+++ int err;
++
++ /* choose all parameters */
++ err = snd_pcm_hw_params_any(handle,params);
++@@ -74,6 +73,12 @@
++ printf("Access type not available for playback: %s\n", snd_strerror(err));
++ return err;
++ }
+++ /* set the access type */
+++ err = snd_pcm_hw_params_set_access(handle, params, alsa_access);
+++ if (err < 0) {
+++ printf("Sample format not available for playback: %s\n", snd_strerror(err));
+++ return err;
+++ }
++ /* set the sample format */
++ err = snd_pcm_hw_params_set_format(handle, params, alsa_format);
++ if (err < 0) {
++@@ -87,29 +92,42 @@
++ return err;
++ }
++ /* set the stream rate */
++- err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
+++ err = snd_pcm_hw_params_set_rate(handle, params, rate, 0);
++ if (err < 0) {
++ printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
++ return err;
++ }
++- if (err != rate) {
+++ /*if (err != rate) {
++ printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
++ return -EINVAL;
+++ }*/
+++ err = snd_pcm_hw_params_get_buffer_time_max(params, &buffer_time, NULL);
+++ if (err < 0) {
+++ printf("Unable to retrieve buffer time: %s\n", snd_strerror(err));
+++ return err;
++ }
+++ if (buffer_time > BUFFER_TIME_MAX)
+++ buffer_time = BUFFER_TIME_MAX;
++ /* set buffer time */
++- err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
+++ err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, NULL);
++ if (err < 0) {
++ printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
++ return err;
++ }
++- buffer_size = snd_pcm_hw_params_get_buffer_size(params);
+++ if (period_time * 4 > buffer_time)
+++ period_time = buffer_time / 4;
++ /* set period time */
++- err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
+++ err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, NULL);
++ if (err < 0) {
++ printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
++ return err;
++ }
++- period_size = snd_pcm_hw_params_get_period_size(params, &dir);
+++ /* retrieve buffer size */
+++ err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
+++ if (err < 0) {
+++ printf("Unable to retrieve buffer size: %s\n", snd_strerror(err));
+++ return err;
+++ }
++ /* write the parameters to device */
++ err = snd_pcm_hw_params(handle, params);
++ if (err < 0) {
++@@ -123,6 +141,7 @@
++ int set_swparams(snd_pcm_t *handle,
++ snd_pcm_sw_params_t *params)
++ {
+++ unsigned int start_threshold;
++ int err;
++
++ /* get current swparams */
++@@ -136,13 +155,7 @@
++ if (err < 0) {
++ printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
++ return err;
++- }
++- /* allow transfer when at least period_size samples can be processed */
++- err = snd_pcm_sw_params_set_avail_min(handle, params, period_size);
++- if (err < 0) {
++- printf("Unable to set avail min for playback: %s\n", snd_strerror(err));
++- return err;
++- }
+++ }
++ /* align all transfers to 1 samples */
++ err = snd_pcm_sw_params_set_xfer_align(handle, params, 1);
++ if (err < 0) {
++@@ -190,7 +203,7 @@
++ rate = config->speed;
++
++ if ( bitdepth == 0 )
++- config->precision = bitdepth = 32;
+++ config->precision = bitdepth = 16;
++
++ switch (bitdepth)
++ {
++@@ -241,7 +254,7 @@
++ return -1;
++ }
++
++- buf = malloc(buffer_size);
+++ buf = malloc(buffer_size * sample_size);
++ if (buf == NULL) {
++ audio_error="unable to allocate output buffer table";
++ return -1;
++@@ -279,7 +292,7 @@
++ int play(struct audio_play *play)
++ {
++ int err, len;
++- char *ptr;
+++ unsigned char *ptr;
++
++ ptr = buf;
++ len = play->nsamples;
diff --git a/patches/buildroot/2010.02/102-rsync-updates_source_repository_and_bump_version.patch b/patches/buildroot/2010.02/102-rsync-updates_source_repository_and_bump_version.patch
new file mode 100644
index 0000000..4d8fda9
--- /dev/null
+++ b/patches/buildroot/2010.02/102-rsync-updates_source_repository_and_bump_version.patch
@@ -0,0 +1,32 @@
+From 0296eef9774b080a5ddd960f9bc7694c4b590f7b Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Thu, 11 Feb 2010 13:40:40 +0100
+Subject: [PATCH] Updates rsync source repository
+
+rsync source repository has moved (?).
+Bump version while we are at it.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ package/rsync/rsync.mk | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
+index 1ed6812..e1bb28e 100644
+--- a/package/rsync/rsync.mk
++++ b/package/rsync/rsync.mk
+@@ -4,9 +4,9 @@
+ #
+ #############################################################
+
+-RSYNC_VERSION:=3.0.6
++RSYNC_VERSION:=3.0.7
+ RSYNC_SOURCE:=rsync-$(RSYNC_VERSION).tar.gz
+-RSYNC_SITE:=http://rsync.samba.org/ftp/rsync
++RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/src
+ RSYNC_INSTALL_STAGING:=NO
+ RSYNC_INSTALL_TARGET:=YES
+ RSYNC_CONF_OPT=$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
+--
+1.6.0.4
+
diff --git a/patches/buildroot/2010.02/103-alsamixer-now_requires_libform_libmenu_and_libpanel_from_ncurses.patch b/patches/buildroot/2010.02/103-alsamixer-now_requires_libform_libmenu_and_libpanel_from_ncurses.patch
new file mode 100644
index 0000000..54f3b6d
--- /dev/null
+++ b/patches/buildroot/2010.02/103-alsamixer-now_requires_libform_libmenu_and_libpanel_from_ncurses.patch
@@ -0,0 +1,36 @@
+From 4ad3a1b57fb94d8fd8cf5a6e215afbcc16f50c23 Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Thu, 11 Feb 2010 17:27:06 +0100
+Subject: [PATCH] alsamixer now seems to need libform, libmenu & libpanel (from ncurses)
+
+Without this patch alsamixer complains about missing libs and
+ldd says:
+ libform.so.5 => not found
+ libmenu.so.5 => not found
+ libpanel.so.5 => not found
+ libncurses.so.5 => /usr/lib/libncurses.so.5 (0x4000e000)
+ libasound.so.2 => /usr/lib/libasound.so.2 (0x40056000)
+ ... <cut>
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ package/multimedia/alsa-utils/Config.in | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/package/multimedia/alsa-utils/Config.in b/package/multimedia/alsa-utils/Config.in
+index 54ab3f9..04057f4 100644
+--- a/package/multimedia/alsa-utils/Config.in
++++ b/package/multimedia/alsa-utils/Config.in
+@@ -24,6 +24,9 @@ config BR2_PACKAGE_ALSA_UTILS_ALSACTL
+ config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
+ bool "alsamixer"
+ select BR2_PACKAGE_NCURSES
++ select BR2_PACKAGE_NCURSES_TARGET_PANEL
++ select BR2_PACKAGE_NCURSES_TARGET_FORM
++ select BR2_PACKAGE_NCURSES_TARGET_MENU
+ default y
+
+ config BR2_PACKAGE_ALSA_UTILS_AMIDI
+--
+1.6.0.4
+
diff --git a/patches/buildroot/2010.02/cleanup_buildroot.sh b/patches/buildroot/2010.02/cleanup_buildroot.sh
index e05712e..37b5a56 100755
--- a/patches/buildroot/2010.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.02/cleanup_buildroot.sh
@@ -14,3 +14,4 @@ rm -f buildroot/package/multimedia/libsndfile/libsndfile-1.0.*-srconly.patch
rm -rf buildroot/package/multimedia/flite/
rm -rf buildroot/package/libcurl/
rm -f buildroot/package/multimedia/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
+rm -f buildroot/package/multimedia/madplay/madplay-audio-alsa.patch
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index fa42d5b..692a240 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -13,4 +13,4 @@ rm -rf buildroot/package/uucp/
rm -f buildroot/package/audio/libsndfile/libsndfile-1.0.*-srconly.patch
rm -rf buildroot/package/audio/flite/
rm -rf buildroot/package/libcurl/
-
+rm -f buildroot/package/audio/madplay/madplay-audio-alsa.patch
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 3bea317..93f6da2 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -56,7 +56,7 @@ if [ "$answer" == "Buildroot" ]; then
QUILT_TARGET_NAME="Buildroot"
QUILT_MAKEFILE_TARGET="buildroot-unpacked"
QUILT_TARGET_DIR=$ARMADEUS_BUILDROOT_DIR
- QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/buildroot
+ QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_PATCH_DIR
elif [ "$answer" == "U-Boot" ]; then
QUILT_TARGET_NAME="U-Boot"
QUILT_MAKEFILE_TARGET="u-boot-src-unpacked"
hooks/post-receive
--
armadeus
|
