[vlc-devel] [PATCH] contrib: x264: Fix build by using UNPACK_DIR

david.fuhrmann at gmail.com david.fuhrmann at gmail.com
Fri Mar 22 08:06:37 CET 2019

From: David Fuhrmann <dfuhrmann at videolan.org>

UNPACK_DIR instead of x264-git is expected for the following
contrib macros (UPDATE_AUTOCONFIG, APPLY).

Fixes build on macOS.


I am not exactly sure why we use the manual tar unpacking here at at all,
using $(UNPACK) also seems to work here.

BR. David

 contrib/src/x264/rules.mak | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 49ca5ab508..68472cb957 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -84,12 +84,12 @@ $(TARBALLS)/$(X264_BASENAME):
 .sum-x264: $(X264_BASENAME)
 x264 x26410b: %: $(X264_BASENAME) .sum-%
-	rm -Rf $*-git
-	mkdir -p $*-git
-	tar xvjfo "$<" --strip-components=1 -C $*-git
+	rm -Rf $(UNPACK_DIR)
+	mkdir -p $(UNPACK_DIR)
+	tar xvjfo "$<" --strip-components=1 -C $(UNPACK_DIR)
 	$(APPLY) $(SRC)/x264/x264-winstore.patch
-	mv $*-git $*
+	$(MOVE)
 x262: x262-git.tar.gz .sum-x262
 	rm -Rf $@-git
2.17.2 (Apple Git-113)

More information about the vlc-devel mailing list