CVS commit: pkgsrc/emulators/caprice32

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators/caprice32
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Wed, 22 Apr 2020 08:13:40 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Apr 22 08:13:40 UTC 2020

Modified Files:
        pkgsrc/emulators/caprice32: MESSAGE Makefile PLIST distinfo
        pkgsrc/emulators/caprice32/patches: patch-doc_man6_cap32.6
            patch-makefile patch-src_cap32.cpp
Removed Files:
        pkgsrc/emulators/caprice32/patches: patch-cap32.cfg

Log Message:
caprice32: Update to 4.6.0

Changes:
* Support CAP32_DELAY in autorun commands
* Support German keyboard (physical layout only)
* Better freedesktop integration
* Better logic for finding configuration file
* Dynamic loading of CAPS (IPF) library
* Nix packaging support


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/caprice32/MESSAGE \
    pkgsrc/emulators/caprice32/Makefile pkgsrc/emulators/caprice32/PLIST \
    pkgsrc/emulators/caprice32/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/caprice32/patches/patch-cap32.cfg
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/caprice32/patches/patch-doc_man6_cap32.6 \
    pkgsrc/emulators/caprice32/patches/patch-makefile \
    pkgsrc/emulators/caprice32/patches/patch-src_cap32.cpp

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

Modified files:

Index: pkgsrc/emulators/caprice32/MESSAGE
diff -u pkgsrc/emulators/caprice32/MESSAGE:1.1 pkgsrc/emulators/caprice32/MESSAGE:1.2
--- pkgsrc/emulators/caprice32/MESSAGE:1.1      Fri Mar  6 12:23:01 2020
+++ pkgsrc/emulators/caprice32/MESSAGE  Wed Apr 22 08:13:39 2020
@@ -1,11 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2020/03/06 12:23:01 nia Exp $
+$NetBSD: MESSAGE,v 1.2 2020/04/22 08:13:39 nia Exp $
 
 For copyright reasons ROM files cannot be redistributed with the package.
 
-Caprice32 searches ${PREFIX}/share/caprice32/rom for BASIC and AMSDOS ROM
-images in MAME/MESS format (only not compressed), e.g. cpc6128.rom and
-amsdos.rom.
+Caprice32 needs BASIC and AMSDOS ROM images in MAME/MESS format (only not
+compressed), e.g. cpc6128.rom and amsdos.rom.  The path to these
+is configurable in ${PKG_SYSCONFDIR}/cap32.cfg.
 
 Note that Caprice32's executable name is "cap32" rather than "caprice32".
 
Index: pkgsrc/emulators/caprice32/Makefile
diff -u pkgsrc/emulators/caprice32/Makefile:1.1 pkgsrc/emulators/caprice32/Makefile:1.2
--- pkgsrc/emulators/caprice32/Makefile:1.1     Fri Mar  6 12:23:01 2020
+++ pkgsrc/emulators/caprice32/Makefile Wed Apr 22 08:13:39 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2020/03/06 12:23:01 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/04/22 08:13:39 nia Exp $
 
-DISTNAME=      caprice32-4.5.0
+DISTNAME=      caprice32-4.6.0
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ColinPitrat/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -38,4 +38,5 @@ NO_SRC_ON_FTP=        ${RESTRICTED}
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/emulators/caprice32/PLIST
diff -u pkgsrc/emulators/caprice32/PLIST:1.1 pkgsrc/emulators/caprice32/PLIST:1.2
--- pkgsrc/emulators/caprice32/PLIST:1.1        Fri Mar  6 12:23:01 2020
+++ pkgsrc/emulators/caprice32/PLIST    Wed Apr 22 08:13:39 2020
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2020/03/06 12:23:01 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/04/22 08:13:39 nia Exp $
 bin/cap32
 man/man6/cap32.6
+share/applications/caprice32.desktop
 share/caprice32/resources/audio.bmp
 share/caprice32/resources/cap32logo.bmp
 share/caprice32/resources/disk.bmp
 share/caprice32/resources/general.bmp
 share/caprice32/resources/input.bmp
