Date: Sat, 02 May 2026 09:36:37 +0000 From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c00125468d55 - main - graphics/gnash: new option FFMPEG Message-ID: <69f5c5a5.1e1eb.3d16bf4f@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=c00125468d5575c2b1e24c72bd50ea7927d2a5af commit c00125468d5575c2b1e24c72bd50ea7927d2a5af Author: Dirk Meyer <dinoex@FreeBSD.org> AuthorDate: 2026-05-02 09:36:19 +0000 Commit: Dirk Meyer <dinoex@FreeBSD.org> CommitDate: 2026-05-02 09:36:19 +0000 graphics/gnash: new option FFMPEG --- graphics/gnash/Makefile | 60 ++++++++++++++++++------------------------------ graphics/gnash/pkg-plist | 8 +++---- 2 files changed, 26 insertions(+), 42 deletions(-) diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index c2751431f7a4..d79a11f44de7 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -1,6 +1,6 @@ PORTNAME= gnash PORTVERSION= 0.8.11.20190130 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics multimedia MAINTAINER= dinoex@FreeBSD.org @@ -19,7 +19,6 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ libboost_thread.so:devel/boost-libs \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ - libavcodec.so.58:multimedia/ffmpeg4 \ libtheora.so:multimedia/libtheora \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis \ @@ -47,9 +46,6 @@ PORTSCOUT= limit:^0\. SYSCONFIGDIR= ${PREFIX}/etc # jemalloc leads to infinite recursion on FreeBSD -CFLAGS+= -I${LOCALBASE}/ffmpeg4/include -CPPFLAGS+= -I${LOCALBASE}/ffmpeg4/include -LDFLAGS+= -L${LOCALBASE}/ffmpeg4/lib CONFIGURE_ENV= SDL_CONFIG=${LOCALBASE}/bin/sdl2-config CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \ --with-boost-lib="${LOCALBASE}/lib" \ @@ -57,16 +53,15 @@ CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \ --sysconfdir="${SYSCONFIGDIR}" \ --enable-gui=gtk \ --enable-renderer=cairo \ - --enable-media=ffmpeg \ --enable-sound=sdl \ - --with-ffmpeg-incl="${LOCALBASE}/ffmpeg4/include/libavcodec" \ - --with-ffmpeg-lib=${LOCALBASE}/ffmpeg4/lib \ + --disable-docbook \ --disable-testsuite \ --disable-kparts3 \ --disable-jemalloc \ + --disable-npapi \ + --disable-kparts4 \ --without-gconf GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -#MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/ffmpeg4" GNASHVER= 0.8.11dev CONFIG_FILES= gnashpluginrc gnashrc @@ -75,9 +70,8 @@ PLIST_SUB+= GNASHVER="${GNASHVER}" USE_LDCONFIG= ${PREFIX}/lib/gnash -OPTIONS_DEFINE= CYGNAL VAAPI DOCS NLS -OPTIONS_SINGLE= MEDIA RENDERER -OPTIONS_DEFAULT=VAAPI +OPTIONS_DEFINE= CYGNAL FFMPEG VAAPI DOCS NLS +OPTIONS_DEFAULT=VAAPI FFMPEG NO_OPTIONS_SORT=yes OPTIONS_SUB= yes @@ -85,7 +79,21 @@ CYGNAL_DESC= Cygnal media server VAAPI_DESC= VAAPI support CYGNAL_CONFIGURE_ENABLE= cygnal -VAAPI_CPPFLAGS= -I../libdevice/vaapi +VAAPI_LIB_DEPENDS+= libva.so:multimedia/libva +VAAPI_CPPFLAGS= -I../libdevice/vaapi +VAAPI_CONFIGURE_ON= --enable-device=egl,x11,vaapi +VAAPI_CONFIGURE_OFF+= --enable-hwaccel=none +VAAPI_CONFIGURE_OFF+= --enable-device=egl,x11 +FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 +FFMPEG_CPPFLAGS= -I${LOCALBASE}/ffmpeg4/include +FFMPEG_CFLAGS= -I${LOCALBASE}/ffmpeg4/include +FFMPEG_LDFLAGS= -L${LOCALBASE}/ffmpeg4/lib +FFMPEG_CONFIGURE_ON+= --enable-media=ffmpeg +FFMPEG_CONFIGURE_ON+= --with-ffmpeg-incl="${LOCALBASE}/ffmpeg4/include/libavcodec" +FFMPEG_CONFIGURE_ON+= --with-ffmpeg-lib=${LOCALBASE}/ffmpeg4/lib +FFMPEG_CONFIGURE_OFF= --enable-media=no +NLS_USES= gettext +NLS_CONFIGURE_OFF= --disable-nls .include <bsd.port.options.mk> @@ -94,30 +102,6 @@ VAAPI_CPPFLAGS= -I../libdevice/vaapi CONFIG_FILES+= cygnalrc .endif -# NLS option processing (not sure if --disable-nls actually has any effect) -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -CONFIGURE_ARGS+= --disable-npapi --disable-kparts4 - -# -# Hardware acceleration options processing -# -.if ${PORT_OPTIONS:MVAAPI} -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 - -.include <bsd.port.pre.mk> - post-patch: ${REINPLACE_CMD} -e 's|lib64|lib|g' -e 's|lib32|lib|g' \ ${WRKSRC}/macros/libslist @@ -134,4 +118,4 @@ post-install: ${MV} ${STAGEDIR}/${SYSCONFIGDIR}/${conf} ${STAGEDIR}${SYSCONFIGDIR}/${conf}.dist .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist index 0346f5acc8e3..55dbf2d8c2e9 100644 --- a/graphics/gnash/pkg-plist +++ b/graphics/gnash/pkg-plist @@ -186,16 +186,16 @@ lib/gnash/libgnashcore-%%GNASHVER%%.so lib/gnash/libgnashcore.so lib/gnash/libgnashdevice-%%GNASHVER%%.so lib/gnash/libgnashdevice.so -lib/gnash/libgnashmedia-%%GNASHVER%%.so -lib/gnash/libgnashmedia.so +%%FFMPEG%%lib/gnash/libgnashmedia-%%GNASHVER%%.so +%%FFMPEG%%lib/gnash/libgnashmedia.so %%CYGNAL%%lib/gnash/libgnashnet-%%GNASHVER%%.so %%CYGNAL%%lib/gnash/libgnashnet.so lib/gnash/libgnashrender-%%GNASHVER%%.so lib/gnash/libgnashrender.so lib/gnash/libgnashsound-%%GNASHVER%%.so lib/gnash/libgnashsound.so -%%VAAPI%%lib/gnash/libgnashvaapi-%%GNASHVER%%.so -%%VAAPI%%lib/gnash/libgnashvaapi.so +%%VAAPI%%%%FFMPEG%%lib/gnash/libgnashvaapi-%%GNASHVER%%.so +%%VAAPI%%%%FFMPEG%%lib/gnash/libgnashvaapi.so libdata/pkgconfig/gnash.pc share/applications/gnash.desktop %%DATADIR%%/GnashG.pnghome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f5c5a5.1e1eb.3d16bf4f>