Author: viric
Date: Tue May 8 09:50:58 2012
New Revision: 34013
URL: https://nixos.org/websvn/nix/?rev=34013&sc=1
Log:
Adding the Allied Technologies libdc1394 variant and the cc1394 viewer.
Added:
nixpkgs/trunk/pkgs/applications/video/cc1394/
nixpkgs/trunk/pkgs/applications/video/cc1394/default.nix
nixpkgs/trunk/pkgs/development/libraries/libdc1394avt/
nixpkgs/trunk/pkgs/development/libraries/libdc1394avt/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/applications/video/cc1394/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/video/cc1394/default.nix Tue May 8
09:50:58 2012 (r34013)
@@ -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;
+ };
+}
Added: nixpkgs/trunk/pkgs/development/libraries/libdc1394avt/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/libdc1394avt/default.nix Tue May
8 09:50:58 2012 (r34013)
@@ -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;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 8 09:49:38
2012 (r34012)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 8 09:50:58
2012 (r34013)
@@ -3997,6 +3997,8 @@
libdc1394 = callPackage ../development/libraries/libdc1394 { };
+ libdc1394avt = callPackage ../development/libraries/libdc1394avt { };
+
libdevil = callPackage ../development/libraries/libdevil { };
libdiscid = callPackage ../development/libraries/libdiscid { };
@@ -6436,6 +6438,8 @@
};
funpidgin = carrier;
+ cc1394 = callPackage ../applications/video/cc1394 { };
+
cddiscid = callPackage ../applications/audio/cd-discid { };
cdparanoia = cdparanoiaIII;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
