Index: head/graphics/gnash/Makefile =================================================================== --- head/graphics/gnash/Makefile (revision 495792) +++ head/graphics/gnash/Makefile (revision 495793) @@ -1,178 +1,181 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= gnash PORTVERSION= 0.8.10 PORTREVISION= 40 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= 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 USE_GNOME= atk gconf2 gtk20 libxml2 pango 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}" \ --enable-gui=gtk \ --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= CYGNAL VAAPI DOCS NLS OPTIONS_SINGLE= MEDIA RENDERER OPTIONS_SINGLE_MEDIA= FFMPEG GSTREAMER OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO OPTIONS_DEFAULT=AGG FFMPEG VAAPI NO_OPTIONS_SORT=yes OPTIONS_SUB= yes 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) 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 CONFIGURE_ARGS+= --disable-npapi --disable-kparts4 # # 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 LIB_DEPENDS+= libgdkglext-x11-1.0.so:x11-toolkits/gtkglext +. if ${PORT_OPTIONS:MVAAPI} +LIB_DEPENDS+= libva-glx.so:multimedia/libva-glx +. endif .endif .if ${PORT_OPTIONS:MCAIRO} 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 .include Index: head/multimedia/Makefile =================================================================== --- head/multimedia/Makefile (revision 495792) +++ head/multimedia/Makefile (revision 495793) @@ -1,476 +1,477 @@ # $FreeBSD$ # COMMENT = Multimedia software SUBDIR += 2mandvd SUBDIR += Bento4 SUBDIR += QtAV SUBDIR += ab25 SUBDIR += abby SUBDIR += acidrip SUBDIR += aegisub SUBDIR += aom SUBDIR += aravis SUBDIR += asdcplib SUBDIR += assimp SUBDIR += atomicparsley SUBDIR += audacious SUBDIR += audacious-gtk3 SUBDIR += audacious-plugins SUBDIR += audacious-plugins-gtk3 SUBDIR += audiopreview SUBDIR += avidemux SUBDIR += avidemux-cli SUBDIR += avidemux-plugins SUBDIR += avidemux-qt4 SUBDIR += avinfo SUBDIR += baka-mplayer SUBDIR += bcmatroska2 SUBDIR += bino SUBDIR += bitstream SUBDIR += blind SUBDIR += bsdbktr_tvtune SUBDIR += camserv SUBDIR += ccextractor SUBDIR += cclive SUBDIR += cheese SUBDIR += chilitags SUBDIR += cinelerra-gg SUBDIR += clipgrab SUBDIR += clive SUBDIR += clutter-gst SUBDIR += clutter-gst3 SUBDIR += cmrt SUBDIR += cmrtlib SUBDIR += cuse4bsd-kmod SUBDIR += cx88 SUBDIR += dav1d SUBDIR += deforaos-player SUBDIR += devede SUBDIR += din SUBDIR += dirac SUBDIR += dragon SUBDIR += dtv-scan-tables SUBDIR += dumpmpeg SUBDIR += dv2sub SUBDIR += dvb-apps SUBDIR += dvbcut SUBDIR += dvbsnoop SUBDIR += dvd-slideshow SUBDIR += dvdauthor SUBDIR += dvdid SUBDIR += dvdrip SUBDIR += dvdstyler SUBDIR += dvts SUBDIR += emby-server SUBDIR += emovix SUBDIR += ffdec SUBDIR += ffmpeg SUBDIR += ffmpeg0 SUBDIR += ffmpeg2theora SUBDIR += ffmpegthumbnailer SUBDIR += ffms2 SUBDIR += flvmeta SUBDIR += flvstreamer SUBDIR += flvtool++ SUBDIR += fpc-dts SUBDIR += fpc-libvlc SUBDIR += freevo SUBDIR += fxtv SUBDIR += gaupol SUBDIR += gavl SUBDIR += gcfilms SUBDIR += gdialog SUBDIR += gdvrecv SUBDIR += gmerlin SUBDIR += gmerlin-avdecoder SUBDIR += gmimms SUBDIR += gmmlib SUBDIR += gmp-api SUBDIR += gmtk SUBDIR += gnome-mplayer SUBDIR += gnome-mpv SUBDIR += gnome-subtitles SUBDIR += gnome-twitch SUBDIR += gpac-libgpac SUBDIR += gpac-mp4box SUBDIR += gpodder SUBDIR += grake SUBDIR += gst123 SUBDIR += gstreamer SUBDIR += gstreamer-ffmpeg SUBDIR += gstreamer-plugins SUBDIR += gstreamer-plugins-all SUBDIR += gstreamer-plugins-annodex SUBDIR += gstreamer-plugins-bad SUBDIR += gstreamer-plugins-bz2 SUBDIR += gstreamer-plugins-core SUBDIR += gstreamer-plugins-dts SUBDIR += gstreamer-plugins-dv SUBDIR += gstreamer-plugins-dvd SUBDIR += gstreamer-plugins-fluendo-mpegdemux SUBDIR += gstreamer-plugins-gnonlin SUBDIR += gstreamer-plugins-good SUBDIR += gstreamer-plugins-mpeg2dec SUBDIR += gstreamer-plugins-mpeg2enc SUBDIR += gstreamer-plugins-resindvd SUBDIR += gstreamer-plugins-schroedinger SUBDIR += gstreamer-plugins-theora SUBDIR += gstreamer-plugins-ugly SUBDIR += gstreamer-plugins-v4l2 SUBDIR += gstreamer-plugins-vdpau SUBDIR += gstreamer-plugins-vp8 SUBDIR += gstreamer-plugins-x264 SUBDIR += gstreamer-plugins-xvid SUBDIR += gstreamer-qt4 SUBDIR += gstreamer1 SUBDIR += gstreamer1-editing-services SUBDIR += gstreamer1-libav SUBDIR += gstreamer1-plugins SUBDIR += gstreamer1-plugins-all SUBDIR += gstreamer1-plugins-aom SUBDIR += gstreamer1-plugins-assrender SUBDIR += gstreamer1-plugins-bad SUBDIR += gstreamer1-plugins-core SUBDIR += gstreamer1-plugins-dash SUBDIR += gstreamer1-plugins-dts SUBDIR += gstreamer1-plugins-dv SUBDIR += gstreamer1-plugins-dvdread SUBDIR += gstreamer1-plugins-gnonlin SUBDIR += gstreamer1-plugins-good SUBDIR += gstreamer1-plugins-hls SUBDIR += gstreamer1-plugins-kate SUBDIR += gstreamer1-plugins-libde265 SUBDIR += gstreamer1-plugins-mpeg2dec SUBDIR += gstreamer1-plugins-mpeg2enc SUBDIR += gstreamer1-plugins-mplex SUBDIR += gstreamer1-plugins-openh264 SUBDIR += gstreamer1-plugins-resindvd SUBDIR += gstreamer1-plugins-rtmp SUBDIR += gstreamer1-plugins-smoothstreaming SUBDIR += gstreamer1-plugins-theora SUBDIR += gstreamer1-plugins-ttml SUBDIR += gstreamer1-plugins-ugly SUBDIR += gstreamer1-plugins-v4l2 SUBDIR += gstreamer1-plugins-vpx SUBDIR += gstreamer1-plugins-x264 SUBDIR += gstreamer1-plugins-x265 SUBDIR += gstreamer1-qt SUBDIR += gstreamer1-rtsp-server SUBDIR += gstreamer1-transcoder SUBDIR += gstreamer1-vaapi SUBDIR += gstreamer1-validate SUBDIR += gstreamermm SUBDIR += gtk-recordmydesktop SUBDIR += gtk-youtube-viewer SUBDIR += gxine SUBDIR += handbrake SUBDIR += harvid SUBDIR += imagination SUBDIR += iriverter SUBDIR += iso2mkv SUBDIR += jmref SUBDIR += kaffeine SUBDIR += kamoso SUBDIR += kdemultimedia SUBDIR += kdemultimedia-ffmpegthumbs SUBDIR += kdenlive SUBDIR += kf5-kmediaplayer SUBDIR += kissdx SUBDIR += kmplayer SUBDIR += kodi SUBDIR += kodi-addon-peripheral-joystick SUBDIR += kodi-addon-pvr-hts SUBDIR += kodi-addon-pvr-iptvsimple SUBDIR += kodi-devel SUBDIR += kvazaar SUBDIR += l-smash SUBDIR += libaacs SUBDIR += libass SUBDIR += libav SUBDIR += libbdplus SUBDIR += libbluray SUBDIR += libcec SUBDIR += libdc1394 SUBDIR += libdca SUBDIR += libdcadec SUBDIR += libde265 SUBDIR += libdv SUBDIR += libdvbcsa SUBDIR += libdvbpsi SUBDIR += libdvdcss SUBDIR += libdvdnav SUBDIR += libdvdread SUBDIR += libfame SUBDIR += libhdhomerun SUBDIR += libkate SUBDIR += libmatroska SUBDIR += libmediaart SUBDIR += libmediainfo SUBDIR += libmpeg2 SUBDIR += libmpeg3 SUBDIR += libmtp SUBDIR += libquicktime SUBDIR += libquicktime-lame SUBDIR += libquvi SUBDIR += libquvi-scripts SUBDIR += libquvi-scripts09 SUBDIR += libquvi09 SUBDIR += librtmp SUBDIR += libsmacker SUBDIR += libtheora SUBDIR += libtuner SUBDIR += libuvc SUBDIR += libv4l SUBDIR += libva + SUBDIR += libva-glx SUBDIR += libva-intel-driver SUBDIR += libva-intel-hybrid-driver SUBDIR += libva-intel-media-driver SUBDIR += libva-utils SUBDIR += libva-vdpau-driver SUBDIR += libvdpau SUBDIR += libvdpau-va-gl SUBDIR += libvpx SUBDIR += libx264 SUBDIR += libxine SUBDIR += libxspf SUBDIR += libzen SUBDIR += linux-c6-libtheora SUBDIR += linux-c6-libv4l SUBDIR += linux-c7-libtheora SUBDIR += linux-c7-libv4l SUBDIR += linux-tsmuxer SUBDIR += linux_dvbwrapper-kmod SUBDIR += lives SUBDIR += livestreamer SUBDIR += lsdvd SUBDIR += lxdvdrip SUBDIR += m2tstoavi SUBDIR += m2vrequantiser SUBDIR += mediadownloader SUBDIR += mediainfo SUBDIR += mencoder SUBDIR += mimms SUBDIR += minitube SUBDIR += miro SUBDIR += mjpegtools SUBDIR += mjpg-streamer SUBDIR += mkclean SUBDIR += mkvalidator SUBDIR += mkvtoolnix SUBDIR += mkxvcd SUBDIR += mlt SUBDIR += mlt-qt4 SUBDIR += mlt-qt5 SUBDIR += mmpython SUBDIR += mmsclient SUBDIR += mmsrip SUBDIR += motion SUBDIR += mp3cd SUBDIR += mp4v2 SUBDIR += mpc-qt SUBDIR += mpeg2codec SUBDIR += mpeg2play SUBDIR += mpeg4ip SUBDIR += mpeg_encode SUBDIR += mpeg_play SUBDIR += mpeg_stat SUBDIR += mpgtx SUBDIR += mplayer SUBDIR += mplayer-skins SUBDIR += mplex SUBDIR += mps-youtube SUBDIR += mpv SUBDIR += msdl SUBDIR += msopenh264 SUBDIR += mswebrtc SUBDIR += musikcube SUBDIR += mxflib SUBDIR += mythtv SUBDIR += mythtv-frontend SUBDIR += naludump SUBDIR += nordlicht SUBDIR += nostt SUBDIR += obs-qtwebkit SUBDIR += obs-studio SUBDIR += oggvideotools SUBDIR += ogmrip SUBDIR += ogmtools SUBDIR += omxplayer SUBDIR += openh264 SUBDIR += openshot SUBDIR += oscam SUBDIR += p5-Audio-M4P SUBDIR += p5-FFmpeg-Command SUBDIR += p5-FLV-Info SUBDIR += p5-File-Format-RIFF SUBDIR += p5-GStreamer SUBDIR += p5-MP4-Info SUBDIR += p5-Net-UPnP SUBDIR += p5-Subtitles SUBDIR += p5-Umph-Prompt SUBDIR += pHash SUBDIR += phonon SUBDIR += phonon-designerplugin SUBDIR += phonon-gstreamer SUBDIR += phonon-vlc SUBDIR += phonon-xine SUBDIR += photofilmstrip SUBDIR += php-pHash SUBDIR += pitivi SUBDIR += playd SUBDIR += plexmediaserver SUBDIR += plexmediaserver-plexpass SUBDIR += plexwatch SUBDIR += podcastdl SUBDIR += poe SUBDIR += ppm2fli SUBDIR += projectx SUBDIR += ptx-kmod SUBDIR += pwcbsd SUBDIR += pwcview SUBDIR += py-PySceneDetect SUBDIR += py-av SUBDIR += py-cec SUBDIR += py-enzyme SUBDIR += py-flvlib SUBDIR += py-gstreamer SUBDIR += py-gstreamer1 SUBDIR += py-guessit SUBDIR += py-kaa-base SUBDIR += py-kaa-imlib2 SUBDIR += py-kaa-metadata SUBDIR += py-librtmp SUBDIR += py-mido SUBDIR += py-mlt SUBDIR += py-moviepy SUBDIR += py-openlp SUBDIR += py-periscope SUBDIR += py-pretty_midi SUBDIR += py-qt4-multimedia SUBDIR += py-qt4-phonon SUBDIR += py-qt5-multimedia SUBDIR += py-qt5-multimediawidgets SUBDIR += py-soco SUBDIR += py-subliminal SUBDIR += py-tvnamer SUBDIR += pymp SUBDIR += qmmp SUBDIR += qmmp-plugin-pack SUBDIR += qmmp-plugin-pack-qt5 SUBDIR += qmmp-qt5 SUBDIR += qt-faststart SUBDIR += qt4-mobility SUBDIR += qt4-multimedia SUBDIR += qt5-multimedia SUBDIR += quodlibet SUBDIR += quvi SUBDIR += quvi09 SUBDIR += rage SUBDIR += rav1e SUBDIR += recmpeg SUBDIR += recordmydesktop SUBDIR += replex SUBDIR += rox-videothumbnail SUBDIR += rtmpdump SUBDIR += rubygem-av SUBDIR += rubygem-clutter-gstreamer SUBDIR += rubygem-flvtool2 SUBDIR += rubygem-gstreamer SUBDIR += rubygem-paperclip-av-transcoder SUBDIR += rubygem-paperclip-av-transcoder-rails50 SUBDIR += rubygem-streamio-ffmpeg SUBDIR += sabbu SUBDIR += schroedinger SUBDIR += shotcut SUBDIR += simplescreenrecorder SUBDIR += smpeg SUBDIR += smpeg2 SUBDIR += smplayer SUBDIR += smplayer-skins SUBDIR += smplayer-themes SUBDIR += sms1xxx-kmod SUBDIR += smtube SUBDIR += snappy SUBDIR += spigot SUBDIR += spook SUBDIR += subtitlecomposer SUBDIR += subtitleeditor SUBDIR += subtitleoffsetmodifier SUBDIR += subtitleripper SUBDIR += subtools SUBDIR += svt-av1 SUBDIR += svt-hevc SUBDIR += svt-vp9 SUBDIR += swfdec-gnome SUBDIR += syncplay SUBDIR += szap-s2 SUBDIR += tautulli SUBDIR += tcmplex-panteltje SUBDIR += tivodecode SUBDIR += totem SUBDIR += totem-pl-parser SUBDIR += tovid SUBDIR += transcode SUBDIR += tstools SUBDIR += tvheadend SUBDIR += umph SUBDIR += umplayer SUBDIR += umr SUBDIR += v4l-utils SUBDIR += v4l_compat SUBDIR += vamps SUBDIR += vapoursynth SUBDIR += vapoursynth-l-smash-works SUBDIR += vcdgear SUBDIR += vcdimager SUBDIR += vcdpad SUBDIR += vdpauinfo SUBDIR += vdr SUBDIR += vdr-plugin-control SUBDIR += vdr-plugin-eepg SUBDIR += vdr-plugin-epgsearch SUBDIR += vdr-plugin-extrecmenu SUBDIR += vdr-plugin-femon SUBDIR += vdr-plugin-infosatepg SUBDIR += vdr-plugin-iptv SUBDIR += vdr-plugin-markad SUBDIR += vdr-plugin-osdpip SUBDIR += vdr-plugin-osdteletext SUBDIR += vdr-plugin-reelchannelscan SUBDIR += vdr-plugin-remote SUBDIR += vdr-plugin-skinenigmang SUBDIR += vdr-plugin-sleeptimer SUBDIR += vdr-plugin-softhddevice SUBDIR += vdr-plugin-streamdev SUBDIR += vdr-plugin-ttxtsubs SUBDIR += vdr-plugin-upnp SUBDIR += vdr-plugin-vdrmanager SUBDIR += vdr-plugin-vnsiserver SUBDIR += vdr-plugin-wirbelscan SUBDIR += vdr-plugin-xineliboutput SUBDIR += vdr-plugin-xvdr SUBDIR += vdr-plugins SUBDIR += vid.stab SUBDIR += vlc SUBDIR += vtkmpeg2encode SUBDIR += w_scan SUBDIR += webcamd SUBDIR += webcamoid SUBDIR += webvfx-qt5 SUBDIR += wf-recorder SUBDIR += win32-codecs SUBDIR += winff SUBDIR += x264 SUBDIR += x265 SUBDIR += xanim SUBDIR += xawtv SUBDIR += xfce4-parole SUBDIR += xine SUBDIR += xporthdmv SUBDIR += xvid SUBDIR += yamdi SUBDIR += zoneminder .include Index: head/multimedia/libva/Makefile =================================================================== --- head/multimedia/libva/Makefile (revision 495792) +++ head/multimedia/libva/Makefile (revision 495793) @@ -1,36 +1,43 @@ # $FreeBSD$ PORTNAME= libva PORTVERSION= 2.4.0 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org -COMMENT= VAAPI wrapper and dummy driver +COMMENT?= VAAPI wrapper and dummy driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libdrm.so:graphics/libdrm +LIB_DEPENDS+= libdrm.so:graphics/libdrm USES= meson pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel LDFLAGS+= -lpthread # for pthread_getthreadid_np -OPTIONS_DEFINE= WAYLAND X11 -OPTIONS_DEFAULT=WAYLAND X11 +OPTIONS_DEFINE= GLX WAYLAND X11 +OPTIONS_DEFAULT=GLX WAYLAND X11 +OPTIONS_EXCLUDE?=GLX # enslaved until subpackaging OPTIONS_SUB= yes +GLX_LIB_DEPENDS= libva-x11.so:multimedia/libva +GLX_USES= gl +GLX_USE= GL=gl +GLX_MESON_YES= with_glx +GLX_IMPLIES= X11 + WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_MESON_YES= with_wayland -X11_USES= gl -X11_USE= GL=gl XORG=x11,xorgproto,xext,xfixes -X11_MESON_YES= with_x11 with_glx +X11_USE= XORG=x11,xorgproto,xext,xfixes +X11_MESON_YES= with_x11 post-patch: .SILENT # V4L2 is unused since http://github.com/intel/libva/commit/70074679333c ${REINPLACE_CMD} '/videodev2\.h/d' ${WRKSRC}/va/va_backend.h .include Index: head/multimedia/libva/pkg-plist =================================================================== --- head/multimedia/libva/pkg-plist (revision 495792) +++ head/multimedia/libva/pkg-plist (revision 495793) @@ -1,51 +1,51 @@ include/va/va.h include/va/va_backend.h -%%X11%%include/va/va_backend_glx.h +%%GLX%%include/va/va_backend_glx.h include/va/va_backend_vpp.h %%WAYLAND%%include/va/va_backend_wayland.h include/va/va_compat.h include/va/va_dec_hevc.h include/va/va_dec_jpeg.h include/va/va_dec_vp8.h include/va/va_dec_vp9.h %%X11%%include/va/va_dri2.h %%X11%%include/va/va_dricommon.h include/va/va_drm.h include/va/va_drmcommon.h include/va/va_egl.h include/va/va_enc_h264.h include/va/va_enc_hevc.h include/va/va_enc_jpeg.h include/va/va_enc_mpeg2.h include/va/va_enc_vp8.h include/va/va_enc_vp9.h include/va/va_fei_h264.h include/va/va_fei_hevc.h include/va/va_fei.h -%%X11%%include/va/va_glx.h +%%GLX%%include/va/va_glx.h include/va/va_str.h include/va/va_tpi.h include/va/va_version.h include/va/va_vpp.h %%WAYLAND%%include/va/va_wayland.h %%X11%%include/va/va_x11.h lib/libva-drm.so lib/libva-drm.so.2 lib/libva-drm.so.2.400.0 -%%X11%%lib/libva-glx.so -%%X11%%lib/libva-glx.so.2 -%%X11%%lib/libva-glx.so.2.400.0 +%%GLX%%lib/libva-glx.so +%%GLX%%lib/libva-glx.so.2 +%%GLX%%lib/libva-glx.so.2.400.0 %%WAYLAND%%lib/libva-wayland.so %%WAYLAND%%lib/libva-wayland.so.2 %%WAYLAND%%lib/libva-wayland.so.2.400.0 %%X11%%lib/libva-x11.so %%X11%%lib/libva-x11.so.2 %%X11%%lib/libva-x11.so.2.400.0 lib/libva.so lib/libva.so.2 lib/libva.so.2.400.0 libdata/pkgconfig/libva-drm.pc -%%X11%%libdata/pkgconfig/libva-glx.pc +%%GLX%%libdata/pkgconfig/libva-glx.pc %%WAYLAND%%libdata/pkgconfig/libva-wayland.pc %%X11%%libdata/pkgconfig/libva-x11.pc libdata/pkgconfig/libva.pc Index: head/multimedia/libva-glx/Makefile =================================================================== --- head/multimedia/libva-glx/Makefile (nonexistent) +++ head/multimedia/libva-glx/Makefile (revision 495793) @@ -0,0 +1,16 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -glx + +COMMENT= VAAPI wrapper for GLX + +OPTIONS_SLAVE= GLX X11 +OPTIONS_EXCLUDE=WAYLAND + +MASTERDIR= ${.CURDIR}/../libva + +post-install: slave-post-install +slave-post-install: + @${REINPLACE_CMD} '/glx/!s/^/@comment /' ${TMPPLIST} + +.include "${MASTERDIR}/Makefile" Property changes on: head/multimedia/libva-glx/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/libxine/Makefile =================================================================== --- head/multimedia/libxine/Makefile (revision 495792) +++ head/multimedia/libxine/Makefile (revision 495793) @@ -1,147 +1,148 @@ # Created by: alex # $FreeBSD$ PORTNAME= xine PORTVERSION= 1.2.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION} PKGNAMEPREFIX= lib DISTNAME= ${PORTNAME}-lib-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Libraries for xine multimedia player LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= v4l_compat>=1.0.20100321:multimedia/v4l_compat LIB_DEPENDS= libFLAC.so:audio/flac \ liba52.so:audio/liba52 \ libvorbis.so:audio/libvorbis \ libspeex.so:audio/speex \ libmng.so:graphics/libmng \ libpng.so:graphics/png \ libdvdread.so:multimedia/libdvdread \ libfreetype.so:print/freetype2 \ libfame.so:multimedia/libfame \ libcdio_paranoia.so:sysutils/libcdio-paranoia \ libmodplug.so:audio/libmodplug \ libvcdinfo.so:multimedia/vcdimager \ libtheora.so:multimedia/libtheora \ libmad.so:audio/libmad \ libdca.so:multimedia/libdca \ libavcodec.so:multimedia/ffmpeg \ libfaad.so:audio/faad \ libvdpau.so:multimedia/libvdpau \ libvpx.so:multimedia/libvpx \ libiso9660.so:sysutils/libcdio \ libogg.so:audio/libogg \ libdvdnav.so:multimedia/libdvdnav USES= compiler cpe gmake gnome iconv libtool:keepla jpeg \ localbase pathfix perl5 pkgconfig tar:xz LLD_UNSAFE= yes CPE_PRODUCT= xine-lib CPE_VENDOR= xine GNU_CONFIGURE= yes USE_XORG= x11 xcb xv xinerama xext sm ice USE_GL= gl glu USE_PERL5= build USE_SDL= sdl USE_LDCONFIG= yes CONFIGURE_ARGS= --with-libflac \ --disable-real-codecs \ --disable-v4l \ --without-alsa \ --without-esound \ --disable-musepack MAKE_ENV= V=1 MAKE_ARGS= pkgdatadir="${DATADIR}" \ datadir="${DATADIR}" \ libdir="${PREFIX}/lib" CFLAGS_i386= -fomit-frame-pointer DOCSDIR= ${PREFIX}/share/doc/xine-lib # Please sync with XINE_PLUGINSDIR in multimedia/xine # and multimedia/vdr-plugin-xineliboutput PLUGINSDIR= lib/xine/plugins/2.7 PLIST_SUB= PLUGINSDIR="${PLUGINSDIR}" OPTIONS_DEFINE= DOCS NLS CACA DVB DMX_IMAGE IPV6 IMAGEMAGICK JACK \ GNOMEVFS2 PIXBUF PULSEAUDIO XVMC SMB SNDIO AALIB WAVPACK \ VAAPI LIBBLURAY OPTIONS_DEFAULT= DVB PIXBUF VAAPI OPTIONS_DEFINE_i386= W32DLL OPTIONS_DEFAULT_i386= W32DLL OPTIONS_SUB= yes DMX_IMAGE_DESC= DMX image plugin DVB_DESC= DVB plugin W32DLL_DESC= Win32 codec support AALIB_LIB_DEPENDS= libaa.so:graphics/aalib AALIB_CONFIGURE_ENABLE= aalib CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca CACA_CONFIGURE_WITH= caca DVB_CONFIGURE_ENABLE= dvb GNOMEVFS2_USE= GNOME=glib20,gconf2,gnomevfs2 GNOMEVFS2_CONFIGURE_ENABLE= gnomevfs IMAGEMAGICK_CONFIGURE_WITH= imagemagick IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 IMAGEMAGICK_IMPLIES= DMX_IMAGE IPV6_CONFIGURE_ENABLE= ipv6 JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_WITH= jack LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= bluray NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls PIXBUF_CONFIGURE_ENABLE= gdkpixbuf PIXBUF_IMPLIES= DMX_IMAGE PIXBUF_USE= GNOME=gdkpixbuf2,glib20 PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_WITH= pulseaudio SMB_USES= samba:lib SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \ LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}" SMB_CONFIGURE_ENABLE= samba SNDIO_CONFIGURE_ENABLE= sndio SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio -VAAPI_LIB_DEPENDS= libva.so:multimedia/libva +VAAPI_LIB_DEPENDS= libva.so:multimedia/libva \ + libva-glx.so:multimedia/libva-glx VAAPI_CONFIGURE_ENABLE= vaapi W32DLL_CONFIGURE_ENABLE= w32dll W32DLL_PLIST_FILES= ${PLUGINSDIR}/xineplug_decode_qt.so \ ${PLUGINSDIR}/xineplug_decode_w32dll.so WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WAVPACK_CONFIGURE_WITH= wavpack .if defined(WITH_NVIDIA304_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1) XVMC_CONFIGURE_WITH= xvmc-lib=XvMCNVIDIA XVMC_LIB_DEPENDS= libXvMCNVIDIA.so:x11/nvidia-driver-304 .else XVMC_CONFIGURE_WITH= xvmc-lib=XvMCW XVMC_LIB_DEPENDS= libXvMC.so:x11/libXvMC .endif XVMC_CONFIGURE_ENABLE= xvmc .include post-patch: .if ${COMPILER_TYPE} == "clang" @${REINPLACE_CMD} -e 's|-fno-rename-registers||' \ ${WRKSRC}/src/libw32dll/wine/Makefile.in .endif @${REINPLACE_CMD} -e 's|-ldl||' \ ${WRKSRC}/src/video_out/Makefile.in @${REINPLACE_CMD} -e "s|#define _ATOM QT_ATOM('', '', '', '')||" \ ${WRKSRC}/src/demuxers/demux_qt.c \ ${WRKSRC}/configure post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/post/*.so .include Index: head/multimedia/mythtv/Makefile =================================================================== --- head/multimedia/mythtv/Makefile (revision 495792) +++ head/multimedia/mythtv/Makefile (revision 495793) @@ -1,180 +1,181 @@ # Created by: Stacey Son , Ari Maniatis # $FreeBSD$ PORTNAME= mythtv DISTVERSIONPREFIX= v DISTVERSION= 30.0 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= multimedia MAINTAINER?= ports@FreeBSD.org COMMENT?= MythTV is a homebrew PVR project LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= liblzo2.so:archivers/lzo2 \ libmp3lame.so:audio/lame \ libsamplerate.so:audio/libsamplerate \ libtag.so:audio/taglib \ libexiv2.so:graphics/exiv2 \ libva.so:multimedia/libva \ + libva-glx.so:multimedia/libva-glx \ libbluray.so:multimedia/libbluray \ libass.so:multimedia/libass \ libfftw3_threads.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libfreetype.so:print/freetype2 \ libxml2.so:textproc/libxml2 BUILD_DEPENDS= yasm:devel/yasm \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto USES= gmake gl iconv libtool pkgconfig pathfix qmake:no_env qt:5 ssl USE_GITHUB= yes GH_ACCOUNT= MythTV USE_GL= gl USE_LDCONFIG= yes USE_QT= buildtools_build core dbus gui imageformats_run \ linguist_build network opengl qmake_build script sql \ sql-mysql_run webkit widgets xml USE_XORG= x11 xv xrandr xxf86vm xinerama xext xcb HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" \ --libxml2-path="${LOCALBASE}/include/libxml2" \ --enable-opengl-video \ --disable-audio-alsa --disable-indev=alsa \ --disable-outdev=alsa CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \ QTDIR="${PREFIX}" PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig" MAKE_ENV= QTDIR="${PREFIX}" \ QMAKESPEC="${QMAKESPEC}" NOPRECIOUSMAKEVARS= # don't override ARCH in ffmpeg makefiles DESTDIRNAME= INSTALL_ROOT CPPFLAGS+= ${QTCPPFLAGS} LDFLAGS+= -L${LOCALBASE}/lib REINPLACE_ARGS= -i "" WRKSRC_SUBDIR= ${PORTNAME} DESKTOP_ENTRIES="MythTV Frontend" "MythTV is a homebrew PVR project" "" \ "mythfrontend" "AudioVideo;Video;" false .if defined(SLAVEPORT) && ${SLAVEPORT} == "frontend" CONFLICTS_INSTALL= mythtv CONFIGURE_ARGS+=--disable-dvb --disable-firewire --disable-hdhomerun \ --disable-hdpvr --disable-ivtv --disable-v4l2 \ --without-bindings=perl,python,php EXTRA_PATCHES= ${FILESDIR}/extrapatch-programs_programs.pro OPTIONS_EXCLUDE+= BINDINGS LIRC MYSQL .else CONFLICTS_INSTALL= mythtv-frontend BUILD_DEPENDS+= v4l_compat>=1.0.20100321:multimedia/v4l_compat RUN_DEPENDS+= tv_check:textproc/p5-xmltv \ wget:ftp/wget USES+= perl5 python:2.7 shebangfix USE_PERL5= run build USE_RC_SUBR= mythbackend SHEBANG_FILES= programs/scripts/database/*.pl \ programs/scripts/internetcontent/*.py \ programs/scripts/internetcontent/*.pl \ programs/scripts/internetcontent/nv_python_libs/*.py \ programs/scripts/hardwareprofile/*.py \ programs/scripts/metadata/Television/ttvdb.py \ programs/scripts/metadata/Movie/tmdb3.py \ programs/scripts/metadata/Music/mbutils.py CONFIGURE_ARGS+=--dvb-path="${LOCALBASE}/include" \ --enable-ivtv --enable-v4l2 --enable-xv USERS= mythtv GROUPS= mythtv DATADIR= ${PREFIX}/share/mythtv SUB_FILES= pkg-message .endif OPTIONS_DEFINE= BINDINGS JACK LIRC MYSQL PULSEAUDIO VDPAU OPTIONS_DEFAULT= BINDINGS VDPAU OPTIONS_SUB= yes BINDINGS_DESC= Perl and Python bindings BINDINGS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:www/py-urlgrabber@${PY_FLAVOR} \ p5-DBI>=0:databases/p5-DBI \ p5-DBD-mysql>0:databases/p5-DBD-mysql \ p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \ p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \ p5-XML-Simple>=0:textproc/p5-XML-Simple \ p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \ p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined BINDINGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:www/py-urlgrabber@${PY_FLAVOR} \ p5-DBI>=0:databases/p5-DBI \ p5-DBD-mysql>0:databases/p5-DBD-mysql \ p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \ p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \ p5-XML-Simple>=0:textproc/p5-XML-Simple \ p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \ p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined BINDINGS_CONFIGURE_ON= --python=${PYTHON_CMD} BINDINGS_CONFIGURE_OFF= --without-bindings=perl,python JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ON= --enable-audio-jack --enable-indev=jack JACK_CONFIGURE_OFF= --disable-audio-jack --disable-indev=jack LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CONFIGURE_ENABLE= lirc MYSQL_DESC= Install MySQL server in addition to client MYSQL_USES= mysql:client,server MYSQL_USES_OFF= mysql PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= audio-pulse audio-pulseoutput VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/libs/libmythtv/libmythtv.pro \ ${WRKSRC}/bindings/perl/MythTV/Recording.pm \ ${WRKSRC}/programs/mythtranscode/external/replex/Makefile.standalone \ ${WRKSRC}/programs/scripts/database/mythconverg_backup.pl \ ${WRKSRC}/programs/scripts/database/mythconverg_restore.pl \ ${WRKSRC}/programs/mythcommflag/mythcommflag-analyze post-install: .if !defined(SLAVEPORT) @${MKDIR} ${STAGEDIR}${PREFIX}/share/mythtv/database ${INSTALL_DATA} ${WRKSRC}/database/mc.sql ${STAGEDIR}${PREFIX}/share/mythtv/database .endif @${FIND} ${STAGEDIR}${PREFIX}/bin -type f -exec ${SH} -c "${FILE} -i '{}' | \ ${GREP} -q 'x-executable; charset=binary'" \; -print | ${XARGS} ${STRIP_CMD} @(cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} lib/libmyth*.so lib/mythtv/filters/lib*.so) # Apply additional substitutions to pkg-plist generated by the 'makeplist' target create-plist: stage @(cd ${.CURDIR} && ${MAKE} makeplist > pkg-plist && \ ${REINPLACE_CMD} -E \ -e '1d' -e '/etc\/rc.d\/mythbackend/d' -e '/packlist/d' \ -e '/mythfrontend.desktop/d' \ -e '/(^%%PYTHON_SITELIBDIR%%|^%%SITE_PERL%%|mythpython|mythwikiscripts)/s|^|%%BINDINGS%%|g' \ pkg-plist) .include