From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 8 19:10:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A889A8A2 for ; Tue, 8 Oct 2013 19:10:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86E3029A1 for ; Tue, 8 Oct 2013 19:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r98JA0R6071162 for ; Tue, 8 Oct 2013 19:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r98JA0Xb071161; Tue, 8 Oct 2013 19:10:00 GMT (envelope-from gnats) Resent-Date: Tue, 8 Oct 2013 19:10:00 GMT Resent-Message-Id: <201310081910.r98JA0Xb071161@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Xin LI Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 44F5588D; Tue, 8 Oct 2013 19:09:17 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 18DCB2997; Tue, 8 Oct 2013 19:09:17 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r98J9G4O071103; Tue, 8 Oct 2013 19:09:16 GMT (envelope-from delphij@freefall.freebsd.org) Received: (from delphij@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r98J9Gwe071102; Tue, 8 Oct 2013 19:09:16 GMT (envelope-from delphij) Message-Id: <201310081909.r98J9Gwe071102@freefall.freebsd.org> Date: Tue, 8 Oct 2013 19:09:16 GMT From: Xin LI To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/182839: [PATCH] Fix build for multimedia/ffmpeg Cc: wg@freebsd.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Xin LI List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 19:10:00 -0000 >Number: 182839 >Category: ports >Synopsis: [PATCH] Fix build for multimedia/ffmpeg >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Oct 08 19:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Xin LI >Release: FreeBSD 10.0-CURRENT amd64 >Organization: iXsystems, Inc. >Environment: System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #2 r255453: Mon Sep 16 12:43:32 UTC 2013 root@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64 >Description: The current multimedia ffmpeg have multiple build issues. >How-To-Repeat: >Fix: - Don't depend on specific version of x264 library; - Fix an invalid sequence in protocols.texi. --- ffmpeg.diff begins here --- Index: multimedia/ffmpeg/Makefile =================================================================== --- multimedia/ffmpeg/Makefile (revision 328876) +++ multimedia/ffmpeg/Makefile (working copy) @@ -4,7 +4,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.15 PORTEPOCH= 1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -363,7 +363,7 @@ CONFIGURE_ARGS+= --disable-libvpx # x264 .if ${PORT_OPTIONS:MX264} -LIB_DEPENDS+= x264.125:${PORTSDIR}/multimedia/x264 +LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264 CONFIGURE_ARGS+= --enable-libx264 .else CONFIGURE_ARGS+= --disable-libx264 Index: multimedia/ffmpeg/files/patch-doc-protocols.texi =================================================================== --- multimedia/ffmpeg/files/patch-doc-protocols.texi (revision 0) +++ multimedia/ffmpeg/files/patch-doc-protocols.texi (working copy) @@ -0,0 +1,13 @@ +--- doc/protocols.texi.orig 2013-02-17 14:46:23.000000000 -0800 ++++ doc/protocols.texi 2013-10-08 12:00:38.375693236 -0700 +@@ -155,8 +155,8 @@ + + Real-Time Messaging Protocol. + +-The Real-Time Messaging Protocol (RTMP) is used for streaming multime‐ +-dia content across a TCP/IP network. ++The Real-Time Messaging Protocol (RTMP) is used for streaming multimedia ++content across a TCP/IP network. + + The required syntax is: + @example Property changes on: multimedia/ffmpeg/files/patch-doc-protocols.texi ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property --- ffmpeg.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: