On Fri, 24 Jun 2011, Edd Barrett wrote:
> As noticed by brad, mplayer was picking up the new libass and failing to
> build.
> I have added --enable-ass and --enable-enca to be absolutely explicit and
> clear.
>
> OK?:
No need to add enca to LIB_DEPENDS, it's already a dependency of
libass.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/mplayer/Makefile,v
> retrieving revision 1.188
> diff -u -p -r1.188 Makefile
> --- Makefile 2 Jun 2011 13:41:42 -0000 1.188
> +++ Makefile 24 Jun 2011 21:48:01 -0000
> @@ -13,7 +13,7 @@ SUBST_VARS += PREFIX CONFDIR
> # Distfiles must be hand-rolled, see README
> N = mplayer
> DISTNAME = mplayer-${V}
> -REVISION = 5
> +REVISION = 6
>
> CATEGORIES = x11 multimedia
>
> @@ -25,9 +25,9 @@ PERMIT_PACKAGE_FTP = Yes
> PERMIT_DISTFILES_CDROM = Yes
> PERMIT_DISTFILES_FTP = Yes
>
> -WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm avcodec avformat \
> - avutil bz2 c cdda_interface cdda_paranoia \
> - crypto dv faac fontconfig freetype fribidi gsm jpeg lcms \
> +WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
> + avformat avutil bz2 c cdda_interface cdda_paranoia \
> + crypto dv enca faac fontconfig freetype fribidi gsm jpeg lcms \
> m mng mp3lame ncurses ogg>=5 orc-0.4 png postproc \
> pthread SDL schroedinger-1.0>=2.0 sndio speex stdc++ \
> swscale theoradec theoraenc ungif util vpx x264>=5 \
> @@ -57,7 +57,9 @@ LIB_DEPENDS = graphics/png \
> multimedia/schroedinger>=1.0.10 \
> audio/faac \
> multimedia/x264>=20101023 \
> - devel/sdl>=1.2.5
> + devel/sdl>=1.2.5 \
> + multimedia/libass \
> + converters/enca
>
> BUILD_DEPENDS = net/livemedia \
> audio/rtunes>=0.8 \
> @@ -113,7 +115,9 @@ CONFIGURE_ARGS += --disable-gui \
> CONFIGURE_ARGS += --enable-menu
>
> # CONFIGURE_ARGS that enable external stuff
> -CONFIGURE_ARGS += --with-sdl-config=${LOCALBASE}/bin/sdl-config
> +CONFIGURE_ARGS += --with-sdl-config=${LOCALBASE}/bin/sdl-config \
> + --enable-enca \
> + --enable-ass
>
> # CONFIGURE_ARGS that disable external stuff
> CONFIGURE_ARGS += --disable-smb \
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/mplayer/patches/patch-Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 patch-Makefile
> --- patches/patch-Makefile 29 Mar 2011 20:04:41 -0000 1.22
> +++ patches/patch-Makefile 24 Jun 2011 21:48:01 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-Makefile,v 1.22 2011/03/29 20:04:41 edd Exp $
> ---- Makefile.orig Thu Mar 3 12:35:16 2011
> -+++ Makefile Thu Mar 3 13:22:00 2011
> +--- Makefile.orig Wed Mar 9 00:33:03 2011
> ++++ Makefile Fri Jun 24 12:19:26 2011
> @@ -26,6 +26,7 @@ include config.mak
> SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c
> SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c
> @@ -27,6 +27,15 @@ $OpenBSD: patch-Makefile,v 1.22 2011/03/
>
>
> SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c
> +@@ -814,7 +817,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
> + $(CC) -o $@ $^ $(EXTRALIBS)
> +
> + codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
> +- $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
> ++ $(HOST_CC) ${CFLAGS} -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
> +
> + codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
> + ./$^ > $@
> @@ -864,7 +867,16 @@ loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_N
> #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
> loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN)
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/x11/mplayer/patches/patch-configure,v
> retrieving revision 1.58
> diff -u -p -r1.58 patch-configure
> --- patches/patch-configure 29 Mar 2011 20:04:41 -0000 1.58
> +++ patches/patch-configure 24 Jun 2011 21:48:01 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-configure,v 1.58 2011/03/29 20:04:41 edd Exp $
> --- configure.orig Wed Mar 9 00:33:03 2011
> -+++ configure Wed Mar 9 00:46:58 2011
> ++++ configure Fri Jun 24 12:19:32 2011
> @@ -35,29 +35,33 @@
> #
>
> #############################################################################
>
>
--
Antoine
