File tree Expand file tree Collapse file tree 4 files changed +8
-7
lines changed Expand file tree Collapse file tree 4 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -431,7 +431,7 @@ proc ffmpegSetup(crossWindows: bool) =
431
431
exec & " tar { tarArgs} { package.location} && mv { package.dirName} { package.name} "
432
432
let patchFile = & " ../patches/{ package.name} .patch "
433
433
if fileExists(patchFile):
434
- let cmd = & " patch -d { package.name} -i { absolutePath(patchFile)} -p1 "
434
+ let cmd = & " patch -d { package.name} -i { absolutePath(patchFile)} -p1 --force "
435
435
echo " Applying patch: " , cmd
436
436
exec cmd
437
437
Original file line number Diff line number Diff line change 10
10
Cflags: -I${includedir}
11
11
+
12
12
+ Requires:
13
- + Conflicts:
13
+ + Conflicts:
Original file line number Diff line number Diff line change
1
+ import std/ strformat
1
2
import ../ ffmpeg
2
3
import ../ av
4
+ import ../ log
3
5
4
6
proc main* (args: seq [string ]) =
5
7
if args.len < 1 :
Original file line number Diff line number Diff line change @@ -10,13 +10,12 @@ when defined(linux):
10
10
when defined(macosx):
11
11
{.passL: " -framework Accelerate -framework Metal -framework MetalKit -framework Foundation" .}
12
12
13
-
13
+ when defined(macosx): # C++ linkers
14
+ {.passL: " -lc++" }
15
+ else :
16
+ {.passL: " -lstdc++" }
14
17
when not defined(disable_hevc):
15
18
{.passL: " -lx265" .}
16
- when defined(macosx):
17
- {.passL: " -lc++" }
18
- else :
19
- {.passL: " -lstdc++" }
20
19
{.passL: " -lm" .}
21
20
22
21
import std/ posix
You can’t perform that action at this time.
0 commit comments