From 8b585cc9f555ac88970d8814641ad1488e8d9e9b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 21 Apr 2016 14:33:04 -0500 Subject: phonon: 4.8.3 -> 4.9.0 - Removed phonon-backend-vlc. - Moved qt5.phonon to kde5.phonon. --- .../libraries/phonon/backends/gstreamer.nix | 45 ++++++++++++++++++++++ pkgs/development/libraries/phonon/default.nix | 27 ++++++------- 2 files changed, 57 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/libraries/phonon/backends/gstreamer.nix (limited to 'pkgs/development/libraries/phonon') diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix new file mode 100644 index 0000000000000..756db94e34377 --- /dev/null +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig +, extra-cmake-modules ? null, qtbase ? null, qtx11extras ? null, qt4 ? null +, debug ? false }: + +with lib; + +let + v = "4.9.0"; + pname = "phonon-backend-gstreamer"; + withQt5 = extra-cmake-modules != null; +in + +assert withQt5 -> qtbase != null; +assert withQt5 -> qtx11extras != null; + +stdenv.mkDerivation rec { + name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; + + meta = with stdenv.lib; { + homepage = http://phonon.kde.org/; + description = "GStreamer backend for Phonon"; + platforms = platforms.linux; + maintainers = with maintainers; [ ttuegel ]; + }; + + src = fetchurl { + url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz"; + sha256 = "1wc5p1rqglf0n1avp55s50k7fjdzdrhg0gind15k8796w7nfbhyf"; + }; + + buildInputs = with gst_all_1; + [ gstreamer gst-plugins-base phonon ] + ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]); + + NIX_CFLAGS_COMPILE = [ + # This flag should be picked up through pkgconfig, but it isn't. + "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" + ]; + + nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; + + cmakeFlags = + [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ] + ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; +} diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 3c731ca19e329..7f3a2d773cf59 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio -, qt4 ? null, automoc4 ? null -, qtbase ? null, qtquick1 ? null, qttools ? null +{ stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio +, qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qtquick1 ? null, qttools ? null , debug ? false }: -with stdenv.lib; +with lib; let - v = "4.8.3"; - withQt5 = qtbase != null; + v = "4.9.0"; + withQt5 = extra-cmake-modules != null; in +assert withQt5 -> qtbase != null; assert withQt5 -> qtquick1 != null; assert withQt5 -> qttools != null; -assert !withQt5 -> automoc4 != null; stdenv.mkDerivation rec { - name = "phonon-${v}"; + name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = { homepage = http://phonon.kde.org/; @@ -27,16 +26,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz"; - sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"; + sha256 = "1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v"; }; buildInputs = [ mesa libpulseaudio ] ++ (if withQt5 then [ qtbase qtquick1 qttools ] else [ qt4 ]); - nativeBuildInputs = - [ cmake pkgconfig ] - ++ optional (!withQt5) automoc4; + nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; NIX_CFLAGS_COMPILE = "-fPIC"; @@ -47,8 +44,8 @@ stdenv.mkDerivation rec { postPatch = '' sed -i PhononConfig.cmake.in \ -e "/get_filename_component(rootDir/ s/^.*$//" \ - -e "s,\\(set(PHONON_INCLUDE_DIR\\).*$,\\1 \"''${!outputDev}/include\")," \ - -e "s,\\(set(PHONON_LIBRARY_DIR\\).*$,\\1 \"''${!outputLib}/lib\")," \ - -e "s,\\(set(PHONON_BUILDSYSTEM_DIR\\).*$,\\1 \"''${!outputDev}/share/phonon${if withQt5 then "4qt5" else ""}/buildsystem\")," + -e "/^set(PHONON_INCLUDE_DIR/ s,\''${rootDir},''${!outputDev}," \ + -e "/^set(PHONON_LIBRARY_DIR/ s,\''${rootDir}/,," \ + -e "/^set(PHONON_BUILDSYSTEM_DIR/ s,\''${rootDir},''${!outputDev}," ''; } -- cgit 1.4.1