From 29d6678fd546377459ef75cf54abeef5b969b5cf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 Aug 2010 15:14:24 +0100 Subject: Major layout change to the packages directory Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie --- meta/recipes-multimedia/alsa/alsa-fpu.inc | 6 ++ .../alsa-lib-1.0.23/fix-tstamp-declaration.patch | 19 ++++++ .../alsa/alsa-lib-1.0.23/unbreak_plugindir.patch | 12 ++++ meta/recipes-multimedia/alsa/alsa-lib_1.0.23.bb | 40 +++++++++++++ meta/recipes-multimedia/alsa/alsa-oss_1.0.17.bb | 12 ++++ meta/recipes-multimedia/alsa/alsa-tools_1.0.20.bb | 10 ++++ .../alsa/alsa-utils-1.0.23/ncursesfix.patch | 42 ++++++++++++++ meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb | 67 ++++++++++++++++++++++ 8 files changed, 208 insertions(+) create mode 100644 meta/recipes-multimedia/alsa/alsa-fpu.inc create mode 100644 meta/recipes-multimedia/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-lib_1.0.23.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-oss_1.0.17.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.0.20.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb (limited to 'meta/recipes-multimedia/alsa') diff --git a/meta/recipes-multimedia/alsa/alsa-fpu.inc b/meta/recipes-multimedia/alsa/alsa-fpu.inc new file mode 100644 index 0000000000..ebd3493e6c --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-fpu.inc @@ -0,0 +1,6 @@ + +def get_alsa_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--with-softfloat" + return "" + diff --git a/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch b/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch new file mode 100644 index 0000000000..9016b348de --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/fix-tstamp-declaration.patch @@ -0,0 +1,19 @@ +# Author: Michael Lauer +# Date: Thu Jan 18 00:27:21 2007 +0000 +# alsa-lib: fix "error: field 'tstamp' has incomplete type" when including alsa headers with strict compilation options +# +# Acquired from OpenEmbedded + +Index: alsa-lib-1.0.13/include/global.h +=================================================================== +--- alsa-lib-1.0.13.orig/include/global.h ++++ alsa-lib-1.0.13/include/global.h +@@ -29,6 +29,8 @@ + #define __ALSA_GLOBAL_H_ + + /* for timeval and timespec */ ++#define __need_timeval ++#define __need_timespec + #include + + #ifdef __cplusplus diff --git a/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch b/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch new file mode 100644 index 0000000000..7d13166809 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib-1.0.23/unbreak_plugindir.patch @@ -0,0 +1,12 @@ +diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in +--- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500 ++++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500 +@@ -93,7 +93,7 @@ + esac + plugindir="$dir/$PACKAGE" + fi +-AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules]) ++AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules]) + ALSA_PLUGIN_DIR="$plugindir" + AC_SUBST(ALSA_PLUGIN_DIR) + diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.23.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.23.bb new file mode 100644 index 0000000000..b0a2a305c0 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.23.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "Alsa sound library" +HOMEPAGE = "http://www.alsa-project.org" +BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" +SECTION = "libs/multimedia" +LICENSE = "LGPLv2.1 & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ + file://src/socket.c;beginline=1;endline=26;md5=11ff89a8a7a4a690a5c78effe8159545" + +# configure.in sets -D__arm__ on the command line for any arm system +# (not just those with the ARM instruction set), this should be removed, +# (or replaced by a permitted #define). +#FIXME: remove the following +ARM_INSTRUCTION_SET = "arm" + +PR = "r0" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ + file://fix-tstamp-declaration.patch;patch=1" + +inherit autotools pkgconfig + +require alsa-fpu.inc +EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " + +EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" + +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" +FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" +FILES_libasound = "${libdir}/libasound.so.*" +FILES_alsa-server = "${bindir}/*" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base = "\ +${datadir}/alsa/alsa.conf \ +${datadir}/alsa/cards/aliases.conf \ +${datadir}/alsa/pcm/default.conf \ +${datadir}/alsa/pcm/dmix.conf \ +${datadir}/alsa/pcm/dsnoop.conf" + +RDEPENDS_libasound = "alsa-conf-base" diff --git a/meta/recipes-multimedia/alsa/alsa-oss_1.0.17.bb b/meta/recipes-multimedia/alsa/alsa-oss_1.0.17.bb new file mode 100644 index 0000000000..00e00dc62b --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-oss_1.0.17.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Alsa OSS Compatibility Package" +SECTION = "libs/multimedia" +LICENSE = "GPL" +DEPENDS = "alsa-lib" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2" + +inherit autotools + +do_configure_prepend () { + touch NEWS README AUTHORS ChangeLog +} diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.20.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.20.bb new file mode 100644 index 0000000000..789b68e438 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.20.bb @@ -0,0 +1,10 @@ +BROKEN = "1" + +DESCRIPTION = "Alsa Tools" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "alsa-lib ncurses" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2" + +inherit autotools diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch new file mode 100644 index 0000000000..0009c1afe9 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch @@ -0,0 +1,42 @@ +# alsa-utils: Fix ncurses build failures +# Richard Purdie +# Rebased to 1.0.23, Dongxiao Xu + +diff -ruN alsa-utils-1.0.23-orig/configure.in alsa-utils-1.0.23/configure.in +--- alsa-utils-1.0.23-orig/configure.in 2010-04-16 19:19:12.000000000 +0800 ++++ alsa-utils-1.0.23/configure.in 2010-06-22 15:22:06.731202478 +0800 +@@ -109,34 +109,16 @@ + NCURSESLIBSUFFIX="" + CURSES_NLS="no" + if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then +- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) +- if test "$ncursesw5_config" = "yes"; then +- CURSESINC="" +- CURSESLIB=`ncursesw5-config --libs` +- CURSESLIBDIR=`ncursesw5-config --libdir` +- CURSES_CFLAGS=`ncursesw5-config --cflags` +- curseslib="ncursesw" +- else + AC_CHECK_LIB(ncursesw, initscr, + [ CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) +- fi + if test -n "$CURSESINC"; then + NCURSESLIBSUFFIX="w" + CURSES_NLS="yes" + fi + fi + if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then +- AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) +- if test "$ncurses5_config" = "yes"; then +- CURSESINC="" +- CURSESLIB=`ncurses5-config --libs` +- CURSESLIBDIR=`ncurses5-config --libdir` +- CURSES_CFLAGS=`ncurses5-config --cflags` +- curseslib="ncurses" +- else + AC_CHECK_LIB(ncurses, initscr, + [ CURSESINC=''; CURSESLIB='-lncurses'; curseslib="ncurses"]) +- fi + fi + if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then + AC_CHECK_LIB(curses, initscr, diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb new file mode 100644 index 0000000000..7b30c0d4b0 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb @@ -0,0 +1,67 @@ +DESCRIPTION = "ALSA Utilities" +HOMEPAGE = "http://www.alsa-project.org" +BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" +SECTION = "console/utils" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ + file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" +DEPENDS = "alsa-lib ncurses gettext" +PR = "r0" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ + file://ncursesfix.patch;patch=1 " + +# lazy hack. needs proper fixing in gettext.m4, see +# http://bugs.openembedded.org/show_bug.cgi?id=2348 +# please close bug and remove this comment when properly fixed +# +EXTRA_OECONF = "--disable-xmlto" +EXTRA_OECONF_linux-uclibc = "--disable-nls" +EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls" + +inherit autotools + +# This are all packages that we need to make. Also, the now empty alsa-utils +# ipk depend on them. + +PACKAGES += "\ + alsa-utils-alsamixer \ + alsa-utils-midi \ + alsa-utils-aplay \ + alsa-utils-amixer \ + alsa-utils-aconnect \ + alsa-utils-iecset \ + alsa-utils-speakertest \ + alsa-utils-aseqnet \ + alsa-utils-aseqdump \ + alsa-utils-alsaconf \ + alsa-utils-alsactl " + +# We omit alsaconf, because +# a) this is a bash script +# b) it creates config files not suitable for OE-based distros + +FILES_${PN} = "" +FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" +FILES_alsa-utils-amixer = "${bindir}/amixer" +FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" +FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/" +FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" +FILES_alsa-utils-aconnect = "${bindir}/aconnect" +FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" +FILES_alsa-utils-iecset = "${bindir}/iecset" +FILES_alsa-utils-alsactl = "${sbindir}/alsactl" +FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" +FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" + +DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" +DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility" +DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" +DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" +DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" +DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" +DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" + +ALLOW_EMPTY_alsa-utils = "1" -- cgit v1.2.3-54-g00ecf