cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to FFmpeg 20151112 (2.8.2).

Browse Source 
from Brad (maintainer)
This commit is contained in:
ajacoutot 2015-11-16 06:36:55 +00:00
parent 1b99924d3c
commit c7a3ab83e8
4 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/ffmpeg/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.134 2015/11/13 07:03:00 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.135 2015/11/16 06:36:55 ajacoutot Exp $
COMMENT= audio/video converter and streamer
V= 20150909
V= 20151112
DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V}
REVISION= 10
CATEGORIES= graphics multimedia
MASTER_SITES= http://comstyle.com/source/
EXTRACT_SUFX= .tar.xz

4
graphics/ffmpeg/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ffmpeg-git-20150909.tar.xz) = FpIAItYSosU6F0YTkINBx+rZn1q5zVzFsOGBqaa5VPM=
SIZE (ffmpeg-git-20150909.tar.xz) = 6913596
SHA256 (ffmpeg-git-20151112.tar.xz) = dt1KmWNp7dnrvVXRS/nHCQQk4OwgdepD/PuwvMgB4mc=
SIZE (ffmpeg-git-20151112.tar.xz) = 6926012

18
graphics/ffmpeg/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.50 2015/09/10 07:10:04 ajacoutot Exp $
--- configure.orig Mon Sep 7 21:58:01 2015
+++ configure Wed Sep 9 03:08:46 2015
$OpenBSD: patch-configure,v 1.51 2015/11/16 06:36:55 ajacoutot Exp $
--- configure.orig Thu Nov 12 02:08:28 2015
+++ configure Sun Nov 15 22:08:43 2015
@@ -4307,7 +4307,7 @@ case $target_os in
openbsd|bitrig)
disable symver
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.50 2015/09/10 07:10:04 ajacoutot Exp $
enable_weak_pic() {
disabled pic && return
@@ -5556,7 +5556,9 @@ check_ldflags -Wl,--warn-common
@@ -5557,7 +5557,9 @@ 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
enabled rpath && add_ldlibflags -Wl,-rpath,$libdir
@ -30,7 +30,7 @@ $OpenBSD: patch-configure,v 1.50 2015/09/10 07:10:04 ajacoutot Exp $
# add some strip flags
# -wN '..@*' is more selective than -x, but not available everywhere.
@@ -5784,6 +5786,11 @@ if test $target_os = "haiku"; then
@@ -5785,6 +5787,11 @@ if test $target_os = "haiku"; then
disable posix_memalign
fi
@ -42,7 +42,7 @@ $OpenBSD: patch-configure,v 1.50 2015/09/10 07:10:04 ajacoutot Exp $
enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
prepend ffmpeg_libs $($ldflags_filter "-lole32" "-luser32") &&
enable dxva2_lib
@@ -6216,8 +6223,8 @@ pkgconfig_generate(){
@@ -6217,8 +6224,8 @@ pkgconfig_generate(){
comment=$2
version=$3
libs=$4
@ -53,7 +53,7 @@ $OpenBSD: patch-configure,v 1.50 2015/09/10 07:10:04 ajacoutot Exp $
enabled ${name#lib} || return 0
mkdir -p $name
cat <<EOF > $name/$name${build_suffix}.pc
@@ -6232,7 +6239,7 @@ Version: $version
@@ -6233,7 +6240,7 @@ Version: $version
Requires: $(enabled shared || echo $requires)
Requires.private: $(enabled shared && echo $requires)
Conflicts:
@ -62,7 +62,7 @@ $OpenBSD: patch-configure,v 1.50 2015/09/10 07:10:04 ajacoutot Exp $
Libs.private: $(enabled shared && echo $libs)
Cflags: -I\${includedir}
EOF
@@ -6256,12 +6263,12 @@ Cflags: -I\${includedir}
@@ -6257,12 +6264,12 @@ Cflags: -I\${includedir}
EOF
}
@ -74,7 +74,7 @@ $OpenBSD: patch-configure,v 1.50 2015/09/10 07:10:04 ajacoutot Exp $
-pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" ""
-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"
-pkgconfig_generate libswresample "FFmpeg audio resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM $LIBSOXR"
+pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBavutil_EXTRALIBS" "$LIBavutil_REQUIRES" "$LIBavutil_LINKFLAGS"
+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$LIBavcodec_EXTRALIBS" "$LIBavcodec_REQUIRES" "$LIBavcodec_LINKFLAGS"
+pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$LIBavformat_EXTRALIBS" "$LIBavformat_REQUIRES" "$LIBavformat_LINKFLAGS"

27
graphics/ffmpeg/patches/patch-libavformat_hls_c
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-libavformat_hls_c,v 1.1 2015/10/03 19:39:47 sthen Exp $
From 26eb2940079d0ec433cf9b2deae24560707cbcf8 Mon Sep 17 00:00:00 2001
From: wm4 <nfxjfg@googlemail.com>
Date: Mon, 21 Sep 2015 14:43:06 +0200
Subject: [PATCH] avformat/hls: fix some cases of HLS streams which require
cookies
--- libavformat/hls.c.orig Sat Oct 3 12:33:34 2015
+++ libavformat/hls.c Sat Oct 3 12:33:55 2015
@@ -516,15 +516,11 @@ static int url_connect(struct playlist *pls, AVDiction
av_dict_copy(&tmp, opts, 0);
av_dict_copy(&tmp, opts2, 0);
- if ((ret = av_opt_set_dict(pls->input, &tmp)) < 0)
- goto fail;
-
- if ((ret = ffurl_connect(pls->input, NULL)) < 0) {
+ if ((ret = ffurl_connect(pls->input, &tmp)) < 0) {
ffurl_close(pls->input);
pls->input = NULL;
}
-fail:
av_dict_free(&tmp);
return ret;
}