- Update to version 11.7, take maintainership [1]

- Register proxy dependencies found by stage-qa
- Convert to USES=ssl
- Regenerate patches with make makepatch

PR:		211508 [1]
Submitted by:	Demetris Procopiou [1]
This commit is contained in:
Pawel Pekala 2016-08-03 16:41:44 +00:00
parent cd4f79228a
commit a859112b83
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=419535
10 changed files with 38 additions and 39 deletions

View file

@ -1,20 +1,24 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= libav PORTNAME= libav
PORTVERSION= 11.6 PORTVERSION= 11.7
PORTREVISION= 3
CATEGORIES= multimedia audio ipv6 net CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://libav.org/releases/ MASTER_SITES= http://libav.org/releases/
MAINTAINER= ports@FreeBSD.org MAINTAINER= dem.procopiou@gmail.com
COMMENT= Realtime audio/video conversion library COMMENT= Realtime audio/video conversion library
BUILD_DEPENDS= yasm:devel/yasm BUILD_DEPENDS= yasm:devel/yasm
LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \
libgmp.so:math/gmp \
libvdpau.so:multimedia/libvdpau \
libhogweed.so:security/nettle
USES= cpe gmake perl5 pkgconfig tar:xz USES= cpe gmake perl5 pkgconfig tar:xz
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_XORG= x11
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
USE_PERL5= build USE_PERL5= build
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS= --prefix="${PREFIX}" \ CONFIGURE_ARGS= --prefix="${PREFIX}" \
@ -101,7 +105,7 @@ OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15
OPENJPEG_CONFIGURE_ENABLE= libopenjpeg OPENJPEG_CONFIGURE_ENABLE= libopenjpeg
OPENSSL_CONFIGURE_ENABLE= openssl OPENSSL_CONFIGURE_ENABLE= openssl
OPENSSL_USE= OPENSSL=yes OPENSSL_USES= ssl
OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_LIB_DEPENDS= libopus.so:audio/opus
OPUS_CONFIGURE_ENABLE= libopus OPUS_CONFIGURE_ENABLE= libopus

View file

@ -1,2 +1,3 @@
SHA256 (libav-11.6.tar.xz) = 542f30e4266d2d2226e681b888bc718c995f5438f2db66a9a27d581243d27aed TIMESTAMP = 1470076400
SIZE (libav-11.6.tar.xz) = 4860268 SHA256 (libav-11.7.tar.xz) = 8c9a75c89c6df58dd5e3f6f735d1ba5448680e23013fd66a51b50b4f49913c46
SIZE (libav-11.7.tar.xz) = 4861984

View file

@ -1,6 +1,6 @@
--- Makefile.orig 2015-01-15 05:50:49.000000000 +0900 --- Makefile.orig 2016-05-25 00:36:32 UTC
+++ Makefile 2015-01-21 16:21:14.000000000 +0900 +++ Makefile
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@ define DOSUBDIR
$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
SUBDIR := $(1)/ SUBDIR := $(1)/
include $(SRC_PATH)/$(1)/Makefile include $(SRC_PATH)/$(1)/Makefile

View file

@ -1,6 +1,6 @@
--- common.mak.orig 2014-04-08 18:24:04.000000000 +0200 --- common.mak.orig 2016-05-25 00:36:32 UTC
+++ common.mak 2014-04-08 18:24:45.000000000 +0200 +++ common.mak
@@ -28,8 +28,8 @@ @@ -28,8 +28,8 @@ PATH_LIBNAME = $(foreach NAME,$(1),lib$(
DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib))) DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib)))
SRC_DIR := $(SRC_PATH)/lib$(NAME) SRC_DIR := $(SRC_PATH)/lib$(NAME)

View file

