Date: Thu, 10 Mar 2011 11:21:43 +0300 From: Anonymous <swell.k@gmail.com> To: Dmitry Marakasov <amdmi3@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/graphics/gnash Makefile pkg-plist Message-ID: <86aah3wfl4.fsf@gmail.com> In-Reply-To: <201103100629.p2A6TDjM027321@repoman.freebsd.org> (Dmitry Marakasov's message of "Thu, 10 Mar 2011 06:29:13 %2B0000 (UTC)") References: <201103100629.p2A6TDjM027321@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Dmitry Marakasov <amdmi3@FreeBSD.org> 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 <swell.k@gmail.com>
[...]
> +# 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
%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86aah3wfl4.fsf>