diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-01-09 00:09:36 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-01-09 00:09:36 (GMT) |
| commit | bc0b269799787fa57ade5d6354a7ffd8302bb3ad (patch) | |
| tree | 78ad287be72714e0153694fa6b4157fd65e010d8 | |
| parent | b01046d648b52b88529d04f72b2bd84854417592 (diff) | |
| parent | c04bcada4399cc16b17670e5a0668a48b42fba88 (diff) | |
| download | mxe-bc0b269799787fa57ade5d6354a7ffd8302bb3ad.zip mxe-bc0b269799787fa57ade5d6354a7ffd8302bb3ad.tar.gz mxe-bc0b269799787fa57ade5d6354a7ffd8302bb3ad.tar.bz2 | |
Merge pull request #1153 from LuaAndC/update-taglib
update taglib from 1.7.2 to 1.10
| -rw-r--r-- | src/taglib-1-static.patch | 23 | ||||
| -rw-r--r-- | src/taglib.mk | 14 |
2 files changed, 5 insertions, 32 deletions
diff --git a/src/taglib-1-static.patch b/src/taglib-1-static.patch deleted file mode 100644 index 8a3d6b1..0000000 --- a/src/taglib-1-static.patch +++ /dev/null @@ -1,23 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: -https://bugs.kde.org/show_bug.cgi?id=268441 - -diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt -index 79c7a6b..fa4056d 100644 ---- a/bindings/c/CMakeLists.txt -+++ b/bindings/c/CMakeLists.txt -@@ -19,9 +19,11 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc ) - ########### next target ############### - --ADD_LIBRARY(tag_c SHARED tag_c.cpp) - if(ENABLE_STATIC) -+ add_library(tag_c STATIC tag_c.cpp) - set_target_properties(tag_c PROPERTIES COMPILE_DEFINITIONS TAGLIB_STATIC) -+else(ENABLE_STATIC) -+ add_library(tag_c SHARED tag_c.cpp) - endif(ENABLE_STATIC) - - TARGET_LINK_LIBRARIES(tag_c tag ) diff --git a/src/taglib.mk b/src/taglib.mk index 3501d0a..66fcc00 100644 --- a/src/taglib.mk +++ b/src/taglib.mk @@ -3,25 +3,21 @@ PKG := taglib $(PKG)_IGNORE := -$(PKG)_VERSION := 1.7.2 -$(PKG)_CHECKSUM := 38f7e5283b594021b28426a61339cffbf2d503b450338b02f651fab1b0b42899 +$(PKG)_VERSION := 1.10 +$(PKG)_CHECKSUM := 24c32d50042cb0ddf162eb263f8ac75c5a158e12bf32ed534c1d5c71ee369baa $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://developer.kde.org/~wheeler/files/src/$($(PKG)_FILE) +$(PKG)_URL := http://taglib.github.io/releases/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib define $(PKG)_UPDATE - $(WGET) -q -O- 'http://developer.kde.org/~wheeler/files/src/?C=M;O=D' | \ - $(SED) -n 's,.*"taglib-\([0-9][^"]*\)\.tar.*,\1,p' | \ - head -1 + $(call MXE_GET_GITHUB_TAGS, taglib/taglib, v) endef define $(PKG)_BUILD mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DENABLE_STATIC=ON + -DENABLE_STATIC=$(CMAKE_STATIC_BOOL) $(MAKE) -C '$(1)/build' -j '$(JOBS)' install endef - -$(PKG)_BUILD_SHARED = |