pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

clock-signal: Update to 20230515



Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Tue Jul 11 20:36:12 2023 -0700
Changeset:	d27f504474c7e3a1cc086d7cf613f9040a9e4d5c

Modified Files:
	clock-signal/Makefile
	clock-signal/TODO
	clock-signal/distinfo
	clock-signal/patches/patch-OSBindings_SDL_SConstruct

Log Message:
clock-signal: Update to 20230515

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d27f504474c7e3a1cc086d7cf613f9040a9e4d5c

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

diffstat:
 clock-signal/Makefile                                | 15 +++++++++++----
 clock-signal/TODO                                    |  2 +-
 clock-signal/distinfo                                |  8 ++++----
 clock-signal/patches/patch-OSBindings_SDL_SConstruct | 17 ++---------------
 4 files changed, 18 insertions(+), 24 deletions(-)

diffs:
diff --git a/clock-signal/Makefile b/clock-signal/Makefile
index 55e36944ce..489607dd78 100644
--- a/clock-signal/Makefile
+++ b/clock-signal/Makefile
@@ -1,23 +1,26 @@
 # $NetBSD$
 
-DISTNAME=	clock-signal-20220723
+DISTNAME=	clock-signal-20230515
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=TomHarte/}
 GITHUB_PROJECT=	CLK
-GITHUB_TAG=	2022-07-23
+GITHUB_TAG=	2023-05-15
 
 MAINTAINER=	charlotte%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/TomHarte/CLK
 COMMENT=	Emulator of 8- and 16-bit platforms
 LICENSE=	mit
 
-EXTRACT_USING=	gtar
 NO_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 
-SCONS_ARGS=	# defined
 SCONS_ARGS+=	${_MAKE_JOBS}
 
+# C++17
+GCC_REQD+=	8.4.0
+
+#TOOL_DEPENDS+=	patchelf-[0-9]*:../../devel/patchelf
+
 do-build:
 	cd ${WRKSRC}/OSBindings/SDL && \
 	${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS}
@@ -25,6 +28,10 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${LOCALBASE}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/OSBindings/SDL/clksignal ${DESTDIR}${LOCALBASE}/bin
+	#${PREFIX}/bin/patchelf \
+	#	--force-rpath --set-rpath \
+	#	${PREFIX}/lib \
+	#	${DESTDIR}${LOCALBASE}/bin/clksignal
 
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/scons/buildlink3.mk"
diff --git a/clock-signal/TODO b/clock-signal/TODO
index 8ce203dc6b..bd824f86f7 100644
--- a/clock-signal/TODO
+++ b/clock-signal/TODO
@@ -1,3 +1,3 @@
 TODO
 
-- Neet to get rid of hardcoded RPATH 
+- rpath problems
diff --git a/clock-signal/distinfo b/clock-signal/distinfo
index 60146daebd..c3dbb83a1b 100644
--- a/clock-signal/distinfo
+++ b/clock-signal/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-RMD160 (clock-signal-20220723.tar.gz) = 581bebcee42f2cb069e42c9c74af8c958f6745e0
-SHA512 (clock-signal-20220723.tar.gz) = f8bce2e52849f961a64daf7bb6b311a336966736da8b042d93a2908800301d05719779124b536e2c3944c3b40b0a1bd9f455346eb79a5f94c65f7744d9698c70
-Size (clock-signal-20220723.tar.gz) = 46985968 bytes
-SHA1 (patch-OSBindings_SDL_SConstruct) = a29cec555ba2b2ef04a76d69cf38a2b2c8774667
+BLAKE2s (clock-signal-20230515.tar.gz) = 314d7b0ffb8684bf9f726fa2772912710a04ae15c1e818b6819200f5e72b70b3
+SHA512 (clock-signal-20230515.tar.gz) = 098b8fabdde815b4065a2b345b78c086ac6d7f6008a99c4f6d8431cb8faebe39ca763065b70efb3aa9a80ee60a5affbf54a7f99a6c8c1791f1d236f06cf59df7
+Size (clock-signal-20230515.tar.gz) = 49040110 bytes
+SHA1 (patch-OSBindings_SDL_SConstruct) = 77dab3ddfbba42d561f781d0e2a616594762e09a
diff --git a/clock-signal/patches/patch-OSBindings_SDL_SConstruct b/clock-signal/patches/patch-OSBindings_SDL_SConstruct
index 5946bf4e64..6b85661941 100644
--- a/clock-signal/patches/patch-OSBindings_SDL_SConstruct
+++ b/clock-signal/patches/patch-OSBindings_SDL_SConstruct
@@ -1,9 +1,5 @@
-$NetBSD$
-
-Let scons inherit the build environment.
-
---- OSBindings/SDL/SConstruct.orig	2021-12-19 14:35:27.000000000 -0800
-+++ OSBindings/SDL/SConstruct	2022-01-28 17:52:43.025087118 -0800
+--- OSBindings/SDL/SConstruct.orig	2023-05-15 07:01:38.000000000 -0700
++++ OSBindings/SDL/SConstruct	2023-07-11 20:16:48.339990466 -0700
 @@ -1,4 +1,5 @@
  import glob
 +import os
@@ -19,12 +15,3 @@ Let scons inherit the build environment.
  
  # Determine compiler and linker flags for SDL.
  env.ParseConfig('sdl2-config --cflags')
-@@ -140,5 +141,8 @@
- # Add additional libraries to link against.
- env.Append(LIBS = ['libz', 'pthread', 'GL'])
- 
-+# XXX XXX XXX FIXME
-+env.Append(RPATH = ['/usr/pkg/lib', '/usr/X11R7/lib',])
-+
- # Build target.
- env.Program(target = 'clksignal', source = SOURCES)


Home | Main Index | Thread Index | Old Index