diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-12 09:59:45 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:14:17 +0000 |
| commit | c5571a126859eb658ffd7340cb580f7d91f12bb6 (patch) | |
| tree | 577573c3bf14d9849246d52daece719a10eaf138 /nixpkgs/pkgs/development/libraries/libdc1394 | |
| parent | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (diff) | |
| parent | 98e3b90b6c8f400ae5438ef868eb992a64b75ce5 (diff) | |
| download | nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.gz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.bz2 nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.lz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.xz nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.tar.zst nixlib-c5571a126859eb658ffd7340cb580f7d91f12bb6.zip | |
Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'
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 | 10 |
2 files changed, 4 insertions, 30 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libdc1394/darwin-fixes.patch b/nixpkgs/pkgs/development/libraries/libdc1394/darwin-fixes.patch deleted file mode 100644 index 5356a1111129..000000000000 --- a/nixpkgs/pkgs/development/libraries/libdc1394/darwin-fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 index be7852e6cdd2..86b9fcd0bef3 100644 --- a/nixpkgs/pkgs/development/libraries/libdc1394/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdc1394/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, libraw1394, -libusb1, CoreServices }: +{ stdenv, fetchurl, libraw1394 +, libusb1, CoreServices }: stdenv.mkDerivation rec { name = "libdc1394-${version}"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; - sha256 = "0drk4sqvaym9glaraia25mj60rmwqbhy4j9h3x7gqpzfib8ch31m"; + sha256 = "1v8gq54n1pg8izn7s15yylwjf8r1l1dmzbm2yvf6pv2fmb4mz41b"; }; 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"; |