diff options
39 files changed, 264 insertions, 54 deletions
diff --git a/devel/py-aiortc/Makefile b/devel/py-aiortc/Makefile index 06e5ae15d8a6..7bde6cb7d600 100644 --- a/devel/py-aiortc/Makefile +++ b/devel/py-aiortc/Makefile @@ -2,6 +2,7 @@ PORTNAME= aiortc PORTVERSION= 0.9.18 +PORTREVISION= 1 CATEGORIES= devel multimedia python www MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 9d63540afb3e..6e3b4ee96d49 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 5.2.26 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile index e45b197d4a4e..b464b5efaaa0 100644 --- a/games/eduke32/Makefile +++ b/games/eduke32/Makefile @@ -3,7 +3,7 @@ PORTNAME= eduke32 PORTVERSION= 20180809 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/:eduke32 \ http://www.duke4.org/files/nightfright/hrp/:hrp \ diff --git a/games/openbor/Makefile b/games/openbor/Makefile index 8e12be56ff38..48bf0ccc862f 100644 --- a/games/openbor/Makefile +++ b/games/openbor/Makefile @@ -4,7 +4,7 @@ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} PORTVERSION?= 6662 .ifndef PKGNAMESUFFIX -PORTREVISION= 1 +PORTREVISION= 2 .endif CATEGORIES= games diff --git a/games/openbor4432/Makefile b/games/openbor4432/Makefile index ae03e26caaff..213faa22da20 100644 --- a/games/openbor4432/Makefile +++ b/games/openbor4432/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 4432 -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= ${PORTVERSION} MASTERDIR= ${.CURDIR}/../openbor diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index b5de74d78ff7..140ce2d6b223 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 60.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source @@ -30,7 +30,7 @@ BUILD_DEPENDS= nspr>=4.19:devel/nspr \ SSP_UNSAFE= yes USE_GECKO= gecko -USE_MOZILLA= -webp +USE_MOZILLA= -webp -vpx USES= tar:xz diff --git a/multimedia/avidemux-plugins/Makefile b/multimedia/avidemux-plugins/Makefile index 28d4b7b214dd..b27e9da348ff 100644 --- a/multimedia/avidemux-plugins/Makefile +++ b/multimedia/avidemux-plugins/Makefile @@ -3,7 +3,7 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= multimedia PKGNAMESUFFIX= -plugins diff --git a/multimedia/ccextractor/Makefile b/multimedia/ccextractor/Makefile index a6a0e10dbf92..071ebee878e0 100644 --- a/multimedia/ccextractor/Makefile +++ b/multimedia/ccextractor/Makefile @@ -3,7 +3,7 @@ PORTNAME= ccextractor DISTVERSIONPREFIX= v DISTVERSION= 0.85 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= multimedia MAINTAINER= oz@nixil.net diff --git a/multimedia/cinelerra-gg/Makefile b/multimedia/cinelerra-gg/Makefile index afd70f2aeff6..a54eb69f0a8d 100644 --- a/multimedia/cinelerra-gg/Makefile +++ b/multimedia/cinelerra-gg/Makefile @@ -3,7 +3,7 @@ PORTNAME= cinelerra-gg DISTVERSION= 5.1-20180714 DISTVERSIONSUFFIX= -${REV:C/(.......).*/\1/} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= https://git.cinelerra-cv.org/gitweb?p=goodguy/cinelerra.git;a=snapshot;h=${REV};sf=tgz;dummy=/ # tarballs are @ https://cinelerra-cv.org/five/pkgs/src/ diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 819b2b598c28..96af2736a6ba 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 4.1 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= https://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile index aa977834b432..6ee0fd8ee0bd 100644 --- a/multimedia/ffmpeg0/Makefile +++ b/multimedia/ffmpeg0/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.17 -PORTREVISION= 15 +PORTREVISION= 16 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ diff --git a/multimedia/gstreamer-plugins-vp8/Makefile b/multimedia/gstreamer-plugins-vp8/Makefile index e0a6f60ffb70..7c5714d72021 100644 --- a/multimedia/gstreamer-plugins-vp8/Makefile +++ b/multimedia/gstreamer-plugins-vp8/Makefile @@ -1,7 +1,7 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia COMMENT= Gstreamer vp8 codec plugin diff --git a/multimedia/gstreamer1-plugins-good/files/patch-ext_vpx_gstvpxdec.c b/multimedia/gstreamer1-plugins-good/files/patch-ext_vpx_gstvpxdec.c new file mode 100644 index 000000000000..f9dc10912212 --- /dev/null +++ b/multimedia/gstreamer1-plugins-good/files/patch-ext_vpx_gstvpxdec.c @@ -0,0 +1,36 @@ +Regressed by https://chromium.googlesource.com/webm/libvpx/+/763f8318de2c%5E!/ + +gstvpxdec.c:65:15: error: use of undeclared identifier 'VP8_DEBUG_TXT_FRAME_INFO' + {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO), + ^ +gstvpxdec.c:68:15: error: use of undeclared identifier 'VP8_DEBUG_TXT_MBLK_MODES' + {C_FLAGS (VP8_DEBUG_TXT_MBLK_MODES), + ^ +gstvpxdec.c:71:15: error: use of undeclared identifier 'VP8_DEBUG_TXT_DC_DIFF' + {C_FLAGS (VP8_DEBUG_TXT_DC_DIFF), + ^ +gstvpxdec.c:74:15: error: use of undeclared identifier 'VP8_DEBUG_TXT_RATE_INFO' + {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO), + ^ + +--- ext/vpx/gstvpxdec.c.orig 2018-03-23 20:44:48 UTC ++++ ext/vpx/gstvpxdec.c +@@ -62,18 +62,6 @@ gst_vpx_dec_post_processing_flags_get_type (void) + {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"}, + {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"}, + {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"}, +- {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO), +- "Print frame information", +- "visualize-frame-info"}, +- {C_FLAGS (VP8_DEBUG_TXT_MBLK_MODES), +- "Show macroblock mode selection overlaid on image", +- "visualize-macroblock-modes"}, +- {C_FLAGS (VP8_DEBUG_TXT_DC_DIFF), +- "Show dc diff for each macro block overlaid on image", +- "visualize-dc-diff"}, +- {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO), +- "Print video rate info", +- "visualize-rate-info"}, + {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"}, + {0, NULL, NULL} + }; diff --git a/multimedia/gstreamer1-plugins-vpx/Makefile b/multimedia/gstreamer1-plugins-vpx/Makefile index 9ec5908a1f9c..6bfc3c68914e 100644 --- a/multimedia/gstreamer1-plugins-vpx/Makefile +++ b/multimedia/gstreamer1-plugins-vpx/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia COMMENT= GStreamer vp8 codec plugin diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index b1e0efbc0efe..5fda1912c38a 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -3,6 +3,7 @@ PORTNAME= handbrake DISTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= multimedia DIST_SUBDIR= ${PORTNAME} diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile index 4e07926a2610..1441e9a76cfa 100644 --- a/multimedia/libav/Makefile +++ b/multimedia/libav/Makefile @@ -2,6 +2,7 @@ PORTNAME= libav PORTVERSION= 12.3 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ diff --git a/multimedia/libav/files/patch-libavcodec_libvpx.c b/multimedia/libav/files/patch-libavcodec_libvpx.c new file mode 100644 index 000000000000..15f58b6e48d6 --- /dev/null +++ b/multimedia/libav/files/patch-libavcodec_libvpx.c @@ -0,0 +1,112 @@ +Regressed by https://chromium.googlesource.com/webm/libvpx/+/c9a459216dc3%5E!/ + +libavcodec/libvpx.c:28:10: error: use of undeclared identifier 'VPX_IMG_FMT_RGB24' + case VPX_IMG_FMT_RGB24: return AV_PIX_FMT_RGB24; + ^ +libavcodec/libvpx.c:29:10: error: use of undeclared identifier 'VPX_IMG_FMT_RGB565' + case VPX_IMG_FMT_RGB565: return AV_PIX_FMT_RGB565BE; + ^ +libavcodec/libvpx.c:30:10: error: use of undeclared identifier 'VPX_IMG_FMT_RGB555' + case VPX_IMG_FMT_RGB555: return AV_PIX_FMT_RGB555BE; + ^ +libavcodec/libvpx.c:31:10: error: use of undeclared identifier 'VPX_IMG_FMT_UYVY'; did you mean 'VPX_IMG_FMT_YV12'? + case VPX_IMG_FMT_UYVY: return AV_PIX_FMT_UYVY422; + ^~~~~~~~~~~~~~~~ +libavcodec/libvpx.c:32:10: error: use of undeclared identifier 'VPX_IMG_FMT_YUY2'; did you mean 'VPX_IMG_FMT_YV12'? + case VPX_IMG_FMT_YUY2: return AV_PIX_FMT_YUYV422; + ^~~~~~~~~~~~~~~~ +libavcodec/libvpx.c:33:10: error: use of undeclared identifier 'VPX_IMG_FMT_YVYU'; did you mean 'VPX_IMG_FMT_YV12'? + case VPX_IMG_FMT_YVYU: return AV_PIX_FMT_YVYU422; + ^~~~~~~~~~~~~~~~ +libavcodec/libvpx.c:34:10: error: use of undeclared identifier 'VPX_IMG_FMT_BGR24' + case VPX_IMG_FMT_BGR24: return AV_PIX_FMT_BGR24; + ^ +libavcodec/libvpx.c:35:10: error: use of undeclared identifier 'VPX_IMG_FMT_ARGB' + case VPX_IMG_FMT_ARGB: return AV_PIX_FMT_ARGB; + ^ +libavcodec/libvpx.c:36:10: error: use of undeclared identifier 'VPX_IMG_FMT_ARGB_LE'; did you mean 'VPX_IMG_FMT_NONE'? + case VPX_IMG_FMT_ARGB_LE: return AV_PIX_FMT_BGRA; + ^~~~~~~~~~~~~~~~~~~ +libavcodec/libvpx.c:37:10: error: use of undeclared identifier 'VPX_IMG_FMT_RGB565_LE'; did you mean 'AV_PIX_FMT_RGB565LE'? + case VPX_IMG_FMT_RGB565_LE: return AV_PIX_FMT_RGB565LE; + ^~~~~~~~~~~~~~~~~~~~~ +libavcodec/libvpx.c:38:10: error: use of undeclared identifier 'VPX_IMG_FMT_RGB555_LE' + case VPX_IMG_FMT_RGB555_LE: return AV_PIX_FMT_RGB555LE; + ^ +libavcodec/libvpx.c:42:10: error: use of undeclared identifier 'VPX_IMG_FMT_444A' + case VPX_IMG_FMT_444A: return AV_PIX_FMT_YUVA444P; + ^ +libavcodec/libvpx.c:32:10: error: duplicate case value 'VPX_IMG_FMT_YV12' + case VPX_IMG_FMT_YUY2: return AV_PIX_FMT_YUYV422; + ^ +libavcodec/libvpx.c:31:10: note: previous case defined here + case VPX_IMG_FMT_UYVY: return AV_PIX_FMT_UYVY422; + ^ +libavcodec/libvpx.c:33:10: error: duplicate case value 'VPX_IMG_FMT_YV12' + case VPX_IMG_FMT_YVYU: return AV_PIX_FMT_YVYU422; + ^ +libavcodec/libvpx.c:56:42: error: use of undeclared identifier 'VPX_IMG_FMT_RGB24' + case AV_PIX_FMT_RGB24: return VPX_IMG_FMT_RGB24; + ^ +libavcodec/libvpx.c:57:42: error: use of undeclared identifier 'VPX_IMG_FMT_RGB565' + case AV_PIX_FMT_RGB565BE: return VPX_IMG_FMT_RGB565; + ^ +libavcodec/libvpx.c:58:42: error: use of undeclared identifier 'VPX_IMG_FMT_RGB555' + case AV_PIX_FMT_RGB555BE: return VPX_IMG_FMT_RGB555; + ^ +libavcodec/libvpx.c:59:42: error: use of undeclared identifier 'VPX_IMG_FMT_UYVY'; did you mean 'VPX_IMG_FMT_YV12'? + case AV_PIX_FMT_UYVY422: return VPX_IMG_FMT_UYVY; + ^~~~~~~~~~~~~~~~ + VPX_IMG_FMT_YV12 +libavcodec/libvpx.c:60:42: error: use of undeclared identifier 'VPX_IMG_FMT_YUY2'; did you mean 'VPX_IMG_FMT_YV12'? + case AV_PIX_FMT_YUYV422: return VPX_IMG_FMT_YUY2; + ^~~~~~~~~~~~~~~~ + VPX_IMG_FMT_YV12 +fatal error: too many errors emitted, stopping now [-ferror-limit=] + +--- libavcodec/libvpx.c.orig 2018-02-12 21:25:59 UTC ++++ libavcodec/libvpx.c +@@ -25,6 +25,7 @@ + enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt_t img) + { + switch (img) { ++#if VPX_IMAGE_ABI_VERSION < 5 + case VPX_IMG_FMT_RGB24: return AV_PIX_FMT_RGB24; + case VPX_IMG_FMT_RGB565: return AV_PIX_FMT_RGB565BE; + case VPX_IMG_FMT_RGB555: return AV_PIX_FMT_RGB555BE; +@@ -36,10 +37,13 @@ enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt + case VPX_IMG_FMT_ARGB_LE: return AV_PIX_FMT_BGRA; + case VPX_IMG_FMT_RGB565_LE: return AV_PIX_FMT_RGB565LE; + case VPX_IMG_FMT_RGB555_LE: return AV_PIX_FMT_RGB555LE; ++#endif + case VPX_IMG_FMT_I420: return AV_PIX_FMT_YUV420P; + case VPX_IMG_FMT_I422: return AV_PIX_FMT_YUV422P; + case VPX_IMG_FMT_I444: return AV_PIX_FMT_YUV444P; ++#if VPX_IMAGE_ABI_VERSION < 5 + case VPX_IMG_FMT_444A: return AV_PIX_FMT_YUVA444P; ++#endif + #if VPX_IMAGE_ABI_VERSION >= 3 + case VPX_IMG_FMT_I440: return AV_PIX_FMT_YUV440P; + case VPX_IMG_FMT_I42016: return AV_PIX_FMT_YUV420P16BE; +@@ -53,6 +57,7 @@ enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt + vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelFormat pix) + { + switch (pix) { ++#if VPX_IMAGE_ABI_VERSION < 5 + case AV_PIX_FMT_RGB24: return VPX_IMG_FMT_RGB24; + case AV_PIX_FMT_RGB565BE: return VPX_IMG_FMT_RGB565; + case AV_PIX_FMT_RGB555BE: return VPX_IMG_FMT_RGB555; +@@ -64,10 +69,13 @@ vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelForm + case AV_PIX_FMT_BGRA: return VPX_IMG_FMT_ARGB_LE; + case AV_PIX_FMT_RGB565LE: return VPX_IMG_FMT_RGB565_LE; + case AV_PIX_FMT_RGB555LE: return VPX_IMG_FMT_RGB555_LE; ++#endif + case AV_PIX_FMT_YUV420P: return VPX_IMG_FMT_I420; + case AV_PIX_FMT_YUV422P: return VPX_IMG_FMT_I422; + case AV_PIX_FMT_YUV444P: return VPX_IMG_FMT_I444; ++#if VPX_IMAGE_ABI_VERSION < 5 + case AV_PIX_FMT_YUVA444P: return VPX_IMG_FMT_444A; ++#endif + #if VPX_IMAGE_ABI_VERSION >= 3 + case AV_PIX_FMT_YUV440P: return VPX_IMG_FMT_I440; + case AV_PIX_FMT_YUV420P16BE: return VPX_IMG_FMT_I42016; diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile index 609adf95a5e0..77ed156372b6 100644 --- a/multimedia/libvpx/Makefile +++ b/multimedia/libvpx/Makefile @@ -3,8 +3,7 @@ PORTNAME= libvpx DISTVERSIONPREFIX= v -DISTVERSION= 1.7.0 -PORTREVISION= 4 +DISTVERSION= 1.8.0 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo index 19ce8468e78d..d5be90627bf3 100644 --- a/multimedia/libvpx/distinfo +++ b/multimedia/libvpx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516832744 -SHA256 (webmproject-libvpx-v1.7.0_GH0.tar.gz) = 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238 -SIZE (webmproject-libvpx-v1.7.0_GH0.tar.gz) = 2679797 +TIMESTAMP = 1549299753 +SHA256 (webmproject-libvpx-v1.8.0_GH0.tar.gz) = 86df18c694e1c06cc8f83d2d816e9270747a0ce6abe316e93a4f4095689373f6 +SIZE (webmproject-libvpx-v1.8.0_GH0.tar.gz) = 2879302 diff --git a/multimedia/libvpx/files/patch-configure b/multimedia/libvpx/files/patch-configure index 0acba20fc0af..9891cc480b93 100644 --- a/multimedia/libvpx/files/patch-configure +++ b/multimedia/libvpx/files/patch-configure @@ -1,25 +1,26 @@ - Add missing targets when toolchain != generic-gnu - --version is a GNUism which BSD diff doesn't support +- Skip bogus NEON check when soft-enabled on armv6 ---- configure.orig 2018-01-24 22:25:44 UTC +--- configure.orig 2019-02-04 17:02:33 UTC +++ configure -@@ -101,6 +101,7 @@ EOF - all_platforms="${all_platforms} arm64-android-gcc" - all_platforms="${all_platforms} arm64-darwin-gcc" +@@ -103,6 +103,7 @@ all_platforms="${all_platforms} arm64-darwin-gcc" all_platforms="${all_platforms} arm64-linux-gcc" + all_platforms="${all_platforms} arm64-win64-gcc" + all_platforms="${all_platforms} arm64-win64-vs15" +all_platforms="${all_platforms} armv6-linux-gcc" all_platforms="${all_platforms} armv7-android-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 -@@ -116,6 +117,7 @@ all_platforms="${all_platforms} mips32-linux-gcc" +@@ -116,6 +117,7 @@ all_platforms="${all_platforms} armv8-linux-gcc" + all_platforms="${all_platforms} mips32-linux-gcc" all_platforms="${all_platforms} mips64-linux-gcc" - all_platforms="${all_platforms} ppc64-linux-gcc" all_platforms="${all_platforms} ppc64le-linux-gcc" +all_platforms="${all_platforms} sparc-linux-gcc" all_platforms="${all_platforms} sparc-solaris-gcc" all_platforms="${all_platforms} x86-android-gcc" all_platforms="${all_platforms} x86-darwin8-gcc" -@@ -170,7 +170,7 @@ for t in ${all_targets}; do +@@ -166,7 +168,7 @@ for t in ${all_targets}; do [ -f "${source_path}/${t}.mk" ] && enable_feature ${t} done @@ -28,3 +29,13 @@ die "diff missing: Try installing diffutils via your package manager." fi +@@ -591,9 +593,6 @@ EOF + + check_header vpx/vpx_integer.h -I${source_path} && enable_feature vpx_ports + +- if enabled neon && ! enabled external_build; then +- check_header arm_neon.h || die "Unable to find arm_neon.h" +- fi + } + + process_toolchain() { diff --git a/multimedia/libvpx/files/patch-mozilla-bug1480092 b/multimedia/libvpx/files/patch-mozilla-bug1480092 deleted file mode 100644 index 08863f8b0644..000000000000 --- a/multimedia/libvpx/files/patch-mozilla-bug1480092 +++ /dev/null @@ -1,13 +0,0 @@ -https://chromium.googlesource.com/webm/libvpx/+/52add5896661%5E!/ - ---- vp8/common/postproc.c.orig 2018-01-24 22:25:44 UTC -+++ vp8/common/postproc.c -@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BUFFER_CONFIG *s - double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; - int ppl = (int)(level + .5); - -- const MODE_INFO *mode_info_context = cm->show_frame_mi; -+ const MODE_INFO *mode_info_context = cm->mi; - int mbr, mbc; - - /* The pixel thresholds are adjusted according to if or not the macroblock diff --git a/multimedia/libvpx/pkg-plist b/multimedia/libvpx/pkg-plist index 575edfe73945..04684b3754af 100644 --- a/multimedia/libvpx/pkg-plist +++ b/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.5 -%%SHARED%%lib/libvpx.so.5.0 -%%SHARED%%lib/libvpx.so.5.0.0 +%%SHARED%%lib/libvpx.so.6 +%%SHARED%%lib/libvpx.so.6.0 +%%SHARED%%lib/libvpx.so.6.0.0 libdata/pkgconfig/vpx.pc diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 8e6026d8aed1..c0124f9a8c85 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -3,7 +3,7 @@ PORTNAME= xine PORTVERSION= 1.2.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION} PKGNAMEPREFIX= lib diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 3381be65e938..65891bbb761a 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -3,7 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 17a56abbd972..6e34f1d4fff6 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -3,7 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index ededf875b114..6d8f2674e32c 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 3.0.6 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ diff --git a/multimedia/vlc/files/patch-modules_codec_vpx.c b/multimedia/vlc/files/patch-modules_codec_vpx.c new file mode 100644 index 000000000000..4f338fb76e64 --- /dev/null +++ b/multimedia/vlc/files/patch-modules_codec_vpx.c @@ -0,0 +1,57 @@ +Regressed by https://chromium.googlesource.com/webm/libvpx/+/c9a459216dc3%5E!/ + +codec/vpx.c:119:23: error: use of undeclared identifier 'VPX_IMG_FMT_444A' + { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 }, + ^ +codec/vpx.c:120:23: error: use of undeclared identifier 'VPX_IMG_FMT_YUY2'; did you mean 'VPX_IMG_FMT_YV12'? + { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 }, + ^~~~~~~~~~~~~~~~ +codec/vpx.c:121:23: error: use of undeclared identifier 'VPX_IMG_FMT_UYVY'; did you mean 'VPX_IMG_FMT_YV12'? + { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 }, + ^~~~~~~~~~~~~~~~ +codec/vpx.c:122:23: error: use of undeclared identifier 'VPX_IMG_FMT_YVYU'; did you mean 'VPX_IMG_FMT_YV12'? + { VLC_CODEC_YVYU, VPX_IMG_FMT_YVYU, 8, 0 }, + ^~~~~~~~~~~~~~~~ +codec/vpx.c:124:24: error: use of undeclared identifier 'VPX_IMG_FMT_RGB555' + { VLC_CODEC_RGB15, VPX_IMG_FMT_RGB555, 8, 0 }, + ^ +codec/vpx.c:125:24: error: use of undeclared identifier 'VPX_IMG_FMT_RGB565' + { VLC_CODEC_RGB16, VPX_IMG_FMT_RGB565, 8, 0 }, + ^ +codec/vpx.c:126:24: error: use of undeclared identifier 'VPX_IMG_FMT_RGB24' + { VLC_CODEC_RGB24, VPX_IMG_FMT_RGB24, 8, 0 }, + ^ +codec/vpx.c:127:24: error: use of undeclared identifier 'VPX_IMG_FMT_RGB32' + { VLC_CODEC_RGB32, VPX_IMG_FMT_RGB32, 8, 0 }, + ^ +codec/vpx.c:129:23: error: use of undeclared identifier 'VPX_IMG_FMT_ARGB' + { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 }, + ^ +codec/vpx.c:130:23: error: use of undeclared identifier 'VPX_IMG_FMT_ARGB_LE'; did you mean 'VPX_IMG_FMT_NONE'? + { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 }, + ^~~~~~~~~~~~~~~~~~~ +codec/vpx.c:150:34: error: invalid application of 'sizeof' to an incomplete type 'const struct (anonymous struct at codec/vpx.c:104:14) []' + for( unsigned int i = 0; i < ARRAY_SIZE(chroma_table); i++ ) + ^~~~~~~~~~~~~~~~~~~~~~~~ + +--- modules/codec/vpx.c.orig 2018-03-29 12:04:52 UTC ++++ modules/codec/vpx.c +@@ -116,18 +116,6 @@ static const struct + { VLC_CODEC_I440, VPX_IMG_FMT_I440, 8, 0 }, + + { VLC_CODEC_YV12, VPX_IMG_FMT_YV12, 8, 0 }, +- { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 }, +- { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 }, +- { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 }, +- { VLC_CODEC_YVYU, VPX_IMG_FMT_YVYU, 8, 0 }, +- +- { VLC_CODEC_RGB15, VPX_IMG_FMT_RGB555, 8, 0 }, +- { VLC_CODEC_RGB16, VPX_IMG_FMT_RGB565, 8, 0 }, +- { VLC_CODEC_RGB24, VPX_IMG_FMT_RGB24, 8, 0 }, +- { VLC_CODEC_RGB32, VPX_IMG_FMT_RGB32, 8, 0 }, +- +- { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 }, +- { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 }, + + { VLC_CODEC_GBR_PLANAR, VPX_IMG_FMT_I444, 8, 1 }, + { VLC_CODEC_GBR_PLANAR_10L, VPX_IMG_FMT_I44416, 10, 1 }, diff --git a/net-im/py-toxcore-c/Makefile b/net-im/py-toxcore-c/Makefile index 091bd03c85e0..7833f559f8d0 100644 --- a/net-im/py-toxcore-c/Makefile +++ b/net-im/py-toxcore-c/Makefile @@ -4,7 +4,7 @@ PORTNAME= toxcore-c DISTVERSIONPREFIX= v DISTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net-im net-p2p python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile index a0d34b21c0e3..3329c0eeae9e 100644 --- a/net-im/qTox/Makefile +++ b/net-im/qTox/Makefile @@ -4,7 +4,7 @@ PORTNAME= qTox DISTVERSIONPREFIX= v DISTVERSION= 1.16.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-im net-p2p MAINTAINER= yuri@FreeBSD.org diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile index 84fd830ef5c3..8029fe99200b 100644 --- a/net-im/tox/Makefile +++ b/net-im/tox/Makefile @@ -4,6 +4,7 @@ PORTNAME= toxcore PORTVERSION= 0.2.9 DISTVERSIONPREFIX= v +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-im net-p2p diff --git a/net-im/toxic/Makefile b/net-im/toxic/Makefile index 88bebec6d3ca..8ef143c66727 100644 --- a/net-im/toxic/Makefile +++ b/net-im/toxic/Makefile @@ -4,6 +4,7 @@ PORTNAME= toxic PORTVERSION= 0.8.3 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= net-im MAINTAINER= thierry@FreeBSD.org diff --git a/net-im/uTox/Makefile b/net-im/uTox/Makefile index ded9f2faa30f..a0d58363cb95 100644 --- a/net-im/uTox/Makefile +++ b/net-im/uTox/Makefile @@ -3,7 +3,7 @@ PORTNAME= uTox DISTVERSION= 0.17.0 DISTVERSIONSUFFIX= -full -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-im net-p2p MASTER_SITES= https://github.com/uTox/uTox/releases/download/v${PORTVERSION}/ diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile index 6d48c2b964c1..7465e9d1bd21 100644 --- a/net/mediastreamer/Makefile +++ b/net/mediastreamer/Makefile @@ -3,7 +3,7 @@ PORTNAME= mediastreamer PORTVERSION= 2.16.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://www.linphone.org/releases/sources/mediastreamer/ diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile index ddc4e34b74f3..d7940678c4d3 100644 --- a/www/cliqz/Makefile +++ b/www/cliqz/Makefile @@ -2,6 +2,7 @@ PORTNAME= cliqz DISTVERSION= 1.24.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \ http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index ee7d1cf98c4c..4693d17b2664 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 60.5.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ @@ -34,7 +34,7 @@ USE_GECKO= gecko CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS_INSTALL= firefox MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -webp +USE_MOZILLA= -webp -vpx USES= tar:xz diff --git a/www/firefox/Makefile b/www/firefox/Makefile index ac12ba1a15b0..b2a6046e62fc 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 65.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -32,7 +32,7 @@ BUILD_DEPENDS= nspr>=4.19:devel/nspr \ USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -hunspell +USE_MOZILLA= -hunspell -vpx USES= tar:xz diff --git a/www/palemoon/Makefile b/www/palemoon/Makefile index 04f7abeb0691..d9ee557139e3 100644 --- a/www/palemoon/Makefile +++ b/www/palemoon/Makefile @@ -4,7 +4,7 @@ PORTNAME= palemoon DISTVERSION= 27.9.4 DISTVERSIONSUFFIX=_Release -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www ipv6 MAINTAINER= lichray@gmail.com diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index ba571be5b907..f1506c4bbd11 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -3,7 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.49.4 -PORTREVISION= 22 +PORTREVISION= 23 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile index 360fa84f5425..db766dd96046 100644 --- a/x11/xpra/Makefile +++ b/x11/xpra/Makefile @@ -2,6 +2,7 @@ PORTNAME= xpra PORTVERSION= 2.4.3 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/ |