From 97abdd38a5fffaa87062bb6d73735e4e11135556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 8 May 2012 09:50:58 +0000 Subject: [PATCH] Adding the Allied Technologies libdc1394 variant and the cc1394 viewer. svn path=/nixpkgs/trunk/; revision=34013 --- pkgs/applications/video/cc1394/default.nix | 37 +++++++++++++++++++ .../libraries/libdc1394avt/default.nix | 28 ++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 69 insertions(+) create mode 100644 pkgs/applications/video/cc1394/default.nix create mode 100644 pkgs/development/libraries/libdc1394avt/default.nix diff --git a/pkgs/applications/video/cc1394/default.nix b/pkgs/applications/video/cc1394/default.nix new file mode 100644 index 000000000000..df131f0e4852 --- /dev/null +++ b/pkgs/applications/video/cc1394/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, libraw1394, libdc1394avt, qt4, SDL }: + +stdenv.mkDerivation rec { + name = "cc1394-3.0"; + + src = fetchurl { + url = http://www.alliedvisiontec.com/fileadmin/content/PDF/Software/AVT_software/zip_files/AVTFire4Linux3v0.src.tar; + sha256 = "13fz3apxcv2rkb34hxd48lbhss6vagp9h96f55148l4mlf5iyyfv"; + }; + + unpackPhase = '' + tar xf $src + BIGTAR=`echo *` + tar xf */cc1394*.tar.gz + rm -R $BIGTAR + cd cc* + ''; + + NIX_LDFLAGS = "-lX11"; + + enableParalellBuilding = true; + + preConfigure = '' + sed -i -e s,/usr,$out, cc1394.pro + qmake PREFIX=$out + ''; + + buildInputs = [ libraw1394 libdc1394avt qt4 SDL ]; + + meta = { + homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html; + description = "AVT Viewer application for AVT cameras"; + license = "BSD"; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libdc1394avt/default.nix b/pkgs/development/libraries/libdc1394avt/default.nix new file mode 100644 index 000000000000..1fcdeae0d116 --- /dev/null +++ b/pkgs/development/libraries/libdc1394avt/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, libraw1394, libusb1, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libdc1394avt-2.1.2"; + + src = fetchurl { + url = http://www.alliedvisiontec.com/fileadmin/content/PDF/Software/AVT_software/zip_files/AVTFire4Linux3v0.src.tar; + sha256 = "13fz3apxcv2rkb34hxd48lbhss6vagp9h96f55148l4mlf5iyyfv"; + }; + + unpackPhase = '' + tar xf $src + BIGTAR=`echo *` + tar xf */libdc1394*.tar.gz + rm -R $BIGTAR + cd libd* + ''; + + buildInputs = [ libraw1394 libusb1 pkgconfig ]; + + meta = { + homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html; + description = "Capture and control API for IIDC cameras with AVT extensions"; + license = "LGPLv2.1+"; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dcc0acab9bb..f59df248dbd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3997,6 +3997,8 @@ let libdc1394 = callPackage ../development/libraries/libdc1394 { }; + libdc1394avt = callPackage ../development/libraries/libdc1394avt { }; + libdevil = callPackage ../development/libraries/libdevil { }; libdiscid = callPackage ../development/libraries/libdiscid { }; @@ -6436,6 +6438,8 @@ let }; funpidgin = carrier; + cc1394 = callPackage ../applications/video/cc1394 { }; + cddiscid = callPackage ../applications/audio/cd-discid { }; cdparanoia = cdparanoiaIII;