Mercurial > mxe-octave

changeset 1652:34e2c7640502

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package taglib
author Mark Brand <mabrand@mabrand.nl>
date Sun, 13 Mar 2011 22:49:51 +0100
parents 45a9939c7868
children 7edd14e8a941
files src/taglib-1-static.patch src/taglib.mk
diffstat 2 files changed, 35 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/taglib-1-static.patch	Sun Mar 13 22:49:51 2011 +0100
@@ -0,0 +1,17 @@
+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 )
--- a/src/taglib.mk	Sun Mar 13 21:05:04 2011 +0100
+++ b/src/taglib.mk	Sun Mar 13 22:49:51 2011 +0100
@@ -4,8 +4,8 @@
 # TagLib
 PKG             := taglib
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.6.3
-$(PKG)_CHECKSUM := ee54f10c63f236ef1c29c82e39c227a75a7e3785
+$(PKG)_VERSION  := 1.7
+$(PKG)_CHECKSUM := 5138e1665182bc2171e298ff31518c9ad72ddf23
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://developer.kde.org/~wheeler/taglib.html
@@ -19,13 +19,20 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) -i '/#define TAGLIB_EXPORT_H/a#define TAGLIB_STATIC' '$(1)/taglib/taglib_export.h'
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    mkdir '$(1)/build'
+    cd '$(1)/build' && cmake ..                            \
+        -DCMAKE_SYSTEM_NAME=Windows                        \
+        -DCMAKE_FIND_ROOT_PATH='$(PREFIX)/$(TARGET)'       \
+        -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER          \
+        -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY           \
+        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY           \
+        -DCMAKE_C_COMPILER='$(PREFIX)/bin/$(TARGET)-gcc'   \
+        -DCMAKE_CXX_COMPILER='$(PREFIX)/bin/$(TARGET)-g++' \
+        -DCMAKE_INCLUDE_PATH='$(PREFIX)/$(TARGET)/include' \
+        -DCMAKE_LIB_PATH='$(PREFIX)/$(TARGET)/lib'         \
+        -DPKG_CONFIG_EXECUTABLE=$(TARGET)-pkg-config       \
+        -DCMAKE_INSTALL_PREFIX='$(PREFIX)/$(TARGET)'       \
+        -DCMAKE_BUILD_TYPE=Release                         \
+        -DENABLE_STATIC=ON
+    $(MAKE) -C '$(1)/build' -j '$(JOBS)' install
 endef