@ -1,6 +1,6 @@
--- configure.orig 2015-01-15 05:50:49.000000000 +0900 --- configure.orig 2016-05-25 00:36:32 UTC
+++ configure 2015-01-21 16:23:01.000000000 +0900 +++ configure
@@ -779,8 +779,8 @@ @@ -780,8 +780,8 @@ ld_o(){
check_ld(){ check_ld(){
log check_ld "$@" log check_ld "$@"
@ -11,7 +11,7 @@
check_cc $($cflags_filter $flags) || return check_cc $($cflags_filter $flags) || return
flags=$($ldflags_filter $flags) flags=$($ldflags_filter $flags)
libs=$($ldflags_filter $libs) libs=$($ldflags_filter $libs)
@@ -4606,7 +4606,7 @@ @@ -4644,7 +4644,7 @@ DOCDIR=\$(DESTDIR)$docdir
MANDIR=\$(DESTDIR)$mandir MANDIR=\$(DESTDIR)$mandir
SRC_PATH=$source_path SRC_PATH=$source_path
CC_IDENT=$cc_ident CC_IDENT=$cc_ident
@ -20,7 +20,7 @@
INTRINSICS=$intrinsics INTRINSICS=$intrinsics
CC=$cc CC=$cc
AS=$as AS=$as
@@ -4783,7 +4783,7 @@ @@ -4821,7 +4821,7 @@ pkgconfig_generate(){
requires=${requires%, } requires=${requires%, }
enabled ${name#lib} || return 0 enabled ${name#lib} || return 0
mkdir -p $name mkdir -p $name

View file

@ -1,5 +1,5 @@
--- libavcodec/libilbc.c.orig 2015-03-09 02:54:09.000000000 +0100 --- libavcodec/libilbc.c.orig 2016-05-25 00:36:32 UTC
+++ libavcodec/libilbc.c 2015-04-03 19:12:02.210836254 +0200 +++ libavcodec/libilbc.c
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
*/ */
@ -8,7 +8,7 @@
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/common.h" #include "libavutil/common.h"
@@ -95,8 +96,8 @@ @@ -95,8 +96,8 @@ static int ilbc_decode_frame(AVCodecCont
return ret; return ret;
} }
@ -19,7 +19,7 @@
*got_frame_ptr = 1; *got_frame_ptr = 1;
@@ -168,7 +169,7 @@ @@ -168,7 +169,7 @@ static int ilbc_encode_frame(AVCodecCont
return ret; return ret;
} }

View file

@ -1,6 +1,6 @@
--- libavcodec/Makefile.orig 2014-04-08 16:36:02.000000000 +0200 --- libavcodec/Makefile.orig 2016-05-25 00:36:32 UTC
+++ libavcodec/Makefile 2014-04-08 16:36:14.000000000 +0200 +++ libavcodec/Makefile
@@ -687,7 +687,7 @@ @@ -704,7 +704,7 @@ SKIPHEADERS +
aac_tablegen_decl.h \ aac_tablegen_decl.h \
fft-internal.h \ fft-internal.h \
tableprint.h \ tableprint.h \

View file

@ -9,15 +9,9 @@ Date: Mon Oct 19 22:44:11 2015 -0700
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com> Signed-off-by: James Zern <jzern@google.com>
--- --- libavcodec/libvpxenc.c.orig 2016-05-25 00:36:32 UTC
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 +++ libavcodec/libvpxenc.c
@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { @@ -70,19 +70,11 @@ typedef struct VP8EncoderContext {
/** String mappings for enum vp8e_enc_control_id */ /** String mappings for enum vp8e_enc_control_id */
static const char *const ctlidstr[] = { static const char *const ctlidstr[] = {

View file

@ -1,6 +1,6 @@
--- libavutil/x86/asm.h.orig 2013-11-07 22:15:35.000000000 +0100 --- libavutil/x86/asm.h.orig 2016-05-25 00:36:32 UTC
+++ libavutil/x86/asm.h 2013-11-07 22:15:52.000000000 +0100 +++ libavutil/x86/asm.h
@@ -68,7 +68,7 @@ @@ -70,7 +70,7 @@ typedef int32_t x86_reg;
typedef int x86_reg; typedef int x86_reg;
#endif #endif

View file

@ -1,6 +1,6 @@
--- library.mak.orig 2014-04-08 18:27:40.000000000 +0200 --- library.mak.orig 2016-05-25 00:36:32 UTC
+++ library.mak 2014-03-23 17:47:44.000000000 +0100 +++ library.mak
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@ install-lib$(NAME)-headers: $(addprefix
$(Q)mkdir -p "$(INCINSTDIR)" $(Q)mkdir -p "$(INCINSTDIR)"
$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)" $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"