Typo

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 01f6a209a7672efa1e66138b5b080372d50dc5e0..97cf1b78a8c0585f2606171f824c62798f8315a1 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -560,25 +560,25 @@ DISTCLEAN_PKG += a52dec-$(A52DEC_VERSION).tar.gz
 #      cvs -d $(MPEG2DEC_CVSROOT) co mpeg2dec
 #      (cd $@; ./bootstrap)
 
-mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
-       $(WGET) $(MPEG2DEC_URL)
+libmpeg2-$(LIBMPEG2_VERSION).tar.gz:
+       $(WGET) $(LIBMPEG2_URL)
 
 # It is easier to use bootstrapped versions...
 #mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
 #      $(WGET) $(MPEG2DEC_SNAPSHOT)
 #      mv mpeg2dec-$(MPEG2DEC_DATE).tar.gz $@
 
-mpeg2dec: mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
+libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-.mpeg2: mpeg2dec
+.mpeg2: libmpeg2
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-x --disable-sdl && cd libmpeg2 && make && make install && cd ../include && make && make install)
        touch $@
 
 CLEAN_FILE += .mpeg2
-CLEAN_PKG += mpeg2dec
+CLEAN_PKG += libmpeg2
 #DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION)-cvs.tar.gz
-DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
+DISTCLEAN_PKG += libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 
 # ***************************************************************************
 # libid3tag
@@ -1252,6 +1252,7 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p0 < Patches/live-noapps.patch
+       patch -p0 < Patches/live-uselocale.patch
 
 .live: live
 ifdef HAVE_WIN32  
@@ -2388,7 +2389,7 @@ asa: asa.git.tar.gz
 
 .asa: asa .fontconfig .pcre .iconv
        (cd $<; ./bootstrap; $(HOSTCC) CFLAGS="$(CFLAGS) -DPCRE_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX))
-       (cd $</lib/import; make || (echo "Please copy a ./prepare file you built for your host into asa/lib/import"; echo "When you are finished, press enter." ; echo "If you are building natively, press enter." ; read i ; make) )
+       (cd $</lib/import; make || (echo "Please copy a ./preparse file you built for your host into asa/lib/import"; echo "When you are finished, press enter." ; echo "If you are building natively, press enter." ; read i ; make) )
        (cd $<; make && make install)
        $(INSTALL_NAME)
        touch $@
@@ -2427,7 +2428,7 @@ liboil: liboil-$(OIL_VERSION).tar.gz
        patch -d liboil -p1 < Patches/liboil-noshared.patch
 
 .liboil: liboil
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2" && make && make install)
        touch $@
 
 CLEAN_FILE += .liboil