[vlc-commits] commit: Contrib: update libcaca to beta17 (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug  9 11:50:26 2010 +0200| [ddb682a6fe32caae7a597fff0c3f22195a90c835] | committer: Jean-Baptiste Kempf 

Contrib: update libcaca to beta17

And remove unneeded patch + simplify target for speed-up

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

 extras/contrib/src/Makefile                     |    7 +------
 extras/contrib/src/Patches/libcaca-static.patch |    7 -------
 extras/contrib/src/packages.mak                 |    6 +++---
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 860ab02..ee59b99 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1326,18 +1326,13 @@ libcaca-$(LIBCACA_VERSION).tar.gz:
 
 libcaca: libcaca-$(LIBCACA_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p0 < Patches/libcaca-static.patch
 ifdef HAVE_DARWIN_OS
 	patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
 	(cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig  configure)
 endif
 
 .caca: libcaca
-ifdef HAVE_WIN32
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-win32 --disable-x11 --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && make && make install)
-else
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && make && make install)
-endif
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && cd caca && make && make install)
 	touch $@
 
 CLEAN_FILE += .caca
diff --git a/extras/contrib/src/Patches/libcaca-static.patch b/extras/contrib/src/Patches/libcaca-static.patch
deleted file mode 100644
index 6d6f345..0000000
--- a/extras/contrib/src/Patches/libcaca-static.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- libcaca/caca/caca.pc.in (revision 2878)
-+++ libcaca/caca/caca.pc.in (revision 3647)
-@@ -10,3 +10,4 @@
- Conflicts: 
- Libs: -L${libdir} -lcaca
-+Libs.private: @ZLIB_LIBS@
- Cflags: -I${includedir}
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index ad5e804..aba6ba0 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -113,9 +113,9 @@ LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION)
 GOOM2k4_VERSION=2k4-0
 GOOM2k4_URL=$(CONTRIB_VIDEOLAN)/goom-$(GOOM2k4_VERSION)-src.tar.gz
 #GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
-LIBCACA_VERSION=0.99.beta16
-LIBCACA_URL=$(CONTRIB_VIDEOLAN)/libcaca-$(LIBCACA_VERSION).tar.gz
-#LIBCACA_URL=http://caca.zoy.org/files/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
+LIBCACA_VERSION=0.99.beta17
+#LIBCACA_URL=$(CONTRIB_VIDEOLAN)/libcaca-$(LIBCACA_VERSION).tar.gz
+LIBCACA_URL=http://caca.zoy.org/files/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
 LIBDCA_VERSION=0.0.5
 LIBDCA_URL=ftp://ftp.videolan.org/pub/videolan/libdca/$(LIBDCA_VERSION)/libdca-$(LIBDCA_VERSION).tar.bz2
 LIBDC1394_VERSION=1.2.1