CVS commit: [pkgsrc-2024Q3] pkgsrc/devel/SDL2

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Nov  5 01:02:38 UTC 2024

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

Log Message:
Pullup ticket #6912 - requested by nia
Portability fix

Revisions pulled up:
- devel/SDL2/Makefile                                           1.98
- devel/SDL2/distinfo                                           1.76
- devel/SDL2/patches/patch-sdl2-config.in                       1.1

---
   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.95 -r1.95.2.1 pkgsrc/devel/SDL2/Makefile
cvs rdiff -u -r1.73 -r1.73.2.1 pkgsrc/devel/SDL2/distinfo
cvs rdiff -u -r0 -r1.1.2.2 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.95 pkgsrc/devel/SDL2/Makefile:1.95.2.1
--- pkgsrc/devel/SDL2/Makefile:1.95     Tue Sep  3 05:07:49 2024
+++ pkgsrc/devel/SDL2/Makefile  Tue Nov  5 01:02:38 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.95 2024/09/03 05:07:49 adam Exp $
+# $NetBSD: Makefile,v 1.95.2.1 2024/11/05 01:02:38 maya Exp $
 
 DISTNAME=      SDL2-2.30.7
+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.73 pkgsrc/devel/SDL2/distinfo:1.73.2.1
--- pkgsrc/devel/SDL2/distinfo:1.73     Tue Sep  3 05:07:49 2024
+++ pkgsrc/devel/SDL2/distinfo  Tue Nov  5 01:02:38 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.73 2024/09/03 05:07:49 adam Exp $
+$NetBSD: distinfo,v 1.73.2.1 2024/11/05 01:02:38 maya Exp $
 
 BLAKE2s (SDL2-2.30.7.tar.gz) = efdb276b87ac8c7d39b4dff98e8ac55ee3460ab3438b2a97702004ff41f08456
 SHA512 (SDL2-2.30.7.tar.gz) = 1a16c10f500dea97bd4e4ca5f560fe4ab8e746c975d30751b7cf567868743d105ce84055d480e4c18b290adac485e67d1bb14ae1719644d6e42223d96f299a16
 Size (SDL2-2.30.7.tar.gz) = 7525092 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.2.2
--- /dev/null   Tue Nov  5 01:02:38 2024
+++ pkgsrc/devel/SDL2/patches/patch-sdl2-config.in      Tue Nov  5 01:02:38 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-sdl2-config.in,v 1.1.2.2 2024/11/05 01:02:38 maya 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)