+share/caprice32/resources/keymap_de_linux.map
+share/caprice32/resources/keymap_de_win.map
 share/caprice32/resources/keymap_es_linux.map
 share/caprice32/resources/keymap_es_win.map
 share/caprice32/resources/keymap_fr_linux.map
@@ -18,3 +21,5 @@ share/caprice32/resources/vera_mono.ttf
 share/caprice32/resources/vera_sans.ttf
 share/caprice32/resources/video.bmp
 share/examples/caprice32/cap32.cfg
+share/pixmaps/caprice32.png
+@pkgdir share/caprice32/rom
Index: pkgsrc/emulators/caprice32/distinfo
diff -u pkgsrc/emulators/caprice32/distinfo:1.1 pkgsrc/emulators/caprice32/distinfo:1.2
--- pkgsrc/emulators/caprice32/distinfo:1.1     Fri Mar  6 12:23:01 2020
+++ pkgsrc/emulators/caprice32/distinfo Wed Apr 22 08:13:39 2020
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.1 2020/03/06 12:23:01 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/04/22 08:13:39 nia Exp $
 
-SHA1 (caprice32-4.5.0.tar.gz) = c1f824023a0cee23488e238cb518d4b176594ee2
-RMD160 (caprice32-4.5.0.tar.gz) = b803d7f0f8742fc7bb10d23e24c71dbaa7484f6b
-SHA512 (caprice32-4.5.0.tar.gz) = 9f4c2583fa7d5215901765109177eef60c89dc322b59c352473bdc00dabc5d65dba112bcf4c41b47322c98e9b76d11fc7ecdf9e9973c57ba42b6966ceaba5efd
-Size (caprice32-4.5.0.tar.gz) = 577297 bytes
-SHA1 (patch-cap32.cfg) = 862cb8eff1235e3cbd95410a5e2074cf7a48df09
-SHA1 (patch-doc_man6_cap32.6) = 9779e2fb84d22f4f74bb8540872239e4359d0aeb
-SHA1 (patch-makefile) = 8a25b98eeb0e7b2c016628bb3dda0e8a8e084915
-SHA1 (patch-src_cap32.cpp) = c6d6c23f8a0cc59cdecbe63d99cca5b87f1eb274
+SHA1 (caprice32-4.6.0.tar.gz) = 15cf01ea5237260a941d82363677bf61c502e2d5
+RMD160 (caprice32-4.6.0.tar.gz) = 845b37aff8ecacbae43cd90bf181efdee97b2fb6
+SHA512 (caprice32-4.6.0.tar.gz) = b34c1198d56035243d4e07b6099da5ba21bfe6aa2c0955c179d21678b4befc91306aedb212a7e4998ce1fc49333b38f567fc8de229cc7512f035cfc65fa1e9f2
+Size (caprice32-4.6.0.tar.gz) = 591257 bytes
+SHA1 (patch-doc_man6_cap32.6) = 977a6c1ad050123a342bb370e0a30ae28efc0ac1
+SHA1 (patch-makefile) = 2a4ec14d66d66168c325ed4fbf9a259b4477d8ca
+SHA1 (patch-src_cap32.cpp) = 24a5b40809079b81ff23be3983c20dd0391213d9

Index: pkgsrc/emulators/caprice32/patches/patch-doc_man6_cap32.6
diff -u pkgsrc/emulators/caprice32/patches/patch-doc_man6_cap32.6:1.1 pkgsrc/emulators/caprice32/patches/patch-doc_man6_cap32.6:1.2
--- pkgsrc/emulators/caprice32/patches/patch-doc_man6_cap32.6:1.1       Fri Mar  6 12:23:01 2020
+++ pkgsrc/emulators/caprice32/patches/patch-doc_man6_cap32.6   Wed Apr 22 08:13:40 2020
@@ -1,19 +1,19 @@
-$NetBSD: patch-doc_man6_cap32.6,v 1.1 2020/03/06 12:23:01 nia Exp $
+$NetBSD: patch-doc_man6_cap32.6,v 1.2 2020/04/22 08:13:40 nia Exp $
 
 Fix path.
 
---- doc/man6/cap32.6.orig      2019-01-04 19:01:29.000000000 +0000
+--- doc/man6/cap32.6.orig      2020-03-14 14:36:08.000000000 +0000
 +++ doc/man6/cap32.6
