sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

multimedia/libvpx: update to 1.4.0

Browse source 
ABI isn't compatible, so bump PORTREVISION in consumers.

Changes:	https://chromium.googlesource.com/webm/libvpx/+/v1.4.0
Differential Revision:	https://reviews.freebsd.org/D2570
Exp-run by:	antoine
Approved by:	ashish, multimedia (kwm)
Approved by:	maintainer timeout (ale, dinoex; 2 weeks)
This commit is contained in:
Jan Beich 2015-06-09 14:25:41 +00:00
parent 6828ea7d03
commit f2fc9d6de4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=388940
42 changed files with 443 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
emulators/virtualbox-ose/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= virtualbox-ose
DISTVERSION= 4.3.28
PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
http://tmp.chruetertee.ch/ \

1
games/openbor/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= openbor
PORTVERSION= 3.0.r4163
PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= LOCAL/jbeich \
https://svn.code.sf.net/p/${PORTNAME}/engine/engine/:svn

2
graphics/gd/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= libgd
PORTVERSION= 2.1.0
PORTREVISION?= 5
PORTREVISION?= 6
PORTEPOCH= 1
CATEGORIES+= graphics
MASTER_SITES= https://bitbucket.org/libgd/gd-libgd/downloads/ \

29
graphics/gd/files/patch-webpimg.c Normal file
View file

@ -0,0 +1,29 @@
Adjust to libvpx 1.4.0 until the code is removed.
https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d%5E!/
https://bitbucket.org/libgd/gd-libgd/commits/824a3aa
--- src/webpimg.c.orig 2013-06-25 09:58:23 UTC
+++ src/webpimg.c
@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8*
codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
- vpx_img_wrap(&img, IMG_FMT_I420,
+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
y_width, y_height, 16, (uint8*)(Y));
- img.planes[PLANE_Y] = (uint8*)(Y);
- img.planes[PLANE_U] = (uint8*)(U);
- img.planes[PLANE_V] = (uint8*)(V);
- img.stride[PLANE_Y] = y_stride;
- img.stride[PLANE_U] = uv_stride;
- img.stride[PLANE_V] = uv_stride;
+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
+ img.planes[VPX_PLANE_U] = (uint8*)(U);
+ img.planes[VPX_PLANE_V] = (uint8*)(V);
+ img.stride[VPX_PLANE_Y] = y_stride;
+ img.stride[VPX_PLANE_U] = uv_stride;
+ img.stride[VPX_PLANE_V] = uv_stride;
res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);

1
graphics/php5-gd/Makefile
View file

@ -1,6 +1,7 @@
# Created by: Alex Dupre <ale@FreeBSD.org>
# $FreeBSD$
PORTREVISION= 1
CATEGORIES= graphics
MASTERDIR= ${.CURDIR}/../../lang/php5

29
graphics/php5-gd/files/patch-libgd_webpimg.c Normal file
View file

@ -0,0 +1,29 @@
Adjust to libvpx 1.4.0 until the code is removed.
https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d%5E!/
https://bitbucket.org/libgd/gd-libgd/commits/824a3aa
--- libgd/webpimg.c.orig 2013-06-25 09:58:23 UTC
+++ libgd/webpimg.c
@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8*
codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
- vpx_img_wrap(&img, IMG_FMT_I420,
+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
y_width, y_height, 16, (uint8*)(Y));
- img.planes[PLANE_Y] = (uint8*)(Y);
- img.planes[PLANE_U] = (uint8*)(U);
- img.planes[PLANE_V] = (uint8*)(V);
- img.stride[PLANE_Y] = y_stride;
- img.stride[PLANE_U] = uv_stride;
- img.stride[PLANE_V] = uv_stride;
+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
+ img.planes[VPX_PLANE_U] = (uint8*)(U);
+ img.planes[VPX_PLANE_V] = (uint8*)(V);
+ img.stride[VPX_PLANE_Y] = y_stride;
+ img.stride[VPX_PLANE_U] = uv_stride;
+ img.stride[VPX_PLANE_V] = uv_stride;
res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);

