diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2013-12-24 17:26:22 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2013-12-24 17:26:22 +0000 |
commit | f8cfface7c543dd240e218eeeadb50e47394f69b (patch) | |
tree | ba464319b577685142ac53246ffc9cd2c22e3f03 /multimedia | |
parent | biology/seqtools: update to 4.24 (diff) |
. Update to 1.1.20131223
. This addresses 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
- Dependency registration on screensaver works now. Fixes ports/177721
PR: ports/185142
Submitted by: Thomas Zander (maintainer)
Notes
Notes:
svn path=/head/; revision=337376
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/mencoder/Makefile | 2 | ||||
-rw-r--r-- | multimedia/mencoder/distinfo | 4 | ||||
-rw-r--r-- | multimedia/mplayer/Makefile | 5 | ||||
-rw-r--r-- | multimedia/mplayer/Makefile.options | 16 | ||||
-rw-r--r-- | multimedia/mplayer/Makefile.shared | 2 | ||||
-rw-r--r-- | multimedia/mplayer/distinfo | 4 |
6 files changed, 18 insertions, 15 deletions
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 15919d0d90d4..f3d7b4d727c4 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -23,7 +23,7 @@ OCFLAGS_DESC?= Use optimized compiler flags 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 --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo index bfda07997751..df1802cf532d 100644 --- a/multimedia/mencoder/distinfo +++ b/multimedia/mencoder/distinfo @@ -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 --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 0f786d2042f2..1fe972e06b18 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -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 @@ OPUS_DESC?= Opus decoding with libopus 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 @@ post-install: @(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 --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options index a7f80b66207d..79226f89f7f9 100644 --- a/multimedia/mplayer/Makefile.options +++ b/multimedia/mplayer/Makefile.options @@ -112,8 +112,10 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_log2f #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 @@ CFLAGS+= -O -fomit-frame-pointer 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 @@ CONFIGURE_ARGS+= --disable-asm .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 --git a/multimedia/mplayer/Makefile.shared b/multimedia/mplayer/Makefile.shared index 8b0ce7a74839..24cf770ed69c 100644 --- a/multimedia/mplayer/Makefile.shared +++ b/multimedia/mplayer/Makefile.shared @@ -4,7 +4,7 @@ # # $FreeBSD$ -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 --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo index bfda07997751..df1802cf532d 100644 --- a/multimedia/mplayer/distinfo +++ b/multimedia/mplayer/distinfo @@ -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 |