[79717] trunk/dports/multimedia/mplayer-devel
jeremyhu at macports.org
jeremyhu at macports.org
Thu Jun 23 15:00:58 PDT 2011
Revision: 79717
http://trac.macports.org/changeset/79717
Author: jeremyhu at macports.org
Date: 2011-06-23 15:00:58 -0700 (Thu, 23 Jun 2011)
Log Message:
-----------
mplayer-devel: Update to revision 33714, fix build on Lion
This addresses all the asm fixes I submitted as well as others. Unfortunately,
it still fails to build with llvm-gcc, so using gcc-4.2 on Lion until we figure
out the rest of the issues.
Revision Links:
--------------
http://trac.macports.org/changeset/33714
Modified Paths:
--------------
trunk/dports/multimedia/mplayer-devel/Portfile
trunk/dports/multimedia/mplayer-devel/files/configure.x11.patch
Removed Paths:
-------------
trunk/dports/multimedia/mplayer-devel/files/dsputil-mmx.patch
trunk/dports/multimedia/mplayer-devel/files/mp3lib-sse.patch
trunk/dports/multimedia/mplayer-devel/files/yadif.patch
Modified: trunk/dports/multimedia/mplayer-devel/Portfile
===================================================================
--- trunk/dports/multimedia/mplayer-devel/Portfile 2011-06-23 21:59:09 UTC (rev 79716)
+++ trunk/dports/multimedia/mplayer-devel/Portfile 2011-06-23 22:00:58 UTC (rev 79717)
@@ -5,14 +5,13 @@
PortSystem 1.0
name mplayer-devel
-version 31034
-revision 3
+version 33714
categories multimedia
maintainers acho openmaintainer
platforms darwin
-set dvdnav_ver 1191
-set ffmpeg_ver 22866
+set dvdnav_ver 1228
+set ffmpeg_ver ffc6c8a4305d25db8a5af72389a2453b17f43646
description The MPlayer movie player built from SVN.
long_description ${description} It plays most MPEG/VOB, AVI, Ogg/OGM, \
@@ -40,11 +39,18 @@
system "svn export -r${version} --ignore-externals svn://svn.mplayerhq.hu/mplayer/trunk ${worksrcpath}/"
system "svn export -r${dvdnav_ver} svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav/src ${worksrcpath}/libdvdnav/"
system "svn export -r${dvdnav_ver} svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread/src ${worksrcpath}/libdvdread4/"
- system "svn export -r${ffmpeg_ver} svn://svn.ffmpeg.org/ffmpeg/trunk/libavcodec ${worksrcpath}/libavcodec/"
- system "svn export -r${ffmpeg_ver} svn://svn.ffmpeg.org/ffmpeg/trunk/libavutil ${worksrcpath}/libavutil/"
- system "svn export -r${ffmpeg_ver} svn://svn.ffmpeg.org/ffmpeg/trunk/libavformat ${worksrcpath}/libavformat/"
- system "svn export -r${ffmpeg_ver} svn://svn.ffmpeg.org/ffmpeg/trunk/libpostproc ${worksrcpath}/libpostproc/"
+ system "git clone --depth 1 git://git.videolan.org/ffmpeg.git ${worksrcpath}/ffmpeg"
+ system "cd ${worksrcpath}/ffmpeg && git checkout -f ${ffmpeg_ver}"
}
+
+platform darwin 11 {
+ configure.compiler gcc-4.2
+ #post-patch {
+ # # MPlayer does not play well with llvm-gcc's link time optimization
+ # reinplace "s:-O4:-O4 -fno-lto:" ${worksrcpath}/configure
+ #}
+}
+
# Do not use the following environment variables, otherwise the build phase
# will fail.
configure.cflags {}
@@ -64,9 +70,11 @@
--confdir=${prefix}/etc/${name} \
--mandir=${prefix}/share/man \
--enable-png --enable-jpeg --enable-liblzo \
- --enable-theora --enable-libvorbis --enable-mad \
- --enable-largefiles
+ --enable-theora --enable-libvorbis --enable-mad
+# MPlayer autodetects many support libs. To prevent undeclared
+# dependencies, explicitly disable everything optional first.
+# Later, let autodetect do its magic not explicit --enable
configure.args-append \
--disable-smb --disable-live --disable-dvdnav \
--disable-dvdread --disable-cdparanoia --disable-freetype \
@@ -81,7 +89,7 @@
--disable-libschroedinger-lavc --disable-liba52 \
--disable-gif
-patchfiles configure.x11.patch yadif.patch mp3lib-sse.patch dsputil-mmx.patch
+patchfiles configure.x11.patch
post-destroot {
xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
Modified: trunk/dports/multimedia/mplayer-devel/files/configure.x11.patch
===================================================================
--- trunk/dports/multimedia/mplayer-devel/files/configure.x11.patch 2011-06-23 21:59:09 UTC (rev 79716)
+++ trunk/dports/multimedia/mplayer-devel/files/configure.x11.patch 2011-06-23 22:00:58 UTC (rev 79717)
@@ -1,6 +1,6 @@
---- configure.orig 2009-04-12 10:07:30.000000000 -0700
-+++ configure 2009-04-22 22:53:09.000000000 -0700
-@@ -4196,6 +4196,9 @@ echores "$_x11_headers"
+--- configure.orig 2011-06-23 11:42:26.000000000 -0700
++++ configure 2011-06-23 13:34:17.000000000 -0700
+@@ -4297,6 +4297,9 @@ echores "$_x11_headers"
echocheck "X11"
@@ -8,13 +8,13 @@
+ libs_mplayer="$libs_mplayer -lXext -lX11"
+fi
if test "$_x11" = auto && test "$_x11_headers" = yes ; then
- cat > $TMPC <<EOF
- #include <X11/Xlib.h>
-@@ -6760,6 +6763,7 @@ fi
+ for I in "" -L/usr/X11R7/lib -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 \
+ -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
+@@ -6777,6 +6780,7 @@ fi
if test "$_qtx" = yes ; then
def_qtx='#define CONFIG_QTX_CODECS 1'
win32 && _qtx_codecs_win32=yes && def_qtx_win32='#define CONFIG_QTX_CODECS_WIN32 1'
+ darwin && extra_ldflags="$extra_ldflags -framework Carbon -framework QuickTime" && def_quicktime='#define CONFIG_QUICKTIME 1'
- _codecmodules="qtx $_codecmodules"
+ codecmodules="qtx $codecmodules"
darwin || win32 || _qtx_emulation=yes
else
Deleted: trunk/dports/multimedia/mplayer-devel/files/dsputil-mmx.patch
===================================================================
--- trunk/dports/multimedia/mplayer-devel/files/dsputil-mmx.patch 2011-06-23 21:59:09 UTC (rev 79716)
+++ trunk/dports/multimedia/mplayer-devel/files/dsputil-mmx.patch 2011-06-23 22:00:58 UTC (rev 79717)
@@ -1,11 +0,0 @@
---- libavcodec/x86/dsputil_mmx.c.orig 2011-06-23 13:21:36.000000000 -0700
-+++ libavcodec/x86/dsputil_mmx.c 2011-06-23 13:22:09.000000000 -0700
-@@ -606,7 +606,7 @@ static void add_hfyu_median_prediction_c
- __asm__ volatile(
- "mov %7, %3 \n"
- "1: \n"
-- "movzx (%3,%4), %2 \n"
-+ "movzbl (%3,%4), %2 \n"
- "mov %2, %k3 \n"
- "sub %b1, %b3 \n"
- "add %b0, %b3 \n"
Deleted: trunk/dports/multimedia/mplayer-devel/files/mp3lib-sse.patch
===================================================================
--- trunk/dports/multimedia/mplayer-devel/files/mp3lib-sse.patch 2011-06-23 21:59:09 UTC (rev 79716)
+++ trunk/dports/multimedia/mplayer-devel/files/mp3lib-sse.patch 2011-06-23 22:00:58 UTC (rev 79717)
@@ -1,192 +0,0 @@
-Index: mp3lib/dct64_sse.c
-===================================================================
---- mp3lib/dct64_sse.c (revision 32612)
-+++ mp3lib/dct64_sse.c (revision 33714)
-@@ -112,7 +112,6 @@
- }
-
- {
-- real *costab = costab_mmx + 24;
- int i;
-
- __asm__(
-@@ -121,7 +120,7 @@
- "movaps %1, %%xmm5\n\t"
- "movaps %%xmm5, %%xmm6\n\t"
- :
-- :"m"(*costab), "m"(*nnnn)
-+ :"m"(costab_mmx[24]), "m"(*nnnn)
- );
-
- for (i = 0; i < 0x20; i += 8)
-@@ -281,27 +280,27 @@
-
- #else
- /*
-- To do saturation efficiently in x86 we can use fist(t)(p),
-- pf2iw, or packssdw. We use fist(p) here.
-+ To do saturation efficiently in x86 we can use fist(p)s,
-+ pf2iw, or packssdw. We use fist(p)s here.
- */
- __asm__(
- "flds %0\n\t"
- "flds (%2)\n\t"
- "fadds 4(%2)\n\t"
-- "fistp 512(%3)\n\t"
-+ "fistps 512(%3)\n\t"
-
- "flds (%2)\n\t"
- "fsubs 4(%2)\n\t"
- "fmul %%st(1)\n\t"
-- "fistp (%3)\n\t"
-+ "fistps (%3)\n\t"
-
- "flds 12(%2)\n\t"
- "fsubs 8(%2)\n\t"
- "fmul %%st(1)\n\t"
-- "fist 256(%4)\n\t"
-+ "fists 256(%4)\n\t"
- "fadds 12(%2)\n\t"
- "fadds 8(%2)\n\t"
-- "fistp 256(%3)\n\t"
-+ "fistps 256(%3)\n\t"
-
- "flds 16(%2)\n\t"
- "fsubs 20(%2)\n\t"
-@@ -310,108 +309,108 @@
- "flds 28(%2)\n\t"
- "fsubs 24(%2)\n\t"
- "fmul %%st(2)\n\t"
-- "fist 384(%4)\n\t"
-+ "fists 384(%4)\n\t"
- "fld %%st(0)\n\t"
- "fadds 24(%2)\n\t"
- "fadds 28(%2)\n\t"
- "fld %%st(0)\n\t"
- "fadds 16(%2)\n\t"
- "fadds 20(%2)\n\t"
-- "fistp 384(%3)\n\t"
-+ "fistps 384(%3)\n\t"
- "fadd %%st(2)\n\t"
-- "fistp 128(%3)\n\t"
-+ "fistps 128(%3)\n\t"
- "faddp %%st(1)\n\t"
-- "fistp 128(%4)\n\t"
-+ "fistps 128(%4)\n\t"
-
- "flds 32(%1)\n\t"
- "fadds 48(%1)\n\t"
-- "fistp 448(%3)\n\t"
-+ "fistps 448(%3)\n\t"
-
- "flds 48(%1)\n\t"
- "fadds 40(%1)\n\t"
-- "fistp 320(%3)\n\t"
-+ "fistps 320(%3)\n\t"
-
- "flds 40(%1)\n\t"
- "fadds 56(%1)\n\t"
-- "fistp 192(%3)\n\t"
-+ "fistps 192(%3)\n\t"
-
- "flds 56(%1)\n\t"
- "fadds 36(%1)\n\t"
-- "fistp 64(%3)\n\t"
-+ "fistps 64(%3)\n\t"
-
- "flds 36(%1)\n\t"
- "fadds 52(%1)\n\t"
-- "fistp 64(%4)\n\t"
-+ "fistps 64(%4)\n\t"
-
- "flds 52(%1)\n\t"
- "fadds 44(%1)\n\t"
-- "fistp 192(%4)\n\t"
-+ "fistps 192(%4)\n\t"
-
- "flds 60(%1)\n\t"
-- "fist 448(%4)\n\t"
-+ "fists 448(%4)\n\t"
- "fadds 44(%1)\n\t"
-- "fistp 320(%4)\n\t"
-+ "fistps 320(%4)\n\t"
-
- "flds 96(%1)\n\t"
- "fadds 112(%1)\n\t"
- "fld %%st(0)\n\t"
- "fadds 64(%1)\n\t"
-- "fistp 480(%3)\n\t"
-+ "fistps 480(%3)\n\t"
- "fadds 80(%1)\n\t"
-- "fistp 416(%3)\n\t"
-+ "fistps 416(%3)\n\t"
-
- "flds 112(%1)\n\t"
- "fadds 104(%1)\n\t"
- "fld %%st(0)\n\t"
- "fadds 80(%1)\n\t"
-- "fistp 352(%3)\n\t"
-+ "fistps 352(%3)\n\t"
- "fadds 72(%1)\n\t"
-- "fistp 288(%3)\n\t"
-+ "fistps 288(%3)\n\t"
-
- "flds 104(%1)\n\t"
- "fadds 120(%1)\n\t"
- "fld %%st(0)\n\t"
- "fadds 72(%1)\n\t"
-- "fistp 224(%3)\n\t"
-+ "fistps 224(%3)\n\t"
- "fadds 88(%1)\n\t"
-- "fistp 160(%3)\n\t"
-+ "fistps 160(%3)\n\t"
-
- "flds 120(%1)\n\t"
- "fadds 100(%1)\n\t"
- "fld %%st(0)\n\t"
- "fadds 88(%1)\n\t"
-- "fistp 96(%3)\n\t"
-+ "fistps 96(%3)\n\t"
- "fadds 68(%1)\n\t"
-- "fistp 32(%3)\n\t"
-+ "fistps 32(%3)\n\t"
-
- "flds 100(%1)\n\t"
- "fadds 116(%1)\n\t"
- "fld %%st(0)\n\t"
- "fadds 68(%1)\n\t"
-- "fistp 32(%4)\n\t"
-+ "fistps 32(%4)\n\t"
- "fadds 84(%1)\n\t"
-- "fistp 96(%4)\n\t"
-+ "fistps 96(%4)\n\t"
-
- "flds 116(%1)\n\t"
- "fadds 108(%1)\n\t"
- "fld %%st(0)\n\t"
- "fadds 84(%1)\n\t"
-- "fistp 160(%4)\n\t"
-+ "fistps 160(%4)\n\t"
- "fadds 76(%1)\n\t"
-- "fistp 224(%4)\n\t"
-+ "fistps 224(%4)\n\t"
-
- "flds 108(%1)\n\t"
- "fadds 124(%1)\n\t"
- "fld %%st(0)\n\t"
- "fadds 76(%1)\n\t"
-- "fistp 288(%4)\n\t"
-+ "fistps 288(%4)\n\t"
- "fadds 92(%1)\n\t"
-- "fistp 352(%4)\n\t"
-+ "fistps 352(%4)\n\t"
-
- "flds 124(%1)\n\t"
-- "fist 480(%4)\n\t"
-+ "fists 480(%4)\n\t"
- "fadds 92(%1)\n\t"
-- "fistp 416(%4)\n\t"
-+ "fistps 416(%4)\n\t"
- ".byte 0xdf, 0xc0\n\t" // ffreep %%st(0)
- :
- :"m"(costab_mmx[30]), "r"(b1), "r"(b2), "r"(out0), "r"(out1)
Deleted: trunk/dports/multimedia/mplayer-devel/files/yadif.patch
===================================================================
--- trunk/dports/multimedia/mplayer-devel/files/yadif.patch 2011-06-23 21:59:09 UTC (rev 79716)
+++ trunk/dports/multimedia/mplayer-devel/files/yadif.patch 2011-06-23 22:00:58 UTC (rev 79717)
@@ -1,11 +0,0 @@
---- libmpcodecs/vf_yadif.c.orig 2011-06-23 12:54:15.000000000 -0700
-+++ libmpcodecs/vf_yadif.c 2011-06-23 12:53:19.000000000 -0700
-@@ -196,7 +196,7 @@ static void filter_line_mmx2(struct vf_p
- \
- /* if(p->mode<2) ... */\
- "movq %[tmp3], %%mm6 \n\t" /* diff */\
-- "cmp $2, %[mode] \n\t"\
-+ "cmpl $2, %[mode] \n\t"\
- "jge 1f \n\t"\
- LOAD4("(%["prev2"],%[mrefs],2)", %%mm2) /* prev2[x-2*refs] */\
- LOAD4("(%["next2"],%[mrefs],2)", %%mm4) /* next2[x-2*refs] */\
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110623/2a5aeabf/attachment-0001.html>
More information about the macports-changes
mailing list