svn commit: r488774 - head/graphics/gnash
Jan Beich
jbeich at FreeBSD.org
Mon Dec 31 13:11:18 UTC 2018
Rene Ladan <rene at FreeBSD.org> writes:
> Author: rene
> Date: Mon Dec 31 12:50:48 2018
> New Revision: 488774
> URL: https://svnweb.freebsd.org/changeset/ports/488774
>
> Log:
> graphics/gnash: remove optional dependency on expired KDE4
[...]
> -OPTIONS_DEFINE= CYGNAL VAAPI DOCS NLS
> -OPTIONS_SINGLE= MEDIA GUI RENDERER
> +OPTIONS_DEFINE= CYGNAL VAAPI DOCS NLS GTK2
> +OPTIONS_SINGLE= MEDIA RENDERER
> OPTIONS_SINGLE_MEDIA= FFMPEG GSTREAMER
> -OPTIONS_SINGLE_GUI= GTK2 KDE4
SINGLE means 1 option must be selected. If KDE4 is gone then GTK2 cannot
be disabled. As DEFINE now allows GTK2 to be disabled it leads to IGNORE.
So, can you drop the cruft as well?
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 53ab8bd81a4c..9d752798dd74 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -26,47 +26,48 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \
CONFLICTS= gnash-devel-[0-9]*
USES= autoreconf compiler:c++11-lang cpe desktop-file-utils gl \
gmake gnome jpeg libtool pkgconfig tar:bzip2
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
SYSCONFIGDIR= ${PREFIX}/etc
# jemalloc leads to infinite recursion on FreeBSD
CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \
--with-boost-lib="${LOCALBASE}/lib" \
--with-plugins-install=prefix \
--sysconfdir="${SYSCONFIGDIR}" \
+ --enable-gui=gtk \
--disable-testsuite \
--disable-kparts3 \
--disable-jemalloc
GNASHVER= 0.8.11dev
CONFIG_FILES= gnashpluginrc gnashrc
WRKSRC= ${WRKDIR}/${DISTNAME}
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
CYGNAL_DESC= Cygnal media server
AGG_DESC= AGG renderer
OPENGL_DESC= OpenGL renderer (experimental)
CAIRO_DESC= Cairo renderer
FFMPEG_DESC= ffmpeg media handler
@@ -90,49 +91,31 @@ PLIST_SUB+= NLS=""
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.endif
CONFIGURE_ARGS+= --disable-npapi
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=
.if ${PORT_OPTIONS:MAGG}
LIB_DEPENDS+= libagg.so:graphics/agg
GNASH_RENDERERS+= agg
.endif
.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}
LIB_DEPENDS+= libcairo.so:graphics/cairo
GNASH_RENDERERS+= cairo
.endif
.if ${GNASH_RENDERERS} == ""
IGNORE= needs at least one renderer enabled. Please rerun 'make config' and enable AGG, OPENGL or CAIRO
More information about the svn-ports-head
mailing list