diff options
68 files changed, 236 insertions, 122 deletions
diff --git a/audio/akode-plugins-ffmpeg/Makefile b/audio/akode-plugins-ffmpeg/Makefile index fddd0ff80780..cdb09f66201b 100644 --- a/audio/akode-plugins-ffmpeg/Makefile +++ b/audio/akode-plugins-ffmpeg/Makefile @@ -7,6 +7,7 @@ PORTNAME= akode PORTVERSION= 2.0.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_GENTOO} diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile index 43a1ffd7cb69..4939dadb42ee 100644 --- a/audio/alsa-plugins/Makefile +++ b/audio/alsa-plugins/Makefile @@ -7,6 +7,7 @@ PORTNAME= alsa-plugins PORTVERSION= 1.0.23 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ftp://ftp.silug.org/pub/alsa/plugins/ \ ftp://gd.tuwien.ac.at/opsys/linux/alsa/plugins/ \ diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile index f7b2d0cadb3d..36b36776f646 100644 --- a/audio/aqualung/Makefile +++ b/audio/aqualung/Makefile @@ -7,7 +7,7 @@ PORTNAME= aqualung DISTVERSION= 0.9beta11 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \ http://wickedmachine.net/mirror/ diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 76edb1098123..928995469fef 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -7,6 +7,7 @@ PORTNAME= cmus PORTVERSION= 2.3.3 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/audio/cuberok/Makefile b/audio/cuberok/Makefile index a43fb7f12395..c5dedcdc7dfb 100644 --- a/audio/cuberok/Makefile +++ b/audio/cuberok/Makefile @@ -7,7 +7,7 @@ PORTNAME= cuberok PORTVERSION= 0.0.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= GOOGLE_CODE diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile index 5a4806ff8634..7064f2f23820 100644 --- a/audio/deadbeef/Makefile +++ b/audio/deadbeef/Makefile @@ -7,6 +7,7 @@ PORTNAME= deadbeef PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/ diff --git a/audio/moc/Makefile b/audio/moc/Makefile index e51247997080..b1d78c6a349a 100644 --- a/audio/moc/Makefile +++ b/audio/moc/Makefile @@ -7,7 +7,7 @@ PORTNAME= moc PORTVERSION= 2.4.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= ftp://ftp.daper.net/pub/soft/moc/stable/ diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 875c267cc9d4..3f66f548014f 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -7,7 +7,7 @@ PORTNAME= musicpd PORTVERSION= 0.15.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio ipv6 MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION} DISTNAME= mpd-${PORTVERSION} diff --git a/audio/picard/Makefile b/audio/picard/Makefile index 5ca388a225b8..48f903f04a31 100644 --- a/audio/picard/Makefile +++ b/audio/picard/Makefile @@ -7,7 +7,7 @@ PORTNAME= picard PORTVERSION= 0.12.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio python MASTER_SITES= http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \ ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \ diff --git a/audio/sox/Makefile b/audio/sox/Makefile index 47413d5fc355..3f78ce297d4a 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -7,7 +7,7 @@ PORTNAME= sox PORTVERSION= 14.3.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= SF diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile index 6ef5d28c588a..00167e22038d 100644 --- a/audio/xmms2/Makefile +++ b/audio/xmms2/Makefile @@ -7,7 +7,7 @@ PORTNAME?= xmms2 PORTVERSION= 0.6 -PORTREVISION= 6 +PORTREVISION= 7 DISTVERSIONSUFFIX=DrMattDestruction CATEGORIES?= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20DrMattDestruction diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile index 9fc825f0edc9..78cbbe4e9cb6 100644 --- a/cad/netgen/Makefile +++ b/cad/netgen/Makefile @@ -7,7 +7,7 @@ PORTNAME= netgen PORTVERSION= 4.9.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION}/ diff --git a/devel/libdlna/Makefile b/devel/libdlna/Makefile index af778f1bd922..789dbe9c57f9 100644 --- a/devel/libdlna/Makefile +++ b/devel/libdlna/Makefile @@ -7,6 +7,7 @@ PORTNAME= libdlna PORTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://libdlna.geexbox.org/releases/ \ http://critical.ch/distfiles/ \ diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile index 7ac21c0bf85f..9e8bfa168148 100644 --- a/devel/synfig/Makefile +++ b/devel/synfig/Makefile @@ -7,6 +7,7 @@ PORTNAME= synfig DISTVERSION= 0.62.01 +PORTREVISION= 1 CATEGORIES= devel graphics multimedia MASTER_SITES= SF 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"); diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile index 6dc8c32958f8..e363b8346792 100644 --- a/lang/pike76/Makefile +++ b/lang/pike76/Makefile @@ -7,7 +7,7 @@ PORTNAME= pike76 PORTVERSION= 7.6.112 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= lang MASTER_SITES= ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \ http://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \ diff --git a/math/octave-forge-video/Makefile b/math/octave-forge-video/Makefile index c1a7e7b7c564..706c6d5c07db 100644 --- a/math/octave-forge-video/Makefile +++ b/math/octave-forge-video/Makefile @@ -7,7 +7,7 @@ PORTNAME= octave-forge-video PORTVERSION= 1.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MAINTAINER= stephen@missouri.edu diff --git a/multimedia/avbin/Makefile b/multimedia/avbin/Makefile index a1bbb0990cb3..4973807ec169 100644 --- a/multimedia/avbin/Makefile +++ b/multimedia/avbin/Makefile @@ -7,7 +7,7 @@ PORTNAME= avbin PORTVERSION= 7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ http://mirror.amdmi3.ru/distfiles/ diff --git a/multimedia/avbin/files/patch-src-avbin.c b/multimedia/avbin/files/patch-src-avbin.c index 8a0ead8622aa..453e12ba26da 100644 --- a/multimedia/avbin/files/patch-src-avbin.c +++ b/multimedia/avbin/files/patch-src-avbin.c @@ -1,6 +1,15 @@ --- src/avbin.c.orig 2008-09-21 08:45:33.000000000 +0200 -+++ src/avbin.c 2009-08-11 15:02:52.574916144 +0200 -@@ -215,10 +237,6 @@ ++++ src/avbin.c 2010-07-11 10:38:40.684168520 +0200 +@@ -43,6 +43,8 @@ + + static AVbinLogCallback user_log_callback = NULL; + ++static int av_log_level; ++ + /** + * Format log messages and call the user log callback. Essentially a + * reimplementation of libavutil/log.c:av_log_default_callback. +@@ -215,10 +217,6 @@ info->audio.sample_format = AVBIN_SAMPLE_FORMAT_S16; info->audio.sample_bits = 16; break; diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile index 62e82d2343cb..721c9a9bc326 100644 --- a/multimedia/dvbcut/Makefile +++ b/multimedia/dvbcut/Makefile @@ -7,7 +7,7 @@ PORTNAME= dvbcut PORTVERSION= 0.6.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= http://www.mr511.de/dvbcut/ diff --git a/multimedia/etoile-mediakit/Makefile b/multimedia/etoile-mediakit/Makefile index 87a355ae3a95..d6034fa40aa0 100644 --- a/multimedia/etoile-mediakit/Makefile +++ b/multimedia/etoile-mediakit/Makefile @@ -7,6 +7,7 @@ PORTNAME= mediakit PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= multimedia gnustep MASTER_SITES= http://download.gna.org/etoile/ PKGNAMEPREFIX= etoile- diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 684f032bad7a..2e033f195268 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -6,8 +6,7 @@ # $Id: Makefile 77 2008-07-27 21:50:37Z buhnux $ PORTNAME= ffmpeg -PORTVERSION= 0.5.2 -PORTREVISION= 3 +PORTVERSION= 0.6 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -26,14 +25,13 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes WANT_SDL= yes -OPTIONS= AMR_NB "AMR Narrow Band encoder" off \ - AMR_WB "AMR Wide Band encoder" off \ +OPTIONS= AMR_NB "AMR Narrow Band encoder (opencore)" off \ + AMR_WB "AMR Wide Band encoder (opencore)" off \ DIRAC "Dirac codec via libdirac" off \ FAAC "FAAC mp4/aac audio encoder" off \ FAAD "FAAD mp4/aac audio decoder" on \ FFSERVER "Build and install ffserver" on \ GSM "GSM audio codec" off \ - IPV6 "IPV6 network support" on \ LAME "LAME MP3 encoder" off \ OPENJPEG "JPEG 2000 decoder" off \ OPTIMIZED_CFLAGS "Additional optimizations" off \ @@ -42,9 +40,7 @@ OPTIONS= AMR_NB "AMR Narrow Band encoder" off \ SPEEX "Speex audio decoder" off \ SSSE3 "Enable ssse3 support" on \ THEORA "Theora encoder (implies OGG)" on \ - VHOOK "Video hook support" off \ VORBIS "Vorbis encoder via libvorbis (implies OGG)" on \ - X11GRAB "enable X11 grabbing" off \ X264 "H.264 encoder" on \ XVID "Xvid encoder via xvidcore" on @@ -81,11 +77,11 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --mandir="${PREFIX}/man" \ --enable-shared \ --enable-gpl \ - --enable-swscale \ --enable-postproc \ --enable-avfilter \ --enable-avfilter-lavf \ --enable-pthreads \ + --enable-x11grab \ --enable-memalign-hack \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ @@ -96,9 +92,8 @@ SHLIB_VER= 1 PLIST_SUB= SHLIB_VER=${SHLIB_VER} USE_LDCONFIG= yes -DOC_FILES= Changelog COPYING.GPLv2 COPYING.GPLv3 \ - COPYING.LGPLv2.1 COPYING.LGPLv3 \ - CREDITS INSTALL MAINTAINERS README RELEASE +DOC_FILES= Changelog COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 \ + COPYING.LGPLv3 CREDITS INSTALL MAINTAINERS README # under doc subdirectory DOC_DOCFILES= APIchanges avutil.txt faq.html ffmpeg-doc.html \ ffmpeg_powerpc_performance_evaluation_howto.txt \ @@ -108,9 +103,9 @@ DOC_DOCFILES= APIchanges avutil.txt faq.html ffmpeg-doc.html \ PORTDOCS= * .if !defined(WITHOUT_SSSE3) -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils -CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils +CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif .ifndef(WITHOUT_FFSERVER) @@ -138,7 +133,7 @@ FFMPEG_CFLAGS+= -msse # PORTDOCS .ifndef(NOPORTDOCS) BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html -MAN1+= ffmpeg.1 +MAN1+= ffmpeg.1 ffprobe.1 . ifndef(WITHOUT_FFSERVER) MAN1+= ffserver.1 . endif @@ -150,18 +145,20 @@ CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer .endif # amr +.if defined(WITH_AMR_NB) || defined (WITH_AMR_WB) +LIB_DEPENDS+= opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr +.endif + .ifdef(WITH_AMR_NB) -LIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrnb -CONFIGURE_ARGS+= --enable-libamr-nb --enable-nonfree +CONFIGURE_ARGS+= --enable-libopencore-amrnb --enable-version3 .else -CONFIGURE_ARGS+= --disable-libamr-nb +CONFIGURE_ARGS+= --disable-libopencore-amrnb .endif .ifdef(WITH_AMR_WB) -LIB_DEPENDS+= amrwb.3:${PORTSDIR}/audio/libamrwb -CONFIGURE_ARGS+= --enable-libamr-wb --enable-nonfree +CONFIGURE_ARGS+= --enable-libopencore-amrwb --enable-version3 .else -CONFIGURE_ARGS+= --disable-libamr-wb +CONFIGURE_ARGS+= --disable-libopencore-amrwb .endif # dirac @@ -205,23 +202,6 @@ CONFIGURE_ARGS+= --enable-libgsm CONFIGURE_ARGS+= --disable-libgsm .endif -# vhook -.if defined(WITH_VHOOK) -USE_EFL= imlib2 -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 -PLIST_SUB+= VHOOK="" -.else -CONFIGURE_ARGS+= --disable-vhook -PLIST_SUB+= VHOOK="@comment " -.endif - -# ipv6 -.ifndef(WITHOUT_IPV6) -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - # mp3 .ifdef(WITH_LAME) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame @@ -282,15 +262,6 @@ FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis CONFIGURE_ARGS+= --disable-libvorbis .endif -# x11grab -.if defined(WITH_X11GRAB) && !defined(WITHOUT_X11) -USE_XORG= x11 xext -CONFIGURE_ARGS+= --enable-x11grab -.else -CONFIGURE_ARGS+= --disable-x11grab -.endif - - # x264 .ifndef(WITHOUT_X264) LIB_DEPENDS+= x264.98:${PORTSDIR}/multimedia/x264 @@ -323,10 +294,12 @@ post-patch: @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ - s|-pthread|${PTHREAD_LIBS}|g" \ + s|-pthread|${PTHREAD_LIBS}|g; \ + s|gsm/gsm.h|gsm.h|g" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + @cd ${WRKSRC}/libavcodec && ${LN} -s x86 i386 && ${LN} -s x86 amd64 .ifdef(WITH_SDL) @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index d6dc176244c6..335f1e572c7f 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,3 +1,3 @@ -MD5 (ffmpeg-0.5.2.tar.bz2) = 451eb428ca97a72c00555d50944cdb24 -SHA256 (ffmpeg-0.5.2.tar.bz2) = 4eaf0a9cdbf97e6200b6eb821e527fcb3e9bd525de3b4537e2b3bab633ee47e5 -SIZE (ffmpeg-0.5.2.tar.bz2) = 2777698 +MD5 (ffmpeg-0.6.tar.bz2) = d6142a9a5821d6a6262a6edb903faa24 +SHA256 (ffmpeg-0.6.tar.bz2) = 6730baa6750f0cbffaf5f4c04f8ddcf1ebe6c651a6eeb12ae947a228de4c8120 +SIZE (ffmpeg-0.6.tar.bz2) = 3720372 diff --git a/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c b/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c new file mode 100644 index 000000000000..62f52c8206fe --- /dev/null +++ b/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c @@ -0,0 +1,11 @@ +--- libavcodec/libgsm.c.orig 2010-07-21 10:24:16.297810379 +0200 ++++ libavcodec/libgsm.c 2010-07-21 10:24:22.915234561 +0200 +@@ -28,7 +28,7 @@ + // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html + + #include "avcodec.h" +-#include <gsm/gsm.h> ++#include <gsm.h> + + // gsm.h misses some essential constants + #define GSM_BLOCK_SIZE 33 diff --git a/multimedia/ffmpeg/files/patch-libavformat-sierravmd.c b/multimedia/ffmpeg/files/patch-libavformat-sierravmd.c deleted file mode 100644 index 5c5e61694f70..000000000000 --- a/multimedia/ffmpeg/files/patch-libavformat-sierravmd.c +++ /dev/null @@ -1,12 +0,0 @@ ---- libavformat/sierravmd.c -+++ libavformat/sierravmd.c -@@ -154,7 +154,7 @@ static int vmd_read_header(AVFormatContext *s, - vmd->frame_table = NULL; - sound_buffers = AV_RL16(&vmd->vmd_header[808]); - raw_frame_table_size = vmd->frame_count * 6; -- if(vmd->frame_count * vmd->frames_per_block >= UINT_MAX / sizeof(vmd_frame)){ -+ if(vmd->frame_count * vmd->frames_per_block >= (UINT_MAX - sound_buffers) / sizeof(vmd_frame)){ - av_log(s, AV_LOG_ERROR, "vmd->frame_count * vmd->frames_per_block too large\n"); - return -1; - } - diff --git a/multimedia/ffmpeg/files/patch-libavutil-common.h b/multimedia/ffmpeg/files/patch-libavutil-common.h new file mode 100644 index 000000000000..9bb629bc0ab8 --- /dev/null +++ b/multimedia/ffmpeg/files/patch-libavutil-common.h @@ -0,0 +1,13 @@ +--- libavutil/common.h.orig 2010-04-26 23:01:38.000000000 +0200 ++++ libavutil/common.h 2010-07-10 16:06:27.038027901 +0200 +@@ -36,6 +36,10 @@ + #include <string.h> + #include "attributes.h" + ++#ifndef UINT64_C ++#define UINT64_C(c) (c ## UL) ++#endif ++ + //rounded division & shift + #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) + /* assume b>0 */ diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist index f75c19235463..0f7eb3b0cddd 100644 --- a/multimedia/ffmpeg/pkg-plist +++ b/multimedia/ffmpeg/pkg-plist @@ -1,4 +1,5 @@ bin/ffmpeg +bin/ffprobe %%FFSERVER%%bin/ffserver %%FFSERVER%%@unexec if cmp -s %D/etc/ffserver.conf %D/etc/ffserver.conf-dist; then rm -f %D/etc/ffserver.conf; fi %%FFSERVER%%etc/ffserver.conf-dist @@ -30,7 +31,10 @@ include/ffmpeg/swscale.h include/ffmpeg/vdpau.h include/ffmpeg/xvmc.h include/libavcodec/avcodec.h +include/libavcodec/avfft.h +include/libavcodec/dxva2.h include/libavcodec/opt.h +include/libavcodec/vaapi.h include/libavcodec/vdpau.h include/libavcodec/xvmc.h include/libavdevice/avdevice.h @@ -38,11 +42,14 @@ include/libavfilter/avfilter.h include/libavformat/avformat.h include/libavformat/avio.h include/libavutil/adler32.h +include/libavutil/attributes.h +include/libavutil/avconfig.h include/libavutil/avstring.h include/libavutil/avutil.h include/libavutil/base64.h include/libavutil/common.h include/libavutil/crc.h +include/libavutil/error.h include/libavutil/fifo.h include/libavutil/intfloat_readwrite.h include/libavutil/log.h @@ -50,8 +57,8 @@ include/libavutil/lzo.h include/libavutil/mathematics.h include/libavutil/md5.h include/libavutil/mem.h +include/libavutil/pixdesc.h include/libavutil/pixfmt.h -include/libavutil/random.h include/libavutil/rational.h include/libavutil/sha1.h include/libpostproc/postprocess.h @@ -60,37 +67,31 @@ include/libswscale/swscale.h lib/libavcodec.a lib/libavcodec.so lib/libavcodec.so.1 -lib/libavcodec.so.52.20.1 +lib/libavcodec.so.52.72.2 lib/libavdevice.a lib/libavdevice.so lib/libavdevice.so.1 -lib/libavdevice.so.52.1.0 +lib/libavdevice.so.52.2.0 lib/libavfilter.a lib/libavfilter.so -lib/libavfilter.so.0.4.0 +lib/libavfilter.so.1.19.0 lib/libavfilter.so.1 lib/libavformat.a lib/libavformat.so lib/libavformat.so.1 -lib/libavformat.so.52.31.0 +lib/libavformat.so.52.64.2 lib/libavutil.a lib/libavutil.so lib/libavutil.so.1 -lib/libavutil.so.49.15.0 +lib/libavutil.so.50.15.1 lib/libpostproc.a lib/libpostproc.so lib/libpostproc.so.1 lib/libpostproc.so.51.2.0 lib/libswscale.a lib/libswscale.so -lib/libswscale.so.0.7.1 +lib/libswscale.so.0.11.0 lib/libswscale.so.1 -%%VHOOK%%lib/vhook/drawtext.so -%%VHOOK%%lib/vhook/fish.so -%%VHOOK%%lib/vhook/ppm.so -%%VHOOK%%lib/vhook/imlib2.so -%%VHOOK%%lib/vhook/null.so -%%VHOOK%%lib/vhook/watermark.so libdata/pkgconfig/libavcodec.pc libdata/pkgconfig/libavdevice.pc libdata/pkgconfig/libavfilter.pc @@ -100,6 +101,10 @@ libdata/pkgconfig/libpostproc.pc libdata/pkgconfig/libswscale.pc %%DATADIR%%/libx264-baseline.ffpreset %%DATADIR%%/libx264-default.ffpreset +%%DATADIR%%/libx264-fast.ffpreset +%%DATADIR%%/libx264-fast_firstpass.ffpreset +%%DATADIR%%/libx264-faster.ffpreset +%%DATADIR%%/libx264-faster_firstpass.ffpreset %%DATADIR%%/libx264-fastfirstpass.ffpreset %%DATADIR%%/libx264-hq.ffpreset %%DATADIR%%/libx264-ipod320.ffpreset @@ -112,10 +117,25 @@ libdata/pkgconfig/libswscale.pc %%DATADIR%%/libx264-lossless_ultrafast.ffpreset %%DATADIR%%/libx264-main.ffpreset %%DATADIR%%/libx264-max.ffpreset +%%DATADIR%%/libx264-medium.ffpreset +%%DATADIR%%/libx264-medium_firstpass.ffpreset %%DATADIR%%/libx264-normal.ffpreset +%%DATADIR%%/libx264-placebo.ffpreset +%%DATADIR%%/libx264-placebo_firstpass.ffpreset +%%DATADIR%%/libx264-slow.ffpreset +%%DATADIR%%/libx264-slow_firstpass.ffpreset +%%DATADIR%%/libx264-slower.ffpreset +%%DATADIR%%/libx264-slower_firstpass.ffpreset %%DATADIR%%/libx264-slowfirstpass.ffpreset -@dirrm %%DATADIR%% -%%VHOOK%%@dirrm lib/vhook +%%DATADIR%%/libx264-superfast.ffpreset +%%DATADIR%%/libx264-superfast_firstpass.ffpreset +%%DATADIR%%/libx264-ultrafast.ffpreset +%%DATADIR%%/libx264-ultrafast_firstpass.ffpreset +%%DATADIR%%/libx264-veryfast.ffpreset +%%DATADIR%%/libx264-veryfast_firstpass.ffpreset +%%DATADIR%%/libx264-veryslow.ffpreset +%%DATADIR%%/libx264-veryslow_firstpass.ffpreset +@dirrm %%DATADIR%%/ @dirrm include/postproc @dirrm include/libswscale @dirrm include/libpostproc diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile index 627e556882b2..9c4254fadaf0 100644 --- a/multimedia/ffmpeg2theora/Makefile +++ b/multimedia/ffmpeg2theora/Makefile @@ -6,7 +6,7 @@ PORTNAME= ffmpeg2theora PORTVERSION= 0.24 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://v2v.cc/~j/ffmpeg2theora/ diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile index bbb90ef3d2e1..f7a7eb7f53b3 100644 --- a/multimedia/ffmpegthumbnailer/Makefile +++ b/multimedia/ffmpegthumbnailer/Makefile @@ -6,6 +6,7 @@ PORTNAME= ffmpegthumbnailer PORTVERSION= 2.0.2 +PORTREVISION= 1 CATEGORIES= multimedia graphics MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} diff --git a/multimedia/flv2mpeg4/Makefile b/multimedia/flv2mpeg4/Makefile index 58d72e49efd1..df26f935a759 100644 --- a/multimedia/flv2mpeg4/Makefile +++ b/multimedia/flv2mpeg4/Makefile @@ -7,6 +7,7 @@ PORTNAME= flv2mpeg4 DISTVERSION= 20061129 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://src4.narod.ru/ diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile index 499b458f1c31..aff5e92c9185 100644 --- a/multimedia/gmerlin-avdecoder/Makefile +++ b/multimedia/gmerlin-avdecoder/Makefile @@ -7,7 +7,7 @@ PORTNAME= gmerlin-avdecoder PORTVERSION= 1.0.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION} diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile index 0eac710b5d07..3b146dc23539 100644 --- a/multimedia/k9copy-kde4/Makefile +++ b/multimedia/k9copy-kde4/Makefile @@ -6,7 +6,7 @@ PORTNAME= k9copy PORTVERSION= 2.3.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-kde4/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-Source diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile index ae339e74d22b..dbe6d4b0876e 100644 --- a/multimedia/kino/Makefile +++ b/multimedia/kino/Makefile @@ -7,7 +7,7 @@ PORTNAME= kino PORTVERSION= 1.3.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= SF diff --git a/multimedia/libomxil-bellagio/Makefile b/multimedia/libomxil-bellagio/Makefile index a28788e7853c..512c06c4454e 100644 --- a/multimedia/libomxil-bellagio/Makefile +++ b/multimedia/libomxil-bellagio/Makefile @@ -7,6 +7,7 @@ PORTNAME= libomxil-bellagio PORTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF/omxil/omxil/Bellagio%200.9.1 diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index 1cdf501479ef..884dface4344 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -7,7 +7,7 @@ PORTNAME= libquicktime PORTVERSION= 1.1.5 -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES= multimedia MASTER_SITES= SF diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index b1166c480ebf..0c7847946ef4 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -7,6 +7,7 @@ PORTNAME= xine PORTVERSION= 1.1.18.1 +PORTREVISION= 1 CATEGORIES= multimedia ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION} PKGNAMEPREFIX= lib diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile index d8abc6c15f5c..adeb40b694f3 100644 --- a/multimedia/mlt/Makefile +++ b/multimedia/mlt/Makefile @@ -6,7 +6,7 @@ PORTNAME= mlt PORTVERSION= 0.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME} diff --git a/multimedia/moonlight/Makefile b/multimedia/moonlight/Makefile index 1fab762dc824..865ff5230afc 100644 --- a/multimedia/moonlight/Makefile +++ b/multimedia/moonlight/Makefile @@ -7,6 +7,7 @@ PORTNAME= moonlight PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= multimedia www MASTER_SITES= http://ftp.novell.com/pub/mono/sources/moon/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 3baa33eba5b9..f05796125f69 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -7,7 +7,7 @@ PORTNAME= motion PORTVERSION= 3.2.11.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%203.2/${PORTVERSION} diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index a5ca2cb30961..da4871d4c4fc 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -7,7 +7,7 @@ PORTNAME= mpeg4ip PORTVERSION= 1.6.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= LOCAL/ahze # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136 diff --git a/multimedia/openmovieeditor/Makefile b/multimedia/openmovieeditor/Makefile index 989a3556af00..4e1b6032157a 100644 --- a/multimedia/openmovieeditor/Makefile +++ b/multimedia/openmovieeditor/Makefile @@ -7,7 +7,7 @@ PORTNAME= openmovieeditor PORTVERSION= 0.0.20090105 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= SF diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile index 52592ff72921..1a6dfa32a56d 100644 --- a/multimedia/sabbu/Makefile +++ b/multimedia/sabbu/Makefile @@ -7,7 +7,7 @@ PORTNAME= sabbu PORTVERSION= 0.3.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Sabbu%20${PORTVERSION} diff --git a/multimedia/sabbu/files/patch-video.cpp b/multimedia/sabbu/files/patch-video.cpp index 25f818bd7ee8..8eea1f07114d 100644 --- a/multimedia/sabbu/files/patch-video.cpp +++ b/multimedia/sabbu/files/patch-video.cpp @@ -50,7 +50,7 @@ +#if 0 int dst_pix_fmt = PIX_FMT_RGBA32; +#else -+ PixelFormat dst_pix_fmt = PIX_FMT_RGBA32; ++ PixelFormat dst_pix_fmt = PIX_FMT_RGB32; +#endif int got_picture; int len; diff --git a/multimedia/sabbu/files/patch-video_ffmpeg.h b/multimedia/sabbu/files/patch-video_ffmpeg.h new file mode 100644 index 000000000000..3e637edef292 --- /dev/null +++ b/multimedia/sabbu/files/patch-video_ffmpeg.h @@ -0,0 +1,11 @@ +--- Source/video_ffmpeg.h.orig 2010-07-11 10:16:57.816240554 +0200 ++++ Source/video_ffmpeg.h 2010-07-11 10:17:06.976420069 +0200 +@@ -24,7 +24,7 @@ + PIX_FMT_BGR24, ///< Packed pixel, 3 bytes per pixel, BGRBGR... + PIX_FMT_YUV422P, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) + PIX_FMT_YUV444P, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) +- PIX_FMT_RGBA32, ///< Packed pixel, 4 bytes per pixel, BGRABGRA..., stored in cpu endianness ++ PIX_FMT_RGB32, ///< Packed pixel, 4 bytes per pixel, BGRABGRA..., stored in cpu endianness + PIX_FMT_YUV410P, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) + PIX_FMT_YUV411P, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) + PIX_FMT_RGB565, ///< always stored in cpu endianness diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 976df0dead58..624b921efa40 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -7,7 +7,7 @@ PORTNAME= transcode PORTVERSION= 1.1.5 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_BERLIOS} \ http://fromani.exit1.org/ diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 66bc7307ce26..b9e514417e2a 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -7,7 +7,8 @@ PORTNAME= vlc DISTVERSION= 1.1.0 -PORTEPOCH= 4 +PORTREVISION= 1 +PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \ http://ftp.snt.utwente.nl/pub/software/videolan/${PORTNAME}/${DISTVERSION}/ \ diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile index 2a25d864d275..4e7f00eca29a 100644 --- a/net/mediatomb/Makefile +++ b/net/mediatomb/Makefile @@ -7,6 +7,7 @@ PORTNAME= mediatomb PORTVERSION= 0.12.1 +PORTREVISION= 1 CATEGORIES= net multimedia MASTER_SITES= SF/${PORTNAME}/MediaTomb/${PORTVERSION} diff --git a/net/opal/Makefile b/net/opal/Makefile index 1ebd2bfa5a33..667f4051e564 100644 --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -7,7 +7,7 @@ PORTNAME= opal PORTVERSION= 2.2.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= GNOME diff --git a/net/opal3/Makefile b/net/opal3/Makefile index 718f1d0ead62..1323282f9485 100644 --- a/net/opal3/Makefile +++ b/net/opal3/Makefile @@ -7,7 +7,7 @@ PORTNAME= opal3 PORTVERSION= 3.6.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net MASTER_SITES= SF/opalvoip/v3.6%20Lalande/Stable%205 DISTNAME= opal-${PORTVERSION} diff --git a/net/openh323/Makefile b/net/openh323/Makefile index 1143703bd2fd..034ca6fe5201 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -7,7 +7,7 @@ PORTNAME= openh323 PORTVERSION= 1.19.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= SF DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile index 5c7433767129..6cc643ed2fb9 100644 --- a/sysutils/k3b-kde4/Makefile +++ b/sysutils/k3b-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= k3b PORTVERSION= 1.0.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils multimedia kde MASTER_SITES= SF diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile index 5c7433767129..6cc643ed2fb9 100644 --- a/sysutils/k3b/Makefile +++ b/sysutils/k3b/Makefile @@ -7,7 +7,7 @@ PORTNAME= k3b PORTVERSION= 1.0.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils multimedia kde MASTER_SITES= SF diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile index ca496bcdea33..67ac739ab0a3 100644 --- a/www/cherokee/Makefile +++ b/www/cherokee/Makefile @@ -7,6 +7,7 @@ PORTNAME= cherokee PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.cherokee-project.com/download/1.0/${PORTVERSION}/ \ http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \ diff --git a/www/flock/Makefile b/www/flock/Makefile index f7db5ab02b7b..f3f0b38f6ec1 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -7,6 +7,7 @@ PORTNAME= flock DISTVERSION= 2.6.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://mirror4.flock.com/source/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile index a887549f4d1b..faf4cd7c6ce0 100644 --- a/www/gallery2/Makefile +++ b/www/gallery2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gallery2 PORTVERSION= 2.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= SF/gallery/${PORTNAME}/${PORTVERSION} DISTNAME= gallery-${PORTVERSION}-full diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile index 7ed08fcb0849..b18267cd20a3 100644 --- a/x11-toolkits/nucleo/Makefile +++ b/x11-toolkits/nucleo/Makefile @@ -7,6 +7,7 @@ PORTNAME= nucleo PORTVERSION= 0.7.6 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/ |