diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-05 22:55:15 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-05 22:55:15 -0400 |
| commit | f2a33b8709a0d8cefb0acf299c4ca9ee94a70106 (patch) | |
| tree | 7bbe170ac33cf96e85e54d06af98bf85f946bb1c /pkgs/development/libraries/libdc1394 | |
| parent | a430a5c96377ea356f24dd75754a1c9a3cd513fc (diff) | |
| download | nixpkgs-f2a33b8709a0d8cefb0acf299c4ca9ee94a70106.tar nixpkgs-f2a33b8709a0d8cefb0acf299c4ca9ee94a70106.tar.gz nixpkgs-f2a33b8709a0d8cefb0acf299c4ca9ee94a70106.tar.bz2 nixpkgs-f2a33b8709a0d8cefb0acf299c4ca9ee94a70106.tar.lz nixpkgs-f2a33b8709a0d8cefb0acf299c4ca9ee94a70106.tar.xz nixpkgs-f2a33b8709a0d8cefb0acf299c4ca9ee94a70106.tar.zst nixpkgs-f2a33b8709a0d8cefb0acf299c4ca9ee94a70106.zip | |
libdc1394: remove patch
applied in newer version
Diffstat (limited to 'pkgs/development/libraries/libdc1394')
| -rw-r--r-- | pkgs/development/libraries/libdc1394/darwin-fixes.patch | 24 | ||||
| -rw-r--r-- | pkgs/development/libraries/libdc1394/default.nix | 6 |
2 files changed, 2 insertions, 28 deletions
diff --git a/pkgs/development/libraries/libdc1394/darwin-fixes.patch b/pkgs/development/libraries/libdc1394/darwin-fixes.patch deleted file mode 100644 index 5356a111112..00000000000 --- a/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/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index ea4a50275a3..86b9fcd0bef 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libraw1394, -libusb1, CoreServices }: +{ stdenv, fetchurl, libraw1394 +, libusb1, CoreServices }: stdenv.mkDerivation rec { name = "libdc1394-${version}"; @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { ++ 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"; |