Attachment #179156 for bug #215271





PORTNAME=	chromium
PORTVERSION=	55.0.2883.87
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on


BUILD_DEPENDS=	bash:shells/bash \
		clang39:devel/llvm39 \
		ffmpeg>=3.2.2,1:multimedia/ffmpeg \
		python:lang/python \
		flock:sysutils/flock \
		gperf:devel/gperf \
		yasm:devel/yasm \
		${LOCALBASE}/include/libav/libavformat/internal.h:multimedia/libav \
		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \

		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib

LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
		libcairo.so:graphics/cairo \
		libcups.so:print/cups \
		libdbus-1.so:devel/dbus \
		libdbus-glib-1.so:devel/dbus-glib \

	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
	cd ${WRKSRC} && ${PYTHON_CMD} \
		./build/linux/unbundle/replace_gn_files.py --system-libraries \
		ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE}

do-configure:
	# GN generator bootstrapping and generating ninja files




--- media/ffmpeg/ffmpeg_common.h.orig	2017-01-20 16:39:21.594594000 +0000
+++ media/ffmpeg/ffmpeg_common.h	2017-01-20 16:40:36.609384000 +0000
@@ -25,7 +25,7 @@
 // Disable deprecated features which result in spammy compile warnings.  This
 // list of defines must mirror those in the 'defines' section of FFmpeg's
 // BUILD.gn file or the headers below will generate different structures!
-#define FF_API_CONVERGENCE_DURATION 0
+//#define FF_API_CONVERGENCE_DURATION 0
 // Upstream libavcodec/utils.c still uses the deprecated
 // av_dup_packet(), causing deprecation warnings.
 // The normal fix for such things is to disable the feature as below,
@@ -39,7 +39,6 @@
 MSVC_PUSH_DISABLE_WARNING(4244);
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavformat/internal.h>
 #include <libavformat/avio.h>
 #include <libavutil/avutil.h>
 #include <libavutil/imgutils.h>




--- media/filters/ffmpeg_demuxer.cc.orig	2017-01-20 16:41:01.338620000 +0000
+++ media/filters/ffmpeg_demuxer.cc	2017-01-20 16:45:09.946039000 +0000
@@ -1186,24 +1186,6 @@
   // If no estimate is found, the stream entry will be kInfiniteDuration.
   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
                                                     kInfiniteDuration);
-  const AVFormatInternal* internal = format_context->internal;
-  if (internal && internal->packet_buffer &&
-      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
-    struct AVPacketList* packet_buffer = internal->packet_buffer;
-    while (packet_buffer != internal->packet_buffer_end) {
-      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
-                start_time_estimates.size());
-      const AVStream* stream =
-          format_context->streams[packet_buffer->pkt.stream_index];
-      if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
-        const base::TimeDelta packet_pts =
-            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
-        if (packet_pts < start_time_estimates[stream->index])
-          start_time_estimates[stream->index] = packet_pts;
-      }
-      packet_buffer = packet_buffer->next;
-    }
-  }
 
   std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
 




--- third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.orig	2017-01-20 16:46:55.707062000 +0000
+++ third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc	2017-01-20 16:47:50.777686000 +0000
@@ -15,9 +15,9 @@
 #include <limits>
 
 extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
-#include "third_party/ffmpeg/libavformat/avformat.h"
-#include "third_party/ffmpeg/libavutil/imgutils.h"
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavutil/imgutils.h>
 }  // extern "C"
 
 #include "webrtc/base/checks.h"

Line 0 Link Here

(-)www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264__h264_decoder_impl.h (+11 lines)
	1	--- third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.orig 2017-01-20 16:47:06.507060000 +0000
	2	+++ third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h 2017-01-20 16:48:08.025635000 +0000
	3	@@ -17,7 +17,7 @@
	4	#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
	5
	6	extern "C" {
	7	-#include "third_party/ffmpeg/libavcodec/avcodec.h"
	8	+#include <libavcodec/avcodec.h>
	9	} // extern "C"
	10
	11	#include "webrtc/common_video/include/i420_buffer_pool.h"

Return to bug 215271

Lines 3-8 Link Here

(-)www/chromium/Makefile (-2 / +6 lines)
3		3
4	PORTNAME= chromium	4	PORTNAME= chromium
5	PORTVERSION= 55.0.2883.87	5	PORTVERSION= 55.0.2883.87
		6	PORTREVISION= 1
