[88909] trunk/dports/multimedia/mkvtoolnix

[ecronin at macports.org]

Revision: 88909
          http://trac.macports.org/changeset/88909
Author:   ecronin at macports.org
Date:     2012-01-14 18:54:36 -0800 (Sat, 14 Jan 2012)
Log Message:
-----------
mkvtoolnix: Workaround for boost 1.48.0 (fixes #32558)

Patch should be obsolete after the next official release of boost

Modified Paths:
--------------
    trunk/dports/multimedia/mkvtoolnix/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/mkvtoolnix/files/
    trunk/dports/multimedia/mkvtoolnix/files/boost_foreach.diff

Modified: trunk/dports/multimedia/mkvtoolnix/Portfile
===================================================================
--- trunk/dports/multimedia/mkvtoolnix/Portfile	2012-01-15 02:49:46 UTC (rev 88908)
+++ trunk/dports/multimedia/mkvtoolnix/Portfile	2012-01-15 02:54:36 UTC (rev 88909)
@@ -19,6 +19,9 @@
                     http://svn.mandriva.com/svn/packages/cooker/mkvtoolnix/releases/${version}/1/SOURCES/
 use_bzip2           yes
 
+# This is needed until boost > 1.4.48.0 has been released
+patchfiles          boost_foreach.diff
+
 # g++-4.2: -E, -S, -save-temps and -M options are not allowed with multiple -arch flags
 universal_variant   no
 

Added: trunk/dports/multimedia/mkvtoolnix/files/boost_foreach.diff
===================================================================
--- trunk/dports/multimedia/mkvtoolnix/files/boost_foreach.diff	                        (rev 0)
+++ trunk/dports/multimedia/mkvtoolnix/files/boost_foreach.diff	2012-01-15 02:54:36 UTC (rev 88909)
@@ -0,0 +1,22 @@
+diff -rup mkvtoolnix-5.0.1.orig/src/common/common.h mkvtoolnix-5.0.1/src/common/common.h
+--- src/common/common.h	2012-01-14 20:50:46.000000000 -0500
++++ src/common/common.h	2012-01-14 20:53:16.000000000 -0500
+@@ -17,6 +17,9 @@
+ #undef min
+ #undef max
+ 
++#define foreach                  BOOST_FOREACH
++#define reverse_foreach          BOOST_REVERSE_FOREACH
++
+ #include <boost/foreach.hpp>
+ #include <boost/format.hpp>
+ #include <boost/regex.hpp>
+@@ -81,8 +84,6 @@ void MTX_DLL_API set_process_priority(in
+ 
+ extern unsigned int MTX_DLL_API verbose;
+ 
+-#define foreach                  BOOST_FOREACH
+-#define reverse_foreach          BOOST_REVERSE_FOREACH
+ #define mxforeach(it, vec)       for (it = (vec).begin(); it != (vec).end(); it++)
+ #define mxfind(value, cont)      std::find(cont.begin(), cont.end(), value)
+ #define mxfind2(it, value, cont) ((it = std::find((cont).begin(), (cont).end(), value)) != (cont).end())
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120114/0b60028c/attachment.html>