From owner-svn-ports-head@FreeBSD.ORG Sat Dec 1 00:04:34 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ED60EFA7; Sat, 1 Dec 2012 00:04:33 +0000 (UTC) (envelope-from sperber@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C8AD08FC08; Sat, 1 Dec 2012 00:04:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB104XEF084315; Sat, 1 Dec 2012 00:04:33 GMT (envelope-from sperber@svn.freebsd.org) Received: (from sperber@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB104Xxr084309; Sat, 1 Dec 2012 00:04:33 GMT (envelope-from sperber@svn.freebsd.org) Message-Id: <201212010004.qB104Xxr084309@svn.freebsd.org> From: Armin Pirkovitsch Date: Sat, 1 Dec 2012 00:04:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308056 - in head/multimedia/ffmpeg2theora: . 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.14 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, 01 Dec 2012 00:04:34 -0000 Author: sperber Date: Sat Dec 1 00:04:33 2012 New Revision: 308056 URL: http://svnweb.freebsd.org/changeset/ports/308056 Log: - Update to version 0.29 - Add MAKE_JOBS_SAFE - Remove shlib versions PR: ports/170159 Submitted by: KATO Tsuguru Approved by: beat (mentor) Feature safe: yes Added: head/multimedia/ffmpeg2theora/files/ head/multimedia/ffmpeg2theora/files/patch-SConstruct (contents, props changed) head/multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c (contents, props changed) Modified: head/multimedia/ffmpeg2theora/Makefile (contents, props changed) head/multimedia/ffmpeg2theora/distinfo (contents, props changed) Modified: head/multimedia/ffmpeg2theora/Makefile ============================================================================== --- head/multimedia/ffmpeg2theora/Makefile Sat Dec 1 00:00:50 2012 (r308055) +++ head/multimedia/ffmpeg2theora/Makefile Sat Dec 1 00:04:33 2012 (r308056) @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= ffmpeg2theora -PORTVERSION= 0.28 -PORTREVISION= 4 +PORTVERSION= 0.29 CATEGORIES= multimedia MASTER_SITES= http://v2v.cc/~j/ffmpeg2theora/downloads/ @@ -15,15 +14,19 @@ COMMENT= Reencode many media file format LICENSE= GPLv3 -LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ - theora.0:${PORTSDIR}/multimedia/libtheora \ - kate.4:${PORTSDIR}/multimedia/libkate +LIB_DEPENDS= avcodec:${PORTSDIR}/multimedia/ffmpeg \ + kate:${PORTSDIR}/multimedia/libkate \ + theora:${PORTSDIR}/multimedia/libtheora USE_BZIP2= yes +USE_ICONV= yes USE_SCONS= yes +SCONS_BUILDENV= CC="${CC}" CCFLAGS="${CFLAGS}" \ + APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}" +MAKE_JOBS_SAFE= yes -SCONS_ENV+= APPEND_LINKFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ - APPEND_CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} MAN1= ffmpeg2theora.1 PLIST_FILES= bin/ffmpeg2theora Modified: head/multimedia/ffmpeg2theora/distinfo ============================================================================== --- head/multimedia/ffmpeg2theora/distinfo Sat Dec 1 00:00:50 2012 (r308055) +++ head/multimedia/ffmpeg2theora/distinfo Sat Dec 1 00:04:33 2012 (r308056) @@ -1,2 +1,2 @@ -SHA256 (ffmpeg2theora-0.28.tar.bz2) = 6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e -SIZE (ffmpeg2theora-0.28.tar.bz2) = 95404 +SHA256 (ffmpeg2theora-0.29.tar.bz2) = 214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d +SIZE (ffmpeg2theora-0.29.tar.bz2) = 90143 Added: head/multimedia/ffmpeg2theora/files/patch-SConstruct ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/ffmpeg2theora/files/patch-SConstruct Sat Dec 1 00:04:33 2012 (r308056) @@ -0,0 +1,19 @@ +--- SConstruct.orig 2012-06-26 02:15:16.000000000 +0900 ++++ SConstruct 2012-07-04 01:17:19.000000000 +0900 +@@ -37,7 +37,7 @@ + BoolVariable('libkate', 'enable libkate support', 1), + BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0) + ) +-env = Environment(options = opts) ++env = Environment(options = opts, CC = Split(os.environ['CC']), CCFLAGS = Split(os.environ['CCFLAGS'])) + Help(opts.GenerateHelpText(env)) + + pkg_flags="--cflags --libs" +@@ -151,7 +151,6 @@ + "libavcodec >= 52.30.0", + "libpostproc", + "libswscale", +- "libswresample", + "libavutil", + ] + if os.path.exists("./ffmpeg"): Added: head/multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c Sat Dec 1 00:04:33 2012 (r308056) @@ -0,0 +1,14 @@ +--- src/ffmpeg2theora.c.orig 2012-01-29 17:00:19.000000000 +0900 ++++ src/ffmpeg2theora.c 2012-07-04 01:49:09.000000000 +0900 +@@ -2970,7 +2970,11 @@ + fprintf(stderr,"\nUnable to decode input.\n"); + return(1); + } ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,17,0) ++ av_close_input_file(convert->context); ++#else + avformat_close_input(&convert->context); ++#endif + } + else{ + if (info.frontend)