Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Jan 2024 00:19:28 GMT
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 17292fe162db - 2024Q1 - audio/kmix: Fix OSS backend support
Message-ID:  <202401100019.40A0JS81021485@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=17292fe162db8385371feb6a5686db6882846d2d

commit 17292fe162db8385371feb6a5686db6882846d2d
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-01-10 00:11:27 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-01-10 00:19:24 +0000

    audio/kmix: Fix OSS backend support
    
    PR:             273476
    Reported by:    vvd
    MFH:            2024Q1
    
    (cherry picked from commit 35b5dec477c73d1f3c81d00cdabd027c78040637)
---
 audio/kmix/Makefile                   |  1 +
 audio/kmix/files/patch-CMakeLists.txt | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
index f74c773efbd9..73b092b2417b 100644
--- a/audio/kmix/Makefile
+++ b/audio/kmix/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kmix
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	audio kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/audio/kmix/files/patch-CMakeLists.txt b/audio/kmix/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..e1ea15bb1724
--- /dev/null
+++ b/audio/kmix/files/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+The OSS4 backend doesn't currently work on FreeBSD. Use the OSS3 backend
+as a fallback instead.
+
+PR: 273476
+
+--- CMakeLists.txt.orig	2024-01-09 20:14:13 UTC
++++ CMakeLists.txt
+@@ -126,7 +126,7 @@ if (HAVE_SOUNDCARD_H OR HAVE_SYS_SOUNDCARD_H)
+ 
+   if (${TEST_COMPILE_RESULT} AND (${TEST_RUN_RESULT} EQUAL 0))
+     message(STATUS "Detected OSS version ${TEST_RESULT_VERSION}")
+-    if (${TEST_RESULT_VERSION} GREATER_EQUAL 0x040000)
++    if (${TEST_RESULT_VERSION} GREATER_EQUAL 0x040000 AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+       message(STATUS "Building with OSS 4 support")
+       set(HAVE_OSS_4 true)
+       add_definitions(-DHAVE_OSS_4)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401100019.40A0JS81021485>