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

Update to FFmpeg 20150412: a snapshot from the 2.6 branch currently at the 2.6.2

Browse Source 
release.

Two of the lib dependencies got removed:
- libschroedinger: currently broken because of an issue with mutexes;
unmaintained upstream and its a niche codec
- libtheora: modern replacements such as VP8 / VP9 are more than good enough to
replace VP3 use

from brad (maintainer)
This commit is contained in:
ajacoutot 2015-04-28 06:32:47 +00:00
parent 31fbb69ad0
commit 1853f9d4c4
5 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
graphics/ffmpeg/Makefile
View File

@ -1,24 +1,23 @@
# $OpenBSD: Makefile,v 1.111 2015/02/17 01:28:52 brad Exp $
# $OpenBSD: Makefile,v 1.112 2015/04/28 06:32:47 ajacoutot Exp $
COMMENT= audio/video converter and streamer
V= 20150107
V= 20150412
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.1 \
avdevice 9.0 \
avfilter 7.0 \
avformat 19.1 \
SHARED_LIBS= avcodec 22.0 \
avdevice 10.0 \
avfilter 7.1 \
avformat 19.2 \
avresample 1.0 \
avutil 12.1 \
postproc 16.0 \
avutil 12.2 \
postproc 16.1 \
swresample 1.1 \
swscale 6.0
swscale 6.1
HOMEPAGE= http://ffmpeg.org/
@ -28,9 +27,9 @@ MAINTAINER= Brad Smith <brad@comstyle.com>
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 sndio speex ssl theoradec theoraenc vorbis \
vorbisenc vpx>=5 x264 xvidcore z
WANTLIB= SDL X11 Xext Xv bz2 c crypto gsm m mp3lame opus pthread \
sndio speex ssl vorbis vorbisenc vpx>=5 x264 xcb xcb-shape \
xcb-shm xcb-xfixes xvidcore z \
MODULES= lang/clang
@ -48,14 +47,12 @@ LIB_DEPENDS= archivers/bzip2 \
audio/speex \
audio/gsm \
devel/sdl \
multimedia/libtheora \
multimedia/libvpx>=1.3.0 \
multimedia/schroedinger \
multimedia/x264 \
multimedia/xvidcore
# inter-library dependencies for the current configuration
LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXfixes -lXv -lsndio
LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXv -lxcb-render -lxcb-shape -lxcb-shm -lxcb-xfixes -lxcb -lsndio
LIBavfilter_EXTRALIBS=
LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2 -lssl -lcrypto -pthread
LIBavresample_EXTRALIBS=
@ -79,11 +76,11 @@ FFMPEG_ARCH= ${MACHINE_ARCH}
LIB_DEPENDS+= multimedia/x265>=1.5
WANTLIB+= x265>=2
CONFIGURE_ARGS+= --enable-libx265
CONFIGURE_ENV+= LIBavcodec_REQUIRES="libavutil libswresample opus schroedinger-1.0 speex theoraenc vpx x264 x265"
LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lgsm -lmp3lame -lopus -lschroedinger-1.0 -lspeex -ltheoradec -ltheoraenc -lvorbis -lvorbisenc -lvpx -lx264 -lx265 -lxvidcore -lz -pthread
CONFIGURE_ENV+= LIBavcodec_REQUIRES="libavutil libswresample opus speex vpx x264 x265"
LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lgsm -lmp3lame -lopus -lspeex -lvorbis -lvorbisenc -lvpx -lx264 -lx265 -lxvidcore -lz -pthread
.else
CONFIGURE_ENV+= LIBavcodec_REQUIRES="libavutil libswresample opus schroedinger-1.0 speex theoraenc vpx x264"
LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lgsm -lmp3lame -lopus -lschroedinger-1.0 -lspeex -ltheoradec -ltheoraenc -lvorbis -lvorbisenc -lvpx -lx264 -lxvidcore -lz -pthread
CONFIGURE_ENV+= LIBavcodec_REQUIRES="libavutil libswresample opus speex vpx x264"
LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lgsm -lmp3lame -lopus -lspeex -lvorbis -lvorbisenc -lvpx -lx264 -lxvidcore -lz -pthread
.endif
OPTFLAGS= ${CFLAGS}
@ -105,7 +102,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-indev=jack \
--disable-indev=oss \
--disable-lzma \
--disable-mips32r2 \
--disable-mipsdspr1 \
--disable-mipsdspr2 \
--disable-neon \
@ -117,16 +113,13 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-libgsm \
--enable-libmp3lame \
--enable-libopus \
--enable-libschroedinger \
--enable-libspeex \
--enable-libtheora \
--enable-libvorbis \
--enable-libvpx \
--enable-libx264 \
--enable-libxvid \
--enable-nonfree \
--enable-openssl \
--enable-x11grab \
--extra-cflags="-I${LOCALBASE}/include -I${X11BASE}/include" \
--extra-libs="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
--mandir=${PREFIX}/man \

