Commit ddb682a6 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contrib: update libcaca to beta17

And remove unneeded patch + simplify target for speed-up
parent a284d05a
...@@ -1326,18 +1326,13 @@ libcaca-$(LIBCACA_VERSION).tar.gz: ...@@ -1326,18 +1326,13 @@ libcaca-$(LIBCACA_VERSION).tar.gz:
libcaca: libcaca-$(LIBCACA_VERSION).tar.gz libcaca: libcaca-$(LIBCACA_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -p0 < Patches/libcaca-static.patch
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
(cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig configure) (cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig configure)
endif endif
.caca: libcaca .caca: libcaca
ifdef HAVE_WIN32 (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && cd caca && make && make install)
(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
touch $@ touch $@
CLEAN_FILE += .caca CLEAN_FILE += .caca
......
--- 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}
...@@ -113,9 +113,9 @@ LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION) ...@@ -113,9 +113,9 @@ LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION)
GOOM2k4_VERSION=2k4-0 GOOM2k4_VERSION=2k4-0
GOOM2k4_URL=$(CONTRIB_VIDEOLAN)/goom-$(GOOM2k4_VERSION)-src.tar.gz GOOM2k4_URL=$(CONTRIB_VIDEOLAN)/goom-$(GOOM2k4_VERSION)-src.tar.gz
#GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz #GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
LIBCACA_VERSION=0.99.beta16 LIBCACA_VERSION=0.99.beta17
LIBCACA_URL=$(CONTRIB_VIDEOLAN)/libcaca-$(LIBCACA_VERSION).tar.gz #LIBCACA_URL=$(CONTRIB_VIDEOLAN)/libcaca-$(LIBCACA_VERSION).tar.gz
#LIBCACA_URL=http://caca.zoy.org/files/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz LIBCACA_URL=http://caca.zoy.org/files/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
LIBDCA_VERSION=0.0.5 LIBDCA_VERSION=0.0.5
LIBDCA_URL=ftp://ftp.videolan.org/pub/videolan/libdca/$(LIBDCA_VERSION)/libdca-$(LIBDCA_VERSION).tar.bz2 LIBDCA_URL=ftp://ftp.videolan.org/pub/videolan/libdca/$(LIBDCA_VERSION)/libdca-$(LIBDCA_VERSION).tar.bz2
LIBDC1394_VERSION=1.2.1 LIBDC1394_VERSION=1.2.1
......
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