svn commit: r305892 - in head/multimedia: . ffmpeg1 ffmpeg1/files

Sun Oct 14 20:30:01 UTC 2012

Author: mm
Date: Sun Oct 14 20:30:00 2012
New Revision: 305892
URL: http://svn.freebsd.org/changeset/ports/305892

Log:
  FFmpeg is a complete, cross-platform solution to record, convert and stream
  audio and video. It includes libavcodec - the leading audio/video codec
  library.
  
  This version is from the 1.0 release branch.
  
  WWW: http://ffmpeg.org/
  
  Feature safe:	yes

Added:
  head/multimedia/ffmpeg1/
     - copied from r305891, head/multimedia/ffmpeg-devel/
  head/multimedia/ffmpeg1/files/ffserver1.in
     - copied, changed from r305891, head/multimedia/ffmpeg-devel/files/ffserver-devel.in
Deleted:
  head/multimedia/ffmpeg1/files/ffserver-devel.in
Modified:
  head/multimedia/Makefile
  head/multimedia/ffmpeg1/Makefile
  head/multimedia/ffmpeg1/distinfo
  head/multimedia/ffmpeg1/files/patch-configure
  head/multimedia/ffmpeg1/files/patch-doc-Makefile
  head/multimedia/ffmpeg1/files/patch-library.mak
  head/multimedia/ffmpeg1/pkg-descr
  head/multimedia/ffmpeg1/pkg-plist

Modified: head/multimedia/Makefile
==============================================================================

--- head/multimedia/Makefile	Sun Oct 14 20:20:50 2012	(r305891)
+++ head/multimedia/Makefile	Sun Oct 14 20:30:00 2012	(r305892)
@@ -56,6 +56,7 @@
     SUBDIR += ffmpeg
     SUBDIR += ffmpeg-011
     SUBDIR += ffmpeg-devel
+    SUBDIR += ffmpeg1
     SUBDIR += ffmpeg2theora
     SUBDIR += ffmpegthumbnailer
     SUBDIR += flvmeta

Modified: head/multimedia/ffmpeg1/Makefile
==============================================================================
--- head/multimedia/ffmpeg-devel/Makefile	Sun Oct 14 20:20:50 2012	(r305891)
+++ head/multimedia/ffmpeg1/Makefile	Sun Oct 14 20:30:00 2012	(r305892)
@@ -1,17 +1,15 @@
-# New ports collection makefile for:	ffmpeg-devel
-# Date created:		2009-08-12
+# New ports collection makefile for:	ffmpeg1
+# Date created:		2012-10-14
 # Whom:			Martin Matuska <mm at FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ffmpeg
-DISTVERSION=	2012-10-13
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	multimedia audio ipv6 net
-MASTER_SITES=	http://git.videolan.org/
-PKGNAMESUFFIX=	-devel
-DISTNAME=	ffmpeg-${GIT_SUFFIX}
+MASTER_SITES=	http://ffmpeg.org/releases/
+PKGNAMESUFFIX=	1
 
 MAINTAINER=	mm at FreeBSD.org
 COMMENT=	Realtime audio/video encoder/converter and streaming server
@@ -27,13 +25,9 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/ya
 
 LATEST_LINK=	ffmpeg${PKGNAMESUFFIX}
 
-GIT_SNAPSHOT=	79133fd0e58f3564e790eb2858b24db18182cef1
-GIT_SUFFIX=	${GIT_SNAPSHOT:C/^(.......).*$/\1/g}
-FETCH_ARGS=	-pRr -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-FETCH_URL=	"http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=${GIT_SNAPSHOT};sf=tgz"
-
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 WANT_SDL=	yes
@@ -61,7 +55,7 @@ X11GRAB_DESC=	Enable x11 grabbing
 
 FFPROGS=	ffmpeg ffprobe
 INSTALL_TARGET=	install-progs install-data install-libs install-headers
-FFMPEG_SUFFIX=	-devel
+FFMPEG_SUFFIX=	1
 PLIST_SUB+=	SUFF="${FFMPEG_SUFFIX}"
 MAN1=		ffmpeg${FFMPEG_SUFFIX}.1 ffprobe${FFMPEG_SUFFIX}.1
 
@@ -467,11 +461,6 @@ LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING.GP
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPLv3
 .endif
 
