Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Aug 2016 16:41:44 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r419535 - in head/multimedia/libav: . files
Message-ID:  <201608031641.u73GfiDe071022@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Wed Aug  3 16:41:44 2016
New Revision: 419535
URL: https://svnweb.freebsd.org/changeset/ports/419535

Log:
  - 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]

Modified:
  head/multimedia/libav/Makefile
  head/multimedia/libav/distinfo
  head/multimedia/libav/files/patch-Makefile
  head/multimedia/libav/files/patch-common.mak
  head/multimedia/libav/files/patch-configure
  head/multimedia/libav/files/patch-libavcodec-libilbc.c
  head/multimedia/libav/files/patch-libavcodec_Makefile
  head/multimedia/libav/files/patch-libavcodec_libvpxenc.c
  head/multimedia/libav/files/patch-libavutil_x86_asm.h
  head/multimedia/libav/files/patch-library.mak

Modified: head/multimedia/libav/Makefile
==============================================================================
--- head/multimedia/libav/Makefile	Wed Aug  3 16:32:26 2016	(r419534)
+++ head/multimedia/libav/Makefile	Wed Aug  3 16:41:44 2016	(r419535)
@@ -1,20 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	libav
-PORTVERSION=	11.6
-PORTREVISION=	3
+PORTVERSION=	11.7
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dem.procopiou@gmail.com
 COMMENT=	Realtime audio/video conversion library
 
 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
-USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
+USE_XORG=	x11
 HAS_CONFIGURE=	yes
 USE_PERL5=	build
+USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
@@ -101,7 +105,7 @@ OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:gr
 OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
 
 OPENSSL_CONFIGURE_ENABLE=	openssl
-OPENSSL_USE=		OPENSSL=yes
+OPENSSL_USES=			ssl
 
 OPUS_LIB_DEPENDS=		libopus.so:audio/opus
 OPUS_CONFIGURE_ENABLE=		libopus

Modified: head/multimedia/libav/distinfo
==============================================================================
--- head/multimedia/libav/distinfo	Wed Aug  3 16:32:26 2016	(r419534)
+++ head/multimedia/libav/distinfo	Wed Aug  3 16:41:44 2016	(r419535)
@@ -1,2 +1,3 @@
-SHA256 (libav-11.6.tar.xz) = 542f30e4266d2d2226e681b888bc718c995f5438f2db66a9a27d581243d27aed
-SIZE (libav-11.6.tar.xz) = 4860268
+TIMESTAMP = 1470076400
+SHA256 (libav-11.7.tar.xz) = 8c9a75c89c6df58dd5e3f6f735d1ba5448680e23013fd66a51b50b4f49913c46
+SIZE (libav-11.7.tar.xz) = 4861984

Modified: head/multimedia/libav/files/patch-Makefile
==============================================================================
--- head/multimedia/libav/files/patch-Makefile	Wed Aug  3 16:32:26 2016	(r419534)
+++ head/multimedia/libav/files/patch-Makefile	Wed Aug  3 16:41:44 2016	(r419535)
@@ -1,6 +1,6 @@
---- Makefile.orig	2015-01-15 05:50:49.000000000 +0900
-+++ Makefile	2015-01-21 16:21:14.000000000 +0900
-@@ -129,7 +129,7 @@
+--- Makefile.orig	2016-05-25 00:36:32 UTC
++++ Makefile
+@@ -129,7 +129,7 @@ define DOSUBDIR
  $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
  SUBDIR := $(1)/
  include $(SRC_PATH)/$(1)/Makefile

Modified: head/multimedia/libav/files/patch-common.mak
==============================================================================
--- head/multimedia/libav/files/patch-common.mak	Wed Aug  3 16:32:26 2016	(r419534)
+++ head/multimedia/libav/files/patch-common.mak	Wed Aug  3 16:41:44 2016	(r419535)
@@ -1,6 +1,6 @@
---- common.mak.orig	2014-04-08 18:24:04.000000000 +0200
-+++ common.mak	2014-04-08 18:24:45.000000000 +0200
-@@ -28,8 +28,8 @@
+--- common.mak.orig	2016-05-25 00:36:32 UTC
++++ common.mak
+@@ -28,8 +28,8 @@ PATH_LIBNAME = $(foreach NAME,$(1),lib$(
  DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib)))
  
  SRC_DIR    := $(SRC_PATH)/lib$(NAME)

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

