Date: Wed, 28 Sep 2016 12:37:19 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422866 - in head/multimedia/obs-studio: . files Message-ID: <201609281237.u8SCbJK7045357@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Wed Sep 28 12:37:19 2016 New Revision: 422866 URL: https://svnweb.freebsd.org/changeset/ports/422866 Log: Update to 0.16.0. Added: head/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp (contents, props changed) head/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp (contents, props changed) head/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h (contents, props changed) Deleted: head/multimedia/obs-studio/files/patch-obs_window-basic-main.cpp head/multimedia/obs-studio/files/patch-obs_window-basic-preview.cpp Modified: head/multimedia/obs-studio/Makefile head/multimedia/obs-studio/distinfo head/multimedia/obs-studio/pkg-plist Modified: head/multimedia/obs-studio/Makefile ============================================================================== --- head/multimedia/obs-studio/Makefile Wed Sep 28 11:48:46 2016 (r422865) +++ head/multimedia/obs-studio/Makefile Wed Sep 28 12:37:19 2016 (r422866) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= obs-studio -PORTVERSION= 0.15.2 -PORTREVISION= 1 +PORTVERSION= 0.16.0 CATEGORIES= multimedia MAINTAINER= ports@FreeBSD.org Modified: head/multimedia/obs-studio/distinfo ============================================================================== --- head/multimedia/obs-studio/distinfo Wed Sep 28 11:48:46 2016 (r422865) +++ head/multimedia/obs-studio/distinfo Wed Sep 28 12:37:19 2016 (r422866) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470668729 -SHA256 (jp9000-obs-studio-0.15.2_GH0.tar.gz) = b55ed2804699c919833ed52fce231d3f1f6c470809fe3af8c60f53ca58405d22 -SIZE (jp9000-obs-studio-0.15.2_GH0.tar.gz) = 3457076 +TIMESTAMP = 1475054530 +SHA256 (jp9000-obs-studio-0.16.0_GH0.tar.gz) = 15506793a4303315d26bf94350ae6e9b823830e24335b0cd7c2a945c75ebc74e +SIZE (jp9000-obs-studio-0.16.0_GH0.tar.gz) = 4977868 Added: head/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp Wed Sep 28 12:37:19 2016 (r422866) @@ -0,0 +1,13 @@ +--- UI/window-basic-main.cpp.orig 2016-09-28 09:24:18 UTC ++++ UI/window-basic-main.cpp +@@ -1930,6 +1930,10 @@ void trigger_sparkle_update(); + + void OBSBasic::TimedCheckForUpdates() + { ++#ifdef __FreeBSD__ ++ // Update check seg faults on FreeBSD ++ return; ++#endif + #ifdef UPDATE_SPARKLE + init_sparkle_updater(config_get_bool(App()->GlobalConfig(), "General", + "UpdateToUndeployed")); Added: head/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp Wed Sep 28 12:37:19 2016 (r422866) @@ -0,0 +1,69 @@ +--- UI/window-basic-preview.cpp.orig 2016-09-28 09:26:01 UTC ++++ UI/window-basic-preview.cpp +@@ -407,8 +407,8 @@ void OBSBasicPreview::mousePressEvent(QM + GetStretchHandleData(startPos); + + vec2_divf(&startPos, &startPos, main->previewScale / pixelRatio); +- startPos.x = std::round(startPos.x); +- startPos.y = std::round(startPos.y); ++ startPos.x = ::round(startPos.x); ++ startPos.y = ::round(startPos.y); + + mouseOverItems = SelectedAtPos(startPos); + vec2_zero(&lastMoveOffset); +@@ -702,8 +702,8 @@ void OBSBasicPreview::ClampAspect(vec3 & + size.y = size.x / baseAspect; + } + +- size.x = std::round(size.x); +- size.y = std::round(size.y); ++ size.x = ::round(size.x); ++ size.y = ::round(size.y); + + if (stretchFlags & ITEM_LEFT) + tl.x = br.x - size.x; +@@ -849,18 +849,18 @@ void OBSBasicPreview::CropItem(const vec + crop = startCrop; + + if (stretchFlags & ITEM_LEFT) +- crop.left += int(std::round(tl.x / scale.x)); ++ crop.left += int(::round(tl.x / scale.x)); + else if (stretchFlags & ITEM_RIGHT) +- crop.right += int(std::round((stretchItemSize.x - br.x) / scale.x)); ++ crop.right += int(::round((stretchItemSize.x - br.x) / scale.x)); + + if (stretchFlags & ITEM_TOP) +- crop.top += int(std::round(tl.y / scale.y)); ++ crop.top += int(::round(tl.y / scale.y)); + else if (stretchFlags & ITEM_BOTTOM) +- crop.bottom += int(std::round((stretchItemSize.y - br.y) / scale.y)); ++ crop.bottom += int(::round((stretchItemSize.y - br.y) / scale.y)); + + vec3_transform(&newPos, &newPos, &itemToScreen); +- newPos.x = std::round(newPos.x); +- newPos.y = std::round(newPos.y); ++ newPos.x = ::round(newPos.x); ++ newPos.y = ::round(newPos.y); + + #if 0 + vec3 curPos; +@@ -945,7 +945,7 @@ void OBSBasicPreview::StretchItem(const + vec3_transform(&pos3, &pos3, &itemToScreen); + + vec2 newPos; +- vec2_set(&newPos, std::round(pos3.x), std::round(pos3.y)); ++ vec2_set(&newPos, ::round(pos3.x), ::round(pos3.y)); + obs_sceneitem_set_pos(stretchItem, &newPos); + } + +@@ -963,8 +963,8 @@ void OBSBasicPreview::mouseMoveEvent(QMo + mouseOverItems = SelectedAtPos(startPos); + } + +- pos.x = std::round(pos.x); +- pos.y = std::round(pos.y); ++ pos.x = ::round(pos.x); ++ pos.y = ::round(pos.y); + + if (stretchHandle != ItemHandle::None) { + if (cropping) Added: head/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h Wed Sep 28 12:37:19 2016 (r422866) @@ -0,0 +1,10 @@ +--- plugins/obs-outputs/net-if.h.orig 2016-09-28 11:25:11 UTC ++++ plugins/obs-outputs/net-if.h +@@ -48,6 +48,7 @@ + # undef ___NET_IF_GNU_SOURCE__ + # undef _GNU_SOURCE + # endif ++# include <netinet/in.h> + # endif + + #endif Modified: head/multimedia/obs-studio/pkg-plist ============================================================================== --- head/multimedia/obs-studio/pkg-plist Wed Sep 28 11:48:46 2016 (r422865) +++ head/multimedia/obs-studio/pkg-plist Wed Sep 28 12:37:19 2016 (r422866) @@ -84,6 +84,7 @@ lib/cmake/LibObs/LibObsConfig.cmake lib/cmake/LibObs/LibObsConfigVersion.cmake lib/cmake/LibObs/LibObsTarget-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/LibObs/LibObsTarget.cmake +lib/libobs-frontend-api.so lib/libobs-opengl.so lib/libobs-opengl.so.0 lib/libobs-opengl.so.0.0 @@ -157,6 +158,7 @@ share/obs/obs-plugins/image-source/local share/obs/obs-plugins/image-source/locale/sv-SE.ini share/obs/obs-plugins/image-source/locale/th-TH.ini share/obs/obs-plugins/image-source/locale/tr-TR.ini +share/obs/obs-plugins/image-source/locale/uk-UA.ini share/obs/obs-plugins/image-source/locale/zh-CN.ini share/obs/obs-plugins/image-source/locale/zh-TW.ini share/obs/obs-plugins/linux-capture/locale/ar-SA.ini @@ -191,6 +193,7 @@ share/obs/obs-plugins/linux-capture/loca share/obs/obs-plugins/linux-capture/locale/sr-SP.ini share/obs/obs-plugins/linux-capture/locale/sv-SE.ini share/obs/obs-plugins/linux-capture/locale/tr-TR.ini +share/obs/obs-plugins/linux-capture/locale/uk-UA.ini share/obs/obs-plugins/linux-capture/locale/zh-CN.ini share/obs/obs-plugins/linux-capture/locale/zh-TW.ini share/obs/obs-plugins/linux-jack/locale/ar-SA.ini @@ -225,6 +228,7 @@ share/obs/obs-plugins/linux-jack/locale/ share/obs/obs-plugins/linux-jack/locale/sr-SP.ini share/obs/obs-plugins/linux-jack/locale/sv-SE.ini share/obs/obs-plugins/linux-jack/locale/tr-TR.ini +share/obs/obs-plugins/linux-jack/locale/uk-UA.ini share/obs/obs-plugins/linux-jack/locale/zh-CN.ini share/obs/obs-plugins/linux-jack/locale/zh-TW.ini share/obs/obs-plugins/linux-pulseaudio/locale/ar-SA.ini @@ -260,6 +264,7 @@ share/obs/obs-plugins/linux-pulseaudio/l share/obs/obs-plugins/linux-pulseaudio/locale/sv-SE.ini share/obs/obs-plugins/linux-pulseaudio/locale/th-TH.ini share/obs/obs-plugins/linux-pulseaudio/locale/tr-TR.ini +share/obs/obs-plugins/linux-pulseaudio/locale/uk-UA.ini share/obs/obs-plugins/linux-pulseaudio/locale/zh-CN.ini share/obs/obs-plugins/linux-pulseaudio/locale/zh-TW.ini share/obs/obs-plugins/linux-v4l2/locale/ar-SA.ini @@ -332,6 +337,7 @@ share/obs/obs-plugins/obs-ffmpeg/locale/ share/obs/obs-plugins/obs-ffmpeg/locale/sv-SE.ini share/obs/obs-plugins/obs-ffmpeg/locale/th-TH.ini share/obs/obs-plugins/obs-ffmpeg/locale/tr-TR.ini +share/obs/obs-plugins/obs-ffmpeg/locale/uk-UA.ini share/obs/obs-plugins/obs-ffmpeg/locale/zh-CN.ini share/obs/obs-plugins/obs-ffmpeg/locale/zh-TW.ini share/obs/obs-plugins/obs-filters/blend_add_filter.effect @@ -372,6 +378,7 @@ share/obs/obs-plugins/obs-filters/locale share/obs/obs-plugins/obs-filters/locale/sr-SP.ini share/obs/obs-plugins/obs-filters/locale/sv-SE.ini share/obs/obs-plugins/obs-filters/locale/tr-TR.ini +share/obs/obs-plugins/obs-filters/locale/uk-UA.ini share/obs/obs-plugins/obs-filters/locale/zh-CN.ini share/obs/obs-plugins/obs-filters/locale/zh-TW.ini share/obs/obs-plugins/obs-filters/mask_alpha_filter.effect @@ -409,6 +416,7 @@ share/obs/obs-plugins/obs-libfdk/locale/ share/obs/obs-plugins/obs-libfdk/locale/sv-SE.ini share/obs/obs-plugins/obs-libfdk/locale/th-TH.ini share/obs/obs-plugins/obs-libfdk/locale/tr-TR.ini +share/obs/obs-plugins/obs-libfdk/locale/uk-UA.ini share/obs/obs-plugins/obs-libfdk/locale/zh-CN.ini share/obs/obs-plugins/obs-libfdk/locale/zh-TW.ini share/obs/obs-plugins/obs-outputs/locale/ar-SA.ini @@ -477,8 +485,45 @@ share/obs/obs-plugins/obs-transitions/lo share/obs/obs-plugins/obs-transitions/locale/sr-SP.ini share/obs/obs-plugins/obs-transitions/locale/sv-SE.ini share/obs/obs-plugins/obs-transitions/locale/tr-TR.ini +share/obs/obs-plugins/obs-transitions/locale/uk-UA.ini share/obs/obs-plugins/obs-transitions/locale/zh-CN.ini share/obs/obs-plugins/obs-transitions/locale/zh-TW.ini +share/obs/obs-plugins/obs-transitions/luma_wipe_transition.effect +share/obs/obs-plugins/obs-transitions/luma_wipes/barndoor-botleft.png +share/obs/obs-plugins/obs-transitions/luma_wipes/barndoor-h.png +share/obs/obs-plugins/obs-transitions/luma_wipes/barndoor-topleft.png +share/obs/obs-plugins/obs-transitions/luma_wipes/barndoor-v.png +share/obs/obs-plugins/obs-transitions/luma_wipes/blinds-h.png +share/obs/obs-plugins/obs-transitions/luma_wipes/box-botleft.png +share/obs/obs-plugins/obs-transitions/luma_wipes/box-botright.png +share/obs/obs-plugins/obs-transitions/luma_wipes/box-topleft.png +share/obs/obs-plugins/obs-transitions/luma_wipes/box-topright.png +share/obs/obs-plugins/obs-transitions/luma_wipes/burst.png +share/obs/obs-plugins/obs-transitions/luma_wipes/checkerboard-small.png +share/obs/obs-plugins/obs-transitions/luma_wipes/circles.png +share/obs/obs-plugins/obs-transitions/luma_wipes/clock.png +share/obs/obs-plugins/obs-transitions/luma_wipes/cloud.png +share/obs/obs-plugins/obs-transitions/luma_wipes/curtain.png +share/obs/obs-plugins/obs-transitions/luma_wipes/fan.png +share/obs/obs-plugins/obs-transitions/luma_wipes/fractal.png +share/obs/obs-plugins/obs-transitions/luma_wipes/iris.png +share/obs/obs-plugins/obs-transitions/luma_wipes/linear-h.png +share/obs/obs-plugins/obs-transitions/luma_wipes/linear-topleft.png +share/obs/obs-plugins/obs-transitions/luma_wipes/linear-topright.png +share/obs/obs-plugins/obs-transitions/luma_wipes/linear-v.png +share/obs/obs-plugins/obs-transitions/luma_wipes/parallel-zigzag-h.png +share/obs/obs-plugins/obs-transitions/luma_wipes/parallel-zigzag-v.png +share/obs/obs-plugins/obs-transitions/luma_wipes/sinus9.png +share/obs/obs-plugins/obs-transitions/luma_wipes/spiral.png +share/obs/obs-plugins/obs-transitions/luma_wipes/square.png +share/obs/obs-plugins/obs-transitions/luma_wipes/squares.png +share/obs/obs-plugins/obs-transitions/luma_wipes/stripes.png +share/obs/obs-plugins/obs-transitions/luma_wipes/strips-h.png +share/obs/obs-plugins/obs-transitions/luma_wipes/strips-v.png +share/obs/obs-plugins/obs-transitions/luma_wipes/watercolor.png +share/obs/obs-plugins/obs-transitions/luma_wipes/wipes.json +share/obs/obs-plugins/obs-transitions/luma_wipes/zigzag-h.png +share/obs/obs-plugins/obs-transitions/luma_wipes/zigzag-v.png share/obs/obs-plugins/obs-transitions/slide_transition.effect share/obs/obs-plugins/obs-transitions/swipe_transition.effect share/obs/obs-plugins/obs-x264/locale/ar-SA.ini @@ -587,6 +632,7 @@ share/obs/obs-plugins/text-freetype2/loc share/obs/obs-plugins/text-freetype2/locale/sv-SE.ini share/obs/obs-plugins/text-freetype2/locale/th-TH.ini share/obs/obs-plugins/text-freetype2/locale/tr-TR.ini +share/obs/obs-plugins/text-freetype2/locale/uk-UA.ini share/obs/obs-plugins/text-freetype2/locale/zh-CN.ini share/obs/obs-plugins/text-freetype2/locale/zh-TW.ini share/obs/obs-plugins/text-freetype2/text_default.effect
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609281237.u8SCbJK7045357>