From owner-cvs-ports@FreeBSD.ORG Thu Mar 10 08:22:28 2011 Return-Path: Delivered-To: cvs-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8A5A1065678; Thu, 10 Mar 2011 08:22:28 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 10F6B8FC24; Thu, 10 Mar 2011 08:22:27 +0000 (UTC) Received: by bwz12 with SMTP id 12so1655430bwz.13 for ; Thu, 10 Mar 2011 00:22:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=6yjZSLPsukZ870yFmWzvMhYygR/qwllZz1jxfjEV7sY=; b=nol2CkqdR2V98zTnK9hWz587iiVGLNppFG52PfyRtKrqqBQwx1DdwKhYHJ9ZF1IKTV ZECySe/NGV8P76B8n8edglhFCCNcD1lafAqZvkWR7sBEIl5ezZl8c/UOMBwvcew+T0TO bq6e03rX46FhIBSboYgAF3GMgK5xc/RRpTnY4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=Ekzro6fX36+mkJJdtMn3zOETVJUmekcELFk7gAQRuVm0rpsb/3iPS4RrTNXaap6gMg +6hAUsF0ivVzTUMV8RXurW6gsC0rHQe1032jWSAR5nt3yG0fzHYVXhsNVKMpPnKbQne0 mH3HiwbrbprE+pksEwcuUNjGGKA0UoDMgYw4s= Received: by 10.223.31.133 with SMTP id y5mr1246603fac.7.1299745346576; Thu, 10 Mar 2011 00:22:26 -0800 (PST) Received: from localhost (78-60-194-139.static.zebra.lt [78.60.194.139]) by mx.google.com with ESMTPS id e23sm205632faa.42.2011.03.10.00.22.08 (version=SSLv3 cipher=OTHER); Thu, 10 Mar 2011 00:22:25 -0800 (PST) From: Anonymous To: Dmitry Marakasov References: <201103100629.p2A6TDjM027321@repoman.freebsd.org> Date: Thu, 10 Mar 2011 11:21:43 +0300 In-Reply-To: <201103100629.p2A6TDjM027321@repoman.freebsd.org> (Dmitry Marakasov's message of "Thu, 10 Mar 2011 06:29:13 +0000 (UTC)") Message-ID: <86aah3wfl4.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/graphics/gnash Makefile pkg-plist X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2011 08:22:28 -0000 Dmitry Marakasov writes: > amdmi3 2011-03-10 06:29:13 UTC > > FreeBSD ports repository > > Modified files: > graphics/gnash Makefile pkg-plist > Log: > - Add VAAPI support > > PR: 153729 > Submitted by: Anonymous [...] > +# Hardware acceleration options processing > +# > +.if defined(WITH_VAAPI) && !defined(WITHOUT_FFMPEG) > +. if !defined(WITH_VAAPI) WITH_VAAPI cannot be defined and not defined at the same time. > +IGNORE= VAAPI currently works only with FFMPEG. Please rerun 'make config' and enable FFMPEG. > +. endif > +LIB_DEPENDS+= va.1:${PORTSDIR}/multimedia/libva > +PLIST_SUB+= VAAPI="" > +.else > +CONFIGURE_ARGS+= --enable-hwaccel=none # XVideo > +PLIST_SUB+= VAAPI="@comment " > +.endif WITH_VAAPI + WITHOUT_FFMPEG matches `else' condition while IGNORE is ignored. Here is a fix for the bug not present in the PR. %% Index: graphics/gnash/Makefile =================================================================== RCS file: /a/.cvsup/ports/graphics/gnash/Makefile,v retrieving revision 1.53 diff -u -p -r1.53 Makefile --- graphics/gnash/Makefile 10 Mar 2011 06:29:13 -0000 1.53 +++ graphics/gnash/Makefile 10 Mar 2011 08:18:50 -0000 @@ -201,8 +201,8 @@ CONFIGURE_ARGS+= --enable-renderer=`${EC # # Hardware acceleration options processing # -.if defined(WITH_VAAPI) && !defined(WITHOUT_FFMPEG) -. if !defined(WITH_VAAPI) +.if defined(WITH_VAAPI) +. if !defined(WITH_FFMPEG) IGNORE= VAAPI currently works only with FFMPEG. Please rerun 'make config' and enable FFMPEG. . endif LIB_DEPENDS+= va.1:${PORTSDIR}/multimedia/libva %%