diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
| commit | 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch) | |
| tree | c04604583d8be53b3ed7f10975be828c731f87cb /multimedia | |
| parent | 24315159daa0089f08acea4ba1b130fb6721ad5c (diff) | |
| download | ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.tar.gz ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.zip | |
Notes
Diffstat (limited to 'multimedia')
166 files changed, 350 insertions, 136 deletions
diff --git a/multimedia/2mandvd/Makefile b/multimedia/2mandvd/Makefile index df05969ef5c7..fa62d8cb2ec5 100644 --- a/multimedia/2mandvd/Makefile +++ b/multimedia/2mandvd/Makefile @@ -7,7 +7,7 @@ PORTNAME= 2ManDVD PORTVERSION= 1.3.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia kde MASTER_SITES= http://download.tuxfamily.org/2mandvd/ diff --git a/multimedia/abby/Makefile b/multimedia/abby/Makefile index 04c7e42b0eff..f0a1b3b59cc5 100644 --- a/multimedia/abby/Makefile +++ b/multimedia/abby/Makefile @@ -7,7 +7,7 @@ PORTNAME= abby PORTVERSION= 0.4.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia net MASTER_SITES= GOOGLE_CODE diff --git a/multimedia/acidrip/Makefile b/multimedia/acidrip/Makefile index b165d3669729..829f592197fe 100644 --- a/multimedia/acidrip/Makefile +++ b/multimedia/acidrip/Makefile @@ -7,7 +7,7 @@ PORTNAME= acidrip PORTVERSION= 0.14 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20-%20Your%20two-wheeled%20knife diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile index 6dd9a855f97a..d669e4dceb75 100644 --- a/multimedia/aegisub/Makefile +++ b/multimedia/aegisub/Makefile @@ -9,6 +9,7 @@ PORTNAME= aegisub PORTVERSION= 2.1.9 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://ftp.aegisub.org/pub/releases/ \ http://ftp2.aegisub.org/pub/releases/ \ diff --git a/multimedia/arista/Makefile b/multimedia/arista/Makefile index f2fda478f77f..f74eeea1175b 100644 --- a/multimedia/arista/Makefile +++ b/multimedia/arista/Makefile @@ -7,7 +7,7 @@ PORTNAME= arista PORTVERSION= 0.9.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://programmer-art.org/media/releases/arista-transcoder/ \ http://launchpadlibrarian.net/28489828/ diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile index 351f7507280c..bd1acd533f89 100644 --- a/multimedia/audacious-plugins/Makefile +++ b/multimedia/audacious-plugins/Makefile @@ -8,7 +8,7 @@ PORTNAME= audacious-plugins PORTVERSION= 3.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile index 30f862405b03..2c591623e6a6 100644 --- a/multimedia/audacious/Makefile +++ b/multimedia/audacious/Makefile @@ -7,6 +7,7 @@ PORTNAME= audacious PORTVERSION= 3.2.2 +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ diff --git a/multimedia/audiopreview/Makefile b/multimedia/audiopreview/Makefile index a4faa8a90d55..e9a24bf5f586 100644 --- a/multimedia/audiopreview/Makefile +++ b/multimedia/audiopreview/Makefile @@ -7,6 +7,7 @@ PORTNAME= audiopreview PORTVERSION= 0.6 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://audiopreview.codealpha.net/files/ diff --git a/multimedia/avbin/Makefile b/multimedia/avbin/Makefile index 5a12dee47726..95dcc277f33a 100644 --- a/multimedia/avbin/Makefile +++ b/multimedia/avbin/Makefile @@ -7,7 +7,7 @@ PORTNAME= avbin PORTVERSION= 7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ http://mirror.amdmi3.ru/distfiles/ diff --git a/multimedia/avidemux2-plugins/Makefile b/multimedia/avidemux2-plugins/Makefile index f94fecd30e26..b3d94c8afc73 100644 --- a/multimedia/avidemux2-plugins/Makefile +++ b/multimedia/avidemux2-plugins/Makefile @@ -7,6 +7,7 @@ PORTNAME= avidemux2 PORTVERSION= ${AVIDEMUX2_VERSION} +PORTREVISION= 5 CATEGORIES= multimedia PKGNAMESUFFIX= -plugins diff --git a/multimedia/avidemux2/Makefile.common b/multimedia/avidemux2/Makefile.common index 41410d87c157..bcaefce86600 100644 --- a/multimedia/avidemux2/Makefile.common +++ b/multimedia/avidemux2/Makefile.common @@ -2,7 +2,7 @@ # AVIDEMUX2_VERSION= 2.5.6 -PORTREVISION= 1 +PORTREVISION= 2 MASTER_SITES= BERLIOS \ SF/avidemux/avidemux/${PORTVERSION} DISTNAME= avidemux_${PORTVERSION} @@ -10,7 +10,7 @@ DISTNAME= avidemux_${PORTVERSION} BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \ a52.0:${PORTSDIR}/audio/liba52 \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ dca.0:${PORTSDIR}/multimedia/libdca \ execinfo.1:${PORTSDIR}/devel/libexecinfo diff --git a/multimedia/bangarang/Makefile b/multimedia/bangarang/Makefile index 044df88a9cd5..69fd9dcbd669 100644 --- a/multimedia/bangarang/Makefile +++ b/multimedia/bangarang/Makefile @@ -6,6 +6,7 @@ PORTNAME= bangarang PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile index c5fbef9af8ba..a65d98e9f09d 100644 --- a/multimedia/beep-media-player/Makefile +++ b/multimedia/beep-media-player/Makefile @@ -7,7 +7,7 @@ PORTNAME= beep-media-player PORTVERSION= 0.9.7.1 -PORTREVISION= 9 +PORTREVISION= 10 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 MASTER_SITES= SF/beepmp/bmp/${PORTVERSION} diff --git a/multimedia/bino/Makefile b/multimedia/bino/Makefile index a3807ac0d8b5..b86727e29fb7 100644 --- a/multimedia/bino/Makefile +++ b/multimedia/bino/Makefile @@ -7,6 +7,7 @@ PORTNAME= bino PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://download.savannah.nongnu.org/releases/bino/ http://levsha.me/ports/distfiles/ diff --git a/multimedia/bmp-extra-plugins/Makefile b/multimedia/bmp-extra-plugins/Makefile index d5b4f1dcfebf..925ac9d05c0e 100644 --- a/multimedia/bmp-extra-plugins/Makefile +++ b/multimedia/bmp-extra-plugins/Makefile @@ -7,7 +7,7 @@ PORTNAME= bmp-extra-plugins PORTVERSION= 0.2.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia audio MASTER_SITES= http://wrzask.pl/files/ diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile index 71907ecc2546..8cc395facd59 100644 --- a/multimedia/bombono/Makefile +++ b/multimedia/bombono/Makefile @@ -7,7 +7,7 @@ PORTNAME= bombono PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dvd/1.2 DISTNAME= ${PORTNAME}-dvd-${PORTVERSION} diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile index f49d2f63ca91..9925dcbf1b6f 100644 --- a/multimedia/camserv/Makefile +++ b/multimedia/camserv/Makefile @@ -7,7 +7,7 @@ PORTNAME= camserv PORTVERSION= 0.5.1 -PORTREVISION= 15 +PORTREVISION= 16 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= SF/cserv/${PORTNAME}/${PORTVERSION} diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile index 56c506443749..8a135eafa181 100644 --- a/multimedia/cheese/Makefile +++ b/multimedia/cheese/Makefile @@ -8,7 +8,7 @@ PORTNAME= cheese PORTVERSION= 2.32.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/multimedia/clipgrab/Makefile b/multimedia/clipgrab/Makefile index 86dfa9c99c16..ff4ef074f783 100644 --- a/multimedia/clipgrab/Makefile +++ b/multimedia/clipgrab/Makefile @@ -7,6 +7,7 @@ PORTNAME= clipgrab PORTVERSION= 3.1.0.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://clipgrab.de/download/ \ http://vanbittern.org/ diff --git a/multimedia/clive1/Makefile b/multimedia/clive1/Makefile index 805eaef53225..10b90b31e6dd 100644 --- a/multimedia/clive1/Makefile +++ b/multimedia/clive1/Makefile @@ -7,7 +7,7 @@ PORTNAME= clive PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 #PORTEPOCH= 0 CATEGORIES= multimedia MASTER_SITES= http://download.gna.org/clive/1.0.x/ \ diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile index 3b915db3c849..df2996f307b0 100644 --- a/multimedia/clutter-gst/Makefile +++ b/multimedia/clutter-gst/Makefile @@ -7,6 +7,7 @@ PORTNAME= clutter-gst PORTVERSION= 1.3.4 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://source.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/ diff --git a/multimedia/dv2jpg/Makefile b/multimedia/dv2jpg/Makefile index f59ebd5609c3..37dd601804a7 100644 --- a/multimedia/dv2jpg/Makefile +++ b/multimedia/dv2jpg/Makefile @@ -7,7 +7,7 @@ PORTNAME= dv2jpg PORTVERSION= 1.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= multimedia MASTER_SITES= SF diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile index 03e94555d6ee..29bfc641ac24 100644 --- a/multimedia/dvbcut/Makefile +++ b/multimedia/dvbcut/Makefile @@ -7,7 +7,7 @@ PORTNAME= dvbcut PORTVERSION= 0.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://www.mr511.de/dvbcut/ diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile index 7172b1005dd7..53fe3cf5c095 100644 --- a/multimedia/dvdauthor/Makefile +++ b/multimedia/dvdauthor/Makefile @@ -7,7 +7,7 @@ PORTNAME= dvdauthor PORTVERSION= 0.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= SF @@ -46,7 +46,7 @@ CFLAGS+= -DICONV_CONV=yes .if defined(WITH_IMAGEMAGICK) LIB_DEPENDS+= MagickWand.5:${PORTSDIR}/graphics/ImageMagick .else -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .endif pre-everything:: diff --git a/multimedia/dvdauthor/files/patch-spuunmux.c b/multimedia/dvdauthor/files/patch-spuunmux.c new file mode 100644 index 000000000000..0ef3496b4962 --- /dev/null +++ b/multimedia/dvdauthor/files/patch-spuunmux.c @@ -0,0 +1,19 @@ +--- src/spuunmux.c.orig 2010-05-10 09:27:55.000000000 +0200 ++++ src/spuunmux.c 2012-04-27 10:44:31.000000000 +0200 +@@ -39,6 +39,7 @@ + #include <netinet/in.h> + + #include <png.h> ++#include <zlib.h> + + #include "rgb.h" + #include "common.h" +@@ -610,7 +611,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + return -1; + } /*if*/ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); diff --git a/multimedia/dvdauthorwizard/Makefile b/multimedia/dvdauthorwizard/Makefile index 0c3181ceabe3..e240371a9909 100644 --- a/multimedia/dvdauthorwizard/Makefile +++ b/multimedia/dvdauthorwizard/Makefile @@ -7,7 +7,7 @@ PORTNAME= dvdauthorwizard PORTVERSION= 1.4.6 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia kde MASTER_SITES= SF DISTNAME= DVDAuthorWizard-${PORTVERSION} diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile index 27119ff96fd1..cadd5122b3ca 100644 --- a/multimedia/dvdrip/Makefile +++ b/multimedia/dvdrip/Makefile @@ -7,7 +7,7 @@ PORTNAME= dvdrip PORTVERSION= 0.98.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= CPAN \ http://www.exit1.org/dvdrip/dist/ diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile index 95c1aa049ee1..6b3a6df04e26 100644 --- a/multimedia/dvdstyler/Makefile +++ b/multimedia/dvdstyler/Makefile @@ -7,7 +7,7 @@ PORTNAME= dvdstyler DISTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} diff --git a/multimedia/emotion/Makefile b/multimedia/emotion/Makefile index 27313d5cc32a..777ad09100fd 100644 --- a/multimedia/emotion/Makefile +++ b/multimedia/emotion/Makefile @@ -8,7 +8,7 @@ PORTNAME= emotion PORTVERSION= 0.2.0.56361 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= multimedia enlightenment MASTER_SITES= http://files.roorback.net/e17/2011-01-29/extra/ diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index 11371c4616fb..d5fd96014345 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= ffmpeg DISTVERSION= 2012-04-25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mm/ffmpeg diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 2f53ee189efd..bb476a8a0858 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -6,7 +6,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.12 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile index 80e037d01bbb..30bc100a352a 100644 --- a/multimedia/ffmpeg2theora/Makefile +++ b/multimedia/ffmpeg2theora/Makefile @@ -6,7 +6,7 @@ PORTNAME= ffmpeg2theora PORTVERSION= 0.28 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://v2v.cc/~j/ffmpeg2theora/downloads/ diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile index 9d4345f3ebfa..73ed7273e313 100644 --- a/multimedia/ffmpegthumbnailer/Makefile +++ b/multimedia/ffmpegthumbnailer/Makefile @@ -6,14 +6,14 @@ PORTNAME= ffmpegthumbnailer PORTVERSION= 2.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia graphics MASTER_SITES= GOOGLE_CODE MAINTAINER= dierk@blaxxtarz.de COMMENT= Lightweight video thumbnailer that can be used by file managers -LIB_DEPENDS= png:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ swscale:${PORTSDIR}/multimedia/ffmpeg \ jpeg.11:${PORTSDIR}/graphics/jpeg diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile index f8c45e84a56a..403e4f8142dc 100644 --- a/multimedia/freevo/Makefile +++ b/multimedia/freevo/Makefile @@ -7,7 +7,7 @@ PORTNAME= freevo PORTVERSION= 1.9.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/Freevo%20releases/${PORTVERSION} diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile index f44ad79427bd..c186c5d58331 100644 --- a/multimedia/gaupol/Makefile +++ b/multimedia/gaupol/Makefile @@ -7,6 +7,7 @@ PORTNAME= gaupol PORTVERSION= 0.19.2 +PORTREVISION= 1 CATEGORIES= multimedia python MASTER_SITES= http://download.gna.org/gaupol/0.19/ \ http://www.c-s.li/ports/ diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile index d1ee2157ddc8..e8f7bd573134 100644 --- a/multimedia/gavl/Makefile +++ b/multimedia/gavl/Makefile @@ -7,13 +7,14 @@ PORTNAME= gavl PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION} MAINTAINER= mm@FreeBSD.org COMMENT= A library for handling uncompressed video and audio data -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ samplerate.1:${PORTSDIR}/audio/libsamplerate LICENSE= GPLv3 diff --git a/multimedia/gdvrecv/Makefile b/multimedia/gdvrecv/Makefile index d517c804b6c4..a41977bc8a59 100644 --- a/multimedia/gdvrecv/Makefile +++ b/multimedia/gdvrecv/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdvrecv PORTVERSION= 1.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= SF diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile index ee664bcc13a6..f20df3785533 100644 --- a/multimedia/gmencoder/Makefile +++ b/multimedia/gmencoder/Makefile @@ -7,7 +7,7 @@ PORTNAME= gmencoder PORTVERSION= 0.1.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION} EXTRACT_SUFX= .tgz diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile index 2c78d4c33eae..d66a7faa1067 100644 --- a/multimedia/gmerlin-avdecoder/Makefile +++ b/multimedia/gmerlin-avdecoder/Makefile @@ -7,7 +7,7 @@ PORTNAME= gmerlin-avdecoder PORTVERSION= 1.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION} @@ -108,7 +108,7 @@ CONFIGURE_ARGS+=--disable-samba .endif .if !defined(WITHOUT_PNG) -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .else CONFIGURE_ARGS+=--disable-libpng .endif diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile index 5cc67718d833..3ecda24979f2 100644 --- a/multimedia/gmerlin/Makefile +++ b/multimedia/gmerlin/Makefile @@ -7,7 +7,7 @@ PORTNAME= gmerlin PORTVERSION= 1.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= SF @@ -115,7 +115,7 @@ PLIST_SUB+= JPEG="@comment " .endif .if !defined(WITHOUT_PNG) -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png PLIST_SUB+= PNG="" .else CONFIGURE_ARGS+=--disable-libpng diff --git a/multimedia/gmimms/Makefile b/multimedia/gmimms/Makefile index 1d3ccfa264a4..abda4146a9d3 100644 --- a/multimedia/gmimms/Makefile +++ b/multimedia/gmimms/Makefile @@ -7,7 +7,7 @@ PORTNAME= gmimms DISTVERSION= 0.0.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile index 4b9a9b277e3f..d9433ecadf62 100644 --- a/multimedia/gnome-mplayer/Makefile +++ b/multimedia/gnome-mplayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-mplayer PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia gnome MASTER_SITES= GOOGLE_CODE diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile index 9082522403ff..6c238be7b327 100644 --- a/multimedia/gnome-subtitles/Makefile +++ b/multimedia/gnome-subtitles/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnome-subtitles PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile index 6a9a21f3995c..52e3c9921645 100644 --- a/multimedia/gpac-libgpac/Makefile +++ b/multimedia/gpac-libgpac/Makefile @@ -7,7 +7,7 @@ PORTNAME= gpac PORTVERSION= 0.4.5 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION} @@ -77,8 +77,9 @@ CONFIGURE_ARGS+= --use-jpeg=no .endif .if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CONFIGURE_ARGS+= --use-png=local +CFLAGS+= -I${LOCALBASE}/include/libpng15 .else CONFIGURE_ARGS+= --use-png=no .endif diff --git a/multimedia/gpac-libgpac/files/patch-src-media_tools-img.c b/multimedia/gpac-libgpac/files/patch-src-media_tools-img.c index 43a34f264345..1d8a614bb5e4 100644 --- a/multimedia/gpac-libgpac/files/patch-src-media_tools-img.c +++ b/multimedia/gpac-libgpac/files/patch-src-media_tools-img.c @@ -1,6 +1,32 @@ ---- src/media_tools/img.c.orig 2010-03-31 10:03:24.806360005 +0000 -+++ src/media_tools/img.c 2010-03-31 10:05:39.430477556 +0000 -@@ -551,7 +551,7 @@ +--- src/media_tools/img.c.orig 2008-12-01 18:39:36.000000000 +0100 ++++ src/media_tools/img.c 2012-04-24 23:00:42.000000000 +0200 +@@ -33,6 +33,7 @@ + + /*include png.h before setjmp.h, otherwise we get compilation errors*/ + #include <png.h> ++#include <pngpriv.h> + + #endif /*GPAC_HAS_PNG*/ + +@@ -399,7 +400,7 @@ + } + static void user_error_fn(png_structp png_ptr,png_const_charp error_msg) + { +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + GF_EXPORT +@@ -424,7 +425,7 @@ + png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL); + return GF_IO_ERR; + } +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_info_struct(png_ptr,(png_infopp) & info_ptr); + png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL); + return GF_IO_ERR; +@@ -551,7 +552,7 @@ /* Allocate/initialize the image information data. REQUIRED */ info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) { diff --git a/multimedia/gpac-mp4box/Makefile b/multimedia/gpac-mp4box/Makefile index f2c30e143573..243a47e5b4e4 100644 --- a/multimedia/gpac-mp4box/Makefile +++ b/multimedia/gpac-mp4box/Makefile @@ -7,6 +7,7 @@ PORTNAME= mp4box DISTVERSION= 0.4.5 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF/gpac/GPAC/GPAC%20${PORTVERSION} PKGNAMEPREFIX= gpac- diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile index ff297309f604..0e366af38f94 100644 --- a/multimedia/gpodder/Makefile +++ b/multimedia/gpodder/Makefile @@ -7,6 +7,7 @@ PORTNAME= gpodder PORTVERSION= 3.1.2 +PORTREVISION= 1 CATEGORIES= multimedia python MASTER_SITES= http://gpodder.org/src/ diff --git a/multimedia/grpplaylist/Makefile b/multimedia/grpplaylist/Makefile index 0f0bbb1b555f..bfc7eee51499 100644 --- a/multimedia/grpplaylist/Makefile +++ b/multimedia/grpplaylist/Makefile @@ -6,7 +6,7 @@ PORTNAME= grpplaylist PORTVERSION= 0.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= multimedia kde MASTER_SITES= SF DISTNAME= groupplaylist-${PORTVERSION} diff --git a/multimedia/gst123/Makefile b/multimedia/gst123/Makefile index 73d9bcfe7b38..25d81820251b 100644 --- a/multimedia/gst123/Makefile +++ b/multimedia/gst123/Makefile @@ -7,6 +7,7 @@ PORTNAME= gst123 PORTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://space.twc.de/~stefan/gst123/ diff --git a/multimedia/gstreamer-plugins-core/Makefile b/multimedia/gstreamer-plugins-core/Makefile index 4906fdcff606..350d888e2eb0 100644 --- a/multimedia/gstreamer-plugins-core/Makefile +++ b/multimedia/gstreamer-plugins-core/Makefile @@ -7,7 +7,7 @@ PORTNAME= gstreamer-plugins-core PORTVERSION= 0.10 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia audio MASTER_SITES= # empty DISTFILES= # empty diff --git a/multimedia/gstreamer-plugins-mpeg2enc/Makefile b/multimedia/gstreamer-plugins-mpeg2enc/Makefile index 990c5c8190ca..3333a6d274ba 100644 --- a/multimedia/gstreamer-plugins-mpeg2enc/Makefile +++ b/multimedia/gstreamer-plugins-mpeg2enc/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/multimedia/gstreamer-plugins-mpeg2enc/Makefile,v 1.5 2008/03/19 14:05:37 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia COMMENT= Gstreamer mpeg encoder plugin diff --git a/multimedia/gstreamer-plugins-x264/Makefile b/multimedia/gstreamer-plugins-x264/Makefile index 2d075f8c1d24..dcb316cba5c9 100644 --- a/multimedia/gstreamer-plugins-x264/Makefile +++ b/multimedia/gstreamer-plugins-x264/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $ # -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia COMMENT= Gstreamer x264 plugin diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 55b45e1a3d66..c17317b424d7 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -157,7 +157,7 @@ post-patch: s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|' @${REINPLACE_CMD} -e 's|DEFAULT_AUDIOSINK="alsasink"|DEFAULT_AUDIOSINK="${DEFAULT_AUDIOSINK}"|; \ s|DEFAULT_AUDIOSRC="alsasrc"|DEFAULT_AUDIOSRC="${DEFAULT_AUDIOSRC}"|' \ - -e 's|libpng12.pc|libpng14.pc|g' \ + -e 's|libpng12.pc|libpng15.pc|g' \ -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common index 5a090bd8ba2a..80907686ad6b 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -368,7 +368,7 @@ gst_libmms_PLIST_FILES= ${GST_LIB_DIR}/libgstmms.so \ gst_libmms_DIST= bad # libpng and the snapshot plugin -gst_libpng_LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +gst_libpng_LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png gst_libpng_GST_PLUGIN_DIR= ext/libpng gst_libpng_PLIST_FILES= ${GST_LIB_DIR}/libgstpng.so \ ${GST_LIB_DIR}/libgstpng.la diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile index d315b0443b5e..871e053a78d1 100644 --- a/multimedia/gstreamer-qt4/Makefile +++ b/multimedia/gstreamer-qt4/Makefile @@ -7,6 +7,7 @@ PORTNAME= gstreamer PORTVERSION= 0.10.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/qt-${PORTNAME}/ PKGNAMESUFFIX= -qt4 diff --git a/multimedia/gstreamermm/Makefile b/multimedia/gstreamermm/Makefile index 92a535f5c53c..e242b1e97ad7 100644 --- a/multimedia/gstreamermm/Makefile +++ b/multimedia/gstreamermm/Makefile @@ -7,6 +7,7 @@ PORTNAME= gstreamermm PORTVERSION= 0.10.10.1 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= GNOME diff --git a/multimedia/gsubedit/Makefile b/multimedia/gsubedit/Makefile index 122ec9bb44c7..aa635dcfddaf 100644 --- a/multimedia/gsubedit/Makefile +++ b/multimedia/gsubedit/Makefile @@ -8,7 +8,7 @@ PORTNAME= GSubEdit PORTVERSION= 0.4.p1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= multimedia gnome MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/0.4pre1 DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/.p/pre/} diff --git a/multimedia/gtk-recordmydesktop/Makefile b/multimedia/gtk-recordmydesktop/Makefile index d6fecc3fed6d..277190760fad 100644 --- a/multimedia/gtk-recordmydesktop/Makefile +++ b/multimedia/gtk-recordmydesktop/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk-recordmydesktop PORTVERSION= 0.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia deskutils MASTER_SITES= SF/recordmydesktop/gtk-recordMyDesktop/${PORTVERSION} diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile index baab2aaf21dd..32df5514f662 100644 --- a/multimedia/gxine/Makefile +++ b/multimedia/gxine/Makefile @@ -7,6 +7,7 @@ PORTNAME= gxine PORTVERSION= 0.5.907 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF/xine/${PORTNAME}/${PORTVERSION} diff --git a/multimedia/gxmms/Makefile b/multimedia/gxmms/Makefile index f6acb257acb0..23dac7505041 100644 --- a/multimedia/gxmms/Makefile +++ b/multimedia/gxmms/Makefile @@ -7,7 +7,7 @@ PORTNAME= gxmms PORTVERSION= 0.2.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/multimedia/imagination/Makefile b/multimedia/imagination/Makefile index b3e9fd64a5b3..b84dea29adfe 100644 --- a/multimedia/imagination/Makefile +++ b/multimedia/imagination/Makefile @@ -7,7 +7,7 @@ PORTNAME= imagination PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ diff --git a/multimedia/iriverter/Makefile b/multimedia/iriverter/Makefile index 72931c4257e0..4d5995f7bbee 100644 --- a/multimedia/iriverter/Makefile +++ b/multimedia/iriverter/Makefile @@ -7,7 +7,7 @@ PORTNAME= iriverter PORTVERSION= 0.16 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia java MASTER_SITES= SF diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile index 176006572c52..238723694a7e 100644 --- a/multimedia/k9copy-kde4/Makefile +++ b/multimedia/k9copy-kde4/Makefile @@ -6,7 +6,7 @@ PORTNAME= k9copy PORTVERSION= 2.3.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-kde4/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-Source diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile index 1d5ecb3f51f3..2410eb97042a 100644 --- a/multimedia/k9copy/Makefile +++ b/multimedia/k9copy/Makefile @@ -6,6 +6,7 @@ PORTNAME= k9copy PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= SF diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile index 52081bbb0e8a..e1b5be48a295 100644 --- a/multimedia/kaffeine-mozilla/Makefile +++ b/multimedia/kaffeine-mozilla/Makefile @@ -8,7 +8,7 @@ PORTNAME= kaffeine-mozilla PORTVERSION= 0.2 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= multimedia MASTER_SITES= SF/kaffeine/${PORTNAME}/${PORTVERSION} diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index 9462b8d8f6dc..a9d26e2e757b 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -6,7 +6,7 @@ PORTNAME= kaffeine PORTVERSION= 1.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia kde MASTER_SITES= SF MASTER_SITE_SUBDIR= kaffeine/current diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index bce281e93d59..ca10c8dc88ad 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdemultimedia PORTVERSION= ${KDE_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 50bf62a26260..2d9a481e32bb 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdemultimedia PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile index d7429783edb7..674b63cd4c1b 100644 --- a/multimedia/kdenlive/Makefile +++ b/multimedia/kdenlive/Makefile @@ -6,7 +6,7 @@ PORTNAME= kdenlive PORTVERSION= 0.8.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia kde MASTER_SITES= SF diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile index 82e2aff82dfb..34e63e0a56d1 100644 --- a/multimedia/kino/Makefile +++ b/multimedia/kino/Makefile @@ -7,7 +7,7 @@ PORTNAME= kino PORTVERSION= 1.3.4 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia MASTER_SITES= SF diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile index 452b5078cc96..737a11d58575 100644 --- a/multimedia/kissdx/Makefile +++ b/multimedia/kissdx/Makefile @@ -7,7 +7,7 @@ PORTNAME= kissdx PORTVERSION= 0.13.10a -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia net MASTER_SITES= http://paragi.dk/kiss/ diff --git a/multimedia/kmenc15/Makefile b/multimedia/kmenc15/Makefile index b23181e2a0fc..e10510720599 100644 --- a/multimedia/kmenc15/Makefile +++ b/multimedia/kmenc15/Makefile @@ -7,7 +7,7 @@ PORTNAME= kmenc15 PORTVERSION= 0.04 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia kde MASTER_SITES= SF diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile index 9fc5275dc842..fb992303c9e0 100644 --- a/multimedia/kmplayer-kde4/Makefile +++ b/multimedia/kmplayer-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= kmplayer PORTVERSION= 0.11.2b -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 3 CATEGORIES= multimedia audio kde MASTER_SITES= http://kmplayer.kde.org/pkgs/ diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile index 65dd9f8beb95..c0006cd6cb38 100644 --- a/multimedia/kmplayer/Makefile +++ b/multimedia/kmplayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= kmplayer PORTVERSION= 0.10.0c -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 2 CATEGORIES= multimedia audio kde MASTER_SITES= http://freebsd.ricin.com/ports/distfiles/ \ diff --git a/multimedia/konverter/Makefile b/multimedia/konverter/Makefile index 11e06d837483..35f0d1eadc3a 100644 --- a/multimedia/konverter/Makefile +++ b/multimedia/konverter/Makefile @@ -7,7 +7,7 @@ PORTNAME= konverter DISTVERSION= 0.92-beta1 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= multimedia kde MASTER_SITES= http://www.tr0ll.net/kraus.tk/projects/konverter/sources/ diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile index d0754198b9ad..69f7ee2af9fd 100644 --- a/multimedia/kplayer-kde4/Makefile +++ b/multimedia/kplayer-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= kplayer PORTVERSION= 0.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia kde MASTER_SITES= SF diff --git a/multimedia/kplayer/Makefile b/multimedia/kplayer/Makefile index 605a81f3e7af..97a5bc8bc9e2 100644 --- a/multimedia/kplayer/Makefile +++ b/multimedia/kplayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= kplayer PORTVERSION= 0.6.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia kde MASTER_SITES= SF diff --git a/multimedia/ksubeditor/Makefile b/multimedia/ksubeditor/Makefile index 18abbaa7e2be..83a69c928f7e 100644 --- a/multimedia/ksubeditor/Makefile +++ b/multimedia/ksubeditor/Makefile @@ -7,7 +7,7 @@ PORTNAME= KSubeditor PORTVERSION= 0.2 -PORTREVISION= 9 +PORTREVISION= 10 PORTEPOCH= 1 CATEGORIES= multimedia kde MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME:L}-${PORTVERSION} diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile index 9bba0bd27314..840d28277ae6 100644 --- a/multimedia/libkate/Makefile +++ b/multimedia/libkate/Makefile @@ -7,6 +7,7 @@ PORTNAME= libkate PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} @@ -17,7 +18,7 @@ LICENSE= BSD BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= ogg.7:${PORTSDIR}/audio/libogg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/multimedia/libquicktime-lame/Makefile b/multimedia/libquicktime-lame/Makefile index 003e5ba5ee2e..3c82ad974b3e 100644 --- a/multimedia/libquicktime-lame/Makefile +++ b/multimedia/libquicktime-lame/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libquicktime -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia PKGNAMESUFFIX= -lame -PORTREVISION= 1 +PORTREVISION= 2 MAINTAINER= mm@FreeBSD.org COMMENT= LAME plugin for libquicktime diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index 3ff2287b466b..ea606ecda85c 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -7,7 +7,7 @@ PORTNAME= libquicktime PORTVERSION= 1.2.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= multimedia MASTER_SITES= SF @@ -108,7 +108,7 @@ CONFIGURE_ARGS+= --without-libjpeg .endif .if !defined(WITHOUT_PNG) -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png PLIST_SUB+= PNG="" CONFIGURE_ARGS+= --with-libpng .else diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 4cc1720d31cc..0888d928f35d 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -7,6 +7,7 @@ PORTNAME= xine PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= multimedia ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION} PKGNAMEPREFIX= lib @@ -19,7 +20,7 @@ LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \ vorbis.4:${PORTSDIR}/audio/libvorbis \ speex.1:${PORTSDIR}/audio/speex \ mng.1:${PORTSDIR}/graphics/libmng \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ dvdread.4:${PORTSDIR}/multimedia/libdvdread \ freetype.9:${PORTSDIR}/print/freetype2 \ fame-0.9.1:${PORTSDIR}/multimedia/libfame \ diff --git a/multimedia/linux-huludesktop/Makefile b/multimedia/linux-huludesktop/Makefile index 03daf23b340d..027448890252 100644 --- a/multimedia/linux-huludesktop/Makefile +++ b/multimedia/linux-huludesktop/Makefile @@ -7,7 +7,7 @@ PORTNAME= huludesktop PORTVERSION= 0.9.8 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= multimedia linux MASTER_SITES= http://download.hulu.com/ PKGNAMEPREFIX= linux- diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile index f9a1f60ecdaa..f80cd52256e1 100644 --- a/multimedia/linux-realplayer/Makefile +++ b/multimedia/linux-realplayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= linux-realplayer DISTVERSION= 10.0.9.809-20070726 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio linux MASTER_SITES= https://helixcommunity.org/download.php/2479/:player \ http://ftp.nluug.nl/ftp/pub/os/Linux/distr/pardusrepo/sources/:playeralt \ diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile index bfbaba6a2e11..26e508bec339 100644 --- a/multimedia/lives/Makefile +++ b/multimedia/lives/Makefile @@ -7,7 +7,7 @@ PORTNAME= lives PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://salsaman.home.xs4all.nl/lives/current/ DISTNAME= LiVES-${PORTVERSION} diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile index 9bb74eab39ce..e24524af0ded 100644 --- a/multimedia/lxdvdrip/Makefile +++ b/multimedia/lxdvdrip/Makefile @@ -7,7 +7,7 @@ PORTNAME= lxdvdrip PORTVERSION= 1.62 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= multimedia MASTER_SITES= http://download.berlios.de/lxdvdrip/ EXTRACT_SUFX= .tgz diff --git a/multimedia/m2tstoavi/Makefile b/multimedia/m2tstoavi/Makefile index cc1cdef4fc3b..897c0329d30c 100644 --- a/multimedia/m2tstoavi/Makefile +++ b/multimedia/m2tstoavi/Makefile @@ -7,7 +7,7 @@ PORTNAME= m2tstoavi PORTVERSION= 2009121901 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://www.olmosconsulting.com/ http://meatwad.mouf.net/~steve/ DISTNAME= m2ts diff --git a/multimedia/mandvd/Makefile b/multimedia/mandvd/Makefile index c3b0eace43a5..0b3e91bdd099 100644 --- a/multimedia/mandvd/Makefile +++ b/multimedia/mandvd/Makefile @@ -7,7 +7,7 @@ PORTNAME= mandvd DISTVERSION= 2.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= multimedia kde MASTER_SITES= http://csgib36.ifrance.com/FTP/ DISTNAME= ManDVD diff --git a/multimedia/mediadownloader/Makefile b/multimedia/mediadownloader/Makefile index 99be09b6af6d..e4ea1a56323c 100644 --- a/multimedia/mediadownloader/Makefile +++ b/multimedia/mediadownloader/Makefile @@ -7,6 +7,7 @@ PORTNAME= mediadownloader PORTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= multimedia www MASTER_SITES= SF/googleimagedown/project/${PORTVERSION}/ DISTNAME= ${PORTNAME}_${PORTVERSION}-src diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 48ec8b8b62dd..e2f6521d8e41 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -6,7 +6,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Convenient video file and movie encoder RESTRICTED= Port has restricted dependencies diff --git a/multimedia/minitube/Makefile b/multimedia/minitube/Makefile index 616ab32dc634..bc6a174af4d5 100644 --- a/multimedia/minitube/Makefile +++ b/multimedia/minitube/Makefile @@ -7,6 +7,7 @@ PORTNAME= minitube PORTVERSION= 1.7 +PORTREVISION= 1 CATEGORIES= multimedia www MASTER_SITES= http://flavio.tordini.org/files/minitube/ diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile index 3b8fae02c619..11aec8da022c 100644 --- a/multimedia/miro/Makefile +++ b/multimedia/miro/Makefile @@ -7,6 +7,7 @@ PORTNAME= miro PORTVERSION= 5.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \ http://ftp.osuosl.org/pub/pculture.org/miro/src/ diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index 71f4cd7a7534..70bc94f6de5c 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -7,7 +7,7 @@ PORTNAME= mjpegtools PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION} diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index dd259d0e253e..db31851c8c72 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -7,6 +7,7 @@ PORTNAME= mkvtoolnix PORTVERSION= 5.0.1 +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile index 2cc30c5a1b58..22a4be50a6f2 100644 --- a/multimedia/mlt/Makefile +++ b/multimedia/mlt/Makefile @@ -6,6 +6,7 @@ PORTNAME= mlt PORTVERSION= 0.7.8 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME} diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 08ffe1bac2e5..a2efa78f1942 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -7,7 +7,7 @@ PORTNAME= motion PORTVERSION= 3.2.11.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%203.2/${PORTVERSION} diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index a193180a9d20..51d9c52f12cc 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -7,7 +7,7 @@ PORTNAME= mpeg4ip PORTVERSION= 1.6.1 -PORTREVISION= 24 +PORTREVISION= 25 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/mplayer/Makefile b/multimedia/mplayer/Makefile index f95b98972c23..bfa9d758af57 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= High performance media player supporting many formats diff --git a/multimedia/mplayer/Makefile.shared b/multimedia/mplayer/Makefile.shared index 191ca85ee332..10c2c4462dd9 100644 --- a/multimedia/mplayer/Makefile.shared +++ b/multimedia/mplayer/Makefile.shared @@ -18,7 +18,7 @@ MAINTAINER?= thomas.e.zander@googlemail.com LICENSE= GPLv2 -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile index 769010803fd0..eb90ae4c1ab8 100644 --- a/multimedia/mplayerxp/Makefile +++ b/multimedia/mplayerxp/Makefile @@ -7,7 +7,7 @@ PORTNAME= mplayerxp PORTVERSION= 0.7.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia audio MASTER_SITES= SF @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Multi-threaded branch of the well known mplayer media player LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ vcdinfo.2:${PORTSDIR}/multimedia/vcdimager RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts diff --git a/multimedia/mplayerxp/files/patch-mplayerxp__libvo__screenshot.c b/multimedia/mplayerxp/files/patch-mplayerxp__libvo__screenshot.c new file mode 100644 index 000000000000..c79e3dfd515c --- /dev/null +++ b/multimedia/mplayerxp/files/patch-mplayerxp__libvo__screenshot.c @@ -0,0 +1,19 @@ +--- mplayerxp/libvo/screenshot.c.orig 2006-11-30 07:28:10.000000000 +0100 ++++ mplayerxp/libvo/screenshot.c 2012-05-06 20:04:09.000000000 +0200 +@@ -20,6 +20,7 @@ + #include <libpng/png.h> + #else + #include <png.h> ++#include <zlib.h> + #endif + #endif + +@@ -67,7 +68,7 @@ + return png; + } + +- if (setjmp(png.png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png.png_ptr))) { + MSG_V("PNG Internal error!\n"); + png_destroy_write_struct(&png.png_ptr, &png.info_ptr); + fclose(png.fp); diff --git a/multimedia/mythtv-frontend/Makefile b/multimedia/mythtv-frontend/Makefile index d82b006be8e4..2d92a977342d 100644 --- a/multimedia/mythtv-frontend/Makefile +++ b/multimedia/mythtv-frontend/Makefile @@ -7,6 +7,7 @@ PORTNAME= mythtv-frontend PORTVERSION= 0.25 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \ http://ftp.osuosl.org/pub/mythtv/old_releases/ \ diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index b883bfb0b734..647d7bc24799 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -8,6 +8,7 @@ PORTNAME= mythtv PORTVERSION= 0.25 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \ http://ftp.osuosl.org/pub/mythtv/old_releases/ \ diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile index e3d73c91ffea..340138ead62b 100644 --- a/multimedia/oggvideotools/Makefile +++ b/multimedia/oggvideotools/Makefile @@ -5,7 +5,7 @@ PORTNAME= oggvideotools PORTVERSION= 0.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= SF MASTER_SITE_SUBDIR= oggvideotools/oggvideotools/${DISTNAME} diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile index 09a28c411284..59039203f9fa 100644 --- a/multimedia/ogmrip/Makefile +++ b/multimedia/ogmrip/Makefile @@ -7,7 +7,7 @@ PORTNAME= ogmrip PORTVERSION= 0.13.7 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION} @@ -21,7 +21,7 @@ BUILD_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder \ mplayer:${PORTSDIR}/multimedia/mplayer \ gsed:${PORTSDIR}/textproc/gsed LIB_DEPENDS= enca.5:${PORTSDIR}/converters/enca \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ dvdread.4:${PORTSDIR}/multimedia/libdvdread RUN_DEPENDS= lame:${PORTSDIR}/audio/lame \ diff --git a/multimedia/openmovieeditor/Makefile b/multimedia/openmovieeditor/Makefile index a24d0158bf61..cd7ccfbc16f5 100644 --- a/multimedia/openmovieeditor/Makefile +++ b/multimedia/openmovieeditor/Makefile @@ -7,7 +7,7 @@ PORTNAME= openmovieeditor PORTVERSION= 0.0.20090105 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia MASTER_SITES= SF diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile index 836a3c59e901..754a94b420a9 100644 --- a/multimedia/openshot/Makefile +++ b/multimedia/openshot/Makefile @@ -8,6 +8,7 @@ PORTNAME= openshot PORTVERSION= 1.4.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://launchpad.net/openshot/${PORTVERSION:C/\.[0-9]+$//}/${PORTVERSION}/+download/ diff --git a/multimedia/p5-FFmpeg-Command/Makefile b/multimedia/p5-FFmpeg-Command/Makefile index d8fa78bf0f21..ce53a6d47f0a 100644 --- a/multimedia/p5-FFmpeg-Command/Makefile +++ b/multimedia/p5-FFmpeg-Command/Makefile @@ -7,6 +7,7 @@ PORTNAME= FFmpeg-Command PORTVERSION= 0.18 +PORTREVISION= 1 CATEGORIES= multimedia perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MIZZY diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile index a8ed9fcddcd9..0b87a5ebb44e 100644 --- a/multimedia/phonon-gstreamer/Makefile +++ b/multimedia/phonon-gstreamer/Makefile @@ -6,6 +6,7 @@ PORTNAME= phonon PORTVERSION= 4.6.0 +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile index 387166656aa7..27955fa86e87 100644 --- a/multimedia/phonon-vlc/Makefile +++ b/multimedia/phonon-vlc/Makefile @@ -7,6 +7,7 @@ PORTNAME= phonon PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= multimedia kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src diff --git a/multimedia/phonon-xine/Makefile b/multimedia/phonon-xine/Makefile index 641f11ff8661..8c0921d84ba9 100644 --- a/multimedia/phonon-xine/Makefile +++ b/multimedia/phonon-xine/Makefile @@ -6,7 +6,7 @@ PORTNAME= phonon PORTVERSION= 4.4.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index 3ad49c557f44..788748a32b63 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -6,6 +6,7 @@ PORTNAME= phonon PORTVERSION= 4.6.0 +PORTREVISION= 1 CATEGORIES= multimedia kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}/src/ diff --git a/multimedia/photofilmstrip/Makefile b/multimedia/photofilmstrip/Makefile index 6729324631ac..c7ee3910891f 100644 --- a/multimedia/photofilmstrip/Makefile +++ b/multimedia/photofilmstrip/Makefile @@ -8,7 +8,7 @@ PORTNAME= photofilmstrip PORTVERSION= 1.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia python MASTER_SITES= SF/photostoryx/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile index dc09fe8528d3..1d836de6bcec 100644 --- a/multimedia/pitivi/Makefile +++ b/multimedia/pitivi/Makefile @@ -7,7 +7,7 @@ PORTNAME= pitivi PORTVERSION= 0.13.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= GNOME diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile index a294b09b4217..119da07a6edf 100644 --- a/multimedia/py-gstreamer/Makefile +++ b/multimedia/py-gstreamer/Makefile @@ -8,6 +8,7 @@ PORTNAME= gstreamer PORTVERSION= 0.10.22 +PORTREVISION= 1 CATEGORIES= multimedia python gnome MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/py-kaa-base/Makefile b/multimedia/py-kaa-base/Makefile index b80fd606b5d9..89ba52701815 100644 --- a/multimedia/py-kaa-base/Makefile +++ b/multimedia/py-kaa-base/Makefile @@ -7,7 +7,7 @@ PORTNAME= kaa-base PORTVERSION= 0.6.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia python MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/py-kaa-imlib2/Makefile b/multimedia/py-kaa-imlib2/Makefile index 8791d64192d5..eff9d6cfcc8b 100644 --- a/multimedia/py-kaa-imlib2/Makefile +++ b/multimedia/py-kaa-imlib2/Makefile @@ -7,7 +7,7 @@ PORTNAME= kaa-imlib2 PORTVERSION= 0.2.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia python MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/py-kaa-metadata/Makefile b/multimedia/py-kaa-metadata/Makefile index 15f47489618d..a3a644c78e39 100644 --- a/multimedia/py-kaa-metadata/Makefile +++ b/multimedia/py-kaa-metadata/Makefile @@ -7,7 +7,7 @@ PORTNAME= kaa-metadata PORTVERSION= 0.7.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia python MASTER_SITES= SF/freevo/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/py-mlt/Makefile b/multimedia/py-mlt/Makefile index ce376c7eed94..9c6acc46a97a 100644 --- a/multimedia/py-mlt/Makefile +++ b/multimedia/py-mlt/Makefile @@ -8,6 +8,7 @@ PORTNAME= mlt PORTVERSION= 0.7.8 +PORTREVISION= 1 CATEGORIES= multimedia python MASTER_SITES= SF/${PORTNAME}/${PORTNAME} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/py-openlp/Makefile b/multimedia/py-openlp/Makefile index 3fad7d0e3e0a..7de622718ba7 100644 --- a/multimedia/py-openlp/Makefile +++ b/multimedia/py-openlp/Makefile @@ -7,7 +7,7 @@ PORTNAME= OpenLP PORTVERSION= 1.9.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia python MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/py-pybmp/Makefile b/multimedia/py-pybmp/Makefile index 28493133b173..3de6f4d52cda 100644 --- a/multimedia/py-pybmp/Makefile +++ b/multimedia/py-pybmp/Makefile @@ -7,7 +7,7 @@ PORTNAME= pyBMP PORTVERSION= 1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia python MASTER_SITES= http://nivi.interfree.it/distfiles/${PORTNAME}/ \ LOCAL/nivit/${PORTNAME}/ diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile index 7f0e5fa62c15..b023e1c9ba91 100644 --- a/multimedia/py-qt4-multimedia/Makefile +++ b/multimedia/py-qt4-multimedia/Makefile @@ -7,6 +7,7 @@ PORTNAME= multimedia PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia devel python MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile index 295e10318566..823d41b05a47 100644 --- a/multimedia/py-qt4-phonon/Makefile +++ b/multimedia/py-qt4-phonon/Makefile @@ -7,6 +7,7 @@ PORTNAME= phonon PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia devel python MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- diff --git a/multimedia/qdvdauthor/Makefile b/multimedia/qdvdauthor/Makefile index b996d9a25d24..dbf6a32ba0d6 100644 --- a/multimedia/qdvdauthor/Makefile +++ b/multimedia/qdvdauthor/Makefile @@ -7,7 +7,7 @@ PORTNAME= qdvdauthor PORTVERSION= 1.1.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia MASTER_SITES= SF diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile index 9ade63170e5a..09f9f9f02543 100644 --- a/multimedia/qmmp/Makefile +++ b/multimedia/qmmp/Makefile @@ -7,6 +7,7 @@ PORTNAME= qmmp PORTVERSION= 0.5.5 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ ${MASTER_SITE_GOOGLE_CODE} diff --git a/multimedia/qt4-multimedia/Makefile b/multimedia/qt4-multimedia/Makefile index 5d77b8b4051f..c1da479f7e12 100644 --- a/multimedia/qt4-multimedia/Makefile +++ b/multimedia/qt4-multimedia/Makefile @@ -7,6 +7,7 @@ PORTNAME= multimedia DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES?= multimedia PKGNAMEPREFIX= qt4- diff --git a/multimedia/qt4-phonon-gst/Makefile b/multimedia/qt4-phonon-gst/Makefile index a484a98e27dc..f3221e18b353 100644 --- a/multimedia/qt4-phonon-gst/Makefile +++ b/multimedia/qt4-phonon-gst/Makefile @@ -7,6 +7,7 @@ PORTNAME= phonon DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES?= multimedia PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -gst diff --git a/multimedia/qt4-phonon/Makefile b/multimedia/qt4-phonon/Makefile index 32870c3de6de..c598de46b44f 100644 --- a/multimedia/qt4-phonon/Makefile +++ b/multimedia/qt4-phonon/Makefile @@ -7,6 +7,7 @@ PORTNAME= phonon DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES?= multimedia PKGNAMEPREFIX= qt4- diff --git a/multimedia/quark/Makefile b/multimedia/quark/Makefile index d557057db4e3..07d219317e1e 100644 --- a/multimedia/quark/Makefile +++ b/multimedia/quark/Makefile @@ -6,7 +6,7 @@ PORTNAME= quark PORTVERSION= 3.24 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia gnome MASTER_SITES= http://hsgg.github.com/quark/ diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile index 92b63b26aee7..5afac7be4c23 100644 --- a/multimedia/quodlibet/Makefile +++ b/multimedia/quodlibet/Makefile @@ -7,7 +7,7 @@ PORTNAME= quodlibet PORTVERSION= 2.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia audio python gnome MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} diff --git a/multimedia/rox-videothumbnail/Makefile b/multimedia/rox-videothumbnail/Makefile index c8345f5d9ed9..66bb0e72152a 100644 --- a/multimedia/rox-videothumbnail/Makefile +++ b/multimedia/rox-videothumbnail/Makefile @@ -7,7 +7,7 @@ PORTNAME= rox-videothumbnail PORTVERSION= 0.1.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://www.kerofin.demon.co.uk/rox/ DISTNAME= VideoThumbnail-${PORTVERSION} diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile index 329a264225e2..b65b14154d4b 100644 --- a/multimedia/sabbu/Makefile +++ b/multimedia/sabbu/Makefile @@ -7,7 +7,7 @@ PORTNAME= sabbu PORTVERSION= 0.3.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Sabbu%20${PORTVERSION} diff --git a/multimedia/smile/Makefile b/multimedia/smile/Makefile index 64776689db71..57a0320daf03 100644 --- a/multimedia/smile/Makefile +++ b/multimedia/smile/Makefile @@ -7,7 +7,7 @@ PORTNAME= smile PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia kde MASTER_SITES= http://download.tuxfamily.org/smiletool/ diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile index 4a75ce8221a8..6d24f6100e3c 100644 --- a/multimedia/smplayer/Makefile +++ b/multimedia/smplayer/Makefile @@ -7,6 +7,7 @@ PORTNAME= smplayer DISTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= multimedia audio kde MASTER_SITES= SF/${PORTNAME}/SMPlayer/${PORTVERSION} diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile index 52a4310f87db..225bfb9fbc32 100644 --- a/multimedia/subtitlecomposer-kde4/Makefile +++ b/multimedia/subtitlecomposer-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= subtitlecomposer PORTVERSION= 0.5.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia kde MASTER_SITES= SF/subcomposer/subcomposer/${PORTNAME}-${PORTVERSION} diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile index aca9646101bb..5bc3e98f9e4f 100644 --- a/multimedia/subtitlecomposer/Makefile +++ b/multimedia/subtitlecomposer/Makefile @@ -7,7 +7,7 @@ PORTNAME= subtitlecomposer PORTVERSION= 0.4.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= SF/subcomposer/subcomposer/${PORTNAME}-${PORTVERSION} diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile index 4e430a18d72b..b777565353c2 100644 --- a/multimedia/subtitleeditor/Makefile +++ b/multimedia/subtitleeditor/Makefile @@ -7,7 +7,7 @@ PORTNAME= subtitleeditor PORTVERSION= 0.39.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://download.gna.org/${PORTNAME}/${PORTVERSION:C/\.[0-9]*$//}/ \ CRITICAL diff --git a/multimedia/subtitleripper/Makefile b/multimedia/subtitleripper/Makefile index d1f4d6186b04..b775d55656fa 100644 --- a/multimedia/subtitleripper/Makefile +++ b/multimedia/subtitleripper/Makefile @@ -7,7 +7,7 @@ PORTNAME= subtitleripper DISTVERSION= 0.3-4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.3-4 EXTRACT_SUFX= .tgz @@ -16,7 +16,7 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= Convert DVD subtitles into text format (subrip srt) or VobSub format LIB_DEPENDS= netpbm:${PORTSDIR}/graphics/netpbm \ - png:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png RUN_DEPENDS= gocr:${PORTSDIR}/graphics/gocr \ xv:${PORTSDIR}/graphics/xv \ transcode:${PORTSDIR}/multimedia/transcode diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile index 5d310df581e6..bdca88a95368 100644 --- a/multimedia/swfdec-gnome/Makefile +++ b/multimedia/swfdec-gnome/Makefile @@ -8,6 +8,7 @@ PORTNAME= swfdec-gnome PORTVERSION= 2.30.1 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile index 513ac1c247c5..12e00fe833ac 100644 --- a/multimedia/totem-pl-parser/Makefile +++ b/multimedia/totem-pl-parser/Makefile @@ -8,6 +8,7 @@ PORTNAME= totem-pl-parser PORTVERSION= 2.32.3 +PORTREVISION= 1 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 4c37904d379e..7ad7a8f47733 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -8,7 +8,7 @@ PORTNAME= totem PORTVERSION= 2.32.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index e76e12694535..afc061442521 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -7,7 +7,7 @@ PORTNAME= transcode PORTVERSION= 1.1.7 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= http://cdn.bitbucket.org/france/transcode-tcforge/downloads/ diff --git a/multimedia/transkode/Makefile b/multimedia/transkode/Makefile index 9241bd321387..f09933a84dbd 100644 --- a/multimedia/transkode/Makefile +++ b/multimedia/transkode/Makefile @@ -7,7 +7,7 @@ PORTNAME= transkode PORTVERSION= 0.7 -PORTREVISION= 14 +PORTREVISION= 15 PORTEPOCH= 1 CATEGORIES= multimedia audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/multimedia/umplayer/Makefile b/multimedia/umplayer/Makefile index eeb912f9bd1a..86a17259d5e8 100644 --- a/multimedia/umplayer/Makefile +++ b/multimedia/umplayer/Makefile @@ -7,6 +7,7 @@ PORTNAME= umplayer DISTVERSION= 0.97 +PORTREVISION= 1 CATEGORIES= multimedia audio kde MASTER_SITES= LOCAL/wen diff --git a/multimedia/vdr-plugin-markad/Makefile b/multimedia/vdr-plugin-markad/Makefile index 74fe8ba25d0f..14b85cb8f270 100644 --- a/multimedia/vdr-plugin-markad/Makefile +++ b/multimedia/vdr-plugin-markad/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-markad PORTVERSION= 0.1.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/578/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-osdpip/Makefile b/multimedia/vdr-plugin-osdpip/Makefile index 364b398a9ae6..b54a1a7f2996 100644 --- a/multimedia/vdr-plugin-osdpip/Makefile +++ b/multimedia/vdr-plugin-osdpip/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-osdpip PORTVERSION= 0.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/880/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-softdevice/Makefile b/multimedia/vdr-plugin-softdevice/Makefile index 523da6dca425..f1984bf73d6f 100644 --- a/multimedia/vdr-plugin-softdevice/Makefile +++ b/multimedia/vdr-plugin-softdevice/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-softdevice PORTVERSION= 0.5.0p20100414 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia MASTER_SITES= LOCAL MASTER_SITE_SUBDIR= nox/ diff --git a/multimedia/vdr-plugin-upnp/Makefile b/multimedia/vdr-plugin-upnp/Makefile index aab8e0b54648..2c8affa33fae 100644 --- a/multimedia/vdr-plugin-upnp/Makefile +++ b/multimedia/vdr-plugin-upnp/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-upnp PORTVERSION= 0.0.2a2 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/177/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a/-alpha/}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile index b0e12c1819b5..a345c8b6bfef 100644 --- a/multimedia/vdr-plugin-xineliboutput/Makefile +++ b/multimedia/vdr-plugin-xineliboutput/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdr-plugin-xineliboutput PORTVERSION= 1.0.90s20120511 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF:release \ LOCAL:snapshot diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 5943e4a48ed7..bc12c8257af1 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -7,7 +7,7 @@ PORTNAME= vlc DISTVERSION= 1.1.13 -PORTREVISION= 9 +PORTREVISION= 10 PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \ @@ -501,7 +501,7 @@ CONFIGURE_ARGS+=--disable-mozilla .if defined(WITHOUT_PNG) CONFIGURE_ARGS+=--disable-png .else -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CONFIGURE_ARGS+=--enable-png .endif diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index 2e4d396bca2c..ce625d7c87e8 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -6,7 +6,7 @@ PORTNAME= x264 PORTVERSION= 0.${X264_BUILD}.${X264_REV} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://samples.mplayerhq.hu/yuv4mpeg2/:pgo diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index cfe9e60fbec0..c31639ae72e0 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -6,7 +6,7 @@ PORTNAME= x264 PORTVERSION= 0.${X264_BUILD}.${X264_REV} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://samples.mplayerhq.hu/yuv4mpeg2/:pgo diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 7c2e4a347e89..8a791af32bd3 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -7,7 +7,7 @@ PORTNAME= xawtv PORTVERSION= 3.95 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia MASTER_SITES= http://dl.bytesex.org/releases/xawtv/ @@ -18,7 +18,7 @@ BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \ ${LOCALBASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts RUN_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \ ${LOCALBASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg OPTIONS= AA "Enable AA support" on \ diff --git a/multimedia/xbmc-addon-xvdr/Makefile b/multimedia/xbmc-addon-xvdr/Makefile index ef90b9619881..aeca4918f7ee 100644 --- a/multimedia/xbmc-addon-xvdr/Makefile +++ b/multimedia/xbmc-addon-xvdr/Makefile @@ -7,7 +7,7 @@ PORTNAME= xbmc-addon-xvdr PORTVERSION= 0.9.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= LOCAL/nox DISTNAME= pipelka-${PORTNAME}-xvdr-${PORTVERSION}-0-g${GITHASH} diff --git a/multimedia/xbmc-pvr/Makefile b/multimedia/xbmc-pvr/Makefile index 3078b85c75e2..22407a2b6e5f 100644 --- a/multimedia/xbmc-pvr/Makefile +++ b/multimedia/xbmc-pvr/Makefile @@ -7,7 +7,7 @@ PORTNAME= xbmc PORTVERSION= 70 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= LOCAL/nox PKGNAMESUFFIX= -pvr-ppa-odk @@ -47,7 +47,7 @@ LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib \ mpeg2:${PORTSDIR}/multimedia/libmpeg2 \ ogg.7:${PORTSDIR}/audio/libogg \ pcre.1:${PORTSDIR}/devel/pcre \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ smbclient.0:${PORTSDIR}/net/samba-libsmbclient \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ diff --git a/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.cpp b/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.cpp new file mode 100644 index 000000000000..227ee6e097e7 --- /dev/null +++ b/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.cpp @@ -0,0 +1,74 @@ +--- lib/cximage-6.0/CxImage/ximapng.cpp.orig 2012-03-16 00:33:05.000000000 +0100 ++++ lib/cximage-6.0/CxImage/ximapng.cpp 2012-04-28 06:40:43.000000000 +0200 +@@ -15,7 +15,7 @@ + void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message) + { + strcpy(info.szLastError,message); +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + //////////////////////////////////////////////////////////////////////////////// + #if CXIMAGE_SUPPORT_DECODE +@@ -62,7 +62,7 @@ + /* Set error handling if you are using the setjmp/longjmp method (this is + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + delete [] row_pointers; + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); +@@ -80,7 +80,7 @@ + head.biWidth = info_ptr->width; + head.biHeight= info_ptr->height; + info.dwType = CXIMAGE_FORMAT_PNG; +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + /* calculate new number of channels */ +@@ -101,7 +101,7 @@ + break; + default: + strcpy(info.szLastError,"unknown PNG color type"); +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + //find the right pixel depth used for cximage +@@ -111,7 +111,7 @@ + if (channels >= 3) pixel_depth=24; + + if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){ +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + /* get metrics */ +@@ -207,7 +207,7 @@ + } + + // <vho> - handle cancel +- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1); ++ if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1); + + // row_bytes is the width x number of channels x (bit-depth / 8) + row_pointers = new BYTE[info_ptr->rowbytes + 8]; +@@ -230,7 +230,7 @@ + do { + + // <vho> - handle cancel +- if (info.nEscape) longjmp(png_ptr->jmpbuf, 1); ++ if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1); + + #if CXIMAGE_SUPPORT_ALPHA // <vho> + if (AlphaIsValid()) { +@@ -361,7 +361,7 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)){ ++ if (setjmp(png_jmpbuf(png_ptr))){ + /* If we get here, we had a problem reading the file */ + if (info_ptr->palette) free(info_ptr->palette); + png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr); diff --git a/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.h b/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.h new file mode 100644 index 000000000000..136d212061ad --- /dev/null +++ b/multimedia/xbmc-pvr/files/patch-lib-cximage-6.0-CxImage-ximapng.h @@ -0,0 +1,19 @@ +--- lib/cximage-6.0/CxImage/ximapng.h.orig 2012-03-16 00:33:05.000000000 +0100 ++++ lib/cximage-6.0/CxImage/ximapng.h 2012-04-28 06:17:43.000000000 +0200 +@@ -25,6 +25,7 @@ + #ifdef _LINUX + #undef _DLL + #include <png.h> ++#include <pngpriv.h> + #else + #include "../png/png.h" + #endif +@@ -70,7 +71,7 @@ + static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg) + { + strncpy((char*)png_ptr->error_ptr,error_msg,255); +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + }; + diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile index 358f921cf4cb..8cd05f8c28c8 100644 --- a/multimedia/xbmc/Makefile +++ b/multimedia/xbmc/Makefile @@ -7,7 +7,7 @@ PORTNAME= xbmc PORTVERSION= 11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://mirrors.xbmc.org/releases/source/ @@ -46,7 +46,7 @@ LIB_DEPENDS= ass.5:${PORTSDIR}/multimedia/libass \ ogg.7:${PORTSDIR}/audio/libogg \ pcre.1:${PORTSDIR}/devel/pcre \ plist.1:${PORTSDIR}/devel/libplist \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ smbclient.0:${PORTSDIR}/net/samba-libsmbclient \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile index 0f59574ca536..f774ef9c5334 100644 --- a/multimedia/xfce4-media/Makefile +++ b/multimedia/xfce4-media/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-media PORTVERSION= 0.9.2 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= multimedia xfce MASTER_SITES= http://spuriousinterrupt.org/files/xfmedia/ DISTNAME= xfmedia-${PORTVERSION} diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile index 716da7351320..60a33e1a4594 100644 --- a/multimedia/xfce4-parole/Makefile +++ b/multimedia/xfce4-parole/Makefile @@ -7,7 +7,7 @@ PORTNAME= parole PORTVERSION= 0.2.0.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia xfce MASTER_SITES= XFCE/src/apps/parole/0.2/ DIST_SUBDIR= xfce4 diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile index 1ded005e59c4..f985e7cef004 100644 --- a/multimedia/xfce4-xmms-plugin/Makefile +++ b/multimedia/xfce4-xmms-plugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-xmms-plugin PORTVERSION= 0.5.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile index dc1600e8d377..055b9a07e5c5 100644 --- a/multimedia/xine/Makefile +++ b/multimedia/xine/Makefile @@ -7,7 +7,7 @@ PORTNAME= xine PORTVERSION= 0.99.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION} DISTNAME= ${PORTNAME}-ui-${PORTVERSION} @@ -18,7 +18,7 @@ COMMENT= An X11 multimedia player BUILD_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info # Please update libxine PLUGINSDIR as well (see below) LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info USE_XZ= yes diff --git a/multimedia/xine/files/patch-src_xitk_Imlib-light_load.c b/multimedia/xine/files/patch-src_xitk_Imlib-light_load.c new file mode 100644 index 000000000000..c0636a391d3f --- /dev/null +++ b/multimedia/xine/files/patch-src_xitk_Imlib-light_load.c @@ -0,0 +1,10 @@ +--- src/xitk/Imlib-light/load.c.orig 2010-03-01 18:02:05.000000000 +0100 ++++ src/xitk/Imlib-light/load.c 2012-05-06 06:38:35.000000000 +0200 +@@ -5,6 +5,7 @@ + #include "Imlib.h" + #include "Imlib_private.h" + #include <setjmp.h> ++#include <pngpriv.h> + + #ifndef INT_MAX + #define INT_MAX ((int)((unsigned int)(1 << (8 * sizeof(int) - 1)) - 1)) diff --git a/multimedia/xine_artsplugin/Makefile b/multimedia/xine_artsplugin/Makefile index 0a6f4269206c..82e204beaa26 100644 --- a/multimedia/xine_artsplugin/Makefile +++ b/multimedia/xine_artsplugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= xine_artsplugin PORTVERSION= ${KDE_VERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile index db31b7aad6f4..f838f84d5be9 100644 --- a/multimedia/xmms/Makefile +++ b/multimedia/xmms/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmms PORTVERSION= 1.2.11 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES+= multimedia audio ipv6 MASTER_SITES= http://www.xmms.org/files/1.2.x/ \ LOCAL/beech diff --git a/multimedia/y4mscaler/Makefile b/multimedia/y4mscaler/Makefile index 534dc06f4956..878cfb045d40 100644 --- a/multimedia/y4mscaler/Makefile +++ b/multimedia/y4mscaler/Makefile @@ -7,7 +7,7 @@ PORTNAME= y4mscaler PORTVERSION= 9.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= http://www.mir.com/DMG/Software/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src |