Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 05 Dec 2016 00:01:38 +0000
From:      bugzilla-noreply@freebsd.org
To:        multimedia@FreeBSD.org
Subject:   [Bug 207547] [exp-run] Update ffmpeg to 3.2
Message-ID:  <bug-207547-12827-vNYearHyAF@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-207547-12827@https.bugs.freebsd.org/bugzilla/>
References:  <bug-207547-12827@https.bugs.freebsd.org/bugzilla/>

next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D207547

--- Comment #51 from Jan Beich (mail not working) <jbeich@FreeBSD.org> ---
Comment on attachment 177651
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D177651
svn diff to ffmpeg 3.2.1

> -USES=3D		compiler:c11 cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
> +USES=3D		compiler cpe gmake perl5 pkgconfig tar:bzip2 shebangfix

What's the rationale for backing out ports r425640?

> -OPTIONS_DEFINE=3D AACPLUS ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1=
394 \
> +OPTIONS_DEFINE=3D ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT=
 DC1394 \

Did you actually review upstream changes to configure during updates? One of
the following already has a port:

    --enable-libebur128      enable libebur128 for EBU R128 measurement,
                             needed for loudnorm filter [no]
    --enable-libopenmpt      enable decoding tracked files via libopenmpt [=
no]

> +	@${REINPLACE_CMD} -E \
> +		-e 's|#include <SDL|#include <SDL2/SDL|' \
> +		${WRKSRC}/ffplay.c \
> +		${WRKSRC}/libavdevice/opengl_enc.c \
> +		${WRKSRC}/libavdevice/sdl2.c

What's the rationale for keeping this cruft? "sdl2-config --cflags" already
includes path to where the correct SDL.h is located.

> +-                              sizeof(rtsp_st->sdp_ip),
[...]
>  +                        sizeof(rtsp_st->sdp_ip),

Nop change. Rebase to avoid + line by adjusting whitespace to be consistent
with the rest of the file.

> +--include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile
> ++-include $(SRC_PATH)/tests/checkasm/$(FFMPEG_ARCH)/Makefile

Patching source to work around Mk/bsd.port.mk bug doesn't make sense. Define
NOPRECIOUSMAKEVARS=3D1 then drop all $(FFMPEG_ARCH) hacks.

> +%%OPENCL%%include/libavutil/opencl.h
>  include/libavcodec/avcodec.h

Sort as if %%FOO%% lines were all expanded to "" i.e., put %%OPENCL%% to wh=
ere
it was.

--=20
You are receiving this mail because:
You are on the CC list for the bug.
You are the assignee for the bug.=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-207547-12827-vNYearHyAF>