Commit e52025ed authored by VideoLAN's avatar VideoLAN Committed by Rafaël Carré

build asa on darwin add pcre contrib (needed for asa) install fontconfig.pc on darwin

Signed-off-by: Rafaël Carré's avatarRafaël Carré <funman@videolan.org>
parent 5b968686
......@@ -2,7 +2,7 @@
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 \
.dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod .asa \
.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager \
.SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
.dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal
......
......@@ -450,7 +450,7 @@ ifdef HAVE_WIN32
endif
else
ifdef HAVE_DARWIN_OS
(cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-confdir=/etc/fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data))
(cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-confdir=/etc/fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc $(PKG_CONFIG_LIBDIR))
else
(cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
endif
......@@ -573,6 +573,24 @@ CLEAN_FILE += .id3tag
CLEAN_PKG += libid3tag
DISTCLEAN_PKG += libid3tag-$(LIBID3TAG_VERSION).tar.gz
# ***************************************************************************
# pcre
# ***************************************************************************
pcre-$(PCRE_VERSION).tar.bz2:
$(WGET) $(PCRE_URL)
pcre: pcre-$(PCRE_VERSION).tar.bz2
$(EXTRACT_BZ2)
.pcre: pcre
(cd $<; ./configure --prefix=$(PREFIX) --disable-shared && $(HOSTCC) make && make install )
touch $@
CLEAN_FILE += .pcre
CLEAN_PKG += pcre
DISTCLEAN_PKG += pcre-$(PCRE_VERSION).tar.bz2
# ***************************************************************************
# lua
# ***************************************************************************
......@@ -2309,9 +2327,11 @@ asa.git.tar.gz:
asa: asa.git.tar.gz
$(EXTRACT_GZ)
patch -p0 < Patches/asa-git.diff
.asa: asa
.asa: asa .fontconfig .pcre
(cd $<; ./bootstrap; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
$(INSTALL_NAME)
touch $@
CLEAN_FILE += .asa
......
diff -ur asa.orig/lib/Makefile.am asa/lib/Makefile.am
--- asa.orig/lib/Makefile.am 2007-08-31 17:26:54.000000000 +0200
+++ asa/lib/Makefile.am 2008-03-08 23:17:27.000000000 +0100
@@ -25,7 +25,9 @@
echo obj $(objname) pic $(picname)
$(NASM) -f elf $(ASMOPT) -o ${picname} $^
$(NASM) -f elf $(ASMOPT) -DNO_PIC -o ${objname} $^
- echo -e "# Generated by libtool\npic_object='../${picname}'\nnon_pic_object='../${objname}'" > $@
+ echo "# Generated by libtool" > $@
+ echo "pic_object='../${picname}'" >> $@
+ echo "non_pic_object='../${objname}'" >> $@
noinst_HEADERS = blitter_internal.h
lib_LTLIBRARIES = libasa.la
@@ -51,11 +53,12 @@
../csri/subhelp/libsubhelp_la-openfile.lo \
../csri/subhelp/libsubhelp_la-logging.lo \
import/libimport.la \
+ $(PCRE_LIBS) \
$(ASM)
libasa_la_LDFLAGS = -version-info 0:0:0 -no-undefined
install-exec-hook:
- test -z "$(csrilibdir)" || $(MKDIR_P) "$(DESTDIR)$(csrilibdir)"
+ test -z "$(csrilibdir)" || $(mkdir_p) "$(DESTDIR)$(csrilibdir)"
$(LN_S) $(libdir)/libasa.so.0 \
$(DESTDIR)$(csrilibdir)/asa_csri.so
diff -ur asa.orig/lib/import/Makefile.am asa/lib/import/Makefile.am
--- asa.orig/lib/import/Makefile.am 2007-08-31 17:26:54.000000000 +0200
+++ asa/lib/import/Makefile.am 2008-03-08 23:01:50.000000000 +0100
@@ -1,6 +1,6 @@
if IMPORTS_PREP
noinst_PROGRAMS = preparse
-preparse_LDFLAGS = -limportparser
+preparse_LDFLAGS = -limportparser $(PCRE_LIBS)
BUILT_SOURCES = imports_prep.h
imports_prep.h: $(srcdir)/imports libimportparser.la preparse
......@@ -212,3 +212,5 @@ LUA_URL=http://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz
NCURSES_VERSION=5.6
NCURSES_URL=$(GNU)/ncurses/ncurses-$(NCURSES_VERSION).tar.gz
ASA_URL="http://git.spaceboyz.net/asa.git/?p=asa.git;a=snapshot;"
PCRE_VERSION=7.6
PCRE_URL=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2
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