[vlc-devel] [PATCH v2 11/13] contrib: use UNPACK1 in targets using --strip-components=1

[Steve Lhomme]

That was the only reason they were not using UNPACK

set the different UNPACK_DIR for luac
---
 contrib/src/bitstream/rules.mak    |  4 +---
 contrib/src/ffmpeg/rules.mak       |  4 +---
 contrib/src/fxc2/rules.mak         |  4 +---
 contrib/src/glslang/rules.mak      |  4 +---
 contrib/src/lua/rules.mak          | 11 +++++------
 contrib/src/medialibrary/rules.mak |  4 +---
 contrib/src/x264/rules.mak         |  8 ++------
 contrib/src/x265/rules.mak         |  4 +---
 8 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/contrib/src/bitstream/rules.mak b/contrib/src/bitstream/rules.mak
index 0310f8a25bc..9178bfa7739 100644
--- a/contrib/src/bitstream/rules.mak
+++ b/contrib/src/bitstream/rules.mak
@@ -12,9 +12,7 @@ $(TARBALLS)/bitstream-$(BITSTREAM_VERSION).tar.xz:
 	touch $@
 
 bitstream: bitstream-$(BITSTREAM_VERSION).tar.xz .sum-bitstream
-	rm -rf $@-$(BITSTREAM_VERSION) $@
-	mkdir -p $@-$(BITSTREAM_VERSION)
-	tar xvf "$<" --strip-components=1 -C $@-$(BITSTREAM_VERSION)
+	$(UNPACK1)
 	$(MOVE)
 
 .bitstream: bitstream
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index a61adfbb3bc..1a79568aec1 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -229,9 +229,7 @@ $(TARBALLS)/ffmpeg-$(FFMPEG_BASENAME).tar.xz:
 	touch $@
 
 ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
