cvs commit: ports/graphics/gnash Makefile pkg-plist

[Anonymous]

Dmitry Marakasov <amdmi3 at 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 at 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
%%