1
graphics/php55-gd/Makefile
View file

@ -1,6 +1,7 @@
# Created by: Alex Dupre <ale@FreeBSD.org>
# $FreeBSD$
PORTREVISION= 1
CATEGORIES= graphics
MASTERDIR= ${.CURDIR}/../../lang/php55

29
graphics/php55-gd/files/patch-libgd_webpimg.c Normal file
View file

@ -0,0 +1,29 @@
Adjust to libvpx 1.4.0 until the code is removed.
https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d%5E!/
https://bitbucket.org/libgd/gd-libgd/commits/824a3aa
--- libgd/webpimg.c.orig 2013-06-25 09:58:23 UTC
+++ libgd/webpimg.c
@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8*
codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
- vpx_img_wrap(&img, IMG_FMT_I420,
+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
y_width, y_height, 16, (uint8*)(Y));
- img.planes[PLANE_Y] = (uint8*)(Y);
- img.planes[PLANE_U] = (uint8*)(U);
- img.planes[PLANE_V] = (uint8*)(V);
- img.stride[PLANE_Y] = y_stride;
- img.stride[PLANE_U] = uv_stride;
- img.stride[PLANE_V] = uv_stride;
+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
+ img.planes[VPX_PLANE_U] = (uint8*)(U);
+ img.planes[VPX_PLANE_V] = (uint8*)(V);
+ img.stride[VPX_PLANE_Y] = y_stride;
+ img.stride[VPX_PLANE_U] = uv_stride;
+ img.stride[VPX_PLANE_V] = uv_stride;
res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);

1
graphics/php56-gd/Makefile
View file

@ -1,6 +1,7 @@
# Created by: Alex Dupre <ale@FreeBSD.org>
# $FreeBSD$
PORTREVISION= 1
CATEGORIES= graphics
MASTERDIR= ${.CURDIR}/../../lang/php56

29
graphics/php56-gd/files/patch-libgd_webpimg.c Normal file
View file

@ -0,0 +1,29 @@
Adjust to libvpx 1.4.0 until the code is removed.
https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d%5E!/
https://bitbucket.org/libgd/gd-libgd/commits/824a3aa
--- libgd/webpimg.c.orig 2013-06-25 09:58:23 UTC
+++ libgd/webpimg.c
@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8*
codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
- vpx_img_wrap(&img, IMG_FMT_I420,
+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
y_width, y_height, 16, (uint8*)(Y));
- img.planes[PLANE_Y] = (uint8*)(Y);
- img.planes[PLANE_U] = (uint8*)(U);
- img.planes[PLANE_V] = (uint8*)(V);
- img.stride[PLANE_Y] = y_stride;
- img.stride[PLANE_U] = uv_stride;
- img.stride[PLANE_V] = uv_stride;
+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
+ img.planes[VPX_PLANE_U] = (uint8*)(U);
+ img.planes[VPX_PLANE_V] = (uint8*)(V);
+ img.stride[VPX_PLANE_Y] = y_stride;
+ img.stride[VPX_PLANE_U] = uv_stride;
+ img.stride[VPX_PLANE_V] = uv_stride;
res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);

1
mail/thunderbird/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 31.7.0
PORTREVISION= 1
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source

78
mail/thunderbird/files/patch-bug1067377 Normal file
View file