-	rm -Rf $@ $@-$(FFMPEG_BASENAME)
-	mkdir -p $@-$(FFMPEG_BASENAME)
-	tar xvJfo "$<" --strip-components=1 -C $@-$(FFMPEG_BASENAME)
+	$(UNPACK1)
 ifdef USE_FFMPEG
 	$(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch
 	$(APPLY) $(SRC)/ffmpeg/dxva_vc1_crash.patch
diff --git a/contrib/src/fxc2/rules.mak b/contrib/src/fxc2/rules.mak
index 2e48d76df2f..df698842d91 100644
--- a/contrib/src/fxc2/rules.mak
+++ b/contrib/src/fxc2/rules.mak
@@ -14,9 +14,7 @@ $(TARBALLS)/fxc2-$(FXC2_VERSION).tar.xz:
 	touch $@
 
 fxc2: fxc2-$(FXC2_VERSION).tar.xz .sum-fxc2
-	rm -rf $@-$(FXC2_VERSION) $@
-	mkdir -p $@-$(FXC2_VERSION)
-	tar xvf "$<" --strip-components=1 -C $@-$(FXC2_VERSION)
+	$(UNPACK1)
 	$(APPLY) $(SRC)/fxc2/0001-make-Vn-argument-as-optional-and-provide-default-var.patch
 	$(APPLY) $(SRC)/fxc2/0002-accept-windows-style-flags-and-splitted-argument-val.patch
 	$(APPLY) $(SRC)/fxc2/0004-Revert-Fix-narrowing-conversion-from-int-to-BYTE.patch
diff --git a/contrib/src/glslang/rules.mak b/contrib/src/glslang/rules.mak
index 565f8c075d9..3a4d2cc4073 100644
--- a/contrib/src/glslang/rules.mak
+++ b/contrib/src/glslang/rules.mak
@@ -17,9 +17,7 @@ $(TARBALLS)/glslang-$(GLSLANG_BASENAME).tar.xz:
 	touch $@
 
 glslang: glslang-$(GLSLANG_BASENAME).tar.xz .sum-glslang
-	rm -Rf $@ $@-$(GLSLANG_BASENAME)
-	mkdir -p $@-$(GLSLANG_BASENAME)
-	tar xvJf "$<" --strip-components=1 -C $@-$(GLSLANG_BASENAME)
+	$(UNPACK1)
 	$(APPLY) $(SRC)/glslang/glslang-win32.patch
 	$(APPLY) $(SRC)/glslang/remove-broken-code.patch
 	$(MOVE)
diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
index f9315e15941..bd3e1bb68da 100644
--- a/contrib/src/lua/rules.mak
+++ b/contrib/src/lua/rules.mak
@@ -99,13 +99,12 @@ ifdef HAVE_CROSS_COMPILE
 LUACVARS+=CFLAGS="" CPPFLAGS="" LDFLAGS=""
 endif
 
+# DO NOT use the same intermediate directory as the lua target
+luac: UNPACK_DIR=luac-$(LUA_VERSION)
 luac: lua-$(LUA_VERSION).tar.gz .sum-luac
-	# DO NOT use the same intermediate directory as the lua target
-	rm -Rf -- $@-$(LUA_VERSION) $@
-	mkdir -- $@-$(LUA_VERSION)
-	tar -x -v -z -o -C $@-$(LUA_VERSION) --strip-components=1 -f $<
-	(cd luac-$(LUA_VERSION) && patch -p1) < $(SRC)/lua/luac-32bits.patch
-	mv luac-$(LUA_VERSION) luac
+	$(UNPACK1)
+	$(APPLY) $(SRC)/lua/luac-32bits.patch
+	$(MOVE)
 
 .luac: luac
 	cd $< && $(LUACVARS) $(MAKE) generic
diff --git a/contrib/src/medialibrary/rules.mak b/contrib/src/medialibrary/rules.mak
index 1d958318417..f7d9ed75902 100644
--- a/contrib/src/medialibrary/rules.mak
+++ b/contrib/src/medialibrary/rules.mak
@@ -17,9 +17,7 @@ $(TARBALLS)/medialibrary-$(MEDIALIBRARY_VERSION).tar.xz:
 	touch $@
 
 medialibrary: medialibrary-$(MEDIALIBRARY_VERSION).tar.xz .sum-medialibrary
-	rm -rf $@-$(MEDIALIBRARY_VERSION) $@
-	mkdir -p $@-$(MEDIALIBRARY_VERSION)
-	tar xvf "$<" --strip-components=1 -C $@-$(MEDIALIBRARY_VERSION)
+	$(UNPACK1)
 	$(call pkg_static, "medialibrary.pc.in")
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 68472cb9575..026f82bc4d5 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -84,17 +84,13 @@ $(TARBALLS)/$(X264_BASENAME):
 .sum-x264: $(X264_BASENAME)
 
 x264 x26410b: %: $(X264_BASENAME) .sum-%
-	rm -Rf $(UNPACK_DIR)
-	mkdir -p $(UNPACK_DIR)
-	tar xvjfo "$<" --strip-components=1 -C $(UNPACK_DIR)
+	$(UNPACK1)
 	$(UPDATE_AUTOCONFIG)
 	$(APPLY) $(SRC)/x264/x264-winstore.patch
 	$(MOVE)
 
 x262: x262-git.tar.gz .sum-x262
-	rm -Rf $@-git
-	mkdir -p $@-git
-	tar xvzfo "$<" --strip-components=1 -C $@-git
+	$(UNPACK1)
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
diff --git a/contrib/src/x265/rules.mak b/contrib/src/x265/rules.mak
index 308eb4884d1..8a4244ca175 100644
--- a/contrib/src/x265/rules.mak
+++ b/contrib/src/x265/rules.mak
@@ -25,9 +25,7 @@ $(TARBALLS)/x265-$(X265_VERSION).tar.bz2:
 .sum-x265: x265-$(X265_VERSION).tar.bz2
 
 x265: x265-$(X265_VERSION).tar.bz2 .sum-x265
-	rm -Rf $@-$(X265_VERSION)
-	mkdir -p $@-$(X265_VERSION)
-	tar xvjfo "$<" --strip-components=1 -C $@-$(X265_VERSION)
+	$(UNPACK1)
 	$(APPLY) $(SRC)/x265/x265-ldl-linking.patch
 	$(APPLY) $(SRC)/x265/x265-no-pdb-install.patch
 	$(call pkg_static,"source/x265.pc.in")
-- 
2.26.2