diff options
| author | mm <mm@FreeBSD.org> | 2010-10-17 06:36:03 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-10-17 06:36:03 +0800 |
| commit | 05396b935488dee14a17a3a226177fee762e98ae (patch) | |
| tree | 55a1677f60aae2ea903b1e91db3953ada61c7e2f /multimedia | |
| parent | 8291747dd4e778e86ed16444395ddb67b6c7d0e0 (diff) | |
| download | freebsd-ports-gnome-05396b935488dee14a17a3a226177fee762e98ae.tar.gz freebsd-ports-gnome-05396b935488dee14a17a3a226177fee762e98ae.tar.zst freebsd-ports-gnome-05396b935488dee14a17a3a226177fee762e98ae.zip | |
- fix conflicts with ffmpeg-devel [1]
- properly handle alsa-lib as a possible dependency [2]
PR: ports/150634 [1], ports/151508 [2]
Submitted by: avilla@FreeBSD.org [1], makc@FreeBSD.org [2]
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 6ff3a4823bcf..d6bc5f23c724 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.6 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -17,7 +17,7 @@ COMMENT= Realtime audio/video encoder/converter and streaming server BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm -CONFLICTS= ffmpeg-devel-20* +CONFLICTS= ffmpeg-20* HAS_CONFIGURE= yes CONFIGURE_LOG= config.err @@ -26,7 +26,8 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes WANT_SDL= yes -OPTIONS= AMR_NB "AMR Narrow Band encoder (opencore)" off \ +OPTIONS= ALSA "Enable alsa input/output device" off \ + AMR_NB "AMR Narrow Band encoder (opencore)" off \ AMR_WB "AMR Wide Band encoder (opencore)" off \ DIRAC "Dirac codec via libdirac" off \ FAAC "FAAC mp4/aac audio encoder" off \ @@ -148,6 +149,14 @@ MAN1+= ffserver.1 CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer .endif +#alsa +.if defined(WITH_ALSA) +LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib +.else +CONFIGURE_ARGS+= --disable-indev=alsa \ + --disable-outdev=alsa +.endif + # amr .if defined(WITH_AMR_NB) || defined (WITH_AMR_WB) LIB_DEPENDS+= opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr |