- Update ffmpeg to 0.6

13 files changed, 83 insertions, 11 deletions

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 336c30fc1f35..47e7f18426c4 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	blender
 PORTVERSION=	2.49b
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index 2ffec34142f9..e56fcb3002f5 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bugle
 PORTVERSION=	0.0.20091026
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/gimp-gap/Makefile b/graphics/gimp-gap/Makefile
index 9621e9505558..d46de16c2eb4 100644
--- a/graphics/gimp-gap/Makefile
+++ b/graphics/gimp-gap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp-gap
 PORTVERSION=	2.4.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile
index 8524be155ca9..afddce917f7b 100644
--- a/graphics/gnash-devel/Makefile
+++ b/graphics/gnash-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnash
 PORTVERSION=	20100218
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 PKGNAMESUFFIX=	-devel
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 2c9fabdf7d7c..4597e658d73f 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnash
 PORTVERSION=	0.8.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 # getgnash.org is slow
 MASTER_SITES=	${MASTER_SITE_GNU} \
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;
diff --git a/graphics/lightspark-devel/Makefile b/graphics/lightspark-devel/Makefile
index 011e6cff637a..41f15f7de875 100644
--- a/graphics/lightspark-devel/Makefile
+++ b/graphics/lightspark-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lightspark
 DISTVERSION=	r20100625
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 PKGNAMESUFFIX=	-devel
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 97f5e6989b58..14f23deab980 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	opencv
 PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}library/${PORTNAME}-unix/2.0
 DISTNAME=	OpenCV-${PORTVERSION}
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 4484731563be..957cc7faa4cc 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	osg
 PORTVERSION=	2.9.7
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/php5-ffmpeg/Makefile b/graphics/php5-ffmpeg/Makefile
index 05978b2874ed..769dce44fbee 100644
--- a/graphics/php5-ffmpeg/Makefile
+++ b/graphics/php5-ffmpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}-php/${PORTNAME}-php/${PORTVERSION}
 PKGNAMEPREFIX=	php5-
diff --git a/graphics/php5-ffmpeg/files/patch-ffmpeg_frame.c b/graphics/php5-ffmpeg/files/patch-ffmpeg_frame.c
new file mode 100644
index 000000000000..9c783972acd2
--- /dev/null
+++ b/graphics/php5-ffmpeg/files/patch-ffmpeg_frame.c
@@ -0,0 +1,29 @@
+--- ffmpeg_frame.c.orig	2010-07-21 10:31:08.581341617 +0200
++++ ffmpeg_frame.c	2010-07-21 10:31:21.405528178 +0200
+@@ -333,7 +333,7 @@
+ 
+     GET_FRAME_RESOURCE(getThis(), ff_frame);
+ 
+-    _php_convert_frame(ff_frame, PIX_FMT_RGBA32);
++    _php_convert_frame(ff_frame, PIX_FMT_RGB32);
+ 
+     return_value->value.lval = _php_get_gd_image(ff_frame->width, 
+             ff_frame->height);
+@@ -418,7 +418,7 @@
+ 
+             /* create a an av_frame and allocate space for it */
+             frame = avcodec_alloc_frame();
+-            avpicture_alloc((AVPicture*)frame, PIX_FMT_RGBA32, width, height);
++            avpicture_alloc((AVPicture*)frame, PIX_FMT_RGB32, width, height);
+ 
+             /* copy the gd image to the av_frame */
+             _php_gd_image_to_avframe(gd_img, frame, width, height);
+@@ -429,7 +429,7 @@
+             /* set the ffpmeg_frame's properties */
+             ff_frame->width = width;
+             ff_frame->height = height;
+-            ff_frame->pixel_format = PIX_FMT_RGBA32;
++            ff_frame->pixel_format = PIX_FMT_RGB32;
+             break;
+         default:
+             zend_error(E_ERROR, "Invalid argument\n");