diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:36 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:47 +0000 |
commit | 36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2 (patch) | |
tree | b3faaf573407b32aa645237a4d16b82778a39a92 /nixpkgs/pkgs/development/libraries/libdc1394 | |
parent | 4e31070265257dc67d120c27e0f75c2344fdfa9a (diff) | |
parent | abf060725d7614bd3b9f96764262dfbc2f9c2199 (diff) | |
download | nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.gz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.bz2 nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.lz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.xz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.zst nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.zip |
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libdc1394')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libdc1394/darwin-fixes.patch | 24 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libdc1394/default.nix | 26 |
2 files changed, 50 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libdc1394/darwin-fixes.patch b/nixpkgs/pkgs/development/libraries/libdc1394/darwin-fixes.patch new file mode 100644 index 000000000000..5356a1111129 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libdc1394/darwin-fixes.patch @@ -0,0 +1,24 @@ +diff -Naur libdc1394-2.2.5-old/dc1394/bayer.c libdc1394-2.2.5-new/dc1394/bayer.c +--- libdc1394-2.2.5-old/dc1394/bayer.c 2016-10-11 02:19:10.000000000 -0400 ++++ libdc1394-2.2.5-new/dc1394/bayer.c 2017-03-28 17:59:02.000000000 -0400 +@@ -775,7 +775,7 @@ + { + uint8_t *outR, *outG, *outB; + register int i, j; +- uint tmp; ++ uint32_t tmp; + int st=sx*sy; + int p; + int sx2=sx<<1; +diff -Naur libdc1394-2.2.5-old/dc1394/macosx/capture.c libdc1394-2.2.5-new/dc1394/macosx/capture.c +--- libdc1394-2.2.5-old/dc1394/macosx/capture.c 2016-12-20 08:10:34.000000000 -0500 ++++ libdc1394-2.2.5-new/dc1394/macosx/capture.c 2017-03-28 17:58:38.000000000 -0400 +@@ -614,7 +614,7 @@ + dc1394video_frame_t * frame_tmp = capture->frames + next; + char ch; + +- if(craw->frames==NULL || craw->capture_is_set==0) { ++ if(craw->capture.frames==NULL || craw->capture_is_set==0) { + *frame=NULL; + return DC1394_CAPTURE_IS_NOT_SET; + } diff --git a/nixpkgs/pkgs/development/libraries/libdc1394/default.nix b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix new file mode 100644 index 000000000000..be7852e6cdd2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, libraw1394, +libusb1, CoreServices }: + +stdenv.mkDerivation rec { + name = "libdc1394-${version}"; + version = "2.2.5"; + + src = fetchurl { + url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; + sha256 = "0drk4sqvaym9glaraia25mj60rmwqbhy4j9h3x7gqpzfib8ch31m"; + }; + + buildInputs = [ libusb1 ] + ++ stdenv.lib.optional stdenv.isLinux libraw1394 + ++ stdenv.lib.optional stdenv.isDarwin CoreServices; + + patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch; + + meta = with stdenv.lib; { + homepage = https://sourceforge.net/projects/libdc1394/; + description = "Capture and control API for IIDC compliant cameras"; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.unix; + }; +} |