-@@ -26,7 +26,7 @@ The \fBrom_path\fR entry in the configur
- .PP
- \fBConfiguration\fR
- .RS
--When launched, Caprice32 will look for a configuration file in several locations. If a configuration file was specified using the \fB\-\-cfg_file\fR command line switch, Caprice32 will try and use 
it. If no configuration file was specified, or the configuration file specified does not exist, Caprice32 will try and open, in this order: \fB$CWD/cap32.cfg\fR ($CWD being the directory where the 
cap32 executable resides), then a \fB.cap32.cfg\fR file in the user home directory, then \fB/etc/cap32.cfg\fR. Caprice32 will use the first valid file it finds. If no configuration file is found, a 
default configuration will be used.
-+When launched, Caprice32 will look for a configuration file in several locations. If a configuration file was specified using the \fB\-\-cfg_file\fR command line switch, Caprice32 will try and use 
it. If no configuration file was specified, or the configuration file specified does not exist, Caprice32 will try and open, in this order: \fB$CWD/cap32.cfg\fR ($CWD being the directory where the 
cap32 executable resides), then a \fB.cap32.cfg\fR file in the user home directory, then \fB@PKG_SYSCONFDIR@/cap32.cfg\fR. Caprice32 will use the first valid file it finds. If no configuration file 
is found, a default configuration will be used.
+@@ -34,7 +34,7 @@ When launched, Caprice32 will look for a
+ .br
+   - \fB$HOME/.cap32.cfg\fR for compatibility. 
+ .br
+-  - \fB/etc/cap32.cfg\fR.
++  - \fB@PKG_SYSCONFDIR@/cap32.cfg\fR.
+ .br
+ Caprice32 will use the first valid file it finds. If no configuration file is found, a default configuration will be used.
  .PP
- The configuration file contains various configuration parameters, some of which can be modified from the GUI.
- When saving the configuration from the GUI, it will be written in the configuration file specified by the \fB\-\-cfg_file\fR switch, if it exists, else in $CWD/cap32.cfg if it exists, otherwise in 
$HOME/.cap32.cfg.
-@@ -138,7 +138,7 @@ The screen capture code uses driedfruit 
+@@ -148,7 +148,7 @@ The screen capture code uses driedfruit 
  .SH FILES
  $HOME/.cap32.cfg
  .br
Index: pkgsrc/emulators/caprice32/patches/patch-makefile
diff -u pkgsrc/emulators/caprice32/patches/patch-makefile:1.1 pkgsrc/emulators/caprice32/patches/patch-makefile:1.2
--- pkgsrc/emulators/caprice32/patches/patch-makefile:1.1       Fri Mar  6 12:23:01 2020
+++ pkgsrc/emulators/caprice32/patches/patch-makefile   Wed Apr 22 08:13:40 2020
@@ -1,18 +1,12 @@
-$NetBSD: patch-makefile,v 1.1 2020/03/06 12:23:01 nia Exp $
+$NetBSD: patch-makefile,v 1.2 2020/04/22 08:13:40 nia Exp $
 
-We pass our own flags.
+- Don't force -O2
+- Use the executable for the "all" target
+- Use BSD_INSTALL_*.
 
---- makefile.orig      2019-01-04 19:01:29.000000000 +0000
+--- makefile.orig      2020-03-14 14:36:08.000000000 +0000
 +++ makefile
-@@ -50,7 +50,6 @@ COMMON_CFLAGS += -DWITH_IPF
- LIBS += $(MINGW_PATH)/bin/$(CAPSIPFDLL)
- endif
- else
--prefix = /usr/local
- TARGET = cap32
- TEST_TARGET = test_runner
- IPATHS = -Isrc/ -Isrc/gui/includes `pkg-config --cflags freetype2` `sdl-config --cflags` `pkg-config --cflags libpng`
-@@ -97,7 +96,7 @@ TEST_OBJECTS:=$(TEST_DEPENDS:.d=.o)
+@@ -104,7 +104,7 @@ TEST_OBJECTS:=$(TEST_DEPENDS:.d=.o)
  WARNINGS = -Wall -Wextra -Wzero-as-null-pointer-constant -Wformat=2 -Wold-style-cast -Wmissing-include-dirs -Wlogical-op -Woverloaded-virtual -Wpointer-arith -Wredundant-decls
  COMMON_CFLAGS += $(CFLAGS) -std=c++11 $(IPATHS)
  DEBUG_FLAGS = -Werror -g -O0 -DDEBUG
