Sat May 18 14:58:53 2019 UTC ()
retroarch: Add a patch to fix keyboard input (arrow keys) on NetBSD.

This worked fine before someone replaced the portable X11 input driver
with this monstrosity. This workaround is hopefully temporary since it
probably causes problems on other X11 implementations (using evdev)...

Bump PKGREVISION.


(nia)
diff -r1.22 -r1.23 pkgsrc/emulators/retroarch/Makefile
diff -r1.13 -r1.14 pkgsrc/emulators/retroarch/distinfo
diff -r0 -r1.1 pkgsrc/emulators/retroarch/patches/patch-input_include_xfree86__keycodes.h

cvs diff -r1.22 -r1.23 pkgsrc/emulators/retroarch/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/retroarch/Makefile 2019/05/18 12:27:47 1.22
+++ pkgsrc/emulators/retroarch/Makefile 2019/05/18 14:58:53 1.23
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.22 2019/05/18 12:27:47 nia Exp $ 1# $NetBSD: Makefile,v 1.23 2019/05/18 14:58:53 nia Exp $
2 2
3PKGNAME= retroarch-${RETROARCH_VERSION} 3PKGNAME= retroarch-${RETROARCH_VERSION}
4DISTNAME= RetroArch-${RETROARCH_VERSION} 4DISTNAME= RetroArch-${RETROARCH_VERSION}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= emulators 6CATEGORIES= emulators
7MASTER_SITES= ${MASTER_SITE_GITHUB:=libretro/RetroArch/releases/download/v${RETROARCH_VERSION}/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=libretro/RetroArch/releases/download/v${RETROARCH_VERSION}/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= nia@NetBSD.org 10MAINTAINER= nia@NetBSD.org
11HOMEPAGE= https://www.retroarch.com/ 11HOMEPAGE= https://www.retroarch.com/
12COMMENT= Official reference frontend for the libretro API 12COMMENT= Official reference frontend for the libretro API
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15EXTRACT_USING= bsdtar 15EXTRACT_USING= bsdtar
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_TOOLS+= pkg-config gmake 17USE_TOOLS+= pkg-config gmake
18 18

cvs diff -r1.13 -r1.14 pkgsrc/emulators/retroarch/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/retroarch/distinfo 2019/05/18 12:27:47 1.13
+++ pkgsrc/emulators/retroarch/distinfo 2019/05/18 14:58:53 1.14
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.13 2019/05/18 12:27:47 nia Exp $ 1$NetBSD: distinfo,v 1.14 2019/05/18 14:58:53 nia Exp $
2 2
3SHA1 (RetroArch-1.7.7.tar.xz) = 32288d3cc23319280c80968e9f0446e00f24db19 3SHA1 (RetroArch-1.7.7.tar.xz) = 32288d3cc23319280c80968e9f0446e00f24db19
4RMD160 (RetroArch-1.7.7.tar.xz) = e019c8a6486706e076878adc0510178e5c8d5d81 4RMD160 (RetroArch-1.7.7.tar.xz) = e019c8a6486706e076878adc0510178e5c8d5d81
5SHA512 (RetroArch-1.7.7.tar.xz) = cdb509f12d7b5e7fd71b7d91cb93c43f8c6cb1fb83417f9e23f4edf896db9af1ad07aa99da4467fdac26bbe935da2e9f464a6caf33177ea1f1596f3831ab8312 5SHA512 (RetroArch-1.7.7.tar.xz) = cdb509f12d7b5e7fd71b7d91cb93c43f8c6cb1fb83417f9e23f4edf896db9af1ad07aa99da4467fdac26bbe935da2e9f464a6caf33177ea1f1596f3831ab8312
6Size (RetroArch-1.7.7.tar.xz) = 220787816 bytes 6Size (RetroArch-1.7.7.tar.xz) = 220787816 bytes
7SHA1 (patch-Makefile) = a4dd20cf34724f79e4cc886c5d7a383a11d2e42d 7SHA1 (patch-Makefile) = a4dd20cf34724f79e4cc886c5d7a383a11d2e42d
8SHA1 (patch-audio_drivers_audioio.c) = 50820a7f3fbf7685098efdb794dd4efa485df806 8SHA1 (patch-audio_drivers_audioio.c) = 50820a7f3fbf7685098efdb794dd4efa485df806
9SHA1 (patch-configuration.c) = 58873db839f8f0ed2e011d4c4c75b00e6293c239 9SHA1 (patch-configuration.c) = 58873db839f8f0ed2e011d4c4c75b00e6293c239
10SHA1 (patch-frontend_drivers_platform__unix.c) = e81ba53af2bdd4cecc4007cc9556f06446bf3b3f 10SHA1 (patch-frontend_drivers_platform__unix.c) = e81ba53af2bdd4cecc4007cc9556f06446bf3b3f
 11SHA1 (patch-input_include_xfree86__keycodes.h) = cd3b59122e9075a96fccb01bce2110dfa9cc160e
11SHA1 (patch-qb_config.libs.sh) = 0ec6ab7d49cdcd59c5938276517df1ee0212868e 12SHA1 (patch-qb_config.libs.sh) = 0ec6ab7d49cdcd59c5938276517df1ee0212868e

File Added: pkgsrc/emulators/retroarch/patches/Attic/patch-input_include_xfree86__keycodes.h
$NetBSD: patch-input_include_xfree86__keycodes.h,v 1.1 2019/05/18 14:58:53 nia Exp $

Support non-evdev special keys...

--- input/include/xfree86_keycodes.h.orig	2019-05-08 06:06:23.000000000 +0000
+++ input/include/xfree86_keycodes.h
@@ -101,8 +101,8 @@ enum xfvk_key
    XFVK_LALT           = 64,
    XFVK_LCTL           = 37,
    XFVK_SPCE           = 65,
-   XFVK_RCTL           = 105,
-   XFVK_RALT           = 108,
+   XFVK_RCTL           = 109,
+   XFVK_RALT           = 113,
 
    XFVK_PRSC           = 107,
    /* SYRQ                = 107, */
@@ -110,20 +110,20 @@ enum xfvk_key
    XFVK_PAUS           = 127,
    /* BRK                 = 419, */
 
-   XFVK_INS            = 118,
-   XFVK_HOME           = 110,
-   XFVK_PGUP           = 112,
-   XFVK_DELE           = 119,
-   XFVK_END            = 115,
-   XFVK_PGDN           = 117,
-
-   XFVK_UP             = 111,
-   XFVK_LEFT           = 113,
-   XFVK_DOWN           = 116,
-   XFVK_RGHT           = 114,
+   XFVK_INS            = 106,
+   XFVK_HOME           = 97,
+   XFVK_PGUP           = 99,
+   XFVK_DELE           = 107,
+   XFVK_END            = 103,
+   XFVK_PGDN           = 105,
+
+   XFVK_UP             = 98,
+   XFVK_LEFT           = 100,
+   XFVK_DOWN           = 104,
+   XFVK_RGHT           = 102,
 
    XFVK_NMLK           = 77,
-   XFVK_KPDV           = 106,
+   XFVK_KPDV           = 112,
    XFVK_KPMU           = 63,
    XFVK_KPSU           = 82,
 
@@ -139,26 +139,26 @@ enum xfvk_key
    XFVK_KP1            = 87,
    XFVK_KP2            = 88,
    XFVK_KP3            = 89,
-   XFVK_KPEN           = 104,
+   XFVK_KPEN           = 108,
 
    XFVK_KP0            = 90,
    XFVK_KPDL           = 91,
-   XFVK_KPEQ           = 125,
+   XFVK_KPEQ           = 126,
 
    /* Microsoft keyboard extra keys */
-   XFVK_LWIN           = 133,
-   XFVK_RWIN           = 134,
+   XFVK_LWIN           = 115,
+   XFVK_RWIN           = 116,
    XFVK_COMP           = 135,
-   XFVK_MENU           = XFVK_COMP,
+   XFVK_MENU           = 117,
 
    /* Extended keys */
    XFVK_CALC           = 148,
 
-   XFVK_FK13           = 191,
-   XFVK_FK14           = 192,
-   XFVK_FK15           = 193,
-   XFVK_FK16           = 194,
-   XFVK_FK17           = 195,
+   XFVK_FK13           = 118,
+   XFVK_FK14           = 119,
+   XFVK_FK15           = 120,
+   XFVK_FK16           = 121,
+   XFVK_FK17           = 122,
    XFVK_FK18           = 196,
    XFVK_FK19           = 197,
    XFVK_FK20           = 198,