Index: head/graphics/gnash/Makefile =================================================================== --- head/graphics/gnash/Makefile (revision 436650) +++ head/graphics/gnash/Makefile (revision 436651) @@ -1,244 +1,246 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= gnash PORTVERSION= 0.8.10 -PORTREVISION= 24 +PORTREVISION= 25 CATEGORIES= graphics MASTER_SITES= http://git.savannah.gnu.org/cgit/gnash.git/snapshot/ DISTNAME= gnash-2b3bdede0305c4fc3ad21a0a4197330606c9b880 MAINTAINER= dinoex@FreeBSD.org COMMENT= GNU Flash movie player 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 CONFLICTS= gnash-devel-[0-9]* USES= cpe tar:bzip2 compiler:features autoreconf pkgconfig gmake libtool jpeg desktop-file-utils CPE_VENDOR= gnu GNU_CONFIGURE= yes WANT_GSTREAMER= yes USE_GNOME= libxml2 USE_XORG= x11 xau xdmcp xext xi xinerama ice sm xv USE_GL= egl INSTALLS_ICONS= yes SYSCONFIGDIR= ${PREFIX}/etc # jemalloc leads to infinite recursion on FreeBSD CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \ --with-boost-lib="${LOCALBASE}/lib" \ --with-plugins-install=prefix \ --sysconfdir="${SYSCONFIGDIR}" \ --disable-testsuite \ --disable-kparts3 \ --disable-jemalloc GNASHVER= 0.8.11dev CONFIG_FILES= gnashpluginrc gnashrc WRKSRC= ${WRKDIR}/${DISTNAME} PLIST_SUB+= GNASHVER="${GNASHVER}" USE_LDCONFIG= ${PREFIX}/lib/gnash OPTIONS_DEFINE= PLUGIN CYGNAL VAAPI DOCS OPTIONS_SINGLE= MEDIA GUI RENDERER OPTIONS_SINGLE_MEDIA= FFMPEG GSTREAMER OPTIONS_SINGLE_GUI= GTK2 KDE4 OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO OPTIONS_DEFAULT=GTK2 PLUGIN AGG FFMPEG VAAPI NO_OPTIONS_SORT=yes OPTIONS_SUB= yes PLUGIN_DESC= browser plugin CYGNAL_DESC= Cygnal media server AGG_DESC= AGG renderer OPENGL_DESC= OpenGL renderer (experimental) CAIRO_DESC= Cairo renderer FFMPEG_DESC= ffmpeg media handler GSTREAMER_DESC= GStreamer media handler VAAPI_DESC= VAAPI support (requires FFMPEG) KDE4_USES= kde:4 CYGNAL_CONFIGURE_ENABLE= cygnal .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 # # Plugin configuration # .if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MPLUGIN} USES+= webplugin:native WEBPLUGIN_NAME= gnash WEBPLUGIN_FILES= libgnashplugin.so WEBPLUGIN_DIR=${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME} PLIST_SUB+= NPAPI="" CONFIGURE_ARGS+=--with-npapi-plugindir="${WEBPLUGIN_DIR}" BUILD_DEPENDS+= ${LOCALBASE}/bin/xulrunner:www/libxul RUN_DEPENDS+= ${LOCALBASE}/bin/xulrunner:www/libxul .else PLIST_SUB+= NPAPI="@comment " CONFIGURE_ARGS+= --disable-npapi .endif .if ${PORT_OPTIONS:MKDE4} && ${PORT_OPTIONS:MPLUGIN} PLIST_SUB+= KPARTS4="${KDE_PREFIX}" CONFIGURE_ARGS+= --with-kde4_prefix=${KDE_PREFIX} \ --with-kde-appsdatadir=${KDE_PREFIX}/share/apps/klash .else PLIST_SUB+= KPARTS4="@comment " CONFIGURE_ARGS+= --disable-kparts4 .endif # # GUI options processing # GNASH_GUIS= .if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 pango atk gconf2 GNASH_GUIS+= gtk .endif .if ${PORT_OPTIONS:MKDE4} GNASH_GUIS+= kde4 USE_QT4= moc_build QT_NONSTANDARD= yes 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 .endif CONFIGURE_ARGS+=--enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,` # # Renderer options processing # GNASH_RENDERERS= .if ${PORT_OPTIONS:MAGG} LIB_DEPENDS+= libagg.so:graphics/agg GNASH_RENDERERS+= agg .endif .if ${PORT_OPTIONS:MOPENGL} IGNORE= support for OpenGL is currently broken, use option AGG GNASH_RENDERERS+= ogl .if ${PORT_OPTIONS:MGTK2} LIB_DEPENDS+= libgdkglext-x11-1.0.so:x11-toolkits/gtkglext .endif .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 .if ${GNASH_RENDERERS} == "" IGNORE= needs at least one renderer enabled. Please rerun 'make config' and enable AGG, OPENGL or CAIRO .endif CONFIGURE_ARGS+= --enable-renderer=${GNASH_RENDERERS:S/^ //W:S/ /,/gW} # # 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} && empty(PORT_OPTIONS:MGSTREAMER) 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 USE_SDL+= sdl MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include/ffmpeg" .elif ${PORT_OPTIONS:MGSTREAMER} && empty(PORT_OPTIONS:MFFMPEG) USE_GSTREAMER= ffmpeg mad vorbis CONFIGURE_ARGS+= --enable-media=gst USE_SDL+= sdl .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 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 .if ${PORT_OPTIONS:MPLUGIN} .if ${PORT_OPTIONS:MGTK2} cd ${INSTALL_WRKSRC}/plugin && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-plugin .endif .if ${PORT_OPTIONS:MKDE4} cd ${INSTALL_WRKSRC}/plugin/klash4 && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-plugin .endif .endif .include Index: head/graphics/gnash/pkg-plist =================================================================== --- head/graphics/gnash/pkg-plist (revision 436650) +++ head/graphics/gnash/pkg-plist (revision 436651) @@ -1,246 +1,246 @@ -bin/eglinfo +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 %%CYGNAL%%bin/cygnal %%CYGNAL%%bin/flvdumper %%CYGNAL%%bin/soldumper %%NPAPI%%%%WEBPLUGIN_DIR%%/libgnashplugin.so %%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 %%KPARTS4%%/share/apps/klash/pluginsinfo %%KPARTS4%%/share/apps/klash/klashpartui.rc %%KPARTS4%%/share/kde4/services/klash_part.desktop %%KPARTS4%%/lib/kde4/libklashpart.so %%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 %%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 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 man/man1/flvdumper.1.gz man/man1/gnash.1.gz man/man1/gprocessor.1.gz 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 %%PORTDOCS%%%%DOCSDIR%%/gnashref.html %%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 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