Skip to content
Snippets Groups Projects
Commit 018f0069 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

contrib: use UNPACK in targets using --strip-components=1

They don't actually need some special treatment. They extract properly in the
expected folder given their tarball name.
parent 9b9447af
No related branches found
No related tags found
No related merge requests found
Pipeline #20146 passed with stage
in 1 hour, 34 minutes, and 15 seconds
......@@ -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)
$(UNPACK)
$(MOVE)
.bitstream: bitstream
......
......@@ -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)
$(UNPACK)
ifdef USE_FFMPEG
$(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch
$(APPLY) $(SRC)/ffmpeg/dxva_vc1_crash.patch
......
......@@ -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)
$(UNPACK)
$(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
......
......@@ -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)
$(UNPACK)
$(APPLY) $(SRC)/glslang/glslang-win32.patch
$(APPLY) $(SRC)/glslang/remove-broken-code.patch
$(MOVE)
......
......@@ -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)
$(UNPACK)
$(call pkg_static, "medialibrary.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
......
......@@ -69,9 +69,7 @@ $(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)
$(UNPACK)
$(UPDATE_AUTOCONFIG)
$(APPLY) $(SRC)/x264/x264-winstore.patch
$(MOVE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment