From owner-svn-ports-head@FreeBSD.ORG Sat Dec 27 15:28:48 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9E098155; Sat, 27 Dec 2014 15:28:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 877F6FED; Sat, 27 Dec 2014 15:28:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBRFSmXM042320; Sat, 27 Dec 2014 15:28:48 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBRFSk0L042310; Sat, 27 Dec 2014 15:28:46 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201412271528.sBRFSk0L042310@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 27 Dec 2014 15:28:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375688 - in head: . multimedia multimedia/ffmpeg24 multimedia/ffmpeg25 multimedia/ffmpeg25/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Dec 2014 15:28:48 -0000 Author: riggs Date: Sat Dec 27 15:28:46 2014 New Revision: 375688 URL: https://svnweb.freebsd.org/changeset/ports/375688 QAT: https://qat.redports.org/buildarchive/r375688/ Log: Replace multimedia/ffmpeg24 with ffmpeg25 (no ports depend on ffmpeg24 and ffmpeg25 is the more likely candidate for the eventual replacement of multimedia/ffmpeg) Added: head/multimedia/ffmpeg25/ - copied from r375631, head/multimedia/ffmpeg24/ head/multimedia/ffmpeg25/files/ffserver25.in - copied, changed from r375631, head/multimedia/ffmpeg24/files/ffserver24.in Deleted: head/multimedia/ffmpeg24/ head/multimedia/ffmpeg25/files/ffserver24.in head/multimedia/ffmpeg25/files/patch-libavdevice-Makefile Modified: head/MOVED head/multimedia/Makefile head/multimedia/ffmpeg25/Makefile head/multimedia/ffmpeg25/distinfo head/multimedia/ffmpeg25/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Sat Dec 27 15:18:14 2014 (r375687) +++ head/MOVED Sat Dec 27 15:28:46 2014 (r375688) @@ -7348,3 +7348,4 @@ games/secretmaryochronicles-music||2014- science/mpb||2014-12-27|Has expired: Broken for more than 6 months x11-fm/pbi-thumbnailer||2014-12-27|Has expired: Broken for more than 6 months games/secretmaryochronicles||2014-12-27|Has expired: does not run, cegui 0.8 support still in development +multimedia/ffmpeg24|multimedia/ffmpeg25|2014-12-27|ffmpeg upstream now points to 2.5.x series Modified: head/multimedia/Makefile ============================================================================== --- head/multimedia/Makefile Sat Dec 27 15:18:14 2014 (r375687) +++ head/multimedia/Makefile Sat Dec 27 15:28:46 2014 (r375688) @@ -58,7 +58,7 @@ SUBDIR += emovix SUBDIR += ffmpeg SUBDIR += ffmpeg0 - SUBDIR += ffmpeg24 + SUBDIR += ffmpeg25 SUBDIR += ffmpeg2theora SUBDIR += ffmpegthumbnailer SUBDIR += flvmeta Modified: head/multimedia/ffmpeg25/Makefile ============================================================================== --- head/multimedia/ffmpeg24/Makefile Fri Dec 26 16:11:24 2014 (r375631) +++ head/multimedia/ffmpeg25/Makefile Sat Dec 27 15:28:46 2014 (r375688) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= ffmpeg -PORTVERSION= 2.4.3 -PORTREVISION= 4 +PORTVERSION= 2.5.2 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ -PKGNAMESUFFIX= 24 +PKGNAMESUFFIX= 25 MAINTAINER= riggs@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server @@ -27,7 +26,7 @@ USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMP USE_PERL5= build WANT_SDL= yes -FFMPEG_SUFFIX= 24 +FFMPEG_SUFFIX= 25 PLIST_SUB+= FFMPEG_SUFFIX="${FFMPEG_SUFFIX}" CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX}" MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}" Modified: head/multimedia/ffmpeg25/distinfo ============================================================================== --- head/multimedia/ffmpeg24/distinfo Fri Dec 26 16:11:24 2014 (r375631) +++ head/multimedia/ffmpeg25/distinfo Sat Dec 27 15:28:46 2014 (r375688) @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-2.4.3.tar.bz2) = ca5c3e3c0e4f9e43b9dceafceb866acb1ea575cb9f2d94e0d959303e4fc4e602 -SIZE (ffmpeg-2.4.3.tar.bz2) = 7369986 +SHA256 (ffmpeg-2.5.2.tar.bz2) = 9edf17e7c280cbcfca4bc4219b1c22f760a61ec6a3f39ef26e3e2ad4cd24465e +SIZE (ffmpeg-2.5.2.tar.bz2) = 7675420 Copied and modified: head/multimedia/ffmpeg25/files/ffserver25.in (from r375631, head/multimedia/ffmpeg24/files/ffserver24.in) ============================================================================== --- head/multimedia/ffmpeg24/files/ffserver24.in Fri Dec 26 16:11:24 2014 (r375631, copy source) +++ head/multimedia/ffmpeg25/files/ffserver25.in Sat Dec 27 15:28:46 2014 (r375688) @@ -3,25 +3,25 @@ # $FreeBSD$ # -# PROVIDE: ffserver24 +# PROVIDE: ffserver25 # REQUIRE: NETWORKING # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable ffserver: # -#ffserver24_enable="YES" +#ffserver25_enable="YES" # -ffserver24_enable="${ffserver_enable-NO}" +ffserver25_enable="${ffserver_enable-NO}" . /etc/rc.subr -name=ffserver24 -rcvar=ffserver24_enable +name=ffserver25 +rcvar=ffserver25_enable command="%%PREFIX%%/bin/${name}" command_args="&" -required_files=%%PREFIX%%/etc/ffserver24.conf +required_files=%%PREFIX%%/etc/ffserver25.conf load_rc_config ${name} run_rc_command "$1" Modified: head/multimedia/ffmpeg25/pkg-plist ============================================================================== --- head/multimedia/ffmpeg24/pkg-plist Fri Dec 26 16:11:24 2014 (r375631) +++ head/multimedia/ffmpeg25/pkg-plist Sat Dec 27 15:28:46 2014 (r375688) @@ -12,6 +12,7 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libavcod include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/vda.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/vdpau.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/version.h +include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/vorbis_parser.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec/xvmc.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice/avdevice.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice/version.h @@ -21,6 +22,7 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libavfil include/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter/avfiltergraph.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter/buffersink.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter/buffersrc.h +include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/cast5.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter/version.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavformat/avformat.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavformat/avio.h @@ -58,7 +60,6 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libavuti include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/hmac.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/imgutils.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/intfloat.h -include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/intfloat_readwrite.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/intreadwrite.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/lfg.h include/ffmpeg%%FFMPEG_SUFFIX%%/libavutil/log.h @@ -98,19 +99,19 @@ include/ffmpeg%%FFMPEG_SUFFIX%%/libswsca lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.so.56 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.so.56.1.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavcodec%%FFMPEG_SUFFIX%%.so.56.13.100 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.so.56 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.so.56.0.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavdevice%%FFMPEG_SUFFIX%%.so.56.3.100 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.so.5 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.so.5.1.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavfilter%%FFMPEG_SUFFIX%%.so.5.2.103 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.so.56 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.so.56.4.101 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavformat%%FFMPEG_SUFFIX%%.so.56.15.102 lib/ffmpeg%%FFMPEG_SUFFIX%%/libavresample%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavresample%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavresample%%FFMPEG_SUFFIX%%.so.2 @@ -118,11 +119,11 @@ lib/ffmpeg%%FFMPEG_SUFFIX%%/libavresampl lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.so.54 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.so.54.7.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libavutil%%FFMPEG_SUFFIX%%.so.54.15.100 lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.so.53 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.so.53.0.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libpostproc%%FFMPEG_SUFFIX%%.so.53.3.100 lib/ffmpeg%%FFMPEG_SUFFIX%%/libswresample%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libswresample%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libswresample%%FFMPEG_SUFFIX%%.so.1 @@ -130,7 +131,7 @@ lib/ffmpeg%%FFMPEG_SUFFIX%%/libswresampl lib/ffmpeg%%FFMPEG_SUFFIX%%/libswscale%%FFMPEG_SUFFIX%%.a lib/ffmpeg%%FFMPEG_SUFFIX%%/libswscale%%FFMPEG_SUFFIX%%.so lib/ffmpeg%%FFMPEG_SUFFIX%%/libswscale%%FFMPEG_SUFFIX%%.so.3 -lib/ffmpeg%%FFMPEG_SUFFIX%%/libswscale%%FFMPEG_SUFFIX%%.so.3.0.100 +lib/ffmpeg%%FFMPEG_SUFFIX%%/libswscale%%FFMPEG_SUFFIX%%.so.3.1.101 libdata/pkgconfig/libavcodec%%FFMPEG_SUFFIX%%.pc libdata/pkgconfig/libavdevice%%FFMPEG_SUFFIX%%.pc libdata/pkgconfig/libavfilter%%FFMPEG_SUFFIX%%.pc