[vlc-devel] commit: add libtiger to the contribs (ogg.k.ogg.k )

git version control git at videolan.org
Sun Dec 28 11:26:18 CET 2008


vlc | branch: master | ogg.k.ogg.k <ogg.k.ogg.k at googlemail.com> | Sat Dec 13 11:44:23 2008 +0000| [de0146e47e8b423ec60f431140e102179c07a363] | committer: Rémi Denis-Courmont 

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 at simphalempin.com>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=de0146e47e8b423ec60f431140e102179c07a363
---

 extras/contrib/src/Distributions/debian.mak |    1 +
 extras/contrib/src/Distributions/fedora.mak |    2 +-
 extras/contrib/src/Distributions/unix.mak   |    1 +
 extras/contrib/src/Makefile                 |   20 +++++++++++++++++++-
 extras/contrib/src/packages.mak             |    2 ++
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/Distributions/debian.mak b/extras/contrib/src/Distributions/debian.mak
index dcfbbd3..7258fee 100644
--- 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 f80df93..69b8eb3 100644
--- 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 28f7875..5eafb05 100644
--- 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 6b4dc5b..2e90df8 100644
--- 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)
@@ -2314,6 +2313,25 @@ 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
 # configure.ac/Makefile.am change in the vlc root dir
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 5325264..bf0e518 100644
--- 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




More information about the vlc-devel mailing list