Index: graphics/gimp-gap/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/gimp-gap/Makefile,v retrieving revision 1.12 diff -a -u -r1.12 Makefile --- graphics/gimp-gap/Makefile 25 Jul 2010 23:09:56 -0000 1.12 +++ graphics/gimp-gap/Makefile 29 Sep 2010 15:48:53 -0000 @@ -6,8 +6,7 @@ # PORTNAME= gimp-gap -PORTVERSION= 2.4.0 -PORTREVISION= 6 +PORTVERSION= 2.6.0 CATEGORIES= graphics MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ http://gimp.mirrors.hoobly.com/%SUBDIR%/ \ @@ -27,11 +26,9 @@ avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ gimp-2.0:${PORTSDIR}/graphics/gimp-app RUN_DEPENDS= wavplay:${PORTSDIR}/audio/wavplay \ - gimp>0:${PORTSDIR}/graphics/gimp \ - mpeg2encode:${PORTSDIR}/multimedia/mpeg2codec \ - mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode - -IGNORE= does not work with Gimp 2.6, and no update available + gimp:${PORTSDIR}/graphics/gimp-app +# mpeg2encode:${PORTSDIR}/multimedia/mpeg2codec \ +# mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode USE_BZIP2= yes USE_GETTEXT= yes @@ -40,5 +37,20 @@ USE_GNOME= intltool CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ARGS= --with-preinstalled-libmpeg3incdir= + +# --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +# --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +# --with-ffmpegsrcdir=DIR specify where to find ffmpeg src directory DIR (this is a developers option to bypass the included ffmpeg sourcetree) +# --with-ff-extra-cflags=cflags specify extra c-compiler flags for compiling ffmpeg +# --with-ff-extra-ldflags=ldflags specify extra linker flags for linking ffmpeg libs +# --with-libmpeg3srcdir=DIR specify where to find libmpeg3 src directory DIR (this is a developers option to bypass the included libmpeg3 sourcetree) +# --with-preinstalled-libmpeg3incdir=DIR force link with an already installed libmpeg3 library and specify where to find libmpeg3 headerfiles +# --with-preinstalled-libmpeg3=FILE full pathname of the preinstalled libmpeg3.a libraryfile + + +post-extract: +# Get rid of shipped bundled software + @${RM} -r ${WRKSRC}/extern_libs/*.tar.gz .include Index: graphics/gimp-gap/distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/gimp-gap/distinfo,v retrieving revision 1.2 diff -a -u -r1.2 distinfo --- graphics/gimp-gap/distinfo 31 Mar 2008 01:37:17 -0000 1.2 +++ graphics/gimp-gap/distinfo 29 Sep 2010 15:48:53 -0000 @@ -1,3 +1,3 @@ -MD5 (gimp-gap-2.4.0.tar.bz2) = b3e8eb56cc3d94325a81266a2d95fa39 -SHA256 (gimp-gap-2.4.0.tar.bz2) = 905dfcfd6ba78f8b25b8e0dc068a75cca3e1effc998fe50b8a7f4b65746cc653 -SIZE (gimp-gap-2.4.0.tar.bz2) = 4701609 +MD5 (gimp-gap-2.6.0.tar.bz2) = 249ed829de8b78675c0fe4ef4212089f +SHA256 (gimp-gap-2.6.0.tar.bz2) = 1483f5e17ed5f9107c1702fcac3b7a66e6834061560ccb449fc4eaca7a3c2cca +SIZE (gimp-gap-2.6.0.tar.bz2) = 8503561 Index: graphics/gimp-gap/pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/gimp-gap/pkg-plist,v retrieving revision 1.3 diff -a -u -r1.3 pkg-plist --- graphics/gimp-gap/pkg-plist 31 Mar 2008 01:37:17 -0000 1.3 +++ graphics/gimp-gap/pkg-plist 29 Sep 2010 15:48:53 -0000 @@ -1,33 +1,39 @@ -lib/gimp-gap-2.4/audioconvert_to_wav.sh +lib/gimp-gap-2.6/audioconvert_to_wav.sh +libexec/gimp/2.2/plug-ins/gap_decode_mplayer libexec/gimp/2.2/plug-ins/gap_bluebox libexec/gimp/2.2/plug-ins/gap_plugins libexec/gimp/2.2/plug-ins/gap_filter +libexec/gimp/2.2/plug-ins/gap_fmac_varying libexec/gimp/2.2/plug-ins/gap_fmac -libexec/gimp/2.2/plug-ins/gap_frontends libexec/gimp/2.2/plug-ins/gap_morph libexec/gimp/2.2/plug-ins/gap_name2layer libexec/gimp/2.2/plug-ins/gap_navigator_dialog libexec/gimp/2.2/plug-ins/gap_player libexec/gimp/2.2/plug-ins/gap_onion libexec/gimp/2.2/plug-ins/gap_storyboard +libexec/gimp/2.2/plug-ins/gap_vid_enc_rawframes libexec/gimp/2.2/plug-ins/gap_video_extract +libexec/gimp/2.2/plug-ins/gap_video_index libexec/gimp/2.2/plug-ins/gap_wr_color_curve libexec/gimp/2.2/plug-ins/gap_wr_color_levels libexec/gimp/2.2/plug-ins/gap_wr_color_huesat libexec/gimp/2.2/plug-ins/gap_wr_trans libexec/gimp/2.2/plug-ins/gap_wr_opacity +libexec/gimp/2.2/plug-ins/gap_wr_resynth libexec/gimp/2.2/plug-ins/gap_vid_common_encoder libexec/gimp/2.2/plug-ins/gap_vid_enc_avi libexec/gimp/2.2/plug-ins/gap_vid_enc_ffmpeg libexec/gimp/2.2/plug-ins/gap_vid_enc_singleframes share/gimp/scripts/gap-dup-continue.scm share/gimp/scripts/sel-to-anim-img.scm +share/locale/ar/LC_MESSAGES/gimp20-gap.mo share/locale/az/LC_MESSAGES/gimp20-gap.mo share/locale/bg/LC_MESSAGES/gimp20-gap.mo share/locale/ca/LC_MESSAGES/gimp20-gap.mo share/locale/cs/LC_MESSAGES/gimp20-gap.mo share/locale/da/LC_MESSAGES/gimp20-gap.mo share/locale/de/LC_MESSAGES/gimp20-gap.mo +share/locale/dz/LC_MESSAGES/gimp20-gap.mo share/locale/el/LC_MESSAGES/gimp20-gap.mo share/locale/en_CA/LC_MESSAGES/gimp20-gap.mo share/locale/en_GB/LC_MESSAGES/gimp20-gap.mo @@ -35,6 +41,7 @@ share/locale/eu/LC_MESSAGES/gimp20-gap.mo share/locale/fi/LC_MESSAGES/gimp20-gap.mo share/locale/fr/LC_MESSAGES/gimp20-gap.mo +share/locale/gl/LC_MESSAGES/gimp20-gap.mo share/locale/gu/LC_MESSAGES/gimp20-gap.mo share/locale/hi/LC_MESSAGES/gimp20-gap.mo share/locale/hr/LC_MESSAGES/gimp20-gap.mo @@ -44,10 +51,12 @@ share/locale/ko/LC_MESSAGES/gimp20-gap.mo share/locale/lt/LC_MESSAGES/gimp20-gap.mo share/locale/ml/LC_MESSAGES/gimp20-gap.mo +share/locale/mr/LC_MESSAGES/gimp20-gap.mo share/locale/nb/LC_MESSAGES/gimp20-gap.mo share/locale/ne/LC_MESSAGES/gimp20-gap.mo share/locale/nl/LC_MESSAGES/gimp20-gap.mo share/locale/nn/LC_MESSAGES/gimp20-gap.mo +share/locale/oc/LC_MESSAGES/gimp20-gap.mo share/locale/pa/LC_MESSAGES/gimp20-gap.mo share/locale/pl/LC_MESSAGES/gimp20-gap.mo share/locale/pt/LC_MESSAGES/gimp20-gap.mo @@ -67,4 +76,10 @@ share/locale/zh_TW/LC_MESSAGES/gimp20-gap.mo @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw -@dirrm lib/gimp-gap-2.4 +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrm lib/gimp-gap-2.6 Index: graphics/gimp-gap/files/patch-configure =================================================================== RCS file: graphics/gimp-gap/files/patch-configure diff -N graphics/gimp-gap/files/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/gimp-gap/files/patch-configure 29 Sep 2010 15:48:53 -0000 @@ -0,0 +1,28 @@ +--- configure.orig 2009-06-04 22:41:01.000000000 +0200 ++++ configure 2010-08-20 23:19:41.000000000 +0200 +@@ -1640,7 +1640,6 @@ + uname -v = `(uname -v) 2>/dev/null || echo unknown` + + /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + + /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` + /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +@@ -7689,7 +7688,7 @@ + if test -f "$FFMPEG_TARBALL"; then + cd "$extern_libs_dir" + echo "extracting tarball: $FFMPEG_TARBALL" +- gzip -d -c "$FFMPEG_TARBALL" | tar -x ++ gzip -d -c "$FFMPEG_TARBALL" | tar -xf - + cd "$pwd_dir" + else + echo "** error FFMPEG tarball not found, file: $FFMPEG_TARBALL" +@@ -8275,7 +8274,7 @@ + if test -f "$LIBMPEG3_TARBALL"; then + cd "$extern_libs_dir" + echo "extracting tarball: $LIBMPEG3_TARBALL" +- gzip -d -c "$LIBMPEG3_TARBALL" | tar -x ++ gzip -d -c "$LIBMPEG3_TARBALL" | tar -xf - + cd "$pwd_dir" + else + echo "** error LIBMPEG3 tarball not found, file: $LIBMPEG3_TARBALL" Index: graphics/gimp-gap/files/patch-gap_Makefile.in =================================================================== RCS file: /home/pcvs/ports/graphics/gimp-gap/files/patch-gap_Makefile.in,v retrieving revision 1.1 diff -a -u -r1.1 patch-gap_Makefile.in --- graphics/gimp-gap/files/patch-gap_Makefile.in 22 Aug 2007 17:10:16 -0000 1.1 +++ graphics/gimp-gap/files/patch-gap_Makefile.in 29 Sep 2010 15:48:53 -0000 @@ -1,11 +1,11 @@ ---- gap/Makefile.in.orig 2007-07-29 17:47:38.000000000 -0400 -+++ gap/Makefile.in 2007-08-22 10:27:59.000000000 -0400 -@@ -257,7 +257,7 @@ - FFMPEG_LIBAVFORMAT_A = @FFMPEG_LIBAVFORMAT_A@ +--- gap/Makefile.in.orig 2009-06-04 22:41:00.000000000 +0200 ++++ gap/Makefile.in 2010-08-20 22:29:00.000000000 +0200 +@@ -294,7 +294,7 @@ + FFMPEG_LIBAVUTIL_A = @FFMPEG_LIBAVUTIL_A@ GAPLIBDIR = @GAPLIBDIR@ GAPVIDEOAPI_EXTINCS = @GAPVIDEOAPI_EXTINCS@ -GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -+GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -lavformat - GAP_AUDIO_SUPPORT_FALSE = @GAP_AUDIO_SUPPORT_FALSE@ - GAP_AUDIO_SUPPORT_TRUE = @GAP_AUDIO_SUPPORT_TRUE@ ++GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -lavformat -lswscale GAP_MAJOR_VERSION = @GAP_MAJOR_VERSION@ + GAP_MICRO_VERSION = @GAP_MICRO_VERSION@ + GAP_MINOR_VERSION = @GAP_MINOR_VERSION@ Index: graphics/gimp-gap/files/patch-libgapvidapi_gap-vid-api-ffmpeg.c =================================================================== RCS file: graphics/gimp-gap/files/patch-libgapvidapi_gap-vid-api-ffmpeg.c diff -N graphics/gimp-gap/files/patch-libgapvidapi_gap-vid-api-ffmpeg.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/gimp-gap/files/patch-libgapvidapi_gap-vid-api-ffmpeg.c 29 Sep 2010 15:48:53 -0000 @@ -0,0 +1,44 @@ +--- libgapvidapi/gap_vid_api_ffmpeg.c.orig 2010-08-20 21:54:07.000000000 +0200 ++++ libgapvidapi/gap_vid_api_ffmpeg.c 2010-08-20 22:12:05.000000000 +0200 +@@ -30,6 +30,7 @@ + #include "stdlib.h" + #include "gap_val_file.h" + #include "audioconvert.h" ++#include "swscale.h" + + + #define READSTEPS_PROBE_TIMECODE 32 +@@ -1143,14 +1144,26 @@ + + /* avcodec.img_convert convert among pixel formats */ + ++ static int sws_flags = SWS_BICUBIC; ++ struct SwsContext *img_convert_ctx; + +- l_rc = img_convert(handle->picture_rgb +- , PIX_FMT_RGB24 /* dst */ +- ,handle->picture_yuv +- ,handle->yuv_buff_pix_fmt /* src */ +- ,gvahand->width +- ,gvahand->height +- ); ++ img_convert_ctx = sws_getContext(gvahand->width, ++ gvahand->height, ++ handle->yuv_buff_pix_fmt, /* src */ ++ gvahand->width, ++ gvahand->height, ++ PIX_FMT_RGB24, /* dst */ ++ sws_flags, NULL, NULL, NULL); ++ ++ sws_scale (img_convert_ctx, ++ handle->picture_yuv->data, ++ handle->picture_yuv->linesize, ++ 0, ++ gvahand->height, ++ handle->picture_rgb->data, ++ handle->picture_rgb->linesize); ++ sws_freeContext(img_convert_ctx); ++ + + /* if (gap_debug) printf("p_wrapper_ffmpeg_get_next_frame: after img_convert l_rc:%d\n", (int)l_rc); */ + } Index: graphics/gimp-gap/files/patch-libgapvidapi_gap_vid_api_ffmpeg.c =================================================================== RCS file: graphics/gimp-gap/files/patch-libgapvidapi_gap_vid_api_ffmpeg.c diff -N graphics/gimp-gap/files/patch-libgapvidapi_gap_vid_api_ffmpeg.c --- graphics/gimp-gap/files/patch-libgapvidapi_gap_vid_api_ffmpeg.c 22 Aug 2007 17:10:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,31 +0,0 @@ ---- libgapvidapi/gap_vid_api_ffmpeg.c.orig 2007-08-22 09:59:27.000000000 -0400 -+++ libgapvidapi/gap_vid_api_ffmpeg.c 2007-08-22 10:06:41.000000000 -0400 -@@ -1721,7 +1721,7 @@ - ); - } - #endif -- rfps = ic->streams[ii]->r_frame_rate; -+ rfps = ic->streams[ii]->r_frame_rate.num; - acc->workaround_bugs = FF_BUG_AUTODETECT; - acc->error_resilience = 2; - acc->error_concealment = 3; -@@ -1734,15 +1734,15 @@ - { - acc->flags|= CODEC_FLAG_TRUNCATED; - } -- if (acc->frame_rate != rfps) -+ if (acc->time_base.num != rfps) - { - printf("\nSeems that stream %d comes from film source: %2.2f->%2.2f\n", -- ii, (float)acc->frame_rate / (float)acc->frame_rate_base, -- (float)rfps / (float)acc->frame_rate_base); -+ ii, (float)acc->time_base.num / (float)acc->time_base.den, -+ (float)rfps / (float)acc->time_base.den); - } - - /* update the current frame rate to match the stream frame rate */ -- gvahand->framerate = (gdouble)rfps / (gdouble)acc->frame_rate_base; -+ gvahand->framerate = (gdouble)rfps / (gdouble)acc->time_base.den; - } - break; - default: Index: graphics/gimp-gap/files/patch-vid_common_Makefile.in =================================================================== RCS file: /home/pcvs/ports/graphics/gimp-gap/files/patch-vid_common_Makefile.in,v retrieving revision 1.1 diff -a -u -r1.1 patch-vid_common_Makefile.in --- graphics/gimp-gap/files/patch-vid_common_Makefile.in 22 Aug 2007 17:10:16 -0000 1.1 +++ graphics/gimp-gap/files/patch-vid_common_Makefile.in 29 Sep 2010 15:48:53 -0000 @@ -1,11 +1,11 @@ ---- vid_common/Makefile.in.orig 2007-08-22 10:31:57.000000000 -0400 -+++ vid_common/Makefile.in 2007-08-22 10:32:05.000000000 -0400 -@@ -111,7 +111,7 @@ - FFMPEG_LIBAVFORMAT_A = @FFMPEG_LIBAVFORMAT_A@ +--- vid_common/Makefile.in.orig 2009-06-04 22:41:00.000000000 +0200 ++++ vid_common/Makefile.in 2010-08-20 22:31:03.000000000 +0200 +@@ -97,7 +97,7 @@ + FFMPEG_LIBAVUTIL_A = @FFMPEG_LIBAVUTIL_A@ GAPLIBDIR = @GAPLIBDIR@ GAPVIDEOAPI_EXTINCS = @GAPVIDEOAPI_EXTINCS@ -GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -+GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -lavformat - GAP_AUDIO_SUPPORT_FALSE = @GAP_AUDIO_SUPPORT_FALSE@ - GAP_AUDIO_SUPPORT_TRUE = @GAP_AUDIO_SUPPORT_TRUE@ ++GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -lavformat -lswscale GAP_MAJOR_VERSION = @GAP_MAJOR_VERSION@ + GAP_MICRO_VERSION = @GAP_MICRO_VERSION@ + GAP_MINOR_VERSION = @GAP_MINOR_VERSION@ Index: graphics/gimp-gap/files/patch-vid_enc_avi_Makefile.in =================================================================== RCS file: /home/pcvs/ports/graphics/gimp-gap/files/patch-vid_enc_avi_Makefile.in,v retrieving revision 1.1 diff -a -u -r1.1 patch-vid_enc_avi_Makefile.in --- graphics/gimp-gap/files/patch-vid_enc_avi_Makefile.in 22 Aug 2007 17:10:16 -0000 1.1 +++ graphics/gimp-gap/files/patch-vid_enc_avi_Makefile.in 29 Sep 2010 15:48:53 -0000 @@ -1,11 +1,11 @@ ---- vid_enc_avi/Makefile.in.orig 2007-08-22 10:35:56.000000000 -0400 -+++ vid_enc_avi/Makefile.in 2007-08-22 10:36:04.000000000 -0400 -@@ -113,7 +113,7 @@ - FFMPEG_LIBAVFORMAT_A = @FFMPEG_LIBAVFORMAT_A@ +--- vid_enc_avi/Makefile.in.orig 2009-06-04 22:41:00.000000000 +0200 ++++ vid_enc_avi/Makefile.in 2010-08-20 22:31:59.000000000 +0200 +@@ -98,7 +98,7 @@ + FFMPEG_LIBAVUTIL_A = @FFMPEG_LIBAVUTIL_A@ GAPLIBDIR = @GAPLIBDIR@ GAPVIDEOAPI_EXTINCS = @GAPVIDEOAPI_EXTINCS@ -GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -+GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -lavformat - GAP_AUDIO_SUPPORT_FALSE = @GAP_AUDIO_SUPPORT_FALSE@ - GAP_AUDIO_SUPPORT_TRUE = @GAP_AUDIO_SUPPORT_TRUE@ ++GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -lavformat -lswscale GAP_MAJOR_VERSION = @GAP_MAJOR_VERSION@ + GAP_MICRO_VERSION = @GAP_MICRO_VERSION@ + GAP_MINOR_VERSION = @GAP_MINOR_VERSION@ Index: graphics/gimp-gap/files/patch-vid_enc_ffmpeg_Makefile.in =================================================================== RCS file: /home/pcvs/ports/graphics/gimp-gap/files/patch-vid_enc_ffmpeg_Makefile.in,v retrieving revision 1.1 diff -a -u -r1.1 patch-vid_enc_ffmpeg_Makefile.in --- graphics/gimp-gap/files/patch-vid_enc_ffmpeg_Makefile.in 22 Aug 2007 17:10:16 -0000 1.1 +++ graphics/gimp-gap/files/patch-vid_enc_ffmpeg_Makefile.in 29 Sep 2010 15:48:53 -0000 @@ -1,11 +1,11 @@ ---- vid_enc_ffmpeg/Makefile.in.orig 2007-08-22 11:01:25.000000000 -0400 -+++ vid_enc_ffmpeg/Makefile.in 2007-08-22 11:01:37.000000000 -0400 -@@ -119,7 +119,7 @@ - FFMPEG_LIBAVFORMAT_A = @FFMPEG_LIBAVFORMAT_A@ +--- vid_enc_ffmpeg/Makefile.in.orig 2009-06-04 22:41:00.000000000 +0200 ++++ vid_enc_ffmpeg/Makefile.in 2010-08-20 22:33:31.000000000 +0200 +@@ -106,7 +106,7 @@ + FFMPEG_LIBAVUTIL_A = @FFMPEG_LIBAVUTIL_A@ GAPLIBDIR = @GAPLIBDIR@ GAPVIDEOAPI_EXTINCS = @GAPVIDEOAPI_EXTINCS@ -GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -+GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -lavformat - GAP_AUDIO_SUPPORT_FALSE = @GAP_AUDIO_SUPPORT_FALSE@ - GAP_AUDIO_SUPPORT_TRUE = @GAP_AUDIO_SUPPORT_TRUE@ ++GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -lavformat -lswscale GAP_MAJOR_VERSION = @GAP_MAJOR_VERSION@ + GAP_MICRO_VERSION = @GAP_MICRO_VERSION@ + GAP_MINOR_VERSION = @GAP_MINOR_VERSION@ Index: graphics/gimp-gap/files/patch-vid_enc_ffmpeg__gap_enc_ffmpeg_main.c =================================================================== RCS file: graphics/gimp-gap/files/patch-vid_enc_ffmpeg__gap_enc_ffmpeg_main.c diff -N graphics/gimp-gap/files/patch-vid_enc_ffmpeg__gap_enc_ffmpeg_main.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/gimp-gap/files/patch-vid_enc_ffmpeg__gap_enc_ffmpeg_main.c 29 Sep 2010 15:48:53 -0000 @@ -0,0 +1,40 @@ +--- vid_enc_ffmpeg/gap_enc_ffmpeg_main.c.orig 2010-08-20 22:35:28.000000000 +0200 ++++ vid_enc_ffmpeg/gap_enc_ffmpeg_main.c 2010-08-20 22:45:11.000000000 +0200 +@@ -76,6 +76,7 @@ + #include + #include + ++#include + + #include "gap-intl.h" + +@@ -2843,11 +2844,24 @@ p_convert_colormodel(t_ffmpeg_handle *ff + } + + /* convert to pix_fmt needed by the codec */ +- l_rc = img_convert(picture_codec, ffh->vst[ii].vid_codec_context->pix_fmt /* dst */ +- ,picture_rgb, PIX_FMT_BGR24 /* src */ +- ,ffh->frame_width +- ,ffh->frame_height +- ); ++ static int sws_flags = SWS_BICUBIC; ++ struct SwsContext *img_convert_ctx; ++ img_convert_ctx = sws_getContext(ffh->frame_width, ++ ffh->frame_height, ++ PIX_FMT_BGR24, ++ ffh->frame_width, ++ ffh->frame_height, ++ ffh->vst[ii].vid_codec_context->pix_fmt, ++ sws_flags, NULL, NULL, NULL); ++ ++ sws_scale (img_convert_ctx, ++ picture_rgb->data, ++ picture_rgb->linesize, ++ 0, ++ ffh->frame_height, ++ picture_codec->data, ++ picture_codec->linesize); ++ sws_freeContext(img_convert_ctx); + + if(gap_debug) + { Index: graphics/gimp-gap/files/patch-vid_enc_ffmpeg_gap_enc_ffmpeg_main.c =================================================================== RCS file: graphics/gimp-gap/files/patch-vid_enc_ffmpeg_gap_enc_ffmpeg_main.c diff -N graphics/gimp-gap/files/patch-vid_enc_ffmpeg_gap_enc_ffmpeg_main.c --- graphics/gimp-gap/files/patch-vid_enc_ffmpeg_gap_enc_ffmpeg_main.c 22 Aug 2007 17:10:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ ---- vid_enc_ffmpeg/gap_enc_ffmpeg_main.c.orig 2007-08-22 09:48:40.000000000 -0400 -+++ vid_enc_ffmpeg/gap_enc_ffmpeg_main.c 2007-08-22 09:55:11.000000000 -0400 -@@ -1537,8 +1537,8 @@ - - video_enc->bit_rate = epp->video_bitrate * 1000; - video_enc->bit_rate_tolerance = epp->bitrate_tol * 1000; -- video_enc->frame_rate_base = DEFAULT_FRAME_RATE_BASE; -- video_enc->frame_rate = gpp->val.framerate * DEFAULT_FRAME_RATE_BASE; -+ video_enc->time_base.den = DEFAULT_FRAME_RATE_BASE; -+ video_enc->time_base.num = gpp->val.framerate * DEFAULT_FRAME_RATE_BASE; - video_enc->width = gpp->val.vid_width; - video_enc->height = gpp->val.vid_height; - -@@ -2235,12 +2235,11 @@ - */ - ffh->ap->sample_rate = awp->awk[0].sample_rate; - ffh->ap->channels = awp->awk[0].channels; -- ffh->ap->frame_rate_base = DEFAULT_FRAME_RATE_BASE; -- ffh->ap->frame_rate = gpp->val.framerate * DEFAULT_FRAME_RATE_BASE; -+ ffh->ap->time_base.num = DEFAULT_FRAME_RATE_BASE; -+ ffh->ap->time_base.den = gpp->val.framerate * DEFAULT_FRAME_RATE_BASE; - ffh->ap->width = gpp->val.vid_width; - ffh->ap->height = gpp->val.vid_height; - -- ffh->ap->image_format = NULL; - ffh->ap->pix_fmt = PIX_FMT_YUV420P; - - /* tv standard, NTSC, PAL, SECAM */ Index: graphics/gimp-gap/files/patch-vid_enc_rawframes_Makefile.in =================================================================== RCS file: graphics/gimp-gap/files/patch-vid_enc_rawframes_Makefile.in diff -N graphics/gimp-gap/files/patch-vid_enc_rawframes_Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/gimp-gap/files/patch-vid_enc_rawframes_Makefile.in 29 Sep 2010 15:48:53 -0000 @@ -0,0 +1,11 @@ +--- vid_enc_rawframes/Makefile.in.orig 2010-08-20 22:50:12.000000000 +0200 ++++ vid_enc_rawframes/Makefile.in 2010-08-20 22:50:59.000000000 +0200 +@@ -96,7 +96,7 @@ + FFMPEG_LIBAVUTIL_A = @FFMPEG_LIBAVUTIL_A@ + GAPLIBDIR = @GAPLIBDIR@ + GAPVIDEOAPI_EXTINCS = @GAPVIDEOAPI_EXTINCS@ +-GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ ++GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -lavformat -lswscale + GAP_MAJOR_VERSION = @GAP_MAJOR_VERSION@ + GAP_MICRO_VERSION = @GAP_MICRO_VERSION@ + GAP_MINOR_VERSION = @GAP_MINOR_VERSION@ Index: graphics/gimp-gap/files/patch-vid_enc_single_Makefile.in =================================================================== RCS file: /home/pcvs/ports/graphics/gimp-gap/files/patch-vid_enc_single_Makefile.in,v retrieving revision 1.1 diff -a -u -r1.1 patch-vid_enc_single_Makefile.in --- graphics/gimp-gap/files/patch-vid_enc_single_Makefile.in 22 Aug 2007 17:10:16 -0000 1.1 +++ graphics/gimp-gap/files/patch-vid_enc_single_Makefile.in 29 Sep 2010 15:48:53 -0000 @@ -1,11 +1,11 @@ ---- vid_enc_single/Makefile.in.orig 2007-08-22 11:04:39.000000000 -0400 -+++ vid_enc_single/Makefile.in 2007-08-22 11:04:48.000000000 -0400 -@@ -112,7 +112,7 @@ - FFMPEG_LIBAVFORMAT_A = @FFMPEG_LIBAVFORMAT_A@ +--- vid_enc_single/Makefile.in.orig 2009-06-04 22:41:00.000000000 +0200 ++++ vid_enc_single/Makefile.in 2010-08-20 22:52:26.000000000 +0200 +@@ -98,7 +98,7 @@ + FFMPEG_LIBAVUTIL_A = @FFMPEG_LIBAVUTIL_A@ GAPLIBDIR = @GAPLIBDIR@ GAPVIDEOAPI_EXTINCS = @GAPVIDEOAPI_EXTINCS@ -GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -+GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -lavformat - GAP_AUDIO_SUPPORT_FALSE = @GAP_AUDIO_SUPPORT_FALSE@ - GAP_AUDIO_SUPPORT_TRUE = @GAP_AUDIO_SUPPORT_TRUE@ ++GAPVIDEOAPI_EXTLIBS = @GAPVIDEOAPI_EXTLIBS@ -lavformat -lswscale GAP_MAJOR_VERSION = @GAP_MAJOR_VERSION@ + GAP_MICRO_VERSION = @GAP_MICRO_VERSION@ + GAP_MINOR_VERSION = @GAP_MINOR_VERSION@