6	CATEGORIES= www	7	CATEGORIES= www
7	MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/	8	MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on	9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
Lines 15-24 Link Here
15		16
16	BUILD_DEPENDS= bash:shells/bash \	17	BUILD_DEPENDS= bash:shells/bash \
17	clang39:devel/llvm39 \	18	clang39:devel/llvm39 \
		19	ffmpeg>=3.2.2,1:multimedia/ffmpeg \
18	python:lang/python \	20	python:lang/python \
19	flock:sysutils/flock \	21	flock:sysutils/flock \
20	gperf:devel/gperf \	22	gperf:devel/gperf \
21	yasm:devel/yasm \	23	yasm:devel/yasm \
		24	${LOCALBASE}/include/libav/libavformat/internal.h:multimedia/libav \
22	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \	25	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
23	${LOCALBASE}/share/usbids/usb.ids:misc/usbids \	26	${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
24	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \	27	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
Lines 25-31 Link Here
25	${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \	28	${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
26	${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib	29	${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
27		30
28	LIB_DEPENDS= libcairo.so:graphics/cairo \	31	LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
		32	libcairo.so:graphics/cairo \
29	libcups.so:print/cups \	33	libcups.so:print/cups \
30	libdbus-1.so:devel/dbus \	34	libdbus-1.so:devel/dbus \
31	libdbus-glib-1.so:devel/dbus-glib \	35	libdbus-glib-1.so:devel/dbus-glib \
Lines 224-230 Link Here
224	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]	228	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
225	cd ${WRKSRC} && ${PYTHON_CMD} \	229	cd ${WRKSRC} && ${PYTHON_CMD} \
226	./build/linux/unbundle/replace_gn_files.py --system-libraries \	230	./build/linux/unbundle/replace_gn_files.py --system-libraries \
227	flac harfbuzz-ng libwebp libxml libxslt snappy yasm \|\| ${FALSE}	231	ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm \|\| ${FALSE}
228		232
229	do-configure:	233	do-configure:
230	# GN generator bootstrapping and generating ninja files	234	# GN generator bootstrapping and generating ninja files

Line 0 Link Here

(-)www/chromium/files/patch-media_ffmpeg__ffmpeg_common.h (+19 lines)
	1	--- media/ffmpeg/ffmpeg_common.h.orig 2017-01-20 16:39:21.594594000 +0000
	2	+++ media/ffmpeg/ffmpeg_common.h 2017-01-20 16:40:36.609384000 +0000
	3	@@ -25,7 +25,7 @@
	4	// Disable deprecated features which result in spammy compile warnings. This
	5	// list of defines must mirror those in the 'defines' section of FFmpeg's
	6	// BUILD.gn file or the headers below will generate different structures!
	7	-#define FF_API_CONVERGENCE_DURATION 0
	8	+//#define FF_API_CONVERGENCE_DURATION 0
	9	// Upstream libavcodec/utils.c still uses the deprecated
	10	// av_dup_packet(), causing deprecation warnings.
	11	// The normal fix for such things is to disable the feature as below,
	12	@@ -39,7 +39,6 @@
	13	MSVC_PUSH_DISABLE_WARNING(4244);
	14	#include <libavcodec/avcodec.h>
	15	#include <libavformat/avformat.h>
	16	-#include <libavformat/internal.h>
	17	#include <libavformat/avio.h>
	18	#include <libavutil/avutil.h>
	19	#include <libavutil/imgutils.h>

Line 0 Link Here

(-)www/chromium/files/patch-media_filters__ffmpeg_demuxer.cc (+27 lines)
	1	--- media/filters/ffmpeg_demuxer.cc.orig 2017-01-20 16:41:01.338620000 +0000
	2	+++ media/filters/ffmpeg_demuxer.cc 2017-01-20 16:45:09.946039000 +0000
	3	@@ -1186,24 +1186,6 @@
	4	// If no estimate is found, the stream entry will be kInfiniteDuration.
	5	std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
	6	kInfiniteDuration);
	7	- const AVFormatInternal* internal = format_context->internal;
	8	- if (internal && internal->packet_buffer &&
	9	- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
	10	- struct AVPacketList* packet_buffer = internal->packet_buffer;
	11	- while (packet_buffer != internal->packet_buffer_end) {
	12	- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
	13	- start_time_estimates.size());
	14	- const AVStream* stream =
	15	- format_context->streams[packet_buffer->pkt.stream_index];
	16	- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
	17	- const base::TimeDelta packet_pts =
	18	- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
	19	- if (packet_pts < start_time_estimates[stream->index])
	20	- start_time_estimates[stream->index] = packet_pts;
	21	- }
	22	- packet_buffer = packet_buffer->next;
	23	- }
	24	- }
	25
	26	std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
	27