Skip to content

Commit 8d3ab4a

Browse files
committed
patch
1 parent 67e2659 commit 8d3ab4a

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

ae.nimble

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ proc ffmpegSetup(crossWindows: bool) =
431431
exec &"tar {tarArgs} {package.location} && mv {package.dirName} {package.name}"
432432
let patchFile = &"../patches/{package.name}.patch"
433433
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"
435435
echo "Applying patch: ", cmd
436436
exec cmd
437437

patches/whisper.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
Cflags: -I${includedir}
1111
+
1212
+Requires:
13-
+Conflicts:
13+
+Conflicts:

src/cmds/whisper.nim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import std/strformat
12
import ../ffmpeg
23
import ../av
4+
import ../log
35

46
proc main*(args: seq[string]) =
57
if args.len < 1:

src/ffmpeg.nim

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ when defined(linux):
1010
when defined(macosx):
1111
{.passL: "-framework Accelerate -framework Metal -framework MetalKit -framework Foundation".}
1212

13-
13+
when defined(macosx): # C++ linkers
14+
{.passL: "-lc++"}
15+
else:
16+
{.passL: "-lstdc++"}
1417
when not defined(disable_hevc):
1518
{.passL: "-lx265".}
16-
when defined(macosx):
17-
{.passL: "-lc++"}
18-
else:
19-
{.passL: "-lstdc++"}
2019
{.passL: "-lm".}
2120

2221
import std/posix

0 commit comments

Comments
 (0)