[vlc-commits] Contribs: fix xz for OSX

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Nov 15 15:04:56 2011 +0100| [2ce437a18f45f742aea39fc8d2da83a7574b1ae2] | committer: Jean-Baptiste Kempf

Contribs: fix xz for OSX

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2ce437a18f45f742aea39fc8d2da83a7574b1ae2
---

 contrib/src/gecko/rules.mak |    2 +-
 contrib/src/main.mak        |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/gecko/rules.mak b/contrib/src/gecko/rules.mak
index 50e4fa5..49dd12a 100644
--- a/contrib/src/gecko/rules.mak
+++ b/contrib/src/gecko/rules.mak
@@ -8,7 +8,7 @@ NPAPI_HEADERS_SVN_REV := HEAD # revision number, or just HEAD for the latest
 $(TARBALLS)/gecko-svn.tar.xz:
 	rm -Rf gecko-svn
 	$(SVN) export $(NPAPI_HEADERS_SVN_URL) gecko-svn -r $(NPAPI_HEADERS_SVN_REV)
-	tar cvJ gecko-svn > $@
+	tar cv gecko-svn | xz -z > $@
 
 .sum-gecko: gecko-svn.tar.xz
 	$(warning Integrity check skipped.)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index d0e5e16..231461a 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -180,7 +180,7 @@ download_git = \
 	$(GIT) clone $(2:%=--branch %) $(1) $(@:.tar.xz=) && \
 	rm -Rf $(@:%.tar.xz=%)/.git && \
 	(cd $(dir $@) && \
-	 tar cvJ $(notdir $(@:.tar.xz=))) > $@ && \
+	tar cv $(notdir $(@:.tar.xz=)) | xz -z ) > $@ && \
 	rm -Rf $(@:.tar.xz=)
 checksum = \
 	$(foreach f,$(filter $(TARBALLS)/%,$^), \
@@ -192,7 +192,7 @@ CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512)
 UNPACK = $(RM) -R $@ \
 	$(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzf $(f)) \
 	$(foreach f,$(filter %.tar.bz2,$^), && tar xvjf $(f)) \
-	$(foreach f,$(filter %.tar.xz,$^), && tar xvJf $(f)) \
+	$(foreach f,$(filter %.tar.xz,$^), && xzcat $(f) | tar xv ) \
 	$(foreach f,$(filter %.zip,$^), && unzip $(f))
 UNPACK_DIR = $(basename $(basename $(notdir $<)))
 APPLY = (cd $(UNPACK_DIR) && patch -p1) <
@@ -242,7 +242,7 @@ distclean: clean
 
 package: install
 	(cd $(PREFIX)/.. && \
-	tar cvJ $(notdir $(PREFIX))/) > ../vlc-contrib-$(HOST)-$(DATE).tar.xz
+	tar cv $(notdir $(PREFIX))/) | xz -z > ../vlc-contrib-$(HOST)-$(DATE).tar.xz
 
 list:
 	@echo All packages: