On 9/12/14, Brad Smith <[email protected]> wrote:
> Here is an update to a newer FFmpeg snapshot from 20140912. Mainly
> to fix bugs with HEVC and VP9 decoding (among the other bug fixes
> coming in).
Not sure if you care. Seems OK on amd64, playing some mp4s
and converting some m4a to mp3s.
--patrick
$ sysctl kern.version
kern.version=OpenBSD 5.6-current (GENERIC.MP) #368: Tue Sep 9 00:28:20 MDT 2014
[email protected]:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> OK?
>
>
> Index: graphics/ffmpeg/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
> retrieving revision 1.106
> diff -u -p -u -p -r1.106 Makefile
> --- graphics/ffmpeg/Makefile 4 Sep 2014 05:49:49 -0000 1.106
> +++ graphics/ffmpeg/Makefile 12 Sep 2014 15:13:21 -0000
> @@ -2,22 +2,21 @@
>
> COMMENT= audio/video converter and streamer
>
> -V= 20140810
> +V= 20140912
> DISTNAME= ffmpeg-git-${V}
> PKGNAME= ffmpeg-${V}
> -REVISION= 0
> CATEGORIES= graphics multimedia
> MASTER_SITES= http://comstyle.com/source/
> EXTRACT_SUFX= .tar.xz
>
> -SHARED_LIBS= avcodec 21.0 \
> +SHARED_LIBS= avcodec 21.1 \
> avdevice 9.0 \
> avfilter 7.0 \
> - avformat 19.0 \
> + avformat 19.1 \
> avresample 1.0 \
> - avutil 12.0 \
> + avutil 12.1 \
> postproc 16.0 \
> - swresample 1.0 \
> + swresample 1.1 \
> swscale 6.0
>
> HOMEPAGE= http://ffmpeg.org/
> @@ -33,6 +32,11 @@ WANTLIB= SDL X11 Xext Xfixes Xv bz2 c cr
> theoraenc vorbis vorbisenc vpx>=5 x264>=8 x265 xvidcore \
> z
>
> +MODULES= lang/clang
> +
> +MODCLANG_ARCHS= amd64 i386
> +MODCLANG_LANGS= c
> +
> BUILD_DEPENDS= textproc/texi2html
> .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
> BUILD_DEPENDS+= devel/yasm
> @@ -90,6 +94,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
> --disable-iconv \
> --disable-indev=jack \
> --disable-indev=oss \
> + --disable-lzma \
> --disable-mips32r2 \
> --disable-mipsdspr1 \
> --disable-mipsdspr2 \
> Index: graphics/ffmpeg/distinfo
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v
> retrieving revision 1.31
> diff -u -p -u -p -r1.31 distinfo
> --- graphics/ffmpeg/distinfo 14 Aug 2014 08:20:27 -0000 1.31
> +++ graphics/ffmpeg/distinfo 12 Sep 2014 15:14:09 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (ffmpeg-git-20140810.tar.xz) =
> 1yR5E7oR6twORJ9rbd7iWMFZAfKegkIGZxdf19V2rXU=
> -SIZE (ffmpeg-git-20140810.tar.xz) = 6168568
> +SHA256 (ffmpeg-git-20140912.tar.xz) =
> TGf/UNFP2SY+D+s1kMslPSEowOd+St9PiH0qaoe6lZI=
> +SIZE (ffmpeg-git-20140912.tar.xz) = 6038712
> Index: graphics/ffmpeg/patches/patch-configure
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-configure,v
> retrieving revision 1.40
> diff -u -p -u -p -r1.40 patch-configure
> --- graphics/ffmpeg/patches/patch-configure 14 Aug 2014 08:20:27 -0000
> 1.40
> +++ graphics/ffmpeg/patches/patch-configure 4 Sep 2014 06:03:50 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-configure,v 1.40 2014/08/14 08:20:27 brad Exp $
> ---- configure.orig Sun Aug 10 21:09:03 2014
> -+++ configure Sun Aug 10 21:15:16 2014
> -@@ -1630,7 +1630,6 @@ HEADERS_LIST="
> +--- configure.orig Thu Sep 4 01:50:15 2014
> ++++ configure Thu Sep 4 02:03:44 2014
> +@@ -1633,7 +1633,6 @@ HEADERS_LIST="
> mach_mach_time_h
> machine_ioctl_bt848_h
> machine_ioctl_meteor_h
> @@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.40 2014/08
> openjpeg_1_5_openjpeg_h
> OpenGL_gl3_h
> poll_h
> -@@ -3970,7 +3969,7 @@ case $target_os in
> +@@ -3981,7 +3980,7 @@ case $target_os in
> openbsd|bitrig)
> disable symver
> SHFLAGS='-shared'
> @@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.40 2014/08
> SLIB_INSTALL_LINKS=
> oss_indev_extralibs="-lossaudio"
> oss_outdev_extralibs="-lossaudio"
> -@@ -4301,7 +4300,7 @@ die_license_disabled version3 libvo_amrwbenc
> +@@ -4312,7 +4311,7 @@ die_license_disabled version3 libvo_amrwbenc
>
> enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
>
> @@ -27,15 +27,15 @@ $OpenBSD: patch-configure,v 1.40 2014/08
>
> enable_weak_pic() {
> disabled pic && return
> -@@ -5026,7 +5025,6 @@ check_disable_warning -Wno-pointer-sign
> +@@ -5042,7 +5041,6 @@ check_disable_warning -Wno-pointer-sign
> check_ldflags -Wl,--warn-common
> check_ldflags
> -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
> - enabled rpath && add_ldflags -Wl,-rpath,$libdir
> + enabled rpath && add_ldexeflags -Wl,-rpath,$libdir
> -test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
>
> # add some strip flags
> # -wN '..@*' is more selective than -x, but not available everywhere.
> -@@ -5645,8 +5643,8 @@ pkgconfig_generate(){
> +@@ -5662,8 +5660,8 @@ pkgconfig_generate(){
> comment=$2
> version=$3
> libs=$4
> @@ -46,7 +46,7 @@ $OpenBSD: patch-configure,v 1.40 2014/08
> enabled ${name#lib} || return 0
> mkdir -p $name
> cat <<EOF > $name/$name${build_suffix}.pc
> -@@ -5661,7 +5659,7 @@ Version: $version
> +@@ -5678,7 +5676,7 @@ Version: $version
> Requires: $(enabled shared || echo $requires)
> Requires.private: $(enabled shared && echo $requires)
> Conflicts:
> @@ -55,7 +55,7 @@ $OpenBSD: patch-configure,v 1.40 2014/08
> Libs.private: $(enabled shared && echo $libs)
> Cflags: -I\${includedir}
> EOF
> -@@ -5694,3 +5692,13 @@ pkgconfig_generate libpostproc "FFmpeg
> postprocessin
> +@@ -5711,3 +5709,13 @@ pkgconfig_generate libpostproc "FFmpeg
> postprocessin
> pkgconfig_generate libavresample "Libav audio resampling library"
> "$LIBAVRESAMPLE_VERSION" "$LIBM"
> pkgconfig_generate libswscale "FFmpeg image rescaling library"
> "$LIBSWSCALE_VERSION" "$LIBM"
> pkgconfig_generate libswresample "FFmpeg audio resampling library"
> "$LIBSWRESAMPLE_VERSION" "$LIBM"
> Index: graphics/ffmpeg/patches/patch-libavdevice_x11grab_c
> ===================================================================
> RCS file: graphics/ffmpeg/patches/patch-libavdevice_x11grab_c
> diff -N graphics/ffmpeg/patches/patch-libavdevice_x11grab_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ graphics/ffmpeg/patches/patch-libavdevice_x11grab_c 4 Sep 2014
> 22:52:35
> -0000
> @@ -0,0 +1,11 @@
> +$OpenBSD$
> +--- libavdevice/x11grab.c.orig Thu Sep 4 18:52:06 2014
> ++++ libavdevice/x11grab.c Thu Sep 4 18:52:25 2014
> +@@ -39,6 +39,7 @@
> + #include "config.h"
> +
> + #include <time.h>
> ++#include <sys/types.h>
> + #include <sys/shm.h>
> +
> + #include <X11/cursorfont.h>
> Index: graphics/ffmpeg/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/pkg/PLIST,v
> retrieving revision 1.29
> diff -u -p -u -p -r1.29 PLIST
> --- graphics/ffmpeg/pkg/PLIST 14 Aug 2014 08:20:27 -0000 1.29
> +++ graphics/ffmpeg/pkg/PLIST 4 Sep 2014 23:06:34 -0000
> @@ -74,6 +74,7 @@ include/libavutil/macros.h
> include/libavutil/mathematics.h
> include/libavutil/md5.h
> include/libavutil/mem.h
> +include/libavutil/motion_vector.h
> include/libavutil/murmur3.h
> include/libavutil/old_pix_fmts.h
> include/libavutil/opt.h
> @@ -197,6 +198,7 @@ share/ffmpeg/examples/README
> share/ffmpeg/examples/avio_reading.c
> share/ffmpeg/examples/decoding_encoding.c
> share/ffmpeg/examples/demuxing_decoding.c
> +share/ffmpeg/examples/extract_mvs.c
> share/ffmpeg/examples/filter_audio.c
> share/ffmpeg/examples/filtering_audio.c
> share/ffmpeg/examples/filtering_video.c
> Index: x11/mplayer/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
> retrieving revision 1.240
> diff -u -p -u -p -r1.240 Makefile
> --- x11/mplayer/Makefile 3 Sep 2014 06:43:28 -0000 1.240
> +++ x11/mplayer/Makefile 12 Sep 2014 16:01:11 -0000
> @@ -8,13 +8,14 @@ ONLY_FOR_ARCHS = ${GCC4_ARCHS}
> COMMENT = movie player supporting many formats
>
> V = 20140824
> -FFMPEG_V = 20140810
> +FFMPEG_V = 20140912
>
> SUBST_VARS += PREFIX CONFDIR
>
> # Distfiles must be hand-rolled, see README
> N = mplayer
> DISTNAME = mplayer-${V}
> +REVISION = 0
> EXTRACT_SUFX = .tar.xz
>
> CATEGORIES = x11 multimedia
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
>
