alsa{Lib,Plugins}: update to 1.28.0
Dropped unrecognized option, patch no longer applying, fixed licenses.
This commit is contained in:
parent
8aa892489e
commit
1a1c83fa77
|
@ -1,14 +1,14 @@
|
|||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "alsa-lib-1.0.27.2";
|
||||
name = "alsa-lib-1.0.28";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"
|
||||
"http://alsa.cybermirror.org/lib/${name}.tar.bz2"
|
||||
];
|
||||
sha256 = "068d8c92122hwca5jzhrjp4a131995adlb1d79zgrm7gwy9x63k9";
|
||||
sha256 = "0vaafg5q1q1mqcsgin5v7xlmngl3cnbmg5a9xxw0xcz1vn2ln1rw";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
|
|||
See http://thread.gmane.org/gmane.linux.distributions.nixos/3435
|
||||
*/
|
||||
./alsa-plugin-dirs.patch
|
||||
|
||||
/* patch provided by larsc on irc.
|
||||
it may be a compiler problem on mips; without this, alsa does not build
|
||||
on mips, because lacks some symbols atomic_add/atomic_sub */
|
||||
./mips-atomic.patch
|
||||
];
|
||||
|
||||
# Fix pcm.h file in order to prevent some compilation bugs
|
||||
|
@ -35,15 +30,13 @@ stdenv.mkDerivation rec {
|
|||
sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h
|
||||
'';
|
||||
|
||||
configureFlags = "--disable-xmlto";
|
||||
|
||||
crossAttrs = {
|
||||
patchPhase = ''
|
||||
sed -i s/extern/static/g include/iatomic.h
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.alsa-project.org/;
|
||||
description = "ALSA, the Advanced Linux Sound Architecture libraries";
|
||||
|
||||
|
@ -52,6 +45,7 @@ stdenv.mkDerivation rec {
|
|||
MIDI functionality to the Linux-based operating system.
|
||||
'';
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,39 +0,0 @@
|
|||
diff --git a/include/iatomic.h b/include/iatomic.h
|
||||
index e92dbfd..364bc5c 100644
|
||||
--- a/include/iatomic.h
|
||||
+++ b/include/iatomic.h
|
||||
@@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t;
|
||||
* Atomically adds @i to @v. Note that the guaranteed useful range
|
||||
* of an atomic_t is only 24 bits.
|
||||
*/
|
||||
-extern __inline__ void atomic_add(int i, atomic_t * v)
|
||||
+static __inline__ void atomic_add(int i, atomic_t * v)
|
||||
{
|
||||
unsigned long temp;
|
||||
|
||||
@@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v)
|
||||
* Atomically subtracts @i from @v. Note that the guaranteed
|
||||
* useful range of an atomic_t is only 24 bits.
|
||||
*/
|
||||
-extern __inline__ void atomic_sub(int i, atomic_t * v)
|
||||
+static __inline__ void atomic_sub(int i, atomic_t * v)
|
||||
{
|
||||
unsigned long temp;
|
||||
|
||||
@@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v)
|
||||
/*
|
||||
* Same as above, but return the result value
|
||||
*/
|
||||
-extern __inline__ int atomic_add_return(int i, atomic_t * v)
|
||||
+static __inline__ int atomic_add_return(int i, atomic_t * v)
|
||||
{
|
||||
unsigned long temp, result;
|
||||
|
||||
@@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v)
|
||||
return result;
|
||||
}
|
||||
|
||||
-extern __inline__ int atomic_sub_return(int i, atomic_t * v)
|
||||
+static __inline__ int atomic_sub_return(int i, atomic_t * v)
|
||||
{
|
||||
unsigned long temp, result;
|
|
@ -1,26 +1,27 @@
|
|||
{ stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "alsa-plugins-1.0.27";
|
||||
name = "alsa-plugins-1.0.28";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2"
|
||||
"http://alsa.cybermirror.org/plugins/${name}.tar.bz2"
|
||||
];
|
||||
sha256 = "0ddbycq4cn9mc8xin0vh1af0zywz2rc2xyrs6qbayyyxq8vhrg8b";
|
||||
sha256 = "081is33afhykb4ysll8s6gh0d6nm1cglslj9ck0disbyl3qqlvs2";
|
||||
};
|
||||
|
||||
# ToDo: a52, etc.?
|
||||
buildInputs =
|
||||
[ pkgconfig alsaLib ]
|
||||
++ stdenv.lib.optional (pulseaudio != null) pulseaudio
|
||||
++ stdenv.lib.optional (jackaudio != null) jackaudio;
|
||||
++ lib.optional (pulseaudio != null) pulseaudio
|
||||
++ lib.optional (jackaudio != null) jackaudio;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Various plugins for ALSA";
|
||||
homepage = http://alsa-project.org/;
|
||||
license = "GPL2.1";
|
||||
maintainers = [lib.maintainers.marcweber];
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [maintainers.marcweber];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue