CVS commit: pkgsrc/devel/SDL2

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Nov  4 21:31:46 UTC 2024

Modified Files:
        pkgsrc/devel/SDL2: Makefile distinfo
Added Files:
        pkgsrc/devel/SDL2/patches: patch-sdl2-config.in

Log Message:
SDL2: Fix rpath in sdl2-config's --libs output.

This has been sitting in my tree for ages, looks like I forgot to commit
it :(


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/devel/SDL2/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/devel/SDL2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/SDL2/patches/patch-sdl2-config.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/SDL2/Makefile
diff -u pkgsrc/devel/SDL2/Makefile:1.97 pkgsrc/devel/SDL2/Makefile:1.98
--- pkgsrc/devel/SDL2/Makefile:1.97     Sat Nov  2 08:32:23 2024
+++ pkgsrc/devel/SDL2/Makefile  Mon Nov  4 21:31:46 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2024/11/02 08:32:23 adam Exp $
+# $NetBSD: Makefile,v 1.98 2024/11/04 21:31:46 nia Exp $
 
 DISTNAME=      SDL2-2.30.9
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libsdl-org/}
 GITHUB_PROJECT=        SDL
@@ -36,6 +37,11 @@ CONFIGURE_ARGS+=     --disable-esd
 # SDL has native audio(4) support, avoid building ossaudio(4) support.
 CONFIGURE_ARGS.NetBSD+=        --disable-oss
 
+SUBST_CLASSES+=                rpath
+SUBST_STAGE.rpath=     pre-configure 
+SUBST_FILES.rpath=     sdl2-config.in
+SUBST_VARS.rpath=      COMPILER_RPATH_FLAG
+
 LDFLAGS.FreeBSD+=      -lusb
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/devel/SDL2/distinfo
diff -u pkgsrc/devel/SDL2/distinfo:1.75 pkgsrc/devel/SDL2/distinfo:1.76
--- pkgsrc/devel/SDL2/distinfo:1.75     Sat Nov  2 08:32:23 2024
+++ pkgsrc/devel/SDL2/distinfo  Mon Nov  4 21:31:46 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.75 2024/11/02 08:32:23 adam Exp $
+$NetBSD: distinfo,v 1.76 2024/11/04 21:31:46 nia Exp $
 
 BLAKE2s (SDL2-2.30.9.tar.gz) = 5d25b6f085fcce7636dcf3471c239056a60dde81715ff10434e5501aea7a9d6a
 SHA512 (SDL2-2.30.9.tar.gz) = 30dfa86fcced174fef0ed78ffa53476a31765e19cdcdf8233ab92876445b4dedaa758fc42a3ec332324d13faa2daafcadcc44fc0f536a2969ef836162ec3cd36
 Size (SDL2-2.30.9.tar.gz) = 7681555 bytes
+SHA1 (patch-sdl2-config.in) = 963486e3cf6cb437f43197885e9f519ace4497c1

Added files:

Index: pkgsrc/devel/SDL2/patches/patch-sdl2-config.in
diff -u /dev/null pkgsrc/devel/SDL2/patches/patch-sdl2-config.in:1.1
--- /dev/null   Mon Nov  4 21:31:46 2024
+++ pkgsrc/devel/SDL2/patches/patch-sdl2-config.in      Mon Nov  4 21:31:46 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-sdl2-config.in,v 1.1 2024/11/04 21:31:46 nia Exp $
+
+Re-add the rpath in the --libs output...
+
+--- sdl2-config.in.orig        2024-11-04 21:22:35.533607872 +0000
++++ sdl2-config.in
+@@ -49,7 +49,7 @@ while test $# -gt 0; do
+       echo -I@includedir@/SDL2 @SDL_CFLAGS@
+       ;;
+ @ENABLE_SHARED_TRUE@    --libs)
+-@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
++@ENABLE_SHARED_TRUE@      echo -L@libdir@ @COMPILER_RPATH_FLAG@@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+ @ENABLE_SHARED_TRUE@      ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)