diff options
author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2017-10-29 09:29:07 +0000 |
---|---|---|
committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2017-10-29 09:29:07 +0000 |
commit | 404fd9d89fb4fe8fd27a84225e98f4797eaf9ee3 (patch) | |
tree | 6c61986f7f7a3592cdc08e73b5b409f8725554eb /multimedia/obs-studio | |
parent | New port: graphics/gmic-qt (diff) |
Update to 20.1.1.
Notes
Notes:
svn path=/head/; revision=453104
Diffstat (limited to 'multimedia/obs-studio')
-rw-r--r-- | multimedia/obs-studio/Makefile | 3 | ||||
-rw-r--r-- | multimedia/obs-studio/distinfo | 6 | ||||
-rw-r--r-- | multimedia/obs-studio/files/patch-UI_window-basic-main.cpp | 10 | ||||
-rw-r--r-- | multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp | 14 | ||||
-rw-r--r-- | multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h | 4 | ||||
-rw-r--r-- | multimedia/obs-studio/pkg-plist | 2 |
6 files changed, 19 insertions, 20 deletions
diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile index a7052ff4b018..38e7928dbed0 100644 --- a/multimedia/obs-studio/Makefile +++ b/multimedia/obs-studio/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= obs-studio -PORTVERSION= 20.0.1 -PORTREVISION= 2 +PORTVERSION= 20.1.1 CATEGORIES= multimedia MAINTAINER= ports@FreeBSD.org diff --git a/multimedia/obs-studio/distinfo b/multimedia/obs-studio/distinfo index 258a0beeff62..e7100b3760c9 100644 --- a/multimedia/obs-studio/distinfo +++ b/multimedia/obs-studio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1502959032 -SHA256 (jp9000-obs-studio-20.0.1_GH0.tar.gz) = 3241667f180816b860622fd9ac572a86375a9a766ac45c69a886dcbdaf524643 -SIZE (jp9000-obs-studio-20.0.1_GH0.tar.gz) = 5610534 +TIMESTAMP = 1509267550 +SHA256 (jp9000-obs-studio-20.1.1_GH0.tar.gz) = 3236adaed5053e1ce4c022ca9f0ff282f75e20c433faeeff7724a0e3321b90bb +SIZE (jp9000-obs-studio-20.1.1_GH0.tar.gz) = 5638181 diff --git a/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp b/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp index ab50ef66b927..5e7d7d96a0d7 100644 --- a/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp +++ b/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp @@ -1,13 +1,13 @@ ---- UI/window-basic-main.cpp.orig 2016-09-28 09:24:18 UTC +--- UI/window-basic-main.cpp.orig 2017-10-25 18:45:20 UTC +++ UI/window-basic-main.cpp -@@ -1930,6 +1930,10 @@ void trigger_sparkle_update(); +@@ -2461,6 +2461,10 @@ void OBSBasic::TimedCheckForUpdates() - void OBSBasic::TimedCheckForUpdates() + void OBSBasic::CheckForUpdates(bool manualUpdate) { +#ifdef __FreeBSD__ + // Update check seg faults on FreeBSD + return; +#endif #ifdef UPDATE_SPARKLE - init_sparkle_updater(config_get_bool(App()->GlobalConfig(), "General", - "UpdateToUndeployed")); + trigger_sparkle_update(); + #elif ENABLE_WIN_UPDATER diff --git a/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp b/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp index 3fd6b1002afc..e9babfb98983 100644 --- a/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp +++ b/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp @@ -1,6 +1,6 @@ ---- UI/window-basic-preview.cpp.orig 2016-09-28 09:26:01 UTC +--- UI/window-basic-preview.cpp.orig 2017-10-25 18:45:20 UTC +++ UI/window-basic-preview.cpp -@@ -407,8 +407,8 @@ void OBSBasicPreview::mousePressEvent(QM +@@ -471,8 +471,8 @@ void OBSBasicPreview::mousePressEvent(QM GetStretchHandleData(startPos); vec2_divf(&startPos, &startPos, main->previewScale / pixelRatio); @@ -11,8 +11,8 @@ mouseOverItems = SelectedAtPos(startPos); vec2_zero(&lastMoveOffset); -@@ -702,8 +702,8 @@ void OBSBasicPreview::ClampAspect(vec3 & - size.y = size.x / baseAspect; +@@ -789,8 +789,8 @@ void OBSBasicPreview::ClampAspect(vec3 & + size.y = size.x / baseAspect * -1.0f; } - size.x = std::round(size.x); @@ -22,7 +22,7 @@ if (stretchFlags & ITEM_LEFT) tl.x = br.x - size.x; -@@ -849,18 +849,18 @@ void OBSBasicPreview::CropItem(const vec +@@ -936,18 +936,18 @@ void OBSBasicPreview::CropItem(const vec crop = startCrop; if (stretchFlags & ITEM_LEFT) @@ -47,7 +47,7 @@ #if 0 vec3 curPos; -@@ -945,7 +945,7 @@ void OBSBasicPreview::StretchItem(const +@@ -1032,7 +1032,7 @@ void OBSBasicPreview::StretchItem(const vec3_transform(&pos3, &pos3, &itemToScreen); vec2 newPos; @@ -56,7 +56,7 @@ obs_sceneitem_set_pos(stretchItem, &newPos); } -@@ -963,8 +963,8 @@ void OBSBasicPreview::mouseMoveEvent(QMo +@@ -1059,8 +1059,8 @@ void OBSBasicPreview::mouseMoveEvent(QMo mouseOverItems = SelectedAtPos(startPos); } diff --git a/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h b/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h index b5e5a70be0cb..d9d6661f87cd 100644 --- a/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h +++ b/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h @@ -1,6 +1,6 @@ ---- plugins/obs-outputs/net-if.h.orig 2016-09-28 11:25:11 UTC +--- plugins/obs-outputs/net-if.h.orig 2017-10-25 18:45:20 UTC +++ plugins/obs-outputs/net-if.h -@@ -48,6 +48,7 @@ +@@ -49,6 +49,7 @@ # undef ___NET_IF_GNU_SOURCE__ # undef _GNU_SOURCE # endif diff --git a/multimedia/obs-studio/pkg-plist b/multimedia/obs-studio/pkg-plist index 2f7063725ffa..6f03c8e47e5f 100644 --- a/multimedia/obs-studio/pkg-plist +++ b/multimedia/obs-studio/pkg-plist @@ -1,5 +1,5 @@ bin/obs -include/obs/audio-monitoring/null/null-audio-monitoring.c +include/obs/audio-monitoring/pulse/pulseaudio-wrapper.h include/obs/callback/calldata.h include/obs/callback/decl.h include/obs/callback/proc.h |