Here is an update to FFmpeg 20150107. Another snapshot
along the 2.4 branch to roll in any bug fixes commited
between the last snap and now.
OK?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.109
diff -u -p -u -p -r1.109 Makefile
--- Makefile 4 Nov 2014 09:31:01 -0000 1.109
+++ Makefile 7 Jan 2015 09:00:20 -0000
@@ -2,10 +2,9 @@
COMMENT= audio/video converter and streamer
-V= 20141010
+V= 20150107
DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V}
-REVISION= 1
CATEGORIES= graphics multimedia
MASTER_SITES= http://comstyle.com/source/
EXTRACT_SUFX= .tar.xz
@@ -29,9 +28,8 @@ PERMIT_PACKAGE_CDROM= patents
PERMIT_PACKAGE_FTP= Yes
WANTLIB= SDL X11 Xext Xfixes Xv bz2 c crypto gsm m mp3lame opus \
- pthread schroedinger-1.0>=2 sndio speex ssl theoradec \
- theoraenc vorbis vorbisenc vpx>=5 x264>=8 xvidcore \
- z
+ pthread schroedinger-1.0 sndio speex ssl theoradec \
+ theoraenc vorbis vorbisenc vpx>=5 x264 xvidcore z
MODULES= lang/clang
@@ -51,8 +49,8 @@ LIB_DEPENDS= archivers/bzip2 \
devel/sdl \
multimedia/libtheora \
multimedia/libvpx>=1.3.0 \
- multimedia/schroedinger>=1.0.10 \
- multimedia/x264>=20111027 \
+ multimedia/schroedinger \
+ multimedia/x264 \
multimedia/xvidcore
# inter-library dependencies for the current configuration
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 distinfo
--- distinfo 19 Oct 2014 23:14:23 -0000 1.32
+++ distinfo 7 Jan 2015 09:40:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-git-20141010.tar.xz) =
tYaAiBQbiblTXvBwUK76cOWPOvb3XooQ+2DvtaGlEUU=
-SIZE (ffmpeg-git-20141010.tar.xz) = 6042584
+SHA256 (ffmpeg-git-20150107.tar.xz) =
mWY/3jAEIB03/M5qVOHTmXitR1PsOwfxTZDpYueTzeM=
+SIZE (ffmpeg-git-20150107.tar.xz) = 6186516
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-configure,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 patch-configure
--- patches/patch-configure 23 Oct 2014 07:41:45 -0000 1.42
+++ patches/patch-configure 7 Jan 2015 09:42:25 -0000
@@ -1,11 +1,7 @@
$OpenBSD: patch-configure,v 1.42 2014/10/23 07:41:45 brad Exp $
-
-04a4fb81b3d1a92f52b5404738da8971c018946f
-v4l2: Make use of the VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD
-
---- configure.orig Wed Oct 8 18:04:13 2014
-+++ configure Sun Oct 19 19:48:01 2014
-@@ -3990,7 +3990,7 @@ case $target_os in
+--- configure.orig Wed Jan 7 04:31:28 2015
++++ configure Wed Jan 7 04:42:09 2015
+@@ -3992,7 +3992,7 @@ case $target_os in
openbsd|bitrig)
disable symver
SHFLAGS='-shared'
@@ -14,7 +10,7 @@ v4l2: Make use of the VIDIOC_ENUM_FRAMES
SLIB_INSTALL_LINKS=
oss_indev_extralibs="-lossaudio"
oss_outdev_extralibs="-lossaudio"
-@@ -4321,7 +4321,7 @@ die_license_disabled version3 libvo_amrwbenc
+@@ -4323,7 +4323,7 @@ die_license_disabled version3 libvo_amrwbenc
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
@@ -23,15 +19,7 @@ v4l2: Make use of the VIDIOC_ENUM_FRAMES
enable_weak_pic() {
disabled pic && return
-@@ -4943,6 +4943,7 @@ check_header linux/videodev2.h
- check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse;
vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
-
- check_header sys/videoio.h
-+check_code cc sys/videoio.h "struct v4l2_frmsizeenum vfse;
vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
-
- check_func_headers "windows.h vfw.h" capCreateCaptureWindow
"$vfwcap_indev_extralibs"
- # check that WM_CAP_DRIVER_CONNECT is defined to the proper value
-@@ -5052,7 +5053,6 @@ check_disable_warning -Wno-pointer-sign
+@@ -5054,7 +5054,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_ldexeflags -Wl,-rpath,$libdir
@@ -39,7 +27,7 @@ v4l2: Make use of the VIDIOC_ENUM_FRAMES
# add some strip flags
# -wN '..@*' is more selective than -x, but not available everywhere.
-@@ -5672,8 +5672,8 @@ pkgconfig_generate(){
+@@ -5675,8 +5674,8 @@ pkgconfig_generate(){
comment=$2
version=$3
libs=$4
@@ -50,7 +38,7 @@ v4l2: Make use of the VIDIOC_ENUM_FRAMES
enabled ${name#lib} || return 0
mkdir -p $name
cat <<EOF > $name/$name${build_suffix}.pc
-@@ -5688,7 +5688,7 @@ Version: $version
+@@ -5691,7 +5690,7 @@ Version: $version
Requires: $(enabled shared || echo $requires)
Requires.private: $(enabled shared && echo $requires)
Conflicts:
@@ -59,7 +47,7 @@ v4l2: Make use of the VIDIOC_ENUM_FRAMES
Libs.private: $(enabled shared && echo $libs)
Cflags: -I\${includedir}
EOF
-@@ -5721,3 +5721,13 @@ pkgconfig_generate libpostproc "FFmpeg postprocessin
+@@ -5724,3 +5723,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"
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
