repair vaapi encode_frame, fix segv on unreadable asset, update crop resource icon...

[goodguy/cinelerra.git] / cinelerra-5.1 / thirdparty / src / dav1d-0.4.0.patch1

diff --git a/cinelerra-5.1/thirdparty/src/dav1d-0.4.0.patch1 b/cinelerra-5.1/thirdparty/src/dav1d-0.4.0.patch1
index 05396f33a01b58820c5413c64d77c273432bf223..94c9d7b1c2cff552de2640828d661c95d49baa9b 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/dav1d-0.4.0.patch1
+++ b/cinelerra-5.1/thirdparty/src/dav1d-0.4.0.patch1
@@ -1,7 +1,23 @@
 diff -uN dav1d-0.4.0.orig/Makefile dav1d-0.4.0/Makefile
 --- dav1d-0.4.0.orig/Makefile  1969-12-31 17:00:00.000000000 -0700
 diff -uN dav1d-0.4.0.orig/Makefile dav1d-0.4.0/Makefile
 --- dav1d-0.4.0.orig/Makefile  1969-12-31 17:00:00.000000000 -0700

-+++ dav1d-0.4.0/Makefile       2019-08-30 10:30:39.846512952 -0600
-@@ -0,0 +1,342 @@
++++ dav1d-0.4.0/Makefile       2019-09-05 16:38:01.820636946 -0600
+@@ -0,0 +1,358 @@
++
++_ARCH := $(shell uname -m)
++ARCH_I32 := $(shell expr "x$(_ARCH)" : 'xi[346]86.*')
++ARCH_X64 := $(shell expr "x$(_ARCH)" : 'x..._64*')
++
++ifneq ($(ARCH_I32),0)
++ASM_ARCH := elf32
++ARCH_X86_32 := 1
++ARCH_X86_64 := 0
++endif
++ifneq ($(ARCH_X64),0)
++ASM_ARCH := elf64
++ARCH_X86_32 := 0
++ARCH_X86_64 := 1
++endif
++

 +BUILD=build
 +DESTDIR=/
 +PREFIX=usr/local
 +BUILD=build
 +DESTDIR=/
 +PREFIX=usr/local


@@ -96,7 +112,7 @@ diff -uN dav1d-0.4.0.orig/Makefile dav1d-0.4.0/Makefile
 +      mc_ssse3.obj \
 +      msac.obj)
 +$(NASM_BLD)/%.obj: src/x86/%.asm
 +      mc_ssse3.obj \
 +      msac.obj)
 +$(NASM_BLD)/%.obj: src/x86/%.asm

-+      $(NASM) -f elf64 \
++      $(NASM) -f $(ASM_ARCH) \

 +              -I src/ -I $(BUILD)/ -MQ $@ -MF $@.ndep \
 +              $< -o $@
 +
 +              -I src/ -I $(BUILD)/ -MQ $@ -MF $@.ndep \
 +              $< -o $@
 +


@@ -174,8 +190,8 @@ diff -uN dav1d-0.4.0.orig/Makefile dav1d-0.4.0/Makefile
 +      echo >> $@ "#define ARCH_ARM 0"
 +      echo >> $@ "#define ARCH_PPC64LE 0"
 +      echo >> $@ "#define ARCH_X86 1"
 +      echo >> $@ "#define ARCH_ARM 0"
 +      echo >> $@ "#define ARCH_PPC64LE 0"
 +      echo >> $@ "#define ARCH_X86 1"

-+      echo >> $@ "#define ARCH_X86_32 0"
-+      echo >> $@ "#define ARCH_X86_64 1"
++      echo >> $@ "#define ARCH_X86_32 $(ARCH_X86_32)"
++      echo >> $@ "#define ARCH_X86_64 $(ARCH_X86_64)"

 +      echo >> $@ "#define CONFIG_16BPC 1"
 +      echo >> $@ "#define CONFIG_8BPC 1"
 +      echo >> $@ "#define CONFIG_LOG 1"
 +      echo >> $@ "#define CONFIG_16BPC 1"
 +      echo >> $@ "#define CONFIG_8BPC 1"
 +      echo >> $@ "#define CONFIG_LOG 1"


@@ -186,8 +202,8 @@ diff -uN dav1d-0.4.0.orig/Makefile dav1d-0.4.0/Makefile
 +      echo >> $@ "#define STACK_ALIGNMENT 32"
 +
 +$(BUILD)/config.asm:
 +      echo >> $@ "#define STACK_ALIGNMENT 32"
 +
 +$(BUILD)/config.asm:

-+      echo  > $@ "%define ARCH_X86_32 0"
-+      echo >> $@ "%define ARCH_X86_64 1"
++      echo  > $@ "%define ARCH_X86_32 $(ARCH_X86_32)"
++      echo >> $@ "%define ARCH_X86_64 $(ARCH_X86_64)"

 +      echo >> $@ "%define PIC 1"
 +      echo >> $@ "%define STACK_ALIGNMENT 32"
 +
 +      echo >> $@ "%define PIC 1"
 +      echo >> $@ "%define STACK_ALIGNMENT 32"
 +


@@ -297,7 +313,7 @@ diff -uN dav1d-0.4.0.orig/Makefile dav1d-0.4.0/Makefile
 +$(CHKASM_BIT16)/%.o: $(TESTS_CHKASM)/%.c
 +      $(CC_CC) $(BLD_INCL) -DBITDEPTH=16 -o $@ -c $<
 +$(TESTS_CHKASM_BLD)/x86/%.obj: $(TESTS_CHKASM)/x86/%.asm
 +$(CHKASM_BIT16)/%.o: $(TESTS_CHKASM)/%.c
 +      $(CC_CC) $(BLD_INCL) -DBITDEPTH=16 -o $@ -c $<
 +$(TESTS_CHKASM_BLD)/x86/%.obj: $(TESTS_CHKASM)/x86/%.asm

-+      @$(NASM) -f elf64 \
++      @$(NASM) -f $(ASM_ARCH) \

 +              -I src/ -I $(BUILD)/ -MQ $@ -MF $@.ndep \
 +              $< -o $@
 +
 +              -I src/ -I $(BUILD)/ -MQ $@ -MF $@.ndep \
 +              $< -o $@
 +