pkgsrc-Changes archive

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

CVS commit: pkgsrc/games/spaceracer



Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan  3 10:52:03 UTC 2026

Modified Files:
        pkgsrc/games/spaceracer: distinfo
Added Files:
        pkgsrc/games/spaceracer/patches: patch-acinclude.m4 patch-configure.in
            patch-src_stk_kernel_stk__file.cpp patch-src_stk_kernel_stk__file.h
            patch-src_stk_kernel_stk__looper.cpp
            patch-src_stk_sound_stk__sound.cpp
Removed Files:
        pkgsrc/games/spaceracer/patches: patch-acinclude patch-configurein
            patch-loopercpp patch-soundcpp

Log Message:
spacerace: fix build with (now default) c++17

Fix some pkglint while here by renaming files.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/spaceracer/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/games/spaceracer/patches/patch-acinclude \
    pkgsrc/games/spaceracer/patches/patch-loopercpp \
    pkgsrc/games/spaceracer/patches/patch-soundcpp
cvs rdiff -u -r0 -r1.1 pkgsrc/games/spaceracer/patches/patch-acinclude.m4 \
    pkgsrc/games/spaceracer/patches/patch-configure.in \
    pkgsrc/games/spaceracer/patches/patch-src_stk_kernel_stk__file.cpp \
    pkgsrc/games/spaceracer/patches/patch-src_stk_kernel_stk__file.h \
    pkgsrc/games/spaceracer/patches/patch-src_stk_kernel_stk__looper.cpp \
    pkgsrc/games/spaceracer/patches/patch-src_stk_sound_stk__sound.cpp
cvs rdiff -u -r1.2 -r0 pkgsrc/games/spaceracer/patches/patch-configurein

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

Modified files:

Index: pkgsrc/games/spaceracer/distinfo
diff -u pkgsrc/games/spaceracer/distinfo:1.10 pkgsrc/games/spaceracer/distinfo:1.11
--- pkgsrc/games/spaceracer/distinfo:1.10       Tue Oct 26 10:44:25 2021
+++ pkgsrc/games/spaceracer/distinfo    Sat Jan  3 10:52:02 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:44:25 nia Exp $
+$NetBSD: distinfo,v 1.11 2026/01/03 10:52:02 wiz Exp $
 
 BLAKE2s (spaceracer-0.2.4.tgz) = 89cfb58897926994453c9b73389a66df6d38734a19f898b8adef2b955a9ca0dc
 SHA512 (spaceracer-0.2.4.tgz) = 920977b805e4e96bd06f5856918c217591f69b384be52c301438cb9a7d5b039298a7420325e6fb545501b346ddf136ff5b6a624782e4c49485554d071c1e92dc
@@ -6,10 +6,12 @@ Size (spaceracer-0.2.4.tgz) = 992616 byt
 SHA1 (patch-aa) = 777c257d6a13d46bb40a715e7f2033f45427ed28
 SHA1 (patch-ab) = c60ffc762899e811b65d5c52e2ddb6a265ff5297
 SHA1 (patch-ac) = ef701f2cbba891e8ebb37175bce22111b443450a
-SHA1 (patch-acinclude) = b3126a339641f984a35f544653c8528a630902b0
-SHA1 (patch-configurein) = 76a4a56fd69344a54c8de781fc1d7a53fa8c6a31
-SHA1 (patch-loopercpp) = a81f8570cb9ebb2de80b03f4093fc028179b82af
-SHA1 (patch-soundcpp) = 679d9442bc533ae3923f47fba6e8c1f712190df7
+SHA1 (patch-acinclude.m4) = b3126a339641f984a35f544653c8528a630902b0
+SHA1 (patch-configure.in) = 76a4a56fd69344a54c8de781fc1d7a53fa8c6a31
 SHA1 (patch-src_graphics_PNGImage.cpp) = 2707e24d34450e560f7607dfe6399a542f308eb9
 SHA1 (patch-src_stk_input_stk__joy_h) = 9c6bc498729f4263471f623990df34e63c7c0c1e
 SHA1 (patch-src_stk_kernel_stk__debug_h) = 743ecdbec3587b54ffc9b9dc199b13f33a2e9226
