Commit d3e0b1b2 authored by Konstantin Pavlov's avatar Konstantin Pavlov
Browse files

Contrib: introduce yasm to build x264 on darwin.

Also fix Distributions gitignore.
parent 3744a824
......@@ -14,7 +14,7 @@ info
src/*
# But not our files
!Makefile
!src/Distributions
!src/Distributions/*
!src/Patches
!src/packages.mak
!src/Makefile
......@@ -5,14 +5,14 @@ download-all: autoconf automake libtool cmake gettext pkgconfig freetype2 \
libdvdcss libdvdnav libdvbpsi live libcaca libmodplug xml asa jpeg tiff \
SDL zlib libpng libgpg-error libgcrypt opencdk gnutls libopendaap libcddb \
libcdio vcdimager SDL_image glib gecko-sdk mpcdec dirac expat taglib nasm \
x264 goom lua zvbi fontconfig ncurses all
yasm x264 goom lua zvbi fontconfig ncurses all
all: .autoconf .automake .libtool .cmake .intl .pkgcfg .freetype \
.fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
.dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod .asa \
.png .gpg-error .gcrypt .opencdk .gnutls .opendaap .cddb .cdio .vcdimager \
.SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
.dca .tag .nasm .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal
.dca .tag .nasm .yasm .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal
# .expat .clinkcc don't work with SDK yet
# .glib .IDL .gecko are required to build the mozilla plugin
# .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package
......
......@@ -2252,6 +2252,24 @@ CLEAN_FILE += .nasm
CLEAN_PKG += nasm nasm.cvs
DISTCLEAN_PKG += nasm-$(NASM_VERSION).tar.bz2
# ***************************************************************************
# YASM assembler
# ***************************************************************************
yasm-$(YASM_VERSION).tar.gz:
$(WGET) $(YASM_URL)
yasm: yasm-$(YASM_VERSION).tar.gz
$(EXTRACT_GZ)
.yasm: yasm
(cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install)
touch $@
CLEAN_FILE += .yasm
CLEAN_PKG += yasm
DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.bz2
# ***************************************************************************
# Copy aclocal files
# This is necessary for --missing aclocal to succeed after a
......
......@@ -219,3 +219,5 @@ PCRE_VERSION=7.6
PCRE_URL=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2
FLUID_VERSION=1.0.8
FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz
YASM_VERSION=0.6.2
YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment