Some fixes for libavresample.

ok rpe@ juanfra@
This commit is contained in:
brad 2013-12-28 00:40:05 +00:00
parent 11e2317fb5
commit 8ff15dda71
2 changed files with 6 additions and 5 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.101 2013/12/24 15:22:55 brad Exp $
# $OpenBSD: Makefile,v 1.102 2013/12/28 00:40:05 brad Exp $
COMMENT= audio/video converter and streamer
V= 20131216
DISTNAME= ffmpeg-git-${V}
PKGNAME= ffmpeg-${V}
REVISION= 0
CATEGORIES= graphics multimedia
MASTER_SITES= http://comstyle.com/source/
EXTRACT_SUFX= .tar.xz
@ -134,7 +135,7 @@ CONFIGURE_ENV+= LIBavcodec_EXTRALIBS="${LIBavcodec_EXTRALIBS}" \
LIBswscale_LINKFLAGS="" \
LIBavcodec_REQUIRES="libavutil opus schroedinger-1.0 speex theoraenc vpx x264" \
LIBavdevice_REQUIRES="libavcodec libavfilter libavformat libavutil" \
LIBavfilter_REQUIRES="libavcodec libavformat libavutil libpostproc libswresample libswscale" \
LIBavfilter_REQUIRES="libavcodec libavformat libavresample libavutil libpostproc libswresample libswscale" \
LIBavformat_REQUIRES="libavcodec libavutil" \
LIBavresample_REQUIRES="libavutil" \
LIBavutil_REQUIRES="" \
@ -158,7 +159,7 @@ MAKE_ENV= V=1
MAKE_FLAGS= ${VERSION_FLAGS} \
LIBavcodec_EXTRALIBS="-lavutil ${LIBavcodec_EXTRALIBS}" \
LIBavdevice_EXTRALIBS="-lavcodec -lavfilter -lavformat -lavutil ${LIBavdevice_EXTRALIBS}" \
LIBavfilter_EXTRALIBS="-lavcodec -lavformat -lavutil -lpostproc -lswresample -lswscale ${LIBavfilter_EXTRALIBS}" \
LIBavfilter_EXTRALIBS="-lavcodec -lavformat -lavresample -lavutil -lpostproc -lswresample -lswscale ${LIBavfilter_EXTRALIBS}" \
LIBavformat_EXTRALIBS="-lavcodec -lavutil ${LIBavformat_EXTRALIBS}" \
LIBavresample_EXTRALIBS="-lavutil ${LIBavresample_EXTRALIBS}" \
LIBavutil_EXTRALIBS="${LIBavutil_EXTRALIBS}" \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.26 2013/12/24 15:22:55 brad Exp $
@comment $OpenBSD: PLIST,v 1.27 2013/12/28 00:40:05 brad Exp $
@bin bin/ffmpeg
@bin bin/ffplay
@bin bin/ffprobe
@ -98,7 +98,7 @@ lib/libavfilter.a
lib/libavformat.a
@lib lib/libavformat.so.${LIBavformat_VERSION}
lib/libavresample.a
@bin lib/libavresample.so.${LIBavresample_VERSION}
@lib lib/libavresample.so.${LIBavresample_VERSION}
lib/libavutil.a
@lib lib/libavutil.so.${LIBavutil_VERSION}
lib/libpostproc.a