@ -0,0 +1,78 @@
diff --git content/media/encoder/VP8TrackEncoder.cpp content/media/encoder/VP8TrackEncoder.cpp
index 452821c..ede21c5 100644
--- mozilla/content/media/encoder/VP8TrackEncoder.cpp
+++ mozilla/content/media/encoder/VP8TrackEncoder.cpp
@@ -84,7 +84,7 @@ VP8TrackEncoder::Init(int32_t aWidth, int32_t aHeight, int32_t aDisplayWidth,
// Creating a wrapper to the image - setting image data to NULL. Actual
// pointer will be set in encode. Setting align to 1, as it is meaningless
// (actual memory is not allocated).
- vpx_img_wrap(mVPXImageWrapper, IMG_FMT_I420,
+ vpx_img_wrap(mVPXImageWrapper, VPX_IMG_FMT_I420,
mFrameWidth, mFrameHeight, 1, nullptr);
config.g_w = mFrameWidth;
@@ -239,9 +239,9 @@ void VP8TrackEncoder::PrepareMutedFrame()
uint8_t *cb = mMuteFrame.Elements() + yPlaneSize;
uint8_t *cr = mMuteFrame.Elements() + yPlaneSize + uvPlaneSize;
- mVPXImageWrapper->planes[PLANE_Y] = y;
- mVPXImageWrapper->planes[PLANE_U] = cb;
- mVPXImageWrapper->planes[PLANE_V] = cr;
+ mVPXImageWrapper->planes[VPX_PLANE_Y] = y;
+ mVPXImageWrapper->planes[VPX_PLANE_U] = cb;
+ mVPXImageWrapper->planes[VPX_PLANE_V] = cr;
mVPXImageWrapper->stride[VPX_PLANE_Y] = mFrameWidth;
mVPXImageWrapper->stride[VPX_PLANE_U] = halfWidth;
mVPXImageWrapper->stride[VPX_PLANE_V] = halfWidth;
@@ -297,9 +297,9 @@ nsresult VP8TrackEncoder::PrepareRawFrame(VideoChunk &aChunk)
const PlanarYCbCrImage::Data *data = yuv->GetData();
if (isYUV420(data) && !data->mCbSkip) { // 420 planar
- mVPXImageWrapper->planes[PLANE_Y] = data->mYChannel;
- mVPXImageWrapper->planes[PLANE_U] = data->mCbChannel;
- mVPXImageWrapper->planes[PLANE_V] = data->mCrChannel;
+ mVPXImageWrapper->planes[VPX_PLANE_Y] = data->mYChannel;
+ mVPXImageWrapper->planes[VPX_PLANE_U] = data->mCbChannel;
+ mVPXImageWrapper->planes[VPX_PLANE_V] = data->mCrChannel;
mVPXImageWrapper->stride[VPX_PLANE_Y] = data->mYStride;
mVPXImageWrapper->stride[VPX_PLANE_U] = data->mCbCrStride;
mVPXImageWrapper->stride[VPX_PLANE_V] = data->mCbCrStride;
@@ -355,9 +355,9 @@ nsresult VP8TrackEncoder::PrepareRawFrame(VideoChunk &aChunk)
return NS_ERROR_NOT_IMPLEMENTED;
}
- mVPXImageWrapper->planes[PLANE_Y] = y;
- mVPXImageWrapper->planes[PLANE_U] = cb;
- mVPXImageWrapper->planes[PLANE_V] = cr;
+ mVPXImageWrapper->planes[VPX_PLANE_Y] = y;
+ mVPXImageWrapper->planes[VPX_PLANE_U] = cb;
+ mVPXImageWrapper->planes[VPX_PLANE_V] = cr;
mVPXImageWrapper->stride[VPX_PLANE_Y] = mFrameWidth;
mVPXImageWrapper->stride[VPX_PLANE_U] = halfWidth;
mVPXImageWrapper->stride[VPX_PLANE_V] = halfWidth;
diff --git media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
index d9c3a22..75195ae 100644
--- mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+++ mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
@@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst,
// Creating a wrapper to the image - setting image data to NULL. Actual
// pointer will be set in encode. Setting align to 1, as it is meaningless
// (actual memory is not allocated).
- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height,
+ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height,
1, NULL);
// populate encoder configuration with default values
if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) {
@@ -349,9 +349,9 @@ int VP8EncoderImpl::Encode(const I420VideoFrame& input_image,
}
// Image in vpx_image_t format.
// Input image is const. VP8's raw image is not defined as const.
- raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
+ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
+ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
+ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
// TODO(mikhal): Stride should be set in initialization.
raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);

