CVS commit: pkgsrc/multimedia/svt-av1

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sat Aug 19 15:03:39 UTC 2023

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

Log Message:
svt-av1: Add missing patches from previous.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/svt-av1/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/svt-av1/patches/patch-Source_App_EncApp_EbAppConfig.c \
    pkgsrc/multimedia/svt-av1/patches/patch-Source_App_EncApp_EbAppConfig.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.3 pkgsrc/multimedia/svt-av1/distinfo:1.4
--- pkgsrc/multimedia/svt-av1/distinfo:1.3      Thu Aug 17 07:43:40 2023
+++ pkgsrc/multimedia/svt-av1/distinfo  Sat Aug 19 15:03:38 2023
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.3 2023/08/17 07:43:40 jperkin Exp $
+$NetBSD: distinfo,v 1.4 2023/08/19 15:03:38 jperkin Exp $
 
 BLAKE2s (svt-av1-1.5.0.tar.bz2) = efa954996cc42b0ad05c8b2b91604625fcd3f92c4f22db14bb4d4cccc08fa371
 SHA512 (svt-av1-1.5.0.tar.bz2) = d5aa7679aeaa1e19f21906a36a7214c72cdaee77e1b5c1946ded43f8381ec2d705e671130589207b65b920a4fcaa9ca1d0037f88ef8d2303125d7f7aa54e3a2e
 Size (svt-av1-1.5.0.tar.bz2) = 9490521 bytes
 SHA1 (patch-CMakeLists.txt) = c9bf8c9628c51b63f9455706400e348faebd6ba0
+SHA1 (patch-Source_App_EncApp_EbAppConfig.c) = 0efc0dad54c9f3625764468010522b3486433a86
+SHA1 (patch-Source_App_EncApp_EbAppConfig.h) = c7a5d2e2ad6324ba1c89ec85843359d51cba6cce
 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_EncApp_EbAppConfig.c
diff -u /dev/null pkgsrc/multimedia/svt-av1/patches/patch-Source_App_EncApp_EbAppConfig.c:1.1
--- /dev/null   Sat Aug 19 15:03:39 2023
+++ pkgsrc/multimedia/svt-av1/patches/patch-Source_App_EncApp_EbAppConfig.c     Sat Aug 19 15:03:39 2023
@@ -0,0 +1,28 @@
+$NetBSD: patch-Source_App_EncApp_EbAppConfig.c,v 1.1 2023/08/19 15:03:39 jperkin Exp $
+
+Re-order includes to avoid FOPEN redefine.
+
+--- Source/App/EncApp/EbAppConfig.c.orig       2023-04-26 22:11:56.000000000 +0000
++++ Source/App/EncApp/EbAppConfig.c
+@@ -16,10 +16,6 @@
+ #include <ctype.h>
+ #include <sys/stat.h>
+ 
+-#include "EbSvtAv1Metadata.h"
+-#include "EbAppConfig.h"
+-#include "EbAppContext.h"
+-#include "EbAppInputy4m.h"
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <io.h>
+@@ -28,6 +24,10 @@
+ #include <sys/file.h>
+ #endif
+ 
++#include "EbSvtAv1Metadata.h"
++#include "EbAppConfig.h"
++#include "EbAppContext.h"
++#include "EbAppInputy4m.h"
+ #include "EbAppOutputivf.h"
+ 
+ #if !defined(_WIN32) || !defined(HAVE_STRNLEN_S)
Index: pkgsrc/multimedia/svt-av1/patches/patch-Source_App_EncApp_EbAppConfig.h
diff -u /dev/null pkgsrc/multimedia/svt-av1/patches/patch-Source_App_EncApp_EbAppConfig.h:1.1
--- /dev/null   Sat Aug 19 15:03:39 2023
+++ pkgsrc/multimedia/svt-av1/patches/patch-Source_App_EncApp_EbAppConfig.h     Sat Aug 19 15:03:39 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-Source_App_EncApp_EbAppConfig.h,v 1.1 2023/08/19 15:03:39 jperkin Exp $
+
+Avoid existing FOPEN define.
+
+--- Source/App/EncApp/EbAppConfig.h.orig       2023-04-26 22:11:56.000000000 +0000
++++ Source/App/EncApp/EbAppConfig.h
+@@ -121,6 +121,7 @@ extern uint32_t          app_malloc_coun
+ #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