From: Good Guy Date: Sat, 31 Aug 2019 03:17:40 +0000 (-0600) Subject: upgrade vpx to 1.8.1, rm meson prereq and add dav1d Makefile, warn/gettid patch X-Git-Tag: 2019-08~1 X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=a1ec01f78c69ac89b70269884acc212a23e49622;p=goodguy%2Fcinelerra.git upgrade vpx to 1.8.1, rm meson prereq and add dav1d Makefile, warn/gettid patch --- diff --git a/cinelerra-5.1/blds/PKGBUILD b/cinelerra-5.1/blds/PKGBUILD index 95350e87..4a5ba37c 100644 --- a/cinelerra-5.1/blds/PKGBUILD +++ b/cinelerra-5.1/blds/PKGBUILD @@ -19,7 +19,7 @@ DEPENDS=( 'alsa-lib' 'atk' 'bzip2' 'cairo' 'expat' 'fftw' 'flac' 'xorg-fonts-misc' 'ttf-dejavu' 'inkscape' 'dvdauthor' 'udftools' ) makedepends=( 'autoconf' 'automake' 'yasm' 'nasm' 'cmake' 'libtool' - 'libxml2' 'perl-xml-libxml' 'perl-xml-parser' 'meson' + 'libxml2' 'perl-xml-libxml' 'perl-xml-parser' 'xorg-mkfontdir' 'xorg-mkfontscale' ) conflicts=() diff --git a/cinelerra-5.1/blds/bld_prepare.sh b/cinelerra-5.1/blds/bld_prepare.sh index 801a71b8..9c6f2dcd 100755 --- a/cinelerra-5.1/blds/bld_prepare.sh +++ b/cinelerra-5.1/blds/bld_prepare.sh @@ -27,7 +27,7 @@ case "$dir" in libsndfile-devel libtheora-devel linux-firmware ivtv-firmware \ libvorbis-devel texinfo xz-devel lzma-devel cmake udftools git \ autoconf automake rpm-build jbigkit-devel libvdpau-devel libva-devel \ - alsa-lib-devel gtk2-devel meson + alsa-lib-devel gtk2-devel yasm=yasm-1.3.0-3.fc24.x86_64.rpm release=http://archives.fedoraproject.org/pub/fedora/linux/releases/24 url=$release/Everything/x86_64/os/Packages/y/$yasm @@ -54,8 +54,7 @@ case "$dir" in ivtv-firmware libvorbis-devel texinfo xz-devel lzma-devel cmake git \ ctags patch gcc-c++ perl-XML-XPath libtiff-devel python dvdauthor \ gettext-devel inkscape udftools autoconf automake numactl-devel \ - jbigkit-devel libvdpau-devel libva-devel gtk2-devel mesa-vdpau-drivers \ - meson + jbigkit-devel libvdpau-devel libva-devel gtk2-devel mesa-vdpau-drivers ;; "suse" | "leap") zypper -n install nasm gcc gcc-c++ zlib-devel texinfo libpng16-devel \ @@ -67,7 +66,7 @@ case "$dir" in ilmbase-devel fftw3-devel libsndfile-devel libtheora-devel flac-devel \ libtiff-devel inkscape cmake patch libnuma-devel lzma-devel udftools git \ yasm autoconf automake rpm-build libjbig-devel libvdpau-devel libva-devel \ - gtk2-devel libusb-1_0-devel meson + gtk2-devel libusb-1_0-devel if [ ! -f /usr/lib64/libtermcap.so ]; then ln -s libtermcap.so.2 /usr/lib64/libtermcap.so fi @@ -81,7 +80,7 @@ case "$dir" in fonts-dejavu libopenexr-dev festival libfftw3-dev gdb libusb-1.0-0-dev \ libdc1394-22-dev libflac-dev libjbig-dev libvdpau-dev libva-dev \ inkscape libsndfile1-dev libtheora-dev cmake udftools libxml2-utils git \ - autoconf automake debhelper libgtk2.0-dev meson + autoconf automake debhelper libgtk2.0-dev ;; #"ub16-10") # apt-get -y install libx264-dev libx265-dev libvpx-dev libmjpegtools-dev @@ -93,8 +92,7 @@ case "$dir" in fonts-dejavu libopenexr-dev libavc1394-dev festival-dev fftw3-dev gdb \ libdc1394-22-dev libiec61883-dev libflac-dev libjbig-dev libusb-1.0-0-dev \ libvdpau-dev libva-dev libsndfile1-dev libtheora-dev cmake udftools \ - libxml2-utils git inkscape autoconf automake debhelper libgtk2.0-dev \ - meson + libxml2-utils git inkscape autoconf automake debhelper libgtk2.0-dev ;; *) echo "unknown os: $dir" diff --git a/cinelerra-5.1/blds/cinelerra.spec b/cinelerra-5.1/blds/cinelerra.spec index fe23c3d6..b34a440c 100644 --- a/cinelerra-5.1/blds/cinelerra.spec +++ b/cinelerra-5.1/blds/cinelerra.spec @@ -26,7 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if 0%{?centos} %define rhat 1 %define distro centos -%define centos_cfg --disable-libaom --disable-libwebp +%define centos_cfg --disable-libaom --disable-libwebp --disable-dav1d %endif BuildRequires: autoconf @@ -52,7 +52,6 @@ BuildRequires: udftools BuildRequires: gtk2-devel BuildRequires: libva-devel BuildRequires: libvdpau-devel -BuildRequires: meson %{?rhat:BuildRequires: alsa-lib-devel} %{?rhat:BuildRequires: bzip2-devel} %{?rhat:BuildRequires: xorg-x11-fonts-cyrillic} diff --git a/cinelerra-5.1/blds/debian/control b/cinelerra-5.1/blds/debian/control index 27e9d3f0..25bd1e66 100644 --- a/cinelerra-5.1/blds/debian/control +++ b/cinelerra-5.1/blds/debian/control @@ -12,7 +12,7 @@ Build-Depends: libpng-dev, libtool, libusb-1.0-0-dev, libva-dev, libvdpau-dev, libxft-dev, libxinerama-dev, libxml2-utils, libxv-dev, libz-dev, linux-firmware, nasm, texinfo, ttf-bitstream-vera, - udftools, xfonts-100dpi, xfonts-75dpi, yasm, meson + udftools, xfonts-100dpi, xfonts-75dpi, yasm Package: cin Depends: ${misc:Depends} diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index a8098cbe..a9fd117f 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -12,7 +12,7 @@ CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros" CFG_CFLAGS+=" -pthread -Wall" # misguided pedantic warnings # this is extra work, not a gain... -CFG_CFLAGS+=" -Wno-unknown-warning" +CFG_CFLAGS+=" -Wno-unknown-warning-option" CFG_CFLAGS+=" -Wno-attributes" CFG_CFLAGS+=" -Wno-unused-result" CFG_CFLAGS+=" -Wno-stringop-overflow" @@ -372,7 +372,7 @@ PKG_3RD([x265],[auto], [ . source ]) PKG_3RD([libvpx],[auto], - [libvpx-1.8.0], + [libvpx-1.8.1], [ libvpx.a ], [ . ]) diff --git a/cinelerra-5.1/guicast/thread.h b/cinelerra-5.1/guicast/thread.h index 216ecd2b..7ad81b23 100644 --- a/cinelerra-5.1/guicast/thread.h +++ b/cinelerra-5.1/guicast/thread.h @@ -27,7 +27,10 @@ #include #include +// glibc >= 2.30 provides gettid() in unistd +#if !defined(__GLIBC_PREREQ) || !__GLIBC_PREREQ(2, 30) static inline int gettid() { return syscall(SYS_gettid, 0, 0, 0); } +#endif // The thread does not autodelete by default. // If autodelete is 1 the thread autodeletes. diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 905731e1..8cc0e36b 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -185,14 +185,8 @@ libaom.cfg_vars?=$(call cmake_config,aom-master) libaom.cfg_params?= -DENABLE_SHARED=no -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_PREFIX=$(call bld_path,libaom)/usr/local libaom.mak_params?= ; $(MAKE) -C libaom* install -dav1d.cfg_vars?=\ - echo "meson setup . build" > configure; \ - echo "meson configure build -Denable_tools=false" >> configure; \ - echo "meson configure build --buildtype=release" >> configure; \ - echo "meson configure build --default-library=static" >> configure; \ - chmod +x ./configure; -dav1d.mak_vars?=(echo "all:"; echo " ninja -C build") > $(call bld_path,dav1d)/Makefile; -dav1d.mak_params?=; cd "$(call bld_path,dav1d)"; DESTDIR="$(call bld_path,dav1d)" meson install -C build +dav1d.cfg_vars?=echo "echo dav1d custom make" >> configure; chmod +x ./configure; +dav1d.mak_params?=; $(MAKE) -C dav1d* install DESTDIR="$(call bld_path,dav1d)" libwebp.cfg_vars?= mkdir build && cd build && $(call cmake_config,..) libwebp.mak_params?= -C build all install DESTDIR=$(call bld_path,libwebp) mjpegtools.cflags?="$(call inc_path,libjpeg) $(call ld_path,libjpeg,.libs)" diff --git a/cinelerra-5.1/thirdparty/src/dav1d-0.4.0.patch1 b/cinelerra-5.1/thirdparty/src/dav1d-0.4.0.patch1 new file mode 100644 index 00000000..05396f33 --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/dav1d-0.4.0.patch1 @@ -0,0 +1,346 @@ +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 @@ ++BUILD=build ++DESTDIR=/ ++PREFIX=usr/local ++LIBDIR=$(PREFIX)/lib ++INCDIR=$(PREFIX)/include ++# make Q="" for verbose ++Q?=@echo == $@; ++OBJDIR?=$(BUILD)/static ++NASM_BLD=$(OBJDIR)/nasm ++ENTRY_BLD=$(OBJDIR)/entry ++SRC_BLD=$(OBJDIR)/src ++BIT8_BLD=$(OBJDIR)/bits8 ++BIT16_BLD=$(OBJDIR)/bits16 ++TOOLS_BLD=$(BUILD)/tools ++TESTS_BLD=$(BUILD)/tests ++ ++STATIC_LIB=$(BUILD)/src/libdav1d.a ++SHARED_LIB=$(BUILD)/src/libdav1d.so ++DEFS= -DNDEBUG -D_FILE_OFFSET_BITS=64 -D_POSIX_C_SOURCE=200112L ++FUZZ= -DDAV1D_MT_FUZZING ++ ++BLD_INCL= $(DEFS) -I. -Isrc -Iinclude/dav1d -Iinclude \ ++ -I$(BUILD) -I$(BUILD)/include -I$(BUILD)/include/dav1d ++TOOLS_INCL= $(DEFS) -Itools -I. -I$(BUILD) -I$(BUILD)/tools \ ++ -Iinclude -Iinclude/dav1d -I$(BUILD)/include/dav1d \ ++ -I$(BUILD)/include -I/usr/include/SDL2 ++ ++NP?=.NOTPARALLEL: ++$(NP) ++MAKE_P:=$(MAKE) -j NP="" ++ ++all: meson_data ++ $(MAKE_P) $(STATIC_LIB) OBJDIR=$(BUILD)/static ++ $(MAKE_P) $(SHARED_LIB) OBJDIR=$(BUILD)/shared ++# req SDL ++# $(MAKE_P) $(TOOLS) OBJDIR=$(BUILD)/static ++# $(MAKE_P) $(TESTS) OBJDIR=$(BUILD)/static ++ ++CC_DEFS=\ ++ -DNDEBUG \ ++ -D_FILE_OFFSET_BITS=64 \ ++ -D_POSIX_C_SOURCE=200112L \ ++ ++CC_OPTS=\ ++ -pipe \ ++ -Wall \ ++ -Winvalid-pch \ ++ -Wextra \ ++ -std=c99 \ ++ -O3 \ ++ -fvisibility=hidden \ ++ -Wundef \ ++ -Werror=vla \ ++ -Wno-maybe-uninitialized \ ++ -Wno-missing-field-initializers \ ++ -Wno-unused-parameter \ ++ -Werror=missing-prototypes \ ++ -fomit-frame-pointer \ ++ -ffast-math \ ++ -fPIC \ ++ -mpreferred-stack-boundary=5 \ ++ -MD -MQ $@ -MF $@.d \ ++ ++SHA_OPTS=\ ++ -Wl,--no-undefined \ ++ -Wl,--as-needed \ ++ -Wl,-O1 \ ++ -shared \ ++ -fPIC \ ++ -Wl,--start-group \ ++ -Wl,-soname,libdav1d.so.2 \ ++ -Wl,--end-group \ ++ -pthread \ ++ ++CC_CC=$(Q)cc $(CC_OPTS) $(CFLAGS) ++NASM=$(Q)/usr/bin/nasm ++any=$(foreach i,$(2),$(1)/$(i)) ++ ++# nasm ++NASM_OBJS=$(call any,$(NASM_BLD), \ ++ cdef.obj \ ++ cdef_sse.obj \ ++ cpuid.obj \ ++ ipred.obj \ ++ ipred_ssse3.obj \ ++ itx.obj \ ++ itx_ssse3.obj \ ++ loopfilter.obj \ ++ looprestoration.obj \ ++ looprestoration_ssse3.obj \ ++ mc.obj \ ++ mc_ssse3.obj \ ++ msac.obj) ++$(NASM_BLD)/%.obj: src/x86/%.asm ++ $(NASM) -f elf64 \ ++ -I src/ -I $(BUILD)/ -MQ $@ -MF $@.ndep \ ++ $< -o $@ ++ ++# entry ++ENTRY_OBJS=$(call any,$(ENTRY_BLD), \ ++ lib.c.o \ ++ thread_task.c.o) ++$(ENTRY_BLD)/%.c.o: src/%.c ++ $(CC_CC) -Iinclude -Ibuild/include/dav1d -Isrc/entry $(BLD_INCL) \ ++ -mincoming-stack-boundary=4 -o $@ -c $< ++ ++# src ++SRC_OBJS=$(call any,$(SRC_BLD), \ ++ cdf.o \ ++ cpu.o \ ++ data.o \ ++ decode.o \ ++ dequant_tables.o \ ++ getbits.o \ ++ intra_edge.o \ ++ lf_mask.o \ ++ log.o \ ++ msac.o \ ++ obu.o \ ++ picture.o \ ++ qm.o \ ++ ref.o \ ++ ref_mvs.o \ ++ scan.o \ ++ tables.o \ ++ warpmv.o \ ++ wedge.o \ ++ x86/cpu.c.o) ++$(SRC_BLD)/%.o: src/%.c ++ $(CC_CC) $(BLD_INCL) -pthread -o $@ -c $< ++$(SRC_BLD)/x86/%.c.o: src/x86/%.c ++ $(CC_CC) $(BLD_INCL) -o $@ -c $< ++ ++# bits ++BITS_OBJS= \ ++ cdef_tmpl.o \ ++ cdef_apply_tmpl.o \ ++ film_grain_tmpl.o \ ++ ipred_tmpl.o \ ++ ipred_prepare_tmpl.o \ ++ itx_tmpl.o \ ++ lf_apply_tmpl.o \ ++ loopfilter_tmpl.o \ ++ looprestoration_tmpl.o \ ++ lr_apply_tmpl.o \ ++ mc_tmpl.o \ ++ recon_tmpl.o \ ++ x86/cdef_init_tmpl.c.o \ ++ x86/ipred_init_tmpl.c.o \ ++ x86/itx_init_tmpl.c.o \ ++ x86/loopfilter_init_tmpl.c.o \ ++ x86/looprestoration_init_tmpl.c.o \ ++ x86/mc_init_tmpl.c.o \ ++ ++BIT8_OBJS=$(call any,$(BIT8_BLD),$(BITS_OBJS)) ++$(BIT8_BLD)/x86/%.c.o: src/x86/%.c ++ $(CC_CC) $(BLD_INCL) -DBITDEPTH=8 -o $@ -c $< ++$(BIT8_BLD)/%.o: src/%.c ++ $(CC_CC) $(BLD_INCL) -DBITDEPTH=8 -o $@ -c $< ++ ++BIT16_OBJS=$(call any,$(BIT16_BLD),$(BITS_OBJS)) ++$(BIT16_BLD)/x86/%.c.o: src/x86/%.c ++ $(CC_CC) $(BLD_INCL) -DBITDEPTH=16 -o $@ -c $< ++$(BIT16_BLD)/%.o: src/%.c ++ $(CC_CC) $(BLD_INCL) -DBITDEPTH=16 -o $@ -c $< ++ ++$(BUILD)/config.h: ++ echo > $@ "#pragma once" ++ echo >> $@ "#define ARCH_AARCH64 0" ++ 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 CONFIG_16BPC 1" ++ echo >> $@ "#define CONFIG_8BPC 1" ++ echo >> $@ "#define CONFIG_LOG 1" ++ echo >> $@ "#define ENDIANNESS_BIG 0" ++ echo >> $@ "#define HAVE_ASM 1" ++ echo >> $@ "#define HAVE_POSIX_MEMALIGN 1" ++ echo >> $@ "#define HAVE_UNISTD_H 1" ++ echo >> $@ "#define STACK_ALIGNMENT 32" ++ ++$(BUILD)/config.asm: ++ echo > $@ "%define ARCH_X86_32 0" ++ echo >> $@ "%define ARCH_X86_64 1" ++ echo >> $@ "%define PIC 1" ++ echo >> $@ "%define STACK_ALIGNMENT 32" ++ ++$(BUILD)/include/vcs_version.h: ++ mkdir -p $(BUILD)/include ++ echo > $@ "#define DAV1D_VERSION \"0.4.0\"" ++ ++$(BUILD)/include/dav1d/version.h: ++ mkdir -p $(BUILD)/include/dav1d ++ echo > $@ "#ifndef DAV1D_VERSION_H" ++ echo >> $@ "#define DAV1D_VERSION_H" ++ echo >> $@ "#define DAV1D_API_VERSION_MAJOR 2" ++ echo >> $@ "#define DAV1D_API_VERSION_MINOR 0" ++ echo >> $@ "#define DAV1D_API_VERSION_PATCH 0" ++ echo >> $@ "#endif /* DAV1D_VERSION_H */" ++ ++$(TOOLS_BLD)/cli_config.h: ++ mkdir -p $(TOOLS_BLD) ++ echo > $@ "#pragma once" ++ echo >> $@ "#define HAVE_CLOCK_GETTIME 1" ++ ++.PHONY: meson_data ++meson_data: ++ make meson_dirs OBJDIR=$(BUILD)/static ++ make meson_dirs OBJDIR=$(BUILD)/shared ++ ln -sf ./include/compat/gcc/stdatomic.h . ++ ++.PHONY: meson_dirs ++meson_dirs: $(OBJDIR) \ ++ $(BUILD)/config.h $(BUILD)/config.asm \ ++ $(BUILD)/include/vcs_version.h \ ++ $(BUILD)/include/dav1d/version.h \ ++ $(TOOLS_BLD)/cli_config.h \ ++ ++LIB_OBJS=$(ENTRY_OBJS) $(NASM_OBJS) $(SRC_OBJS) $(BIT8_OBJS) $(BIT16_OBJS) ++ ++$(STATIC_LIB): DIR?=static ++$(STATIC_LIB): $(LIB_OBJS) ++ rm -f $@ ++ gcc-ar csrD $@ $(LIB_OBJS) ++ ++$(SHARED_LIB): DIR?=shared ++$(SHARED_LIB): $(LIB_OBJS) ++ rm -f $@ ++ cc -o $@ $(LIB_OBJS) $(SHA_OPTS) ++ ++# tools ++DAV1D_OBJS=$(call any,$(TOOLS_BLD),\ ++ dav1d.o \ ++ dav1d_cli_parse.o \ ++ input/annexb.o \ ++ input/ivf.o \ ++ input/input.o \ ++ output/md5.o \ ++ output/null.o \ ++ output/output.o \ ++ output/y4m2.o \ ++ output/yuv.o) ++ ++DAV1DPLAY_OBJS=$(call any,$(TOOLS_BLD),\ ++ dav1dplay.o \ ++ input/annexb.o \ ++ input/ivf.o \ ++ input/input.o) ++ ++$(TOOLS_BLD)/%.o: tools/%.c ++ $(CC_CC) $(TOOLS_INCL) -o $@ -c $< ++ ++DAV1D=$(TOOLS_BLD)/dav1d ++$(DAV1D): $(DAV1D_OBJS) ++ $(CC_CC) -pthread -I$(BUILD) -o $@ $(DAV1D_OBJS) $(STATIC_LIB) ++ ++DAV1DPLAY=$(TOOLS_BLD)/dav1dplay ++$(DAV1DPLAY): $(DAV1DPLAY_OBJS) ++ $(CC_CC) -pthread -o $(TOOLS_BLD)/dav1dplay $(DAV1DPLAY_OBJS) $(STATIC_LIB) -lSDL2 ++ ++TOOLS=$(DAV1D) $(DAV1DPLAY) ++.PHONY: tools ++tools: $(TOOLS) ++ ++# tests ++TESTS_CHKASM=tests/checkasm ++TESTS_CHKASM_BLD=$(TESTS_BLD)/checkasm ++CHKASM_BIT8=$(TESTS_CHKASM_BLD)/bit8 ++CHKASM_BIT16=$(TESTS_CHKASM_BLD)/bit16 ++CHKASM_BITS= \ ++ cdef.o \ ++ ipred.o \ ++ itx.o \ ++ loopfilter.o \ ++ looprestoration.o \ ++ mc.o \ ++ ++CHKASM_BIT8_OBJS=$(call any,$(CHKASM_BIT8),$(CHKASM_BITS)) ++CHKASM_BIT16_OBJS=$(call any,$(CHKASM_BIT16),$(CHKASM_BITS)) ++ ++TESTS_CHKASM_OBJS= \ ++ $(TESTS_CHKASM_BLD)/checkasm.o \ ++ $(TESTS_CHKASM_BLD)/msac.o \ ++ $(CHKASM_BIT8_OBJS) $(CHKASM_BIT16_OBJS) \ ++ $(TESTS_CHKASM_BLD)/x86/checkasm.obj \ ++ ++$(TESTS_CHKASM_BLD)/%.o: $(TESTS_CHKASM)/%.c ++ $(CC_CC) $(BLD_INCL) -o $@ -c $< ++$(CHKASM_BIT8)/%.o: $(TESTS_CHKASM)/%.c ++ $(CC_CC) $(BLD_INCL) -DBITDEPTH=8 -o $@ -c $< ++$(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 \ ++ -I src/ -I $(BUILD)/ -MQ $@ -MF $@.ndep \ ++ $< -o $@ ++ ++CHECKASM=$(TESTS_BLD)/checkasm/checkasm ++$(CHECKASM): $(TESTS_CHKASM_OBJS) $(STATIC_LIB) ++ $(CC_CC) -pthread -o $@ $(TESTS_CHKASM_OBJS) $(STATIC_LIB) -lm ++ ++TESTS_FUZZER=tests/libfuzzer ++TESTS_FUZZER_BLD=$(TESTS_BLD)/libfuzzer ++TESTS_FUZZER_OBJS= \ ++ $(TESTS_FUZZER_BLD)/main.o \ ++ $(TESTS_FUZZER_BLD)/dav1d_fuzzer.o \ ++ ++$(TESTS_FUZZER_BLD)/%.o: $(TESTS_FUZZER)/%.c ++ $(CC_CC) $(BLD_INCL) -o $@ -c $< ++ ++DAV1D_FUZZER=$(TESTS_BLD)/dav1d_fuzzer ++$(DAV1D_FUZZER): $(TESTS_FUZZER_OBJS) $(STATIC_LIB) ++ $(CC_CC) -pthread -o $@ $(TESTS_FUZZER_OBJS) $(STATIC_LIB) ++ ++TESTS=$(CHECKASM) $(DAV1D_FUZZER) ++.PHONY: tests ++tests: $(TESTS) ++ ++$(OBJDIR): ++ mkdir -p $@/include/dav1d \ ++ $(BUILD)/src $(BUILD)/include \ ++ $(ENTRY_BLD) $(NASM_BLD) \ ++ $(SRC_BLD)/x86 $(BIT8_BLD)/x86 $(BIT16_BLD)/x86 \ ++ $(TOOLS_BLD) $(TOOLS_BLD)/input $(TOOLS_BLD)/output \ ++ $(TESTS_CHKASM_BLD)/bit8 $(TESTS_CHKASM_BLD)/bit16 \ ++ $(TESTS_CHKASM_BLD)/x86 $(TESTS_FUZZER_BLD) \ ++ ++clean: ++ rm -rf $(BUILD) ++ ++install: ++ mkdir -p $(DESTDIR)$(LIBDIR) ++ cp -a $(STATIC_LIB) $(DESTDIR)$(LIBDIR) ++ cp -a $(SHARED_LIB) $(DESTDIR)$(LIBDIR) ++ mkdir -p $(DESTDIR)$(INCDIR) ++ cp -a include/dav1d $(DESTDIR)$(INCDIR) ++ rm -f $(DESTDIR)$(INCDIR)/dav1d/meson.build ++ rm -f $(DESTDIR)$(INCDIR)/dav1d/version.h.in ++ cp -a $(BUILD)/include/dav1d/version.h $(DESTDIR)$(INCDIR)/version.h ++ diff --git a/cinelerra-5.1/thirdparty/src/libvpx-1.8.0.tar.xz b/cinelerra-5.1/thirdparty/src/libvpx-1.8.0.tar.xz deleted file mode 100644 index eaee04cf..00000000 Binary files a/cinelerra-5.1/thirdparty/src/libvpx-1.8.0.tar.xz and /dev/null differ diff --git a/cinelerra-5.1/thirdparty/src/libvpx-1.8.1.tar.xz b/cinelerra-5.1/thirdparty/src/libvpx-1.8.1.tar.xz new file mode 100644 index 00000000..caef48da Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/libvpx-1.8.1.tar.xz differ