Date: Thu, 24 Aug 2006 23:25:59 +0200 (CEST) From: "Thomas E. Zander" <riggs@rrr.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Ion-Mihai Tetcu <itetcu@FreeBSD.org> Subject: ports/102493: [Maintainer-update] to multimedia/mplayer Message-ID: <200608242125.k7OLPxKc021354@marvin.riggiland.au> Resent-Message-ID: <200608242130.k7OLUHD7016589@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102493 >Category: ports >Synopsis: [Maintainer-update] to multimedia/mplayer >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Aug 24 21:30:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Thomas E. Zander >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD 6.1-STABLE >Description: This is a cumulative update to the mplayer port addressing several issues reported in PRs and beyond: o supersedes PR ports/101653: imake handling for audio-only-mplayer corrected o adapt mplayer to recent x264 API changes. Reported by David Warren <davideugenewarren@gmail.com>, obtained from official mplayer CVS o Correct internal libtremor handling on amd64 arch, by Aleksey Salow <aleksey.salow@gmail.com> o Correct VIDIX playlists on amd64 arch and o Proper handling of the speex codec and the polyp sound server, reported by Ion-Mihai Tetcu <itetcu@FreeBSD.org> >How-To-Repeat: >Fix: Patch to multimedia/mplayer: diff -ruN /usr/ports/multimedia/mplayer/Makefile mplayer/Makefile --- /usr/ports/multimedia/mplayer/Makefile Wed Aug 16 07:49:49 2006 +++ mplayer/Makefile Sun Aug 20 14:52:28 2006 @@ -84,7 +84,7 @@ PORTNAME= mplayer PORTVERSION= 0.99.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \ http://www2.mplayerhq.hu/MPlayer/releases/ \ @@ -118,6 +118,7 @@ --enable-menu \ --disable-libfame \ --disable-external-faad \ + --disable-external-vidix \ --disable-tv-v4l \ --disable-liblzo \ --disable-libcdio @@ -133,12 +134,14 @@ OPTIONS+= X11 "Enable X11 support for mplayer's video output" on OPTIONS+= GUI "Enable GTK2 graphical user interface with X11" on OPTIONS+= SDL "Enable SDL video output" off +OPTIONS+= VIDIX "Enable VIDIX video output on supported archs" on OPTIONS+= NVIDIA "Enable experimental nvidia xvmc driver" off OPTIONS+= SKINS "Force dependency on mplayer-skins" on OPTIONS+= FREETYPE "Use freetype for OSD fonts (TrueType!)" on OPTIONS+= RTC "Add support for kernel real time clock timing" off OPTIONS+= ARTS "Enable KDE sound system support" off OPTIONS+= ESOUND "Enable GNOME esound support" off +OPTIONS+= POLYP "Enable polyp sound server support" off OPTIONS+= LIBUNGIF "Enable gif support" on OPTIONS+= AALIB "Enable aalib support" off OPTIONS+= LIBCACA "Enable libcaca support" off @@ -146,6 +149,7 @@ OPTIONS+= LIBDV "Enable libdv support" off OPTIONS+= MAD "Enable mad MPEG audio engine support" off OPTIONS+= DTS "Enable DTS audio codec support" on +OPTIONS+= SPEEX "Enable speex audio codec support" off OPTIONS+= TREMOR "Use built-in tremor instead of libvorbis" off OPTIONS+= XMMS "Enable XMMS plugin support" off OPTIONS+= THEORA "Enable ogg theora video support" off @@ -179,12 +183,17 @@ .endif #Building of vidix dependent shared libs is only possible -#on i386 at the moment. -.if ${ARCH} == "i386" +#on i386 and amd64 at the moment. +.if defined(WITH_VIDIX) +.if ${ARCH} == "i386" || ${ARCH} == "amd64" USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/mplayer/vidix PLIST_SUB+= VIDIX="" .else -CONFIGURE_ARGS+=--disable-vidix +CONFIGURE_ARGS+=--disable-internal-vidix +PLIST_SUB+= VIDIX="@comment " +.endif +.else +CONFIGURE_ARGS+=--disable-internal-vidix PLIST_SUB+= VIDIX="@comment " .endif @@ -216,7 +225,6 @@ .if defined(WITHOUT_X11) WITHOUT_GUI= yes -BUILD_DEPENDS+= imake:${X_IMAKE_PORT} CONFIGURE_ARGS+=--disable-x11 .else USE_XLIB= yes @@ -380,6 +388,13 @@ CONFIGURE_ARGS+= --disable-esd .endif +.if !defined(WITHOUT_POLYP) +CONFIGURE_ARGS+= --enable-polyp +LIB_DEPENDS+= polyp-0.7.so.0:${PORTSDIR}/audio/polyp +.else +CONFIGURE_ARGS+= --disable-polyp +.endif + .if defined(WITHOUT_TREMOR) CONFIGURE_ARGS+= --disable-internal-tremor LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis @@ -427,6 +442,13 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts .else CONFIGURE_ARGS+= --disable-libdts +.endif + +.if !defined(WITHOUT_SPEEX) +CONFIGURE_ARGS+= --enable-speex +LIB_DEPENDS+= speex.so.3:${PORTSDIR}/audio/speex +.else +CONFIGURE_ARGS+= --disable-speex .endif .if !defined(WITHOUT_FREETYPE) diff -ruN /usr/ports/multimedia/mplayer/files/patch-libmpcodecs_ve_x264.c mplayer/files/patch-libmpcodecs_ve_x264.c --- /usr/ports/multimedia/mplayer/files/patch-libmpcodecs_ve_x264.c Thu Aug 10 03:07:29 2006 +++ mplayer/files/patch-libmpcodecs_ve_x264.c Sun Aug 20 12:12:26 2006 @@ -1,11 +1,31 @@ ---- libmpcodecs/ve_x264.c.orig Wed Aug 9 21:05:29 2006 -+++ libmpcodecs/ve_x264.c Wed Aug 9 21:06:26 2006 -@@ -275,7 +275,7 @@ +--- libmpcodecs/ve_x264.c.orig Sun Jun 11 20:35:41 2006 ++++ libmpcodecs/ve_x264.c Sun Aug 20 12:11:22 2006 +@@ -208,7 +208,7 @@ + }; + + static int parse_cqm(const char *str, uint8_t *cqm, int length, +- h264_module_t *mod, char *matrix_name) { ++ h264_module_t *mod, const char *matrix_name) { + int i; + if (!str) return 0; + for (i = 0; i < length; i++) { +@@ -247,7 +247,10 @@ + mod->param.i_deblocking_filter_beta = deblockbeta; + mod->param.b_cabac = cabac; + ++ mod->param.rc.i_rc_method = X264_RC_CQP; + mod->param.rc.i_qp_constant = qp_constant; ++ if(rf_constant > 0) ++ mod->param.rc.i_rc_method = X264_RC_CRF; + mod->param.rc.i_rf_constant = rf_constant; + if(qp_min > qp_constant) + qp_min = qp_constant; +@@ -275,7 +278,7 @@ "VBV requires both vbv_maxrate and vbv_bufsize.\n"); return 0; } - mod->param.rc.b_cbr = 1; -+ mod->param.rc.i_rc_method = 1; ++ mod->param.rc.i_rc_method = X264_RC_ABR; mod->param.rc.i_bitrate = bitrate; mod->param.rc.f_rate_tolerance = ratetol; mod->param.rc.i_vbv_max_bitrate = vbv_maxrate; diff -ruN /usr/ports/multimedia/mplayer/files/patch-tremor-codec_internal.h mplayer/files/patch-tremor-codec_internal.h --- /usr/ports/multimedia/mplayer/files/patch-tremor-codec_internal.h Thu Jan 1 01:00:00 1970 +++ mplayer/files/patch-tremor-codec_internal.h Sun Aug 20 11:06:53 2006 @@ -0,0 +1,11 @@ +--- tremor/codec_internal.h.orig Sun Aug 20 11:04:15 2006 ++++ tremor/codec_internal.h Sun Aug 20 11:06:05 2006 +@@ -17,6 +17,8 @@ + + #include "codebook.h" + ++void *_vorbis_block_alloc(vorbis_block *vb, long bytes); ++ + typedef void vorbis_look_mapping; + typedef void vorbis_look_floor; + typedef void vorbis_look_residue; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608242125.k7OLPxKc021354>