2
multimedia/avidemux2/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= avidemux2
PORTVERSION= ${AVIDEMUX2_VERSION}
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= multimedia
MAINTAINER= multimedia@FreeBSD.org

1
multimedia/avidemux26/Makefile
View file

@ -6,6 +6,7 @@
PORTNAME= avidemux26
PORTVERSION= ${AVIDEMUX2_VERSION}
PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= multimedia@FreeBSD.org

2
multimedia/ffmpeg/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 2.3.6
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/

2
multimedia/ffmpeg0/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 0.7.16
PORTREVISION= 5
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/

2
multimedia/ffmpeg26/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 2.6.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
PKGNAMESUFFIX= 26

40
multimedia/gstreamer-plugins-bad/files/patch-ext_vp8_gstvp8utils.h Normal file
View file

@ -0,0 +1,40 @@
commit 130873c
Author: Aurélien Zanelli <aurelien.zanelli@darkosphere.fr>
Date: Sat Nov 1 12:18:02 2014 +0100
vpx: remove compatibility defines
We are guaranteed to have VPX_IMG_FMT_I420, VPX_PLANE_Y,
VPX_PLANE_U and VPX_PLANE_V as we require libvpx > 1.1.0.
https://bugzilla.gnome.org/show_bug.cgi?id=739476
---
ext/vpx/gstvp8utils.h | 17 -----------------
1 file changed, 17 deletions(-)
--- ext/vp8/gstvp8utils.h.orig 2011-12-11 18:49:11 UTC
+++ ext/vp8/gstvp8utils.h
@@ -25,23 +25,6 @@
G_BEGIN_DECLS
-/* Some compatibility defines for older libvpx versions */
-#ifndef VPX_IMG_FMT_I420
-#define VPX_IMG_FMT_I420 IMG_FMT_I420
-#endif
-
-#ifndef VPX_PLANE_Y
-#define VPX_PLANE_Y PLANE_Y
-#endif
-
-#ifndef VPX_PLANE_U
-#define VPX_PLANE_U PLANE_U
-#endif
-
-#ifndef VPX_PLANE_V
-#define VPX_PLANE_V PLANE_V
-#endif
-
const char * gst_vpx_error_name (vpx_codec_err_t status);
G_END_DECLS

2
multimedia/gstreamer-plugins-vp8/Makefile
View file

@ -1,7 +1,7 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= multimedia
COMMENT= Gstreamer vp8 codec plugin

1
multimedia/gstreamer-plugins/Makefile.common
View file

@ -578,6 +578,7 @@ gst_vorbis_PLIST_FILES= ${GST_LIB_DIR}/libgstvorbis.la \
gst_vorbis_DIST= base
# vp8
gst_vp8_BUILD_DEPENDS+= libvpx>=1.1.0:${PORTSDIR}/multimedia/libvpx
gst_vp8_LIB_DEPENDS+= libvpx.so:${PORTSDIR}/multimedia/libvpx
gst_vp8_PLIST_FILES= ${GST_LIB_DIR}/libgstvp8.la \
${GST_LIB_DIR}/libgstvp8.so

2
multimedia/gstreamer1-plugins-vpx/Makefile
View file

@ -1,6 +1,6 @@
# $FreeBSD$
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer vp8 codec plugin

2
multimedia/handbrake/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= handbrake
PORTVERSION= 0.10.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://download.handbrake.fr/releases/${PORTVERSION}/ \
http://download.handbrake.fr/handbrake/contrib/:contrib \

1
multimedia/libav/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= libav
PORTVERSION= 11.3
PORTREVISION= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://libav.org/releases/

3
multimedia/libvpx/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libvpx
PORTVERSION= 1.3.0
PORTREVISION= 1
PORTVERSION= 1.4.0
CATEGORIES= multimedia
MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${DISTVERSION}.orig

4
multimedia/libvpx/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (libvpx_1.3.0.orig.tar.bz2) = bd5af97b74d53a111b48852dfcd1791b2c758f1fe972833b363fe34a83a7750a
SIZE (libvpx_1.3.0.orig.tar.bz2) = 2077846
SHA256 (libvpx_1.4.0.orig.tar.bz2) = f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4
SIZE (libvpx_1.4.0.orig.tar.bz2) = 1807989

