kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- correctly pick up dependency on libvpx if selected in options

Browse source 
- remove mencoder dependency on mplayer,
  the two ports can now be installed independently.
- remove dependency on liba52 as this is handled by internal libavcodec
- correctly handle dependency on external libschroedinger

PR:		ports/149534
Submitted by:	maintainer
Tested by:	Christopher Key [cjk32 cam.ac.uk]
This commit is contained in:
Rene Ladan 2010-09-02 19:56:12 +00:00
parent c45a36f4ac
commit 92f38f55f8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=260438
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
multimedia/mencoder/Makefile
View file

@ -6,6 +6,7 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}
PORTREVISION= 1
COMMENT= Convenient video file and movie encoder
RESTRICTED= Port has restricted dependencies
@ -34,6 +35,7 @@ OPTIONS+= WIN32 "Enable win32 codec set on the IA32 arch" on
OPTIONS+= THEORA "Enable ogg theora video support" off
OPTIONS+= XVID "Enable XVID video codec support" on
OPTIONS+= X264 "Enable x264 (H.264) video codec support" on
OPTIONS+= VPX "Enable VP8 video via libvpx" off
OPTIONS+= DIRAC "Enable dirac video codec support" off
OPTIONS+= SCHROEDINGER "Dirac codec via libschroedinger" off
OPTIONS+= REALPLAYER "Enable real player plugin" off
@ -45,7 +47,7 @@ OPTIONS+= CDPARANOIA "Enable cdparanoia support" off
OPTIONS+= LIBLZO "Enable external liblzo library" off
OPTIONS+= V4L "Enable Video4Linux TV support" off
MLINKS= mplayer.1 mencoder.1
MAN1= mencoder.1
PATCHDIR= ${.CURDIR}/../mplayer/files
DATADIR= ${PREFIX}/share/mplayer
@ -61,8 +63,6 @@ TOOLFILES= aconvert.sh binary_codecs.sh calcbpp.pl \
.include <bsd.port.pre.mk>
LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
BUILD_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer
RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer
CONFIGURE_ARGS+= --disable-mplayer \
--disable-libdca \
@ -157,6 +157,7 @@ do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${PREFIX}/bin
post-install:
@${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${MAN1PREFIX}/man/man1/mencoder.1
@${MKDIR} ${DATADIR}
@${CHMOD} 755 ${DATADIR}
@${MKDIR} ${DATADIR}/tools

3
multimedia/mplayer/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}
PORTREVISION= 1
COMMENT= High performance media player supporting many formats
.include "${.CURDIR}/Makefile.shared"
@ -47,6 +47,7 @@ OPTIONS+= LIBMPCDEC "Enable libmpcdec support" off
OPTIONS+= LADSPA "Enable LADSPA plugin support" off
OPTIONS+= SPEEX "Enable speex audio codec support" on
OPTIONS+= THEORA "Enable ogg theora video support" off
OPTIONS+= VPX "Enable VP8 video via libvpx" off
OPTIONS+= SCHROEDINGER "Dirac codec via libschroedinger" off
.if !defined(PACKAGE_BUILDING)
OPTIONS+= WIN32 "Enable win32 codec set on the IA32 arch" on

8
multimedia/mplayer/Makefile.options
View file

@ -84,10 +84,16 @@ LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora
CONFIGURE_ARGS+= --disable-theora
.endif
.if defined(WITH_VPX)
LIB_DEPENDS+= vpx.0:${PORTSDIR}/multimedia/libvpx
.else
CONFIGURE_ARGS+= --disable-libvpx-lavc
.endif
.if defined(WITH_SCHROEDINGER)
LIB_DEPENDS+= schroedinger-1.0.3:${PORTSDIR}/multimedia/schroedinger
.else
CONFIGURE_ARGS+= --disable-libschroedinger
CONFIGURE_ARGS+= --disable-libschroedinger-lavc
.endif
.if defined(WITH_LIBMPCDEC)

3
multimedia/mplayer/Makefile.shared
View file

@ -24,7 +24,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
TMPDIR="${WRKSRC}"
CONFIGURE_ARGS= --disable-bitmap-font
CONFIGURE_ARGS= --disable-bitmap-font \
--disable-liba52
WANT_GNOME= yes
WANT_SDL= yes