phonon: 4.8.3 -> 4.9.0

- Removed phonon-backend-vlc.
- Moved qt5.phonon to kde5.phonon.

8 files changed, 65 insertions, 195 deletions

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 70dc1ac2a26a..f5d9d8b8e0db 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -22,26 +22,6 @@ in
         description = "Enable the Plasma 5 (KDE 5) desktop environment.";
       };
 
-      phonon = {
-
-        gstreamer = {
-          enable = mkOption {
-            type = types.bool;
-            default = true;
-            description = "Enable the GStreamer Phonon backend (recommended).";
-          };
-        };
-
-        vlc = {
-          enable = mkOption {
-            type = types.bool;
-            default = false;
-            description = "Enable the VLC Phonon backend.";
-          };
-        };
-
-      };
-
     };
 
   };
@@ -141,26 +121,14 @@ in
 
       ++ lib.optionals cfg.phonon.gstreamer.enable
         [
-          pkgs.phonon_backend_gstreamer
-          pkgs.gst_all.gstreamer
-          pkgs.gst_all.gstPluginsBase
-          pkgs.gst_all.gstPluginsGood
-          pkgs.gst_all.gstPluginsUgly
-          pkgs.gst_all.gstPluginsBad
-          pkgs.gst_all.gstFfmpeg # for mp3 playback
-          pkgs.qt55.phonon-backend-gstreamer
+          pkgs.phonon-backend-gstreamer
+          pkgs.kde5.phonon-backend-gstreamer
           pkgs.gst_all_1.gstreamer
           pkgs.gst_all_1.gst-plugins-base
           pkgs.gst_all_1.gst-plugins-good
           pkgs.gst_all_1.gst-plugins-ugly
           pkgs.gst_all_1.gst-plugins-bad
           pkgs.gst_all_1.gst-libav # for mp3 playback
-        ]
-
-      ++ lib.optionals cfg.phonon.vlc.enable
-        [
-          pkgs.phonon_qt5_backend_vlc
-          pkgs.qt55.phonon-backend-vlc
         ];
 
     environment.pathsToLink = [ "/share" ];
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix
deleted file mode 100644
index 2f588cbe7087..000000000000
--- a/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all_1 }:
-
-let
-  version = "4.8.2";
-  pname = "phonon-backend-gstreamer";
-in
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10";
-  };
-
-  buildInputs = with gst_all_1; [ phonon qt4 gstreamer gst-plugins-base ];
-
-  nativeBuildInputs = [ cmake automoc4 pkgconfig ];
-
-  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"
-  ];
-
-  cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
-
-  meta = {
-    homepage = http://phonon.kde.org/;
-    description = "GStreamer backend for Phonon";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
deleted file mode 100644
index 98aa7d81b368..000000000000
--- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, cmake, gst_all_1, phonon, pkgconfig, qtbase, debug ? false }:
-
-with stdenv.lib;
-
-let
-  version = "4.8.2";
-  pname = "phonon-backend-gstreamer";
-in
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10";
-  };
-
-  buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon qtbase ];
-
-  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 ];
-
-  cmakeFlags = [
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DPHONON_BUILD_PHONON4QT5=ON"
-  ]
-  ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-  meta = with stdenv.lib; {
-    homepage = http://phonon.kde.org/;
-    description = "GStreamer backend for Phonon";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
deleted file mode 100644
index 70b6174c635c..000000000000
--- a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon, qt4}:
-
-with stdenv.lib;
-
-let
-  pname = "phonon-backend-vlc";
-  v = "0.8.1";
-  # Force same Qt version in phonon and VLC
-  vlc_ = vlc.override { inherit qt4; };
-  phonon_ = phonon.override { inherit qt4; };
-in
-
-stdenv.mkDerivation {
-  name = "${pname}-${v}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz";
-    sha256 = "1fyfh7qyb6rld350v2fgz452ld96d3z5ifchr323q0vc3hb9k222";
-  };
-
-  nativeBuildInputs = [ cmake pkgconfig automoc4 xz ];
-
-  buildInputs = [ vlc_ phonon_ qt4 ];
-
-  meta = {
-    homepage = http://phonon.kde.org/;
-    description = "VideoLAN backend for Phonon multimedia framework";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ttuegel urkud ];
-    license = licenses.lgpl21Plus;
-  };
-}
diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
deleted file mode 100644
index 744d681a6949..000000000000
--- a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, xz, vlc, cmake, pkgconfig, phonon, qtbase }:
-
-with stdenv.lib;
-
-let
-  pname = "phonon-backend-vlc";
-  v = "0.8.2";
-in
-
-stdenv.mkDerivation {
-  name = "${pname}-${v}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
-    sha256 = "18ysdga681my75lxxv5h242pa4qappvg5z73wnc0ks9yypnzidys";
-  };
-
-  nativeBuildInputs = [ cmake pkgconfig xz ];
-
-  buildInputs = [ vlc phonon qtbase ];
-
-  cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"];
-
-  meta = {
-    homepage = http://phonon.kde.org/;
-    description = "VideoLAN backend for Phonon multimedia framework";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ttuegel urkud ];
-    license = licenses.lgpl21Plus;
-  };
-}
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
new file mode 100644
index 000000000000..756db94e3437
--- /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 3c731ca19e32..7f3a2d773cf5 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},"
   '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7eb9741b2404..ed5684073cad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8437,9 +8437,7 @@ in
 
   phonon = callPackage ../development/libraries/phonon {};
 
-  phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt4 {};
-
-  phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {};
+  phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};
 
   physfs = callPackage ../development/libraries/physfs { };
 
@@ -8576,12 +8574,6 @@ in
 
     openbr = callPackage ../development/libraries/openbr { };
 
-    phonon = callPackage ../development/libraries/phonon { };
-
-    phonon-backend-gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { };
-
-    phonon-backend-vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { };
-
     polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { };
 
     poppler = callPackage ../development/libraries/poppler {
@@ -15461,8 +15453,11 @@ in
 
     kile = callPackage ../applications/editors/kile/frameworks.nix { };
 
-    konversation = callPackage ../applications/networking/irc/konversation/1.6.nix {
-    };
+    konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { };
+
+    phonon = callPackage ../development/libraries/phonon { };
+
+    phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { };
 
     quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix {
       monolithic = true;