43
multimedia/libvpx/files/patch-build_make_configure.sh
View file

@ -1,31 +1,18 @@
--- build/make/configure.sh.orig 2014-11-27 18:00:48 UTC
--- build/make/configure.sh.orig 2015-04-03 18:49:19 UTC
+++ build/make/configure.sh
@@ -799,7 +799,6 @@ process_common_toolchain() {
@@ -379,6 +379,7 @@ write_common_config_banner() {
print_webm_license config.mk "##" ""
echo '# This file automatically generated by configure. Do not edit!' >> config.mk
echo "TOOLCHAIN := ${toolchain}" >> config.mk
+ echo "CLANG_NO_IAS=${CLANG_NO_IAS}" >> config.mk
case ${tgt_cc} in
case ${toolchain} in
*-linux-rvct)
@@ -831,7 +832,6 @@ process_common_toolchain() {
case ${tgt_cc} in
gcc)
- CROSS=${CROSS:-arm-none-linux-gnueabi-}
link_with_cc=gcc
setup_gnu_toolchain
arch_int=${tgt_isa##armv}
$FreeBSD$
--- build/make/configure.sh.orig 2014-12-03 18:11:14.000000000 +0100
+++ build/make/configure.sh 2014-12-03 20:20:00.000000000 +0100
@@ -382,6 +382,7 @@
print_webm_license config.mk "##" ""
echo '# This file automatically generated by configure. Do not edit!' >> config.mk
echo "TOOLCHAIN := ${toolchain}" >> config.mk
+ echo "CLANG_NO_IAS=${CLANG_NO_IAS}" >> config.mk
case ${toolchain} in
*-linux-rvct)
@@ -1019,7 +1019,7 @@ EOF
bits=32
enabled x86_64 && bits=64
check_cpp <<EOF && bits=x32
-#ifndef __ILP32__
+#if !defined(__ILP32__) || !defined(__x86_64__)
#error "not x32"
#endif
EOF
- CROSS=${CROSS:-arm-none-linux-gnueabi-}
link_with_cc=gcc
setup_gnu_toolchain
arch_int=${tgt_isa##armv}

4
multimedia/libvpx/files/patch-configure
View file

@ -1,9 +1,9 @@
--- configure.orig
+++ configure
@@ -149,6 +149,7 @@
all_platforms="${all_platforms} universal-darwin11-gcc"
@@ -164,6 +164,7 @@ all_platforms="${all_platforms} universa
all_platforms="${all_platforms} universal-darwin12-gcc"
all_platforms="${all_platforms} universal-darwin13-gcc"
all_platforms="${all_platforms} universal-darwin14-gcc"
+all_platforms="${all_platforms} ia64-linux-gcc"
all_platforms="${all_platforms} generic-gnu"

31
multimedia/libvpx/files/patch-nestegg_halloc_src
View file

@ -1,31 +0,0 @@
$FreeBSD$
Fix build on modern gcc which defines max_align_t for C11
It renames the locale definition to avoid the name clash.
--- nestegg/halloc/src/align.h.orig
+++ nestegg/halloc/src/align.h
@@ -30,7 +30,7 @@
void (*q)(void);
};
-typedef union max_align max_align_t;
+typedef union max_align halloc_max_align_t;
#endif
$FreeBSD$
--- nestegg/halloc/src/halloc.c.orig
+++ nestegg/halloc/src/halloc.c
@@ -30,7 +30,7 @@
#endif
hlist_item_t siblings; /* 2 pointers */
hlist_head_t children; /* 1 pointer */
- max_align_t data[1]; /* not allocated, see below */
+ halloc_max_align_t data[1]; /* not allocated, see below */
} hblock_t;

12
multimedia/libvpx/pkg-plist
View file

