summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2015-04-19 20:09:33 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-04-19 23:10:31 +0200
commita894d51038a611f2f923d37f37c69e780fe1c48b (patch)
tree1f3a23ea7699f68a3d7dd5917f462f88c9caac7f
parent5da6f1a08e54c9d8bf9a3b048aca3a4d6e64c065 (diff)
downloadbuildroot-a894d51038a611f2f923d37f37c69e780fe1c48b.tar.gz
buildroot-a894d51038a611f2f923d37f37c69e780fe1c48b.zip
package/libmatroska: bump version to 1.4.2
Package now uses GNU autoconf infrastructure. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/libmatroska/libmatroska.mk27
1 files changed, 2 insertions, 25 deletions
diff --git a/package/libmatroska/libmatroska.mk b/package/libmatroska/libmatroska.mk
index 778e74c3c4..1086e87638 100644
--- a/package/libmatroska/libmatroska.mk
+++ b/package/libmatroska/libmatroska.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBMATROSKA_VERSION = 1.3.0
+LIBMATROSKA_VERSION = 1.4.2
LIBMATROSKA_SOURCE = libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
LIBMATROSKA_SITE = http://dl.matroska.org/downloads/libmatroska
LIBMATROSKA_INSTALL_STAGING = YES
@@ -12,27 +12,4 @@ LIBMATROSKA_LICENSE = LGPLv2.1+
LIBMATROSKA_LICENSE_FILES = LICENSE.LGPL
LIBMATROSKA_DEPENDENCIES = libebml
-ifeq ($(BR2_STATIC_LIBS),y)
-LIBMATROSKA_MAKE_TARGETS = staticlib
-LIBMATROSKA_MAKE_INSTALL_TARGETS = install_staticlib install_headers
-else
-LIBMATROSKA_MAKE_TARGETS = staticlib sharedlib
-LIBMATROSKA_MAKE_INSTALL_TARGETS = install_staticlib install_sharedlib install_headers
-endif
-
-define LIBMATROSKA_BUILD_CMDS
- $(MAKE) -C $(@D)/make/linux CROSS="$(CCACHE) $(TARGET_CROSS)" \
- $(LIBMATROSKA_MAKE_TARGETS)
-endef
-
-define LIBMATROSKA_INSTALL_STAGING_CMDS
- $(MAKE) -C $(@D)/make/linux prefix=$(STAGING_DIR)/usr \
- $(LIBMATROSKA_MAKE_INSTALL_TARGETS)
-endef
-
-define LIBMATROSKA_INSTALL_TARGET_CMDS
- $(MAKE) -C $(@D)/make/linux prefix=$(TARGET_DIR)/usr \
- $(LIBMATROSKA_MAKE_INSTALL_TARGETS)
-endef
-
-$(eval $(generic-package))
+$(eval $(autotools-package))
OpenPOWER on IntegriCloud