commit 3b7f6f4 Author: Jan Beich Date: Wed Nov 11 17:35:49 2015 +0000 multimedia/libvpx: update 1.5.0 ABI isn't compatible, so bump PORTREVISION in consumers. Changes: https://chromium.googlesource.com/webm/libvpx/+log/e67d45d..v1.5.0 ACC report: https://people.freebsd.org/~jbeich/compat_reports/libvpx/1.4.0.488_1_to_1.5.0/compat_report.html Exp-run by: ? --- emulators/virtualbox-ose/Makefile | 1 + games/openbor/Makefile | 2 +- graphics/gd/Makefile | 2 +- graphics/php5-gd/Makefile | 1 + graphics/php55-gd/Makefile | 1 + graphics/php56-gd/Makefile | 1 + mail/thunderbird/Makefile | 1 + multimedia/avidemux/Makefile | 2 +- multimedia/ffmpeg/Makefile | 1 + .../ffmpeg/files/patch-libavcodec-libvpxenc.c | 39 ++++++++++++++++++++ multimedia/ffmpeg0/Makefile | 1 + .../ffmpeg0/files/patch-libavcodec-libvpxenc.c | 39 ++++++++++++++++++++ multimedia/gstreamer-plugins-vp8/Makefile | 2 +- multimedia/gstreamer1-plugins-vpx/Makefile | 2 +- multimedia/handbrake/Makefile | 2 +- .../patch-contrib_ffmpeg_A90-libvpx-1.5.0.patch | 42 ++++++++++++++++++++++ multimedia/libav/Makefile | 2 +- .../libav/files/patch-libavcodec_libvpxenc.c | 39 ++++++++++++++++++++ multimedia/libvpx/Makefile | 4 +-- multimedia/libvpx/distinfo | 4 +-- multimedia/libvpx/files/patch-configure | 4 +-- .../libvpx/files/patch-vp9_common_vp9__filter.c | 27 -------------- multimedia/libvpx/pkg-plist | 6 ++-- multimedia/mplayer/Makefile | 2 +- .../files/patch-ffmpeg_libavcodec_libvpxenc.c | 39 ++++++++++++++++++++ net-im/qTox/Makefile | 2 +- net-im/tox/Makefile | 2 +- net-im/toxic/Makefile | 1 + net-im/uTox/Makefile | 1 + net/mediastreamer/Makefile | 1 + www/firefox-esr/Makefile | 1 + www/firefox/Makefile | 1 + www/libxul/Makefile | 1 + www/seamonkey/Makefile | 2 +- x11/xpra/Makefile | 1 + 35 files changed, 231 insertions(+), 48 deletions(-) diff --git emulators/virtualbox-ose/Makefile emulators/virtualbox-ose/Makefile index f16352c..69fb1f4 100644 --- emulators/virtualbox-ose/Makefile +++ emulators/virtualbox-ose/Makefile @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.3.32 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ diff --git games/openbor/Makefile games/openbor/Makefile index 34fadcc..0de8b8c 100644 --- games/openbor/Makefile +++ games/openbor/Makefile @@ -2,7 +2,7 @@ PORTNAME= openbor PORTVERSION= 3.0.r4163 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= LOCAL/jbeich \ https://svn.code.sf.net/p/${PORTNAME}/engine/engine/:svn diff --git graphics/gd/Makefile graphics/gd/Makefile index 07b337488..cafc0cf 100644 --- graphics/gd/Makefile +++ graphics/gd/Makefile @@ -3,7 +3,7 @@ PORTNAME= libgd PORTVERSION= 2.1.0 -PORTREVISION?= 6 +PORTREVISION?= 7 PORTEPOCH= 1 CATEGORIES+= graphics MASTER_SITES= https://bitbucket.org/libgd/gd-libgd/downloads/ \ diff --git graphics/php5-gd/Makefile graphics/php5-gd/Makefile index 2972d31..e4ad86b 100644 --- graphics/php5-gd/Makefile +++ graphics/php5-gd/Makefile @@ -1,6 +1,7 @@ # Created by: Alex Dupre # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= graphics MASTERDIR= ${.CURDIR}/../../lang/php5 diff --git graphics/php55-gd/Makefile graphics/php55-gd/Makefile index 6d549ce..624b80b 100644 --- graphics/php55-gd/Makefile +++ graphics/php55-gd/Makefile @@ -1,6 +1,7 @@ # Created by: Alex Dupre # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= graphics MASTERDIR= ${.CURDIR}/../../lang/php55 diff --git graphics/php56-gd/Makefile graphics/php56-gd/Makefile index 4746215..4979a92 100644 --- graphics/php56-gd/Makefile +++ graphics/php56-gd/Makefile @@ -1,6 +1,7 @@ # Created by: Alex Dupre # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= graphics MASTERDIR= ${.CURDIR}/../../lang/php56 diff --git mail/thunderbird/Makefile mail/thunderbird/Makefile index 52db2e5..d2e5518 100644 --- mail/thunderbird/Makefile +++ mail/thunderbird/Makefile @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 38.3.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source diff --git multimedia/avidemux/Makefile multimedia/avidemux/Makefile index b136f8d..8676d94 100644 --- multimedia/avidemux/Makefile +++ multimedia/avidemux/Makefile @@ -6,7 +6,7 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org diff --git multimedia/ffmpeg/Makefile multimedia/ffmpeg/Makefile index 43f52ba..c82da1c 100644 --- multimedia/ffmpeg/Makefile +++ multimedia/ffmpeg/Makefile @@ -3,6 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.8.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ diff --git multimedia/ffmpeg/files/patch-libavcodec-libvpxenc.c multimedia/ffmpeg/files/patch-libavcodec-libvpxenc.c new file mode 100644 index 0000000..3d27b8a --- /dev/null +++ multimedia/ffmpeg/files/patch-libavcodec-libvpxenc.c @@ -0,0 +1,39 @@ +commit 6540fe0 +Author: James Zern +Date: Mon Oct 19 22:44:11 2015 -0700 + + libvpxenc: remove some unused ctrl id mappings + + VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed + from libvpx and the remaining values were never used here + + Reviewed-by: Michael Niedermayer + Signed-off-by: James Zern +--- + libavcodec/libvpxenc.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git libavcodec/libvpxenc.c libavcodec/libvpxenc.c +index 5f39783..992122c 100644 +--- libavcodec/libvpxenc.c ++++ libavcodec/libvpxenc.c +@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git multimedia/ffmpeg0/Makefile multimedia/ffmpeg0/Makefile index dc5317e..3903e75 100644 --- multimedia/ffmpeg0/Makefile +++ multimedia/ffmpeg0/Makefile @@ -3,6 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.17 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ diff --git multimedia/ffmpeg0/files/patch-libavcodec-libvpxenc.c multimedia/ffmpeg0/files/patch-libavcodec-libvpxenc.c new file mode 100644 index 0000000..26cc58e --- /dev/null +++ multimedia/ffmpeg0/files/patch-libavcodec-libvpxenc.c @@ -0,0 +1,39 @@ +commit 6540fe0 +Author: James Zern +Date: Mon Oct 19 22:44:11 2015 -0700 + + libvpxenc: remove some unused ctrl id mappings + + VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed + from libvpx and the remaining values were never used here + + Reviewed-by: Michael Niedermayer + Signed-off-by: James Zern +--- + libavcodec/libvpxenc.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git libavcodec/libvpxenc.c libavcodec/libvpxenc.c +index 5f39783..992122c 100644 +--- libavcodec/libvpxenc.c ++++ libavcodec/libvpxenc.c +@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git multimedia/gstreamer-plugins-vp8/Makefile multimedia/gstreamer-plugins-vp8/Makefile index 2e42649..b05f6ca 100644 --- multimedia/gstreamer-plugins-vp8/Makefile +++ multimedia/gstreamer-plugins-vp8/Makefile @@ -1,7 +1,7 @@ # Created by: Koop Mast # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia COMMENT= Gstreamer vp8 codec plugin diff --git multimedia/gstreamer1-plugins-vpx/Makefile multimedia/gstreamer1-plugins-vpx/Makefile index 379ee38..626be2a 100644 --- multimedia/gstreamer1-plugins-vpx/Makefile +++ multimedia/gstreamer1-plugins-vpx/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= multimedia COMMENT= Gstreamer vp8 codec plugin diff --git multimedia/handbrake/Makefile multimedia/handbrake/Makefile index 1f31036..7417344 100644 --- multimedia/handbrake/Makefile +++ multimedia/handbrake/Makefile @@ -3,7 +3,7 @@ PORTNAME= handbrake PORTVERSION= 0.10.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://download.handbrake.fr/releases/${PORTVERSION}/ \ http://download.handbrake.fr/handbrake/contrib/:contrib \ diff --git multimedia/handbrake/files/patch-contrib_ffmpeg_A90-libvpx-1.5.0.patch multimedia/handbrake/files/patch-contrib_ffmpeg_A90-libvpx-1.5.0.patch new file mode 100644 index 0000000..f4b2306 --- /dev/null +++ multimedia/handbrake/files/patch-contrib_ffmpeg_A90-libvpx-1.5.0.patch @@ -0,0 +1,42 @@ +--- contrib/ffmpeg/A90-libvpx-1.5.0.patch.orig 2015-11-11 20:38:40 UTC ++++ contrib/ffmpeg/A90-libvpx-1.5.0.patch +@@ -0,0 +1,39 @@ ++commit 6540fe0 ++Author: James Zern ++Date: Mon Oct 19 22:44:11 2015 -0700 ++ ++ libvpxenc: remove some unused ctrl id mappings ++ ++ VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed ++ from libvpx and the remaining values were never used here ++ ++ Reviewed-by: Michael Niedermayer ++ Signed-off-by: James Zern ++--- ++ libavcodec/libvpxenc.c | 8 -------- ++ 1 file changed, 8 deletions(-) ++ ++diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c ++index 5f39783..992122c 100644 ++--- a/libavcodec/libvpxenc.c +++++ b/libavcodec/libvpxenc.c ++@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { ++ ++ /** String mappings for enum vp8e_enc_control_id */ ++ static const char *const ctlidstr[] = { ++- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", ++- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", ++- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", ++- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", ++- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", ++- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", ++ [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", ++ [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", ++ [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", ++- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", ++ [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", ++ [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", ++- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", ++ [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", ++ [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", ++ [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git multimedia/libav/Makefile multimedia/libav/Makefile index cac231c..74910ab 100644 --- multimedia/libav/Makefile +++ multimedia/libav/Makefile @@ -2,7 +2,7 @@ PORTNAME= libav PORTVERSION= 11.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ diff --git multimedia/libav/files/patch-libavcodec_libvpxenc.c multimedia/libav/files/patch-libavcodec_libvpxenc.c new file mode 100644 index 0000000..3d27b8a --- /dev/null +++ multimedia/libav/files/patch-libavcodec_libvpxenc.c @@ -0,0 +1,39 @@ +commit 6540fe0 +Author: James Zern +Date: Mon Oct 19 22:44:11 2015 -0700 + + libvpxenc: remove some unused ctrl id mappings + + VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed + from libvpx and the remaining values were never used here + + Reviewed-by: Michael Niedermayer + Signed-off-by: James Zern +--- + libavcodec/libvpxenc.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git libavcodec/libvpxenc.c libavcodec/libvpxenc.c +index 5f39783..992122c 100644 +--- libavcodec/libvpxenc.c ++++ libavcodec/libvpxenc.c +@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git multimedia/libvpx/Makefile multimedia/libvpx/Makefile index 47f5136..11dd757 100644 --- multimedia/libvpx/Makefile +++ multimedia/libvpx/Makefile @@ -3,9 +3,7 @@ PORTNAME= libvpx DISTVERSIONPREFIX= v -DISTVERSION= 1.4.0-488 # tracking www/firefox -DISTVERSIONSUFFIX= -ge67d45d -PORTREVISION= 1 +DISTVERSION= 1.5.0 CATEGORIES= multimedia MAINTAINER= ashish@FreeBSD.org diff --git multimedia/libvpx/distinfo multimedia/libvpx/distinfo index fa61d55..5f64225 100644 --- multimedia/libvpx/distinfo +++ multimedia/libvpx/distinfo @@ -1,2 +1,2 @@ -SHA256 (webmproject-libvpx-v1.4.0-488-ge67d45d_GH0.tar.bz2) = 9ee182a81d866d92021e4cb11bc81cf0bee96d5bb53c2122eb4d3cc6b86b712b -SIZE (webmproject-libvpx-v1.4.0-488-ge67d45d_GH0.tar.bz2) = 2324228 +SHA256 (webmproject-libvpx-v1.5.0_GH0.tar.bz2) = f199b03b67042e8d94a3ae8bc841fb82b6a8430bdf3965aeeaafe8245bcfa699 +SIZE (webmproject-libvpx-v1.5.0_GH0.tar.bz2) = 2430835 diff --git multimedia/libvpx/files/patch-configure multimedia/libvpx/files/patch-configure index d858d04..8584aed 100644 --- multimedia/libvpx/files/patch-configure +++ multimedia/libvpx/files/patch-configure @@ -1,9 +1,9 @@ --- configure.orig +++ configure -@@ -148,6 +148,10 @@ all_platforms="${all_platforms} x86_64-w - all_platforms="${all_platforms} x86_64-win64-vs10" +@@ -153,6 +153,10 @@ all_platforms="${all_platforms} x86_64-w all_platforms="${all_platforms} x86_64-win64-vs11" all_platforms="${all_platforms} x86_64-win64-vs12" + all_platforms="${all_platforms} x86_64-win64-vs14" +all_platforms="${all_platforms} ia64-linux-gcc" +all_platforms="${all_platforms} ppc32-linux-gcc" +all_platforms="${all_platforms} ppc64-linux-gcc" diff --git multimedia/libvpx/files/patch-vp9_common_vp9__filter.c multimedia/libvpx/files/patch-vp9_common_vp9__filter.c deleted file mode 100644 index cf6235d..0000000 --- multimedia/libvpx/files/patch-vp9_common_vp9__filter.c +++ /dev/null @@ -1,27 +0,0 @@ -commit 33b3953c548a20c0aee705657df0440a740c28b7 -Author: James Zern -Date: Thu Jun 11 15:12:22 2015 -0700 - - vp9_filter: restore vp9_bilinear_filters alignment - - the declaration containing the alignment in vp9_filter.h was removed in: - eb88b17 Make vp9 subpixel match vp8 - - fixes a crash in 32-bit builds - - Change-Id: I9a97e6b4e8e94698e43ff79d0d8bb85043b73c61 - -diff --git a/vp9/common/vp9_filter.c b/vp9/common/vp9_filter.c -index afcdf22..b256d4a 100644 ---- vp9/common/vp9_filter.c -+++ vp9/common/vp9_filter.c -@@ -12,7 +12,8 @@ - - #include "vp9/common/vp9_filter.h" - --const InterpKernel vp9_bilinear_filters[SUBPEL_SHIFTS] = { -+DECLARE_ALIGNED(256, const InterpKernel, -+ vp9_bilinear_filters[SUBPEL_SHIFTS]) = { - { 0, 0, 0, 128, 0, 0, 0, 0 }, - { 0, 0, 0, 120, 8, 0, 0, 0 }, - { 0, 0, 0, 112, 16, 0, 0, 0 }, diff --git multimedia/libvpx/pkg-plist multimedia/libvpx/pkg-plist index 099df59..f698419 100644 --- multimedia/libvpx/pkg-plist +++ multimedia/libvpx/pkg-plist @@ -11,7 +11,7 @@ include/vpx/vpx_image.h include/vpx/vpx_integer.h lib/libvpx.a %%SHARED%%lib/libvpx.so -%%SHARED%%lib/libvpx.so.2 -%%SHARED%%lib/libvpx.so.2.0 -%%SHARED%%lib/libvpx.so.2.0.0 +%%SHARED%%lib/libvpx.so.3 +%%SHARED%%lib/libvpx.so.3.0 +%%SHARED%%lib/libvpx.so.3.0.0 libdata/pkgconfig/vpx.pc diff --git multimedia/mplayer/Makefile multimedia/mplayer/Makefile index d5f3d48..e5c0897 100644 --- multimedia/mplayer/Makefile +++ multimedia/mplayer/Makefile @@ -3,7 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git multimedia/mplayer/files/patch-ffmpeg_libavcodec_libvpxenc.c multimedia/mplayer/files/patch-ffmpeg_libavcodec_libvpxenc.c new file mode 100644 index 0000000..898128c --- /dev/null +++ multimedia/mplayer/files/patch-ffmpeg_libavcodec_libvpxenc.c @@ -0,0 +1,39 @@ +commit 6540fe0 +Author: James Zern +Date: Mon Oct 19 22:44:11 2015 -0700 + + libvpxenc: remove some unused ctrl id mappings + + VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed + from libvpx and the remaining values were never used here + + Reviewed-by: Michael Niedermayer + Signed-off-by: James Zern +--- + libavcodec/libvpxenc.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git ffmpeg/libavcodec/libvpxenc.c ffmpeg/libavcodec/libvpxenc.c +index 5f39783..992122c 100644 +--- ffmpeg/libavcodec/libvpxenc.c ++++ ffmpeg/libavcodec/libvpxenc.c +@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git net-im/qTox/Makefile net-im/qTox/Makefile index 96259e4..a3f4bfd 100644 --- net-im/qTox/Makefile +++ net-im/qTox/Makefile @@ -3,7 +3,7 @@ PORTNAME= qTox PORTVERSION= 0.150614 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im net-p2p MAINTAINER= yuri@rawbw.com diff --git net-im/tox/Makefile net-im/tox/Makefile index 42c96df..4e6f575 100644 --- net-im/tox/Makefile +++ net-im/tox/Makefile @@ -3,7 +3,7 @@ PORTNAME= toxcore PORTVERSION= 0.151028 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im net-p2p MAINTAINER= thierry@FreeBSD.org diff --git net-im/toxic/Makefile net-im/toxic/Makefile index 181d1bd..d4fa30f 100644 --- net-im/toxic/Makefile +++ net-im/toxic/Makefile @@ -3,6 +3,7 @@ PORTNAME= toxic PORTVERSION= 0.6.1.151028 +PORTREVISION= 1 CATEGORIES= net-im MAINTAINER= thierry@FreeBSD.org diff --git net-im/uTox/Makefile net-im/uTox/Makefile index d4eb3a0..ea087c2 100644 --- net-im/uTox/Makefile +++ net-im/uTox/Makefile @@ -2,6 +2,7 @@ PORTNAME= uTox DISTVERSION= 0.3.2.20150613 +PORTREVISION= 1 CATEGORIES= net-im net-p2p MAINTAINER= fidaj@ukr.net diff --git net/mediastreamer/Makefile net/mediastreamer/Makefile index 200bd46..80b3112 100644 --- net/mediastreamer/Makefile +++ net/mediastreamer/Makefile @@ -3,6 +3,7 @@ PORTNAME= mediastreamer PORTVERSION= 2.12.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= SAVANNAH/linphone/mediastreamer diff --git www/firefox-esr/Makefile www/firefox-esr/Makefile index 4e803c2..58c403e 100644 --- www/firefox-esr/Makefile +++ www/firefox-esr/Makefile @@ -4,6 +4,7 @@ PORTNAME= firefox DISTVERSION= 38.3.0 DISTVERSIONSUFFIX=esr.source +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git www/firefox/Makefile www/firefox/Makefile index 32cf0e3..2b60960 100644 --- www/firefox/Makefile +++ www/firefox/Makefile @@ -4,6 +4,7 @@ PORTNAME= firefox DISTVERSION= 41.0.2 DISTVERSIONSUFFIX=.source +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git www/libxul/Makefile www/libxul/Makefile index 9d42a37..df27c1c 100644 --- www/libxul/Makefile +++ www/libxul/Makefile @@ -3,6 +3,7 @@ PORTNAME= libxul DISTVERSION= 38.3.0 +PORTREVISION= 1 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source diff --git www/seamonkey/Makefile www/seamonkey/Makefile index b6d42a5..6edb877 100644 --- www/seamonkey/Makefile +++ www/seamonkey/Makefile @@ -3,7 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.33.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source diff --git x11/xpra/Makefile x11/xpra/Makefile index af69d13..8f50fb5 100644 --- x11/xpra/Makefile +++ x11/xpra/Makefile @@ -3,6 +3,7 @@ PORTNAME= xpra PORTVERSION= 0.15.7 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/