vlc | branch: master | Rafaël Carré <[email protected]> | Sun Nov 6 19:47:24 2011 -0500| [e429aabdce667f03367bc12bf9a4a0d2099bf18c] | committer: Rafaël Carré
contribs: taglib: install libtag.pc unconditionally > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e429aabdce667f03367bc12bf9a4a0d2099bf18c --- contrib/src/taglib/rules.mak | 3 +++ contrib/src/taglib/taglib-win32.patch | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/contrib/src/taglib/rules.mak b/contrib/src/taglib/rules.mak index 187dcd1..5a42f93 100644 --- a/contrib/src/taglib/rules.mak +++ b/contrib/src/taglib/rules.mak @@ -13,6 +13,9 @@ $(TARBALLS)/taglib-$(TAGLIB_VERSION).tar.gz: taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib $(UNPACK) $(APPLY) $(SRC)/taglib/taglib-static.patch +ifdef HAVE_WIN32 + $(APPLY) $(SRC)/taglib/taglib-win32.patch +endif # FIXME: implement HAVE_CYGWIN ifdef HAVE_CYGWIN $(APPLY) $(SRC)/taglib/taglib-cygwin.patch diff --git a/contrib/src/taglib/taglib-win32.patch b/contrib/src/taglib/taglib-win32.patch new file mode 100644 index 0000000..9425bde --- /dev/null +++ b/contrib/src/taglib/taglib-win32.patch @@ -0,0 +1,23 @@ +diff -ru taglib-1.7.orig/CMakeLists.txt taglib-1.7/CMakeLists.txt +--- taglib-1.7.orig/CMakeLists.txt 2011-11-06 19:44:44.574744323 -0500 ++++ taglib-1.7/CMakeLists.txt 2011-11-06 19:44:56.118801560 -0500 +@@ -49,9 +49,7 @@ + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib-config ) + +-if(NOT WIN32) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc ) +-endif(NOT WIN32) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) + +@@ -70,9 +68,7 @@ + ADD_SUBDIRECTORY(examples) + + ADD_SUBDIRECTORY(bindings) +-if(NOT WIN32) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) +-endif(NOT WIN32) + + INSTALL( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/taglib-config DESTINATION ${BIN_INSTALL_DIR}) + _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
