Merge pull request #4708 from titanous/libcec

Add libcec

pkgs/applications/video/xbmc/default.nix

@@ -24,6 +24,7 @@
 # TODO: librtmp
 , libvdpau ? null, vdpauSupport ? true
 , pulseaudio ? null, pulseSupport ? true
+, libcec ? null, cecSupport ? true
 }:
 
 assert dbusSupport  -> dbus_libs != null;
@@ -32,6 +33,7 @@ assert usbSupport   -> libusb != null && ! udevSupport; # libusb won't be used i
 assert sambaSupport -> samba != null;
 assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
 assert pulseSupport -> pulseaudio != null;
+assert cecSupport   -> libcec != null;
 
 stdenv.mkDerivation rec {
     name = "xbmc-13.2";
@@ -65,7 +67,8 @@ stdenv.mkDerivation rec {
     ++ lib.optional usbSupport libusb
     ++ lib.optional sambaSupport samba
     ++ lib.optional vdpauSupport libvdpau
-    ++ lib.optional pulseSupport pulseaudio;
+    ++ lib.optional pulseSupport pulseaudio
+    ++ lib.optional cecSupport libcec;
 
     dontUseCmakeConfigure = true;
 
@@ -91,7 +94,8 @@ stdenv.mkDerivation rec {
           --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \
-          --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib"
+          --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \
+          --prefix LD_LIBRARY_PATH ":" "${libcec}/lib"
       done
     '';
 

pkgs/development/libraries/libcec/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, udev }:
+
+let version = "2.1.4"; in
+
+stdenv.mkDerivation {
+  name = "libcec-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
+    sha256 = "0iz11zclbs3gk4ddq0pm4vyq015qmvy4nb9sra3vk6jw58izbgkr";
+  };
+
+  buildInputs = [ autoreconfHook pkgconfig udev ];
+
+  meta = {
+    description = "USB CEC adapter communication library";
+    homepage = "http://libcec.pulse-eight.com";
+    repositories.git = "https://github.com/Pulse-Eight/libcec.git";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -5549,6 +5549,8 @@ let
     then libcanberra.override { gtk = null; }
     else libcanberra;
 
+  libcec = callPackage ../development/libraries/libcec { };
+
   libcello = callPackage ../development/libraries/libcello {};
 
   libcdaudio = callPackage ../development/libraries/libcdaudio { };