CVS commit: pkgsrc/emulators/fceu

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Apr 29 07:52:16 UTC 2024

Modified Files:
        pkgsrc/emulators/fceu: Makefile distinfo
Added Files:
        pkgsrc/emulators/fceu/patches: patch-src_drivers_common_hq3x.c

Log Message:
fceu: Fix building with modern compilers. Set LICENSE.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/emulators/fceu/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/emulators/fceu/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/fceu/patches/patch-src_drivers_common_hq3x.c

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

Modified files:

Index: pkgsrc/emulators/fceu/Makefile
diff -u pkgsrc/emulators/fceu/Makefile:1.22 pkgsrc/emulators/fceu/Makefile:1.23
--- pkgsrc/emulators/fceu/Makefile:1.22 Wed Apr 15 08:43:23 2020
+++ pkgsrc/emulators/fceu/Makefile      Mon Apr 29 07:52:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/04/15 08:43:23 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2024/04/29 07:52:16 nia Exp $
 
 DISTNAME=              fceu-0.98.13.src
 PKGNAME=               ${DISTNAME:S/.src//}
@@ -10,6 +10,7 @@ EXTRACT_SUFX=         .tar.bz2
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 #HOMEPAGE=             http://pdaxrom.theinternet.nl/fceu/
 COMMENT=               Portable NES and Famicom emulator
+LICENSE=               gnu-gpl-v2
 
 WRKSRC=                        ${WRKDIR}/fceu
 USE_PKGLOCALEDIR=      yes

Index: pkgsrc/emulators/fceu/distinfo
diff -u pkgsrc/emulators/fceu/distinfo:1.12 pkgsrc/emulators/fceu/distinfo:1.13
--- pkgsrc/emulators/fceu/distinfo:1.12 Tue Oct 26 10:23:49 2021
+++ pkgsrc/emulators/fceu/distinfo      Mon Apr 29 07:52:16 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 10:23:49 nia Exp $
+$NetBSD: distinfo,v 1.13 2024/04/29 07:52:16 nia Exp $
 
 BLAKE2s (fceu-0.98.13.src.tar.bz2) = 8dd1d1cc107486bbeab051ab87c7c4a6eaf2b9f165656e1418246fe8b335aa1c
 SHA512 (fceu-0.98.13.src.tar.bz2) = f848f8752637f0aa4cd9aef9c539be7b4a35ad609bceb599c76ae02f48e3a87cffb3b066235b96e91c4bda2196945aecdfa4e129d314419cfce7c46f74afb4b0
@@ -7,4 +7,5 @@ SHA1 (patch-aa) = 31ce24167b8f76df2961ce
 SHA1 (patch-ac) = 8a5297b11484c6eaf5d70a391bb486ff58475f35
 SHA1 (patch-af) = a2b55359d65c60ecb7e7d79390ef872873c0eba1
 SHA1 (patch-ah) = cc48e36406b6d9e4cf88179510824135507aa6f9
+SHA1 (patch-src_drivers_common_hq3x.c) = b2bfe78d66db7ff5676a0ca2ba6d0fdaefc30c0f
 SHA1 (patch-src_file.c) = 6a801513eae47f30eb5f9b7857c7b40b30063129

Added files:

Index: pkgsrc/emulators/fceu/patches/patch-src_drivers_common_hq3x.c
diff -u /dev/null pkgsrc/emulators/fceu/patches/patch-src_drivers_common_hq3x.c:1.1
--- /dev/null   Mon Apr 29 07:52:16 2024
+++ pkgsrc/emulators/fceu/patches/patch-src_drivers_common_hq3x.c       Mon Apr 29 07:52:16 2024
@@ -0,0 +1,46 @@
+$NetBSD: patch-src_drivers_common_hq3x.c,v 1.1 2024/04/29 07:52:16 nia Exp $
+
+Make these functions static and let the compiler make decisions about
+inlining.  Fixes linking problems when built with modern GCC.
+
+--- src/drivers/common/hq3x.c.orig     2024-04-15 16:53:41.787889567 +0000
++++ src/drivers/common/hq3x.c
+@@ -33,17 +33,17 @@ static const  int   trY   = 0x00300000;
+ static const  int   trU   = 0x00000700;
+ static const  int   trV   = 0x00000006;
+ 
+-inline void Interp1(unsigned char * pc, int c1, int c2)
++static void Interp1(unsigned char * pc, int c1, int c2)
+ {
+   *((int*)pc) = (c1*3+c2) >> 2;
+ }
+ 
+-inline void Interp2(unsigned char * pc, int c1, int c2, int c3)
++static void Interp2(unsigned char * pc, int c1, int c2, int c3)
+ {
+   *((int*)pc) = (c1*2+c2+c3) >> 2;
+ }
+ 
+-inline void Interp3(unsigned char * pc, int c1, int c2)
++static void Interp3(unsigned char * pc, int c1, int c2)
+ {
+   //*((int*)pc) = (c1*7+c2)/8;
+ 
+@@ -51,7 +51,7 @@ inline void Interp3(unsigned char * pc, 
+                  (((c1 & 0xFF00FF)*7 + (c2 & 0xFF00FF) ) & 0x07F807F8)) >> 3;
+ }
+ 
+-inline void Interp4(unsigned char * pc, int c1, int c2, int c3)
++static void Interp4(unsigned char * pc, int c1, int c2, int c3)
+ {
+   //*((int*)pc) = (c1*2+(c2+c3)*7)/16;
+ 
+@@ -59,7 +59,7 @@ inline void Interp4(unsigned char * pc, 
+                  (((c1 & 0xFF00FF)*2 + ((c2 & 0xFF00FF) + (c3 & 0xFF00FF))*7 ) & 0x0FF00FF0)) >> 4;
+ }
+ 
+-inline void Interp5(unsigned char * pc, int c1, int c2)
++static void Interp5(unsigned char * pc, int c1, int c2)
+ {
+   *((int*)pc) = (c1+c2) >> 1;
+ }