+SHA1 (patch-src_stk_kernel_stk__file.cpp) = f9dd39a797938f2b7ac574874f64ebdecf59b870
+SHA1 (patch-src_stk_kernel_stk__file.h) = ba155a474f5f1141a51588fc651f5283f2695da5
+SHA1 (patch-src_stk_kernel_stk__looper.cpp) = a81f8570cb9ebb2de80b03f4093fc028179b82af
+SHA1 (patch-src_stk_sound_stk__sound.cpp) = 679d9442bc533ae3923f47fba6e8c1f712190df7

Added files:

Index: pkgsrc/games/spaceracer/patches/patch-acinclude.m4
diff -u /dev/null pkgsrc/games/spaceracer/patches/patch-acinclude.m4:1.1
--- /dev/null   Sat Jan  3 10:52:03 2026
+++ pkgsrc/games/spaceracer/patches/patch-acinclude.m4  Sat Jan  3 10:52:02 2026
@@ -0,0 +1,22 @@
+$NetBSD: patch-acinclude.m4,v 1.1 2026/01/03 10:52:02 wiz Exp $
+
+Added the necessary quoting for m4 macros.
+
+--- acinclude.m4.orig  2001-07-15 23:25:20.000000000 +0200
++++ acinclude.m4       2006-03-09 14:44:04.000000000 +0100
+@@ -191,11 +191,11 @@ AC_ARG_ENABLE(smpegtest, [  --disable-sm
+                       , enable_smpegtest=yes)
+ AC_CHECK_LIB(smpeg,
+              SMPEG_new,
+-           AC_CHECK_HEADER(smpeg/smpeg.h,
++           [AC_CHECK_HEADER(smpeg/smpeg.h,
+                            SMPEG_LIBS="-lsmpeg",
+-                           AC_MSG_WARN(header of smpeg not found))
+-           SMPEG_LIBS="-lsmpeg",
+-           AC_MSG_ERROR(libsmpeg not found),
++                           [AC_MSG_WARN(header of smpeg not found)])
++           SMPEG_LIBS="-lsmpeg"],
++           [AC_MSG_ERROR(libsmpeg not found)],
+                            $SPMEG_FLAGS)
+ AC_SUBST(SMPEG_CFLAGS)        
+ AC_SUBST(SMPEG_LIBS)  
Index: pkgsrc/games/spaceracer/patches/patch-configure.in
diff -u /dev/null pkgsrc/games/spaceracer/patches/patch-configure.in:1.1
--- /dev/null   Sat Jan  3 10:52:03 2026
+++ pkgsrc/games/spaceracer/patches/patch-configure.in  Sat Jan  3 10:52:02 2026
@@ -0,0 +1,131 @@
+$NetBSD: patch-configure.in,v 1.1 2026/01/03 10:52:02 wiz Exp $
+
+First chunk: automake-1.13 compat.
+Rest: Added the necessary quoting for m4 macros.
+
+--- configure.in.orig  2001-07-15 21:25:20.000000000 +0000
++++ configure.in
+@@ -24,7 +24,7 @@ dnl ====================================
+ SPACERACER_VERSION=0.2.3
+ SDL_VERSION=1.1.0
+ AM_INIT_AUTOMAKE(spaceracer,$SPACERACER_VERSION)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ 
+ dnl ==========================================
+@@ -103,15 +103,6 @@ CXXFLAGS="$CFLAGS"
+ 
+ 
+ 
+-dnl ==========================================
+-dnl  Doit-t\'on afficher les info de debug ?
+-dnl ==========================================
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+-  debug_default=no
+-  profile_default=no
+-  profile_debug=no
+-AC_DIVERT_POP()dnl
+-
+ AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
+ AC_ARG_ENABLE(debug, [  --enable-profile=[no/yes] turn on profiling [default=$profile_default]],,profile_debug=$profile_default)
+ 
+@@ -151,23 +142,6 @@ if eval "test x$enable_spaceracerdir != 
+   fi
+ fi)
+ 
+-
+-
+-
+-
+-
+-dnl si c\'est Gcc, on rajoute l\'option -Wall que si il n\'y si trouve pas d�j�
+-changequote(,)dnl
+-if test "x$GCC" = "xyes"; then
+-  case " $CXXFLAGS " in
+-  *[\ \       ]-Wall[\ \      ]*) ;;
+-  *) CXXFLAGS="$CXXFLAGS -Wall" ;;
+-  esac
+-fi
+-changequote([,])dnl
+-
+-
+-
+ dnl ======================================
+ dnl  D�tection des headers standart
+ dnl ======================================
+@@ -180,26 +154,26 @@ dnl ====================================
+ 
+ AC_CHECK_LIB(jpeg,
+              jpeg_start_decompress,
+-           AC_CHECK_HEADERS(jpeglib.h,
++           [AC_CHECK_HEADERS(jpeglib.h,
+                             JPEGLIB="-ljpeg",
+-                            AC_MSG_WARN(jpeg header not found)),
++                            AC_MSG_WARN(jpeg header not found))],
+            ,
+            -lm)
+ 
+ AC_CHECK_LIB(z,
+              gzopen,
+-           AC_CHECK_HEADERS(zlib.h,
++           [AC_CHECK_HEADERS(zlib.h,
+                             ZLIB="-lz",
+-                            AC_MSG_WARN(zlib header not found)),
++                            AC_MSG_WARN(zlib header not found))],
+            ,
+            -lm)
+ if test "$ac_cv_header_zlib_h" = "yes"
+ then
+ AC_CHECK_LIB(png,
+              png_get_IHDR,
+-           AC_CHECK_HEADERS(png.h,
++           [AC_CHECK_HEADERS(png.h,
+                             PNGLIB="-lpng $ZLIB",
+-                            AC_MSG_WARN(png header not found)),
++                            AC_MSG_WARN(png header not found))],
+            ,
+            $ZLIB -lm)
+ fi
+@@ -223,31 +197,31 @@ XLIBS="$X_EXTRA_LIBS -lX11"
+ 
+ AC_CHECK_LIB(Xext,
+              XShmQueryExtension,
+-           AC_CHECK_HEADERS(X11/extensions/XShm.h,
++           [AC_CHECK_HEADERS(X11/extensions/XShm.h,
+                             XLIBS="-lXext $XLIBS",
+-                            AC_MSG_WARN(libXext Not found)),
++                            AC_MSG_WARN(libXext Not found))],
+            ,
+            $XLFLAGS $X_PRE_LIBS $XLIBS)
+ 
+ AC_CHECK_LIB(Xmu,
+              XmuLookupStandardColormap,
+-             AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
++             [AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
+                              XLIBS="-lXmu $XLIBS",
+-                             AC_MSG_WARN(libXmu Not found)),
+-             AC_CHECK_LIB(Xmu,
++                             AC_MSG_WARN(libXmu Not found))],
++             [AC_CHECK_LIB(Xmu,
+                         XmuUpdateMapHints,
+-                          AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
++                          [AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
+                                           XLIBS="-lXmu -lXt $XLIBS",
+-                                          AC_MSG_WARN(XMU library not found)),
++                                          AC_MSG_WARN(XMU library not found))],
+                                           AC_MSG_WARN(XMU library not found),
+-                          $XLFLAGS $X_PRE_LIBS -lXt $XLIBS),
++                          $XLFLAGS $X_PRE_LIBS -lXt $XLIBS)],
+              $XLFLAGS $X_PRE_LIBS $XLIBS)
+ 
+ AC_CHECK_LIB(Xi,
+              XGetExtensionVersion,
+-           AC_CHECK_HEADERS(X11/extensions/XI.h,
++           [AC_CHECK_HEADERS(X11/extensions/XI.h,
+                             XLIBS="-lXi $XLIBS",
+-                            AC_MSG_WARN(libXi Not found)),
++                            AC_MSG_WARN(libXi Not found))],
+            ,
+            $XLFLAGS $X_PRE_LIBS $XLIBS)
+ 
Index: pkgsrc/games/spaceracer/patches/patch-src_stk_kernel_stk__file.cpp
diff -u /dev/null pkgsrc/games/spaceracer/patches/patch-src_stk_kernel_stk__file.cpp:1.1
--- /dev/null   Sat Jan  3 10:52:03 2026
+++ pkgsrc/games/spaceracer/patches/patch-src_stk_kernel_stk__file.cpp  Sat Jan  3 10:52:03 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_stk_kernel_stk__file.cpp,v 1.1 2026/01/03 10:52:03 wiz Exp $
+
+ISO C++17 does not allow dynamic exception specifications.
+
+--- src/stk/kernel/stk_file.cpp.orig   2026-01-03 10:49:25.556179740 +0000
++++ src/stk/kernel/stk_file.cpp
+@@ -4,7 +4,7 @@
+ #include <string.h>
+ #include "stk_file.h"
+ 
+-Stk_File::Stk_File(char *filename) throw (xFileError)
++Stk_File::Stk_File(char *filename)
+ {
+         // init the file descriptor
+     fd=0;
Index: pkgsrc/games/spaceracer/patches/patch-src_stk_kernel_stk__file.h
diff -u /dev/null pkgsrc/games/spaceracer/patches/patch-src_stk_kernel_stk__file.h:1.1
--- /dev/null   Sat Jan  3 10:52:03 2026
+++ pkgsrc/games/spaceracer/patches/patch-src_stk_kernel_stk__file.h    Sat Jan  3 10:52:03 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_stk_kernel_stk__file.h,v 1.1 2026/01/03 10:52:03 wiz Exp $
+
+ISO C++17 does not allow dynamic exception specifications.
+
+--- src/stk/kernel/stk_file.h.orig     2026-01-03 10:47:50.849521600 +0000
++++ src/stk/kernel/stk_file.h
+@@ -17,7 +17,7 @@ class Stk_File
+ {
+ public:
+         /// Constructor
+-    Stk_File(char *filename) throw (xFileError);
++    Stk_File(char *filename);
+         /// Destructor
+     virtual ~Stk_File();
+ 
Index: pkgsrc/games/spaceracer/patches/patch-src_stk_kernel_stk__looper.cpp
diff -u /dev/null pkgsrc/games/spaceracer/patches/patch-src_stk_kernel_stk__looper.cpp:1.1
--- /dev/null   Sat Jan  3 10:52:03 2026
+++ pkgsrc/games/spaceracer/patches/patch-src_stk_kernel_stk__looper.cpp        Sat Jan  3 10:52:03 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_stk_kernel_stk__looper.cpp,v 1.1 2026/01/03 10:52:03 wiz Exp $
+
+g++ does not like double definition of default parameters.
+
+--- src/stk/kernel/stk_looper.cpp.orig 2001-07-15 23:26:19.000000000 +0200
++++ src/stk/kernel/stk_looper.cpp      2006-03-09 14:59:00.000000000 +0100
+@@ -39,7 +39,7 @@ int Stk2_Messages::PollMessage(Stk2_Mess
+ 
+ /* ---------------------- Looper ----------------------------- */
+ 
+-Stk2_Looper::Stk2_Looper(int freq=25)
++Stk2_Looper::Stk2_Looper(int freq)
+         :Stk_Thread()
+ {
+     frequency=freq;
Index: pkgsrc/games/spaceracer/patches/patch-src_stk_sound_stk__sound.cpp
diff -u /dev/null pkgsrc/games/spaceracer/patches/patch-src_stk_sound_stk__sound.cpp:1.1
--- /dev/null   Sat Jan  3 10:52:03 2026
+++ pkgsrc/games/spaceracer/patches/patch-src_stk_sound_stk__sound.cpp  Sat Jan  3 10:52:03 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_stk_sound_stk__sound.cpp,v 1.1 2026/01/03 10:52:03 wiz Exp $
+
+g++ does not like double definition of default parameters.
+
+--- src/stk/sound/stk_sound.cpp.orig   2001-07-15 23:26:19.000000000 +0200
++++ src/stk/sound/stk_sound.cpp        2006-03-09 14:59:42.000000000 +0100
+@@ -145,7 +145,7 @@ void Stk_CSound::Play(char *filename)
+ 
+ 
+ /* Server class */
+-Stk_PSound::Stk_PSound(int freq=25)
++Stk_PSound::Stk_PSound(int freq)
+         :Stk2_Looper(freq)
+ {
+         // no last sing



Home | Main Index | Thread Index | Old Index