From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 27 01:10:08 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66EBB1065672 for ; Thu, 27 Jan 2011 01:10:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2A65E8FC18 for ; Thu, 27 Jan 2011 01:10:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p0R1A8ZQ032293 for ; Thu, 27 Jan 2011 01:10:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p0R1A8LI032292; Thu, 27 Jan 2011 01:10:08 GMT (envelope-from gnats) Resent-Date: Thu, 27 Jan 2011 01:10:08 GMT Resent-Message-Id: <201101270110.p0R1A8LI032292@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, Alexander Wittig Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E487106564A for ; Thu, 27 Jan 2011 01:09:40 +0000 (UTC) (envelope-from alex@wittig.name) Received: from hotzenplotz.wittig.name (unknown [IPv6:2a02:180:1:1:1c:c068:de48:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0CFBF8FC12 for ; Thu, 27 Jan 2011 01:09:40 +0000 (UTC) Received: from alex by hotzenplotz.wittig.name with local (Exim 4.74 (FreeBSD)) (envelope-from ) id 1PiGMi-000HuQ-L0 for FreeBSD-gnats-submit@freebsd.org; Thu, 27 Jan 2011 02:09:36 +0100 Message-Id: Date: Thu, 27 Jan 2011 02:09:36 +0100 From: Alexander Wittig Sender: Alexander Wittig To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/154321: [PATCH] add option for multimedia/ffmpeg-devel to depend on x264-devel X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alexander Wittig List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jan 2011 01:10:08 -0000 >Number: 154321 >Category: ports >Synopsis: [PATCH] add option for multimedia/ffmpeg-devel to depend on x264-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jan 27 01:10:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Alexander Wittig >Release: FreeBSD 8.2-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD hotzenplotz.wittig.name 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Wed Jan 19 00:39:51 CET 2011 root@hotzenplotz.wittig.name:/usr/obj/usr/src/sys/ALEX amd64 >Description: Currently, both multimedia/ffmpeg and multimedia/ffmpeg-devel depend on multimedia/x264 if the X264 option is selected. While this is fine for the stable version, I think the development version of ffmpeg should at least offer the option to depend on the development version of X264 in multimedia/x264-devel. >How-To-Repeat: Install multimedia/x264-devel and then multimedia/ffmpeg-devel. The latter will depend on multimedia/x264 >Fix: The attached patch will add an option to the ffmpeg-devel port to depend on x264-devel. I implemented it so that if X264DEV is selected (it is off by default) the value of X264 is ignored (or put another way X264 is implied). Feel free to change (e.g. make mutually exclusive with warning or only use X264DEV if X264 is also set). This patch builds fine on my system, I do not know if there are incompatibilities between ffmpeg-devel and x264-devel that show up on other systems. --- patch begins here --- diff -uN ffmpeg-devel/Makefile ffmpeg-devel.new/Makefile --- ffmpeg-devel/Makefile 2011-01-27 01:53:42.000000000 +0100 +++ ffmpeg-devel.new/Makefile 2011-01-27 01:59:17.000000000 +0100 @@ -50,6 +50,7 @@ VORBIS "Vorbis encoder via libvorbis (implies OGG)" on \ VP8 "VP8 codec via libvpx" on \ X264 "H.264 encoder" on \ + X264DEV "H.264 encoder (development version)" off \ XVID "Xvid encoder via xvidcore" on COMPAT_HEADERS=libavcodec/avcodec.h \ @@ -309,8 +310,12 @@ .endif # x264 -.ifdef(WITH_X264) +.if defined(WITH_X264) || !defined(WITHOUT_X264DEV) +.if !defined(WITHOUT_X264DEV) +LIB_DEPENDS+= x264.112:${PORTSDIR}/multimedia/x264-devel +.else LIB_DEPENDS+= x264.110:${PORTSDIR}/multimedia/x264 +.endif CONFIGURE_ARGS+= --enable-libx264 .else CONFIGURE_ARGS+= --disable-libx264 Common subdirectories: ffmpeg-devel/files and ffmpeg-devel.new/files --- patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: