From owner-svn-ports-all@freebsd.org Thu Feb 4 05:06:00 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 27F50538227; Thu, 4 Feb 2021 05:06:00 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DWRMr0jlBz4q5r; Thu, 4 Feb 2021 05:06:00 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F08702E186; Thu, 4 Feb 2021 05:05:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11455xJ2032811; Thu, 4 Feb 2021 05:05:59 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11455xiS032810; Thu, 4 Feb 2021 05:05:59 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202102040505.11455xiS032810@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 4 Feb 2021 05:05:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563992 - head/graphics/gnash X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/graphics/gnash X-SVN-Commit-Revision: 563992 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2021 05:06:00 -0000 Author: bapt Date: Thu Feb 4 05:05:59 2021 New Revision: 563992 URL: https://svnweb.freebsd.org/changeset/ports/563992 Log: multimedia/gnash: remove gstreamer option Modified: head/graphics/gnash/Makefile Modified: head/graphics/gnash/Makefile ============================================================================== --- head/graphics/gnash/Makefile Thu Feb 4 05:02:38 2021 (r563991) +++ head/graphics/gnash/Makefile Thu Feb 4 05:05:59 2021 (r563992) @@ -30,7 +30,6 @@ USES= cpe tar:bzip2 compiler:c++11-lang autoreconf gm pkgconfig jpeg gnome gl desktop-file-utils xorg CPE_VENDOR= gnu GNU_CONFIGURE= yes -WANT_GSTREAMER= yes USE_GNOME= atk gconf2 gtk20 libxml2 pango USE_XORG= x11 xau xdmcp xext xi xinerama ice sm xv USE_GL= egl @@ -58,9 +57,8 @@ PLIST_SUB+= GNASHVER="${GNASHVER}" USE_LDCONFIG= ${PREFIX}/lib/gnash -OPTIONS_DEFINE= CYGNAL VAAPI DOCS NLS -OPTIONS_SINGLE= MEDIA RENDERER -OPTIONS_SINGLE_MEDIA= FFMPEG GSTREAMER +OPTIONS_DEFINE= CYGNAL VAAPI DOCS NLS FFMPEG +OPTIONS_SINGLE= RENDERER OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO OPTIONS_DEFAULT=AGG FFMPEG VAAPI @@ -71,7 +69,6 @@ AGG_DESC= AGG renderer OPENGL_DESC= OpenGL renderer (experimental) CAIRO_DESC= Cairo renderer FFMPEG_DESC= ffmpeg media handler -GSTREAMER_DESC= GStreamer media handler VAAPI_DESC= VAAPI support (requires FFMPEG) CYGNAL_CONFIGURE_ENABLE= cygnal @@ -141,7 +138,7 @@ CONFIGURE_ARGS+= --enable-device=egl,x11 # # Media handler options processing # -.if ${PORT_OPTIONS:MFFMPEG} && empty(PORT_OPTIONS:MGSTREAMER) +.if ${PORT_OPTIONS:MFFMPEG} LIB_DEPENDS+= libavcodec.so:multimedia/ffmpeg \ libtheora.so:multimedia/libtheora \ libogg.so:audio/libogg \ @@ -152,11 +149,6 @@ CONFIGURE_ARGS+= --enable-media=ffmpeg \ USES+= sdl USE_SDL+= sdl MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/ffmpeg" -.elif ${PORT_OPTIONS:MGSTREAMER} && empty(PORT_OPTIONS:MFFMPEG) -USE_GSTREAMER= ffmpeg mad vorbis -CONFIGURE_ARGS+= --enable-media=gst -USES+= sdl -USE_SDL+= sdl .else CONFIGURE_ARGS+= --enable-media=none IGNORE= can't be built with multiple media handlers enabled. Please rerun 'make config' and leave one or none of them (ffmpeg|gstreamer)