From nobody Thu Jan 18 11:46:04 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TG1Cw5fD1z588cq; Thu, 18 Jan 2024 11:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TG1Cw4mZkz4Lf0; Thu, 18 Jan 2024 11:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705578364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5IMaAYQ5EuHicJFVZw0c3IdJUsif6skCAkr1RwD6xP0=; b=rW3E9JhX6BUqxfFFqIz4b0rmdmtOCJxj3HaqSIHA/Th9eNcPPjfHg696FM1RwZjxs13Km8 Q1aX6Qbu73evJNdOWiy1dtyCY+qx6cF+vUiWkZ74rLSissAt2Jr3dkD2TT0jk3XTCD5UqL 75GC3XlvJis+HXbKNiV/+b248TQR9u9wmaAxwFYC8OlrqDPlaK5sproZg15DAPfqJg7RGZ QmqdVzNVDVv/v6CC5YhwZrKsvHLC0vhjJcQvCpGuy4rWSQhlvnb/EFBbNvRqyEBhOg6x6x ace0Nt+/VgCfWxn1JuMi1cvkw72Otr06/FWAdk7C+IFAVm2cL9yADvvL4BcjrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705578364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5IMaAYQ5EuHicJFVZw0c3IdJUsif6skCAkr1RwD6xP0=; b=iV11UqhxzIhED6bO0zS2LkbcGWkd6n4JntmMJiZCcKQulml8n3BmN9yRth/ytislXLrWNE qxF9SAExjB6KHL340EOF0/+5vsEVhTdYjD6UBXeC4gW9bjs5P1OcHjsGEUggPktsTg0AJ1 JO0rt1f9jG2/StqEuSa7r6JgNYLvsTTxCQt4Fs4W+14uplK/m+iOAWVBLyneild0lgd1WZ rQ1sqWDjrB0neDz+2zLlIxJJ9gYMVt518JgRQNlFWo7o6dJyglSUJUWU1NOudV1BqYyQ4F IiqncRI11wVG8uTayeDF/kzEmaRX33ffrV0UKs2IyREgeBg867YQbC/tgkyDFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705578364; a=rsa-sha256; cv=none; b=WQ24aAugLgtpq7pL/EHQ7IajPGUMT6/qZHkGtplrtvDi2fTeXt2aiSNFw4Jf5w3lvPkfo7 U4LrxtRgj+4vnq8hMZcqDDISJGlVv78v3QWuGTJ0fdVgFHHfF5tyVBxKFdjms978njFXf/ LIUN8VSf/6hMVVmAv18K9Fzp4y7Dv0Q80C36uCoGFAHGWY/W6ocerjum03hMBTLnGZIeOZ mFArbFxCSUKzbSlxFRu0Lqn4PFu7SBCecNOQJgloVNP+91nPIaKJiZIlUMUULYTzczmtKl cR4ndFw8Ztu6Ef3u3eLV8Nn9hPZbQtWwsig6WOG0hughqfK4tSvEoP7cnyH4Iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TG1Cw3QYHz15Pb; Thu, 18 Jan 2024 11:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40IBk43K009191; Thu, 18 Jan 2024 11:46:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IBk4HU009188; Thu, 18 Jan 2024 11:46:04 GMT (envelope-from git) Date: Thu, 18 Jan 2024 11:46:04 GMT Message-Id: <202401181146.40IBk4HU009188@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 22f374530851 - main - audio/mumble: replace local patch with upstream List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22f3745308511bea1b4e04eb437eab0572356284 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=22f3745308511bea1b4e04eb437eab0572356284 commit 22f3745308511bea1b4e04eb437eab0572356284 Author: Vladimir Druzenko AuthorDate: 2024-01-18 11:42:57 +0000 Commit: Vladimir Druzenko CommitDate: 2024-01-18 11:42:57 +0000 audio/mumble: replace local patch with upstream Patch for correct build 32bit overlay library Approved by: arrowd (mentor, implicit) MFH: 2024Q1 --- audio/mumble/Makefile | 2 +- audio/mumble/distinfo | 4 +++- audio/mumble/files/patch-overlay__gl_CMakeLists.txt | 16 ---------------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile index 3996b22cd445..e9243566cda8 100644 --- a/audio/mumble/Makefile +++ b/audio/mumble/Makefile @@ -6,7 +6,7 @@ MASTER_SITES= https://github.com/${PORTNAME}-voip/${PORTNAME}/releases/download/ PATCH_SITES= https://github.com/${PORTNAME}-voip/${PORTNAME}/commit/ PATCHFILES= 952dfaf4983097d7b9c9b5d9f5b01ffeb6d3463d.patch:-p1 # Fix detection of unbundled GSL -#PATCHFILES+= 589bfbfd634925b47b3a812745bc5a423b7f4285.patch:-p1 # Install 32-bit lib on FreeBSD +PATCHFILES+= 589bfbfd634925b47b3a812745bc5a423b7f4285.patch:-p1 # Install 32-bit lib on FreeBSD MAINTAINER= vvd@FreeBSD.org COMMENT= Voice chat software primarily intended for use while gaming diff --git a/audio/mumble/distinfo b/audio/mumble/distinfo index b116fe3219f5..11cda2f86fdd 100644 --- a/audio/mumble/distinfo +++ b/audio/mumble/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1692992913 +TIMESTAMP = 1705577723 SHA256 (mumble-1.5.517.tar.gz) = 8efd06a0f47ebfe27735f7575ba0becfb21d0f400a5082202dbbd998ab8351de SIZE (mumble-1.5.517.tar.gz) = 12091432 SHA256 (952dfaf4983097d7b9c9b5d9f5b01ffeb6d3463d.patch) = 3316fd3cab0d797d78fa34df358892699db0bde6c45c61a87f095e514c2e5575 SIZE (952dfaf4983097d7b9c9b5d9f5b01ffeb6d3463d.patch) = 1138 +SHA256 (589bfbfd634925b47b3a812745bc5a423b7f4285.patch) = acd9f69856df9218c5a5e6eb8a70eaec3ae7bca0ce1c1f7c59e955db638523cf +SIZE (589bfbfd634925b47b3a812745bc5a423b7f4285.patch) = 923 diff --git a/audio/mumble/files/patch-overlay__gl_CMakeLists.txt b/audio/mumble/files/patch-overlay__gl_CMakeLists.txt deleted file mode 100644 index a6fa6fafdf06..000000000000 --- a/audio/mumble/files/patch-overlay__gl_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -Install the 32-bit overlay library on FreeBSD-amd64 - ---- overlay_gl/CMakeLists.txt.orig -+++ overlay_gl/CMakeLists.txt -@@ -96,6 +96,11 @@ if(NOT APPLE) - "-ldl" - "-lrt" - ) -+ endif() -+ endif() -+ -+ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") -+ if(TARGET overlay_gl_x86) - # install 32bit overlay library - install(TARGETS overlay_gl_x86 LIBRARY DESTINATION "${MUMBLE_INSTALL_LIBDIR}") - endif()