@ -1,19 +1,17 @@
bin/vpxdec
bin/vpxenc
bin/vp8_scalable_patterns
bin/vp9_spatial_scalable_encoder
include/vpx/svc_context.h
include/vpx/vp8.h
include/vpx/vp8cx.h
include/vpx/vp8dx.h
include/vpx/vpx_codec.h
include/vpx/vpx_decoder.h
include/vpx/vpx_encoder.h
include/vpx/vpx_frame_buffer.h
include/vpx/vpx_image.h
include/vpx/vpx_integer.h
lib/libvpx.a
libdata/pkgconfig/vpx.pc
%%SHARED%%lib/libvpx.so
%%SHARED%%lib/libvpx.so.1
%%SHARED%%lib/libvpx.so.1.3
%%SHARED%%lib/libvpx.so.1.3.0
%%SHARED%%lib/libvpx.so.2
%%SHARED%%lib/libvpx.so.2.0
%%SHARED%%lib/libvpx.so.2.0.0
libdata/pkgconfig/vpx.pc

2
multimedia/mplayer/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}
PORTREVISION= 1
PORTREVISION= 2
COMMENT= High performance media player supporting many formats

2
net-im/qTox/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= qTox
PORTVERSION= 0.150426
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net-im net-p2p
MAINTAINER= yuri@rawbw.com

1
net-im/tox/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= toxcore
PORTVERSION= 0.150519
PORTREVISION= 1
CATEGORIES= net-im net-p2p
MAINTAINER= thierry@FreeBSD.org

1
net-im/toxic/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= toxic
PORTVERSION= 0.6.0.150519
PORTREVISION= 1
CATEGORIES= net-im
MAINTAINER= thierry@FreeBSD.org

1
net-im/uTox/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= uTox
DISTVERSION= 0.2.s.20150514
PORTREVISION= 1
CATEGORIES= net-im net-p2p
MAINTAINER= fidaj@ukr.net

2
net/mediastreamer/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= mediastreamer
PORTVERSION= 2.11.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SAVANNAH/linphone/mediastreamer

1
www/firefox-esr/Makefile
View file

@ -4,6 +4,7 @@
PORTNAME= firefox
DISTVERSION= 31.7.0
DISTVERSIONSUFFIX=esr.source
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \

78
www/firefox-esr/files/patch-bug1067377 Normal file
View file