@@ -21,7 +15,7 @@ We pass our own flags.
  BUILD_FLAGS = $(RELEASE_FLAGS)
  
  debug: BUILD_FLAGS:=$(DEBUG_FLAGS)
-@@ -117,7 +116,7 @@ ifdef DEBUG
+@@ -124,7 +124,7 @@ ifdef DEBUG
  BUILD_FLAGS = $(DEBUG_FLAGS)
  all: check_deps debug
  else
@@ -30,7 +24,7 @@ We pass our own flags.
  endif
  
  # gtest doesn't build with warnings flags, hence the COMMON_CFLAGS
-@@ -204,11 +203,15 @@ distrib: $(TARGET)
+@@ -211,11 +211,19 @@ distrib: $(TARGET)
        ln -s caprice32-$(VERSION).tar.bz2 $(ARCHIVE)/caprice32_$(VERSION).orig.tar.bz2 || true
  
  install: $(TARGET)
@@ -46,7 +40,11 @@ We pass our own flags.
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/examples/caprice32
 +      $(BSD_INSTALL_DATA) cap32.cfg $(DESTDIR)$(prefix)/share/examples/caprice32/cap32.cfg
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/caprice32/resources
-+      $(BSD_INSTALL_DATA) resources/* $(DESTDIR)$(prefix)/share/caprice32/resources
++      $(BSD_INSTALL_DATA) resources/*.* $(DESTDIR)$(prefix)/share/caprice32/resources
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/pixmaps
++      $(BSD_INSTALL_DATA) resources/freedesktop/caprice32.png $(DESTDIR)$(prefix)/share/pixmaps
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/applications
++      $(BSD_INSTALL_DATA) resources/freedesktop/caprice32.desktop $(DESTDIR)$(prefix)/share/applications
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/caprice32/rom
  endif
  
Index: pkgsrc/emulators/caprice32/patches/patch-src_cap32.cpp
diff -u pkgsrc/emulators/caprice32/patches/patch-src_cap32.cpp:1.1 pkgsrc/emulators/caprice32/patches/patch-src_cap32.cpp:1.2
--- pkgsrc/emulators/caprice32/patches/patch-src_cap32.cpp:1.1  Fri Mar  6 12:23:01 2020
+++ pkgsrc/emulators/caprice32/patches/patch-src_cap32.cpp      Wed Apr 22 08:13:40 2020
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_cap32.cpp,v 1.1 2020/03/06 12:23:01 nia Exp $
+$NetBSD: patch-src_cap32.cpp,v 1.2 2020/04/22 08:13:40 nia Exp $
 
 Fix paths.
 
---- src/cap32.cpp.orig 2019-01-04 19:01:29.000000000 +0000
+--- src/cap32.cpp.orig 2020-03-14 14:36:08.000000000 +0000
 +++ src/cap32.cpp
-@@ -1578,7 +1578,7 @@ std::string getConfigurationFilename(boo
-         configFilename = std::string(getenv("HOME")) + "/.cap32.cfg";
-         // If still not found, look for cap32.cfg in /etc
-         if (!forWrite && access(configFilename.c_str(), F_OK) != 0) {
--           configFilename = "/etc/cap32.cfg";
-+           configFilename = "@PKG_SYSCONFDIR@/cap32.cfg";
-         }
-      }
-   }
+@@ -1577,7 +1577,7 @@ std::string getConfigurationFilename(boo
+     { getenv("XDG_CONFIG_HOME"), "/cap32.cfg" },
+     { getenv("HOME"), "/.config/cap32.cfg" },
+     { getenv("HOME"), "/.cap32.cfg" },
+-    { PATH_OK, "/etc/cap32.cfg"}
++    { PATH_OK, "@PKG_SYSCONFDIR@/cap32.cfg"}
+   };
+ 
+   for(const auto& p: configPaths){

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index