CVS commit: pkgsrc/emulators/shoebill

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar 21 02:04:51 UTC 2024

Modified Files:
        pkgsrc/emulators/shoebill: Makefile distinfo
        pkgsrc/emulators/shoebill/patches: patch-sdl-gui_lin_build.sh

Log Message:
shoebill: Fix linking on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/emulators/shoebill/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/emulators/shoebill/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh

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

Modified files:

Index: pkgsrc/emulators/shoebill/Makefile
diff -u pkgsrc/emulators/shoebill/Makefile:1.25 pkgsrc/emulators/shoebill/Makefile:1.26
--- pkgsrc/emulators/shoebill/Makefile:1.25     Tue Jan 30 14:21:49 2024
+++ pkgsrc/emulators/shoebill/Makefile  Thu Mar 21 02:04:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/01/30 14:21:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.26 2024/03/21 02:04:51 nia Exp $
 
 DISTNAME=      shoebill-0.0.5
 PKGREVISION=   17
@@ -21,6 +21,13 @@ INSTALLATION_DIRS= bin ${DOCDIR}
 CFLAGS+=               -g3
 INSTALL_UNSTRIPPED=    yes
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+LDFLAGS+=              -framework OpenGL
+.else
+LDFLAGS+=              -lGL
+.endif
+
 do-build:
        ( cd ${WRKSRC}/sdl-gui && \
                ${PKGSRC_SETENV} CC=${CC:Q} CFLAGS=${CFLAGS:Q} LDFLAGS=${LDFLAGS:Q} \

Index: pkgsrc/emulators/shoebill/distinfo
diff -u pkgsrc/emulators/shoebill/distinfo:1.7 pkgsrc/emulators/shoebill/distinfo:1.8
--- pkgsrc/emulators/shoebill/distinfo:1.7      Tue Oct 26 10:24:00 2021
+++ pkgsrc/emulators/shoebill/distinfo  Thu Mar 21 02:04:51 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:24:00 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/03/21 02:04:51 nia Exp $
 
 BLAKE2s (shoebill-0.0.5.tar.gz) = 8d7fd6c2a3da2d3cead604036c282e13bfca752e4bd4769a5d1434b4e285be0d
 SHA512 (shoebill-0.0.5.tar.gz) = cf8d7945943d6d7a505c233b5c99371f5d37d5d60dd5beeeadbe442ef43b9980e96d51f193d69a03eb58a0a2b13103b4dba311a53c939b633b20753a8c19a772
 Size (shoebill-0.0.5.tar.gz) = 253877 bytes
 SHA1 (patch-core_fpu.c) = a2fe3d42c8a61d580b966fe6c3909e9c61640b92
-SHA1 (patch-sdl-gui_lin_build.sh) = 8eb8bf622bc7b83f06a0d4dcdb8b77b25001163b
+SHA1 (patch-sdl-gui_lin_build.sh) = de75e0101ee9cafee27aad6fd4f43655d56cf91a

Index: pkgsrc/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh
diff -u pkgsrc/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh:1.3 pkgsrc/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh:1.4
--- pkgsrc/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh:1.3    Tue Mar 29 22:03:08 2016
+++ pkgsrc/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh        Thu Mar 21 02:04:51 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-sdl-gui_lin_build.sh,v 1.3 2016/03/29 22:03:08 joerg Exp $
+$NetBSD: patch-sdl-gui_lin_build.sh,v 1.4 2024/03/21 02:04:51 nia Exp $
 
 Make build parameters settable from pkg Makefile
 
@@ -19,6 +19,6 @@ Make build parameters settable from pkg 
  
  
 -cmd="$CC -O3 -ggdb -flto $files sdl.c -lpthread -lm -lSDL2 -lGL -o shoebill"
-+cmd="$CC ${CFLAGS} $files sdl.c -lpthread -lm -lSDL2 -lGL ${LDFLAGS} -o shoebill"
++cmd="$CC ${CFLAGS} $files sdl.c -lpthread -lm -lSDL2 ${LDFLAGS} -o shoebill"
  echo $cmd
  $cmd