diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index c2751431f7a4..d79a11f44de7 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -1,137 +1,121 @@ PORTNAME= gnash PORTVERSION= 0.8.11.20190130 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics multimedia MAINTAINER= dinoex@FreeBSD.org COMMENT= GNU Flash movie player WWW= https://www.gnu.org/software/gnash/ LICENSE= GPLv3 LIB_DEPENDS= libltdl.so:devel/libltdl \ libnspr4.so:devel/nspr \ libgif.so:graphics/giflib \ libpng.so:graphics/png \ libcurl.so:ftp/curl \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp \ 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 \ libdca.so:multimedia/libdca \ libgsm.so:audio/gsm \ libcairo.so:graphics/cairo \ libdc1394.so:multimedia/libdc1394 USES= cpe tar:bzip2 compiler:c++11-lang autoreconf gmake libtool \ pkgconfig jpeg gnome gl sdl desktop-file-utils xorg localbase:ldflags CPE_VENDOR= gnu USE_GITHUB= yes USE_CSTD= gnu11 USE_CXXSTD= c++11 USE_XORG= x11 xau xdmcp xext xi xinerama ice sm xv USE_GNOME= atk gdkpixbuf gtk20 libxml2 pango USE_GL= egl USE_SDL= sound2 GH_ACCOUNT= GitMirroring GH_PROJECT= gnash GH_TAGNAME= 583ccbc1 GNU_CONFIGURE= yes 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" \ --with-plugins-install=prefix \ --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 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 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 # Cygnal option processing .if ${PORT_OPTIONS:MCYGNAL} 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 - post-patch: ${REINPLACE_CMD} -e 's|lib64|lib|g' -e 's|lib32|lib|g' \ ${WRKSRC}/macros/libslist ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/macros/incllist ${REINPLACE_CMD} -e 's|CODEC_ID_|AV_CODEC_ID_|' \ ${WRKSRC}/libmedia/ffmpeg/VideoDecoderFfmpegVaapi.cpp post-install: # eglinfo conflicts with mesa-demos ${MV} ${STAGEDIR}/${PREFIX}/bin/eglinfo ${STAGEDIR}/${PREFIX}/bin/eglinfo-gnash .for conf in ${CONFIG_FILES} ${MV} ${STAGEDIR}/${SYSCONFIGDIR}/${conf} ${STAGEDIR}${SYSCONFIGDIR}/${conf}.dist .endfor -.include +.include 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 @@ -1,233 +1,233 @@ bin/eglinfo-gnash bin/gnash bin/gnash-gtk-launcher bin/gtk-gnash bin/gprocessor bin/rtmpget %%CYGNAL%%bin/cygnal %%CYGNAL%%bin/flvdumper %%CYGNAL%%bin/soldumper %%CYGNAL%%@sample etc/cygnalrc.dist etc/cygnalrc @sample etc/gnashpluginrc.dist etc/gnashpluginrc @sample etc/gnashrc.dist etc/gnashrc include/gnash/AMF.h include/gnash/BevelFilter_as.h include/gnash/BitmapData_as.h include/gnash/BitmapFilter_as.h include/gnash/BitsReader.h include/gnash/BlurFilter_as.h include/gnash/CachedBitmap.h include/gnash/ClockTime.h include/gnash/ColorMatrixFilter_as.h include/gnash/ColorTransform_as.h include/gnash/ConvolutionFilter_as.h include/gnash/DisplacementMapFilter_as.h include/gnash/DropShadowFilter_as.h include/gnash/ExternalInterface_as.h include/gnash/GC.h include/gnash/GlowFilter_as.h include/gnash/GnashAlgorithm.h include/gnash/GnashEnums.h include/gnash/GnashException.h include/gnash/GnashFactory.h include/gnash/GnashFileUtilities.h include/gnash/GnashImage.h include/gnash/GnashImageJpeg.h include/gnash/GnashNumeric.h include/gnash/GnashSleep.h include/gnash/GnashSystemFDHeaders.h include/gnash/GnashSystemIOHeaders.h include/gnash/GnashSystemNetHeaders.h include/gnash/GradientBevelFilter_as.h include/gnash/GradientGlowFilter_as.h include/gnash/IOChannel.h include/gnash/ImageIterators.h include/gnash/Matrix_as.h include/gnash/NamingPolicy.h include/gnash/NetworkAdapter.h include/gnash/Point2d.h include/gnash/Point_as.h include/gnash/RTMP.h include/gnash/Range2d.h include/gnash/Rectangle_as.h include/gnash/SWFCtype.h include/gnash/SharedMem.h include/gnash/SimpleBuffer.h include/gnash/Socket.h include/gnash/Stats.h include/gnash/StreamProvider.h include/gnash/StringPredicates.h include/gnash/Transform_as.h include/gnash/URL.h include/gnash/URLAccessManager.h include/gnash/WallClockTimer.h include/gnash/accumulator.h include/gnash/arg_parser.h include/gnash/asobj/AMFConverter.h include/gnash/asobj/ASConversions.h include/gnash/asobj/Accessibility_as.h include/gnash/asobj/Array_as.h include/gnash/asobj/AsBroadcaster.h include/gnash/asobj/Boolean_as.h include/gnash/asobj/Camera_as.h include/gnash/asobj/CharacterProxy.h include/gnash/asobj/Color_as.h include/gnash/asobj/ContextMenuItem_as.h include/gnash/asobj/ContextMenu_as.h include/gnash/asobj/ControlTag.h include/gnash/asobj/Date_as.h include/gnash/asobj/DefinitionTag.h include/gnash/asobj/DisplayList.h include/gnash/asobj/DisplayObject.h include/gnash/asobj/DisplayObjectContainer.h include/gnash/asobj/DragState.h include/gnash/asobj/DynamicShape.h include/gnash/asobj/Error_as.h include/gnash/asobj/FillStyle.h include/gnash/asobj/Function_as.h include/gnash/asobj/Geometry.h include/gnash/asobj/Global_as.h include/gnash/asobj/GnashKey.h include/gnash/asobj/InteractiveObject.h include/gnash/asobj/Key_as.h include/gnash/asobj/LineStyle.h include/gnash/asobj/LoadVars_as.h include/gnash/asobj/LoadableObject.h include/gnash/asobj/LocalConnection_as.h include/gnash/asobj/Math_as.h include/gnash/asobj/Microphone_as.h include/gnash/asobj/MouseButtonState.h include/gnash/asobj/Mouse_as.h include/gnash/asobj/Movie.h include/gnash/asobj/MovieClip.h include/gnash/asobj/MovieClipLoader.h include/gnash/asobj/MovieClip_as.h include/gnash/asobj/MovieFactory.h include/gnash/asobj/NativeFunction.h include/gnash/asobj/NetConnection_as.h include/gnash/asobj/NetStream_as.h include/gnash/asobj/Number_as.h include/gnash/asobj/Object.h include/gnash/asobj/ObjectURI.h include/gnash/asobj/PlayHead.h include/gnash/asobj/PropFlags.h include/gnash/asobj/Property.h include/gnash/asobj/PropertyList.h include/gnash/asobj/RGBA.h include/gnash/asobj/Relay.h include/gnash/asobj/RunResources.h include/gnash/asobj/SWF.h include/gnash/asobj/SWFCxForm.h include/gnash/asobj/SWFMatrix.h include/gnash/asobj/SWFRect.h include/gnash/asobj/Selection_as.h include/gnash/asobj/ShapeRecord.h include/gnash/asobj/SharedObject_as.h include/gnash/asobj/Sound_as.h include/gnash/asobj/Stage_as.h include/gnash/asobj/String_as.h include/gnash/asobj/System_as.h include/gnash/asobj/TagLoadersTable.h include/gnash/asobj/TextField_as.h include/gnash/asobj/TextFormat_as.h include/gnash/asobj/TextSnapshot_as.h include/gnash/asobj/UserFunction.h include/gnash/asobj/Video.h include/gnash/asobj/Video_as.h include/gnash/asobj/XMLNode_as.h include/gnash/asobj/XMLSocket_as.h include/gnash/asobj/XML_as.h include/gnash/asobj/as_environment.h include/gnash/asobj/as_function.h include/gnash/asobj/as_object.h include/gnash/asobj/as_value.h include/gnash/asobj/builtin_function.h include/gnash/asobj/event_id.h include/gnash/asobj/movie_root.h include/gnash/asobj/namedStrings.h include/gnash/display_pkg.h include/gnash/dsodefs.h %%CYGNAL%%include/gnash/extension.h include/gnash/external_pkg.h include/gnash/filters_pkg.h include/gnash/geom_pkg.h include/gnash/getclocktime.hpp include/gnash/gettext.h include/gnash/gmemory.h include/gnash/log.h include/gnash/net_pkg.h include/gnash/noseek_fd_adapter.h include/gnash/parser/movie_definition.h include/gnash/rc.h include/gnash/ref_counted.h %%CYGNAL%%include/gnash/sharedlib.h include/gnash/snappingrange.h include/gnash/string_table.h include/gnash/text_pkg.h include/gnash/tree.hh include/gnash/tu_file.h include/gnash/utf8.h include/gnash/utility.h include/gnash/vm/ASHandlers.h include/gnash/vm/ActionExec.h include/gnash/vm/CallStack.h include/gnash/vm/ExecutableCode.h include/gnash/vm/SafeStack.h include/gnash/vm/VM.h include/gnash/vm/fn_call.h include/gnash/zlib_adapter.h %%CYGNAL%%lib/cygnal/plugins/echo.so %%CYGNAL%%lib/cygnal/plugins/oflaDemo.so %%CYGNAL%%lib/gnash/libgnashamf-%%GNASHVER%%.so %%CYGNAL%%lib/gnash/libgnashamf.so lib/gnash/libgnashbase-%%GNASHVER%%.so lib/gnash/libgnashbase.so 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.png %%DATADIR%%/gnash-splash.swf %%DATADIR%%/gnash_128_96.ico %%PORTDOCS%%%%DOCSDIR%%/gnashref.html %%PORTDOCS%%%%DOCSDIR%%/gnashuser.html %%PORTDOCS%%%%DOCSDIR%%/images/rtmp.png share/icons/hicolor/32x32/apps/gnash.xpm share/locale/cs/LC_MESSAGES/gnash.mo share/locale/da/LC_MESSAGES/gnash.mo share/locale/de/LC_MESSAGES/gnash.mo share/locale/en_GB/LC_MESSAGES/gnash.mo share/locale/el/LC_MESSAGES/gnash.mo share/locale/es/LC_MESSAGES/gnash.mo share/locale/fi/LC_MESSAGES/gnash.mo share/locale/fr/LC_MESSAGES/gnash.mo share/locale/it/LC_MESSAGES/gnash.mo share/locale/ja/LC_MESSAGES/gnash.mo share/locale/km/LC_MESSAGES/gnash.mo share/locale/nb/LC_MESSAGES/gnash.mo share/locale/ne/LC_MESSAGES/gnash.mo share/locale/ru/LC_MESSAGES/gnash.mo share/locale/zh_CN/LC_MESSAGES/gnash.mo share/locale/zh_TW/LC_MESSAGES/gnash.mo share/man/man1/cygnal.1.gz share/man/man1/findmicrophones.1.gz share/man/man1/findwebcams.1.gz share/man/man1/flvdumper.1.gz share/man/man1/gnash.1.gz share/man/man1/gprocessor.1.gz share/man/man1/rtmpget.1.gz share/man/man1/soldumper.1.gz share/man/man1/gnash-gtk-launcher.1.gz share/man/man1/gtk-gnash.1.gz