From: Rafaël Carré <rafael.carre@gmail.com>
Date: Sat, 20 Feb 2010 00:02:49 +0000 (+0100)
Subject: live-armlinux.patch got accepted by upstream
X-Git-Tag: 1.1.0-pre1~834
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1d3327067a68bf6ef9f5f0a6ca9799d32f6d2cad;p=vlc

live-armlinux.patch got accepted by upstream

So apply it unconditionally so when the new release is here it will be
spotted and removed faster.
http://lists.live555.com/pipermail/live-devel/2010-February/011820.html
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 58d8111ce7..6ee76fa76e 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1217,6 +1217,7 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	patch -p0 < Patches/live-uselocale.patch
+	patch -p0 < Patches/live-armlinux.patch
 ifdef HAVE_WIN64
 	patch -p0 < Patches/live-win64.patch
 endif
@@ -1240,7 +1241,6 @@ ifdef HAVE_BIGENDIAN
 endif
 else
 ifeq ($(ARCH),armel)
-	patch -p0 < Patches/live-armlinux.patch
 	(cd $<; ./genMakefiles armlinux && make $(HOSTCC))
 else
 	(cd $<; sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux)