From owner-svn-ports-all@freebsd.org Sun Oct 29 09:29:08 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E42DEE5E9E1; Sun, 29 Oct 2017 09:29:08 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B075D72C74; Sun, 29 Oct 2017 09:29:08 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9T9T7BH072774; Sun, 29 Oct 2017 09:29:07 GMT (envelope-from vanilla@FreeBSD.org) Received: (from vanilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9T9T7wv072768; Sun, 29 Oct 2017 09:29:07 GMT (envelope-from vanilla@FreeBSD.org) Message-Id: <201710290929.v9T9T7wv072768@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vanilla set sender to vanilla@FreeBSD.org using -f From: "Vanilla I. Shu" Date: Sun, 29 Oct 2017 09:29:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453104 - in head/multimedia/obs-studio: . files X-SVN-Group: ports-head X-SVN-Commit-Author: vanilla X-SVN-Commit-Paths: in head/multimedia/obs-studio: . files X-SVN-Commit-Revision: 453104 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 09:29:09 -0000 Author: vanilla Date: Sun Oct 29 09:29:07 2017 New Revision: 453104 URL: https://svnweb.freebsd.org/changeset/ports/453104 Log: Update to 20.1.1. Modified: head/multimedia/obs-studio/Makefile head/multimedia/obs-studio/distinfo head/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp head/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp head/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h head/multimedia/obs-studio/pkg-plist Modified: head/multimedia/obs-studio/Makefile ============================================================================== --- head/multimedia/obs-studio/Makefile Sun Oct 29 09:20:57 2017 (r453103) +++ head/multimedia/obs-studio/Makefile Sun Oct 29 09:29:07 2017 (r453104) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= obs-studio -PORTVERSION= 20.0.1 -PORTREVISION= 2 +PORTVERSION= 20.1.1 CATEGORIES= multimedia MAINTAINER= ports@FreeBSD.org Modified: head/multimedia/obs-studio/distinfo ============================================================================== --- head/multimedia/obs-studio/distinfo Sun Oct 29 09:20:57 2017 (r453103) +++ head/multimedia/obs-studio/distinfo Sun Oct 29 09:29:07 2017 (r453104) @@ -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 Modified: head/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp ============================================================================== --- head/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp Sun Oct 29 09:20:57 2017 (r453103) +++ head/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp Sun Oct 29 09:29:07 2017 (r453104) @@ -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 Modified: head/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp ============================================================================== --- head/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp Sun Oct 29 09:20:57 2017 (r453103) +++ head/multimedia/obs-studio/files/patch-UI_window-basic-preview.cpp Sun Oct 29 09:29:07 2017 (r453104) @@ -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); } Modified: head/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h ============================================================================== --- head/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h Sun Oct 29 09:20:57 2017 (r453103) +++ head/multimedia/obs-studio/files/patch-plugins_obs-outputs_net-if.h Sun Oct 29 09:29:07 2017 (r453104) @@ -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 Modified: head/multimedia/obs-studio/pkg-plist ============================================================================== --- head/multimedia/obs-studio/pkg-plist Sun Oct 29 09:20:57 2017 (r453103) +++ head/multimedia/obs-studio/pkg-plist Sun Oct 29 09:29:07 2017 (r453104) @@ -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