[20652] trunk/dports/multimedia/MPlayer

source_changes at macosforge.org source_changes at macosforge.org
Mon Nov 13 13:29:51 PST 2006


Revision: 20652
          http://trac.macosforge.org/projects/macports/changeset/20652
Author:   dluke at macports.org
Date:     2006-11-13 13:29:51 -0800 (Mon, 13 Nov 2006)

Log Message:
-----------
Fix MPlayer build on i386 where /usr/local/lib/codecs exists (along with assigning a maintainer and other changes from #10948)

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

Added Paths:
-----------
    trunk/dports/multimedia/MPlayer/files/
    trunk/dports/multimedia/MPlayer/files/patch-Makefile

Modified: trunk/dports/multimedia/MPlayer/Portfile
===================================================================
--- trunk/dports/multimedia/MPlayer/Portfile	2006-11-13 21:08:27 UTC (rev 20651)
+++ trunk/dports/multimedia/MPlayer/Portfile	2006-11-13 21:29:51 UTC (rev 20652)
@@ -1,194 +1,298 @@
 # $Id$
 
-PortSystem			1.0
-name				MPlayer
-version				1.0rc1
-categories			multimedia
-maintainers			nomaintainer at macports.org
-description			The Unix movie player
+PortSystem          1.0
+name                MPlayer
+version             1.0rc1
+revision            1
+categories          multimedia
+maintainers         ecronin at gizmolabs.org \
+                    openmaintainer at macports.org
+description         The Unix movie player
 long_description \
-	MPlayer can play most standard video formats out of the box and almost \
-	all others with the help of external codecs.  MPlayer currently works \
-	best from the command line, but visual feedback for many functions is \
-	available from its onscreen status display (OSD), which is also used for \
-	displaying subtitles. MPlayer also has a GUI with skin support and \
-	several unofficial alternative graphical frontends are available.
+    MPlayer can play most standard video formats out of the box and almost \
+    all others with the help of external codecs.  MPlayer currently works \
+    best from the command line, but visual feedback for many functions is \
+    available from its onscreen status display (OSD), which is also used for \
+    displaying subtitles. MPlayer also has a GUI with skin support and \
+    several unofficial alternative graphical frontends are available.
 
-platforms			darwin
+platforms           darwin
 
-homepage			http://www.mplayerhq.hu/
-master_sites		http://www1.mplayerhq.hu/MPlayer/releases/ \
-					http://www2.mplayerhq.hu/MPlayer/releases/ \
-					http://www4.mplayerhq.hu/MPlayer/releases/ \
-					http://studwww.ira.uni-karlsruhe.de/~s_doeffi/MPlayer/ \
-					http://equinox.campus.ltu.se/MPlayer/releases/ \
-					http://tranquillity.campus.ltu.se/~rtogni/ \
-					http://www.people.virginia.edu/~drf8f/MPlayer/releases/ \
-					http://www1.mplayerhq.hu/MPlayer/releases/codecs/:codecs \
-					http://www2.mplayerhq.hu/MPlayer/releases/codecs/:codecs
-use_bzip2			yes
+homepage            http://www.mplayerhq.hu/
+master_sites        http://www1.mplayerhq.hu/MPlayer/releases/ \
+                    http://www2.mplayerhq.hu/MPlayer/releases/ \
+                    http://www4.mplayerhq.hu/MPlayer/releases/ \
+                    http://studwww.ira.uni-karlsruhe.de/~s_doeffi/MPlayer/ \
+                    http://equinox.campus.ltu.se/MPlayer/releases/ \
+                    http://tranquillity.campus.ltu.se/~rtogni/ \
+                    http://www.people.virginia.edu/~drf8f/MPlayer/releases/ \
+                    http://www1.mplayerhq.hu/MPlayer/releases/codecs/:codecs \
+                    http://www2.mplayerhq.hu/MPlayer/releases/codecs/:codecs
+use_bzip2           yes
 
-checksums			${distname}${extract.suffix} \
-						md5 18c05d88e22c3b815a43ca8d7152ccdc \
-						sha1 a450c0b0749c343a8496ba7810363c9d46dfa73c \
-						rmd160 8cea02e832aec5d9e090829d61d0f131dcc177a2
+checksums           ${distname}${extract.suffix} \
+                        md5 18c05d88e22c3b815a43ca8d7152ccdc \
+                        sha1 a450c0b0749c343a8496ba7810363c9d46dfa73c \
+                        rmd160 8cea02e832aec5d9e090829d61d0f131dcc177a2
 
-depends_lib			port:libpng port:jpeg port:lzo port:libvorbis \
-					port:libmad port:lame
+depends_lib         port:libpng port:jpeg port:lzo port:libvorbis \
+                    port:libmad port:lame port:libiconv port:zlib
 
-configure.args		--with-extraincdir=${prefix}/include \
-					--with-extralibdir=${prefix}/lib \
-					--datadir=${prefix}/share/${name} \
-					--confdir=${prefix}/etc/${name} \
-					--mandir=${prefix}/share/man \
-					--enable-inet6 --enable-png --enable-jpeg \
-					--enable-liblzo --enable-libvorbis --enable-mad \
-					--enable-mencoder --enable-largefiles\
-					--disable-sdl --disable-x11 --disable-freetype \
-					--disable-fontconfig --disable-gif --disable-arts \
-					--disable-esd --disable-fribidi --disable-theora \
-					--disable-xvid --disable-x264 --disable-cdparanoia \
-					--disable-libcdio
+configure.args \
+                    --with-extraincdir=${prefix}/include:${prefix}/include/cdparanoia/interface:${prefix}/include/cdparanoia/paranoia \
+                    --with-extralibdir=${prefix}/lib:${prefix}/lib/samba3 \
+                    --datadir=${prefix}/share/${name} \
+                    --confdir=${prefix}/etc/${name} \
+                    --mandir=${prefix}/share/man \
+                    --enable-png --enable-jpeg \
+                    --enable-liblzo --enable-libvorbis \
+                    --enable-mad --disable-faad-external \
+                    --enable-largefiles
+                    
+# 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-mpdvdkit \
+                    --disable-cdparanoia --disable-freetype \
+                    --disable-fontconfig --disable-unrarlib \
+                    --disable-fribidi --disable-enca \
+                    --disable-gif --disable-libcdio --disable-xvid \
+                    --disable-x264 --disable-nut --disable-libfame \
+                    --disable-speex --disable-theora --disable-faac \
+                    --disable-ladspa --disable-libdv --disable-toolame \
+                    --disable-twolame --disable-xmms --disable-libdts \
+                    --disable-musepack --disable-sdl --disable-aa \
+                    --disable-caca --disable-x11 --disable-arts \
+                    --disable-esd
 
 post-destroot {
-	file mkdir ${destroot}${prefix}/share/doc/${name}
-	eval file copy [glob ${worksrcpath}/DOCS/*] \
-		${destroot}${prefix}/share/doc/${name}
+    file mkdir ${destroot}${prefix}/share/doc/${name}
+    eval file copy [glob ${worksrcpath}/DOCS/*] \
+        ${destroot}${prefix}/share/doc/${name}
 }
 
-variant real {
-	global mplayerRP8 mplayerRP9 mplayerRP8file mplayerRP9file
-	set mplayerRP8			rp8codecs-ppc-20050115
-	set mplayerRP9			rp9codecs-macosx-20041107.pkg
-	set mplayerRP8file		${mplayerRP8}.tar.bz2
-	set mplayerRP9file		${mplayerRP9}.zip
-	distfiles-append		${mplayerRP8file}:codecs ${mplayerRP9file}:codecs
-	checksums-append		${mplayerRP8file} \
-								md5 4cc9a6270f9aa834b4fef49d71b9faf9 \
-								sha1 12ce04765bdf96e6ad386de1ef637b471d947796 \
-								rmd160 8d3feedca9ef50a25c5b7560dd5bca9184c1dd01 \
-							${mplayerRP9file} \
-								md5 788cf4940280fd787c0a2141d88ce3c7 \
-								sha1 18abd6d0424c4682815a13b34695d37d2fda2a73 \
-								rmd160 c6f49012633bbb84ffa405b8881dc90605d26fc6
+##### Mplayer features
 
-	extract.only			${distname}${extract.suffix}
+# Install all possible languages for man pages
+variant man_all_lang {
+    configure.args-append --language=all
+}
 
-	depends_lib-append		bin:unzip:unzip
+# configure doesn't fully build up necessary flags when --enable-fontconfig
+# is used, so use autodetect instead
+variant fontconfig {
+    depends_lib-append      port:fontconfig
+    configure.args-delete   --disable-fontconfig
+}
 
-	post-extract {
-		cd ${worksrcpath}
-		system "bunzip2 -c ${distpath}/${mplayerRP8file} | tar xf -"
-		system "unzip -q ${distpath}/${mplayerRP9file}"
-	}
+variant freetype {
+    depends_lib-append      port:freetype
+    configure.args-delete   --disable-freetype
+    configure.args-append   --enable-freetype
+}
 
-	configure.args-append	--with-reallibdir=${prefix}/share/${name}/codecs
+variant fribidi {
+    depends_lib-append      port:fribidi
+    configure.args-delete   --disable-fribidi
+    #configure.args-append   --enable-fribidi
+}
 
-	post-destroot {
-		xinstall -m 755 -d ${destroot}${prefix}/share/${name}/codecs
-		eval file copy [glob ${worksrcpath}/${mplayerRP8}/*] \
-			${destroot}${prefix}/share/${name}/codecs
-		cd ${destroot}${prefix}/share/${name}/codecs
-		system "gunzip -c \
-			${worksrcpath}/${mplayerRP9}/Contents/Archive.pax.gz | pax -r"
-	}
+##### Inputs
+
+## Broken as of 10/25/06 (samba3 produces bad libsmbclient.dylib)
+#variant smb {
+#    depends_lib-append      port:samba3
+#    configure.args-delete   --disable-smb
+#    #configure.args-append   --enable-smb
+#}
+
+variant dvdread {
+    depends_lib-append      port:libdvdread
+    configure.args-delete   --disable-dvdread
 }
 
-variant x11 requires freetype requires fontconfig {
-	depends_lib-append		lib:libX11.6:XFree86
-	configure.args-delete	--disable-x11
-	configure.args-append	--enable-x11
-	configure.env-append	PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${x11prefix}/lib/pkgconfig
+## Broken as of 10/25/06 (version issue?)
+#variant cdparanoia {
+#    depends_lib-append      port:cdparanoia
+#    configure.args-delete   --disable-cdparanoia
+#    #configure.args-append   --enable-dvdread
+#}
+
+##### External codecs
+
+variant gif {
+    depends_lib-append      port:libungif
+    configure.args-delete   --disable-gif
 }
 
-variant sdl {
-	depends_lib-append		port:libsdl
-	configure.args-delete	--disable-sdl
-	configure.args-append	--enable-sdl
+## Broken as of 10/25/06 (undefined symbol _read_toc)
+#variant cdio {
+#    depends_lib-append      port:libcdio
+#    configure.args-delete   --disable-libcdio
+#    #configure.args-append   --enable-libcdio
+#}
+
+variant theora {
+    depends_lib-append      port:libtheora
+    configure.args-delete   --disable-theora
+    configure.args-append   --enable-theora
 }
 
-# configure doesn't fully build up necessary flags when --enable-fontconfig
-# is used, so use autodetect instead
-variant fontconfig {
-	depends_lib-append		port:fontconfig
-	configure.args-delete	--disable-fontconfig
+variant xvid {
+    depends_lib-append      port:XviD
+    configure.args-delete   --disable-xvid
+    configure.args-append   --enable-xvid
 }
 
-variant freetype {
-	depends_lib-append		port:freetype
-	configure.args-delete	--disable-freetype
-	configure.args-append	--enable-freetype
+## Broken as of 10/25/06 (need newer x264 snapshot)
+#variant x264 {
+#    depends_lib-append      port:x264
+#    configure.args-delete   --disable-x264
+#    configure.args-append   --enable-x264
+#}
+
+# binary_codecs replaced 'variant real'
+variant real requires binary_codecs {}
+
+variant binary_codecs {
+    if {[variant_isset darwin_powerpc]} {
+        global mplayercodecs mplayercodecsfile
+        set mplayercodecs           rp9codecs-macosx-20041107.pkg
+        set mplayercodecsfile       ${mplayercodecs}.zip
+        distfiles-append            ${mplayercodecsfile}:codecs
+        checksums-append            ${mplayercodecsfile} \
+                                        md5 788cf4940280fd787c0a2141d88ce3c7 \
+                                        sha1 18abd6d0424c4682815a13b34695d37d2fda2a73 \
+                                        rmd160 c6f49012633bbb84ffa405b8881dc90605d26fc6
+
+        extract.only                ${distname}${extract.suffix}
+
+        depends_lib-append          bin:unzip:unzip
+
+        post-extract {
+            cd ${worksrcpath}
+            system "unzip -q ${distpath}/${mplayercodecsfile}"
+        }
+
+        configure.args-append   --with-codecsdir=${prefix}/share/${name}/codecs
+
+        post-destroot {
+            xinstall -m 755 -d ${destroot}${prefix}/share/${name}/codecs
+            cd ${destroot}${prefix}/share/${name}/codecs
+            system "gunzip -c \
+                ${worksrcpath}/${mplayercodecs}/Contents/Archive.pax.gz | pax -r"
+        }
+    }
+    if {[variant_isset darwin_i386]} {
+        global mplayercodecs mplayercodecsfile
+        set mplayercodecs           "Essential Codecs Package (Intel).pkg"
+        set mplayercodecsfile       essential-macosx-x86-20060611.zip
+        distfiles-append            ${mplayercodecsfile}:codecs
+        checksums-append            ${mplayercodecsfile} \
+                                        md5 1e409d500336a8318cbe2a67bbf9d9ca \
+                                        sha1 4f8fee483b6c227d8cb774d2d30e1ef36a43e04a \
+                                        rmd160 87beaa40263deb0d0b9166f24d6f9dd686f594fd
+
+        extract.only                ${distname}${extract.suffix}
+
+        depends_lib-append          bin:unzip:unzip
+
+        post-extract {
+            cd ${worksrcpath}
+            system "unzip -q ${distpath}/${mplayercodecsfile}"
+        }
+
+        configure.args-append   --with-codecsdir=${prefix}/share/${name}/codecs
+
+        post-destroot {
+            xinstall -m 755 -d ${destroot}${prefix}/share/${name}/codecs
+            cd ${destroot}${prefix}/share/${name}/codecs
+            system "gunzip -c \
+                \"${worksrcpath}/${mplayercodecs}/Contents/Archive.pax.gz\" | pax -r"
+        }
+    }
 }
 
-# configure doesn't pick up the right -l flag if we --enable-gif, so
-# we let it autodetect this
-variant gif {
-	depends_lib-append		port:libungif
-	configure.args-delete	--disable-gif
+variant speex {
+    depends_lib-append      port:speex-devel
+    configure.args-delete   --disable-speex
+    #configure.args-append   --enable-speex
 }
 
-variant arts {
-	depends_lib-append		port:arts
-	configure.args-delete	--disable-arts
-	configure.args-append	--enable-arts
+variant faac {
+    depends_lib-append      port:faac
+    configure.args-delete   --disable-faac
 }
 
-variant esd {
-	depends_lib-append		port:esound
-	configure.args-delete	--disable-esd
-	configure.args-append	--enable-esd
+variant dv {
+    depends_lib-append      port:libdv
+    configure.args-delete   --disable-libdv
 }
 
-variant fribidi {
-	depends_lib-append		port:fribidi
-	configure.args-delete	--disable-fribidi
-	configure.args-append	--enable-fribidi
+variant twolame {
+    depends_lib-append      port:twolame
+    configure.args-delete   --disable-twolame
 }
 
-variant theora {
-	depends_lib-append		port:libtheora
-	configure.args-delete	--disable-theora
-	configure.args-append	--enable-theora
+variant dts {
+    depends_lib-append      port:libdts
+    configure.args-delete   --disable-libdts
 }
 
-variant xvid {
-	depends_lib-append		port:XviD
-	configure.args-delete	--disable-xvid
-	configure.args-append	--enable-xvid
+##### Outputs
+
+variant sdl {
+    depends_lib-append      port:libsdl
+    configure.args-delete   --disable-sdl
 }
 
-variant x264 {
-	depends_lib-append		port:x264
-	configure.args-delete	--disable-x264
-	configure.args-append	--enable-x264
+variant aa {
+    depends_lib-append      port:aalib
+    configure.args-delete   --disable-aa
 }
 
-# Install all possible languages for man pages
-variant man_all_lang {
-	configure.args-append --language=all
+variant caca {
+    depends_lib-append      port:libcaca
+    configure.args-delete   --disable-caca
 }
 
-# GUI variant needs additional download of a skin
-#variant gui {
-#	depends_lib-append		port:gtk1
-#	configure.args-append	--enable-gui
-#}
+variant x11 requires freetype requires fontconfig {
+    depends_lib-append      lib:libX11.6:XFree86
+    configure.args-delete   --disable-x11
+    configure.env-append    PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${x11prefix}/lib/pkgconfig
+}
 
+variant arts {
+    depends_lib-append      port:arts
+    configure.args-delete   --disable-arts
+}
+
+variant esd {
+    depends_lib-append      port:esound
+    configure.args-delete   --disable-esd
+}
+
+
 platform macosx {
-	configure.args-append	--enable-macosx --enable-macosx-finder-support \
-							--enable-macosx-bundle --enable-qtx
+    configure.args-append   --enable-macosx --enable-macosx-finder-support \
+                            --enable-macosx-bundle --enable-qtx
 }
 
 platform darwin {
-	build.env			LD=cc
+    patchfiles-append   patch-Makefile
+    build.env           LD=cc
 }
 
 platform darwin 8 {
-	# Need to force use of c++ for linking when Xcode 2.2 is used since some
-	# bits of libstdc++ are needed during linking
-	build.env			LD=c++
+    # Need to force use of c++ for linking when Xcode 2.2 is used since some
+    # bits of libstdc++ are needed during linking
+    build.env           LD=c++
 }
 
-platform i386 {
-       configure.args-append   --disable-mp3lib
+platform darwin i386 {
+    configure.args-append   --disable-win32 --disable-mp3lib
 }
+
+platform darwin powerpc {}

Added: trunk/dports/multimedia/MPlayer/files/patch-Makefile
===================================================================
--- trunk/dports/multimedia/MPlayer/files/patch-Makefile	                        (rev 0)
+++ trunk/dports/multimedia/MPlayer/files/patch-Makefile	2006-11-13 21:29:51 UTC (rev 20652)
@@ -0,0 +1,20 @@
+--- Makefile.orig	2006-10-24 12:08:13.000000000 -0400
++++ Makefile	2006-10-24 12:08:45.000000000 -0400
+@@ -384,7 +384,7 @@
+                $(STATIC_LIB) \
+ 
+ $(PRG):	$(MPLAYER_DEP)
+-	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(LIBS_MPLAYER)
++	$(LD) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(LIBS_MPLAYER)
+ 
+ ifeq ($(MENCODER),yes)
+ LIBS_MENCODER = libmpcodecs/libmpencoders.a \
+@@ -392,7 +392,7 @@
+                 $(COMMON_LIBS) \
+ 
+ $(PRG_MENCODER): $(MENCODER_DEP)
+-	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(LIBS_MENCODER)
++	$(LD) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(LIBS_MENCODER)
+ endif
+ 
+ osdep/mplayer-rc.o: osdep/mplayer.rc

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061113/9c40fc46/attachment.html


More information about the macports-changes mailing list