Changeset d3e0b1b2fe91e06fefd175cd267103bec56b6f55

Show
Ignore:
Timestamp:
04/13/08 19:37:33 (5 months ago)
Author:
Pavlov Konstantin <thresh@videolan.org>
git-committer:
Pavlov Konstantin <thresh@videolan.org> 1208108253 +0400
git-parent:

[3744a824d1a783139de4a7d57d3931d3ec8ae887]

git-author:
Pavlov Konstantin <thresh@videolan.org> 1208108140 +0400
Message:

Contrib: introduce yasm to build x264 on darwin.
Also fix Distributions gitignore.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/.gitignore

    r3744a82 rd3e0b1b  
    1515# But not our files 
    1616!Makefile 
    17 !src/Distributions 
     17!src/Distributions/* 
    1818!src/Patches 
    1919!src/packages.mak 

  • extras/contrib/src/Distributions/darwin.mak

    r3496984 rd3e0b1b  
    66    SDL zlib libpng libgpg-error libgcrypt opencdk gnutls libopendaap libcddb \ 
    77    libcdio vcdimager SDL_image glib gecko-sdk mpcdec dirac expat taglib nasm \ 
    8     x264 goom lua zvbi fontconfig ncurses all 
     8    yasm x264 goom lua zvbi fontconfig ncurses all 
    99all: .autoconf .automake .libtool .cmake .intl .pkgcfg .freetype \ 
    1010    .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ 
    …… 
    1313    .png .gpg-error .gcrypt .opencdk .gnutls .opendaap .cddb .cdio .vcdimager \ 
    1414    .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \ 
    15     .dca .tag .nasm .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal 
     15    .dca .tag .nasm .yasm .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal 
    1616# .expat .clinkcc don't work with SDK yet 
    1717# .glib .IDL .gecko are required to build the mozilla plugin 

  • extras/contrib/src/Makefile

    r29dde6a rd3e0b1b  
    22542254 
    22552255# *************************************************************************** 
     2256# YASM assembler 
     2257# *************************************************************************** 
     2258 
     2259yasm-$(YASM_VERSION).tar.gz: 
     2260    $(WGET) $(YASM_URL) 
     2261 
     2262yasm: yasm-$(YASM_VERSION).tar.gz 
     2263    $(EXTRACT_GZ) 
     2264 
     2265.yasm: yasm 
     2266    (cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install) 
     2267    touch $@ 
     2268 
     2269CLEAN_FILE += .yasm 
     2270CLEAN_PKG += yasm 
     2271DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.bz2 
     2272 
     2273# *************************************************************************** 
    22562274# Copy aclocal files 
    22572275# This is necessary for --missing aclocal to succeed after a 

  • extras/contrib/src/packages.mak

    r713c078 rd3e0b1b  
    220220FLUID_VERSION=1.0.8 
    221221FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz 
     222YASM_VERSION=0.6.2 
     223YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz