sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 20.1.1.

Browse source
This commit is contained in:
Vanilla I. Shu 2017-10-29 09:29:07 +00:00
parent 62a9d645c8
commit 404fd9d89f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=453104
6 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
multimedia/obs-studio/Makefile
View file

@ -1,8 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= obs-studio PORTNAME= obs-studio
PORTVERSION= 20.0.1 PORTVERSION= 20.1.1
PORTREVISION= 2
CATEGORIES= multimedia CATEGORIES= multimedia
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org

6
multimedia/obs-studio/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1502959032 TIMESTAMP = 1509267550
SHA256 (jp9000-obs-studio-20.0.1_GH0.tar.gz) = 3241667f180816b860622fd9ac572a86375a9a766ac45c69a886dcbdaf524643 SHA256 (jp9000-obs-studio-20.1.1_GH0.tar.gz) = 3236adaed5053e1ce4c022ca9f0ff282f75e20c433faeeff7724a0e3321b90bb
SIZE (jp9000-obs-studio-20.0.1_GH0.tar.gz) = 5610534 SIZE (jp9000-obs-studio-20.1.1_GH0.tar.gz) = 5638181

10
multimedia/obs-studio/files/patch-UI_window-basic-main.cpp
View file

@ -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 +++ 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__ +#ifdef __FreeBSD__
+ // Update check seg faults on FreeBSD + // Update check seg faults on FreeBSD
+ return; + return;
+#endif +#endif
#ifdef UPDATE_SPARKLE #ifdef UPDATE_SPARKLE
init_sparkle_updater(config_get_bool(App()->GlobalConfig(), "General", trigger_sparkle_update();
"UpdateToUndeployed")); #elif ENABLE_WIN_UPDATER

14
multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp
View file

@ -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 +++ UI/window-basic-preview.cpp
@@ -407,8 +407,8 @@ void OBSBasicPreview::mousePressEvent(QM @@ -471,8 +471,8 @@ void OBSBasicPreview::mousePressEvent(QM
GetStretchHandleData(startPos); GetStretchHandleData(startPos);
vec2_divf(&startPos, &startPos, main->previewScale / pixelRatio); vec2_divf(&startPos, &startPos, main->previewScale / pixelRatio);
@ -11,8 +11,8 @@
mouseOverItems = SelectedAtPos(startPos); mouseOverItems = SelectedAtPos(startPos);
vec2_zero(&lastMoveOffset); vec2_zero(&lastMoveOffset);
@@ -702,8 +702,8 @@ void OBSBasicPreview::ClampAspect(vec3 & @@ -789,8 +789,8 @@ void OBSBasicPreview::ClampAspect(vec3 &
size.y = size.x / baseAspect; size.y = size.x / baseAspect * -1.0f;
} }
- size.x = std::round(size.x); - size.x = std::round(size.x);
@ -22,7 +22,7 @@
if (stretchFlags & ITEM_LEFT) if (stretchFlags & ITEM_LEFT)
tl.x = br.x - size.x; 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; crop = startCrop;
if (stretchFlags & ITEM_LEFT) if (stretchFlags & ITEM_LEFT)
@ -47,7 +47,7 @@
#if 0 #if 0
vec3 curPos; vec3 curPos;
@@ -945,7 +945,7 @@ void OBSBasicPreview::StretchItem(const @@ -1032,7 +1032,7 @@ void OBSBasicPreview::StretchItem(const
vec3_transform(&pos3, &pos3, &itemToScreen); vec3_transform(&pos3, &pos3, &itemToScreen);
vec2 newPos; vec2 newPos;
@ -56,7 +56,7 @@
obs_sceneitem_set_pos(stretchItem, &newPos); 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); mouseOverItems = SelectedAtPos(startPos);
} }

4
multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h
View file

@ -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 +++ plugins/obs-outputs/net-if.h
@@ -48,6 +48,7 @@ @@ -49,6 +49,7 @@
# undef ___NET_IF_GNU_SOURCE__ # undef ___NET_IF_GNU_SOURCE__
# undef _GNU_SOURCE # undef _GNU_SOURCE
# endif # endif

2
multimedia/obs-studio/pkg-plist
View file

@ -1,5 +1,5 @@
bin/obs 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/calldata.h
include/obs/callback/decl.h include/obs/callback/decl.h
include/obs/callback/proc.h include/obs/callback/proc.h