4
graphics/ffmpeg/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ffmpeg-git-20150107.tar.xz) = mWY/3jAEIB03/M5qVOHTmXitR1PsOwfxTZDpYueTzeM=
SIZE (ffmpeg-git-20150107.tar.xz) = 6186516
SHA256 (ffmpeg-git-20150412.tar.xz) = /aI+nzNZ+8qN4MBDunq/krMXNKflxzshGnJjaolsJvc=
SIZE (ffmpeg-git-20150412.tar.xz) = 6393564

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.43 2015/01/10 10:46:37 brad Exp $
--- 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: patch-configure,v 1.44 2015/04/28 06:32:47 ajacoutot Exp $
--- configure.orig Wed Mar 25 18:11:38 2015
+++ configure Wed Mar 25 18:16:17 2015
@@ -4057,7 +4057,7 @@ case $target_os in
openbsd|bitrig)
disable symver
SHFLAGS='-shared'
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.43 2015/01/10 10:46:37 brad Exp $
SLIB_INSTALL_LINKS=
oss_indev_extralibs="-lossaudio"
oss_outdev_extralibs="-lossaudio"
@@ -4323,7 +4323,7 @@ die_license_disabled version3 libvo_amrwbenc
@@ -4404,7 +4404,7 @@ die_license_disabled version3 libvo_amrwbenc
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.43 2015/01/10 10:46:37 brad Exp $
enable_weak_pic() {
disabled pic && return
@@ -5054,7 +5054,6 @@ check_disable_warning -Wno-pointer-sign
@@ -5203,7 +5203,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
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.43 2015/01/10 10:46:37 brad Exp $
# add some strip flags
# -wN '..@*' is more selective than -x, but not available everywhere.
@@ -5675,8 +5674,8 @@ pkgconfig_generate(){
@@ -5823,8 +5822,8 @@ pkgconfig_generate(){
comment=$2
version=$3
libs=$4
@ -38,7 +38,7 @@ $OpenBSD: patch-configure,v 1.43 2015/01/10 10:46:37 brad Exp $
enabled ${name#lib} || return 0
mkdir -p $name
cat <<EOF > $name/$name${build_suffix}.pc
@@ -5691,7 +5690,7 @@ Version: $version
@@ -5839,7 +5838,7 @@ Version: $version
Requires: $(enabled shared || echo $requires)
Requires.private: $(enabled shared && echo $requires)
Conflicts:
@ -47,7 +47,7 @@ $OpenBSD: patch-configure,v 1.43 2015/01/10 10:46:37 brad Exp $
Libs.private: $(enabled shared && echo $libs)
Cflags: -I\${includedir}
EOF
@@ -5724,3 +5723,13 @@ pkgconfig_generate libpostproc "FFmpeg postprocessin
@@ -5872,3 +5871,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"

10
graphics/ffmpeg/patches/patch-library_mak
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-library_mak,v 1.4 2014/05/16 01:34:50 brad Exp $
--- library.mak.orig Tue Mar 11 01:57:35 2014
+++ library.mak Tue Mar 11 02:39:44 2014
@@ -53,7 +53,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
$OpenBSD: patch-library_mak,v 1.5 2015/04/28 06:32:47 ajacoutot Exp $
--- library.mak.orig Wed Mar 25 18:11:40 2015
+++ library.mak Wed Mar 25 18:16:17 2015
@@ -57,7 +57,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver
$(SLIB_CREATE_DEF_CMD)
@ -10,7 +10,7 @@ $OpenBSD: patch-library_mak,v 1.4 2014/05/16 01:34:50 brad Exp $
$(SLIB_EXTRA_CMD)
ifdef SUBDIR
@@ -70,8 +70,6 @@ distclean:: clean
@@ -74,8 +74,6 @@ distclean:: clean
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
$(Q)mkdir -p "$(SHLIBDIR)"
$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"

9
graphics/ffmpeg/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.30 2014/10/19 23:14:24 brad Exp $
@comment $OpenBSD: PLIST,v 1.31 2015/04/28 06:32:48 ajacoutot Exp $
@bin bin/ffmpeg
@bin bin/ffplay
@bin bin/ffprobe
@ -10,10 +10,12 @@ include/libavcodec/avfft.h
include/libavcodec/dv_profile.h
include/libavcodec/dxva2.h
include/libavcodec/old_codec_ids.h
include/libavcodec/qsv.h
include/libavcodec/vaapi.h
include/libavcodec/vda.h
include/libavcodec/vdpau.h
include/libavcodec/version.h
include/libavcodec/vorbis_parser.h
include/libavcodec/xvmc.h
include/libavdevice/
include/libavdevice/avdevice.h
@ -48,6 +50,8 @@ include/libavutil/blowfish.h
include/libavutil/bprint.h
include/libavutil/bswap.h
include/libavutil/buffer.h
include/libavutil/camellia.h
include/libavutil/cast5.h
include/libavutil/channel_layout.h
include/libavutil/common.h
include/libavutil/cpu.h
@ -65,7 +69,6 @@ include/libavutil/hash.h
include/libavutil/hmac.h
include/libavutil/imgutils.h
include/libavutil/intfloat.h
include/libavutil/intfloat_readwrite.h
include/libavutil/intreadwrite.h
include/libavutil/lfg.h
include/libavutil/log.h
@ -94,6 +97,7 @@ include/libavutil/threadmessage.h
include/libavutil/time.h
include/libavutil/timecode.h
include/libavutil/timestamp.h
include/libavutil/twofish.h
include/libavutil/version.h
include/libavutil/xtea.h
include/libpostproc/
@ -204,6 +208,7 @@ share/ffmpeg/examples/filtering_audio.c
share/ffmpeg/examples/filtering_video.c
share/ffmpeg/examples/metadata.c
share/ffmpeg/examples/muxing.c
share/ffmpeg/examples/qsvdec.c
share/ffmpeg/examples/remuxing.c
share/ffmpeg/examples/resampling_audio.c
share/ffmpeg/examples/scaling_video.c