[109056] trunk/dports/science/bob

[devans at macports.org]

Revision: 109056
          https://trac.macports.org/changeset/109056
Author:   devans at macports.org
Date:     2013-08-07 08:21:55 -0700 (Wed, 07 Aug 2013)
Log Message:
-----------
bob: maintainer update fixes build with ffmpeg-devel, closes #40024.

Modified Paths:
--------------
    trunk/dports/science/bob/Portfile

Added Paths:
-----------
    trunk/dports/science/bob/files/
    trunk/dports/science/bob/files/patch-src-io-cxx-VideoUtilities.diff

Modified: trunk/dports/science/bob/Portfile
===================================================================
--- trunk/dports/science/bob/Portfile	2013-08-07 15:12:37 UTC (rev 109055)
+++ trunk/dports/science/bob/Portfile	2013-08-07 15:21:55 UTC (rev 109056)
@@ -7,7 +7,7 @@
 PortGroup           active_variants 1.1
 
 github.setup        idiap bob 1.2.0 v
-revision            1
+revision            2
 set soversion       1.2
 categories          science math devel
 platforms           darwin
@@ -28,6 +28,8 @@
 checksums           rmd160  cb32bc17af51ac65e63f2edc48897103c67f9be7 \
                     sha256  79a20ae27bc07c1f486aed1e33026c6efe56965bd60826fdde863e54c02c05e8
 
+patchfiles          patch-src-io-cxx-VideoUtilities.diff
+
 depends_build-append \
     port:pkgconfig
 
@@ -97,7 +99,7 @@
         configure.args-append -DWITH_PYTHON=${prefix}/bin/python2.6
     } elseif {[variant_isset python27]} {
         configure.args-append -DWITH_PYTHON=${prefix}/bin/python2.7
-    } 
+    }
 }
 
 post-destroot {

Added: trunk/dports/science/bob/files/patch-src-io-cxx-VideoUtilities.diff
===================================================================
--- trunk/dports/science/bob/files/patch-src-io-cxx-VideoUtilities.diff	                        (rev 0)
+++ trunk/dports/science/bob/files/patch-src-io-cxx-VideoUtilities.diff	2013-08-07 15:21:55 UTC (rev 109056)
@@ -0,0 +1,23 @@
+diff --git src/io/cxx/VideoUtilities.cc src/io/cxx/VideoUtilities.cc
+index 2b8e9c1..d78cc67 100644
+--- src/io/cxx/VideoUtilities.cc
++++ src/io/cxx/VideoUtilities.cc
+@@ -41,12 +41,11 @@ extern "C" {
+ /**
+  * Some code to account for older versions of ffmpeg
+  */
+-#ifndef AV_CODEC_ID_NONE
+-#define AV_CODEC_ID_NONE CODEC_ID_NONE
+-#define AV_CODEC_ID_MPEG1VIDEO CODEC_ID_MPEG1VIDEO
+-#define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO
+-#define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG
+-typedef CodecID AVCodecID;
++#if LIBAVCODEC_VERSION_INT < 0x363b64 //54.59.100 @ ffmpeg-1.0
++#  define AV_CODEC_ID_NONE CODEC_ID_NONE
++#  define AV_CODEC_ID_MPEG1VIDEO CODEC_ID_MPEG1VIDEO
++#  define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO
++#  define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG
+ #endif
+ 
+ #ifndef AV_PKT_FLAG_KEY
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130807/edfba420/attachment.html>