CVS commit: pkgsrc/multimedia/svt-av1

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Sep  4 11:59:05 UTC 2024

Modified Files:
        pkgsrc/multimedia/svt-av1: distinfo
Added Files:
        pkgsrc/multimedia/svt-av1/patches: patch-Source_App_app__config.c
            patch-Source_App_app__config.h

Log Message:
svt-av1: Fix FOPEN conflict with system headers.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/svt-av1/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/svt-av1/patches/patch-Source_App_app__config.c \
    pkgsrc/multimedia/svt-av1/patches/patch-Source_App_app__config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/svt-av1/distinfo
diff -u pkgsrc/multimedia/svt-av1/distinfo:1.8 pkgsrc/multimedia/svt-av1/distinfo:1.9
--- pkgsrc/multimedia/svt-av1/distinfo:1.8      Wed Aug 21 17:21:44 2024
+++ pkgsrc/multimedia/svt-av1/distinfo  Wed Sep  4 11:59:05 2024
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.8 2024/08/21 17:21:44 wiz Exp $
+$NetBSD: distinfo,v 1.9 2024/09/04 11:59:05 jperkin Exp $
 
 BLAKE2s (svt-av1-2.2.0.tar.bz2) = 117be7c2c78e43a7f1f17566aa375205d788d56384e035b42c490c19b096f511
 SHA512 (svt-av1-2.2.0.tar.bz2) = 19756950f0bf4c16d4bafbcb3c96918e036c65649cf6d62bf823e62cf62dcffdca30a9944cc121a6645dbffa0b1498c7b052f17f0552d3e3db976ecf1ec88cd0
 Size (svt-av1-2.2.0.tar.bz2) = 11793980 bytes
 SHA1 (patch-CMakeLists.txt) = c9bf8c9628c51b63f9455706400e348faebd6ba0
+SHA1 (patch-Source_App_app__config.c) = e12eb168735cc99d7c72d5d9ae29650d3f9fc9e7
+SHA1 (patch-Source_App_app__config.h) = e27dcd0af9494be4a400b025780b4058c2deb9a9
 SHA1 (patch-third__party_cpuinfo_CMakeLists.txt) = 5afbc2a716568aa529e9af85fd716d405a2ad751
 SHA1 (patch-third__party_cpuinfo_src_init.c) = 26e8c0689ed9e7f7734c4cf7a3f7278fe3092fcb

Added files:

Index: pkgsrc/multimedia/svt-av1/patches/patch-Source_App_app__config.c
diff -u /dev/null pkgsrc/multimedia/svt-av1/patches/patch-Source_App_app__config.c:1.1
--- /dev/null   Wed Sep  4 11:59:05 2024
+++ pkgsrc/multimedia/svt-av1/patches/patch-Source_App_app__config.c    Wed Sep  4 11:59:05 2024
@@ -0,0 +1,27 @@
+$NetBSD: patch-Source_App_app__config.c,v 1.1 2024/09/04 11:59:05 jperkin Exp $
+
+Re-order includes so that FOPEN override works.
+
+--- Source/App/app_config.c.orig       2024-09-04 11:26:07.821209504 +0000
++++ Source/App/app_config.c
+@@ -16,10 +16,6 @@
+ #include <ctype.h>
+ #include <sys/stat.h>
+ 
+-#include "EbSvtAv1Metadata.h"
+-#include "app_config.h"
+-#include "app_context.h"
+-#include "app_input_y4m.h"
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <io.h>
+@@ -28,6 +24,9 @@
+ #include <sys/file.h>
+ #endif
+ 
++#include "EbSvtAv1Metadata.h"
++#include "app_input_y4m.h"
++#include "app_context.h"
+ #include "app_output_ivf.h"
+ 
+ #if !defined(_WIN32) || !defined(HAVE_STRNLEN_S)
Index: pkgsrc/multimedia/svt-av1/patches/patch-Source_App_app__config.h
diff -u /dev/null pkgsrc/multimedia/svt-av1/patches/patch-Source_App_app__config.h:1.1
--- /dev/null   Wed Sep  4 11:59:05 2024
+++ pkgsrc/multimedia/svt-av1/patches/patch-Source_App_app__config.h    Wed Sep  4 11:59:05 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-Source_App_app__config.h,v 1.1 2024/09/04 11:59:05 jperkin Exp $
+
+Avoid FOPEN conflict with system headers.
+
+--- Source/App/app_config.h.orig       2024-09-04 11:22:30.145799815 +0000
++++ Source/App/app_config.h
+@@ -50,6 +50,7 @@ typedef enum EncPass {
+ #define MAX_CHANNEL_NUMBER 6U
+ #define MAX_NUM_TOKENS 210
+ 
++#undef FOPEN
+ #ifdef _WIN32
+ #define FOPEN(f, s, m) fopen_s(&f, s, m)
+ #else