ports/185142: Update for multimedia/mplayer and mencoder to a new snapshot + fixes

[Thomas Zander]

>Number:         185142
>Category:       ports
>Synopsis:       Update for multimedia/mplayer and mencoder to a new snapshot + fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 23 18:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Zander
>Release:        
>Organization:
>Environment:
>Description:
Address multiple mplayer + mencoder problems
- Wrong aspect ratio in certain (old) h264 files (Thanks Carl + Reimar for fixing this upstream)
- Proper handling of RTCPU. Fixes ports/184937 and ports/153776
- Remove explicit cat pkg_messag. Fixes ports/184945

Also please clean up other PRs:
- liveMedia is not supported any longer. Fixes ports/181520
- Dependency registration on screensaver works now. Fixes ports/177721
>How-To-Repeat:

>Fix:
Apply attached patch

Patch attached with submission follows:

diff -r ea163ca95ef2 mencoder/Makefile
--- a/mencoder/Makefile	Sat Dec 21 16:04:54 2013 +0100
+++ b/mencoder/Makefile	Mon Dec 23 18:55:40 2013 +0100
@@ -23,7 +23,7 @@
 OPUS_DESC?=	Opus decoding with libopus
 OTCHAIN_DESC?=	Use gcc 4.6+ toolchain on legacy systems
 REAL_DESC?=	Enable realplayer plugin
-RTCPU_DESC?=	Use runtime CPU detection
+RTCPU_DESC?=	Use runtime CPU detection on supported archs
 WIN32_DESC?=	Install win32 binary codecs
 
 RESTRICTED=	Port has restricted dependencies
diff -r ea163ca95ef2 mencoder/distinfo
--- a/mencoder/distinfo	Sat Dec 21 16:04:54 2013 +0100
+++ b/mencoder/distinfo	Mon Dec 23 18:55:40 2013 +0100
@@ -1,2 +1,2 @@
-SHA256 (mplayer-1.1.20131109.tar.xz) = 5647919b61f01396af20273419d5fc74f8b3523177c40e7d1ca063ad45eb13eb
-SIZE (mplayer-1.1.20131109.tar.xz) = 10738036
+SHA256 (mplayer-1.1.20131223.tar.xz) = 925401be982510bf1a04da771aa7cbaca27c1acefc70d23100cf2120ba42c7ab
+SIZE (mplayer-1.1.20131223.tar.xz) = 10922300
diff -r ea163ca95ef2 mplayer/Makefile
--- a/mplayer/Makefile	Sat Dec 21 16:04:54 2013 +0100
+++ b/mplayer/Makefile	Mon Dec 23 18:55:40 2013 +0100
@@ -3,7 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	High performance media player supporting many formats
 
@@ -31,7 +31,7 @@
 OTCHAIN_DESC?=	Use gcc 4.6+ toolchain on legacy systems
 REAL_DESC?=	Enable realplayer plugin
 RTC_DESC?=	Add support for kernel real time clock
-RTCPU_DESC?=	Use runtime CPU detection
+RTCPU_DESC?=	Use runtime CPU detection on supported archs
 SKINS_DESC?=	Install skins for GUI
 WIN32_DESC?=	Install win32 binary codecs
 X11DGA_DESC?=	X11 DGA video driver support
@@ -180,6 +180,5 @@
 	@(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz)
 	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${LOCALBASE}/share/pixmaps/mplayer.png
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff -r ea163ca95ef2 mplayer/Makefile.options
--- a/mplayer/Makefile.options	Sat Dec 21 16:04:54 2013 +0100
+++ b/mplayer/Makefile.options	Mon Dec 23 18:55:40 2013 +0100
@@ -112,8 +112,10 @@
 #On i386, gcc runs out of general purpose registers when
 #trying to compile a debug version with the default flags.
 .if ${PORT_OPTIONS:MDEBUG}
+WITH_DEBUG=	yes
+CONFIGURE_ARGS=+	--enable-debug
 .if ${ARCH} == "i386"
-DEBUG_FLAGS=	-g -O -fomit-frame-pointer
+DEBUG_FLAGS=	-g -fomit-frame-pointer
 .endif
 .else
 .if ${PORT_OPTIONS:MOCFLAGS}
@@ -128,6 +130,11 @@
 MPLAYER_CLANG_SUPPORTED_ARCH=	yes
 .endif
 
+# Supported architectures for runtime CPU detection
+.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ppc"
+MPLAYER_RTCPU_SUPPORTED_ARCH=	yes
+.endif
+
 # Unsupported architectures for inline assembly
 .if ${ARCH} == "ppc"
 CONFIGURE_ARGS+=	--disable-asm
@@ -137,12 +144,9 @@
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
-.if ${ARCH} == "ia64"
-BROKEN=		Does not detect CPU correctly on ia64
-.endif
 
-
-.if ${PORT_OPTIONS:MRTCPU}
+.if ${PORT_OPTIONS:MRTCPU} \
+	&& defined(MPLAYER_RTCPU_SUPPORTED_ARCH)
 CONFIGURE_ARGS+=--enable-runtime-cpudetection
 .endif
 
diff -r ea163ca95ef2 mplayer/Makefile.shared
--- a/mplayer/Makefile.shared	Sat Dec 21 16:04:54 2013 +0100
+++ b/mplayer/Makefile.shared	Mon Dec 23 18:55:40 2013 +0100
@@ -4,7 +4,7 @@
 #
 # $FreeBSD: head/multimedia/mplayer/Makefile.shared 336566 2013-12-15 18:50:51Z thierry $
 
-MPLAYER_SNAPSHOT_DATE=	2013-11-09
+MPLAYER_SNAPSHOT_DATE=	2013-12-23
 MPLAYER_PORT_VERSION=	1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
diff -r ea163ca95ef2 mplayer/distinfo
--- a/mplayer/distinfo	Sat Dec 21 16:04:54 2013 +0100
+++ b/mplayer/distinfo	Mon Dec 23 18:55:40 2013 +0100
@@ -1,2 +1,2 @@
-SHA256 (mplayer-1.1.20131109.tar.xz) = 5647919b61f01396af20273419d5fc74f8b3523177c40e7d1ca063ad45eb13eb
-SIZE (mplayer-1.1.20131109.tar.xz) = 10738036
+SHA256 (mplayer-1.1.20131223.tar.xz) = 925401be982510bf1a04da771aa7cbaca27c1acefc70d23100cf2120ba42c7ab
+SIZE (mplayer-1.1.20131223.tar.xz) = 10922300


>Release-Note:
>Audit-Trail:
>Unformatted: