diff options
author | Andraž 'ruskie' Levstik | 2008-07-15 11:01:02 +0200 |
---|---|---|
committer | Andraž 'ruskie' Levstik | 2008-07-15 11:01:02 +0200 |
commit | 7eed9228a328515cd9d0a3d83783cb53f41ad648 (patch) | |
tree | 1626b0cdeba04329101bd58ec665e53371ce6ea1 /audio-drivers/oss | |
parent | b3bf949689e7ba4527590a4b7fecb0de4085ecf1 (diff) |
oss: finnaly the new GPLed OSS drivers as a spell
Diffstat (limited to 'audio-drivers/oss')
-rwxr-xr-x | audio-drivers/oss/BUILD | 6 | ||||
-rwxr-xr-x | audio-drivers/oss/DEPENDS | 1 | ||||
-rwxr-xr-x | audio-drivers/oss/DETAILS | 41 | ||||
-rwxr-xr-x | audio-drivers/oss/DOWNLOAD | 38 | ||||
-rwxr-xr-x | audio-drivers/oss/FINAL | 1 | ||||
-rw-r--r-- | audio-drivers/oss/HISTORY | 8 | ||||
-rwxr-xr-x | audio-drivers/oss/INSTALL | 5 | ||||
-rwxr-xr-x | audio-drivers/oss/PREPARE | 7 | ||||
-rwxr-xr-x | audio-drivers/oss/PRE_BUILD | 10 | ||||
-rw-r--r-- | audio-drivers/oss/buildfix.diff | 125 | ||||
-rw-r--r-- | audio-drivers/oss/nohal.diff | 15 | ||||
-rw-r--r-- | audio-drivers/oss/nosoundon.diff | 8 |
12 files changed, 265 insertions, 0 deletions
diff --git a/audio-drivers/oss/BUILD b/audio-drivers/oss/BUILD new file mode 100755 index 0000000000..df65342803 --- /dev/null +++ b/audio-drivers/oss/BUILD @@ -0,0 +1,6 @@ +cd $SOURCE_DIRECTORY.bld && +# NEEDED else it fails badly +unset CFLAGS CXXFLAGS LDFLAGS && +$SOURCE_DIRECTORY/configure && +make + diff --git a/audio-drivers/oss/DEPENDS b/audio-drivers/oss/DEPENDS new file mode 100755 index 0000000000..3c6c646002 --- /dev/null +++ b/audio-drivers/oss/DEPENDS @@ -0,0 +1 @@ +optional_depends gtk+2 "" "" "Enable ossxmix app?" diff --git a/audio-drivers/oss/DETAILS b/audio-drivers/oss/DETAILS new file mode 100755 index 0000000000..3d691719a2 --- /dev/null +++ b/audio-drivers/oss/DETAILS @@ -0,0 +1,41 @@ + SPELL=oss +if [[ $OSS_BRANCH == scm ]]; then +if [[ $OSS_SCM_AUTO == y ]]; then + VERSION=$(date +%Y%m%d) +else + VERSION="4.1-scm" +fi + SOURCE=$SPELL-$VERSION.tar.bz2 + SOURCE_URL[0]=hg_http://mercurial.opensound.com/:$SPELL-scm + SOURCE_IGNORE=volatile +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm" +elif [[ $OSS_BRANCH == test ]]; then + VERSION=v4.1-build080705 + SOURCE=$SPELL-$VERSION-src-gpl.tar.bz2 + SOURCE_URL[0]=http://www.4front-tech.com/developer/sources/testing/gpl/$SOURCE + SOURCE_HASH=sha512:8b834738719238726d6194ce21ee6e8c541fe08bd44117806ba658a72d4893ea09f0bc907b5f16b12c281fce4ea413418540377fe7dc5c7cb5506ebdf691f61c +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl" +else + VERSION=v4.0-build1016 + SOURCE=$SPELL-$VERSION-src-gpl.tar.bz2 + SOURCE_URL[0]=http://www.4front-tech.com/developer/sources/stable/gpl/$SOURCE + SOURCE_HASH=sha512:c4511b090a8cdd7a4979dc4921eafa71aa7ef2bbd0baa50aab3c442d30cf5ee685c989b2101c36bc93e3ff302d9ea14a2e23e468e5552641d5423d93b6bbe1b7 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl" +fi + WEB_SITE="http://www.opensound.com " + LICENSE[0]=GPL + LICENSE[1]=CDDL + LICENSE[2]=BSD + ENTERED=20080715 + SHORT="Audio drivers for most popular sound cards." +cat << EOF +OSS provides sound card drivers for most popular sound cards under Linux, *BSD, +Solaris, UnixWare, OpenServer, AIX, HPUX, LynxOS, VxWorks, and Tru64. These +drivers support digital audio, MIDI, synthesizers, and mixers found on +sound cards. These sound drivers comply with the Open Sound System API +specification. OSS provides a user-friendly GUI which makes the installation +of sound drivers and configuration of sound cards very simple. It supports +over 200 brand name sound cards, and provides automatic sound card detection, +Plug-n-Play support, support for PCI audio soundcards, and support for full +duplex audio. +EOF diff --git a/audio-drivers/oss/DOWNLOAD b/audio-drivers/oss/DOWNLOAD new file mode 100755 index 0000000000..fb763f9327 --- /dev/null +++ b/audio-drivers/oss/DOWNLOAD @@ -0,0 +1,38 @@ +function url_hg_crack() { + + URL=$(url_strip_prefix "$1" hg_http) + HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#") + local HG_MODULE_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#") + HG_MODULE=$(echo $HG_MODULE_TAG | cut -d : -f2) + local HG_TAGNAME=$(echo $HG_MODULE_TAG | cut -d : -f3) + HG_TAG=${HG_TAGNAME:-tip} + +} +if [[ $OSS_BRANCH == scm ]]; then +url_hg_crack ${SOURCE_URL} +message "${MESSAGE_COLOR}Starting Mercurial checkout of" \ + "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" && +if [[ -f $SOURCE_CACHE/${SOURCE} ]] +then + message "${MESSAGE_COLOR}Previous source found unpacking...${DEFAULT_COLOR}" && + tar -jxf $SOURCE_CACHE/${SOURCE} && + cd ${HG_MODULE} && + message "${MESSAGE_COLOR}Running Mercurial update...${DEFAULT_COLOR}" && + hg pull -u -r ${HG_TAG} + cd .. + message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}" +else + message "${MESSAGE_COLOR}Running initial Mercurial clone...${DEFAULT_COLOR}" && + hg clone -r${HG_TAG} "http://${HG_ROOT}" ${HG_MODULE} + message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}" +fi && +message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" && +tar -jcf \ + ${SOURCE} \ + ${HG_MODULE} && +cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE} && +rm ${SOURCE} && +message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}" +else + acquire_src '' +fi diff --git a/audio-drivers/oss/FINAL b/audio-drivers/oss/FINAL new file mode 100755 index 0000000000..3920d0c58a --- /dev/null +++ b/audio-drivers/oss/FINAL @@ -0,0 +1 @@ +rm_source_dir $SOURCE_DIRECTORY.bld diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY new file mode 100644 index 0000000000..aff81e7b75 --- /dev/null +++ b/audio-drivers/oss/HISTORY @@ -0,0 +1,8 @@ +2008-07-15 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> + * PREPARE, DEPENDS, PRE_BUILD: spell created + * BUILD, INSTALL, DETAILS, FINAL: spell created + * DOWNLOAD: improved mercurial checkout + * nohal.diff: copy hal settings manualy in scm + * nosoundon.diff: don't try to start it + * buildfix.diff: bug fixes + diff --git a/audio-drivers/oss/INSTALL b/audio-drivers/oss/INSTALL new file mode 100755 index 0000000000..aa86b24229 --- /dev/null +++ b/audio-drivers/oss/INSTALL @@ -0,0 +1,5 @@ +cd $SOURCE_DIRECTORY.bld && +cp -a setup/Linux/oss/scripts/90-oss_usb-create-device.fdi \ + $INSTALL_ROOT/usr/share/hal/fdi/policy/ && +rm -rf prototype/usr/share/hal && +make install diff --git a/audio-drivers/oss/PREPARE b/audio-drivers/oss/PREPARE new file mode 100755 index 0000000000..2cbed32ed0 --- /dev/null +++ b/audio-drivers/oss/PREPARE @@ -0,0 +1,7 @@ +config_query_list OSS_BRANCH "Which branch do you want?" \ + stable test scm && +if [[ $OSS_BRANCH == scm ]]; then + config_query OSS_SCM_AUTO \ + "Automaticaly update the spell on sorcery queue/system-update?" \ + "n" +fi diff --git a/audio-drivers/oss/PRE_BUILD b/audio-drivers/oss/PRE_BUILD new file mode 100755 index 0000000000..82dd13ea14 --- /dev/null +++ b/audio-drivers/oss/PRE_BUILD @@ -0,0 +1,10 @@ +default_pre_build && +mk_source_dir $SOURCE_DIRECTORY.bld && +cd $SOURCE_DIRECTORY && +if [[ $OSS_BRANCH == stable ]]; then +patch -p1 < $SPELL_DIRECTORY/buildfix.diff +fi && +patch -p0 < $SPELL_DIRECTORY/nosoundon.diff && +if [[ $OSS_BRANCH == scm ]]; then +patch -p0 < $SPELL_DIRECTORY/nohal.diff +fi diff --git a/audio-drivers/oss/buildfix.diff b/audio-drivers/oss/buildfix.diff new file mode 100644 index 0000000000..4d9f533b26 --- /dev/null +++ b/audio-drivers/oss/buildfix.diff @@ -0,0 +1,125 @@ + +# HG changeset patch +# User Hannu Savolainen <hannu@opensound.com> +# Date 1202257182 -7200 +# Node ID bc0a06e2e9bde5a503beb02d820125cf3ac46497 +# Parent 1cb776eaa147ecdcc964299686b3a16ffebbec39 +Changes to make libsalsa compatible with latest ALSA versions. + +--- a/lib/libsalsa/seq.c Tue Feb 05 14:42:35 2008 +0200 ++++ b/lib/libsalsa/seq.c Wed Feb 06 02:19:42 2008 +0200 +@@ -1695,13 +1695,8 @@ const unsigned int snd_seq_event_types[2 + FIXED_EV (SND_SEQ_EVFLG_MESSAGE), + [SND_SEQ_EVENT_PORT_SUBSCRIBED...SND_SEQ_EVENT_PORT_UNSUBSCRIBED] = + FIXED_EV (SND_SEQ_EVFLG_CONNECTION), +- [SND_SEQ_EVENT_SAMPLE...SND_SEQ_EVENT_SAMPLE_PRIVATE1] = +- FIXED_EV (SND_SEQ_EVFLG_SAMPLE), + [SND_SEQ_EVENT_USR0...SND_SEQ_EVENT_USR9] = + FIXED_EV (SND_SEQ_EVFLG_RAW) | FIXED_EV (SND_SEQ_EVFLG_USERS), +- [SND_SEQ_EVENT_INSTR_BEGIN...SND_SEQ_EVENT_INSTR_CHANGE] = +- _SND_SEQ_TYPE (SND_SEQ_EVFLG_INSTR) | +- _SND_SEQ_TYPE (SND_SEQ_EVFLG_VARUSR), + [SND_SEQ_EVENT_SYSEX...SND_SEQ_EVENT_BOUNCE] = + _SND_SEQ_TYPE (SND_SEQ_EVFLG_VARIABLE), + [SND_SEQ_EVENT_USR_VAR0...SND_SEQ_EVENT_USR_VAR4] = +--- a/lib/libsalsa/seq_output.c Tue Feb 05 14:42:35 2008 +0200 ++++ b/lib/libsalsa/seq_output.c Wed Feb 06 02:19:42 2008 +0200 +@@ -254,33 +254,6 @@ convert_event (snd_seq_t * seq, snd_seq_ + case SND_SEQ_EVENT_PORT_UNSUBSCRIBED: + dbg_printf ("\tSND_SEQ_EVENT_PORT_UNSUBSCRIBED\n"); + break; +- case SND_SEQ_EVENT_SAMPLE: +- dbg_printf ("\tSND_SEQ_EVENT_SAMPLE\n"); +- break; +- case SND_SEQ_EVENT_SAMPLE_CLUSTER: +- dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_CLUSTER\n"); +- break; +- case SND_SEQ_EVENT_SAMPLE_START: +- dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_START\n"); +- break; +- case SND_SEQ_EVENT_SAMPLE_STOP: +- dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_STOP\n"); +- break; +- case SND_SEQ_EVENT_SAMPLE_FREQ: +- dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_FREQ\n"); +- break; +- case SND_SEQ_EVENT_SAMPLE_VOLUME: +- dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_VOLUME\n"); +- break; +- case SND_SEQ_EVENT_SAMPLE_LOOP: +- dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_LOOP\n"); +- break; +- case SND_SEQ_EVENT_SAMPLE_POSITION: +- dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_POSITION\n"); +- break; +- case SND_SEQ_EVENT_SAMPLE_PRIVATE1: +- dbg_printf ("\tSND_SEQ_EVENT_SAMPLE_PRIVATE1\n"); +- break; + case SND_SEQ_EVENT_USR0: + dbg_printf ("\tSND_SEQ_EVENT_USR0\n"); + break; +@@ -311,63 +284,6 @@ convert_event (snd_seq_t * seq, snd_seq_ + case SND_SEQ_EVENT_USR9: + dbg_printf ("\tSND_SEQ_EVENT_USR9\n"); + break; +- case SND_SEQ_EVENT_INSTR_BEGIN: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_BEGIN\n"); +- break; +- case SND_SEQ_EVENT_INSTR_END: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_END\n"); +- break; +- case SND_SEQ_EVENT_INSTR_INFO: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_INFO\n"); +- break; +- case SND_SEQ_EVENT_INSTR_INFO_RESULT: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_INFO_RESULT\n"); +- break; +- case SND_SEQ_EVENT_INSTR_FINFO: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_FINFO\n"); +- break; +- case SND_SEQ_EVENT_INSTR_FINFO_RESULT: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_FINFO_RESULT\n"); +- break; +- case SND_SEQ_EVENT_INSTR_RESET: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_RESET\n"); +- break; +- case SND_SEQ_EVENT_INSTR_STATUS: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_STATUS\n"); +- break; +- case SND_SEQ_EVENT_INSTR_STATUS_RESULT: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_STATUS_RESULT\n"); +- break; +- case SND_SEQ_EVENT_INSTR_PUT: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_PUT\n"); +- break; +- case SND_SEQ_EVENT_INSTR_GET: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_GET\n"); +- break; +- case SND_SEQ_EVENT_INSTR_GET_RESULT: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_GET_RESULT\n"); +- break; +- case SND_SEQ_EVENT_INSTR_FREE: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_FREE\n"); +- break; +- case SND_SEQ_EVENT_INSTR_LIST: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_LIST\n"); +- break; +- case SND_SEQ_EVENT_INSTR_LIST_RESULT: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_LIST_RESULT\n"); +- break; +- case SND_SEQ_EVENT_INSTR_CLUSTER: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_CLUSTER\n"); +- break; +- case SND_SEQ_EVENT_INSTR_CLUSTER_GET: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_CLUSTER_GET\n"); +- break; +- case SND_SEQ_EVENT_INSTR_CLUSTER_RESULT: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_CLUSTER_RESULT\n"); +- break; +- case SND_SEQ_EVENT_INSTR_CHANGE: +- dbg_printf ("\tSND_SEQ_EVENT_INSTR_CHANGE\n"); +- break; + case SND_SEQ_EVENT_SYSEX: + dbg_printf ("\tSND_SEQ_EVENT_SYSEX\n"); + break; + diff --git a/audio-drivers/oss/nohal.diff b/audio-drivers/oss/nohal.diff new file mode 100644 index 0000000000..286cd043e7 --- /dev/null +++ b/audio-drivers/oss/nohal.diff @@ -0,0 +1,15 @@ +--- setup/Linux/build.sh.orig 2008-07-15 10:39:12.000000000 +0200 ++++ setup/Linux/build.sh 2008-07-15 10:39:24.000000000 +0200 +@@ -187,12 +187,6 @@ + $SRCDIR/setup/txt2man -t "ossdetect" -v "User Commands" -s 8 os_cmd/Linux/ossdetect/ossdetect.man|gzip -9 > prototype/usr/share/man/man8/ossdetect.8.gz + echo done ossdetect + +-# Hal 0.50+ hotplug +-mkdir -p prototype/usr/lib/hal/scripts +-ln -s /usr/lib/oss/scripts/oss_usb-create-devices prototype/usr/lib/hal/scripts/ +-mkdir -p prototype/usr/share/hal/fdi/policy/20thirdparty/ +-ln -s /usr/lib/oss/scripts/90-oss_usb-create-device.fdi prototype/usr/share/hal/fdi/policy/20thirdparty/ +- + # Licensing stuff + if test -f $SRCDIR/4front-private/osslic.c + then diff --git a/audio-drivers/oss/nosoundon.diff b/audio-drivers/oss/nosoundon.diff new file mode 100644 index 0000000000..3305c24e60 --- /dev/null +++ b/audio-drivers/oss/nosoundon.diff @@ -0,0 +1,8 @@ +--- setup/Linux/make.local.orig 2008-07-15 09:26:52.000000000 +0200 ++++ setup/Linux/make.local 2008-07-15 09:27:12.000000000 +0200 +@@ -15,5 +15,3 @@ + + install: copy + cd /usr/lib/oss/build && sh install.sh +- sync +- soundoff && sync && soundon |