[vlc-devel] commit: live-armlinux.patch got accepted by upstream ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sat Feb 20 01:02:49 2010 +0100| [1d3327067a68bf6ef9f5f0a6ca9799d32f6d2cad] | committer: Rafaël Carré 

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

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

 extras/contrib/src/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 58d8111..6ee76fa 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)