Skip to contentSkip to conversation

svn commit: trunk/buildroot/package: audio

Buildroot New laird at uclibc.org 4 participants 8 messages Sep 5, 2008 – Sep 6, 2008

lore
Share & tools
lore
#0 lore raw

Author: laird
Date: 2008-09-05 05:06:50 -0700 (Fri, 05 Sep 2008) New Revision: 23330

Log:
audio: Move all audio packages into audio subdir

Moved all audio packages into a subdir called audio. I then created a Config.in and made sure that a audio.mk existed.

Daniel Laird

Added:
trunk/buildroot/package/audio/
trunk/buildroot/package/audio/Config.in
trunk/buildroot/package/audio/alsa-lib/
trunk/buildroot/package/audio/alsa-utils/
trunk/buildroot/package/audio/asterisk/
trunk/buildroot/package/audio/audio.mk
trunk/buildroot/package/audio/aumix/
trunk/buildroot/package/audio/festival/
trunk/buildroot/package/audio/libid3tag/
trunk/buildroot/package/audio/libmad/
trunk/buildroot/package/audio/libogg/
trunk/buildroot/package/audio/libsndfile/
trunk/buildroot/package/audio/libvorbis/
trunk/buildroot/package/audio/madplay/
trunk/buildroot/package/audio/mpg123/
trunk/buildroot/package/audio/speex/

Removed:
trunk/buildroot/package/alsa-lib/
trunk/buildroot/package/alsa-utils/
trunk/buildroot/package/asterisk/
trunk/buildroot/package/aumix/
trunk/buildroot/package/festival/
trunk/buildroot/package/libid3tag/
trunk/buildroot/package/libmad/
trunk/buildroot/package/libogg/
trunk/buildroot/package/libsndfile/
trunk/buildroot/package/libvorbis/
trunk/buildroot/package/madplay/
trunk/buildroot/package/mpg123/
trunk/buildroot/package/speex/

Modified:
trunk/buildroot/package/Config.in

Changeset:
Modified: trunk/buildroot/package/Config.in
===================================================================

buildroot/package/Config.in +2 -21
@@ -285,28 +285,9 @@
 source "package/xfsprogs/Config.in"
 endif
 
-menuconfig BR2_AUDIO_SUPPORT
-	bool "Audio libraries and applications"
-	default y
-	help
-	  Support for audio libraries and applications
+# Audio support
+source "package/audio/Config.in"
 
-if BR2_AUDIO_SUPPORT
-source "package/alsa-lib/Config.in"
-source "package/alsa-utils/Config.in"
-source "package/asterisk/Config.in"
-source "package/aumix/Config.in"
-source "package/libid3tag/Config.in"
-source "package/libmad/Config.in"
-source "package/libogg/Config.in"
-source "package/libsndfile/Config.in"
-source "package/libvorbis/Config.in"
-source "package/madplay/Config.in"
-source "package/mpg123/Config.in"
-source "package/speex/Config.in"
-source "package/festival/Config.in"
-endif
-
 menuconfig BR2_GRAPHIC_SUPPORT
 	bool "Graphic libraries and applications (graphic/text)"
 	default y

Added: trunk/buildroot/package/audio/Config.in
===================================================================

buildroot/package/audio/Config.in +21 -0
@@ -0,0 +1,21 @@
+menuconfig BR2_AUDIO_SUPPORT
+	bool "Audio libraries and applications"
+	default y
+	help
+	  Support for audio libraries and applications
+
+if BR2_AUDIO_SUPPORT
+source "package/audio/alsa-lib/Config.in"
+source "package/audio/alsa-utils/Config.in"
+source "package/audio/asterisk/Config.in"
+source "package/audio/aumix/Config.in"
+source "package/audio/libid3tag/Config.in"
+source "package/audio/libmad/Config.in"
+source "package/audio/libogg/Config.in"
+source "package/audio/libsndfile/Config.in"
+source "package/audio/libvorbis/Config.in"
+source "package/audio/madplay/Config.in"
+source "package/audio/mpg123/Config.in"
+source "package/audio/speex/Config.in"
+source "package/audio/festival/Config.in"
+endif

Copied: trunk/buildroot/package/audio/alsa-lib (from rev 23309, trunk/buildroot/package/alsa-lib)

Copied: trunk/buildroot/package/audio/alsa-utils (from rev 23309, trunk/buildroot/package/alsa-utils)

Copied: trunk/buildroot/package/audio/asterisk (from rev 23309, trunk/buildroot/package/asterisk)

Added: trunk/buildroot/package/audio/audio.mk
===================================================================

