From owner-cvs-ports@FreeBSD.ORG  Thu Mar 10 15:13:18 2011
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
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 8B0C2106566B;
	Thu, 10 Mar 2011 15:13:18 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.116.15])
	by mx1.freebsd.org (Postfix) with ESMTP id 44CB58FC0C;
	Thu, 10 Mar 2011 15:13:17 +0000 (UTC)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLSv1:CAMELLIA256-SHA:256)
	(Exim 4.71) (envelope-from <amdmi3@amdmi3.ru>)
	id 1PxgEV-0006ox-LX; Thu, 10 Mar 2011 16:48:51 +0300
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id CA264B865;
	Thu, 10 Mar 2011 16:48:50 +0300 (MSK)
Received: by hades.panopticon (Postfix, from userid 1000)
	id B01C0B823; Thu, 10 Mar 2011 16:48:50 +0300 (MSK)
Date: Thu, 10 Mar 2011 16:48:50 +0300
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: Anonymous <swell.k@gmail.com>
Message-ID: <20110310134850.GA90769@hades.panopticon>
References: <201103100629.p2A6TDjM027321@repoman.freebsd.org>
	<86aah3wfl4.fsf@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <86aah3wfl4.fsf@gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
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 <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Mar 2011 15:13:18 -0000

* Anonymous (swell.k@gmail.com) wrote:

> WITH_VAAPI + WITHOUT_FFMPEG matches `else' condition while IGNORE is ignored.
> 
> Here is a fix for the bug not present in the PR.

Thanks, this was exactly what I've intended, but I got distracted and
committed unfinished version. Should be ok now.

> %%
> 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
> %%
> 

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru