From owner-svn-ports-all@FreeBSD.ORG Tue Oct 29 06:54:13 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D213DAFC; Tue, 29 Oct 2013 06:54:13 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BED372DDE; Tue, 29 Oct 2013 06:54:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9T6sDJm037377; Tue, 29 Oct 2013 06:54:13 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9T6sDQG037376; Tue, 29 Oct 2013 06:54:13 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201310290654.r9T6sDQG037376@svn.freebsd.org> From: Dirk Meyer Date: Tue, 29 Oct 2013 06:54:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331932 - head/graphics/gnash X-SVN-Group: ports-head 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.14 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: Tue, 29 Oct 2013 06:54:13 -0000 Author: dinoex Date: Tue Oct 29 06:54:13 2013 New Revision: 331932 URL: http://svnweb.freebsd.org/changeset/ports/331932 Log: - revert default to FFMPG0 Modified: head/graphics/gnash/Makefile Modified: head/graphics/gnash/Makefile ============================================================================== --- head/graphics/gnash/Makefile Tue Oct 29 06:13:15 2013 (r331931) +++ head/graphics/gnash/Makefile Tue Oct 29 06:54:13 2013 (r331932) @@ -3,7 +3,7 @@ PORTNAME= gnash PORTVERSION= 0.8.10 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= GNU/${PORTNAME}/${PORTVERSION}/ @@ -59,16 +59,16 @@ OPTIONS_SINGLE= MEDIA GUI RENDERER OPTIONS_SINGLE_MEDIA= FFMPEG FFMPEG2 GSTREAMER OPTIONS_SINGLE_GUI= GTK2 KDE4 OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO -OPTIONS_DEFAULT=GTK2 PLUGIN AGG FFMPEG2 VAAPI +OPTIONS_DEFAULT=GTK2 PLUGIN AGG FFMPEG VAAPI NO_OPTIONS_SORT=yes PLUGIN_DESC= browser plugin CYGNAL_DESC= Cygnal media server AGG_DESC= AGG renderer -OPENGL_DESC= OpenGL renderer (broken) +OPENGL_DESC= OpenGL renderer CAIRO_DESC= Cairo renderer (experimental) FFMPEG_DESC= ffmpeg0 media handler -FFMPEG2_DESC= ffmpeg2 media handler +FFMPEG2_DESC= ffmpeg2 media handler (broken) GSTREAMER_DESC= GStreamer media handler VAAPI_DESC= VAAPI support (requires FFMPEG) @@ -202,8 +202,8 @@ PLIST_SUB+= VAAPI="@comment " .if ${PORT_OPTIONS:MFFMPEG2} && empty(PORT_OPTIONS:MFFMPEG) && empty(PORT_OPTIONS:MGSTREAMER) LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg CONFIGURE_ARGS+= --enable-media=ffmpeg \ - --with-ffmpeg-incl=${LOCALBASE}/include \ - --with-ffmpeg-lib=${LOCALBASE}/lib/ffmpeg + --with-ffmpeg-incl=${LOCALBASE}/include/libavcodec \ + --with-ffmpeg-lib=${LOCALBASE}/lib USE_SDL+= sdl MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/ffmpeg" .elif ${PORT_OPTIONS:MFFMPEG} && empty(PORT_OPTIONS:MFFMPEG2) && empty(PORT_OPTIONS:MGSTREAMER)