From 475416920231075135fb106282c8377142cbe6d3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Sat, 24 Apr 2010 13:47:14 +0200 Subject: [PATCH] contrib: bump taglib to 1.6.3 and update patches. --- extras/contrib/src/Patches/taglib-static.patch | 6 +++--- extras/contrib/src/packages.mak | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/contrib/src/Patches/taglib-static.patch b/extras/contrib/src/Patches/taglib-static.patch index 23bc5d99cd..f7a8887610 100644 --- a/extras/contrib/src/Patches/taglib-static.patch +++ b/extras/contrib/src/Patches/taglib-static.patch @@ -3,7 +3,7 @@ diff -ru taglib-1.5/taglib/taglib_export.h taglib/taglib/taglib_export.h +++ taglib/taglib/taglib_export.h 2008-04-13 18:25:29.000000000 +0100 @@ -28,9 +28,9 @@ - #if defined(_WIN32) || defined(_WIN64) + #if !defined(TAGLIB_STATIC) && (defined(_WIN32) || defined(_WIN64)) #ifdef MAKE_TAGLIB_LIB -#define TAGLIB_EXPORT __declspec(dllexport) +#define TAGLIB_EXPORT @@ -11,5 +11,5 @@ diff -ru taglib-1.5/taglib/taglib_export.h taglib/taglib/taglib_export.h -#define TAGLIB_EXPORT __declspec(dllimport) +#define TAGLIB_EXPORT #endif - #else - #define TAGLIB_EXPORT + #elif defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 1) + #define TAGLIB_EXPORT __attribute__ ((visibility("default"))) diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak index b7aeeb491f..de2f45c9a3 100644 --- a/extras/contrib/src/packages.mak +++ b/extras/contrib/src/packages.mak @@ -208,7 +208,7 @@ PTHREADS_VERSION=2-8-0 PTHREADS_URL=ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz ZVBI_VERSION=0.2.30 ZVBI_URL=$(SF)/zapping/zvbi-$(ZVBI_VERSION).tar.bz2 -TAGLIB_VERSION=1.6.1 +TAGLIB_VERSION=1.6.3 TAGLIB_URL=http://developer.kde.org/~wheeler/files/src/taglib-$(TAGLIB_VERSION).tar.gz LUA_VERSION=5.1 LUA_URL=http://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz -- 2.39.2