[113010] trunk/dports/devel/strigi

[ryandesign at macports.org]

Revision: 113010
          https://trac.macports.org/changeset/113010
Author:   ryandesign at macports.org
Date:     2013-11-06 15:52:28 -0800 (Wed, 06 Nov 2013)
Log Message:
-----------
strigi: fix build failure on Mavericks by renaming "mutex" variable (#41152)

Modified Paths:
--------------
    trunk/dports/devel/strigi/Portfile

Added Paths:
-----------
    trunk/dports/devel/strigi/files/
    trunk/dports/devel/strigi/files/patch-libstreamanalyzer-plugins-endplugins-ffmpegendanalyzer.cpp.diff

Modified: trunk/dports/devel/strigi/Portfile
===================================================================
--- trunk/dports/devel/strigi/Portfile	2013-11-06 23:42:51 UTC (rev 113009)
+++ trunk/dports/devel/strigi/Portfile	2013-11-06 23:52:28 UTC (rev 113010)
@@ -29,6 +29,8 @@
 checksums       rmd160  34cbbe98e7a371467b115b18586baf299340d1b8 \
                 sha256  43e461a625acdefa59bf58cc9d10aebda9eba920dfbe800fc77e6dcbf1eff989
 
+patchfiles      patch-libstreamanalyzer-plugins-endplugins-ffmpegendanalyzer.cpp.diff
+
 configure.args-append   -DICONV_INCLUDE_DIR:PATH=${prefix}/include \
                         -DLOG4CXX_INCLUDE_DIR=${prefix}/include/log4cxx \
                         -DICONV_LIBRARIES:FILEPATH=${prefix}/lib/libiconv.dylib

Added: trunk/dports/devel/strigi/files/patch-libstreamanalyzer-plugins-endplugins-ffmpegendanalyzer.cpp.diff
===================================================================
--- trunk/dports/devel/strigi/files/patch-libstreamanalyzer-plugins-endplugins-ffmpegendanalyzer.cpp.diff	                        (rev 0)
+++ trunk/dports/devel/strigi/files/patch-libstreamanalyzer-plugins-endplugins-ffmpegendanalyzer.cpp.diff	2013-11-06 23:52:28 UTC (rev 113010)
@@ -0,0 +1,32 @@
+--- libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.orig	2013-11-05 18:43:27.000000000 +0100
++++ libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp	2013-11-05 18:45:02.000000000 +0100
+@@ -56,22 +56,22 @@
+     signed char analyze(AnalysisResult& idx, ::InputStream* in);
+ };
+ 
+-STRIGI_MUTEX_DEFINE(mutex);
++STRIGI_MUTEX_DEFINE(strigi_mutex);
+ 
+ static int
+ lockmgr(void **mtx, enum AVLockOp op) {
+   // pre-allocating a single mutex is the only way to get it to work without changing strigi_thread.h
+-  assert( (*mtx == &mutex) || (op == AV_LOCK_CREATE) );
++  assert( (*mtx == &strigi_mutex) || (op == AV_LOCK_CREATE) );
+   switch(op) {
+   case AV_LOCK_CREATE:
+-    *mtx = &mutex;
+-    return !!STRIGI_MUTEX_INIT(&mutex);
++    *mtx = &strigi_mutex;
++    return !!STRIGI_MUTEX_INIT(&strigi_mutex);
+   case AV_LOCK_OBTAIN:
+-    return !!STRIGI_MUTEX_LOCK(&mutex);
++    return !!STRIGI_MUTEX_LOCK(&strigi_mutex);
+   case AV_LOCK_RELEASE:
+-    return !!STRIGI_MUTEX_UNLOCK(&mutex);
++    return !!STRIGI_MUTEX_UNLOCK(&strigi_mutex);
+   case AV_LOCK_DESTROY:
+-    STRIGI_MUTEX_DESTROY(&mutex);
++    STRIGI_MUTEX_DESTROY(&strigi_mutex);
+     return 0;
+   }
+   return 1;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131106/f386114b/attachment-0001.html>