add libtiger to the contribs

I've added libtiger to the contribs setup, but since it depends
on Pango and Cairo, building it fully via contribs if those
dependencies are not there already will be tricky.

add kate/tiger to debian, fedora, unix,
as they're quite likely to build and run fine there
both are known to work on fedora
libkate is reported to work on darwin too, but i'll shy
away from adding it there as it's too circumstancial

also, do not run autoconf for libkate, it ships an up to date configure

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

diff --git a/extras/contrib/src/Distributions/debian.mak b/extras/contrib/src/Distributions/debian.mak
index dcfbbd335638fc160a179dfaab939fa4f86cb353..7258feeb66e3b4a671bb58016317986f912c0281 100644 (file)
--- a/extras/contrib/src/Distributions/debian.mak
+++ b/extras/contrib/src/Distributions/debian.mak
@@ -6,6 +6,7 @@ all: .iconv .intl .freetype .fribidi .zlib \
        .png .gpg-error .gcrypt .gnutls .mpcdec \
        .dvdnav .dvbpsi .wxwidgets .dirac \
        .dca .raw1394 .dc1394 .lua .zvbi \
+       .kate .tiger \
        .aclocal 
 #      .SDL_image  .daap .cddb .cdio .vcdimager
 

diff --git a/extras/contrib/src/Distributions/fedora.mak b/extras/contrib/src/Distributions/fedora.mak
index f80df93ff7b48aa60f224a0f08318c1389e93729..69b8eb36ef52e4b3a34016fa62c583892ead45c0 100644 (file)
--- a/extras/contrib/src/Distributions/fedora.mak
+++ b/extras/contrib/src/Distributions/fedora.mak
@@ -5,5 +5,5 @@ all: .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .live .goom2k4 .caca .mod .x264  .xml .twolame \
        .mpcdec \
        .dvbpsi .dirac .schroedinger \
-       .dca .lua .zvbi
+       .dca .lua .zvbi .kate .tiger
 

diff --git a/extras/contrib/src/Distributions/unix.mak b/extras/contrib/src/Distributions/unix.mak
index 28f7875d2602ce586b434f5861738d603a1340b7..5eafb057a0627d44670e50ffa02e46ab7d86023b 100644 (file)
--- a/extras/contrib/src/Distributions/unix.mak
+++ b/extras/contrib/src/Distributions/unix.mak
@@ -6,6 +6,7 @@ all: .iconv .intl .freetype .fribidi .zlib \
        .png .gpg-error .gcrypt .gnutls .mpcdec \
        .dvdnav .dvbpsi .wxwidgets .dirac \
        .dca .raw1394 .dc1394 .lua .zvbi \
+       .kate .tiger \
        .aclocal
 #      .png .gpg-error .gcrypt .gnutls .mpcdec \
 #      .SDL_image  .daap .cddb .cdio .vcdimager

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6b4dc5bd3f43e13b91b1833f912024f8f705d8c0..2e90df86859d5df6ec22e93713fe7f1fe4f4d028 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2302,7 +2302,6 @@ libkate-$(KATE_VERSION).tar.gz:
 
 libkate: libkate-$(KATE_VERSION).tar.gz
        $(EXTRACT_GZ)
-       (cd $@; autoconf)
 
 .kate: libkate .ogg
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-valgrind && make && make install)
@@ -2313,6 +2312,25 @@ CLEAN_FILE += .kate
 CLEAN_PKG += libkate
 DISTCLEAN_PKG += libkate-$(KATE_VERSION).tar.gz
 
+# ***************************************************************************
+# tiger
+# ***************************************************************************
+
+libtiger-$(TIGER_VERSION).tar.gz:
+       $(WGET) $(TIGER_URL)
+
+libtiger: libtiger-$(TIGER_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.tiger: libtiger .kate
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       $(INSTALL_NAME)
+       touch $@
+
+CLEAN_FILE += .tiger
+CLEAN_PKG += libtiger
+DISTCLEAN_PKG += libtiger-$(TIGER_VERSION).tar.gz
+
 # ***************************************************************************
 # Copy aclocal files
 # This is necessary for --missing aclocal to succeed after a

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 5325264788c148fd097fd0d695ff47795c61bb2c..bf0e5188a20f0cbce7e44575b429e06b8fd31fc7 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -224,6 +224,8 @@ YASM_URL=$(VIDEOLAN)/testing/contrib/yasm-$(YASM_VERSION).tar.gz
 #YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
 KATE_VERSION=0.1.7
 KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz
+TIGER_VERSION=0.3.1
+TIGER_URL=http://libtiger.googlecode.com/files/libtiger-$(TIGER_VERSION).tar.gz
 OIL_VERSION=0.3.15
 OIL_URL=http://liboil.freedesktop.org/download/liboil-$(OIL_VERSION).tar.gz
 SCHROED_VERSION=1.0.4