Browse Source

*/*: Remove expired ports:

2021-05-31 multimedia/libav: Unmaintained upstream, use multimedia/ffmpeg instead
main
Rene Ladan 2 weeks ago
parent
commit
e906c3236c
  1. 1
      MOVED
  2. 1
      multimedia/Makefile
  3. 250
      multimedia/libav/Makefile
  4. 3
      multimedia/libav/distinfo
  5. 30
      multimedia/libav/files/patch-configure
  6. 71
      multimedia/libav/files/patch-libavcodec_libfdk-aacenc.c
  7. 112
      multimedia/libav/files/patch-libavcodec_libvpx.c
  8. 72
      multimedia/libav/files/patch-libavcodec_libx264.c
  9. 11
      multimedia/libav/files/patch-libavutil_x86_asm.h
  10. 11
      multimedia/libav/files/patch-library.mak
  11. 6
      multimedia/libav/pkg-descr
  12. 168
      multimedia/libav/pkg-plist

1
MOVED

@ -16340,3 +16340,4 @@ devel/omnisharp-server||2021-05-23|Dead upstream, no depends in ports tree
devel/py-jupyter_client|devel/py-jupyter-client|2021-05-26|Rename to match upstream naming
textproc/gi-docgen|textproc/py-gi-docgen|2021-05-27|Follow standard python port conventions
x11/phosh||2021-05-29|Incomplete
multimedia/libav|multimedia/ffmpeg|2021-05-31|Has expired: Unmaintained upstream, use multimedia/ffmpeg instead

1
multimedia/Makefile

@ -158,7 +158,6 @@
SUBDIR += l-smash
SUBDIR += libaacs
SUBDIR += libass
SUBDIR += libav
SUBDIR += libbdplus
SUBDIR += libbluray
SUBDIR += libcec

250
multimedia/libav/Makefile

@ -1,250 +0,0 @@
PORTNAME= libav
PORTVERSION= 12.3
PORTREVISION= 9
CATEGORIES= multimedia audio net
MASTER_SITES= http://libav.org/releases/
MAINTAINER= ports@FreeBSD.org
COMMENT= Realtime audio/video conversion library
LICENSE= GPLv2+
DEPRECATED= Unmaintained upstream, use multimedia/ffmpeg instead
EXPIRATION_DATE=2021-05-31
BROKEN_aarch64= fails to link: can't create dynamic relocation R_AARCH64_ABS64 against local symbol in readonly segment
BROKEN_armv6= fails to compile: cc: warning: joined argument expects additional value: -mcpu=
BUILD_DEPENDS= yasm:devel/yasm
LIB_DEPENDS= libgmp.so:math/gmp \
libvdpau.so:multimedia/libvdpau \
libhogweed.so:security/nettle
USES= cpe gmake localbase perl5 pkgconfig tar:xz xorg
USE_XORG= x11
USE_PERL5= build
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
HAS_CONFIGURE= yes
NOPRECIOUSMAKEVARS= yes # ARCH
CONFIGURE_ARGS= --prefix="${PREFIX}" \
--libdir="${PREFIX}/lib/${PORTNAME}" \
--shlibdir="${PREFIX}/lib/${PORTNAME}" \
--incdir="${PREFIX}/include/${PORTNAME}" \
--mandir="${PREFIX}/man" \
--datadir="${DATADIR}" \
--extra-ldflags="-L${LOCALBASE}/lib" \
--enable-pthreads \
--enable-shared \
--enable-runtime-cpudetect \
--disable-debug \
--cc="${CC}"
OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DC1394 DOCS FREETYPE \
FREI0R GNUTLS GSM ILBC JACK LAME OPENJPEG OPENSSL \
OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX THEORA V4L VAAPI \
VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX WAVPACK WEBP X11GRAB \
X264 XVID ZLIB
OPTIONS_DEFAULT=BZIP2 FREETYPE FREI0R GNUTLS SCHROEDINGER \
THEORA VAAPI VDPAU VO_AACENC VORBIS VPX X264 XVID ZLIB
FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK
ILBC_DESC= iLBC en/decoding via libilbc
X11GRAB_DESC= X11 grabbing
DC1394_DESC= IIDC-1394 grabbing using libdc1394
OPTIONS_SUB= yes
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_CONFIGURE_ON= --enable-indev=alsa --enable-outdev=alsa
ALSA_CONFIGURE_OFF= --disable-indev=alsa --disable-outdev=alsa
AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr
AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb
AMR_WB_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr
AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb
BZIP2_CONFIGURE_ENABLE= bzlib
CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio \
libcdio_paranoia.so:sysutils/libcdio-paranoia
CDIO_CONFIGURE_ENABLE= libcdio
DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394
DC1394_CONFIGURE_ENABLE= libdc1394
DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html
FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:graphics/frei0r
FREI0R_CONFIGURE_ENABLE= frei0r
FAAC_LIB_DEPENDS= libfaac.so:audio/faac
FAAC_CONFIGURE_ENABLE= libfaac
FDK_AAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac
FDK_AAC_CONFIGURE_ENABLE= libfdk-aac
FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
FREETYPE_CONFIGURE_ENABLE= libfreetype
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_CONFIGURE_ENABLE= gnutls
GSM_LIB_DEPENDS= libgsm.so:audio/gsm
GSM_CONFIGURE_ENABLE= libgsm
ILBC_BUILD_DEPENDS= ${LOCALBASE}/include/ilbc.h:net/libilbc
ILBC_CONFIGURE_ENABLE= libilbc
JACK_LIB_DEPENDS= libjack.so:audio/jack
JACK_CONFIGURE_ON= --enable-indev=jack
JACK_CONFIGURE_OFF= --disable-indev=jack
LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
LAME_CONFIGURE_ENABLE= libmp3lame
OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15
OPENJPEG_CONFIGURE_ENABLE= libopenjpeg
OPENSSL_CONFIGURE_ENABLE= openssl
OPENSSL_USES= ssl
OPUS_LIB_DEPENDS= libopus.so:audio/opus
OPUS_CONFIGURE_ENABLE= libopus
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CONFIGURE_ENABLE= libpulse
RTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp
RTMP_CONFIGURE_ENABLE= librtmp
SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:multimedia/schroedinger
SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger
SDL_USES= sdl
SDL_USE= SDL=sdl
SDL_CONFIGURE_ENABLE= avplay
SPEEX_LIB_DEPENDS= libspeex.so:audio/speex
SPEEX_CONFIGURE_ENABLE= libspeex
THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora
THEORA_CONFIGURE_ENABLE= libtheora
V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
V4L_CONFIGURE_ON= --enable-indev=v4l2
V4L_CONFIGURE_OFF= --disable-indev=v4l2
VAAPI_LIB_DEPENDS= libva.so:multimedia/libva
VAAPI_CONFIGURE_ENABLE= vaapi
VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:multimedia/libvdpau
VDPAU_CONFIGURE_ENABLE= vdpau
VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:audio/vo-aacenc
VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc
VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:audio/vo-amrwbenc
VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc
VORBIS_LIB_DEPENDS= libvorbisenc.so:audio/libvorbis
VORBIS_CONFIGURE_ENABLE= libvorbis
VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
VPX_CONFIGURE_ENABLE= libvpx
WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
WAVPACK_CONFIGURE_ENABLE= libwavpack
WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
WEBP_CONFIGURE_ENABLE= libwebp
X11GRAB_USE= XORG=x11,xext,xfixes
X264_LIB_DEPENDS= libx264.so:multimedia/libx264
X264_CONFIGURE_ENABLE= libx264
XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid
XVID_CONFIGURE_ENABLE= libxvid
ZLIB_CONFIGURE_ENABLE= zlib
.include <bsd.port.options.mk>
.if ${ARCH} == "armv6"
CONFIGURE_ENV+= ASFLAGS=-no-integrated-as
.endif
.if ${ARCH} == "i386"
CONFIGURE_ARGS+= --extra-cflags=-m32
LLD_UNSAFE= yes
.endif
.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
USE_GCC= yes
.else
USES+= compiler:c++11-lang
.endif
# License definitions
.if ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC} || ${PORT_OPTIONS:MOPENSSL}
CONFIGURE_ARGS+= --enable-nonfree
AV_NONFREE= true
.endif
.if ${PORT_OPTIONS:MCDIO} || ${PORT_OPTIONS:MX264} || ${PORT_OPTIONS:MXVID} || ${PORT_OPTIONS:MX11GRAB}
CONFIGURE_ARGS+= --enable-gpl
.if !defined(AV_NONFREE)
AV_ISGPL= true
.endif
.endif
.if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB} || ${PORT_OPTIONS:MVO_AACENC} || ${PORT_OPTIONS:MVO_AMRWBENC}
CONFIGURE_ARGS+= --enable-version3
.if !defined(AV_NONFREE)
.if defined(AV_ISGPL)
LICENSE= GPLv3+
.else
LICENSE= LGPL3+
.endif
.endif
.endif
.if !defined(AV_NONFREE) && !defined(AV_ISGPL) && !defined(LICENSE)
LICENSE= LGPL21+
.endif
.if defined(AV_NONFREE)
LICENSE+= AV
LICENSE_COMB= multi
LICENSE_NAME_AV= Restricted redistribution
LICENSE_TEXT_AV= linking to libfaac or libaacplus or using OpenSSL support restricts redistribution
LICENSE_PERMS_AV= auto-accept
.endif
post-patch:
@${REINPLACE_CMD} -e 's|freetype/freetype.h|freetype2/freetype.h|' \
-e 's|-ldc1394 -lraw1394|-ldc1394|' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
${WRKSRC}/configure \
${WRKSRC}/libavcodec/libgsmdec.c
@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \
${WRKSRC}/library.mak
post-configure-DOCS-off:
@${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak
post-install:
.for a in bin/avconv bin/avprobe lib/libav/libavcodec.so.57.25.0\
lib/libav/libavdevice.so.56.1.0 lib/libav/libavfilter.so.6.7.0\
lib/libav/libavformat.so.57.7.2 lib/libav/libavresample.so.3.0.0\
lib/libav/libavutil.so.55.20.0 lib/libav/libswscale.so.4.0.0
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${a}
.endfor
.include <bsd.port.mk>

3
multimedia/libav/distinfo

@ -1,3 +0,0 @@
TIMESTAMP = 1543298830
SHA256 (libav-12.3.tar.xz) = 6893cdbd7bc4b62f5d8fd6593c8e0a62babb53e323fbc7124db3658d04ab443b
SIZE (libav-12.3.tar.xz) = 5267988

30
multimedia/libav/files/patch-configure

@ -1,30 +0,0 @@
--- configure.orig 2016-05-25 00:36:32 UTC
+++ configure
@@ -780,8 +780,8 @@ ld_o(){
check_ld(){
log check_ld "$@"
- flags=$(filter_out '-l*' "$@")
- libs=$(filter '-l*' "$@")
+ flags=$(filter_out '-l*|*.so' "$@")
+ libs=$(filter '-l*|*.so' "$@")
check_cc $($cflags_filter $flags) || return
flags=$($ldflags_filter $flags)
libs=$($ldflags_filter $libs)
@@ -4436,6 +4436,7 @@ elif enabled llvm_gcc; then
check_cflags -mllvm -stack-alignment=16
elif enabled clang; then
check_cflags -mllvm -stack-alignment=16
+ check_cflags -mstack-alignment=16
check_cflags -Qunused-arguments
check_cflags -Werror=implicit-function-declaration
check_cflags -Werror=missing-prototypes
@@ -4821,7 +4821,7 @@ pkgconfig_generate(){
requires=${requires%, }
enabled ${name#lib} || return 0
mkdir -p $name
- cat <<EOF > $name/$name.pc
+ cat <<EOF > $name/$name-libav.pc
prefix=$prefix
exec_prefix=\${prefix}
libdir=$libdir

71
multimedia/libav/files/patch-libavcodec_libfdk-aacenc.c

@ -1,71 +0,0 @@
--- libavcodec/libfdk-aacenc.c.orig 2018-02-12 21:25:59 UTC
+++ libavcodec/libfdk-aacenc.c
@@ -26,6 +26,11 @@
#include "audio_frame_queue.h"
#include "internal.h"
+#define FDKENC_VER_AT_LEAST(vl0, vl1) \
+ (defined(AACENCODER_LIB_VL0) && \
+ ((AACENCODER_LIB_VL0 > vl0) || \
+ (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1)))
+
typedef struct AACContext {
const AVClass *class;
HANDLE_AACENCODER handle;
@@ -286,7 +291,11 @@ static av_cold int aac_encode_init(AVCod
}
avctx->frame_size = info.frameLength;
+#if FDKENC_VER_AT_LEAST(4, 0)
+ avctx->initial_padding = info.nDelay;
+#else
avctx->initial_padding = info.encoderDelay;
+#endif
ff_af_queue_init(avctx, &s->afq);
if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
@@ -319,28 +328,35 @@ static int aac_encode_frame(AVCodecConte
int out_buffer_size, out_buffer_element_size;
void *in_ptr, *out_ptr;
int ret;
+ uint8_t dummy_buf[1];
AACENC_ERROR err;
/* handle end-of-stream small frame and flushing */
if (!frame) {
+ /* Must be a non-null pointer, even if it's a dummy. We could use
+ * the address of anything else on the stack as well. */
+ in_ptr = dummy_buf;
+ in_buffer_size = 0;
+
in_args.numInSamples = -1;
} else {
- in_ptr = frame->data[0];
- in_buffer_size = 2 * avctx->channels * frame->nb_samples;
- in_buffer_element_size = 2;
+ in_ptr = frame->data[0];
+ in_buffer_size = 2 * avctx->channels * frame->nb_samples;
- in_args.numInSamples = avctx->channels * frame->nb_samples;
- in_buf.numBufs = 1;
- in_buf.bufs = &in_ptr;
- in_buf.bufferIdentifiers = &in_buffer_identifier;
- in_buf.bufSizes = &in_buffer_size;
- in_buf.bufElSizes = &in_buffer_element_size;
+ in_args.numInSamples = avctx->channels * frame->nb_samples;
/* add current frame to the queue */
if ((ret = ff_af_queue_add(&s->afq, frame)) < 0)
return ret;
}
+ in_buffer_element_size = 2;
+ in_buf.numBufs = 1;
+ in_buf.bufs = &in_ptr;
+ in_buf.bufferIdentifiers = &in_buffer_identifier;
+ in_buf.bufSizes = &in_buffer_size;
+ in_buf.bufElSizes = &in_buffer_element_size;
+
/* The maximum packet size is 6144 bits aka 768 bytes per channel. */
if ((ret = ff_alloc_packet(avpkt, FFMAX(8192, 768 * avctx->channels)))) {
av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");

112
multimedia/libav/files/patch-libavcodec_libvpx.c

@ -1,112 +0,0 @@
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;

72
multimedia/libav/files/patch-libavcodec_libx264.c

@ -1,72 +0,0 @@
https://git.libav.org/?p=libav.git;a=commitdiff;h=c6558e8840fb
--- libavcodec/libx264.c.orig 2017-05-14 19:25:01 UTC
+++ libavcodec/libx264.c
@@ -243,7 +243,11 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *p
x264_picture_init( &x4->pic );
x4->pic.img.i_csp = x4->params.i_csp;
+#if X264_BUILD >= 153
+ if (x4->params.i_bitdepth > 8)
+#else
if (x264_bit_depth > 8)
+#endif
x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH;
x4->pic.img.i_plane = 3;
@@ -395,6 +399,9 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.p_log_private = avctx;
x4->params.i_log_level = X264_LOG_DEBUG;
x4->params.i_csp = convert_pix_fmt(avctx->pix_fmt);
+#if X264_BUILD >= 153
+ x4->params.i_bitdepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth;
+#endif
if (avctx->bit_rate) {
x4->params.rc.i_bitrate = avctx->bit_rate / 1000;
@@ -675,6 +682,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
return 0;
}
+#if X264_BUILD < 153
static const enum AVPixelFormat pix_fmts_8bit[] = {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_YUVJ420P,
@@ -701,15 +709,37 @@ static const enum AVPixelFormat pix_fmts_10bit[] = {
AV_PIX_FMT_NV20,
AV_PIX_FMT_NONE
};
+#else
+static const enum AVPixelFormat pix_fmts_all[] = {
+ AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_YUVJ420P,
+ AV_PIX_FMT_YUV422P,
+ AV_PIX_FMT_YUVJ422P,
+ AV_PIX_FMT_YUV444P,
+ AV_PIX_FMT_YUVJ444P,
+ AV_PIX_FMT_NV12,
+ AV_PIX_FMT_NV16,
+ AV_PIX_FMT_NV21,
+ AV_PIX_FMT_YUV420P10,
+ AV_PIX_FMT_YUV422P10,
+ AV_PIX_FMT_YUV444P10,
+ AV_PIX_FMT_NV20,
+ AV_PIX_FMT_NONE
+};
+#endif
static av_cold void X264_init_static(AVCodec *codec)
{
+#if X264_BUILD < 153
if (x264_bit_depth == 8)
codec->pix_fmts = pix_fmts_8bit;
else if (x264_bit_depth == 9)
codec->pix_fmts = pix_fmts_9bit;
else if (x264_bit_depth == 10)
codec->pix_fmts = pix_fmts_10bit;
+#else
+ codec->pix_fmts = pix_fmts_all;
+#endif
}
#define OFFSET(x) offsetof(X264Context, x)

11
multimedia/libav/files/patch-libavutil_x86_asm.h

@ -1,11 +0,0 @@
--- libavutil/x86/asm.h.orig 2016-05-25 00:36:32 UTC
+++ libavutil/x86/asm.h
@@ -70,7 +70,7 @@ typedef int32_t x86_reg;
typedef int x86_reg;
#endif
-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
+#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))
#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
#if ARCH_X86_64 && defined(PIC)

11
multimedia/libav/files/patch-library.mak

@ -1,11 +0,0 @@
--- library.mak.orig 2016-05-25 00:36:32 UTC
+++ library.mak
@@ -80,7 +80,7 @@ install-lib$(NAME)-headers: $(addprefix
$(Q)mkdir -p "$(INCINSTDIR)"
$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
-install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
+install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)-libav.pc
$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"

6
multimedia/libav/pkg-descr

@ -1,6 +0,0 @@
Libav provides cross-platform tools and libraries to convert, manipulate
and stream a wide range of multimedia formats and protocols. It originates
from the FFmpeg codebase, but goes its own way these days, providing its
users with reliable releases and a clear vision how to go forward.
WWW: http://www.libav.org

168
multimedia/libav/pkg-plist

@ -1,168 +0,0 @@
bin/avconv
%%SDL%%bin/avplay
bin/avprobe
include/libav/libavcodec/avcodec.h
include/libav/libavcodec/avfft.h
include/libav/libavcodec/d3d11va.h
include/libav/libavcodec/dirac.h
include/libav/libavcodec/dv_profile.h
include/libav/libavcodec/dxva2.h
include/libav/libavcodec/qsv.h
include/libav/libavcodec/vaapi.h
include/libav/libavcodec/vda.h
include/libav/libavcodec/vdpau.h
include/libav/libavcodec/version.h
include/libav/libavcodec/vorbis_parser.h
include/libav/libavcodec/xvmc.h
include/libav/libavdevice/avdevice.h
include/libav/libavdevice/version.h
include/libav/libavfilter/avfilter.h
include/libav/libavfilter/avfiltergraph.h
include/libav/libavfilter/buffersink.h
include/libav/libavfilter/buffersrc.h
include/libav/libavfilter/version.h
include/libav/libavformat/avformat.h
include/libav/libavformat/avio.h
include/libav/libavformat/version.h
include/libav/libavresample/avresample.h
include/libav/libavresample/version.h
include/libav/libavutil/adler32.h
include/libav/libavutil/aes.h
include/libav/libavutil/attributes.h
include/libav/libavutil/audio_fifo.h
include/libav/libavutil/avassert.h
include/libav/libavutil/avconfig.h
include/libav/libavutil/avstring.h
include/libav/libavutil/avutil.h
include/libav/libavutil/base64.h
include/libav/libavutil/blowfish.h
include/libav/libavutil/bswap.h
include/libav/libavutil/buffer.h
include/libav/libavutil/channel_layout.h
include/libav/libavutil/common.h
include/libav/libavutil/cpu.h
include/libav/libavutil/crc.h
include/libav/libavutil/dict.h
include/libav/libavutil/display.h
include/libav/libavutil/downmix_info.h
include/libav/libavutil/error.h
include/libav/libavutil/eval.h
include/libav/libavutil/fifo.h
include/libav/libavutil/file.h
include/libav/libavutil/frame.h
include/libav/libavutil/hmac.h
include/libav/libavutil/hwcontext.h
include/libav/libavutil/hwcontext_cuda.h
include/libav/libavutil/hwcontext_dxva2.h
include/libav/libavutil/hwcontext_qsv.h
include/libav/libavutil/hwcontext_vaapi.h
include/libav/libavutil/hwcontext_vdpau.h
include/libav/libavutil/imgutils.h
include/libav/libavutil/intfloat.h
include/libav/libavutil/intreadwrite.h
include/libav/libavutil/lfg.h
include/libav/libavutil/log.h
include/libav/libavutil/lzo.h
include/libav/libavutil/macros.h
include/libav/libavutil/mathematics.h
include/libav/libavutil/md5.h
include/libav/libavutil/mem.h
include/libav/libavutil/opt.h
include/libav/libavutil/parseutils.h
include/libav/libavutil/pixdesc.h
include/libav/libavutil/pixfmt.h
include/libav/libavutil/random_seed.h
include/libav/libavutil/rational.h
include/libav/libavutil/replaygain.h
include/libav/libavutil/samplefmt.h
include/libav/libavutil/sha.h
include/libav/libavutil/stereo3d.h
include/libav/libavutil/time.h
include/libav/libavutil/version.h
include/libav/libavutil/xtea.h
include/libav/libswscale/swscale.h
include/libav/libswscale/version.h
lib/libav/libavcodec.a
lib/libav/libavcodec.so
lib/libav/libavcodec.so.57
lib/libav/libavcodec.so.57.25.0
lib/libav/libavdevice.a
lib/libav/libavdevice.so
lib/libav/libavdevice.so.56
lib/libav/libavdevice.so.56.1.0
lib/libav/libavfilter.a
lib/libav/libavfilter.so
lib/libav/libavfilter.so.6
lib/libav/libavfilter.so.6.7.0
lib/libav/libavformat.a
lib/libav/libavformat.so
lib/libav/libavformat.so.57
lib/libav/libavformat.so.57.7.2
lib/libav/libavresample.a
lib/libav/libavresample.so
lib/libav/libavresample.so.3
lib/libav/libavresample.so.3.0.0
lib/libav/libavutil.a
lib/libav/libavutil.so
lib/libav/libavutil.so.55
lib/libav/libavutil.so.55.20.0
lib/libav/libswscale.a
lib/libav/libswscale.so
lib/libav/libswscale.so.4
lib/libav/libswscale.so.4.0.0
libdata/pkgconfig/libavcodec-libav.pc
libdata/pkgconfig/libavdevice-libav.pc
libdata/pkgconfig/libavfilter-libav.pc
libdata/pkgconfig/libavformat-libav.pc
libdata/pkgconfig/libavresample-libav.pc
libdata/pkgconfig/libavutil-libav.pc
libdata/pkgconfig/libswscale-libav.pc
man/man1/avconv.1.gz
%%SDL%%man/man1/avplay.1.gz
man/man1/avprobe.1.gz
%%DATADIR%%/libvpx-1080p.avpreset
%%DATADIR%%/libvpx-1080p50_60.avpreset
%%DATADIR%%/libvpx-360p.avpreset
%%DATADIR%%/libvpx-720p.avpreset
%%DATADIR%%/libvpx-720p50_60.avpreset
%%DATADIR%%/libx264-baseline.avpreset
%%DATADIR%%/libx264-fast.avpreset
%%DATADIR%%/libx264-fast_firstpass.avpreset
%%DATADIR%%/libx264-faster.avpreset
%%DATADIR%%/libx264-faster_firstpass.avpreset
%%DATADIR%%/libx264-ipod320.avpreset
%%DATADIR%%/libx264-ipod640.avpreset
%%DATADIR%%/libx264-lossless_fast.avpreset
%%DATADIR%%/libx264-lossless_max.avpreset
%%DATADIR%%/libx264-lossless_medium.avpreset
%%DATADIR%%/libx264-lossless_slow.avpreset
%%DATADIR%%/libx264-lossless_slower.avpreset
%%DATADIR%%/libx264-lossless_ultrafast.avpreset
%%DATADIR%%/libx264-main.avpreset
%%DATADIR%%/libx264-medium.avpreset
%%DATADIR%%/libx264-medium_firstpass.avpreset
%%DATADIR%%/libx264-placebo.avpreset
%%DATADIR%%/libx264-placebo_firstpass.avpreset
%%DATADIR%%/libx264-slow.avpreset
%%DATADIR%%/libx264-slow_firstpass.avpreset
%%DATADIR%%/libx264-slower.avpreset
%%DATADIR%%/libx264-slower_firstpass.avpreset
%%DATADIR%%/libx264-superfast.avpreset
%%DATADIR%%/libx264-superfast_firstpass.avpreset
%%DATADIR%%/libx264-ultrafast.avpreset
%%DATADIR%%/libx264-ultrafast_firstpass.avpreset
%%DATADIR%%/libx264-veryfast.avpreset
%%DATADIR%%/libx264-veryfast_firstpass.avpreset
%%DATADIR%%/libx264-veryslow.avpreset
%%DATADIR%%/libx264-veryslow_firstpass.avpreset
%%PORTDOCS%%%%DOCSDIR%%/avconv.html
%%SDL%%%%PORTDOCS%%%%DOCSDIR%%/avplay.html
%%PORTDOCS%%%%DOCSDIR%%/avprobe.html
%%PORTDOCS%%%%DOCSDIR%%/developer.html
%%PORTDOCS%%%%DOCSDIR%%/faq.html
%%PORTDOCS%%%%DOCSDIR%%/fate.html
%%PORTDOCS%%%%DOCSDIR%%/general.html
%%PORTDOCS%%%%DOCSDIR%%/git-howto.html
%%PORTDOCS%%%%DOCSDIR%%/libavfilter.html
%%PORTDOCS%%%%DOCSDIR%%/nut.html
%%PORTDOCS%%%%DOCSDIR%%/platform.html
Loading…
Cancel
Save