Merge branch 'master' into ffmpeg

5 files changed, 51 insertions, 20 deletions

diff --git a/contrib/fribidi/A02-remove-horrible-hack.patch b/contrib/fribidi/A02-remove-horrible-hack.patch
new file mode 100644
index 000000000..54c6839cd
--- /dev/null
+++ b/contrib/fribidi/A02-remove-horrible-hack.patch
@@ -0,0 +1,17 @@
+diff -Naur fribidi-0.19.7.orig/Makefile.am fribidi-0.19.7/Makefile.am
+--- fribidi-0.19.7.orig/Makefile.am	2015-08-06 16:55:02.000000000 -0400
++++ fribidi-0.19.7/Makefile.am	2017-12-27 19:44:48.000000000 -0500
+@@ -37,12 +37,7 @@
+ 		$(srcdir)/missing \
+ 		$(srcdir)/mkinstalldirs \
+ 		$(srcdir)/ChangeLog \
+-		`find "$(srcdir)" -type f -name Makefile.in -print` \
+-		`$(srcdir)/bootstrap --write-configure`
+-# The last line above is a horrible hack.
+-# GNU Coding Standards recommends that `make maintainer-clean' should not 
+-# remove the configure script.
+-# We instead make configure call bootstrap.
++		`find "$(srcdir)" -type f -name Makefile.in -print`
+ 
+ # Indent all C source and header files, using indent(1):
+ 
diff --git a/contrib/fribidi/A03-no-doc.patch b/contrib/fribidi/A03-no-doc.patch
new file mode 100644
index 000000000..838e5f7d7
--- /dev/null
+++ b/contrib/fribidi/A03-no-doc.patch
@@ -0,0 +1,12 @@
+diff -Naur fribidi-0.19.7.orig/Makefile.am fribidi-0.19.7/Makefile.am
+--- fribidi-0.19.7.orig/Makefile.am	2015-08-06 16:55:02.000000000 -0400
++++ fribidi-0.19.7/Makefile.am	2017-12-27 17:53:09.000000000 -0500
+@@ -11,7 +11,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ ## The order of subdirs is important, don't change without a reason.
+-SUBDIRS = gen.tab charset lib bin doc test
++SUBDIRS = gen.tab charset lib bin test
+ 
+ EXTRA_DIST = bootstrap ChangeLog.old
+ 
diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
index edb7477b0..01db6a1c2 100644
--- a/contrib/fribidi/module.defs
+++ b/contrib/fribidi/module.defs
@@ -5,14 +5,20 @@ endif
 $(eval $(call import.MODULE.defs,FRIBIDI,fribidi))
 $(eval $(call import.CONTRIB.defs,FRIBIDI))
 
-FRIBIDI.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.bz2
-FRIBIDI.FETCH.url    += https://fribidi.org/download/fribidi-0.19.7.tar.bz2
-FRIBIDI.FETCH.sha256  = 08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e
+FRIBIDI.FETCH.url      = https://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.gz
+FRIBIDI.FETCH.url     += https://github.com/fribidi/fribidi/archive/0.19.7.tar.gz
+FRIBIDI.FETCH.sha256   = 3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8
+FRIBIDI.FETCH.basename = fribidi-0.19.7.tar.gz
+
+FRIBIDI.CONFIGURE.bootstrap = ./bootstrap;
+
+ifeq (1,$(BUILD.cross))
+    # force host system compiler for gen.tab, otherwise cross-compiling fails
+    FRIBIDI.CONFIGURE.bootstrap = ./bootstrap; sed -i.bak '/@CC@/s//gcc/' gen.tab/Makefile.in;
+endif
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     FRIBIDI.CONFIGURE.extra = --with-glib=no
 else ifeq (darwin,$(BUILD.system))
     FRIBIDI.CONFIGURE.extra = --with-glib=no
 endif
-
-FRIBIDI.CONFIGURE.bootstrap = ./bootstrap;
diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index f86d076ef..17b1e58ec 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -2,7 +2,7 @@ $(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32))
 $(eval $(call import.CONTRIB.defs,X264))
 
 X264.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20160920-2245-stable.tar.bz2
-X264.FETCH.url    += https://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160920-2245-stable.tar.bz2
+X264.FETCH.url    += https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160920-2245-stable.tar.bz2
 X264.FETCH.sha256  = 6ba2d848eabbca0d9d2c2a12b263e02f856a81fce87fbc74df52a1097c88e39c
 
 X264.GCC.args.c_std =
diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
index 78a5cb054..65ec70516 100644
--- a/contrib/x265/module.defs
+++ b/contrib/x265/module.defs
@@ -42,19 +42,15 @@ X265.SOURCE.libs = \
 	$(X265.BUILD.dir)/10bit/libx265_main10.a \
 	$(X265.BUILD.dir)/12bit/libx265_main12.a
 
-ifeq (darwin, $(BUILD.system))
-    define X265.LINK
-        libtool -static -o $@ $(X265.SOURCE.libs)
-    endef
+ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+    X265.O.ext = .obj
 else
-    X265.arscript = $(X265.BUILD.dir)/script.ar
-    define X265.LINK
-        echo "CREATE $@" > $(X265.arscript)
-        for a in $(X265.SOURCE.libs); do \
-            (echo "ADDLIB $$a" >> $(X265.arscript)); \
-        done
-        echo "SAVE" >> $(X265.arscript)
-        echo "END" >> $(X265.arscript)
-        $(AR.exe) -M < $(X265.arscript)
-    endef
+    X265.O.ext = .o
 endif
+
+define X265.LINK
+    for a in $(X265.SOURCE.libs); do \
+        ($(RM.exe) -rf "$$a"_o && $(MKDIR.exe) -p "$$a"_o && $(AR.exe) x "$$a" && $(MV.exe) *$(X265.O.ext) "$$a"_o && $(AR.exe) cq $@ "$$a"_o/*$(X265.O.ext)); \
+    done
+    $(AR.exe) s $@
+endef