From 146db8079086f1fb5c366a87beafdfb1754a5c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 12 Oct 2008 14:17:44 +0000 Subject: [PATCH] OpenAL 1.5.304. I realize there is `openalSoft' as well in Nixpkgs, but I think it's really OpenAL, and the `openalSoft' directory should be removed. svn path=/nixpkgs/trunk/; revision=13049 --- pkgs/development/libraries/openal/builder.sh | 8 -- pkgs/development/libraries/openal/default.nix | 45 ++++++--- .../libraries/openal/makefile.patch | 92 ------------------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 35 insertions(+), 112 deletions(-) delete mode 100644 pkgs/development/libraries/openal/builder.sh delete mode 100644 pkgs/development/libraries/openal/makefile.patch diff --git a/pkgs/development/libraries/openal/builder.sh b/pkgs/development/libraries/openal/builder.sh deleted file mode 100644 index c870497eb6ca..000000000000 --- a/pkgs/development/libraries/openal/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -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 index 887a668b4e6b..170cb5210479 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -1,15 +1,38 @@ -{stdenv, fetchurl, alsaLib, autoconf, automake, libtool}: +{ stdenv, fetchurl, alsaLib, cmake }: + +let version = "1.5.304"; in +stdenv.mkDerivation rec { + name = "openal-${version}"; -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"; + url = "http://connect.creativelabs.com/openal/Downloads/openal-soft-${version}.tar.bz2"; + sha256 = "0k26ycprmpynvfkqkqsbaahl6avn033z2c03sp21vhpqbyms50ks"; + }; + + # FIXME: The `$out/bin/openal-info' executable doesn't have the + # right RPATH, so it can't find `libopenal.so'. This must be fixed + # by tweaking the CMake crap. + buildInputs = [ cmake alsaLib ]; + + meta = { + description = "OpenAL, a cross-platform 3D audio API"; + + longDescription = '' + OpenAL is a cross-platform 3D audio API appropriate for use with + gaming applications and many other types of audio applications. + + The library models a collection of audio sources moving in a 3D + space that are heard by a single listener somewhere in that + space. The basic OpenAL objects are a Listener, a Source, and a + Buffer. There can be a large number of Buffers, which contain + audio data. Each buffer can be attached to one or more Sources, + which represent points in 3D space which are emitting audio. + There is always one Listener object (per audio context), which + represents the position where the sources are heard -- rendering + is done from the perspective of the Listener. + ''; + + homepage = http://www.openal.org/; + license = "GPLv2+"; }; - # 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 deleted file mode 100644 index a7feafeed95d..000000000000 --- a/pkgs/development/libraries/openal/makefile.patch +++ /dev/null @@ -1,92 +0,0 @@ -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 - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97a12d1078c4..9a68021091e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3417,7 +3417,7 @@ let }; openal = import ../development/libraries/openal { - inherit fetchurl stdenv alsaLib autoconf automake libtool; + inherit fetchurl stdenv cmake alsaLib; }; # added because I hope that it has been easier to compile on x86 (for blender)