Changeset 5d12aaf8536f78a339abceede842f7c78536d670

Show
Ignore:
Timestamp:
13/11/07 05:58:42 (1 year ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1194929922 +0000
git-parent:

[a4fa3c64f29098e3e3342d2a693cd14cb8e613db]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1194929922 +0000
Message:

Contribs: jump to faad 2.6.1. The patch is useless, but don't remove it might still be usefull.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Makefile

    rc37287d r5d12aaf  
    878878#   (cd $@; sh ./bootstrap) 
    879879 
    880 faad2-$(FAAD2_VERSION).tar.bz2: 
     880faad2-$(FAAD2_VERSION).tar.gz: 
    881881    $(WGET) $(FAAD2_URL) 
    882882 
    883 faad: faad2-$(FAAD2_VERSION).tar.bz2 
    884     $(EXTRACT_BZ2) 
    885     (cd $@; patch -p1 < ../Patches/faad2.patch && ./bootstrap) 
    886  
    887 .faad: faad 
     883faad2: faad2-$(FAAD2_VERSION).tar.gz 
     884    $(EXTRACT_GZ) 
     885    (cd $@; ./bootstrap) 
     886 
     887.faad: faad2 
    888888    (cd $< && $(HOSTCC) ./configure $(HOSTCONF) --disable-shared --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install) 
    889889    touch $@ 
    890890 
    891891CLEAN_FILE += .faad 
    892 CLEAN_PKG += faad 
    893 DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.bz2 
     892CLEAN_PKG += faad2 
     893DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz 
    894894 
    895895# *************************************************************************** 

  • extras/contrib/src/packages.mak

    rc37287d r5d12aaf  
    8282SHOUT_VERSION=2.2.2 
    8383SHOUT_URL=http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz 
    84 FAAD2_VERSION=20040923 
    85 FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2 
     84FAAD2_VERSION=2.6.1 
     85FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz 
     86#FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2 
    8687FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac 
    8788FAAC_VERSION=1.26