Date: Sun, 7 Feb 2021 20:14:23 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564644 - head/graphics/gnash Message-ID: <202102072014.117KEN8Q008510@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sun Feb 7 20:14:23 2021 New Revision: 564644 URL: https://svnweb.freebsd.org/changeset/ports/564644 Log: - fix regression from r563992 - remove option FFMPEG Modified: head/graphics/gnash/Makefile head/graphics/gnash/pkg-plist Modified: head/graphics/gnash/Makefile ============================================================================== --- head/graphics/gnash/Makefile Sun Feb 7 20:05:26 2021 (r564643) +++ head/graphics/gnash/Makefile Sun Feb 7 20:14:23 2021 (r564644) @@ -3,7 +3,7 @@ PORTNAME= gnash PORTVERSION= 0.8.10 -PORTREVISION= 45 +PORTREVISION= 46 CATEGORIES= graphics MASTER_SITES= http://git.savannah.gnu.org/cgit/gnash.git/snapshot/ DISTNAME= gnash-2b3bdede0305c4fc3ad21a0a4197330606c9b880 @@ -22,22 +22,29 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ libspeexdsp.so:audio/speexdsp \ libboost_thread.so:devel/boost-libs \ libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig \ + libavcodec.so:multimedia/ffmpeg \ + libtheora.so:multimedia/libtheora \ + libogg.so:audio/libogg \ + libvorbis.so:audio/libvorbis \ + libdca.so:multimedia/libdca \ + libgsm.so:audio/gsm CONFLICTS= gnash-devel-[0-9]* USES= cpe tar:bzip2 compiler:c++11-lang autoreconf gmake libtool \ - pkgconfig jpeg gnome gl desktop-file-utils xorg + pkgconfig jpeg gnome gl sdl desktop-file-utils xorg CPE_VENDOR= gnu GNU_CONFIGURE= yes USE_GNOME= atk gconf2 gtk20 libxml2 pango USE_XORG= x11 xau xdmcp xext xi xinerama ice sm xv USE_GL= egl +USE_SDL= sdl INSTALLS_ICONS= yes SYSCONFIGDIR= ${PREFIX}/etc # jemalloc leads to infinite recursion on FreeBSD -CFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \ @@ -45,9 +52,13 @@ CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/includ --with-plugins-install=prefix \ --sysconfdir="${SYSCONFIGDIR}" \ --enable-gui=gtk \ + --enable-media=ffmpeg \ + --with-ffmpeg-incl=${LOCALBASE}/include/libavcodec \ + --with-ffmpeg-lib=${LOCALBASE}/lib \ --disable-testsuite \ --disable-kparts3 \ --disable-jemalloc +#MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/ffmpeg" GNASHVER= 0.8.11dev CONFIG_FILES= gnashpluginrc gnashrc @@ -57,10 +68,10 @@ PLIST_SUB+= GNASHVER="${GNASHVER}" USE_LDCONFIG= ${PREFIX}/lib/gnash -OPTIONS_DEFINE= CYGNAL VAAPI DOCS NLS FFMPEG -OPTIONS_SINGLE= RENDERER +OPTIONS_DEFINE= CYGNAL VAAPI DOCS NLS +OPTIONS_SINGLE= MEDIA RENDERER OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO -OPTIONS_DEFAULT=AGG FFMPEG VAAPI +OPTIONS_DEFAULT=AGG VAAPI NO_OPTIONS_SORT=yes OPTIONS_SUB= yes @@ -68,8 +79,7 @@ CYGNAL_DESC= Cygnal media server AGG_DESC= AGG renderer OPENGL_DESC= OpenGL renderer (experimental) CAIRO_DESC= Cairo renderer -FFMPEG_DESC= ffmpeg media handler -VAAPI_DESC= VAAPI support (requires FFMPEG) +VAAPI_DESC= VAAPI support CYGNAL_CONFIGURE_ENABLE= cygnal @@ -125,33 +135,11 @@ CONFIGURE_ARGS+= --enable-renderer=${GNASH_RENDERERS:S # Hardware acceleration options processing # .if ${PORT_OPTIONS:MVAAPI} -.if empty(PORT_OPTIONS:MFFMPEG) -IGNORE= option VAAPI currently works only with FFMPEG. Please rerun 'make config' and enable FFMPEG -.endif LIB_DEPENDS+= libva.so:multimedia/libva CONFIGURE_ARGS+= --enable-device=egl,x11,vaapi .else CONFIGURE_ARGS+= --enable-hwaccel=none # XVideo CONFIGURE_ARGS+= --enable-device=egl,x11 -.endif - -# -# Media handler options processing -# -.if ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= libavcodec.so:multimedia/ffmpeg \ - libtheora.so:multimedia/libtheora \ - libogg.so:audio/libogg \ - libvorbis.so:audio/libvorbis -CONFIGURE_ARGS+= --enable-media=ffmpeg \ - --with-ffmpeg-incl=${LOCALBASE}/include/libavcodec \ - --with-ffmpeg-lib=${LOCALBASE}/lib -USES+= sdl -USE_SDL+= sdl -MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/ffmpeg" -.else -CONFIGURE_ARGS+= --enable-media=none -IGNORE= can't be built with multiple media handlers enabled. Please rerun 'make config' and leave one or none of them (ffmpeg|gstreamer) .endif .include <bsd.port.pre.mk> Modified: head/graphics/gnash/pkg-plist ============================================================================== --- head/graphics/gnash/pkg-plist Sun Feb 7 20:05:26 2021 (r564643) +++ head/graphics/gnash/pkg-plist Sun Feb 7 20:14:23 2021 (r564644) @@ -4,8 +4,6 @@ bin/gnash-gtk-launcher bin/gtk-gnash bin/gprocessor bin/rtmpget -%%GSTREAMER%%bin/findmicrophones -%%GSTREAMER%%bin/findwebcams %%CYGNAL%%bin/cygnal %%CYGNAL%%bin/flvdumper %%CYGNAL%%bin/soldumper
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102072014.117KEN8Q008510>