]> git.sesse.net Git - vlc/commitdiff
live-armlinux.patch got accepted by upstream
authorRafaël Carré <rafael.carre@gmail.com>
Sat, 20 Feb 2010 00:02:49 +0000 (01:02 +0100)
committerRafaël Carré <rafael.carre@gmail.com>
Sat, 20 Feb 2010 00:02:49 +0000 (01:02 +0100)
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

extras/contrib/src/Makefile

index 58d8111ce72b272dd144b8e0228890cad8dbe154..6ee76fa76efba414cb9fd7e942e8405ca1a1ea26 100644 (file)
@@ -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)