Date: Thu, 18 Jan 2024 11:46:46 GMT From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: bd1f496becff - 2024Q1 - audio/mumble: replace local patch with upstream Message-ID: <202401181146.40IBkkQq009417@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd1f496becffbf8dae606fcac59941cf0ccc25ff commit bd1f496becffbf8dae606fcac59941cf0ccc25ff Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2024-01-18 11:42:57 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-01-18 11:46:41 +0000 audio/mumble: replace local patch with upstream Patch for correct build 32bit overlay library Approved by: arrowd (mentor, implicit) MFH: 2024Q1 (cherry picked from commit 22f3745308511bea1b4e04eb437eab0572356284) --- 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()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401181146.40IBkkQq009417>