mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-06 06:30:19 +00:00
Code Issues Releases Activity

multimedia/aom: unbreak consumers with VMAF=on after r522621

Browse Source 
$ make -C /usr/ports/multimedia/mpv
[...]
Checking for libav* is FFmpeg   : no
[...]
['cc', 'test.c.1.o', '-o/path/to/mpv-0.31.0/build/.conf_check_*/testbuild/testprog', '-Wl,-Bstatic', '-Wl,-Bdynamic', '-L/usr/local/lib', '-lavcodec', '-fstack-protector-strong', '-fuse-ld=bfd', '-L/usr/local/lib']
err: /usr/local/bin/ld.bfd: /usr/local/lib/libaom.so.0: undefined reference to `fatal'
cc: error: linker command failed with exit code 1 (use -v to see invocation)
This commit is contained in:
Jan Beich 2020-01-20 05:30:11 +00:00
parent 24c4180471
commit fb6c1575df
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=523605
1 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
multimedia/aom/files/patch-aom__dsp_vmaf.c
View File

@ -4,9 +4,13 @@ aom_dsp/vmaf.c:12:10: fatal error: 'libvmaf/libvmaf.h' file not found
#include <libvmaf/libvmaf.h>
^~~~~~~~~~~~~~~~~~~
--- aom_dsp/vmaf.c.orig 2020-01-10 22:53:28 UTC
Don't use CLI symbols in shared library
/usr/lib/libaom.so: undefined reference to `fatal'
--- aom_dsp/vmaf.c.orig 2020-01-17 20:13:03 UTC
+++ aom_dsp/vmaf.c
@@ -9,7 +9,11 @@
@@ -9,13 +9,17 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
#include <assert.h>
@ -15,6 +19,47 @@ aom_dsp/vmaf.c:12:10: fatal error: 'libvmaf/libvmaf.h' file not found
+#else
+#include <libvmaf.h>
+#endif
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "aom_dsp/vmaf.h"
#include "aom_ports/system_state.h"
-#include "common/tools_common.h"
typedef struct FrameData {
const YV12_BUFFER_CONFIG *source;
@@ -82,7 +86,10 @@ void aom_calc_vmaf(const char *model_path, const YV12_
aom_clear_system_state();
*vmaf = vmaf_score;
- if (ret) fatal("Failed to compute VMAF scores.");
+ if (ret) {
+ fprintf(stderr, "Failed to compute VMAF scores.\n");
+ exit(EXIT_FAILURE);
+ }
}
void aom_calc_vmaf_multi_frame(
@@ -102,7 +109,10 @@ void aom_calc_vmaf_multi_frame(
/*do_ms_ssim=*/0, /*pool_method=*/NULL, /*n_thread=*/0,
/*n_subsample=*/1, /*enable_conf_interval=*/0);
FILE *vmaf_log = fopen("vmaf_scores.xml", "r");
- if (vmaf_log == NULL || ret) fatal("Failed to compute VMAF scores.");
+ if (vmaf_log == NULL || ret) {
+ fprintf(stderr, "Failed to compute VMAF scores.\n");
+ exit(EXIT_FAILURE);
+ }
int frame_index = 0;
char buf[512];
@@ -114,7 +124,8 @@ void aom_calc_vmaf_multi_frame(
*p2 = '\0';
const double score = atof(&p[6]);
if (score < 0.0 || score > 100.0) {
- fatal("Failed to compute VMAF scores.");
+ fprintf(stderr, "Failed to compute VMAF scores.\n");
+ exit(EXIT_FAILURE);
}
vmaf[frame_index++] = score;
}