Index | Thread | Search

From:
Theo Buehler <tb@theobuehler.org>
Subject:
spotifyd: align libclang use with ncspot and spotify-player
To:
ports@openbsd.org, pascal@openbsd.org
Date:
Sun, 15 Jun 2025 11:42:24 +0200

Download raw body.

Thread
  • Theo Buehler:

    spotifyd: align libclang use with ncspot and spotify-player

For bindgen it doesn't really matter which libclang version is used
as long as it is larger than the one requested. This aligns spotifyd
with ncspot and spotify-player and removes one of the last few consumers
of llvm/18.

This will briefly drop down to using llvm/16 and go to llvm/19 once
we flip the default.

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/spotifyd/Makefile,v
diff -u -p -r1.17 Makefile
--- Makefile	21 May 2025 18:51:50 -0000	1.17
+++ Makefile	15 Jun 2025 09:37:28 -0000
@@ -6,7 +6,7 @@ COMMENT =		Spotify client running as UNI
 GH_ACCOUNT =		Spotifyd
 GH_PROJECT =		spotifyd
 GH_TAGNAME =		v0.4.1
-REVISION =		0
+REVISION =		1
 CATEGORIES =		audio net
 
 MAINTAINER =		Pascal Stumpf <pascal@stumpf.co>
@@ -22,15 +22,16 @@ COMPILER =		base-clang ports-gcc
 # uses pledge()
 WANTLIB =		${MODCARGO_WANTLIB} dbus-1 m portaudio
 
-MODULES =		devel/cargo
+MODULES =		devel/cargo \
+			lang/clang
 
-BUILD_DEPENDS =		devel/llvm/18 \
-			devel/cmake/core
+BUILD_DEPENDS =		devel/cmake/core
 LIB_DEPENDS =		audio/portaudio-svn \
 			x11/dbus,-main
 
-# same branch as MODCLANG_VERSION used by lang/rust
-MAKE_ENV =		LIBCLANG_PATH=${LOCALBASE}/llvm18/lib
+# libclang needed for bindgen used from aws-lc-sys
+MAKE_ENV =		LIBCLANG_PATH=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
+MODCLANG_COMPILER_LINKS = no
 
 CONFIGURE_STYLE =	cargo
 SEPARATE_BUILD =	Yes