Index: head/multimedia/Makefile =================================================================== --- head/multimedia/Makefile (revision 488412) +++ head/multimedia/Makefile (revision 488413) @@ -1,481 +1,482 @@ # $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 += dragon-kde4 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 += 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 += k9copy-kde4 SUBDIR += kaffeine SUBDIR += kamoso SUBDIR += kdemultimedia SUBDIR += kdemultimedia-ffmpegthumbs SUBDIR += kdemultimedia-ffmpegthumbs-kde4 SUBDIR += kdemultimedia-kde4 SUBDIR += kdemultimedia-mplayerthumbs-kde4 SUBDIR += kdenlive SUBDIR += kdenlive-kde4 SUBDIR += kf5-kmediaplayer SUBDIR += kissdx SUBDIR += kmplayer-kde4 SUBDIR += kodi SUBDIR += kodi-addon-peripheral-joystick SUBDIR += kodi-addon-pvr-hts SUBDIR += kodi-addon-pvr-iptvsimple SUBDIR += kodi-devel SUBDIR += kplayer-kde4 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-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 += 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 += pyjama 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 += subtitlecomposer-kde4 SUBDIR += subtitleeditor SUBDIR += subtitleoffsetmodifier SUBDIR += subtitleripper SUBDIR += subtools 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 += vlc-qt4 SUBDIR += vlc3 SUBDIR += vtkmpeg2encode SUBDIR += w_scan SUBDIR += webcamd SUBDIR += webcamoid SUBDIR += webvfx-qt5 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 SUBDIR += zoneminder-h264 .include Index: head/multimedia/cmrtlib/Makefile =================================================================== --- head/multimedia/cmrtlib/Makefile (nonexistent) +++ head/multimedia/cmrtlib/Makefile (revision 488413) @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= cmrtlib +DISTVERSIONPREFIX= intel-media- +DISTVERSION= 18.4.pre4-75 +DISTVERSIONSUFFIX= -g567da1b8 +CATEGORIES= multimedia + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= C for Media Runtime + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC:H}/LICENSE.md + +ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported + +LIB_DEPENDS= libva.so:multimedia/libva +RUN_DEPENDS= libva-intel-media-driver>=${PORTVERSION}:multimedia/libva-intel-media-driver + +USES= cmake compiler:c++11-lib pkgconfig +USE_GITHUB= yes +USE_LDCONFIG= yes +GH_ACCOUNT= intel +GH_PROJECT= media-driver +WRKSRC_SUBDIR= ${PORTNAME} + +.include Property changes on: head/multimedia/cmrtlib/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/cmrtlib/distinfo =================================================================== --- head/multimedia/cmrtlib/distinfo (nonexistent) +++ head/multimedia/cmrtlib/distinfo (revision 488413) @@ -0,0 +1,3 @@ +TIMESTAMP = 1545793660 +SHA256 (intel-media-driver-intel-media-18.4.pre4-75-g567da1b8_GH0.tar.gz) = 32ca85c64f809879d11e35ed04afdc53a83a7841a2cf895efab88c05e23cf7bf +SIZE (intel-media-driver-intel-media-18.4.pre4-75-g567da1b8_GH0.tar.gz) = 14559556 Property changes on: head/multimedia/cmrtlib/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/cmrtlib/files/patch-memalign =================================================================== --- head/multimedia/cmrtlib/files/patch-memalign (nonexistent) +++ head/multimedia/cmrtlib/files/patch-memalign (revision 488413) @@ -0,0 +1,35 @@ +memalign is Linux-specific, so use C11 aligned_alloc instead + +In file included from media_driver/agnostic/gen9_skl/codec/hal/codechal_fei_hevc_g9_skl.cpp:27: +In file included from media_driver/agnostic/gen9_skl/codec/hal/codechal_fei_hevc_g9_skl.h:35: +In file included from media_driver/agnostic/gen9_skl/codec/cmrt_kernel/CMRTKernel_header_file.h:30: +In file included from media_driver/agnostic/gen9_skl/codec/cmrt_kernel/CMRTKernel_DownScaling.h:30: +In file included from media_driver/agnostic/gen9_skl/codec/cmrt_kernel/CMRTKernelBase.h:33: +In file included from /usr/local/include/igfxcmrt/cm_rt.h:185: +In file included from /usr/local/include/igfxcmrt/cm_rt_def_os.h:39: +/usr/include/malloc.h:3:2: error: " has been replaced by " +#error " has been replaced by " + ^ +/usr/local/include/igfxcmrt/cm_rt_def_os.h:153:10: error: use of undeclared identifier 'memalign' + return memalign(alignment, size); + ^ + +--- linux/share/cm_rt_def_os.h.orig 2018-12-20 08:52:32 UTC ++++ linux/share/cm_rt_def_os.h +@@ -36,7 +36,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -150,7 +149,7 @@ template<> inline const char * CM_TYPE_NAME_UNMANGLED< + + inline void * CM_ALIGNED_MALLOC(size_t size, size_t alignment) + { +- return memalign(alignment, size); ++ return aligned_alloc(alignment, size); + } + + inline void CM_ALIGNED_FREE(void * memory) Property changes on: head/multimedia/cmrtlib/files/patch-memalign ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/cmrtlib/pkg-descr =================================================================== --- head/multimedia/cmrtlib/pkg-descr (nonexistent) +++ head/multimedia/cmrtlib/pkg-descr (revision 488413) @@ -0,0 +1,6 @@ +cmrtlib is a runtime library needed when user wants to execute their +own GPU kernels on render engine. It calls iHD media driver to load +the kernels and allocate the resources. It provides a set of APIs for +user to call directly from application. + +WWW: https://01.org/intel-media-for-linux Property changes on: head/multimedia/cmrtlib/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/cmrtlib/pkg-plist =================================================================== --- head/multimedia/cmrtlib/pkg-plist (nonexistent) +++ head/multimedia/cmrtlib/pkg-plist (revision 488413) @@ -0,0 +1,12 @@ +include/igfxcmrt/cm_hw_vebox_cmd_g10.h +include/igfxcmrt/cm_rt.h +include/igfxcmrt/cm_rt_api_os.h +include/igfxcmrt/cm_rt_def_os.h +include/igfxcmrt/cm_rt_extension.h +include/igfxcmrt/cm_rt_g10.h +include/igfxcmrt/cm_rt_g8.h +include/igfxcmrt/cm_rt_g9.h +lib/libigfxcmrt.so +lib/libigfxcmrt.so.7 +lib/libigfxcmrt.so.7.2.0 +libdata/pkgconfig/igfxcmrt.pc Property changes on: head/multimedia/cmrtlib/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/libva/Makefile =================================================================== --- head/multimedia/libva/Makefile (revision 488412) +++ head/multimedia/libva/Makefile (revision 488413) @@ -1,51 +1,54 @@ # $FreeBSD$ PORTNAME= libva PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia + +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= cf11abe5e1b9.patch:-p1 # for media-driver 18.4+ MAINTAINER= madpilot@FreeBSD.org COMMENT= VAAPI wrapper and dummy driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat RUN_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libdrm.so:graphics/libdrm USES= autoreconf gmake libtool localbase pkgconfig tar:bzip2 USE_XORG= xorgproto pciaccess x11 xext xfixes USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=va USE_LDCONFIG= yes INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= intel LDFLAGS+= -lpthread # prevent types conflict: videodev2.h vs. drm.h CFLAGS+= -DHAVE_LINUX_INTEGER_TYPES OPTIONS_DEFINE= DEBUG WAYLAND OPTIONS_DEFAULT=WAYLAND WAYLAND_DESC= Support wayland protocol OPTIONS_SUB= yes DEBUG_CFLAGS= -D_DEBUG DEBUG_CFLAGS_OFF= -DNDEBUG WAYLAND_CONFIGURE_ENABLE= wayland WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland post-patch: .SILENT ${REINPLACE_CMD} -e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \ ${WRKSRC}/configure.ac ${REINPLACE_CMD} '/^export VA_HEADER_/d' \ ${WRKSRC}/doc/Makefile.am ${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am .include Index: head/multimedia/libva/distinfo =================================================================== --- head/multimedia/libva/distinfo (revision 488412) +++ head/multimedia/libva/distinfo (revision 488413) @@ -1,3 +1,5 @@ TIMESTAMP = 1538516302 SHA256 (intel-libva-2.3.0_GH0.tar.gz) = 8d95e65c4d84d0f82097581e163d3770694c600cbb040ebd827f2d375e004f4b SIZE (intel-libva-2.3.0_GH0.tar.gz) = 222152 +SHA256 (cf11abe5e1b9.patch) = 1df514db32ae2bb49d556c561005315566e232e3ad0dbc82176f76285ef23c2b +SIZE (cf11abe5e1b9.patch) = 3301 Index: head/multimedia/libva-intel-media-driver/Makefile =================================================================== --- head/multimedia/libva-intel-media-driver/Makefile (revision 488412) +++ head/multimedia/libva-intel-media-driver/Makefile (revision 488413) @@ -1,50 +1,53 @@ # $FreeBSD$ PORTNAME= media-driver DISTVERSIONPREFIX= intel-media- -DISTVERSION= 18.3.0 -PORTREVISION= 3 +DISTVERSION= 18.4.pre4-75 +DISTVERSIONSUFFIX= -g567da1b8 CATEGORIES= multimedia PKGNAMEPREFIX= libva-intel- MAINTAINER= jbeich@FreeBSD.org COMMENT= Intel Media Driver for VAAPI LICENSE= MIT BSD3CLAUSE LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported +BUILD_DEPENDS= gmmlib>=${PORTVERSION:C/([^.]*\.[^.]).*/\1/}:multimedia/gmmlib \ + libva>=2.3.0_2:multimedia/libva LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \ libigdgmm.so:multimedia/gmmlib \ libva.so:multimedia/libva -USES= cmake compiler:c++11-lib pkgconfig +USES= cmake compiler:c++11-lib localbase pkgconfig USE_GITHUB= yes GH_ACCOUNT= intel ARCH_SUFX= ${ARCH:S/i386/32/:S/amd//:S/x86_//} -CMAKE_OFF= MEDIA_BUILD_FATAL_WARNINGS INSTALL_DRIVER_SYSCONF +CMAKE_OFF= MEDIA_BUILD_FATAL_WARNINGS BUILD_CMRTLIB CMAKE_ARGS= -DBUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ -DARCH:STRING="${ARCH_SUFX}" \ -DUFO_MARCH:STRING="${CPUTYPE}" -PLIST_FILES= lib/dri/iHD_drv_video.so \ - lib/igfxcmrt${ARCH_SUFX}.so +PLIST_FILES= lib/dri/iHD_drv_video.so OPTIONS_DEFINE= TEST # XXX Unbundle googletest TEST_CMAKE_BOOL= MEDIA_RUN_TEST_SUITE TEST_TEST_TARGET= RunULT post-patch: - @${REINPLACE_CMD} -e '/install.*igfxcmrt/s/64/${ARCH_SUFX}/' \ - ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e '/-D__linux__/d' \ ${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake + @if [ ${CHOSEN_COMPILER_TYPE} != gcc ]; then \ + ${REINPLACE_CMD} -i .gcc.bak '/-fno-tree-pre/d' \ + ${WRKSRC}/media_driver/cmake/linux/media_compile_flags_linux.cmake; \ + fi # Silence -Wmacro-redefined @${REINPLACE_CMD} -e '/__fastcall/d' \ ${WRKSRC}/media_driver/linux/common/cm/cm_mem_os.h .include Index: head/multimedia/libva-intel-media-driver/distinfo =================================================================== --- head/multimedia/libva-intel-media-driver/distinfo (revision 488412) +++ head/multimedia/libva-intel-media-driver/distinfo (revision 488413) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538429992 -SHA256 (intel-media-driver-intel-media-18.3.0_GH0.tar.gz) = df9af1cc796b4123508aacaf19d040cc5d8c5742c05199f45c9a3905ed8d1b52 -SIZE (intel-media-driver-intel-media-18.3.0_GH0.tar.gz) = 14422845 +TIMESTAMP = 1545793660 +SHA256 (intel-media-driver-intel-media-18.4.pre4-75-g567da1b8_GH0.tar.gz) = 32ca85c64f809879d11e35ed04afdc53a83a7841a2cf895efab88c05e23cf7bf +SIZE (intel-media-driver-intel-media-18.4.pre4-75-g567da1b8_GH0.tar.gz) = 14559556 Index: head/multimedia/libva-intel-media-driver/files/patch-i386-atomics =================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-i386-atomics (revision 488412) +++ head/multimedia/libva-intel-media-driver/files/patch-i386-atomics (nonexistent) @@ -1,22 +0,0 @@ -FreeBSD doesn't ship libatomic, so use __sync* builtins instead: - -media_driver/CMakeFiles/iHD_drv_video_OBJ.dir/linux/common/os/mos_context_specific.cpp.o: In function `OsContextSpecific::SetSliceCount(unsigned int*)': -media_driver/linux/common/os/mos_context_specific.cpp:441: undefined reference to `__atomic_load_8' -media_driver/linux/common/os/mos_context_specific.cpp:444: undefined reference to `__atomic_store_8' -c++: error: linker command failed with exit code 1 (use -v to see invocation) - -https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=220822 - ---- media_driver/linux/common/os/mos_context_specific.cpp.orig 2018-10-01 21:39:52 UTC -+++ media_driver/linux/common/os/mos_context_specific.cpp -@@ -437,6 +437,10 @@ void OsContextSpecific::SetSliceCount(uint32_t *pSlice - - for (int sliceCountShm = m_gtSystemInfo.SliceCount; sliceCountShm > 0; sliceCountShm--) - { -+#if defined(__clang__) && defined(__i386__) -+#define __atomic_load_n(ptr, order) __sync_fetch_and_add(ptr, 0) -+#define __atomic_store_n(ptr, val, order) __sync_swap(ptr, val) -+#endif - uint64_t* pTimestampShm = (uint64_t*)m_sseuShm + sliceCountShm; - uint64_t timestampShm = __atomic_load_n(pTimestampShm, __ATOMIC_SEQ_CST); - if (sliceNum == sliceCountShm) Property changes on: head/multimedia/libva-intel-media-driver/files/patch-i386-atomics ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libva-intel-media-driver/files/patch-fbres =================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-fbres (revision 488412) +++ head/multimedia/libva-intel-media-driver/files/patch-fbres (revision 488413) @@ -1,77 +1,77 @@ Get framebuffer resolution on more platforms media_driver/linux/common/codec/ddi/media_libva_decoder.cpp:48:10: fatal error: 'linux/fb.h' file not found #include ^~~~~~~~~~~~ media_driver/linux/common/codec/ddi/media_libva_decoder.cpp:55:43: error: variable has incomplete type 'struct fb_var_screeninfo' struct fb_var_screeninfo vsinfo; ^ media_driver/linux/common/codec/ddi/media_libva_decoder.cpp:62:22: error: use of undeclared identifier 'FBIOGET_VSCREENINFO' if(ioctl(fd, FBIOGET_VSCREENINFO, &vsinfo) < 0) ^ media_driver/linux/common/ddi/media_libva.cpp:39:10: fatal error: 'linux/fb.h' file not found #include ^~~~~~~~~~~~ --- media_driver/linux/common/codec/ddi/media_libva_decoder.cpp.orig 2018-10-01 21:39:52 UTC +++ media_driver/linux/common/codec/ddi/media_libva_decoder.cpp @@ -45,7 +45,39 @@ #include #endif +#if defined(__linux__) #include +#define DEFAULT_FBDEV "/dev/graphics/fb0" +#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__sun) +#include +# if defined(__sun) +#define DEFAULT_FBDEV "/dev/fb" +# else +#define DEFAULT_FBDEV "/dev/ttyv0" +# endif +#define FBIOGET_VSCREENINFO FBIOGTYPE +#define fb_var_screeninfo fbtype +#define xres fb_width +#define yres fb_height +#elif defined(__NetBSD__) || defined(__OpenBSD__) +#include +# if defined(__OpenBSD__) +#define DEFAULT_FBDEV "/dev/ttyC0" +# else +#define DEFAULT_FBDEV "/dev/ttyE0" +# endif +#define FBIOGET_VSCREENINFO WSDISPLAYIO_GINFO +#define fb_var_screeninfo wsdisplay_fbinfo +#define xres width +#define yres height +#else +#define DEFAULT_FBDEV "/dev/fb0" +#define FBIOGET_VSCREENINFO 0 +struct fb_var_screeninfo { + uint32_t xres; + uint32_t yres; +}; +#endif typedef MediaDdiFactory DdiDecodeFactory; static int32_t DdiDecode_GetDisplayInfo(VADriverContextP ctx) @@ -56,7 +88,7 @@ static int32_t DdiDecode_GetDisplayInfo(VADriverContex vsinfo.xres = 0; vsinfo.yres = 0; - fd = open("/dev/graphics/fb0",O_RDONLY); + fd = open(DEFAULT_FBDEV,O_RDONLY); if(fd > 0) { if(ioctl(fd, FBIOGET_VSCREENINFO, &vsinfo) < 0) ---- media_driver/linux/common/ddi/media_libva.cpp.orig 2018-10-01 21:39:52 UTC +--- media_driver/linux/common/ddi/media_libva.cpp.orig 2018-11-26 07:05:55 UTC +++ media_driver/linux/common/ddi/media_libva.cpp @@ -36,8 +36,6 @@ #include #endif -#include - + #include "media_libva.h" + #include "media_libva_util.h" - #include "media_libva_decoder.h" - #include "media_libva_encoder.h" Index: head/multimedia/libva-intel-media-driver/files/patch-glibc =================================================================== --- head/multimedia/libva-intel-media-driver/files/patch-glibc (revision 488412) +++ head/multimedia/libva-intel-media-driver/files/patch-glibc (revision 488413) @@ -1,52 +1,52 @@ makedev() is defined in on BSDs and on Solaris -mon/os/libdrm/xf86drm.c:50:10: fatal error: 'sys/sysmacros.h' file not found +media_driver/linux/common/os/i915/xf86drm.c:50:10: fatal error: 'sys/sysmacros.h' file not found #include ^~~~~~~~~~~~~~~~~ media_driver/linux/ult/libdrm_mock/xf86drm_mock.c:50:10: fatal error: 'sys/sysmacros.h' file not found #include ^~~~~~~~~~~~~~~~~ ---- media_driver/linux/common/os/libdrm/xf86drm.c.orig 2018-10-01 21:39:52 UTC -+++ media_driver/linux/common/os/libdrm/xf86drm.c +--- media_driver/linux/common/os/i915/xf86drm.c.orig 2018-10-01 21:39:52 UTC ++++ media_driver/linux/common/os/i915/xf86drm.c @@ -47,13 +47,15 @@ #include #include #include +#if defined(__GLIBC__) || defined(__linux__) #include +#endif #include #define stat_t struct stat #include #include #include -#ifdef HAVE_SYS_MKDEV_H +#ifdef __sun # include /* defines major(), minor(), and makedev() on Solaris */ #endif --- media_driver/linux/ult/libdrm_mock/xf86drm_mock.c.orig 2018-10-01 21:39:52 UTC +++ media_driver/linux/ult/libdrm_mock/xf86drm_mock.c @@ -47,16 +47,20 @@ #include #include #include +#if defined(__GLIBC__) || defined(__linux__) #include +#endif #include #define stat_t struct stat #include #include #include -#ifdef HAVE_SYS_MKDEV_H +#ifdef __sun # include /* defines major(), minor(), and makedev() on Solaris */ #endif +#if defined(__GLIBC__) || defined(__linux__) #include +#endif /* Not all systems have MAP_FAILED defined */ #ifndef MAP_FAILED