cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better fix for the build on i386, Brad tracked down the actual problem.

Browse Source
This commit is contained in:
sthen 2011-11-15 00:09:31 +00:00
parent ae714b5407
commit 9f2d631f75
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/opencv/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2011/11/14 09:54:45 sthen Exp $
# $OpenBSD: Makefile,v 1.8 2011/11/15 00:09:31 sthen Exp $
ONLY_FOR_ARCH= ${GCC4_ARCHS}
@ -10,7 +10,7 @@ COMMENT-docs= documentation for OpenCV
V= 2.2.0
DISTNAME= OpenCV-$V
PKGNAME-main= opencv-$V
REVISION-main= 4
REVISION-main= 5
PKGNAME-docs= opencv-docs-$V
CATEGORIES= graphics devel

27
graphics/opencv/patches/patch-modules_highgui_src_cap_ffmpeg_cpp
View File

@ -1,15 +1,12 @@
$OpenBSD: patch-modules_highgui_src_cap_ffmpeg_cpp,v 1.3 2011/11/14 09:54:46 sthen Exp $
needed on 32-bit arch.
--- modules/highgui/src/cap_ffmpeg.cpp.orig Mon Nov 14 10:50:43 2011
+++ modules/highgui/src/cap_ffmpeg.cpp Mon Nov 14 10:35:58 2011
@@ -610,7 +610,7 @@ IplImage* CvCapture_FFMPEG::retrieveFrame(int)
return &frame;
}
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__OpenBSD__)
#define AV_NOPTS_VALUE_ ((int64_t)0x8000000000000000LL)
#else
#define AV_NOPTS_VALUE_ ((int64_t)AV_NOPTS_VALUE)
$OpenBSD: patch-modules_highgui_src_cap_ffmpeg_cpp,v 1.4 2011/11/15 00:09:31 sthen Exp $
--- modules/highgui/src/cap_ffmpeg.cpp.orig Sat Dec 4 22:35:25 2010
+++ modules/highgui/src/cap_ffmpeg.cpp Mon Nov 7 21:38:46 2011
@@ -53,7 +53,7 @@ extern "C" {
#define UINT64_C
#define __STDC_CONSTANT_MACROS
// force re-inclusion of stdint.h to get INT64_C macro
-#undef _STDINT_H
+#undef _SYS_STDINT_H_
#include <stdint.h>
#endif
#include <errno.h>