[vlc-commits] Contribs: update taglib to 1.7 and to cmake

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Apr  2 12:48:13 2011 +0200| [0946623c6eb5fb3ee42a1170d1ca1f931fa59edb] | committer: Jean-Baptiste Kempf

Contribs: update taglib to 1.7 and to cmake

But seriously, how is:
 -DENABLE_STATIC:BOOL=ON -DWITH_ASF:BOOL=ON -DWITH_MP4:BOOL=ON
better
 --enable-mp4 --enable-asf --enable-static

Maybe some people should know that we have case-sensitive support since
30 years...

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

 extras/contrib/src/contrib-src.mak |    2 +-
 extras/contrib/src/packages.mak    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 47344c6..7838685 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2256,7 +2256,7 @@ ifdef HAVE_CYGWIN
 endif
 
 .tag: taglib
-	(cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --enable-mp4 --enable-asf --prefix=$(PREFIX) && make && make install)
+	(cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DENABLE_STATIC:BOOL=ON -DWITH_ASF:BOOL=ON -DWITH_MP4:BOOL=ON && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index c873800..6605276 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -197,7 +197,7 @@ PTHREADS_VERSION=2-8-0
 PTHREADS_URL=ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
 ZVBI_VERSION=0.2.30
 ZVBI_URL=$(SF)/zapping/zvbi-$(ZVBI_VERSION).tar.bz2
-TAGLIB_VERSION=1.6.3
+TAGLIB_VERSION=1.7
 TAGLIB_URL=http://developer.kde.org/~wheeler/files/src/taglib-$(TAGLIB_VERSION).tar.gz
 LUA_VERSION=5.1.4
 LUA_URL=http://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz