Attachment #183318 for bug #219469




# $FreeBSD: head/multimedia/libav/Makefile 441819 2017-05-27 00:20:19Z linimon $

PORTNAME=	libav
PORTVERSION=	12.1
PORTREVISION=	2
CATEGORIES=	multimedia audio ipv6 net
MASTER_SITES=	http://libav.org/releases/



BROKEN_armv6=		fails to compile: cc: warning: joined argument expects additional value: -mcpu=

CONFLICTS=	ffmpeg-[0-9]*
USES=		cpe gmake perl5 pkgconfig tar:xz
USE_XORG=	x11
HAS_CONFIGURE=	yes

	@${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


Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1486171185	1	TIMESTAMP = 1495507159
2	SHA256 (libav-11.8.tar.xz) = 7014b869570b9ea759e5c06beb3e9debd024a1c5af517655a9e1ccfe145baf4e	2	SHA256 (libav-12.1.tar.xz) = fad96aa265d3d64b9e53c159559621ec888effa022908da8372164fa4cbe5d2d
3	SIZE (libav-11.8.tar.xz) = 4865796	3	SIZE (libav-12.1.tar.xz) = 5267292




--- libavcodec/libilbc.c.orig	2016-05-25 00:36:32 UTC
+++ libavcodec/libilbc.c
@@ -20,6 +20,7 @@
  */
 
 #include <ilbc.h>
+#include <stdint.h>
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
@@ -95,8 +96,8 @@ static int ilbc_decode_frame(AVCodecCont
         return ret;
     }
 
-    WebRtcIlbcfix_DecodeImpl((WebRtc_Word16*) frame->data[0],
-                             (const WebRtc_UWord16*) buf, &s->decoder, 1);
+    WebRtcIlbcfix_DecodeImpl((int16_t*) frame->data[0],
+                             (const uint16_t*) buf, &s->decoder, 1);
 
     *got_frame_ptr = 1;
 
@@ -168,7 +169,7 @@ static int ilbc_encode_frame(AVCodecCont
         return ret;
     }
 
-    WebRtcIlbcfix_EncodeImpl((WebRtc_UWord16*) avpkt->data, (const WebRtc_Word16*) frame->data[0], &s->encoder);
+    WebRtcIlbcfix_EncodeImpl((uint16_t*) avpkt->data, (const int16_t*) frame->data[0], &s->encoder);
 
     avpkt->size     = s->encoder.no_of_bytes;
     *got_packet_ptr = 1;




commit 6540fe0
Author: James Zern <jzern@google.com>
Date:   Mon Oct 19 22:44:11 2015 -0700

    libvpxenc: remove some unused ctrl id mappings
    
    VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
    from libvpx and the remaining values were never used here
    
    Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
    Signed-off-by: James Zern <jzern@google.com>
--- libavcodec/libvpxenc.c.orig	2016-05-25 00:36:32 UTC
+++ libavcodec/libvpxenc.c
@@ -70,19 +70,11 @@ typedef struct VP8EncoderContext {
 
 /** String mappings for enum vp8e_enc_control_id */
 static const char *const ctlidstr[] = {
-    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
-    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
-    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
-    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
-    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
-    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
-    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
-    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",

Lines 3-14 bin/avconv Link Here

(-)./pkg-plist (-16 / +24 lines)
3	bin/avprobe	3	bin/avprobe
4	include/libav/libavcodec/avcodec.h	4	include/libav/libavcodec/avcodec.h
5	include/libav/libavcodec/avfft.h	5	include/libav/libavcodec/avfft.h
		6	include/libav/libavcodec/d3d11va.h
		7	include/libav/libavcodec/dirac.h
6	include/libav/libavcodec/dv_profile.h	8	include/libav/libavcodec/dv_profile.h
7	include/libav/libavcodec/dxva2.h	9	include/libav/libavcodec/dxva2.h
		10	include/libav/libavcodec/qsv.h
8	include/libav/libavcodec/vaapi.h	11	include/libav/libavcodec/vaapi.h
9	include/libav/libavcodec/vda.h	12	include/libav/libavcodec/vda.h
10	include/libav/libavcodec/vdpau.h	13	include/libav/libavcodec/vdpau.h
11	include/libav/libavcodec/version.h	14	include/libav/libavcodec/version.h
		15	include/libav/libavcodec/vorbis_parser.h
12	include/libav/libavcodec/xvmc.h	16	include/libav/libavcodec/xvmc.h
13	include/libav/libavdevice/avdevice.h	17	include/libav/libavdevice/avdevice.h
14	include/libav/libavdevice/version.h	18	include/libav/libavdevice/version.h
Lines 26-32 include/libav/libavutil/adler32.h Link Here
26	include/libav/libavutil/aes.h	30	include/libav/libavutil/aes.h
27	include/libav/libavutil/attributes.h	31	include/libav/libavutil/attributes.h
28	include/libav/libavutil/audio_fifo.h	32	include/libav/libavutil/audio_fifo.h
29	include/libav/libavutil/audioconvert.h
30	include/libav/libavutil/avassert.h	33	include/libav/libavutil/avassert.h
31	include/libav/libavutil/avconfig.h	34	include/libav/libavutil/avconfig.h
32	include/libav/libavutil/avstring.h	35	include/libav/libavutil/avstring.h
Lines 48-53 include/libav/libavutil/fifo.h Link Here
48	include/libav/libavutil/file.h	51	include/libav/libavutil/file.h
49	include/libav/libavutil/frame.h	52	include/libav/libavutil/frame.h
50	include/libav/libavutil/hmac.h	53	include/libav/libavutil/hmac.h
		54	include/libav/libavutil/hwcontext.h
		55	include/libav/libavutil/hwcontext_cuda.h
		56	include/libav/libavutil/hwcontext_dxva2.h
		57	include/libav/libavutil/hwcontext_qsv.h
		58	include/libav/libavutil/hwcontext_vaapi.h
		59	include/libav/libavutil/hwcontext_vdpau.h
51	include/libav/libavutil/imgutils.h	60	include/libav/libavutil/imgutils.h
52	include/libav/libavutil/intfloat.h	61	include/libav/libavutil/intfloat.h
53	include/libav/libavutil/intreadwrite.h	62	include/libav/libavutil/intreadwrite.h
Lines 58-64 include/libav/libavutil/macros.h Link Here
58	include/libav/libavutil/mathematics.h	67	include/libav/libavutil/mathematics.h
59	include/libav/libavutil/md5.h	68	include/libav/libavutil/md5.h
60	include/libav/libavutil/mem.h	69	include/libav/libavutil/mem.h
61	include/libav/libavutil/old_pix_fmts.h
62	include/libav/libavutil/opt.h	70	include/libav/libavutil/opt.h
63	include/libav/libavutil/parseutils.h	71	include/libav/libavutil/parseutils.h
64	include/libav/libavutil/pixdesc.h	72	include/libav/libavutil/pixdesc.h
Lines 76-107 include/libav/libswscale/swscale.h Link Here
76	include/libav/libswscale/version.h	84	include/libav/libswscale/version.h
77	lib/libav/libavcodec.a	85	lib/libav/libavcodec.a
78	lib/libav/libavcodec.so	86	lib/libav/libavcodec.so
79	lib/libav/libavcodec.so.56	87	lib/libav/libavcodec.so.57
80	lib/libav/libavcodec.so.56.1.0	88	lib/libav/libavcodec.so.57.25.0
81	lib/libav/libavdevice.a	89	lib/libav/libavdevice.a
82	lib/libav/libavdevice.so	90	lib/libav/libavdevice.so
83	lib/libav/libavdevice.so.55	91	lib/libav/libavdevice.so.56
84	lib/libav/libavdevice.so.55.0.0	92	lib/libav/libavdevice.so.56.1.0
85	lib/libav/libavfilter.a	93	lib/libav/libavfilter.a
86	lib/libav/libavfilter.so	94	lib/libav/libavfilter.so
87	lib/libav/libavfilter.so.5	95	lib/libav/libavfilter.so.6
88	lib/libav/libavfilter.so.5.0.0	96	lib/libav/libavfilter.so.6.7.0
89	lib/libav/libavformat.a	97	lib/libav/libavformat.a
90	lib/libav/libavformat.so	98	lib/libav/libavformat.so
91	lib/libav/libavformat.so.56	99	lib/libav/libavformat.so.57
92	lib/libav/libavformat.so.56.1.0	100	lib/libav/libavformat.so.57.7.2
93	lib/libav/libavresample.a	101	lib/libav/libavresample.a
94	lib/libav/libavresample.so	102	lib/libav/libavresample.so
95	lib/libav/libavresample.so.2	103	lib/libav/libavresample.so.3
96	lib/libav/libavresample.so.2.1.0	104	lib/libav/libavresample.so.3.0.0
97	lib/libav/libavutil.a	105	lib/libav/libavutil.a
98	lib/libav/libavutil.so	106	lib/libav/libavutil.so
99	lib/libav/libavutil.so.54	107	lib/libav/libavutil.so.55
100	lib/libav/libavutil.so.54.3.0	108	lib/libav/libavutil.so.55.20.0
101	lib/libav/libswscale.a	109	lib/libav/libswscale.a
102	lib/libav/libswscale.so	110	lib/libav/libswscale.so
103	lib/libav/libswscale.so.3	111	lib/libav/libswscale.so.4
104	lib/libav/libswscale.so.3.0.0	112	lib/libav/libswscale.so.4.0.0
105	libdata/pkgconfig/libavcodec-libav.pc	113	libdata/pkgconfig/libavcodec-libav.pc
106	libdata/pkgconfig/libavdevice-libav.pc	114	libdata/pkgconfig/libavdevice-libav.pc
107	libdata/pkgconfig/libavfilter-libav.pc	115	libdata/pkgconfig/libavfilter-libav.pc

Return to bug 219469

Lines 1-8 Link Here

(-)./Makefile (-6 / +6 lines)
1	# $FreeBSD: head/multimedia/libav/Makefile 441819 2017-05-27 00:20:19Z linimon $	1	# $FreeBSD: head/multimedia/libav/Makefile 441819 2017-05-27 00:20:19Z linimon $
2		2
3	PORTNAME= libav	3	PORTNAME= libav
4	PORTVERSION= 11.8	4	PORTVERSION= 12.1
5	PORTREVISION= 2
6	CATEGORIES= multimedia audio ipv6 net	5	CATEGORIES= multimedia audio ipv6 net
7	MASTER_SITES= http://libav.org/releases/	6	MASTER_SITES= http://libav.org/releases/
8		7
Lines 19-24 LIB_DEPENDS= libopencv_core.so:graphics/ Link Here
19		18
20	BROKEN_armv6= fails to compile: cc: warning: joined argument expects additional value: -mcpu=	19	BROKEN_armv6= fails to compile: cc: warning: joined argument expects additional value: -mcpu=
21		20
		21	CONFLICTS= ffmpeg-[0-9]*
22	USES= cpe gmake perl5 pkgconfig tar:xz	22	USES= cpe gmake perl5 pkgconfig tar:xz
23	USE_XORG= x11	23	USE_XORG= x11
24	HAS_CONFIGURE= yes	24	HAS_CONFIGURE= yes
Lines 226-235 post-configure-DOCS-off: Link Here
226	@${REINPLACE_CMD} -e 's\|CONFIG_TEXI2HTML=yes\|!CONFIG_TEXI2HTML=yes\|' ${WRKSRC}/config.mak	226	@${REINPLACE_CMD} -e 's\|CONFIG_TEXI2HTML=yes\|!CONFIG_TEXI2HTML=yes\|' ${WRKSRC}/config.mak
227		227
228	post-install:	228	post-install:
229	.for a in bin/avconv bin/avprobe lib/libav/libavdevice.so.55.0.0\	229	.for a in bin/avconv bin/avprobe lib/libav/libavcodec.so.57.25.0\
230	lib/libav/libavfilter.so.5.0.0 lib/libav/libavformat.so.56.1.0\	230	lib/libav/libavdevice.so.56.1.0 lib/libav/libavfilter.so.6.7.0\
231	lib/libav/libavcodec.so.56.1.0 lib/libav/libavresample.so.2.1.0\	231	lib/libav/libavformat.so.57.7.2 lib/libav/libavresample.so.3.0.0\
232	lib/libav/libswscale.so.3.0.0 lib/libav/libavutil.so.54.3.0	232	lib/libav/libavutil.so.55.20.0 lib/libav/libswscale.so.4.0.0
233	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${a}	233	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${a}
234	.endfor	234	.endfor
235		235

Lines 1-30 Link Here

(-)./files/patch-libavcodec-libilbc.c (-30 lines)
1	--- libavcodec/libilbc.c.orig 2016-05-25 00:36:32 UTC
2	+++ libavcodec/libilbc.c
3	@@ -20,6 +20,7 @@
4	*/
5
6	#include <ilbc.h>
7	+#include <stdint.h>
8
9	#include "libavutil/channel_layout.h"
10	#include "libavutil/common.h"
11	@@ -95,8 +96,8 @@ static int ilbc_decode_frame(AVCodecCont
12	return ret;
13	}
14
15	- WebRtcIlbcfix_DecodeImpl((WebRtc_Word16*) frame->data[0],
16	- (const WebRtc_UWord16*) buf, &s->decoder, 1);
17	+ WebRtcIlbcfix_DecodeImpl((int16_t*) frame->data[0],
18	+ (const uint16_t*) buf, &s->decoder, 1);
19
20	*got_frame_ptr = 1;
21
22	@@ -168,7 +169,7 @@ static int ilbc_encode_frame(AVCodecCont
23	return ret;
24	}
25
26	- WebRtcIlbcfix_EncodeImpl((WebRtc_UWord16) avpkt->data, (const WebRtc_Word16) frame->data[0], &s->encoder);
27	+ WebRtcIlbcfix_EncodeImpl((uint16_t) avpkt->data, (const int16_t) frame->data[0], &s->encoder);
28
29	avpkt->size = s->encoder.no_of_bytes;
30	*got_packet_ptr = 1;

Lines 1-33 Link Here

(-)./files/patch-libavcodec_libvpxenc.c (-33 lines)
1	commit 6540fe0
2	Author: James Zern <jzern@google.com>
3	Date: Mon Oct 19 22:44:11 2015 -0700
4
5	libvpxenc: remove some unused ctrl id mappings
6
7	VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
8	from libvpx and the remaining values were never used here
9
10	Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
11	Signed-off-by: James Zern <jzern@google.com>
12	--- libavcodec/libvpxenc.c.orig 2016-05-25 00:36:32 UTC
13	+++ libavcodec/libvpxenc.c
14	@@ -70,19 +70,11 @@ typedef struct VP8EncoderContext {
15
16	/** String mappings for enum vp8e_enc_control_id */
17	static const char *const ctlidstr[] = {
18	- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
19	- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
20	- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
21	- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
22	- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
23	- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
24	[VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
25	[VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
26	[VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
27	- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
28	[VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
29	[VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
30	- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
31	[VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
32	[VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
33	[VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",