[ports-multimedia commit] r71 - in trunk/ports-multimedia/multimedia/ffmpeg: . files
codesite-noreply at google.com
codesite-noreply at google.com
Sun Feb 24 21:50:07 EST 2008
Author: buhnux
Date: Sun Feb 24 18:47:15 2008
New Revision: 71
Modified:
trunk/ports-multimedia/multimedia/ffmpeg/Makefile
trunk/ports-multimedia/multimedia/ffmpeg/distinfo
trunk/ports-multimedia/multimedia/ffmpeg/files/patch-configure
trunk/ports-multimedia/multimedia/ffmpeg/pkg-plist
Log:
Update to 2008-02-24
Modified: trunk/ports-multimedia/multimedia/ffmpeg/Makefile
==============================================================================
--- trunk/ports-multimedia/multimedia/ffmpeg/Makefile (original)
+++ trunk/ports-multimedia/multimedia/ffmpeg/Makefile Sun Feb 24
18:47:15 2008
@@ -2,12 +2,11 @@
# Date created: Sun May 1 20:46:59 UTC 2005
# Whom: Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
#
-# $FreeBSD$
+# $FreeBSD: ports/multimedia/ffmpeg/Makefile,v 1.76 2008/01/10
22:32:11 anders Exp $
# $Id$
PORTNAME= ffmpeg
-DISTVERSION= 2007-10-04
-PORTREVISION= 1
+DISTVERSION= 2008-02-24
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= ahze
@@ -15,6 +14,8 @@
MAINTAINER= multimedia at FreeBSD.org
COMMENT= Hyper fast realtime audio/video encoder/converter, streaming server
+LIB_DEPENDS= ogg.5:${PORTSDIR}/audio/libogg
+
HAS_CONFIGURE= yes
CONFIGURE_LOG= config.err
USE_BZIP2= yes
@@ -98,6 +99,17 @@
CONFIGURE_ARGS+= --enable-libfaad \
--enable-libfaadbin
.endif
+## amr
+.ifdef(WITH_AMR_NB) || exists($LOCALBASE}/lib/libamrnb.so)
+LIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrnb
+
+CONFIGURE_ARGS+= --enable-libamr-nb
+.endif
+.ifdef(WITH_AMR_WB) || exists($LOCALBASE}/lib/libamrwb.so)
+LIB_DEPENDS+= amrwb.3:${PORTSDIR}/audio/libamrwb
+
+CONFIGURE_ARGS+= --enable-libamr-wb
+.endif
USE_RC_SUBR= ffserver
.if ${MACHINE_CPU:Mmmx}==""
@@ -117,12 +129,6 @@
CONFIGURE_ARGS+= --enable-libmp3lame
.endif
-## ogg
-.ifndef(WITHOUT_OGG) || exists(${LOCALBASE}/lib/libogg.so)
-LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg
-
-CONFIGURE_ARGS+= --enable-libogg
-.endif
## SDL
.ifdef(WITH_SDL) || ${HAVE_SDL:Msdl}
@@ -146,19 +152,10 @@
## theora
.if !defined(WITHOUT_THEORA)
-WITH_OGG= yes
LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora
CONFIGURE_ARGS+= --enable-libtheora
.endif
-## vorbis
-.if !defined(WITHOUT_VORBIS)
-WITH_OGG= yes
-LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis
-
-CONFIGURE_ARGS+= --enable-libvorbis
-FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis
-.endif
# x264
.ifndef(WITHOUT_X264)
LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
@@ -184,13 +181,6 @@
WITHOUT_IMLIB2= yes
. endif # imlib2
-## xvid
-.ifdef(WITH_XVID) || exists(${LOCALBASE}/lib/libxvidcore.so)
-LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
-
-CONFIGURE_ARGS+= --enable-libxvid
-.endif
-
pre-everything::
.ifndef(WITHOUT_A52)
@${ECHO_MSG} 'You can disable liba52 support by defining WITHOUT_LIBA52'
@@ -220,10 +210,6 @@
@${ECHO_MSG} 'Define WITH_LAME to enable lame MP3 codec'
@${ECHO_MSG}
.endif
-.ifndef(WITH_OGG)
- @${ECHO_MSG} 'Define WITH_OGG to enable OGG codec'
- @${ECHO_MSG}
-.endif
.ifndef(WITH_OPTIMIZED_CFLAGS)
@${ECHO_MSG} 'You can enable additional compilation optimizations'
@${ECHO_MSG} 'by defining WITH_OPTIMIZED_CFLAGS'
@@ -238,16 +224,8 @@
@${ECHO_MSG} 'Define WITHOUT_THEORA to disable libtheora support'
@${ECHO_MSG}
.endif
-.ifndef(WITHOUT_VORBIS)
- @${ECHO_MSG} 'Define WITHOUT_VORBIS to enable libvorbisenc VORBIS codec'
- @${ECHO_MSG}
-.endif
.ifndef(WITHOUT_X264)
@${ECHO_MSG} 'Define WITHOUT_X264 to disable X264 codec'
- @${ECHO_MSG}
-.endif
-.ifndef(WITH_XVID)
- @${ECHO_MSG} 'Define WITH_XVID to enable XVID codec'
@${ECHO_MSG}
.endif
Modified: trunk/ports-multimedia/multimedia/ffmpeg/distinfo
==============================================================================
--- trunk/ports-multimedia/multimedia/ffmpeg/distinfo (original)
+++ trunk/ports-multimedia/multimedia/ffmpeg/distinfo Sun Feb 24
18:47:15 2008
@@ -1,3 +1,3 @@
-MD5 (ffmpeg-2007-10-04.tar.bz2) = 9ec842daece6479cc92cbc421a008d53
-SHA256 (ffmpeg-2007-10-04.tar.bz2) = f8aa5a2b85c1ce27a91a4bb0415f01415dfc7e6110476da717ac835193679447
-SIZE (ffmpeg-2007-10-04.tar.bz2) = 2326718
+MD5 (ffmpeg-2008-02-24.tar.bz2) = 96f4a58effe9733655b96cf05977f110
+SHA256 (ffmpeg-2008-02-24.tar.bz2) = ed8ab66e0ccdcce7ea0ae8bfae0bef14f9a0326a84eb6e56df0eb1328b822a62
+SIZE (ffmpeg-2008-02-24.tar.bz2) = 2472686
Modified: trunk/ports-multimedia/multimedia/ffmpeg/files/patch-configure
==============================================================================
--- trunk/ports-multimedia/multimedia/ffmpeg/files/patch-configure (original)
+++ trunk/ports-multimedia/multimedia/ffmpeg/files/patch-configure Sun
Feb 24 18:47:15 2008
@@ -1,72 +1,59 @@
---- configure.orig 2007-07-08 13:47:15.000000000 -0400
-+++ configure 2007-07-09 12:37:09.000000000 -0400
-@@ -210,11 +210,11 @@
-
- # "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not
grokking "tr a-z A-Z"
- toupper(){
-- echo "$@" | tr '[a-z]' '[A-Z]'
-+ echo "$@" | tr '[:lower:]' '[:upper:]'
- }
-
- tolower(){
-- echo "$@" | tr '[A-Z]' '[a-z]'
-+ echo "$@" | tr '[:upper:]' '[:lower:]'
- }
-
- set_all(){
-@@ -992,15 +992,9 @@
- enable fast_unaligned
- ;;
- x86_64|amd64)
-- arch="x86_32"
- enable fast_unaligned
-- canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
-- if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
-- if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then
-- arch="x86_64"
-- enable fast_64bit
-- fi
-- fi
-+ arch="x86_64"
-+ enable fast_64bit
- ;;
- # armv4l is a subset of armv[567]*l
- arm|armv[4567]*l)
-@@ -1734,12 +1728,6 @@
- check_cflags -Os # not all compilers support -Os
- optimize="small"
- elif enabled optimize; then
-- if test -n "`$cc -v 2>&1 | grep xlc`"; then
+--- configure.orig 2008-02-22 12:15:24.000000000 -0500
++++ configure 2008-02-24 20:35:29.000000000 -0500
+@@ -1083,15 +1083,9 @@
+ enable fast_unaligned
+ ;;
+ x86_64|amd64)
+- arch="x86_32"
+ enable fast_unaligned
+- canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
+- if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64"
]; then
+- if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then
+- arch="x86_64"
+- enable fast_64bit
+- fi
+- fi
++ arch="x86_64"
++ enable fast_64bit
+ ;;
+ # armv4l is a subset of armv[567]*l
+ arm|armv[4567]*l)
+@@ -1799,10 +1793,6 @@
+ optimizations="small"
+ elif enabled optimizations; then
+ if test -n "`$cc -v 2>&1 | grep xlc`"; then
- add_cflags "-O5"
- add_ldflags "-O5"
- else
- add_cflags "-O3"
-- fi
+ fi
fi
- # PIC flags for shared library objects where they are needed
-@@ -1927,15 +1915,15 @@
+@@ -2018,17 +2008,17 @@
if enabled shared; then
- echo "BUILD_SHARED=yes" >> config.mak
- echo "PIC=-fPIC -DPIC" >> config.mak
-- echo "SPPMAJOR=${pp_version%%.*}" >> config.mak
-+ echo "SPPMAJOR=1" >> config.mak
- echo "SPPVERSION=$pp_version" >> config.mak
-- echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
-+ echo "LAVCMAJOR=%%SHLIB_VER%%" >> config.mak
- echo "LAVCVERSION=$lavc_version" >> config.mak
-- echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
-+ echo "LAVFMAJOR=%%SHLIB_VER%%" >> config.mak
- echo "LAVFVERSION=$lavf_version" >> config.mak
-- echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
-+ echo "LAVUMAJOR=%%SHLIB_VER%%" >> config.mak
- echo "LAVUVERSION=$lavu_version" >> config.mak
-- echo "SWSMAJOR=${sws_version%%.*}" >> config.mak
-+ echo "SWSMAJOR=%%SHLIB_VER%%" >> config.mak
- echo "SWSVERSION=$sws_version" >> config.mak
- echo "SLIBNAME=${SLIBNAME}" >> config.mak
- echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
-@@ -1969,7 +1957,7 @@
+ echo "BUILD_SHARED=yes" >> config.mak
+ echo "PIC=-fPIC -DPIC" >> config.mak
+- echo "SPPMAJOR=${pp_version%%.*}" >> config.mak
++ echo "SPPMAJOR=%%SHLIB_VER%%" >> config.mak
+ echo "SPPVERSION=$pp_version" >> config.mak
+- echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
++ echo "LAVCMAJOR=%%SHLIB_VER%%" >> config.mak
+ echo "LAVCVERSION=$lavc_version" >> config.mak
+- echo "LAVDMAJOR=${lavd_version%%.*}" >> config.mak
++ echo "LAVDMAJOR=%%SHLIB_VER%%" >> config.mak
+ echo "LAVDVERSION=$lavd_version" >> config.mak
+- echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
++ echo "LAVFMAJOR=%%SHLIB_VER%%" >> config.mak
+ echo "LAVFVERSION=$lavf_version" >> config.mak
+- echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
++ echo "LAVUMAJOR=%%SHLIB_VER%%" >> config.mak
+ echo "LAVUVERSION=$lavu_version" >> config.mak
+- echo "SWSMAJOR=${sws_version%%.*}" >> config.mak
++ echo "SWSMAJOR=%%SHLIB_VER%%" >> config.mak
+ echo "SWSVERSION=$sws_version" >> config.mak
+ echo "SLIBNAME=${SLIBNAME}" >> config.mak
+ echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
+@@ -2062,7 +2052,7 @@
echo "SRC_PATH=\"$source_path\"" >> config.mak
echo "SRC_PATH_BARE=$source_path" >> config.mak
@@ -74,19 +61,19 @@
+echo "BUILD_ROOT=\"$(pwd)\"" >> config.mak
# Apparently it's not possible to portably echo a backslash.
- if enabled asmalign_pot; then
-@@ -2047,8 +2035,8 @@
+ enabled asmalign_pot &&
+@@ -2142,8 +2132,8 @@
Version: $version
Requires: $requires
Conflicts:
-Libs: -L\${libdir} $libs
--Cflags: -I\${includedir} -I\${includedir}/$include
+-Cflags: -I\${includedir}/$include
+Libs: -L\${libdir} $libs -L%%LOCALBASE%%/lib
-+Cflags: -I\${includedir} -I\${includedir}/$include -I%%LOCALBASE%%/include
++Cflags: -I\${includedir}/$include I\${includedir}/$include -I%%LOCALBASE%%/include
EOF
}
-@@ -2071,7 +2059,8 @@
+@@ -2166,7 +2156,8 @@
Requires: $requires
Conflicts:
Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
Modified: trunk/ports-multimedia/multimedia/ffmpeg/pkg-plist
==============================================================================
--- trunk/ports-multimedia/multimedia/ffmpeg/pkg-plist (original)
+++ trunk/ports-multimedia/multimedia/ffmpeg/pkg-plist Sun Feb 24
18:47:15 2008
@@ -4,14 +4,15 @@
etc/ffserver.conf-dist
include/ffmpeg/adler32.h
include/ffmpeg/avcodec.h
+include/ffmpeg/avdevice.h
include/ffmpeg/avformat.h
include/ffmpeg/avio.h
include/ffmpeg/avstring.h
include/ffmpeg/avutil.h
include/ffmpeg/base64.h
include/ffmpeg/common.h
+include/ffmpeg/crc.h
include/ffmpeg/fifo.h
-include/ffmpeg/integer.h
include/ffmpeg/intfloat_readwrite.h
include/ffmpeg/log.h
include/ffmpeg/lzo.h
@@ -22,23 +23,27 @@
include/ffmpeg/random.h
include/ffmpeg/rational.h
include/ffmpeg/rgb2rgb.h
-include/ffmpeg/rtp.h
include/ffmpeg/rtsp.h
include/ffmpeg/rtspcodes.h
+include/ffmpeg/sha1.h
include/ffmpeg/swscale.h
include/postproc/postprocess.h
lib/libavcodec.a
lib/libavcodec.so
lib/libavcodec.so.%%SHLIB_VER%%
-lib/libavcodec.so.51.44.0
+lib/libavcodec.so.51.50.1
+lib/libavdevice.a
+lib/libavdevice.so
+lib/libavdevice.so.1
+lib/libavdevice.so.52.0.0
lib/libavformat.a
lib/libavformat.so
lib/libavformat.so.%%SHLIB_VER%%
-lib/libavformat.so.51.14.0
+lib/libavformat.so.52.7.0
lib/libavutil.a
lib/libavutil.so
lib/libavutil.so.%%SHLIB_VER%%
-lib/libavutil.so.49.5.0
+lib/libavutil.so.49.6.0
lib/libpostproc.a
lib/libpostproc.so
lib/libpostproc.so.%%SHLIB_VER%%
@@ -52,6 +57,7 @@
lib/vhook/ppm.so
lib/vhook/watermark.so
libdata/pkgconfig/libavcodec.pc
+libdata/pkgconfig/libavdevice.pc
libdata/pkgconfig/libavformat.pc
libdata/pkgconfig/libavutil.pc
libdata/pkgconfig/libpostproc.pc
More information about the multimedia-devel
mailing list