Commit 945b5356 authored by Sven Neumann's avatar Sven Neumann Committed by Peter Korsgaard
Browse files

taglib: bump to 1.7 



Bump the version of taglib to 1.7. This version does not any longer
ship with a configure script so convert the package from autotargets
to cmaketargets.

The 1.7 version offers optional support for MP4 and WMA files.
Expose these options in buildroot.

[Peter: drop unneded dependencies, keep target install, fix Config.in indent]
Signed-off-by: default avatarSven Neumann <s.neumann@raumfeld.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 6c213d64

package/multimedia/taglib/Config.in

+9 −0
Original line number Diff line number Diff line 


config BR2_PACKAGE_TAGLIB

	bool "taglib"

	depends on BR2_INSTALL_LIBSTDCPP
@@ -9,5 +10,13 @@ config BR2_PACKAGE_TAGLIB 


	  http://developer.kde.org/~wheeler/taglib.html



config BR2_PACKAGE_TAGLIB_MP4

	depends on BR2_PACKAGE_TAGLIB

	bool "taglib mp4 support"



config BR2_PACKAGE_TAGLIB_ASF

	depends on BR2_PACKAGE_TAGLIB

	bool "taglib wma support"



comment "taglib requires a toolchain with C++ support enabled"

	depends on !BR2_INSTALL_LIBSTDCPP

package/multimedia/taglib/taglib-1.5-libtool.patch

deleted100644 → 0
+0 −4084

File deleted.

Preview size limit exceeded, changes collapsed.

package/multimedia/taglib/taglib.mk

+8 −8
Original line number Diff line number Diff line
@@ -3,18 +3,18 @@ 
# taglib

#

#############################################################

TAGLIB_VERSION = 1.5

TAGLIB_VERSION = 1.7

TAGLIB_SOURCE = taglib-$(TAGLIB_VERSION).tar.gz

TAGLIB_SITE = http://developer.kde.org/~wheeler/files/src

TAGLIB_LIBTOOL_PATCH = NO

TAGLIB_INSTALL_STAGING = YES



TAGLIB_CONF_ENV = \

	DO_NOT_COMPILE='bindings tests examples' \

	ac_cv_header_cppunit_extensions_HelperMacros_h=no \

	ac_cv_header_zlib_h=$(if $(BR2_PACKAGE_ZLIB),yes,no)

ifeq ($(BR2_PACKAGE_TAGLIB_ASF),y)

TAGLIB_CONF_OPT += -DWITH_ASF=ON

endif



TAGLIB_CONF_OPT = --disable-libsuffix

ifeq ($(BR2_PACKAGE_TAGLIB_MP4),y)

TAGLIB_CONF_OPT += -DWITH_MP4=ON

endif



define TAGLIB_REMOVE_DEVFILE

	rm -f $(TARGET_DIR)/usr/bin/taglib-config
@@ -24,4 +24,4 @@ ifneq ($(BR2_HAVE_DEVFILES),y) 
TAGLIB_POST_INSTALL_TARGET_HOOKS += TAGLIB_REMOVE_DEVFILE

endif



$(eval $(call AUTOTARGETS,package/multimedia,taglib))
 
$(eval $(call CMAKETARGETS,package/multimedia,taglib))