diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-01-26 14:01:08 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-01-26 14:01:08 +0000 |
commit | 8544fe567a34224a81f56a99069f87964ad0367a (patch) | |
tree | 539ee9c4632184f39cb8177644f7e27d31d53b2a /pkgs/development/libraries/openal | |
parent | af5e956d238f97cd043f4a77cbf0775583b42515 (diff) | |
download | nixlib-8544fe567a34224a81f56a99069f87964ad0367a.tar nixlib-8544fe567a34224a81f56a99069f87964ad0367a.tar.gz nixlib-8544fe567a34224a81f56a99069f87964ad0367a.tar.bz2 nixlib-8544fe567a34224a81f56a99069f87964ad0367a.tar.lz nixlib-8544fe567a34224a81f56a99069f87964ad0367a.tar.xz nixlib-8544fe567a34224a81f56a99069f87964ad0367a.tar.zst nixlib-8544fe567a34224a81f56a99069f87964ad0367a.zip |
* Added the OpenAL sound library.
* Enabled (optional) 3D support in SDL. svn path=/nixpkgs/trunk/; revision=4594
Diffstat (limited to 'pkgs/development/libraries/openal')
-rw-r--r-- | pkgs/development/libraries/openal/builder.sh | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/openal/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/openal/makefile.patch | 92 |
3 files changed, 115 insertions, 0 deletions
diff --git a/pkgs/development/libraries/openal/builder.sh b/pkgs/development/libraries/openal/builder.sh new file mode 100644 index 000000000000..c870497eb6ca --- /dev/null +++ b/pkgs/development/libraries/openal/builder.sh @@ -0,0 +1,8 @@ +source $stdenv/setup + +preConfigure=preConfigure +preConfigure() { + ./autogen.sh +} + +genericBuild \ No newline at end of file diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix new file mode 100644 index 000000000000..887a668b4e6b --- /dev/null +++ b/pkgs/development/libraries/openal/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, alsaLib, autoconf, automake, libtool}: + +stdenv.mkDerivation { + name = "openal-0.0.8"; + src = fetchurl { + url = http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz; + md5 = "0379bd39fc84454491ef38434a2e6e8d"; + }; + # Note: the autoconf/automake dependency can go once the Automake + # patch is unnecessary. + builder = ./builder.sh; + patches = [./makefile.patch]; + buildInputs = [alsaLib autoconf automake libtool]; + configureFlags = ["--disable-arts" "--enable-alsa"]; +} diff --git a/pkgs/development/libraries/openal/makefile.patch b/pkgs/development/libraries/openal/makefile.patch new file mode 100644 index 000000000000..a7feafeed95d --- /dev/null +++ b/pkgs/development/libraries/openal/makefile.patch @@ -0,0 +1,92 @@ +diff -rc openal-0.0.8-orig/configure.ac openal-0.0.8-new/configure.ac +*** openal-0.0.8-orig/configure.ac 2005-12-15 16:58:45.000000000 +0100 +--- openal-0.0.8-new/configure.ac 2006-01-26 14:28:47.000000000 +0100 +*************** +*** 530,535 **** +--- 530,537 ---- + fi + fi + ++ AM_CONDITIONAL([ARTSENABLED], [test -n "$HAVEARTS"]) ++ + # enable esd sound? + AC_ARG_ENABLE([esd], + [AS_HELP_STRING([--enable-esd], +*************** +*** 558,563 **** +--- 560,567 ---- + fi + fi + ++ AM_CONDITIONAL([ESDENABLED], [test -n "$HAVEESD"]) ++ + # enable wave output? + AC_ARG_ENABLE([waveout], + [AS_HELP_STRING([--enable-waveout], +*************** +*** 614,619 **** +--- 618,625 ---- + esac + fi + ++ AM_CONDITIONAL([SDLENABLED], [test -n "$HAVESDL"]) ++ + # enable directsound backend? + AC_ARG_ENABLE([dsound], + [AS_HELP_STRING([--enable-dsound], +diff -rc openal-0.0.8-orig/src/Makefile.am openal-0.0.8-new/src/Makefile.am +*** openal-0.0.8-orig/src/Makefile.am 2005-12-04 19:16:21.000000000 +0100 +--- openal-0.0.8-new/src/Makefile.am 2006-01-26 14:28:56.000000000 +0100 +*************** +*** 61,79 **** + arch/alsa/alsa.h + endif + + libopenal_la_SOURCES += \ + arch/interface/interface_sound.c \ + arch/interface/interface_sound.h \ + arch/interface/platform.h \ + arch/portable/cpu_caps.c \ +- arch/arts/arts.c \ +- arch/arts/arts.h \ +- arch/esd/esd.c \ +- arch/esd/esd.h \ + arch/null/null.c \ + arch/null/null.h \ +- arch/sdl/sdl.c \ +- arch/sdl/sdl.h \ + arch/waveout/waveout.c \ + arch/waveout/waveout.h + +--- 61,91 ---- + arch/alsa/alsa.h + endif + ++ if SDLENABLED ++ libopenal_la_SOURCES += \ ++ arch/sdl/sdl.c \ ++ arch/sdl/sdl.h ++ endif ++ ++ if ESDENABLED ++ libopenal_la_SOURCES += \ ++ arch/esd/esd.c \ ++ arch/esd/esd.h ++ endif ++ ++ if ARTSENABLED ++ libopenal_la_SOURCES += \ ++ arch/arts/arts.c \ ++ arch/arts/arts.h ++ endif ++ + libopenal_la_SOURCES += \ + arch/interface/interface_sound.c \ + arch/interface/interface_sound.h \ + arch/interface/platform.h \ + arch/portable/cpu_caps.c \ + arch/null/null.c \ + arch/null/null.h \ + arch/waveout/waveout.c \ + arch/waveout/waveout.h + |