diff options
Diffstat (limited to 'community/libmediainfo')
| -rw-r--r-- | community/libmediainfo/PKGBUILD | 16 | ||||
| -rw-r--r-- | community/libmediainfo/gcc-4.7.patch | 79 |
2 files changed, 89 insertions, 6 deletions
diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index de9c8c090..51cb23690 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68074 2012-03-17 18:50:38Z spupykin $ +# $Id: PKGBUILD 69442 2012-04-16 11:13:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.54 -pkgrel=1 +pkgver=0.7.56 +pkgrel=2 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64' 'mips64el') url="http://mediainfo.sourceforge.net" @@ -13,11 +13,15 @@ depends=( 'curl' 'libmms' 'libzen') makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 - libmediainfo-0.7.50-libmms.patch) -md5sums=('4d936fc2122ad1199e3185d2d6053715' - '2f4b21cc250f663d52b497dedb963e3b') + libmediainfo-0.7.50-libmms.patch + gcc-4.7.patch) +md5sums=('a41c484fea74d34f8f1b430a4d444a72' + '2f4b21cc250f663d52b497dedb963e3b' + '3221024ca99fb941d8eb5302ae470c6d') build() { + cd $srcdir/MediaInfoLib/ + patch -p1 <$srcdir/gcc-4.7.patch cd $srcdir/MediaInfoLib/Project/GNU/Library sh ./autogen ./configure --prefix=/usr --enable-shared --disable-static --with-libcurl --with-libmms diff --git a/community/libmediainfo/gcc-4.7.patch b/community/libmediainfo/gcc-4.7.patch new file mode 100644 index 000000000..5bdfc53e3 --- /dev/null +++ b/community/libmediainfo/gcc-4.7.patch @@ -0,0 +1,79 @@ +diff -aur MediaInfoLib/Source/MediaInfo/Reader/Reader_libcurl.cpp MediaInfoLib.patched/Source/MediaInfo/Reader/Reader_libcurl.cpp +--- MediaInfoLib/Source/MediaInfo/Reader/Reader_libcurl.cpp 2012-04-08 20:25:35.000000000 +0200 ++++ MediaInfoLib.patched/Source/MediaInfo/Reader/Reader_libcurl.cpp 2012-04-13 05:14:46.924995168 +0200 +@@ -249,15 +249,15 @@ + #else
+ libcurl_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("./"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/local/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/local/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ #endif
+ if (!libcurl_Module)
+ {
+diff -aur MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h MediaInfoLib.patched/Source/MediaInfoDLL/MediaInfoDLL.h +--- MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h 2012-04-08 12:08:50.000000000 +0200 ++++ MediaInfoLib.patched/Source/MediaInfoDLL/MediaInfoDLL.h 2012-04-13 05:14:05.481020899 +0200 +@@ -248,24 +248,24 @@ +
+ #ifdef MEDIAINFO_GLIBC
+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \
+- if (!g_module_symbol (MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2, (gpointer*)&MediaInfo_##_Name)) \
++ if (!g_module_symbol (MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2, (gpointer*)&MediaInfo_##_Name)) \
+ Errors++;
+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
+- if (!g_module_symbol (MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2, (gpointer*)&MediaInfoList_##_Name)) \
++ if (!g_module_symbol (MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2, (gpointer*)&MediaInfoList_##_Name)) \
+ Errors++;
+ #elif defined (_WIN32) || defined (WIN32)
+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \
+- MediaInfo_##_Name=(MEDIAINFO_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfo_##_Name=(MEDIAINFO_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfo_##_Name==NULL) Errors++;
+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
+- MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfoList_##_Name==NULL) Errors++;
+ #else
+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \
+- MediaInfo_##_Name=(MEDIAINFO_##_Name)dlsym(MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfo_##_Name=(MEDIAINFO_##_Name)dlsym(MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfo_##_Name==NULL) Errors++;
+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
+- MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)dlsym(MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)dlsym(MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfoList_##_Name==NULL) Errors++;
+ #endif
+
+@@ -317,15 +317,15 @@ + #else
+ MediaInfo_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("./"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/local/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/local/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ #endif
+ if (!MediaInfo_Module)
+ return (size_t)-1;
|