[99854] trunk/dports/multimedia/mplayer2

cal at macports.org cal at macports.org
Mon Nov 19 05:33:20 PST 2012


Revision: 99854
          https://trac.macports.org/changeset/99854
Author:   cal at macports.org
Date:     2012-11-19 05:33:20 -0800 (Mon, 19 Nov 2012)
Log Message:
-----------
mplayer2: update to 20121108, closes #36793

Modified Paths:
--------------
    trunk/dports/multimedia/mplayer2/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/mplayer2/files/
    trunk/dports/multimedia/mplayer2/files/patch-Makefile.diff

Modified: trunk/dports/multimedia/mplayer2/Portfile
===================================================================
--- trunk/dports/multimedia/mplayer2/Portfile	2012-11-19 12:37:34 UTC (rev 99853)
+++ trunk/dports/multimedia/mplayer2/Portfile	2012-11-19 13:33:20 UTC (rev 99854)
@@ -14,11 +14,10 @@
 long_description        ${description}
 
 homepage                http://www.mplayer2.org/
-version                 2.0-20120815
-revision                2
+version                 2.0-20121108
 fetch.type              git
 git.url                 git://git.mplayer2.org/mplayer2.git
-git.branch              01d067dd2160fa3c69a397840a0abd82837f4c91
+git.branch              b5349bb946d481e0f74449960b8f81839b47bd3c
 
 # disable livecheck, because it seems upstream isn't going to do any releases
 livecheck.type          none
@@ -28,20 +27,22 @@
 depends_build-append    port:pkgconfig \
                         port:yasm \
                         port:autoconf \
-                        port:python32
+                        port:python32 \
+                        port:py27-docutils
 
-depends_lib-append      \
-                        path:lib/pkgconfig/sdl.pc:libsdl \
+depends_lib-append      path:lib/pkgconfig/sdl.pc:libsdl \
+                        path:lib/libavcodec.dylib:ffmpeg \
+                        port:XviD \
                         port:a52dec \
                         port:enca \
                         port:faad2 \
-                        path:lib/libavcodec.dylib:ffmpeg \
                         port:fontconfig \
                         port:freetype \
                         port:fribidi \
                         port:gettext \
                         port:jpeg \
                         port:lame \
+                        port:lcms2 \
                         port:libass \
                         port:libcdio \
                         port:libdca \
@@ -53,16 +54,18 @@
                         port:libmng \
                         port:libogg \
                         port:libpng \
+                        port:libquvi \
                         port:libtheora \
                         port:libvorbis \
                         port:mesa \
                         port:ncurses \
                         port:speex \
-                        port:XviD \
                         port:zlib
 
 universal_variant       no
 
