From cd90bb92b16b44e93481e82e15dfec8db05465eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 30 Jun 2011 15:56:50 +0300 Subject: [PATCH] contrib: add taglib --- contrib/src/taglib/SHA512SUMS | 1 + contrib/src/taglib/rules.mak | 28 ++++++++++++++++++++++++++ contrib/src/taglib/taglib-cygwin.patch | 10 +++++++++ contrib/src/taglib/taglib-static.patch | 15 ++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 contrib/src/taglib/SHA512SUMS create mode 100644 contrib/src/taglib/rules.mak create mode 100644 contrib/src/taglib/taglib-cygwin.patch create mode 100644 contrib/src/taglib/taglib-static.patch diff --git a/contrib/src/taglib/SHA512SUMS b/contrib/src/taglib/SHA512SUMS new file mode 100644 index 0000000000..26c22bf1e2 --- /dev/null +++ b/contrib/src/taglib/SHA512SUMS @@ -0,0 +1 @@ +1cf6f33cf3e872224963f42c49f2ae46ce0c69a16e4bfc7d0ffffd9bc01b272a3a4a2eeac2452a659b149f1d3305188a28ce747686e88cee2ff9d5effa667c58 taglib-1.7.tar.gz diff --git a/contrib/src/taglib/rules.mak b/contrib/src/taglib/rules.mak new file mode 100644 index 0000000000..15240badb4 --- /dev/null +++ b/contrib/src/taglib/rules.mak @@ -0,0 +1,28 @@ +# TagLib + +TAGLIB_VERSION := 1.7 +TAGLIB_URL := http://developer.kde.org/~wheeler/files/src/taglib-$(TAGLIB_VERSION).tar.gz + +PKGS += taglib + +$(TARBALLS)/taglib-$(TAGLIB_VERSION).tar.gz: + $(call download,$(TAGLIB_URL)) + +.sum-taglib: taglib-$(TAGLIB_VERSION).tar.gz + +taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib + $(UNPACK) + $(APPLY) $(SRC)/taglib/taglib-static.patch + # FIXME: implement HAVE_CYGWIN +ifdef HAVE_CYGWIN + $(APPLY) $(SRC)/taglib/taglib-cygwin.patch +endif + $(MOVE) + +.taglib: taglib toolchain.cmake + cd $< && $(HOSTVARS) $(CMAKE) \ + -DENABLE_STATIC:BOOL=ON \ + -DWITH_ASF:BOOL=ON \ + -DWITH_MP4:BOOL=ON . + cd $< && $(MAKE) install + touch $@ diff --git a/contrib/src/taglib/taglib-cygwin.patch b/contrib/src/taglib/taglib-cygwin.patch new file mode 100644 index 0000000000..c5efe71af3 --- /dev/null +++ b/contrib/src/taglib/taglib-cygwin.patch @@ -0,0 +1,10 @@ +--- taglib/admin/conf.change.pl 2005-07-27 10:23:52.000000000 +1000 ++++ taglib/admin/conf.change.pl 2007-09-30 15:57:48.062500000 +1000 +@@ -146,6 +146,7 @@ + fi + done + if test -f \$tmp/subs.files ; then ++ dos2unix \$tmp/subs.files + perl $ac_aux_dir/config.pl "\$tmp/subs.sed" "\$tmp/subs.files" "\$srcdir" "\$INSTALL" + fi + rm -f \$tmp/subs.files diff --git a/contrib/src/taglib/taglib-static.patch b/contrib/src/taglib/taglib-static.patch new file mode 100644 index 0000000000..f7a8887610 --- /dev/null +++ b/contrib/src/taglib/taglib-static.patch @@ -0,0 +1,15 @@ +diff -ru taglib-1.5/taglib/taglib_export.h taglib/taglib/taglib_export.h +--- taglib-1.5/taglib/taglib_export.h 2008-02-04 15:14:46.000000000 +0000 ++++ taglib/taglib/taglib_export.h 2008-04-13 18:25:29.000000000 +0100 +@@ -28,9 +28,9 @@ + + #if !defined(TAGLIB_STATIC) && (defined(_WIN32) || defined(_WIN64)) + #ifdef MAKE_TAGLIB_LIB +-#define TAGLIB_EXPORT __declspec(dllexport) ++#define TAGLIB_EXPORT + #else +-#define TAGLIB_EXPORT __declspec(dllimport) ++#define TAGLIB_EXPORT + #endif + #elif defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 1) + #define TAGLIB_EXPORT __attribute__ ((visibility("default"))) -- 2.39.2