@ -0,0 +1,78 @@
diff --git content/media/encoder/VP8TrackEncoder.cpp content/media/encoder/VP8TrackEncoder.cpp
index 452821c..ede21c5 100644
--- content/media/encoder/VP8TrackEncoder.cpp
+++ content/media/encoder/VP8TrackEncoder.cpp
@@ -84,7 +84,7 @@ VP8TrackEncoder::Init(int32_t aWidth, int32_t aHeight, int32_t aDisplayWidth,
// Creating a wrapper to the image - setting image data to NULL. Actual
// pointer will be set in encode. Setting align to 1, as it is meaningless
// (actual memory is not allocated).
- vpx_img_wrap(mVPXImageWrapper, IMG_FMT_I420,
+ vpx_img_wrap(mVPXImageWrapper, VPX_IMG_FMT_I420,
mFrameWidth, mFrameHeight, 1, nullptr);
config.g_w = mFrameWidth;
@@ -239,9 +239,9 @@ void VP8TrackEncoder::PrepareMutedFrame()
uint8_t *cb = mMuteFrame.Elements() + yPlaneSize;
uint8_t *cr = mMuteFrame.Elements() + yPlaneSize + uvPlaneSize;
- mVPXImageWrapper->planes[PLANE_Y] = y;
- mVPXImageWrapper->planes[PLANE_U] = cb;
- mVPXImageWrapper->planes[PLANE_V] = cr;
+ mVPXImageWrapper->planes[VPX_PLANE_Y] = y;
+ mVPXImageWrapper->planes[VPX_PLANE_U] = cb;
+ mVPXImageWrapper->planes[VPX_PLANE_V] = cr;
mVPXImageWrapper->stride[VPX_PLANE_Y] = mFrameWidth;
mVPXImageWrapper->stride[VPX_PLANE_U] = halfWidth;
mVPXImageWrapper->stride[VPX_PLANE_V] = halfWidth;
@@ -297,9 +297,9 @@ nsresult VP8TrackEncoder::PrepareRawFrame(VideoChunk &aChunk)
const PlanarYCbCrImage::Data *data = yuv->GetData();
if (isYUV420(data) && !data->mCbSkip) { // 420 planar
- mVPXImageWrapper->planes[PLANE_Y] = data->mYChannel;
- mVPXImageWrapper->planes[PLANE_U] = data->mCbChannel;
- mVPXImageWrapper->planes[PLANE_V] = data->mCrChannel;
+ mVPXImageWrapper->planes[VPX_PLANE_Y] = data->mYChannel;
+ mVPXImageWrapper->planes[VPX_PLANE_U] = data->mCbChannel;
+ mVPXImageWrapper->planes[VPX_PLANE_V] = data->mCrChannel;
mVPXImageWrapper->stride[VPX_PLANE_Y] = data->mYStride;
mVPXImageWrapper->stride[VPX_PLANE_U] = data->mCbCrStride;
mVPXImageWrapper->stride[VPX_PLANE_V] = data->mCbCrStride;
@@ -355,9 +355,9 @@ nsresult VP8TrackEncoder::PrepareRawFrame(VideoChunk &aChunk)
return NS_ERROR_NOT_IMPLEMENTED;
}
- mVPXImageWrapper->planes[PLANE_Y] = y;
- mVPXImageWrapper->planes[PLANE_U] = cb;
- mVPXImageWrapper->planes[PLANE_V] = cr;
+ mVPXImageWrapper->planes[VPX_PLANE_Y] = y;
+ mVPXImageWrapper->planes[VPX_PLANE_U] = cb;
+ mVPXImageWrapper->planes[VPX_PLANE_V] = cr;
mVPXImageWrapper->stride[VPX_PLANE_Y] = mFrameWidth;
mVPXImageWrapper->stride[VPX_PLANE_U] = halfWidth;
mVPXImageWrapper->stride[VPX_PLANE_V] = halfWidth;
diff --git media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
index d9c3a22..75195ae 100644
--- media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+++ media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
@@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst,
// Creating a wrapper to the image - setting image data to NULL. Actual
// pointer will be set in encode. Setting align to 1, as it is meaningless
// (actual memory is not allocated).
- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height,
+ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height,
1, NULL);
// populate encoder configuration with default values
if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) {
@@ -349,9 +349,9 @@ int VP8EncoderImpl::Encode(const I420VideoFrame& input_image,
}
// Image in vpx_image_t format.
// Input image is const. VP8's raw image is not defined as const.
- raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
+ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
+ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
+ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
// TODO(mikhal): Stride should be set in initialization.
raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);

1
www/firefox/Makefile
View file

@ -4,6 +4,7 @@
PORTNAME= firefox
DISTVERSION= 38.0.5
DISTVERSIONSUFFIX=.source
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

1
www/libxul/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= libxul
DISTVERSION= 31.7.0
PORTREVISION= 1
CATEGORIES?= www devel
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \
MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source

78
www/libxul/files/patch-bug1067377 Normal file
View file

