tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
Merge #25382: ffmpeg: remove darwin patch
Vladimír Čunát
8 years ago
ba4fd616
8a1707ad
-13
2 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
ffmpeg
3.3.nix
sdk_detection.patch
-1
pkgs/development/libraries/ffmpeg/3.3.nix
···
9
9
branch = "3.3";
10
10
sha256 = "1p3brx0qa3i3569zlmcmpbxf17q73nrmbx2vp39s8h77r53qdq11";
11
11
darwinFrameworks = [ Cocoa CoreMedia ];
12
12
-
patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
13
12
})
-12
pkgs/development/libraries/ffmpeg/sdk_detection.patch
···
1
1
-
diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c
2
2
-
--- a/libavcodec/audiotoolboxdec.c
3
3
-
+++ b/libavcodec/audiotoolboxdec.c
4
4
-
@@ -32,7 +32,7 @@
5
5
-
#include "libavutil/opt.h"
6
6
-
#include "libavutil/log.h"
7
7
-
8
8
-
-#ifndef __MAC_10_11
9
9
-
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
10
10
-
#define kAudioFormatEnhancedAC3 'ec-3'
11
11
-
#endif
12
12
-