From owner-svn-ports-all@freebsd.org Mon Dec 31 13:25:01 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23FD71434283; Mon, 31 Dec 2018 13:25:01 +0000 (UTC) (envelope-from rene@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B8BF66BB26; Mon, 31 Dec 2018 13:25:00 +0000 (UTC) (envelope-from rene@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 96397B175; Mon, 31 Dec 2018 13:25:00 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBVDP05D042125; Mon, 31 Dec 2018 13:25:00 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBVDP0br042123; Mon, 31 Dec 2018 13:25:00 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201812311325.wBVDP0br042123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 31 Dec 2018 13:25:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488782 - head/graphics/gnash X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: head/graphics/gnash X-SVN-Commit-Revision: 488782 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B8BF66BB26 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 31 Dec 2018 13:25:01 -0000 Author: rene Date: Mon Dec 31 13:24:59 2018 New Revision: 488782 URL: https://svnweb.freebsd.org/changeset/ports/488782 Log: graphics/gnash: cleanup after r488774 GTK2 is compulsory so make it non-optional and remove related processing code. Submitted by: jbeich Modified: head/graphics/gnash/Makefile head/graphics/gnash/pkg-plist Modified: head/graphics/gnash/Makefile ============================================================================== --- head/graphics/gnash/Makefile Mon Dec 31 13:12:30 2018 (r488781) +++ head/graphics/gnash/Makefile Mon Dec 31 13:24:59 2018 (r488782) @@ -31,7 +31,7 @@ USES= autoreconf compiler:c++11-lang cpe desktop-file CPE_VENDOR= gnu GNU_CONFIGURE= yes WANT_GSTREAMER= yes -USE_GNOME= libxml2 +USE_GNOME= atk gconf2 gtk20 libxml2 pango USE_XORG= x11 xau xdmcp xext xi xinerama ice sm xv USE_GL= egl INSTALLS_ICONS= yes @@ -45,6 +45,7 @@ CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/includ --with-boost-lib="${LOCALBASE}/lib" \ --with-plugins-install=prefix \ --sysconfdir="${SYSCONFIGDIR}" \ + --enable-gui=gtk \ --disable-testsuite \ --disable-kparts3 \ --disable-jemalloc @@ -57,11 +58,11 @@ PLIST_SUB+= GNASHVER="${GNASHVER}" USE_LDCONFIG= ${PREFIX}/lib/gnash -OPTIONS_DEFINE= CYGNAL VAAPI DOCS NLS GTK2 +OPTIONS_DEFINE= CYGNAL VAAPI DOCS NLS OPTIONS_SINGLE= MEDIA RENDERER OPTIONS_SINGLE_MEDIA= FFMPEG GSTREAMER OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO -OPTIONS_DEFAULT=GTK2 AGG FFMPEG VAAPI +OPTIONS_DEFAULT=AGG FFMPEG VAAPI NO_OPTIONS_SORT=yes OPTIONS_SUB= yes @@ -91,27 +92,9 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif -CONFIGURE_ARGS+= --disable-npapi +CONFIGURE_ARGS+= --disable-npapi --disable-kparts4 -CONFIGURE_ARGS+= --disable-kparts4 - # -# GUI options processing -# -GNASH_GUIS= - -.if ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 pango atk gconf2 -GNASH_GUIS+= gtk -.endif - -.if ${GNASH_GUIS} == "" -IGNORE= needs at least one GUI enabled. Please rerun 'make config' and enable GTK -.endif - -CONFIGURE_ARGS+=--enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,` - -# # Renderer options processing # GNASH_RENDERERS= @@ -124,9 +107,7 @@ GNASH_RENDERERS+= agg .if ${PORT_OPTIONS:MOPENGL} IGNORE= support for OpenGL is currently broken, use option AGG GNASH_RENDERERS+= ogl -.if ${PORT_OPTIONS:MGTK2} LIB_DEPENDS+= libgdkglext-x11-1.0.so:x11-toolkits/gtkglext -.endif .endif .if ${PORT_OPTIONS:MCAIRO} Modified: head/graphics/gnash/pkg-plist ============================================================================== --- head/graphics/gnash/pkg-plist Mon Dec 31 13:12:30 2018 (r488781) +++ head/graphics/gnash/pkg-plist Mon Dec 31 13:24:59 2018 (r488782) @@ -1,7 +1,7 @@ bin/eglinfo-gnash bin/gnash -%%GTK2%%bin/gnash-gtk-launcher -%%GTK2%%bin/gtk-gnash +bin/gnash-gtk-launcher +bin/gtk-gnash bin/gprocessor bin/rtmpget %%GSTREAMER%%bin/findmicrophones @@ -199,7 +199,7 @@ lib/gnash/libgnashsound.so %%VAAPI%%lib/gnash/libgnashvaapi-%%GNASHVER%%.so %%VAAPI%%lib/gnash/libgnashvaapi.so libdata/pkgconfig/gnash.pc -%%GTK2%%share/applications/gnash.desktop +share/applications/gnash.desktop man/man1/cygnal.1.gz man/man1/findmicrophones.1.gz man/man1/findwebcams.1.gz @@ -208,15 +208,15 @@ man/man1/gnash.1.gz man/man1/gprocessor.1.gz man/man1/rtmpget.1.gz man/man1/soldumper.1.gz -%%GTK2%%man/man1/gnash-gtk-launcher.1.gz -%%GTK2%%man/man1/gtk-gnash.1.gz +man/man1/gnash-gtk-launcher.1.gz +man/man1/gtk-gnash.1.gz %%DATADIR%%/GnashG.png %%DATADIR%%/gnash-splash.swf %%DATADIR%%/gnash_128_96.ico %%PORTDOCS%%%%DOCSDIR%%/gnashref.html %%PORTDOCS%%%%DOCSDIR%%/gnashuser.html %%PORTDOCS%%%%DOCSDIR%%/images/rtmp.png -%%GTK2%%share/icons/hicolor/32x32/apps/gnash.xpm +share/icons/hicolor/32x32/apps/gnash.xpm share/locale/cs/LC_MESSAGES/gnash.mo share/locale/da/LC_MESSAGES/gnash.mo share/locale/de/LC_MESSAGES/gnash.mo