Author: eelco
Date: Thu Jul 28 12:20:12 2011
New Revision: 27988
URL: https://svn.nixos.org/websvn/nix/?rev=27988&sc=1
Log:
* Move Phonon out of KDE.
Added:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/phonon/
nixpkgs/branches/kde-4.7/pkgs/development/libraries/phonon-backend-gstreamer/
nixpkgs/branches/kde-4.7/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
- copied unchanged from r27866,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix
nixpkgs/branches/kde-4.7/pkgs/development/libraries/phonon/default.nix
- copied unchanged from r27866,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/phonon.nix
Deleted:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/phonon.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/libs/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/default.nix Thu Jul 28
12:10:39 2011 (r27987)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/default.nix Thu Jul 28
12:20:12 2011 (r27988)
@@ -24,8 +24,6 @@
qt4 = qt47;
- phonon = null;
-
kde = callPackage ./kde-package { inherit release; };
### SUPPORT
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/libs/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/libs/default.nix Thu Jul
28 12:10:39 2011 (r27987)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/libs/default.nix Thu Jul
28 12:20:12 2011 (r27988)
@@ -2,7 +2,7 @@
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr,
shared_desktop_ontologies, libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
-, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, phonon
}:
kde.package {
@@ -19,7 +19,7 @@
# Split plugins from libs?
propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
- shared_desktop_ontologies ];
+ shared_desktop_ontologies phonon ];
patches = [ ./polkit-install.patch ];
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Thu Jul 28
12:10:39 2011 (r27987)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Thu Jul 28
12:20:12 2011 (r27988)
@@ -38,10 +38,6 @@
libkipi = callPackage ./libkipi.nix { };
- phonon = callPackage ./phonon.nix { };
-
- phonon_backend_gstreamer = callPackage ./phonon-backend-gstreamer.nix { };
-
#kipi_plugins = callPackage ./kipi-plugins { };
### LIBS
Copied:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
(from r27866,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/kde-4.7/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
Thu Jul 28 12:20:12 2011 (r27988, copy of r27866,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix)
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all }:
+
+let version = "4.5.1"; in
+
+stdenv.mkDerivation rec {
+ name = "phonon-backend-gstreamer-${version}";
+
+ src = fetchurl {
+ url =
"mirror://kde/stable/phonon/phonon-backend-gstreamer/${version}/src/${name}.tar.bz2";
+ sha256 = "13m3kd0iy28nsn532xl97c50vq8ci3qs2i92yk4fw428qvknqck2";
+ };
+
+ buildInputs =
+ [ cmake pkgconfig phonon qt4 automoc4
+ gst_all.gstreamer gst_all.gstPluginsBase
+ ];
+
+ meta = {
+ homepage = http://phonon.kde.org/;
+ description = "GStreamer backend for Phonon";
+ };
+}
Copied: nixpkgs/branches/kde-4.7/pkgs/development/libraries/phonon/default.nix
(from r27866, nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/phonon.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/phonon/default.nix
Thu Jul 28 12:20:12 2011 (r27988, copy of r27866,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/phonon.nix)
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, cmake, automoc4, qt4 }:
+
+stdenv.mkDerivation rec {
+ name = "phonon-4.5.0";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/phonon/4.5.0/src/${name}.tar.bz2";
+ sha256 = "1p2jhxx3ij9xqxvzdz6fm14b83iag9sk940clgj5jnnw00x93s36";
+ };
+
+ buildInputs = [ cmake automoc4 qt4 ];
+
+ preConfigure =
+ ''
+ substituteInPlace CMakeLists.txt \
+ --replace 'PHONON_MKSPECS_DIR}' 'CMAKE_INSTALL_PREFIX}/mkspecs'
+ substituteInPlace designer/CMakeLists.txt \
+ --replace 'QT_PLUGINS_DIR}' 'CMAKE_INSTALL_PREFIX}/lib/qt4/plugins'
+ '';
+
+ meta = {
+ homepage = http://phonon.kde.org/;
+ description = "Multimedia API for Qt";
+ license = "LGPLv2";
+ };
+}
Modified: nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Thu Jul 28
12:10:39 2011 (r27987)
+++ nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Thu Jul 28
12:20:12 2011 (r27988)
@@ -4107,6 +4107,10 @@
pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
+ phonon = callPackage ../development/libraries/phonon { };
+
+ phonon_backend_gstreamer = callPackage
../development/libraries/phonon-backend-gstreamer { };
+
phonon_backend_vlc = newScope pkgs.kde4
../development/libraries/phonon-backend-vlc { };
physfs = callPackage ../development/libraries/physfs { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