Modified: head/multimedia/libav/files/patch-libavcodec-libilbc.c
==============================================================================
--- head/multimedia/libav/files/patch-libavcodec-libilbc.c	Wed Aug  3 16:32:26 2016	(r419534)
+++ head/multimedia/libav/files/patch-libavcodec-libilbc.c	Wed Aug  3 16:41:44 2016	(r419535)
@@ -1,5 +1,5 @@
---- libavcodec/libilbc.c.orig	2015-03-09 02:54:09.000000000 +0100
-+++ libavcodec/libilbc.c	2015-04-03 19:12:02.210836254 +0200
+--- libavcodec/libilbc.c.orig	2016-05-25 00:36:32 UTC
++++ libavcodec/libilbc.c
 @@ -20,6 +20,7 @@
   */
  
@@ -8,7 +8,7 @@
  
  #include "libavutil/channel_layout.h"
  #include "libavutil/common.h"
-@@ -95,8 +96,8 @@
+@@ -95,8 +96,8 @@ static int ilbc_decode_frame(AVCodecCont
          return ret;
      }
  
@@ -19,7 +19,7 @@
  
      *got_frame_ptr = 1;
  
-@@ -168,7 +169,7 @@
+@@ -168,7 +169,7 @@ static int ilbc_encode_frame(AVCodecCont
          return ret;
      }
  

Modified: head/multimedia/libav/files/patch-libavcodec_Makefile
==============================================================================
--- head/multimedia/libav/files/patch-libavcodec_Makefile	Wed Aug  3 16:32:26 2016	(r419534)
+++ head/multimedia/libav/files/patch-libavcodec_Makefile	Wed Aug  3 16:41:44 2016	(r419535)
@@ -1,6 +1,6 @@
---- libavcodec/Makefile.orig	2014-04-08 16:36:02.000000000 +0200
-+++ libavcodec/Makefile	2014-04-08 16:36:14.000000000 +0200
-@@ -687,7 +687,7 @@
+--- libavcodec/Makefile.orig	2016-05-25 00:36:32 UTC
++++ libavcodec/Makefile
+@@ -704,7 +704,7 @@ SKIPHEADERS                            +
                                            aac_tablegen_decl.h           \
                                            fft-internal.h                \
                                            tableprint.h                  \

Modified: head/multimedia/libav/files/patch-libavcodec_libvpxenc.c
==============================================================================
--- head/multimedia/libav/files/patch-libavcodec_libvpxenc.c	Wed Aug  3 16:32:26 2016	(r419534)
+++ head/multimedia/libav/files/patch-libavcodec_libvpxenc.c	Wed Aug  3 16:41:44 2016	(r419535)
@@ -9,15 +9,9 @@ Date:   Mon Oct 19 22:44:11 2015 -0700
     
     Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
     Signed-off-by: James Zern <jzern@google.com>
----
- 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.orig	2016-05-25 00:36:32 UTC
 +++ 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 */
  static const char *const ctlidstr[] = {

Modified: head/multimedia/libav/files/patch-libavutil_x86_asm.h
==============================================================================
--- head/multimedia/libav/files/patch-libavutil_x86_asm.h	Wed Aug  3 16:32:26 2016	(r419534)
+++ head/multimedia/libav/files/patch-libavutil_x86_asm.h	Wed Aug  3 16:41:44 2016	(r419535)
@@ -1,6 +1,6 @@
---- libavutil/x86/asm.h.orig	2013-11-07 22:15:35.000000000 +0100
-+++ libavutil/x86/asm.h	2013-11-07 22:15:52.000000000 +0100
-@@ -68,7 +68,7 @@
+--- 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
  

Modified: head/multimedia/libav/files/patch-library.mak
==============================================================================
--- head/multimedia/libav/files/patch-library.mak	Wed Aug  3 16:32:26 2016	(r419534)
+++ head/multimedia/libav/files/patch-library.mak	Wed Aug  3 16:41:44 2016	(r419535)
@@ -1,6 +1,6 @@
---- library.mak.orig	2014-04-08 18:27:40.000000000 +0200
-+++ library.mak	2014-03-23 17:47:44.000000000 +0100
-@@ -80,7 +80,7 @@
+--- 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)"
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608031641.u73GfiDe071022>