From owner-freebsd-ports@FreeBSD.ORG Fri Mar 25 05:28:51 2011 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 834E71065675 for ; Fri, 25 Mar 2011 05:28:51 +0000 (UTC) (envelope-from yuri.pankov@gmail.com) Received: from darklight.org.ru (darklight.org.ru [IPv6:2001:470:28:4ba::1]) by mx1.freebsd.org (Postfix) with ESMTP id AB6D38FC1A for ; Fri, 25 Mar 2011 05:28:50 +0000 (UTC) Received: from darklight.org.ru (yuri@darklight.org.ru [IPv6:::1]) by darklight.org.ru (8.14.4/8.14.4) with ESMTP id p2P5Sm5w086154; Fri, 25 Mar 2011 08:28:48 +0300 (MSK) (envelope-from yuri.pankov@gmail.com) Received: (from yuri@localhost) by darklight.org.ru (8.14.4/8.14.4/Submit) id p2P5SmB8086153; Fri, 25 Mar 2011 08:28:48 +0300 (MSK) (envelope-from yuri.pankov@gmail.com) X-Authentication-Warning: darklight.org.ru: yuri set sender to yuri.pankov@gmail.com using -f Date: Fri, 25 Mar 2011 08:28:48 +0300 From: Yuri Pankov To: Thomas Zander Message-ID: <20110325052848.GB3074@darklight.org.ru> References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="17pEHd4RhPHOinZp" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: freebsd-ports@freebsd.org Subject: Re: [CFT] A new mplayer and mencoder X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Mar 2011 05:28:51 -0000 --17pEHd4RhPHOinZp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Mar 18, 2011 at 07:26:07PM +0100, Thomas Zander wrote: > Dear all, > > I have prepared a recent snapshot for a an upcoming update for the > mplayer and mencoder ports. > You can find the tarball here: > > http://www.rrr.de/~riggs/mplayer/m20110318.tar.bz2 > > Please test the things that you usually do with it, I'd appreciate feedback! > > Thanks in advance, > Riggs Hi Thomas, Everything seems to work fine, with few small issues (please see attached diff): - configure flags to enable/disable amr{n,w}b are spelled incorrectly: ./configure --help | grep -E 'amrnb|amrwb' --disable-libopencore_amrnb disable libopencore_amr narrowband --disable-libopencore_amrwb disable libopencore_amr wideband - the build is heavily (ab)using 'cc' despite CC is set to clang (even with --cc=${CC} passed to configure). There's another small fix in the diff to fix build failure where clang is actually used. HTH, Yuri --17pEHd4RhPHOinZp Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="mplayer.diff" diff -ruN mplayer.old/Makefile mplayer/Makefile --- mplayer.old/Makefile 2011-03-18 19:29:39.000000000 +0300 +++ mplayer/Makefile 2011-03-25 08:12:26.323326869 +0300 @@ -89,7 +89,9 @@ --disable-libdirac-lavc \ --disable-mencoder \ --disable-mpg123 \ - --disable-musepack + --disable-musepack \ + --cc=${CC} \ + --host-cc=${CC} .include "${.CURDIR}/Makefile.options" diff -ruN mplayer.old/Makefile.options mplayer/Makefile.options --- mplayer.old/Makefile.options 2011-03-18 18:32:51.000000000 +0300 +++ mplayer/Makefile.options 2011-03-25 07:37:24.654326280 +0300 @@ -212,15 +212,15 @@ .endif .ifdef(WITH_AMR_NB) -CONFIGURE_ARGS+= --enable-libopencore-amrnb --enable-version3 +CONFIGURE_ARGS+= --enable-libopencore_amrnb --enable-version3 .else -CONFIGURE_ARGS+= --disable-libopencore-amrnb +CONFIGURE_ARGS+= --disable-libopencore_amrnb .endif .ifdef(WITH_AMR_WB) -CONFIGURE_ARGS+= --enable-libopencore-amrwb --enable-version3 +CONFIGURE_ARGS+= --enable-libopencore_amrwb --enable-version3 .else -CONFIGURE_ARGS+= --disable-libopencore-amrwb +CONFIGURE_ARGS+= --disable-libopencore_amrwb .endif .ifdef(WITH_GSM) diff -ruN mplayer.old/files/patch-ffmpeg__libavcodec__x86__snowdsp_mmx.c mplayer/files/patch-ffmpeg__libavcodec__x86__snowdsp_mmx.c --- mplayer.old/files/patch-ffmpeg__libavcodec__x86__snowdsp_mmx.c 1970-01-01 03:00:00.000000000 +0300 +++ mplayer/files/patch-ffmpeg__libavcodec__x86__snowdsp_mmx.c 2011-03-24 23:43:47.498333114 +0300 @@ -0,0 +1,19 @@ +--- ffmpeg/libavcodec/x86/snowdsp_mmx.c.orig 2011-03-24 23:27:25.485338703 +0300 ++++ ffmpeg/libavcodec/x86/snowdsp_mmx.c 2011-03-24 23:43:04.159326606 +0300 +@@ -675,14 +675,14 @@ + + #define snow_inner_add_yblock_sse2_end_8\ + "sal $1, %%"REG_c" \n\t"\ +- "add $"PTR_SIZE"*2, %1 \n\t"\ ++ "addb $"PTR_SIZE"*2, %1 \n\t"\ + snow_inner_add_yblock_sse2_end_common1\ + "sar $1, %%"REG_c" \n\t"\ + "sub $2, %2 \n\t"\ + snow_inner_add_yblock_sse2_end_common2 + + #define snow_inner_add_yblock_sse2_end_16\ +- "add $"PTR_SIZE"*1, %1 \n\t"\ ++ "addw $"PTR_SIZE"*1, %1 \n\t"\ + snow_inner_add_yblock_sse2_end_common1\ + "dec %2 \n\t"\ + snow_inner_add_yblock_sse2_end_common2 --17pEHd4RhPHOinZp--