public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24428 from acowley/libdc1394-darwin

Browse Source 
libdc1394: patch bugs on darwin
This commit is contained in:
Daniel Peebles 2017-03-28 21:54:32 -04:00 committed by GitHub
commit da79d1f01f
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/libdc1394/darwin-fixes.patch Normal file
View File

@ -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;
}

2
pkgs/development/libraries/libdc1394/default.nix
View File

@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isLinux libraw1394 ++ stdenv.lib.optional stdenv.isLinux libraw1394
++ stdenv.lib.optional stdenv.isDarwin CoreServices; ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://sourceforge.net/projects/libdc1394/; homepage = http://sourceforge.net/projects/libdc1394/;
description = "Capture and control API for IIDC compliant cameras"; description = "Capture and control API for IIDC compliant cameras";