diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2010-07-24 16:38:20 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2010-07-24 16:38:20 +0000 |
| commit | ab5c533c96df6234b64e4f99978215af3f98aebc (patch) | |
| tree | 187b1892fb8c00b1a03fd082eb3798992b00ee64 /graphics/iulib | |
| parent | 2e88b1de64abfd339132c5718df65cdaa32379d4 (diff) | |
| download | ports-ab5c533c96df6234b64e4f99978215af3f98aebc.tar.gz ports-ab5c533c96df6234b64e4f99978215af3f98aebc.zip | |
Notes
Diffstat (limited to 'graphics/iulib')
| -rw-r--r-- | graphics/iulib/Makefile | 2 | ||||
| -rw-r--r-- | graphics/iulib/files/patch-configure.ac | 26 | ||||
| -rw-r--r-- | graphics/iulib/files/patch-vidio__vidio.cc | 22 |
3 files changed, 45 insertions, 5 deletions
diff --git a/graphics/iulib/Makefile b/graphics/iulib/Makefile index bdd11c5f3e54..86a360652c50 100644 --- a/graphics/iulib/Makefile +++ b/graphics/iulib/Makefile @@ -7,7 +7,7 @@ PORTNAME= iulib PORTVERSION= 0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE EXTRACT_SUFX= .tgz diff --git a/graphics/iulib/files/patch-configure.ac b/graphics/iulib/files/patch-configure.ac index 8e284f325962..4ec905a61331 100644 --- a/graphics/iulib/files/patch-configure.ac +++ b/graphics/iulib/files/patch-configure.ac @@ -1,5 +1,5 @@ ---- ./configure.ac.orig 2009-06-10 07:32:20.000000000 +0900 -+++ ./configure.ac 2009-06-11 18:17:12.000000000 +0900 +--- configure.ac.orig 2009-06-10 00:32:20.000000000 +0200 ++++ configure.ac 2010-07-24 18:02:39.000000000 +0200 @@ -10,7 +10,7 @@ AC_PROG_CXX @@ -9,3 +9,25 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT +@@ -55,15 +55,15 @@ + + # --- vidio (optional video in-/output) --- + AC_SUBST(novidio, 0) +-AC_CHECK_HEADER(ffmpeg/avcodec.h,,AC_SUBST(novidio, 1)) +-AC_CHECK_HEADER(ffmpeg/avformat.h,,AC_SUBST(novidio, 1)) +-AC_TRY_COMPILE([#include <ffmpeg/avio.h> +- #include <ffmpeg/avformat.h>], ++AC_CHECK_HEADER(libavcodec/avcodec.h,,AC_SUBST(novidio, 1)) ++AC_CHECK_HEADER(libavformat/avformat.h,,AC_SUBST(novidio, 1)) ++AC_TRY_COMPILE([#include <libavformat/avio.h> ++ #include <libavformat/avformat.h>], + [AVFormatContext fc; url_fclose(fc.pb);], +- [], [AC_DEFINE(HAVE_OLD_AVFORMAT)]) ++ [], []) + AM_CONDITIONAL([have_vidio], [test "$novidio" != 1]) + +-AC_SUBST(nov4l2, 0) ++AC_SUBST(nov4l2, 1) + AC_CHECK_HEADER(linux/videodev2.h,,AC_SUBST(nov4l2, 1)) + AM_CONDITIONAL([have_v4l2], [test "$nov4l2" != 1]) + diff --git a/graphics/iulib/files/patch-vidio__vidio.cc b/graphics/iulib/files/patch-vidio__vidio.cc index 76532d2723f0..f55f19d91e79 100644 --- a/graphics/iulib/files/patch-vidio__vidio.cc +++ b/graphics/iulib/files/patch-vidio__vidio.cc @@ -1,5 +1,5 @@ ---- ./vidio/vidio.cc.orig 2009-06-10 07:32:20.000000000 +0900 -+++ ./vidio/vidio.cc 2009-06-11 18:24:08.000000000 +0900 +--- vidio/vidio.cc.orig 2009-06-10 00:32:20.000000000 +0200 ++++ vidio/vidio.cc 2010-07-11 10:29:54.176325026 +0200 @@ -27,7 +27,6 @@ extern "C" { #include <assert.h> @@ -8,3 +8,21 @@ #include <stdio.h> #include <stdlib.h> #include <ctype.h> +@@ -119,7 +118,7 @@ + AVStream *st); + void closeOutputVideo(AVFormatContext *oc, + AVStream *st); +- AVFrame *allocOutputPicture(int pix_fmt, int width, int height); ++ AVFrame *allocOutputPicture(PixelFormat pix_fmt, int width, int height); + + void copyToYUV(bytearray &red, + bytearray &green, +@@ -624,7 +623,7 @@ + + + +- AVFrame *VidOutImpl::allocOutputPicture(int pix_fmt, int width, int height) { ++ AVFrame *VidOutImpl::allocOutputPicture(PixelFormat pix_fmt, int width, int height) { + + AVFrame *picture; + uint8_t *picture_buf; |