Merge #20081: update alsa lib, plugins and utils

This commit is contained in:
Vladimír Čunát 2016-11-17 11:24:17 +01:00
commit 8b565d6478
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
7 changed files with 168 additions and 6 deletions

View file

@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
xorg.xproto
];
patchPhase = "sed -i '41,43d' libbristolaudio/audioEngineJack.c"; # disable alsa/iatomic
configurePhase = "./configure --prefix=$out --enable-jack-default-audio --enable-jack-default-midi";
preInstall = ''
sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol
sed -e "s@\`which brighton\`@$out/bin/brighton@g" -i bin/startBristol

View file

@ -0,0 +1,120 @@
{ stdenv, fetchurl, cmake, ecm, makeQtWrapper
# For `digitaglinktree`
, perl, sqlite
, qtbase
, qtxmlpatterns
, qtsvg
, qtwebkit
, kconfigwidgets
, kcoreaddons
, kdoctools
, kfilemetadata
, knotifications
, knotifyconfig
, ktextwidgets
, kwidgetsaddons
, kxmlgui
, bison
, boost
, eigen
, exiv2
, flex
, jasper
, lcms2
, lensfun
, libgphoto2
, libkipi
, liblqr1
, libusb1
, marble
, mysql
, opencv
, threadweaver
# For panorama and focus stacking
, enblend-enfuse
, hugin
, gnumake
, oxygen
}:
stdenv.mkDerivation rec {
name = "digikam-${version}";
version = "5.1.0";
src = fetchurl {
url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
sha256 = "1w97a5cmg39dgmjgmjwa936gcrmxjms3h2ww61qi1lny84p5x4a7";
};
nativeBuildInputs = [ cmake ecm makeQtWrapper ];
buildInputs = [
qtbase
qtxmlpatterns
qtsvg
qtwebkit
kconfigwidgets
kcoreaddons
kdoctools
kfilemetadata
knotifications
knotifyconfig
ktextwidgets
kwidgetsaddons
kxmlgui
bison
boost
eigen
exiv2
flex
jasper
lcms2
lensfun
libgphoto2
libkipi
liblqr1
libusb1
marble.unwrapped
mysql
opencv
threadweaver
oxygen
];
enableParallelBuilding = true;
cmakeFlags = [
"-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
"-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0"
"-DENABLE_MYSQLSUPPORT=1"
"-DENABLE_INTERNALMYSQL=1"
];
fixupPhase = ''
substituteInPlace $out/bin/digitaglinktree \
--replace "/usr/bin/perl" "${perl}/bin/perl" \
--replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
wrapQtProgram $out/bin/digikam \
--prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin"
wrapQtProgram $out/bin/showfoto
'';
meta = {
description = "Photo Management Program";
license = stdenv.lib.licenses.gpl2;
homepage = http://www.digikam.org;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -0,0 +1,25 @@
diff -ruN a/src/config.py b/src/config.py
--- a/src/config.py 2015-07-31 19:35:37.000000000 +0000
+++ b/src/config.py 2015-08-03 09:23:34.322098081 +0000
@@ -14,6 +14,7 @@
import logging.config
import os
+import stat
import sys
import pkg_resources
@@ -563,6 +564,13 @@
copy2(default, options.filename)
elif path.isfile(other):
copy2(other, options.filename)
+
+ # Inside the nixstore, the reference file is readonly, so is the copy.
+ # Make it writable by the user who just created it.
+ if os.path.exists(options.filename):
+ os.chmod(options.filename,
+ os.stat(options.filename).st_mode | stat.S_IWUSR)
+
global firstrun
firstrun = True

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "alsa-lib-1.1.1";
name = "alsa-lib-1.1.2";
src = fetchurl {
urls = [
"ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"
"http://alsa.cybermirror.org/lib/${name}.tar.bz2"
];
sha256 = "0sa24fy3qf3jg63xxvfb7j8halj1qmdbcak2lyfx8bpd8hqnriwa";
sha256 = "1mk1v2av6ibyydgr6f2mxrwy7clgnf0c68s9y2zvh1ibi7csr3fk";
};
patches = [

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:
stdenv.mkDerivation rec {
name = "alsa-plugins-1.1.0";
name = "alsa-plugins-1.1.1";
src = fetchurl {
urls = [
"ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2"
"http://alsa.cybermirror.org/plugins/${name}.tar.bz2"
];
sha256 = "3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee";
sha256 = "1w81z5jlwqhd1l2m7qrq69lc4k9dnrg1wn52jsl2hrf3hbhd394f";
};
# ToDo: a52, etc.?

View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "alsa-utils-${version}";
version = "1.1.0";
version = "1.1.2";
src = fetchurl {
urls = [
"ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"
"http://alsa.cybermirror.org/utils/${name}.tar.bz2"
];
sha256 = "3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1";
sha256 = "0wcha78c2sm8qqk5r3w83cvm8fp6fb1zpd35kmcm24kxhz007xks";
};
patchPhase = ''

View file

@ -0,0 +1,13 @@
--- rush-1.7/gnu/stdio.in.h.org 2010-06-13 19:14:59.000000000 +0200
+++ rush-1.7/gnu/stdio.in.h 2013-12-30 14:29:55.000000000 +0100
@@ -138,8 +138,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not
/* It is very rare that the developer ever has full control of stdin,
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
+#if defined gets
#undef gets
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+#endif
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@