diff options
27 files changed, 82 insertions, 88 deletions
diff --git a/audio/beets/Makefile b/audio/beets/Makefile index 6a9622b07bde..a5613ad17ecf 100644 --- a/audio/beets/Makefile +++ b/audio/beets/Makefile @@ -3,6 +3,7 @@ PORTNAME= beets PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= audio python MASTER_SITES= CHEESESHOP diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 0eb70bd47d47..4784e5140d94 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -3,7 +3,7 @@ PORTNAME= cmus PORTVERSION= 2.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME} DISTNAME= ${PORTNAME}-v${PORTVERSION} diff --git a/audio/lastfm-desktop/Makefile b/audio/lastfm-desktop/Makefile index 51dbc19a9192..d2f435f43ff7 100644 --- a/audio/lastfm-desktop/Makefile +++ b/audio/lastfm-desktop/Makefile @@ -3,6 +3,7 @@ PORTNAME= lastfm PORTVERSION= 2.1.30 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://cdn.last.fm/client/Linux/ PKGNAMESUFFIX= -desktop diff --git a/audio/spek/Makefile b/audio/spek/Makefile index 0d841e70fdd3..724e0ebb780b 100644 --- a/audio/spek/Makefile +++ b/audio/spek/Makefile @@ -3,6 +3,7 @@ PORTNAME= spek PORTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile index d8d9d42bbf38..ac27c70d5439 100644 --- a/comms/dabstick-radio/Makefile +++ b/comms/dabstick-radio/Makefile @@ -3,6 +3,7 @@ PORTNAME= dabstick-radio PORTVERSION= 0.95 +PORTREVISION= 1 CATEGORIES= comms audio hamradio MASTER_SITES= http://www.sdr-j.tk/ EXTRACT_SUFX= .tgz diff --git a/deskutils/libstreamanalyzer/Makefile b/deskutils/libstreamanalyzer/Makefile index 0b2d4db44e3d..0b096c1e84d3 100644 --- a/deskutils/libstreamanalyzer/Makefile +++ b/deskutils/libstreamanalyzer/Makefile @@ -2,6 +2,7 @@ PORTNAME= libstreamanalyzer PORTVERSION= ${STRIGI_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ${STRIGI_MASTER_SITES} diff --git a/emulators/dolphin-emu-devel/Makefile b/emulators/dolphin-emu-devel/Makefile index d282fe6350a0..d6ab2bc8639c 100644 --- a/emulators/dolphin-emu-devel/Makefile +++ b/emulators/dolphin-emu-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= dolphin-emu PORTVERSION= 3.5.r${REVDATE} +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ LOCAL/martymac diff --git a/games/corsix-th/Makefile b/games/corsix-th/Makefile index 51fb6ebe8866..3cddb1553ce8 100644 --- a/games/corsix-th/Makefile +++ b/games/corsix-th/Makefile @@ -3,6 +3,7 @@ PORTNAME= corsixth PORTVERSION= 0.21 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= GOOGLE_CODE PROJECTHOST= corsix-th diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 7c14b4bd6a42..1f967843cb94 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -3,6 +3,7 @@ PORTNAME= cimg PORTVERSION= 1.5.5 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= graphics devel MASTER_SITES= SF/${PORTNAME} \ diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile index 871eaa4174b1..fb366719532f 100644 --- a/graphics/wxsvg/Makefile +++ b/graphics/wxsvg/Makefile @@ -3,6 +3,7 @@ PORTNAME= wxsvg PORTVERSION= 1.1.15 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile index 1621a3ae71bd..33ace8f8d03a 100644 --- a/multimedia/audacious-plugins/Makefile +++ b/multimedia/audacious-plugins/Makefile @@ -3,7 +3,7 @@ PORTNAME= audacious-plugins PORTVERSION= 3.3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile index c5f8bedcf3d0..847f8f620457 100644 --- a/multimedia/dvdstyler/Makefile +++ b/multimedia/dvdstyler/Makefile @@ -3,6 +3,7 @@ PORTNAME= dvdstyler PORTVERSION= 2.4.3 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= multimedia MASTER_SITES= SF diff --git a/multimedia/ffmpeg1/Makefile b/multimedia/ffmpeg1/Makefile index 56795c531a85..7a080675ea0a 100644 --- a/multimedia/ffmpeg1/Makefile +++ b/multimedia/ffmpeg1/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ffmpeg -PORTVERSION= 1.0.7 +PORTVERSION= 1.2.1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ PKGNAMESUFFIX= 1 @@ -31,14 +31,14 @@ WANT_SDL= yes USE_PERL5_BUILD= yes OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \ - FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM LAME \ - LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \ + FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM ICONV \ + LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \ OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \ THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \ X11GRAB X264 XVID -OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS OPENCV \ - SCHROEDINGER THEORA VORBIS VPX X264 XVID +OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \ + OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID ASS_DESC= Subtitles rendering via libass CDIO_DESC= Audio CD grabbing with libcdio @@ -96,6 +96,7 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --enable-memalign-hack \ --disable-libstagefright-h264 \ --disable-libutvideo \ + --disable-libsoxr \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ @@ -269,6 +270,14 @@ CONFIGURE_ARGS+= --enable-libgsm CONFIGURE_ARGS+= --disable-libgsm .endif +# gsm +.if ${PORT_OPTIONS:MICONV} +USES+= iconv +CONFIGURE_ARGS+= --enable-iconv +.else +CONFIGURE_ARGS+= --disable-libiconv +.endif + # lame .if ${PORT_OPTIONS:MLAME} LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame diff --git a/multimedia/ffmpeg1/distinfo b/multimedia/ffmpeg1/distinfo index 4afaab25b19c..27c6a3650f3e 100644 --- a/multimedia/ffmpeg1/distinfo +++ b/multimedia/ffmpeg1/distinfo @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-1.0.7.tar.bz2) = f7e52bd5e0de064e36ecb04adf155c31dd30366a13168fabe61fd135f24d5c11 -SIZE (ffmpeg-1.0.7.tar.bz2) = 6451535 +SHA256 (ffmpeg-1.2.1.tar.bz2) = 0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca +SIZE (ffmpeg-1.2.1.tar.bz2) = 5968378 diff --git a/multimedia/ffmpeg1/files/patch-configure b/multimedia/ffmpeg1/files/patch-configure index 325eb7bfbfa3..e827011a9af8 100644 --- a/multimedia/ffmpeg1/files/patch-configure +++ b/multimedia/ffmpeg1/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2013-02-07 01:29:22.000000000 +0100 -+++ configure 2013-02-23 22:38:06.946960545 +0100 -@@ -2030,7 +2030,7 @@ +--- configure.orig ++++ configure +@@ -2147,7 +2147,7 @@ yasmexe_default="yasm" nogas=":" # machine @@ -9,9 +9,9 @@ cpu="generic" # OS -@@ -3729,10 +3729,10 @@ - perl --version > /dev/null 2>&1 && enable perl || disable perl +@@ -3991,10 +3991,10 @@ perl --version > /dev/null 2>&1 && enabl pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man + rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout -check_header linux/fb.h -check_header linux/videodev.h @@ -24,7 +24,7 @@ check_header sys/videoio.h -@@ -4122,7 +4122,7 @@ +@@ -4373,7 +4373,7 @@ ifndef MAIN_MAKEFILE SRC_PATH:=\$(SRC_PATH:.%=..%) endif CC_IDENT=$cc_ident @@ -33,14 +33,7 @@ CC=$cc CXX=$cxx AS=$as -@@ -4325,13 +4325,13 @@ - requires=$5 - enabled ${name#lib} || return 0 - mkdir -p $name -- cat <<EOF > $name/$name.pc -+ cat <<EOF > $name/${name}${build_suffix}.pc - prefix=$prefix - exec_prefix=\${prefix} +@@ -4555,7 +4555,7 @@ exec_prefix=\${prefix} libdir=$libdir includedir=$incdir @@ -49,7 +42,7 @@ Description: $comment Version: $version Requires: $(enabled shared || echo $requires) -@@ -4345,10 +4345,10 @@ +@@ -4569,10 +4569,10 @@ EOF mkdir -p doc/examples/pc-uninstalled includedir=${source_path} [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.." @@ -62,41 +55,3 @@ includedir=${includedir} Name: $name -@@ -4362,25 +4362,25 @@ - } - - libavfilter_pc_deps="" --enabled libavfilter_deps_avcodec && prepend libavfilter_pc_deps "libavcodec = $LIBAVCODEC_VERSION," --enabled libavfilter_deps_avformat && prepend libavfilter_pc_deps "libavformat = $LIBAVFORMAT_VERSION," --enabled libavfilter_deps_swscale && prepend libavfilter_pc_deps "libswscale = $LIBSWSCALE_VERSION," --enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample = $LIBSWRESAMPLE_VERSION," --enabled libavfilter_deps_postproc && prepend libavfilter_pc_deps "libpostproc = $LIBPOSTPROC_VERSION," -+enabled libavfilter_deps_avcodec && prepend libavfilter_pc_deps "libavcodec${build_suffix} = $LIBAVCODEC_VERSION," -+enabled libavfilter_deps_avformat && prepend libavfilter_pc_deps "libavformat${build_suffix} = $LIBAVFORMAT_VERSION," -+enabled libavfilter_deps_swscale && prepend libavfilter_pc_deps "libswscale${build_suffix} = $LIBSWSCALE_VERSION," -+enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample${build_suffix} = $LIBSWRESAMPLE_VERSION," -+enabled libavfilter_deps_postproc && prepend libavfilter_pc_deps "libpostproc${build_suffix} = $LIBPOSTPROC_VERSION," - libavfilter_pc_deps=${libavfilter_pc_deps%, } - --libavdevice_pc_deps="libavformat = $LIBAVFORMAT_VERSION" --enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter = $LIBAVFILTER_VERSION," -+libavdevice_pc_deps="libavformat${build_suffix} = $LIBAVFORMAT_VERSION" -+enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter${build_suffix} = $LIBAVFILTER_VERSION," - - pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM" --pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" --pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" -+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" -+pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec${build_suffix} = $LIBAVCODEC_VERSION" - pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$libavdevice_pc_deps" - pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$libavfilter_pc_deps" --pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" -+pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" - pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" --pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" --pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" -+pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" -+pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" - - fix_ffmpeg_remote(){ - git_remote_from=$1 diff --git a/multimedia/ffmpeg1/files/patch-libavcodec-libgsm.c b/multimedia/ffmpeg1/files/patch-libavcodec-libgsm.c deleted file mode 100644 index 22b346333978..000000000000 --- a/multimedia/ffmpeg1/files/patch-libavcodec-libgsm.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libavcodec/libgsm.c.orig 2012-01-22 14:41:15.000000000 +0100 -+++ libavcodec/libgsm.c 2012-01-22 16:06:24.357156664 +0100 -@@ -27,7 +27,7 @@ - - // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html - --#include <gsm/gsm.h> -+#include <gsm.h> - - #include "avcodec.h" - #include "gsm.h" diff --git a/multimedia/ffmpeg1/files/patch-library.mak b/multimedia/ffmpeg1/files/patch-library.mak index 14e50e5b3a47..8a53c24f7d7f 100644 --- a/multimedia/ffmpeg1/files/patch-library.mak +++ b/multimedia/ffmpeg1/files/patch-library.mak @@ -4,10 +4,9 @@ $(Q)mkdir -p "$(INCINSTDIR)" $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)" --install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc + install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc - $(Q)mkdir -p "$(LIBDIR)/pkgconfig" - $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig" -+install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)$(BUILDSUF).pc + $(Q)mkdir -p "$(prefix)/libdata/pkgconfig" + $$(INSTALL) -m 644 $$^ "$(prefix)/libdata/pkgconfig" @@ -17,8 +16,8 @@ uninstall-headers:: $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS)) -- $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc" -+ $(RM) "$(prefix)/libdata/pkgconfig/lib$(NAME).pc" +- $(RM) "$(LIBDIR)/pkgconfig/lib$(FULLNAME).pc" ++ $(RM) "$(prefix)/libdata/pkgconfig/lib$(FULLNAME).pc" -rmdir "$(INCINSTDIR)" endef diff --git a/multimedia/ffmpeg1/pkg-plist b/multimedia/ffmpeg1/pkg-plist index 023b1b44143b..bbb455286e8e 100644 --- a/multimedia/ffmpeg1/pkg-plist +++ b/multimedia/ffmpeg1/pkg-plist @@ -38,6 +38,7 @@ include/ffmpeg%%SUFF%%/libavutil/base64.h include/ffmpeg%%SUFF%%/libavutil/blowfish.h include/ffmpeg%%SUFF%%/libavutil/bprint.h include/ffmpeg%%SUFF%%/libavutil/bswap.h +include/ffmpeg%%SUFF%%/libavutil/channel_layout.h include/ffmpeg%%SUFF%%/libavutil/common.h include/ffmpeg%%SUFF%%/libavutil/cpu.h include/ffmpeg%%SUFF%%/libavutil/crc.h @@ -46,6 +47,7 @@ include/ffmpeg%%SUFF%%/libavutil/error.h include/ffmpeg%%SUFF%%/libavutil/eval.h include/ffmpeg%%SUFF%%/libavutil/fifo.h include/ffmpeg%%SUFF%%/libavutil/file.h +include/ffmpeg%%SUFF%%/libavutil/hmac.h include/ffmpeg%%SUFF%%/libavutil/imgutils.h include/ffmpeg%%SUFF%%/libavutil/intfloat.h include/ffmpeg%%SUFF%%/libavutil/intfloat_readwrite.h @@ -56,6 +58,7 @@ include/ffmpeg%%SUFF%%/libavutil/lzo.h include/ffmpeg%%SUFF%%/libavutil/mathematics.h include/ffmpeg%%SUFF%%/libavutil/md5.h include/ffmpeg%%SUFF%%/libavutil/mem.h +include/ffmpeg%%SUFF%%/libavutil/old_pix_fmts.h include/ffmpeg%%SUFF%%/libavutil/opt.h include/ffmpeg%%SUFF%%/libavutil/parseutils.h include/ffmpeg%%SUFF%%/libavutil/pixdesc.h @@ -70,41 +73,43 @@ include/ffmpeg%%SUFF%%/libavutil/timestamp.h include/ffmpeg%%SUFF%%/libavutil/version.h include/ffmpeg%%SUFF%%/libavutil/xtea.h include/ffmpeg%%SUFF%%/libpostproc/postprocess.h +include/ffmpeg%%SUFF%%/libpostproc/version.h include/ffmpeg%%SUFF%%/libswresample/swresample.h +include/ffmpeg%%SUFF%%/libswresample/version.h include/ffmpeg%%SUFF%%/libswscale/swscale.h include/ffmpeg%%SUFF%%/libswscale/version.h lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54 -lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.59.100 +lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.92.100 lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54 -lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.2.101 +lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.3.103 lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3 -lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.17.100 +lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.42.103 lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54 -lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.29.104 +lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.63.104 lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so -lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51 -lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.73.101 +lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.52 +lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.52.18.100 lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52 -lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.0.100 +lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.2.100 lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.a lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0 -lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.15.100 +lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.17.102 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2 -lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.1.101 +lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.2.100 libdata/pkgconfig/libavcodec%%SUFF%%.pc libdata/pkgconfig/libavdevice%%SUFF%%.pc libdata/pkgconfig/libavfilter%%SUFF%%.pc @@ -114,12 +119,14 @@ libdata/pkgconfig/libpostproc%%SUFF%%.pc libdata/pkgconfig/libswresample%%SUFF%%.pc libdata/pkgconfig/libswscale%%SUFF%%.pc %%DATADIR%%/examples/Makefile +%%DATADIR%%/examples/README %%DATADIR%%/examples/decoding_encoding.c %%DATADIR%%/examples/demuxing.c %%DATADIR%%/examples/filtering_audio.c %%DATADIR%%/examples/filtering_video.c %%DATADIR%%/examples/metadata.c %%DATADIR%%/examples/muxing.c +%%DATADIR%%/examples/resampling_audio.c %%DATADIR%%/examples/scaling_video.c %%DATADIR%%/ffprobe.xsd %%DATADIR%%/libvpx-1080p.ffpreset diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile index 7d8aa5e5bee7..d3177e272467 100644 --- a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile +++ b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile @@ -3,6 +3,7 @@ PORTNAME= ffmpegthumbs PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile index 5cc90e181b96..9135abec3616 100644 --- a/multimedia/kdenlive/Makefile +++ b/multimedia/kdenlive/Makefile @@ -2,6 +2,7 @@ PORTNAME= kdenlive PORTVERSION= 0.9.6 +PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src/ diff --git a/multimedia/mplayer2/Makefile b/multimedia/mplayer2/Makefile index fbc78a30dd3b..5644e6777f10 100644 --- a/multimedia/mplayer2/Makefile +++ b/multimedia/mplayer2/Makefile @@ -2,6 +2,7 @@ PORTNAME= mplayer2 PORTVERSION= ${MPLAYER2_PORT_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= LOCAL/gblach/ diff --git a/multimedia/mplayer2/files/patch-sub-subassconvert.c b/multimedia/mplayer2/files/patch-sub-subassconvert.c new file mode 100644 index 000000000000..6e8804d44f50 --- /dev/null +++ b/multimedia/mplayer2/files/patch-sub-subassconvert.c @@ -0,0 +1,10 @@ +--- sub/subassconvert.c.orig ++++ sub/subassconvert.c +@@ -18,6 +18,7 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#include <ctype.h> + #include <string.h> + #include <stdint.h> + #include <stdlib.h> diff --git a/multimedia/mplayer2/files/patch-sub-subreader.c b/multimedia/mplayer2/files/patch-sub-subreader.c new file mode 100644 index 000000000000..d6a77a2bee60 --- /dev/null +++ b/multimedia/mplayer2/files/patch-sub-subreader.c @@ -0,0 +1,10 @@ +--- sub/subreader.c.orig ++++ sub/subreader.c +@@ -21,6 +21,7 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#include <ctype.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index cac4a85974a9..856cde03a91d 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.0.6 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/p/-pre/}/ \ diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile index e3fbbdf93e73..2ef45e5d2349 100644 --- a/multimedia/xbmc/Makefile +++ b/multimedia/xbmc/Makefile @@ -2,7 +2,7 @@ PORTNAME= xbmc DISTVERSION= 12.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://mirrors.xbmc.org/releases/source/ diff --git a/net/serviio/Makefile b/net/serviio/Makefile index de0f7716eb95..0abdffe157ce 100644 --- a/net/serviio/Makefile +++ b/net/serviio/Makefile @@ -3,6 +3,7 @@ PORTNAME= serviio PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= net multimedia java www MASTER_SITES= http://download.serviio.org/releases/ EXTRACT_SUFX= -linux.tar.gz diff --git a/sysutils/nepomuk-core/Makefile b/sysutils/nepomuk-core/Makefile index b5dd4384f99d..20c35d7d4c8f 100644 --- a/sysutils/nepomuk-core/Makefile +++ b/sysutils/nepomuk-core/Makefile @@ -3,6 +3,7 @@ PORTNAME= nepomuk-core PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src |