-do-fetch:
-	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
-	${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${FETCH_URL} ${FETCH_AFTER_ARGS}; \
-	fi;
-
 post-patch:
 # {C,LD}FLAGS safeness
 	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \

Modified: head/multimedia/ffmpeg1/distinfo
==============================================================================
--- head/multimedia/ffmpeg-devel/distinfo	Sun Oct 14 20:20:50 2012	(r305891)
+++ head/multimedia/ffmpeg1/distinfo	Sun Oct 14 20:30:00 2012	(r305892)
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-79133fd.tar.gz) = 4198d6a6a2515acca7854081417dc20abc6ce3521c77d63f5def84033ecf872a
-SIZE (ffmpeg-79133fd.tar.gz) = 7689996
+SHA256 (ffmpeg-1.0.tar.bz2) = 0d82c3e246b8a4510ed7947865c0415fef3bc1d1c1259a007463ce2f7e4171c9
+SIZE (ffmpeg-1.0.tar.bz2) = 6443851

Copied and modified: head/multimedia/ffmpeg1/files/ffserver1.in (from r305891, head/multimedia/ffmpeg-devel/files/ffserver-devel.in)
==============================================================================
--- head/multimedia/ffmpeg-devel/files/ffserver-devel.in	Sun Oct 14 20:20:50 2012	(r305891, copy source)
+++ head/multimedia/ffmpeg1/files/ffserver1.in	Sun Oct 14 20:30:00 2012	(r305892)
@@ -10,17 +10,17 @@
 #
 # Add the following lines to /etc/rc.conf to enable ffserver:
 #
-#ffserver_head_enable="YES"
+#ffserver1_enable="YES"
 #
-ffserver_head_enable="${ffserver_head_enable-NO}"
+ffserver1_enable="${ffserver1_enable-NO}"
 
 . /etc/rc.subr
 
-name=ffserver_head
-rcvar=ffserver_head_enable
+name=ffserver1
+rcvar=ffserver1_enable
 
 command="%%PREFIX%%/bin/${name} &"
-required_files=%%PREFIX%%/etc/ffserver-head.conf
+required_files=%%PREFIX%%/etc/ffserver1.conf
 
 load_rc_config ${name}
 run_rc_command "$1"

Modified: head/multimedia/ffmpeg1/files/patch-configure
==============================================================================
--- head/multimedia/ffmpeg-devel/files/patch-configure	Sun Oct 14 20:20:50 2012	(r305891)
+++ head/multimedia/ffmpeg1/files/patch-configure	Sun Oct 14 20:30:00 2012	(r305892)
@@ -1,6 +1,6 @@
---- configure.orig	2012-10-13 10:22:27.000000000 +0200
-+++ configure	2012-10-14 22:18:46.334237396 +0200
-@@ -2041,7 +2041,7 @@
+--- configure.orig	2012-09-28 03:37:35.000000000 +0200
++++ configure	2012-10-12 21:36:17.611237650 +0200
+@@ -2029,7 +2029,7 @@
  nogas=":"
  
  # machine
@@ -9,7 +9,7 @@
  cpu="generic"
  
  # OS
-@@ -3744,10 +3744,10 @@
+@@ -3728,10 +3728,10 @@
  perl --version > /dev/null 2>&1 && enable perl || disable perl
  pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
  
@@ -24,7 +24,7 @@
  
  check_header sys/videoio.h
  
-@@ -4152,7 +4152,7 @@
+@@ -4121,7 +4121,7 @@
  SRC_PATH:=\$(SRC_PATH:.%=..%)
  endif
  CC_IDENT=$cc_ident
@@ -33,7 +33,7 @@
  CC=$cc
  CXX=$cxx
  AS=$as
