Index: head/multimedia/Makefile =================================================================== --- head/multimedia/Makefile (revision 505287) +++ head/multimedia/Makefile (revision 505288) @@ -1,467 +1,468 @@ # $FreeBSD$ # COMMENT = Multimedia software SUBDIR += Bento4 SUBDIR += QtAV SUBDIR += ab25 SUBDIR += acidrip SUBDIR += aegisub SUBDIR += aom SUBDIR += aravis 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 += 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 += ffaudioconverter SUBDIR += ffdec SUBDIR += ffmpeg 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 += 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 += 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-svt-av1 SUBDIR += gstreamer1-plugins-svt-hevc SUBDIR += gstreamer1-plugins-svt-vp9 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-inputstream.adaptive-devel SUBDIR += kodi-addon-peripheral-joystick SUBDIR += kodi-addon-pvr-hts SUBDIR += kodi-addon-pvr-iptvsimple SUBDIR += kodi-addon-vfs.libarchive-devel 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 += libopenshot 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 += mediainfo SUBDIR += mencoder SUBDIR += mimms SUBDIR += minitube SUBDIR += mjpegtools SUBDIR += mjpg-streamer SUBDIR += mkclean SUBDIR += mkvalidator SUBDIR += mkvtoolnix SUBDIR += mkxvcd SUBDIR += mlt SUBDIR += mlt-qt5 SUBDIR += mmpython SUBDIR += mmsclient SUBDIR += mmsrip SUBDIR += motion SUBDIR += mp3cd SUBDIR += mp4v2 SUBDIR += mpc-qt SUBDIR += mpeg2codec SUBDIR += mpeg2play 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 += olive 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 += peek SUBDIR += phonon SUBDIR += phonon-designerplugin SUBDIR += phonon-gstreamer SUBDIR += phonon-vlc 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-ffmpeg-python 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-qt5-multimedia SUBDIR += py-qt5-multimediawidgets SUBDIR += py-soco SUBDIR += py-subliminal SUBDIR += py-tvnamer SUBDIR += pymp SUBDIR += qmmp-plugin-pack-qt5 SUBDIR += qmmp-qt5 SUBDIR += qt-faststart 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 += subsync 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 += umr SUBDIR += ustreamer 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-streamdev SUBDIR += vdr-plugin-ttxtsubs 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/libopenshot/Makefile =================================================================== --- head/multimedia/libopenshot/Makefile (nonexistent) +++ head/multimedia/libopenshot/Makefile (revision 505288) @@ -0,0 +1,42 @@ +# $FreeBSD$ + +PORTNAME= libopenshot +DISTVERSIONPREFIX= v +DISTVERSION= 0.2.3-178 +DISTVERSIONSUFFIX= -g17a2258 +CATEGORIES= multimedia + +MAINTAINER= tatsuki_makino@hotmail.com +COMMENT= OpenShot Video Library + +LICENSE= LGPL3+ +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= swig3.0:devel/swig30 \ + unittest-cpp>=0:devel/unittest-cpp \ + ${LOCALBASE}/include/zmq.hpp:net/cppzmq +LIB_DEPENDS= libopenshot-audio.so:audio/libopenshot-audio \ + libjsoncpp.so:devel/jsoncpp \ + libomp.so:devel/openmp \ + libzmq.so:net/libzmq4 + +USES= cmake compiler:c++11-lang pkgconfig python:3.5+ qt:5 +USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= OpenShot +USE_PYTHON= noflavors +USE_QT= core gui network multimedia widgets qmake_build buildtools_build + +CMAKE_ON= USE_SYSTEM_JSONCPP \ + DISABLE_TESTS \ + CMAKE_DISABLE_FIND_PACKAGE_Doxygen \ + CMAKE_DISABLE_FIND_PACKAGE_ImageMagick \ + CMAKE_DISABLE_FIND_PACKAGE_RESVG \ + CMAKE_DISABLE_FIND_PACKAGE_Ruby +OPTIONS_DEFAULT= FFMPEG +OPTIONS_SINGLE= LIBAVCODEC +OPTIONS_SINGLE_LIBAVCODEC= FFMPEG LIBAV +FFMPEG_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg +LIBAV_LIB_DEPENDS= libavformat.so:multimedia/libav + +.include Property changes on: head/multimedia/libopenshot/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/libopenshot/distinfo =================================================================== --- head/multimedia/libopenshot/distinfo (nonexistent) +++ head/multimedia/libopenshot/distinfo (revision 505288) @@ -0,0 +1,3 @@ +TIMESTAMP = 1557457200 +SHA256 (OpenShot-libopenshot-v0.2.3-178-g17a2258_GH0.tar.gz) = c0b59d59a12a40c0f8723ce77f5cfff745e4f8cab31664223d26822320845df9 +SIZE (OpenShot-libopenshot-v0.2.3-178-g17a2258_GH0.tar.gz) = 10266083 Property changes on: head/multimedia/libopenshot/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/libopenshot/files/patch-src_CMakeLists.txt =================================================================== --- head/multimedia/libopenshot/files/patch-src_CMakeLists.txt (nonexistent) +++ head/multimedia/libopenshot/files/patch-src_CMakeLists.txt (revision 505288) @@ -0,0 +1,19 @@ +--- src/CMakeLists.txt.orig 2019-05-08 19:16:50 UTC ++++ src/CMakeLists.txt +@@ -45,6 +45,8 @@ IF (APPLE) + SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES "-framework Carbon -framework Cocoa -framework CoreFoundation -framework CoreAudio -framework CoreMidi -framework IOKit -framework AGL -framework AudioToolbox -framework QuartzCore -lobjc -framework Accelerate") + ENDIF(APPLE) + ++find_library(EXECINFO_LIBRARY NAMES execinfo) ++ + ################ IMAGE MAGICK ################## + # Set the Quantum Depth that ImageMagick was built with (default to 16 bits) + IF (MAGICKCORE_QUANTUM_DEPTH) +@@ -312,6 +314,7 @@ SET ( REQUIRED_LIBRARIES + ${PROFILER} + ${JSONCPP_LIBRARY} + ${ZMQ_LIBRARIES} ++ ${EXECINFO_LIBRARY} + ) + + IF (AVCODEC_FOUND) Property changes on: head/multimedia/libopenshot/files/patch-src_CMakeLists.txt ___________________________________________________________________ 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/libopenshot/files/patch-src_FFmpegReader.cpp =================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp (nonexistent) +++ head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp (revision 505288) @@ -0,0 +1,35 @@ +--- src/FFmpegReader.cpp.orig 2019-05-08 19:16:50 UTC ++++ src/FFmpegReader.cpp +@@ -159,7 +159,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon + + for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) { + switch (*p) { +-#if defined(__linux__) ++#if defined(__unix__) + // Linux pix formats + case AV_PIX_FMT_VAAPI: + hw_de_av_pix_fmt_global = AV_PIX_FMT_VAAPI; +@@ -312,7 +312,7 @@ void FFmpegReader::Open() { + pCodecCtx->get_format = get_hw_dec_format; + + if (adapter_num < 3 && adapter_num >=0) { +-#if defined(__linux__) ++#if defined(__unix__) + snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128); + adapter_ptr = adapter; + i_decoder_hw = openshot::Settings::Instance()->HARDWARE_DECODER; +@@ -375,11 +375,13 @@ void FFmpegReader::Open() { + } + + // Check if it is there and writable +-#if defined(__linux__) ++#if defined(__unix__) + if( adapter_ptr != NULL && access( adapter_ptr, W_OK ) == 0 ) { + #elif defined(_WIN32) + if( adapter_ptr != NULL ) { + #elif defined(__APPLE__) ++ if( adapter_ptr != NULL ) { ++#else + if( adapter_ptr != NULL ) { + #endif + ZmqLogger::Instance()->AppendDebugMethod("Decode Device present using device", "", -1, "", -1, "", -1, "", -1, "", -1, "", -1); Property changes on: head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp ___________________________________________________________________ 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/libopenshot/files/patch-src_FFmpegWriter.cpp =================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (nonexistent) +++ head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (revision 505288) @@ -0,0 +1,61 @@ +--- src/FFmpegWriter.cpp.orig 2019-05-08 19:16:50 UTC ++++ src/FFmpegWriter.cpp +@@ -166,7 +166,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str + AVCodec *new_codec; + // Check if the codec selected is a hardware accelerated codec + #if IS_FFMPEG_3_2 +- #if defined(__linux__) ++#if defined(__unix__) + if ( (strcmp(codec.c_str(),"h264_vaapi") == 0)) { + new_codec = avcodec_find_encoder_by_name(codec.c_str()); + hw_en_on = 1; +@@ -225,7 +225,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str + } + #else // is FFmpeg 3 but not linux + new_codec = avcodec_find_encoder_by_name(codec.c_str()); +-#endif //__linux__ ++#endif //__unix__ + #else // not ffmpeg 3 + new_codec = avcodec_find_encoder_by_name(codec.c_str()); + #endif //IS_FFMPEG_3_2 +@@ -888,7 +888,7 @@ void FFmpegWriter::close_video(AVFormatContext *oc, AV + AV_FREE_CONTEXT(video_codec); + video_codec = NULL; + #if IS_FFMPEG_3_2 +- // #if defined(__linux__) ++ // #if defined(__unix__) + if (hw_en_on && hw_en_supported) { + if (hw_device_ctx) { + av_buffer_unref(&hw_device_ctx); +@@ -1290,7 +1290,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS + adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET; + fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num); + if (adapter_num < 3 && adapter_num >=0) { +-#if defined(__linux__) ++#if defined(__unix__) + snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128); + // Maybe 127 is better because the first card would be 1?! + adapter_ptr = adapter; +@@ -1298,17 +1298,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS + adapter_ptr = NULL; + #elif defined(__APPLE__) + adapter_ptr = NULL; ++#else ++ adapter_ptr = NULL; + #endif + } + else { + adapter_ptr = NULL; // Just to be sure + } + // Check if it is there and writable +-#if defined(__linux__) ++#if defined(__unix__) + if( adapter_ptr != NULL && access( adapter_ptr, W_OK ) == 0 ) { + #elif defined(_WIN32) + if( adapter_ptr != NULL ) { + #elif defined(__APPLE__) ++ if( adapter_ptr != NULL ) { ++#else + if( adapter_ptr != NULL ) { + #endif + ZmqLogger::Instance()->AppendDebugMethod("Encode Device present using device", "", -1, "", -1, "", -1, "", -1, "", -1, "", -1); Property changes on: head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp ___________________________________________________________________ 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/libopenshot/pkg-descr =================================================================== --- head/multimedia/libopenshot/pkg-descr (nonexistent) +++ head/multimedia/libopenshot/pkg-descr (revision 505288) @@ -0,0 +1,5 @@ +OpenShot Video Library (libopenshot) is a free, open-source project dedicated +to delivering high quality video editing, animation, and playback solutions to +the world. API currently supports C++, Python, and Ruby. + +WWW: https://www.openshot.org/ Property changes on: head/multimedia/libopenshot/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/libopenshot/pkg-plist =================================================================== --- head/multimedia/libopenshot/pkg-plist (nonexistent) +++ head/multimedia/libopenshot/pkg-plist (revision 505288) @@ -0,0 +1,77 @@ +include/libopenshot/AudioBufferSource.h +include/libopenshot/AudioDeviceInfo.h +include/libopenshot/AudioReaderSource.h +include/libopenshot/AudioResampler.h +include/libopenshot/CacheBase.h +include/libopenshot/CacheDisk.h +include/libopenshot/CacheMemory.h +include/libopenshot/ChannelLayouts.h +include/libopenshot/ChunkReader.h +include/libopenshot/ChunkWriter.h +include/libopenshot/Clip.h +include/libopenshot/ClipBase.h +include/libopenshot/Color.h +include/libopenshot/Coordinate.h +include/libopenshot/CrashHandler.h +include/libopenshot/DecklinkInput.h +include/libopenshot/DecklinkOutput.h +include/libopenshot/DecklinkReader.h +include/libopenshot/DecklinkWriter.h +include/libopenshot/DummyReader.h +include/libopenshot/EffectBase.h +include/libopenshot/EffectInfo.h +include/libopenshot/Effects.h +include/libopenshot/Enums.h +include/libopenshot/Exceptions.h +include/libopenshot/FFmpegReader.h +include/libopenshot/FFmpegUtilities.h +include/libopenshot/FFmpegWriter.h +include/libopenshot/Fraction.h +include/libopenshot/Frame.h +include/libopenshot/FrameMapper.h +include/libopenshot/ImageReader.h +include/libopenshot/ImageWriter.h +include/libopenshot/Json.h +include/libopenshot/KeyFrame.h +include/libopenshot/OpenMPUtilities.h +include/libopenshot/OpenShot.h +include/libopenshot/PlayerBase.h +include/libopenshot/Point.h +include/libopenshot/Profiles.h +include/libopenshot/Qt/AudioPlaybackThread.h +include/libopenshot/Qt/PlayerDemo.h +include/libopenshot/Qt/PlayerPrivate.h +include/libopenshot/Qt/VideoCacheThread.h +include/libopenshot/Qt/VideoPlaybackThread.h +include/libopenshot/Qt/VideoRenderWidget.h +include/libopenshot/Qt/VideoRenderer.h +include/libopenshot/QtImageReader.h +include/libopenshot/QtPlayer.h +include/libopenshot/ReaderBase.h +include/libopenshot/RendererBase.h +include/libopenshot/Settings.h +include/libopenshot/Tests.h +include/libopenshot/TextReader.h +include/libopenshot/Timeline.h +include/libopenshot/Version.h +include/libopenshot/WriterBase.h +include/libopenshot/ZmqLogger.h +include/libopenshot/effects/Bars.h +include/libopenshot/effects/Blur.h +include/libopenshot/effects/Brightness.h +include/libopenshot/effects/ChromaKey.h +include/libopenshot/effects/ColorShift.h +include/libopenshot/effects/Crop.h +include/libopenshot/effects/Deinterlace.h +include/libopenshot/effects/Hue.h +include/libopenshot/effects/Mask.h +include/libopenshot/effects/Negate.h +include/libopenshot/effects/Pixelate.h +include/libopenshot/effects/Saturation.h +include/libopenshot/effects/Shift.h +include/libopenshot/effects/Wave.h +lib/libopenshot.so +lib/libopenshot.so.0.2.3 +lib/libopenshot.so.17 +%%PYTHON_SITELIBDIR%%/_openshot.so +%%PYTHON_SITELIBDIR%%/openshot.py Property changes on: head/multimedia/libopenshot/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