Commit 53d5b959 authored by hartman's avatar hartman

* Add taglib to macosx contrib. Use pkg-config for taglib in configure. (if...

* Add taglib to macosx contrib. Use pkg-config for taglib in configure. (if you don't have 1.4 in your distro, too bad, or add something that doesn't rely on /usr/local)
parent ecdf0f1a
......@@ -1582,16 +1582,20 @@ AC_ARG_ENABLE(musicbrainz,
[AC_MSG_WARN(MusicBrainz library not found)])
])
dnl
dnl Taglibplugin
dnl
AC_ARG_ENABLE(taglib,
[ --enable-taglib Taglib support (default disabled) ])
AS_IF([test "x${enable_taglib}" = "xyes"],[
VLC_ADD_PLUGINS([taglib])
VLC_ADD_LDFLAGS([taglib], [-ltag])
VLC_ADD_CXXFLAGS([taglib], [-I/usr/include/taglib])
])
PKG_CHECK_MODULES(TAGLIB, libtag,
[ VLC_ADD_PLUGINS([taglib])
VLC_ADD_LDFLAGS([taglib],[$TAGLIB_LIBS])
VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) ],
[AC_MSG_WARN(TagLib library not found)])
])
dnl
dnl Input plugins
......
......@@ -145,7 +145,7 @@ ifdef HAVE_DARWIN_OS
.dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
.glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
.libdca
.libdca .tag
# .expat .clinkcc don't work with SDK yet
# .glib .libidl .gecko are required to build the mozilla plugin
# .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
......@@ -1961,6 +1961,21 @@ CLEAN_FILE += .unicows
CLEAN_PKG += libunicows
DISTCLEAN_PKG += libunicows-$(UNICOWS_VERSION)-src.tar.gz
# ***************************************************************************
# TagLib read and editing of tags of popular audio formats
# ***************************************************************************
taglib-$(TAGLIB_VERSION).tar.gz:
$(WGET) $(TAGLIB_URL)
taglib: taglib-$(TAGLIB_VERSION).tar.gz
$(EXTRACT_GZ)
.tag: taglib
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
$(INSTALL_NAME)
touch $@
# ***************************************************************************
# Some cleansing
# ***************************************************************************
......
......@@ -175,3 +175,7 @@ PTHREADS_VERSION=2-7-0
PTHREADS_URL=ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
UNICOWS_VERSION=1.1.1
UNICOWS_URL=$(SF)/libunicows/libunicows-$(UNICOWS_VERSION)-src.tar.gz
ZVBI_VERSION=0.2.22
ZVBI_URL=$(SF)/zapping/zvbi-$(ZVBI_VERSION).tar.bz2
TAGLIB_VERSION=1.4
TAGLIB_URL=http://developer.kde.org/~wheeler/files/src/taglib-$(TAGLIB_VERSION).tar.gz
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