@ -0,0 +1,78 @@
diff --git content/media/encoder/VP8TrackEncoder.cpp content/media/encoder/VP8TrackEncoder.cpp
index 452821c..ede21c5 100644
--- content/media/encoder/VP8TrackEncoder.cpp
+++ content/media/encoder/VP8TrackEncoder.cpp
@@ -84,7 +84,7 @@ VP8TrackEncoder::Init(int32_t aWidth, int32_t aHeight, int32_t aDisplayWidth,
// Creating a wrapper to the image - setting image data to NULL. Actual
// pointer will be set in encode. Setting align to 1, as it is meaningless
// (actual memory is not allocated).
- vpx_img_wrap(mVPXImageWrapper, IMG_FMT_I420,
+ vpx_img_wrap(mVPXImageWrapper, VPX_IMG_FMT_I420,
mFrameWidth, mFrameHeight, 1, nullptr);
config.g_w = mFrameWidth;
@@ -239,9 +239,9 @@ void VP8TrackEncoder::PrepareMutedFrame()
uint8_t *cb = mMuteFrame.Elements() + yPlaneSize;
uint8_t *cr = mMuteFrame.Elements() + yPlaneSize + uvPlaneSize;
- mVPXImageWrapper->planes[PLANE_Y] = y;
- mVPXImageWrapper->planes[PLANE_U] = cb;
- mVPXImageWrapper->planes[PLANE_V] = cr;
+ mVPXImageWrapper->planes[VPX_PLANE_Y] = y;
+ mVPXImageWrapper->planes[VPX_PLANE_U] = cb;
+ mVPXImageWrapper->planes[VPX_PLANE_V] = cr;
mVPXImageWrapper->stride[VPX_PLANE_Y] = mFrameWidth;
mVPXImageWrapper->stride[VPX_PLANE_U] = halfWidth;
mVPXImageWrapper->stride[VPX_PLANE_V] = halfWidth;
@@ -297,9 +297,9 @@ nsresult VP8TrackEncoder::PrepareRawFrame(VideoChunk &aChunk)
const PlanarYCbCrImage::Data *data = yuv->GetData();
if (isYUV420(data) && !data->mCbSkip) { // 420 planar
- mVPXImageWrapper->planes[PLANE_Y] = data->mYChannel;
- mVPXImageWrapper->planes[PLANE_U] = data->mCbChannel;
- mVPXImageWrapper->planes[PLANE_V] = data->mCrChannel;
+ mVPXImageWrapper->planes[VPX_PLANE_Y] = data->mYChannel;
+ mVPXImageWrapper->planes[VPX_PLANE_U] = data->mCbChannel;
+ mVPXImageWrapper->planes[VPX_PLANE_V] = data->mCrChannel;
mVPXImageWrapper->stride[VPX_PLANE_Y] = data->mYStride;
mVPXImageWrapper->stride[VPX_PLANE_U] = data->mCbCrStride;
mVPXImageWrapper->stride[VPX_PLANE_V] = data->mCbCrStride;
@@ -355,9 +355,9 @@ nsresult VP8TrackEncoder::PrepareRawFrame(VideoChunk &aChunk)
return NS_ERROR_NOT_IMPLEMENTED;
}
- mVPXImageWrapper->planes[PLANE_Y] = y;
- mVPXImageWrapper->planes[PLANE_U] = cb;
- mVPXImageWrapper->planes[PLANE_V] = cr;
+ mVPXImageWrapper->planes[VPX_PLANE_Y] = y;
+ mVPXImageWrapper->planes[VPX_PLANE_U] = cb;
+ mVPXImageWrapper->planes[VPX_PLANE_V] = cr;
mVPXImageWrapper->stride[VPX_PLANE_Y] = mFrameWidth;
mVPXImageWrapper->stride[VPX_PLANE_U] = halfWidth;
mVPXImageWrapper->stride[VPX_PLANE_V] = halfWidth;
diff --git media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
index d9c3a22..75195ae 100644
--- media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+++ media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
@@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst,
// Creating a wrapper to the image - setting image data to NULL. Actual
// pointer will be set in encode. Setting align to 1, as it is meaningless
// (actual memory is not allocated).
- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height,
+ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height,
1, NULL);
// populate encoder configuration with default values
if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) {
@@ -349,9 +349,9 @@ int VP8EncoderImpl::Encode(const I420VideoFrame& input_image,
}
// Image in vpx_image_t format.
// Input image is const. VP8's raw image is not defined as const.
- raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
+ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
+ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
+ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
// TODO(mikhal): Stride should be set in initialization.
raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);

2
www/seamonkey/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= seamonkey
DISTVERSION= 2.33.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source

1
x11/xpra/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= xpra
PORTVERSION= 0.14.25
PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xpra.org/src/