buildroot/package/audio/audio.mk +1 -0
@@ -0,0 +1 @@
+include package/audio/*/*.mk

Copied: trunk/buildroot/package/audio/aumix (from rev 23309, trunk/buildroot/package/aumix)

Copied: trunk/buildroot/package/audio/festival (from rev 23309, trunk/buildroot/package/festival)

Copied: trunk/buildroot/package/audio/libid3tag (from rev 23309, trunk/buildroot/package/libid3tag)

Copied: trunk/buildroot/package/audio/libmad (from rev 23309, trunk/buildroot/package/libmad)

Copied: trunk/buildroot/package/audio/libogg (from rev 23309, trunk/buildroot/package/libogg)

Copied: trunk/buildroot/package/audio/libsndfile (from rev 23309, trunk/buildroot/package/libsndfile)

Copied: trunk/buildroot/package/audio/libvorbis (from rev 23309, trunk/buildroot/package/libvorbis)

Copied: trunk/buildroot/package/audio/madplay (from rev 23309, trunk/buildroot/package/madplay)

Copied: trunk/buildroot/package/audio/mpg123 (from rev 23309, trunk/buildroot/package/mpg123)

Copied: trunk/buildroot/package/audio/speex (from rev 23309, trunk/buildroot/package/speex)

#1 lore raw
Quoted 4 lines · On Friday 05 September 2008 14:06:50 laird at uclibc.org wrote:

Author: laird
Date: 2008-09-05 05:06:50 -0700 (Fri, 05 Sep 2008) New Revision: 23330

Quoted 9 lines

Log:
audio: Move all audio packages into audio subdir

Moved all audio packages into a subdir called audio. I then created a Config.in and made sure that a audio.mk existed.

Daniel Laird

Hi,

You missed some paths in package/audio/festival, see the attached patch.
Note: it's my first contribution to buildroot, hopefully the patch etc. are in the correct format.

Regards,

Michel Wilson.

Signature · 10 lines
Michel Wilson     michel at crondor.net
PGP key ID        0xD2CB4B7E

-------------- next part --------------
A non-text attachment was scrubbed...
Name: festival.diff
Type: text/x-patch
Size: 644 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20080906/6282a543/attachment.bin 
#2 lore raw

PATCH 1/1 svn commit: trunk/buildroot/package: audio

Michel Wilson, 06.09.2008:

Quoted 5 lines · On Friday 05 September 2008 14:06:50 laird at uclibc.org wrote:
Quoted 4 lines

Author: laird
Date: 2008-09-05 05:06:50 -0700 (Fri, 05 Sep 2008) New Revision: 23330

Quoted 8 lines
Quoted 6 lines

Log:
audio: Move all audio packages into audio subdir

Moved all audio packages into a subdir called audio. I then created a Config.in and made sure that a audio.mk existed.

You missed some paths in package/audio/festival, see the attached patch.

There were also some old paths in the Config.in, see patch below.

Quoted 2 lines

Note: it's my first contribution to buildroot, hopefully the patch etc. are in the correct format.

It applied. I don't know whether inline patches are preferred over attachments. You'd have the possibility to comment on specific lines then.

Markus

package/audio/festival/Config.in +3 -3
index 209c95b..4141e7a 100644
@@ -8,15 +8,15 @@ help
 if BR2_PACKAGE_FESTIVAL
 
 	menu "speech tools"
-		source "package/festival/speech-tools/Config.in"
+		source "package/audio/festival/speech-tools/Config.in"
 	endmenu
 
 	menu "festival lexicons"
-		source "package/festival/lexicons/Config.in"
+		source "package/audio/festival/lexicons/Config.in"
 	endmenu
 
 	menu "festival voices"
-		source "package/festival/voices/Config.in"
+		source "package/audio/festival/voices/Config.in"
 	endmenu
 
 endif
#3 lore raw

PATCH 1/1 svn commit: trunk/buildroot/package: audio

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Markus" == Markus Heidelberg <[email protected]> writes:

Hi,

Markus> There were also some old paths in the Config.in, see patch below.

Thanks - Committed.

Quoted 2 lines
Quoted 2 lines

Note: it's my first contribution to buildroot, hopefully the patch etc. are in the correct format.

Markus> It applied. I don't know whether inline patches are preferred Markus> over attachments. You'd have the possibility to comment on Markus> specific lines then.

I prefer inline patches - Best of all in a format I can just git-am, but it ofcause requires people to not use a broken mailer.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw
In reply to Michel Wilson
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Michel" == Michel Wilson <[email protected]> writes:

Michel> You missed some paths in package/audio/festival, see the Michel> attached patch. Note: it's my first contribution to Michel> buildroot, hopefully the patch etc. are in the correct Michel> format.

Thanks, it looks fine - And it's committed.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw
In reply to laird at uclibc.org
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"laird" == laird <[email protected]> writes:

laird> Author: laird
laird> Date: 2008-09-05 05:06:50 -0700 (Fri, 05 Sep 2008) laird> New Revision: 23330

laird> Log:
laird> audio: Move all audio packages into audio subdir

Argh, that was pretty broken. Please test your changes and be more careful next time.

Signature · 1 line
Bye, Peter Korsgaard
#6 lore raw

PATCH 1/1 svn commit: trunk/buildroot/package: audio

Peter Korsgaard, 06.09.2008:

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"laird" == laird <[email protected]> writes:

laird> Author: laird
laird> Date: 2008-09-05 05:06:50 -0700 (Fri, 05 Sep 2008) laird> New Revision: 23330

laird> Log:
laird> audio: Move all audio packages into audio subdir

Argh, that was pretty broken. Please test your changes and be more careful next time.

Another one, but this is the last one.

package/audio/speex/speex.mk +1 -1
index 0ffd203..31b0b63 100644
@@ -23,7 +23,7 @@ ifeq ($(BR2_PACKAGE_SPEEX_ARM5E),y)
 	SPEEX_CONF_OPT += --enable-arm5e-asm
 endif
 
-$(eval $(call AUTOTARGETS,package,speex))
+$(eval $(call AUTOTARGETS,package/audio,speex))
 
 $(SPEEX_TARGET_BUILD): $(SPEEX_TARGET_CONFIGURE)
 	$(call MESSAGE,"Building")
#7 lore raw

PATCH 1/1 svn commit: trunk/buildroot/package: audio

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Markus" == Markus Heidelberg <[email protected]> writes:

Hi,

laird> Log:
laird> audio: Move all audio packages into audio subdir

Quoted 3 lines
Quoted 3 lines

Argh, that was pretty broken. Please test your changes and be more careful next time.

Markus> Another one, but this is the last one.

Thanks, committed.

Signature · 1 line
Bye, Peter Korsgaard