Unverified Commit 93e87edd authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

Merge pull request #322724 from jopejoe1/ffmpeg/fix/darwin 

ffmpeg_7: fix darwin build
parents 1049aef0 6c65f6f1

pkgs/by-name/xe/xevd/package.nix

+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { 
    pkgConfigModules = [ "xevd" ];

    maintainers = with lib.maintainers; [ jopejoe1 ];

    platforms = lib.platforms.all;

    broken = !stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isDarwin;

    # Currently only supports gcc and msvc as compiler, the limitation for clang gets removed in the next release, but that does not fix building on darwin.

    broken = !stdenv.hostPlatform.isx86 || !stdenv.cc.isGNU;

  };

})

pkgs/by-name/xe/xeve/package.nix

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { 
    mainProgram = "xeve_app";

    maintainers = with lib.maintainers; [ jopejoe1 ];

    platforms = lib.platforms.all;

    broken = !stdenv.hostPlatform.isx86;

    # Currently only supports gcc and msvc as compiler, the limitation for clang gets removed in the next release, but that does not fix building on darwin.

    broken = !stdenv.hostPlatform.isx86 || !stdenv.cc.isGNU;

  };

})

pkgs/development/libraries/ffmpeg/generic.nix

+7 −4
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ 
, withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer

, withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering

, withAudioToolbox ? withHeadlessDeps && stdenv.isDarwin # Apple AudioToolbox

, withAvFoundation ? withHeadlessDeps && stdenv.isDarwin # Apple AVFoundation framework

# Compiling ffmpeg 7 with AVFoundation on x86_64-darwin currently fails with "error: incompatible pointer to integer conversion passing 'NSString *const' to parameter of type 'enum AVMediaType' [-Wint-conversion] NSArray *devices = getDevicesWithMediaType(AVMediaTypeAudio);"

, withAvFoundation ? withHeadlessDeps && stdenv.isDarwin && !(lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86) # Apple AVFoundation framework

, withAvisynth ? withFullDeps # AviSynth script files reading

, withBluray ? withFullDeps # BluRay reading

, withBs2b ? withFullDeps # bs2b DSP library
@@ -93,7 +94,8 @@ 
, withPlacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library

, withPulse ? withSmallDeps && stdenv.isLinux # Pulseaudio input support

, withQrencode ? withFullDeps && lib.versionAtLeast version "7" # QR encode generation

, withQuirc ? withFullDeps && lib.versionAtLeast version "7" # QR decoding

# On runtime fails with dyld[25216]: Library not loaded: libquirc.so.1.2 (Seems to not link the libary correctly)

, withQuirc ? withFullDeps && lib.versionAtLeast version "7" && !stdenv.isDarwin # QR decoding

, withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety)

, withRtmp ? withFullDeps # RTMP[E] support

, withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol
@@ -128,8 +130,9 @@ 
, withXcbShape ? withFullDeps # X11 grabbing shape rendering

, withXcbShm ? withFullDeps # X11 grabbing shm communication

, withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering

, withXevd ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 # MPEG-5 EVC decoding

, withXeve ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 # MPEG-5 EVC encoding

# Currently only supports gcc and msvc as compiler, the limitation for clang get removed in the next release, but that does not fix building on darwin.

, withXevd ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 && stdenv.cc.isGNU # MPEG-5 EVC decoding

, withXeve ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 && stdenv.cc.isGNU # MPEG-5 EVC encoding

, withXlib ? withFullDeps # Xlib support

, withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers

, withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists