Date: Mon, 31 Dec 2018 12:50:48 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488774 - head/graphics/gnash Message-ID: <201812311250.wBVCom6A020495@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 Modified: head/graphics/gnash/Makefile head/graphics/gnash/pkg-plist Modified: head/graphics/gnash/Makefile ============================================================================== --- head/graphics/gnash/Makefile Mon Dec 31 12:47:31 2018 (r488773) +++ head/graphics/gnash/Makefile Mon Dec 31 12:50:48 2018 (r488774) @@ -26,7 +26,8 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ CONFLICTS= gnash-devel-[0-9]* -USES= autoreconf compiler:c++11-lang cpe desktop-file-utils gmake jpeg libtool pkgconfig tar:bzip2 +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 @@ -56,10 +57,9 @@ PLIST_SUB+= GNASHVER="${GNASHVER}" USE_LDCONFIG= ${PREFIX}/lib/gnash -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 OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO OPTIONS_DEFAULT=GTK2 AGG FFMPEG VAAPI @@ -73,7 +73,6 @@ FFMPEG_DESC= ffmpeg media handler GSTREAMER_DESC= GStreamer media handler VAAPI_DESC= VAAPI support (requires FFMPEG) -KDE4_USES= kde:4 qmake:no_env qt:4 CYGNAL_CONFIGURE_ENABLE= cygnal .include <bsd.port.options.mk> @@ -106,21 +105,8 @@ USE_GNOME+= gtk20 pango atk gconf2 GNASH_GUIS+= gtk .endif -.if ${PORT_OPTIONS:MKDE4} -DEPRECATED= KDE4 is end-of-life -EXPIRATION_DATE=2018-12-31 -GNASH_GUIS+= kde4 -USE_QT= moc_build -USE_KDE= kdelibs -CONFIGURE_ARGS+= --without-gconf -CONFIGURE_ENV+= KDE4_CONFIG="${KDE_PREFIX}/bin/kde4-config" -.if ${PORT_OPTIONS:MNLS} -LDFLAGS+= -lintl -.endif -.endif - .if ${GNASH_GUIS} == "" -IGNORE= needs at least one GUI enabled. Please rerun 'make config' and enable GTK or KDE4 +IGNORE= needs at least one GUI enabled. Please rerun 'make config' and enable GTK .endif CONFIGURE_ARGS+=--enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,` @@ -144,9 +130,6 @@ LIB_DEPENDS+= libgdkglext-x11-1.0.so:x11-toolkits/gtk .endif .if ${PORT_OPTIONS:MCAIRO} -.if ${PORT_OPTIONS:MKDE4} -IGNORE= doesn't support Cairo renderer with KDE4 gui. Please rerun 'make config' and select different renderer or disable KDE4 GUI -.endif LIB_DEPENDS+= libcairo.so:graphics/cairo GNASH_RENDERERS+= cairo .endif Modified: head/graphics/gnash/pkg-plist ============================================================================== --- head/graphics/gnash/pkg-plist Mon Dec 31 12:47:31 2018 (r488773) +++ head/graphics/gnash/pkg-plist Mon Dec 31 12:50:48 2018 (r488774) @@ -2,9 +2,7 @@ bin/eglinfo-gnash bin/gnash %%GTK2%%bin/gnash-gtk-launcher %%GTK2%%bin/gtk-gnash -%%KDE4%%bin/gnash-qt-launcher bin/gprocessor -%%KDE4%%bin/qt4-gnash bin/rtmpget %%GSTREAMER%%bin/findmicrophones %%GSTREAMER%%bin/findwebcams @@ -202,7 +200,6 @@ lib/gnash/libgnashsound.so %%VAAPI%%lib/gnash/libgnashvaapi.so libdata/pkgconfig/gnash.pc %%GTK2%%share/applications/gnash.desktop -%%KDE4%%share/applications/klash.desktop man/man1/cygnal.1.gz man/man1/findmicrophones.1.gz man/man1/findwebcams.1.gz @@ -213,8 +210,6 @@ 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 -%%KDE4%%man/man1/gnash-qt-launcher.1.gz -%%KDE4%%man/man1/qt4-gnash.1.gz %%DATADIR%%/GnashG.png %%DATADIR%%/gnash-splash.swf %%DATADIR%%/gnash_128_96.ico @@ -222,7 +217,6 @@ man/man1/soldumper.1.gz %%PORTDOCS%%%%DOCSDIR%%/gnashuser.html %%PORTDOCS%%%%DOCSDIR%%/images/rtmp.png %%GTK2%%share/icons/hicolor/32x32/apps/gnash.xpm -%%KDE4%%share/icons/hicolor/32x32/apps/klash.xpm share/locale/cs/LC_MESSAGES/gnash.mo share/locale/da/LC_MESSAGES/gnash.mo share/locale/de/LC_MESSAGES/gnash.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812311250.wBVCom6A020495>