Update xvid to 1.3.7

Author: PeacefullyDisturbed

cross_compile_ffmpeg.sh

@@ -1582,14 +1582,11 @@ build_libxavs() {
 }
 
 build_libxvid() {
-  download_and_unpack_file https://downloads.xvid.com/downloads/xvidcore-1.3.5.tar.gz xvidcore
+  download_and_unpack_file https://downloads.xvid.com/downloads/xvidcore-1.3.7.tar.gz xvidcore
   cd xvidcore/build/generic
-    apply_patch file://$patch_dir/xvidcore-1.3.4_static-lib.diff
+    apply_patch file://$patch_dir/xvidcore-1.3.7_static-lib.patch
     do_configure "--host=$host_target --prefix=$mingw_w64_x86_64_prefix" # no static option...
-    #sed -i.bak "s/-mno-cygwin//" platform.inc # remove old compiler flag that now apparently breaks us # Not needed for static library, but neither anymore for shared library (see 'configure#L5010').
-    cpu_count=1 # possibly can't build this multi-thread ? http://betterlogic.com/roger/2014/02/xvid-build-woe/
     do_make_and_make_install
-    cpu_count=$original_cpu_count
   cd ../../..
 }
 

patches/xvidcore-1.3.4_static-lib.diff renamed to patches/xvidcore-1.3.7_static-lib.patch

@@ -1,7 +1,6 @@
-diff -ur configure.bak configure
---- configure.bak	2015-06-21 16:21:32.000000000 +0200
-+++ configure	2017-04-24 21:53:57.687500000 +0200
-@@ -4386,9 +4386,6 @@
+--- configure.bak	2020-05-12 05:13:28.807925301 +0000
++++ configure	2020-05-12 05:13:59.064156649 +0000
+@@ -4393,9 +4393,6 @@
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
  $as_echo "ok" >&6; }
  	STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
@@ -11,9 +10,8 @@ diff -ur configure.bak configure
  	;;
       darwin*)
  	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
-diff -ur Makefile.bak Makefile
---- Makefile.bak	2015-06-21 16:21:32.000000000 +0200
-+++ Makefile	2017-04-24 21:57:39.875000000 +0200
+--- Makefile.bak	2020-05-12 05:33:28.220701803 +0000
++++ Makefile	2020-05-12 05:34:39.513211648 +0000
 @@ -70,7 +70,7 @@
 
  .SUFFIXES: .$(OBJECT_EXTENSION) .$(ASSEMBLY_EXTENSION) .c
@@ -23,7 +21,7 @@ diff -ur Makefile.bak Makefile
  	@echo
  	@echo "---------------------------------------------------------------"
  	@echo " Xvid has been successfully built."
-@@ -116,31 +116,10 @@
+@@ -116,54 +116,18 @@
  	@cd $(BUILD_DIR) && $(AR) rc $(@F) $(OBJECTS) && $(RANLIB) $(@F)
 
  #-----------------------------------------------------------------------------
@@ -56,10 +54,10 @@ diff -ur Makefile.bak Makefile
  	@echo "  D: $(includedir)"
  	@$(INSTALL) -d $(DESTDIR)$(includedir)
  	@echo "  I: $(includedir)/xvid.h"
-@@ -148,22 +127,7 @@
+ 	@$(INSTALL) -m 644 $(SRC_DIR)/xvid.h $(DESTDIR)$(includedir)/xvid.h
  	@echo "  D: $(libdir)"
  	@$(INSTALL) -d $(DESTDIR)$(libdir)
- 	@echo "  I: $(libdir)/$(STATIC_LIB)"
+-	@echo "  I: $(libdir)/$(STATIC_LIB)"
 -	@$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
 -ifeq ($(SHARED_EXTENSION),dll)
 -	@echo "  I: $(libdir)/$(SHARED_LIB).a"
@@ -76,6 +74,7 @@ diff -ur Makefile.bak Makefile
 -	@test -z "$(SO_LINK)" || \
 -		$(LN_S) $(SHARED_LIB) $(DESTDIR)$(libdir)/$(SO_LINK)
 -endif
++	@echo "  I: $(libdir)/libxvidcore.a"
 +	@$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/libxvidcore.a
 
  #-----------------------------------------------------------------------------