Date: Sat, 7 Jun 2014 13:24:16 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356900 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <201406071324.s57DOGNn017585@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Jun 7 13:24:16 2014 New Revision: 356900 URL: http://svnweb.freebsd.org/changeset/ports/356900 QAT: https://qat.redports.org/buildarchive/r356900/ Log: - Add CONFLICTS to mplayer to prevent install conflict with mplayer2 [1] - Fix crash when trying to play certain videos with no audio in gmplayer [2] - Improve non-options variable summary during build in pre-everything [2] - Bump PORTREVISION in mplayer (the binary changes) PR: 190027 Submitted by: rfg@tristatelogic.com [1], andre@albsmeier.net[2] Approved by: mentors (implicit) Added: head/multimedia/mplayer/files/patch-mplayer.c (contents, props changed) Modified: head/multimedia/mencoder/Makefile head/multimedia/mplayer/Makefile Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Sat Jun 7 12:26:32 2014 (r356899) +++ head/multimedia/mencoder/Makefile Sat Jun 7 13:24:16 2014 (r356900) @@ -77,9 +77,9 @@ pre-everything:: @${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "" @${ECHO_MSG} "There are some knobs which *can* *not* be selected via the" - @${ECHO_MSG} "OPTIONS framework. At the moment, their defaults are:" - @${ECHO_MSG} "DEFAULT_DVD_DEVICE=/dev/cd0" - @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=/dev/cd0" + @${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:" + @${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}" + @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}" post-patch: .if ${OSVERSION} >= 900010 Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Sat Jun 7 12:26:32 2014 (r356899) +++ head/multimedia/mplayer/Makefile Sat Jun 7 13:24:16 2014 (r356900) @@ -3,7 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= High performance media player supporting many formats @@ -39,6 +39,8 @@ X11VM_DESC?= X11 VidMode support SUB_FILES= pkg-message +CONFLICTS= mplayer2-2.* + CONFFILES= example.conf input.conf menu.conf dvb-menu.conf USES+= pkgconfig @@ -116,10 +118,10 @@ pre-everything:: @${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "" @${ECHO_MSG} "There are some knobs which *can* *not* be selected via the" - @${ECHO_MSG} "OPTIONS framework. At the moment, their defaults are:" - @${ECHO_MSG} "WITH_KERN_HZ=1024" - @${ECHO_MSG} "DEFAULT_DVD_DEVICE=/dev/cd0" - @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=/dev/cd0" + @${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:" + @${ECHO_MSG} "WITH_KERN_HZ=${DEFAULT_KERN_HZ}" + @${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}" + @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}" .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} @${ECHO_MSG} "If you want to use the GUI, you can use the skins from" Added: head/multimedia/mplayer/files/patch-mplayer.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/patch-mplayer.c Sat Jun 7 13:24:16 2014 (r356900) @@ -0,0 +1,12 @@ +--- mplayer.c.orig 2014-04-06 20:46:45.000000000 +0200 ++++ mplayer.c 2014-06-07 14:40:43.756655422 +0200 +@@ -3707,7 +3707,8 @@ + if (use_gui) { + if (!gui(GUI_SET_VIDEO, mpctx->sh_video)) + goto goto_next_file; +- gui(GUI_SET_AUDIO, mpctx->sh_audio); ++ if (mpctx->sh_audio) ++ gui(GUI_SET_AUDIO, mpctx->sh_audio); + } + #endif +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406071324.s57DOGNn017585>