-@@ -4355,13 +4355,13 @@
+@@ -4324,13 +4324,13 @@
      requires=$5
      enabled ${name#lib} || return 0
      mkdir -p $name
@@ -49,7 +49,7 @@
  Description: $comment
  Version: $version
  Requires: $(enabled shared || echo $requires)
-@@ -4375,10 +4375,10 @@
+@@ -4344,10 +4344,10 @@
  mkdir -p doc/examples/pc-uninstalled
  includedir=${source_path}
  [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
@@ -62,7 +62,7 @@
  includedir=${includedir}
  
  Name: $name
-@@ -4392,25 +4392,25 @@
+@@ -4361,25 +4361,25 @@
  }
  
  libavfilter_pc_deps=""

Modified: head/multimedia/ffmpeg1/files/patch-doc-Makefile
==============================================================================
--- head/multimedia/ffmpeg-devel/files/patch-doc-Makefile	Sun Oct 14 20:20:50 2012	(r305891)
+++ head/multimedia/ffmpeg1/files/patch-doc-Makefile	Sun Oct 14 20:30:00 2012	(r305892)
@@ -1,6 +1,6 @@
---- doc/Makefile.orig	2012-10-13 10:22:27.000000000 +0200
-+++ doc/Makefile	2012-10-13 10:56:02.141525689 +0200
-@@ -58,7 +58,7 @@
+--- doc/Makefile.orig	2012-09-28 03:37:35.000000000 +0200
++++ doc/Makefile	2012-10-12 21:36:56.461440175 +0200
+@@ -57,7 +57,7 @@
  install-man:
  
  ifdef CONFIG_MANPAGES

Modified: head/multimedia/ffmpeg1/files/patch-library.mak
==============================================================================
--- head/multimedia/ffmpeg-devel/files/patch-library.mak	Sun Oct 14 20:20:50 2012	(r305891)
+++ head/multimedia/ffmpeg1/files/patch-library.mak	Sun Oct 14 20:30:00 2012	(r305892)
@@ -1,6 +1,6 @@
---- library.mak.orig	2012-10-13 10:22:27.000000000 +0200
-+++ library.mak	2012-10-13 10:57:11.333238227 +0200
-@@ -76,9 +76,9 @@
+--- library.mak.orig	2012-09-28 03:37:35.000000000 +0200
++++ library.mak	2012-10-12 21:38:55.732664096 +0200
+@@ -74,9 +74,9 @@
  	$(Q)mkdir -p "$(INCINSTDIR)"
  	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
  
@@ -13,7 +13,7 @@
  
  uninstall-libs::
  	-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
-@@ -90,7 +90,7 @@
+@@ -88,7 +88,7 @@
  
  uninstall-headers::
  	$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))

Modified: head/multimedia/ffmpeg1/pkg-descr
==============================================================================
--- head/multimedia/ffmpeg-devel/pkg-descr	Sun Oct 14 20:20:50 2012	(r305891)
+++ head/multimedia/ffmpeg1/pkg-descr	Sun Oct 14 20:30:00 2012	(r305892)
@@ -2,6 +2,6 @@ FFmpeg is a complete, cross-platform sol
 audio and video. It includes libavcodec - the leading audio/video codec 
 library.
 
-This is the development version from SVN snapshos.
+This version is from the 1.0 release branch.
 
-WWW: http://ffmpeg.mplayerhq.hu/
+WWW: http://ffmpeg.org/

Modified: head/multimedia/ffmpeg1/pkg-plist
==============================================================================
--- head/multimedia/ffmpeg-devel/pkg-plist	Sun Oct 14 20:20:50 2012	(r305891)
+++ head/multimedia/ffmpeg1/pkg-plist	Sun Oct 14 20:30:00 2012	(r305892)
@@ -56,7 +56,6 @@ include/ffmpeg%%SUFF%%/libavutil/lzo.h
 include/ffmpeg%%SUFF%%/libavutil/mathematics.h
 include/ffmpeg%%SUFF%%/libavutil/md5.h
 include/ffmpeg%%SUFF%%/libavutil/mem.h
-include/ffmpeg%%SUFF%%/libavutil/old_pix_fmts.h
 include/ffmpeg%%SUFF%%/libavutil/opt.h
 include/ffmpeg%%SUFF%%/libavutil/parseutils.h
 include/ffmpeg%%SUFF%%/libavutil/pixdesc.h
@@ -71,39 +70,37 @@ include/ffmpeg%%SUFF%%/libavutil/timesta
 include/ffmpeg%%SUFF%%/libavutil/version.h
 include/ffmpeg%%SUFF%%/libavutil/xtea.h
 include/ffmpeg%%SUFF%%/libpostproc/postprocess.h
-include/ffmpeg%%SUFF%%/libpostproc/version.h
 include/ffmpeg%%SUFF%%/libswresample/swresample.h
-include/ffmpeg%%SUFF%%/libswresample/version.h
 include/ffmpeg%%SUFF%%/libswscale/swscale.h
 include/ffmpeg%%SUFF%%/libswscale/version.h
 lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54
-lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.65.100
+lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.59.100
 lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54
-lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.3.100
+lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.2.101
 lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3
-lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.19.102
+lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.17.100
 lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54
-lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.32.100
+lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.29.104
 lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51
-lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.76.100
+lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.73.101
 lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52
-lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.1.100
+lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.0.100
 lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0
-lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.16.100
+lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.15.100
 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a
 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so
 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2