+patchfiles              patch-Makefile.diff
+
 post-patch {
     reinplace "s|#!/usr/bin/env python3|#!$prefix/bin/python3.2|g" \
         ${worksrcpath}/TOOLS/file2string.py \
@@ -95,8 +98,8 @@
                         --enable-networking \
                         --disable-winsock2_h \
                         --disable-smb \
-                        --enable-live \
-                        --disable-nemesi \
+                        --enable-libquvi \
+                        --enable-lcms2 \
                         --enable-vcd \
                         --disable-bluray \
                         --enable-dvdnav \
@@ -104,12 +107,8 @@
                         --disable-dvdread-internal \ \
                         --disable-libdvdcss-internal \
                         --enable-cddb \
-                        --disable-bitmap-font \
-                        --enable-freetype \
-                        --enable-fontconfig \
                         --disable-unrarexec \
                         --enable-sortsub \
-                        --enable-fribidi \
                         --enable-enca \
                         --enable-macosx-finder \
                         --enable-macosx-bundle \
@@ -148,23 +147,12 @@
                         --enable-liba52 \
                         --disable-musepack \
                         --enable-gl \
-                        --disable-dga2 \
-                        --disable-dga1 \
-                        --disable-vesa \
-                        --disable-svga \
                         --enable-sdl \
-                        --disable-aa \
                         --disable-caca \
-                        --disable-ggi \
-                        --disable-ggiwmh \
                         --disable-direct3d \
                         --disable-directx \
-                        --disable-dxr3 \
-                        --disable-ivtv \
                         --disable-v4l2 \
                         --disable-dvb \
-                        --disable-mga \
-                        --disable-xmga \
                         --disable-xv \
                         --disable-vdpau \
                         --disable-vm \
@@ -172,15 +160,7 @@
                         --disable-x11 \
                         --disable-xshape \
                         --disable-xss \
-                        --disable-fbdev \
-                        --disable-3dfx \
-                        --disable-tdfxfb \
-                        --disable-s3fb \
-                        --disable-wii \
                         --disable-directfb \
-                        --disable-bl \
-                        --disable-tdfxvid \
-                        --disable-xvr100 \
                         --disable-tga \
                         --disable-pnm \
                         --disable-md5sum \
@@ -195,9 +175,6 @@
                         --disable-portaudio \
                         --disable-jack \
                         --disable-openal \
-                        --disable-nas \
-                        --disable-sunaudio \
-                        --disable-win32waveout \
                         --enable-coreaudio \
                         --enable-translation \
                         --disable-select \
@@ -205,7 +182,7 @@
                         --disable-static \
                         --extra-cflags=\"${configure.cppflags} ${configure.optflags} [get_canonical_archflags cc] -Wno-pointer-sign\" \
                         --extra-ldflags=\"${configure.ldflags} [get_canonical_archflags ld]\" \
-                        --extra-libs=\"-liconv -lncurses -lpng -lz -lmng -lz -ljpeg -ldvdread -lcdio_paranoia -lcdio_cdda -lcdio -lfreetype -lfontconfig -lass -lfribidi -lenca -lz -lmad -lvorbis -logg -lspeex -ltheora -logg -la52 -ldca -lfaad -lavutil -lavcodec -lavformat -lswscale -lpostproc -ldv -lxvidcore -lm -ldvdnavmini -lpthread -lm -framework IOKit -framework Cocoa -framework OpenGL -framework QuartzCore -lSDLmain -lSDL -framework CoreAudio -framework AudioUnit -framework AudioToolbox -lintl\"
+                        --extra-libs=\"-liconv -lncurses -lpng -lz -lmng -lz -ljpeg -ldvdread -lcdio_paranoia -lcdio_cdda -lcdio -lfreetype -lfontconfig -lass -lfribidi -lenca -lz -lmad -lvorbis -logg -lspeex -ltheora -logg -la52 -ldca -lfaad -lavutil -lavcodec -lavformat -lswscale -lpostproc -ldv -lxvidcore -lm -ldvdnavmini -lpthread -lm -framework IOKit -framework Cocoa -framework OpenGL -framework QuartzCore -lSDLmain -lSDL -framework CoreAudio -framework AudioUnit -framework AudioToolbox -lintl -llcms2 -lquvi \"
 
                         # leave out libass, as configure doesn't handle it correctly
                         # --enable-libass \
@@ -214,9 +191,9 @@
 build.args-append       V=1
 build.env-append        CC=${configure.cc} \
                         CPP=${configure.cpp} \
-                        CFLAGS="${configure.optflags} [get_canonical_archflags]" \
+                        CFLAGS="${configure.optflags} [get_canonical_archflags cc]" \
                         CPPFLAGS="${configure.cppflags}" \
-                        LDFLAGS="${configure.ldflags} [get_canonical_archflags]"
+                        LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
 
 variant smb description {Enable Samba support} {
     depends_lib-append  port:samba3

Added: trunk/dports/multimedia/mplayer2/files/patch-Makefile.diff
===================================================================
--- trunk/dports/multimedia/mplayer2/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/multimedia/mplayer2/files/patch-Makefile.diff	2012-11-19 13:33:20 UTC (rev 99854)
@@ -0,0 +1,13 @@
+--- Makefile.orig	2012-11-13 23:34:32.000000000 -0600
++++ Makefile	2012-11-13 23:47:27.000000000 -0600
+@@ -535,8 +535,8 @@
+ all: mplayer$(EXESUF) locales
+ 
+ %.1: %.rst
+-	@which rst2man >/dev/null 2>&1 || (printf "\n\trst2man not found. You need the Docutils system to generate the manpages (preferably version >= 0.9; 0.8 and older are known to corrupt the arguments shown in some option descriptions). Alternatively you can use 'install-no-man' rule.\n\n" && exit 1)
+-	rst2man $< $@
++	@which rst2man-2.7.py >/dev/null 2>&1 || (printf "\n\trst2man-2.7.py not found. You need the Docutils system to generate the manpages (preferably version >= 0.9; 0.8 and older are known to corrupt the arguments shown in some option descriptions). Alternatively you can use 'install-no-man' rule.\n\n" && exit 1)
++	rst2man-2.7.py $< $@
+ 
+ %.o: %.S
+ 	$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121119/88b5cf32/attachment-0001.html>


More information about the macports-changes mailing list