diff options
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/distinfo | 9 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-configure | 26 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/pkg-plist | 43 |
4 files changed, 62 insertions, 24 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index 21cabf91d63e..4b4a3b350106 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -12,11 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} # http://mplayerhq.hu/MPlayer/cvs/ MASTER_SITE_SUBDIR= lioux PKGNAMESUFFIX= -devel -DISTNAME= FFMpeg-2005112800 - -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= lioux -PATCHFILES= FFMpeg-2005112800-2005120600.diff.bz2 +DISTNAME= FFMpeg-${RELEASE_DATE} MAINTAINER= lioux@FreeBSD.org COMMENT= Hyper fast realtime audio/video encoder/converter, streaming server @@ -60,7 +56,7 @@ INSTALLS_SHLIB= yes NO_LATEST_LINK= yes CONFLICTS= ffmpeg-[0-9]*-* -RELEASE_DATE= 2005120600 +RELEASE_DATE= 2005122600 SHLIB_VERSION= 1 MAN1= ffmpeg.1 diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo index 004ccbdf9feb..f93542b48798 100644 --- a/multimedia/ffmpeg-devel/distinfo +++ b/multimedia/ffmpeg-devel/distinfo @@ -1,6 +1,3 @@ -MD5 (FFMpeg-2005112800.tar.bz2) = c3c960816c75f640a93662961ba7f15f -SHA256 (FFMpeg-2005112800.tar.bz2) = 7754ca22c545a8ecf5f9bb47a7fed0cbf918718e415caf40eb12ee84ec1655e9 -SIZE (FFMpeg-2005112800.tar.bz2) = 1694390 -MD5 (FFMpeg-2005112800-2005120600.diff.bz2) = 53457bed0e7267048f4aed6b0fcd7d65 -SHA256 (FFMpeg-2005112800-2005120600.diff.bz2) = 9a2b082569f3ce44fe18450747d3c1fe88a708593db110f7342c08a3178e03c7 -SIZE (FFMpeg-2005112800-2005120600.diff.bz2) = 6829 +MD5 (FFMpeg-2005122600.tar.bz2) = 15dbea41624359a15c3464f8ea7ceeb3 +SHA256 (FFMpeg-2005122600.tar.bz2) = 9eec3b519116bfe1ef108be26e0998b47aae0821d68e404915bbf6ca57ad9224 +SIZE (FFMpeg-2005122600.tar.bz2) = 1692320 diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure index c81d2f68f1c3..fc1152c3f6cf 100644 --- a/multimedia/ffmpeg-devel/files/patch-configure +++ b/multimedia/ffmpeg-devel/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sat Oct 22 17:17:17 2005 -+++ configure Mon Nov 28 23:58:20 2005 -@@ -1019,6 +1019,8 @@ +--- configure.orig Sat Dec 17 16:14:03 2005 ++++ configure Tue Dec 20 03:13:45 2005 +@@ -1021,6 +1021,8 @@ builtin_vector=no if $cc -msse -o $TMPO $TMPC 2> /dev/null ; then builtin_vector=yes @@ -9,12 +9,22 @@ fi # dlopen/dlfcn.h probing -@@ -1449,7 +1451,7 @@ +@@ -1457,13 +1459,13 @@ + if test "$lshared" = "yes" ; then echo "BUILD_SHARED=yes" >> config.mak echo "PIC=-fPIC -DPIC" >> config.mak - echo "SPPMAJOR=0" >> config.mak -- echo "SPPVERSION=0.0.1" >> config.mak -+ echo "SPPVERSION=1" >> config.mak +- echo "SPPMAJOR=${lavc_version/.*/}" >> config.mak +- echo "SPPVERSION=$lavc_version" >> config.mak +- echo "LAVCMAJOR=${lavc_version/.*/}" >> config.mak ++ echo "SPPMAJOR=${lavc_version%%.*}" >> config.mak ++ echo "SPPVERSION=${lavc_version%%.*}" >> config.mak ++ echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak + echo "LAVCVERSION=$lavc_version" >> config.mak +- echo "LAVFMAJOR=${lavf_version/.*/}" >> config.mak ++ echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak + echo "LAVFVERSION=$lavf_version" >> config.mak +- echo "LAVUMAJOR=${lavu_version/.*/}" >> config.mak ++ echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak + echo "LAVUVERSION=$lavu_version" >> config.mak fi echo "EXTRALIBS=$extralibs" >> config.mak - version=`grep '#define FFMPEG_VERSION ' "$source_path/libavcodec/avcodec.h" | diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist index 6a6133c87766..96104db50038 100644 --- a/multimedia/ffmpeg-devel/pkg-plist +++ b/multimedia/ffmpeg-devel/pkg-plist @@ -1,4 +1,8 @@ bin/ffmpeg +bin/ffplay +bin/ffserver +etc/ffserver.conf.sample +etc/rc.d/ffserver.sh include/ffmpeg/avcodec.h include/ffmpeg/avformat.h include/ffmpeg/avio.h @@ -8,20 +12,51 @@ include/ffmpeg/dsputil.h include/ffmpeg/integer.h include/ffmpeg/intfloat_readwrite.h include/ffmpeg/mathematics.h +include/ffmpeg/postproc/postprocess.h include/ffmpeg/rational.h include/ffmpeg/rtp.h include/ffmpeg/rtsp.h include/ffmpeg/rtspcodes.h lib/libavcodec.a lib/libavcodec.so -lib/libavcodec.so.%%SHLIB_VERSION%% +lib/libavcodec.so.1 lib/libavformat.a lib/libavformat.so -lib/libavformat.so.%%SHLIB_VERSION%% +lib/libavformat.so.1 lib/libavutil-CVS.so lib/libavutil.a lib/libavutil.so -lib/libavutil.so.%%SHLIB_VERSION%% -libdata/pkgconfig/libavutil.pc +lib/libavutil.so.1 +lib/libpostproc.a +lib/libpostproc.so +lib/libpostproc.so.0 +lib/libpostproc.so.1 +lib/vhook/drawtext.so +lib/vhook/fish.so +lib/vhook/imlib2.so +lib/vhook/null.so +lib/vhook/ppm.so +lib/vhook/watermark.so libdata/pkgconfig/libavcodec.pc libdata/pkgconfig/libavformat.pc +libdata/pkgconfig/libavutil.pc +libdata/pkgconfig/libpostproc.pc +man/man1/ffmpeg.1.gz +man/man1/ffplay.1.gz +man/man1/ffserver.1.gz +share/doc/ffmpeg/COPYING +share/doc/ffmpeg/Changelog +share/doc/ffmpeg/README +share/doc/ffmpeg/TODO +share/doc/ffmpeg/faq.html +share/doc/ffmpeg/ffmpeg-doc.html +share/doc/ffmpeg/ffplay-doc.html +share/doc/ffmpeg/ffserver-doc.html +share/doc/ffmpeg/hooks.html +share/doc/ffmpeg/optimization.txt +share/nls/POSIX +share/nls/en_US.US-ASCII +@dirrm share/doc/ffmpeg +@dirrm lib/vhook +@dirrm include/ffmpeg/postproc +@dirrm include/ffmpeg |