CVS commit: [pkgsrc-2024Q4] pkgsrc/emulators/picodrive

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Thu Jan 16 19:31:13 UTC 2025

Modified Files:
        pkgsrc/emulators/picodrive [pkgsrc-2024Q4]: Makefile Makefile.common

Log Message:
Pullup ticket #6930 - requested by gutteridge
emulators/picodrive: build fix

Revisions pulled up:
- emulators/picodrive/Makefile                                  1.3
- emulators/picodrive/Makefile.common                           1.3

---
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Thu Dec 26 02:32:39 UTC 2024

   Modified Files:
            pkgsrc/emulators/picodrive: Makefile.common

   Log Message:
   picodrive: fix reversed -march and -mfpu settings for ARM

---
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Tue Jan  7 02:46:56 UTC 2025

   Modified Files:
            pkgsrc/emulators/picodrive: Makefile

   Log Message:
   picodrive: requires (external) zlib for Unix builds


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.6.1 pkgsrc/emulators/picodrive/Makefile
cvs rdiff -u -r1.2 -r1.2.2.1 pkgsrc/emulators/picodrive/Makefile.common

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

Modified files:

Index: pkgsrc/emulators/picodrive/Makefile
diff -u pkgsrc/emulators/picodrive/Makefile:1.1 pkgsrc/emulators/picodrive/Makefile:1.1.6.1
--- pkgsrc/emulators/picodrive/Makefile:1.1     Fri Apr 26 09:04:31 2024
+++ pkgsrc/emulators/picodrive/Makefile Thu Jan 16 19:31:12 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2024/04/26 09:04:31 nia Exp $
+# $NetBSD: Makefile,v 1.1.6.1 2025/01/16 19:31:12 bsiegert Exp $
 
 DISTNAME=      PicoDrive_1.93
 PKGNAME=       ${DISTNAME:tl:S/_/-/1}
+PKGREVISION=   2
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=notaz/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
@@ -58,6 +59,7 @@ do-install:
                ${DESTDIR}${PREFIX}/share/picodrive/skin
 
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/emulators/picodrive/Makefile.common
diff -u pkgsrc/emulators/picodrive/Makefile.common:1.2 pkgsrc/emulators/picodrive/Makefile.common:1.2.2.1
--- pkgsrc/emulators/picodrive/Makefile.common:1.2      Sun Dec 22 13:31:54 2024
+++ pkgsrc/emulators/picodrive/Makefile.common  Thu Jan 16 19:31:12 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2024/12/22 13:31:54 nia Exp $
+# $NetBSD: Makefile.common,v 1.2.2.1 2025/01/16 19:31:12 bsiegert Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -6,7 +6,7 @@ NOT_FOR_PLATFORM=       ${BIGENDIANPLATFORMS}
 
 .if ${MACHINE_ARCH} == "earmv7hf"
 # Avoid mixing in Thumb code with Picodrive's ARM asm.
-CFLAGS+=       -marm -mfpu=vfp -march=armv6 -fno-use-linker-plugin
+CFLAGS+=       -marm -mfpu=neon -march=armv7-a -fno-use-linker-plugin
 MAKE_FLAGS+=   ARCH=arm
 MAKE_FLAGS+=   ARM_ASM=1
 MAKE_FLAGS+=   use_cyclone=0
@@ -16,7 +16,7 @@ MAKE_FLAGS+=  use_cz80=1
 MAKE_FLAGS+=   use_sh2drc=1
 MAKE_FLAGS+=   use_svpdrc=1
 .elif ${MACHINE_ARCH} == "earmv6hf"
-CFLAGS+=       -marm -mfpu=neon -march=armv7-a -fno-use-linker-plugin
+CFLAGS+=       -marm -mfpu=vfp -march=armv6 -fno-use-linker-plugin
 MAKE_FLAGS+=   ARCH=arm
 MAKE_FLAGS+=   ARM_ASM=1
 MAKE_FLAGS+=   asm_memory=1