[99165] trunk/dports
jeremyhu at macports.org
jeremyhu at macports.org
Sun Oct 28 15:56:03 PDT 2012
Revision: 99165
http://trac.macports.org//changeset/99165
Author: jeremyhu at macports.org
Date: 2012-10-28 15:56:03 -0700 (Sun, 28 Oct 2012)
Log Message:
-----------
ffmpeg: Bump to 1.0 and revbump dependent ports (#36693).
Modified Paths:
--------------
trunk/dports/audio/mpd/Portfile
trunk/dports/audio/xmms2/Portfile
trunk/dports/devel/libdlna/Portfile
trunk/dports/devel/strigi/Portfile
trunk/dports/devel/vxl/Portfile
trunk/dports/gis/grass/Portfile
trunk/dports/graphics/OpenSceneGraph-devel/Portfile
trunk/dports/graphics/gegl/Portfile
trunk/dports/graphics/opencv/Portfile
trunk/dports/kde/kdemultimedia4/Portfile
trunk/dports/multimedia/VLC/Portfile
trunk/dports/multimedia/VLC-devel/Portfile
trunk/dports/multimedia/ffmpeg/Portfile
trunk/dports/multimedia/libquicktime/Portfile
trunk/dports/multimedia/libquicktime-devel/Portfile
trunk/dports/multimedia/mlt/Portfile
trunk/dports/multimedia/moc/Portfile
trunk/dports/multimedia/mplayer2/Portfile
trunk/dports/multimedia/pHash/Portfile
trunk/dports/multimedia/tovid/Portfile
trunk/dports/multimedia/transcode/Portfile
trunk/dports/multimedia/xine-lib/Portfile
trunk/dports/net/baresip/Portfile
trunk/dports/net/mediatomb/Portfile
trunk/dports/net/minidlna/Portfile
trunk/dports/science/bob/Portfile
trunk/dports/science/gmic/Portfile
trunk/dports/science/yorick-av/Portfile
Removed Paths:
-------------
trunk/dports/multimedia/ffmpeg/files/
Modified: trunk/dports/audio/mpd/Portfile
===================================================================
--- trunk/dports/audio/mpd/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/audio/mpd/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -5,6 +5,7 @@
name mpd
version 0.17.2
+revision 1
categories audio
maintainers rmstonecipher openmaintainer
description Music Player Daemon
@@ -48,7 +49,7 @@
--disable-mpg123
configure.cflags-append -I${prefix}/include
variant ffmpeg description {Support for myriad formats via ffmpeg} {
- depends_lib-append path:bin/ffmpeg:ffmpeg
+ depends_lib-append path:lib/libavcodec.dylib:ffmpeg
configure.args-delete --disable-ffmpeg
}
variant mod description {Support for several formats of tracker/sequencer files via libmikmod} {
Modified: trunk/dports/audio/xmms2/Portfile
===================================================================
--- trunk/dports/audio/xmms2/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/audio/xmms2/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -4,7 +4,7 @@
name xmms2
version 0.8DrO_o
-revision 1
+revision 2
categories audio
maintainers nomaintainer
homepage http://xmms2.org/
Modified: trunk/dports/devel/libdlna/Portfile
===================================================================
--- trunk/dports/devel/libdlna/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/devel/libdlna/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -5,7 +5,7 @@
name libdlna
version 0.2.3
-revision 2
+revision 3
categories devel
platforms darwin
maintainers sfiera
Modified: trunk/dports/devel/strigi/Portfile
===================================================================
--- trunk/dports/devel/strigi/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/devel/strigi/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -6,7 +6,7 @@
name strigi
version 0.7.5
-revision 4
+revision 5
categories devel
maintainers gmail.com:clubjuggler openmaintainer
license LGPL-2+
Modified: trunk/dports/devel/vxl/Portfile
===================================================================
--- trunk/dports/devel/vxl/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/devel/vxl/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -6,7 +6,7 @@
name vxl
version 1.14.0
-revision 3
+revision 4
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers maeth.com:wiking
Modified: trunk/dports/gis/grass/Portfile
===================================================================
--- trunk/dports/gis/grass/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/gis/grass/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -5,6 +5,7 @@
name grass
epoch 1
version 6.4.2
+revision 1
maintainers nomaintainer
categories gis
license GPL-2+
@@ -127,7 +128,7 @@
}
variant ffmpeg description {Add ffmpeg support} {
- depends_lib-append port:ffmpeg
+ depends_lib-append path:lib/libavcodec.dylib:ffmpeg
configure.args-append --with-ffmpeg \
--with-ffmpeg-includes=\"${prefix}/include/libavcodec \
${prefix}/include/libavformat \
Modified: trunk/dports/graphics/OpenSceneGraph-devel/Portfile
===================================================================
--- trunk/dports/graphics/OpenSceneGraph-devel/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/graphics/OpenSceneGraph-devel/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -8,7 +8,7 @@
conflicts OpenSceneGraph
set my_name OpenSceneGraph
version 2.9.7
-revision 3
+revision 4
platforms darwin
categories graphics
maintainers nomaintainer
Modified: trunk/dports/graphics/gegl/Portfile
===================================================================
--- trunk/dports/graphics/gegl/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/graphics/gegl/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -6,7 +6,7 @@
name gegl
version 0.2.0
-revision 2
+revision 3
license {GPL-3+ LGPL-3+}
set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
Modified: trunk/dports/graphics/opencv/Portfile
===================================================================
--- trunk/dports/graphics/opencv/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/graphics/opencv/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -6,7 +6,7 @@
name opencv
version 2.4.2
-revision 1
+revision 2
categories graphics science
license BSD
platforms darwin
Modified: trunk/dports/kde/kdemultimedia4/Portfile
===================================================================
--- trunk/dports/kde/kdemultimedia4/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/kde/kdemultimedia4/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -7,6 +7,7 @@
name kdemultimedia4
conflicts kdelibs4-experimental
version 4.8.5
+revision 1
categories kde kde4
maintainers sharky nicos
license GPL-2+ LGPL-2+ GFDL-1.2
@@ -24,7 +25,7 @@
depends_lib-append port:kde4-runtime \
port:libogg \
port:libvorbis \
- port:ffmpeg \
+ path:lib/libavcodec.dylib:ffmpeg \
port:taglib
configure.args-append -DBUILD_dragonplayer=ON \
Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/multimedia/VLC/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -5,7 +5,7 @@
name VLC
version 2.0.4
-revision 3
+revision 4
categories multimedia
Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -5,7 +5,7 @@
name VLC-devel
version 2.0.99
-revision 4
+revision 5
categories multimedia
Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -8,8 +8,7 @@
name ffmpeg
conflicts ffmpeg-devel
epoch 1
-version 0.7.13
-revision 2
+version 1.0
set branch [join [lrange [split ${version} .] 0 1] .]
license LGPL-2.1+
categories multimedia
@@ -52,8 +51,8 @@
use_bzip2 yes
-checksums sha256 c9450705aba65dce8c02dcbb80a307ba182eeddc752333a7f42dd81fe78c0964 \
- rmd160 507acb8467784d045e0ba3720822243826d054c1
+checksums sha256 0d82c3e246b8a4510ed7947865c0415fef3bc1d1c1259a007463ce2f7e4171c9 \
+ rmd160 ebb115127f40981ea1887f99b18ae6c70aef5830
depends_build port:pkgconfig \
port:gmake \
@@ -61,8 +60,10 @@
depends_lib port:lame \
port:libvorbis \
+ port:libopus \
port:libogg \
port:libtheora \
+ port:libmodplug \
port:dirac \
port:schroedinger \
port:openjpeg \
@@ -72,8 +73,6 @@
port:bzip2 \
port:zlib
-patchfiles patch-configure.diff
-
build.cmd ${prefix}/bin/gmake
build.env-append V=1
@@ -96,32 +95,18 @@
# Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
default_variants-append +gpl2
-# Under some conditions, llvm-gcc-4.2 drops some "unused" code even though it is used.
-# This is fixed in llvm-gcc trunk, but not in Apple's shipped llvm-gccs.
-if {${configure.compiler} == "llvm-gcc-4.2"} {
- configure.compiler clang
-}
-
-# Newer clang hit https://trac.macports.org/ticket/30137 (<rdar://problem/11542429>)
-if {${configure.compiler} == "clang" && [vercmp ${xcodeversion} 4.1] >= 0 && [lsearch [get_canonical_archs] i386] != -1} {
- depends_build-append port:clang-3.0
- depends_skip_archcheck-append clang-3.0
-
- configure.compiler macports-clang-3.0
-}
-
configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
configure.args \
--enable-swscale --enable-avfilter \
--enable-libmp3lame \
--enable-libvorbis \
+ --enable-libopus \
--enable-libtheora \
- --enable-libdirac --enable-libschroedinger \
+ --enable-libschroedinger \
--enable-libopenjpeg \
+ --enable-libmodplug \
--enable-libvpx \
--enable-libspeex \
- --disable-libopencore-amrnb \
- --disable-libopencore-amrwb \
--disable-mmx \
--disable-mmx2 \
--disable-sse \
@@ -154,6 +139,12 @@
}
}
+platform darwin 8 {
+ post-patch {
+ reinplace "s:,-compatibility_version,$\(LIBMAJOR\)::" ${worksrcpath}/configure
+ }
+}
+
configure.universal_args-delete --disable-dependency-tracking
if {[variant_isset universal]} {
Modified: trunk/dports/multimedia/libquicktime/Portfile
===================================================================
--- trunk/dports/multimedia/libquicktime/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/multimedia/libquicktime/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -6,7 +6,7 @@
name libquicktime
conflicts libquicktime-devel
version 1.2.4
-revision 2
+revision 3
categories multimedia
platforms darwin
maintainers mww openmaintainer
Modified: trunk/dports/multimedia/libquicktime-devel/Portfile
===================================================================
--- trunk/dports/multimedia/libquicktime-devel/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/multimedia/libquicktime-devel/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -6,7 +6,7 @@
set my_name libquicktime
conflicts libquicktime
version 1.2.4
-revision 20120902
+revision 20121028
categories multimedia
platforms darwin
maintainers jeremyhu
@@ -38,6 +38,6 @@
fetch.type cvs
cvs.root :pserver:anonymous at libquicktime.cvs.sourceforge.net:/cvsroot/libquicktime
-cvs.date 2012-04-23
+cvs.date 2012-10-28
cvs.module libquicktime
worksrcdir libquicktime
Modified: trunk/dports/multimedia/mlt/Portfile
===================================================================
--- trunk/dports/multimedia/mlt/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/multimedia/mlt/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -7,6 +7,7 @@
name mlt
epoch 3
version 0.8.2
+revision 1
categories multimedia
maintainers dennedy.org:dan
license GPL-2+
Modified: trunk/dports/multimedia/moc/Portfile
===================================================================
--- trunk/dports/multimedia/moc/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/multimedia/moc/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -4,6 +4,7 @@
name moc
version 2.4.4
+revision 1
categories multimedia
maintainers martinvazquez.net:eu
description MOC (music on console) is a console audio player for LINUX/UNIX
@@ -52,7 +53,3 @@
depends_lib-append port:libvorbis
configure.args-delete --without-vorbis
}
-
-variant without_ffmpeg description {Disable some decoders provided by ffmpeg} {
- depends_lib-delete path:lib/libavcodec.dylib:ffmpeg
-}
Modified: trunk/dports/multimedia/mplayer2/Portfile
===================================================================
--- trunk/dports/multimedia/mplayer2/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/multimedia/mplayer2/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -15,7 +15,7 @@
homepage http://www.mplayer2.org/
version 2.0-20120815
-revision 1
+revision 2
fetch.type git
git.url git://git.mplayer2.org/mplayer2.git
git.branch 01d067dd2160fa3c69a397840a0abd82837f4c91
@@ -35,7 +35,7 @@
port:a52dec \
port:enca \
port:faad2 \
- port:ffmpeg-devel \
+ path:lib/libavcodec.dylib:ffmpeg \
port:fontconfig \
port:freetype \
port:fribidi \
Modified: trunk/dports/multimedia/pHash/Portfile
===================================================================
--- trunk/dports/multimedia/pHash/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/multimedia/pHash/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -5,6 +5,7 @@
name pHash
version 0.9.4
+revision 1
categories multimedia
platforms darwin
maintainers workisfun.ru:ivan
@@ -20,7 +21,7 @@
checksums rmd160 6b33bcf07e8d54e695bd1a3ac3e60d3fcffc2000 \
sha256 6f882116a0525fddc8451e334a5dca3f4144d310d97eda80b1b1ab7c1587a189
-depends_lib port:ffmpeg \
+depends_lib path:lib/libavcodec.dylib:ffmpeg \
port:jpeg \
port:libsndfile \
port:libsamplerate \
Modified: trunk/dports/multimedia/tovid/Portfile
===================================================================
--- trunk/dports/multimedia/tovid/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/multimedia/tovid/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -5,7 +5,7 @@
name tovid
version 0.31
-revision 2
+revision 3
categories multimedia
maintainers shah.co.nz:macports
description a collection of GPL video disc authoring tools
@@ -18,7 +18,7 @@
# Use mplayer-devel as mplayer does not build on Snow Leopard
depends_lib port:txt2tags \
path:bin/mplayer:mplayer-devel \
- port:ffmpeg \
+ path:lib/libavcodec.dylib:ffmpeg \
port:mjpegtools \
port:ImageMagick \
port:dvdauthor \
Modified: trunk/dports/multimedia/transcode/Portfile
===================================================================
--- trunk/dports/multimedia/transcode/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/multimedia/transcode/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -5,7 +5,7 @@
name transcode
version 1.1.7
-revision 2
+revision 3
epoch 1
license GPL-2+
categories multimedia
Modified: trunk/dports/multimedia/xine-lib/Portfile
===================================================================
--- trunk/dports/multimedia/xine-lib/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/multimedia/xine-lib/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -4,6 +4,7 @@
name xine-lib
version 1.2.2
+revision 1
description xine-lib is a free multimedia engine, released under the GPL.
long_description ${description}
maintainers ryandesign openmaintainer
Modified: trunk/dports/net/baresip/Portfile
===================================================================
--- trunk/dports/net/baresip/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/net/baresip/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -6,6 +6,7 @@
name baresip
version 0.4.1
+revision 1
categories net
platforms darwin
maintainers db.org:aeh
@@ -25,7 +26,7 @@
depends_lib port:libre \
port:librem \
port:spandsp-devel \
- path:bin/ffmpeg:ffmpeg
+ path:lib/libavcodec.dylib:ffmpeg
use_configure no
Modified: trunk/dports/net/mediatomb/Portfile
===================================================================
--- trunk/dports/net/mediatomb/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/net/mediatomb/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -6,7 +6,7 @@
name mediatomb
version 0.12.1
-revision 5
+revision 6
categories net multimedia
platforms darwin
maintainers gmail.com:yattenator
Modified: trunk/dports/net/minidlna/Portfile
===================================================================
--- trunk/dports/net/minidlna/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/net/minidlna/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -5,7 +5,7 @@
name minidlna
version 1.0.22_20111216
-revision 1
+revision 2
categories net multimedia
platforms darwin
maintainers gmail.com:ranauei
@@ -23,7 +23,7 @@
checksums sha256 05273f6711e83ff124fec6d1b74e54a47887484b003f24feefb1abca9a5c2182 \
rmd160 a057bcc61f0027ae261fef9b9a2493be97c98ed3
-depends_lib port:ffmpeg \
+depends_lib path:lib/libavcodec.dylib:ffmpeg \
port:flac \
port:libid3tag \
port:libexif \
Modified: trunk/dports/science/bob/Portfile
===================================================================
--- trunk/dports/science/bob/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/science/bob/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -6,6 +6,7 @@
PortGroup github 1.0
github.setup idiap bob 1.1.1 v
+revision 1
set soversion 1.1
categories science math devel
platforms darwin
Modified: trunk/dports/science/gmic/Portfile
===================================================================
--- trunk/dports/science/gmic/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/science/gmic/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -5,7 +5,7 @@
name gmic
version 1.5.0.8
-revision 1
+revision 2
license CeCILL
categories science
platforms darwin
Modified: trunk/dports/science/yorick-av/Portfile
===================================================================
--- trunk/dports/science/yorick-av/Portfile 2012-10-28 22:35:34 UTC (rev 99164)
+++ trunk/dports/science/yorick-av/Portfile 2012-10-28 22:56:03 UTC (rev 99165)
@@ -6,6 +6,7 @@
set uname av
github.setup paumard yorick-${uname} 0.0.1 v
+revision 1
categories science multimedia yorick
platforms darwin
maintainers thibaut openmaintainer
@@ -21,7 +22,7 @@
sha256 b81accb4b3c1ac2a74daf8c127c4f6e0ed87af9c877643a0636d0848c65dc540
depends_lib-append path:bin/yorick:yorick \
- port:ffmpeg
+ path:lib/libavcodec.dylib:ffmpeg
variant devel description {Link against ffmpeg-devel insted of ffmpeg} {
depends_lib-replace s/port:ffmpeg/port:ffmpeg-devel/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121028/0e9fc50f/attachment-0001.html>
More information about the macports-changes
mailing list