From f3acbaf99fef4ff5d8cd4fc33e586d001335ca37 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Mon, 9 Nov 2020 08:36:38 +0000 Subject: [PATCH] Remove gstreamer option Gstreamer 0.10 is about to be removed, in preparation for it, disable by default the media support of wxgtk 2.8 which depends on gstreamer 0.10 --- x11-toolkits/wxgtk28/Makefile | 18 ++++-------------- x11-toolkits/wxgtk28/pkg-plist | 3 --- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index 286b76579fdc..29155e9c60e2 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -3,7 +3,7 @@ PORTNAME= wx PORTVERSION= 2.8.12 -PORTREVISION?= 8 +PORTREVISION?= 9 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/${PORTVERSION} PKGNAMESUFFIX= 28-${WXGTK_FLAVOR} @@ -31,7 +31,7 @@ CONFIGURE_ARGS= --with-libpng=sys\ --with-opengl\ --with-mspack\ --with-gtk\ - --enable-mediactrl\ + --disable-mediactrl \ --disable-backtrace\ --enable-graphics_ctx CONFIGURE_ENV= X11BASE="${LOCALBASE}" @@ -39,22 +39,12 @@ PLIST= ${.CURDIR}/pkg-plist WXGTK_FLAVOR?= gtk2 -OPTIONS_DEFINE= GSTREAMER MSPACK -OPTIONS_DEFAULT= GSTREAMER MSPACK +OPTIONS_DEFINE= MSPACK +OPTIONS_DEFAULT= MSPACK MSPACK_DESC= MS archives support .include -.if ${PORT_OPTIONS:MGSTREAMER} -CONFIGURE_ARGS+=--enable-mediactrl -USE_GNOME+= gconf2 -USE_GSTREAMER= yes -PLIST_SUB+= GSTREAMER="" -.else -CONFIGURE_ARGS+=--disable-mediactrl -PLIST_SUB+= GSTREAMER="@comment " -.endif - .if ${PORT_OPTIONS:MMSPACK} CONFIGURE_ARGS+=--with-libmspack LIB_DEPENDS+= libmspack.so:archivers/libmspack diff --git a/x11-toolkits/wxgtk28/pkg-plist b/x11-toolkits/wxgtk28/pkg-plist index 5d4b8e9394ed..986fd038dfce 100644 --- a/x11-toolkits/wxgtk28/pkg-plist +++ b/x11-toolkits/wxgtk28/pkg-plist @@ -24,9 +24,6 @@ lib/libwx_gtk2u_gl-2.8.so.0.8.0 lib/libwx_gtk2u_html-2.8.so lib/libwx_gtk2u_html-2.8.so.0 lib/libwx_gtk2u_html-2.8.so.0.8.0 -%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so -%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0 -%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0.8.0 lib/libwx_gtk2u_qa-2.8.so lib/libwx_gtk2u_qa-2.8.so.0 lib/libwx_gtk2u_qa-2.8.so.0.8.0