CVS commit: pkgsrc/emulators

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Fri, 17 Nov 2023 09:27:51 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Nov 17 09:27:51 UTC 2023

Modified Files:
        pkgsrc/emulators/flycast: Makefile Makefile.common distinfo options.mk
        pkgsrc/emulators/flycast/patches: patch-CMakeLists.txt
        pkgsrc/emulators/libretro-flycast: Makefile
Added Files:
        pkgsrc/emulators/flycast/patches: patch-core_deps_khronos_GL4_gl3w.c
Removed Files:
        pkgsrc/emulators/flycast/patches: patch-core_khronos_GL4_gl3w.c
            patch-core_linux_context.cpp patch-core_log_StringUtil.h

Log Message:
[libretro-]flycast: Update to 2.2

What's New

     * Naomi F355 multiboard
     * Sega SystemSP emulation
     * Virtua Fighter 4 RFID card support. VF.Net emulation server
     * Naomi touchscreen (Manic Panic Ghosts, Touch de Uno 1 & 2, Touch de
       zunou)
     * Hopper for Kick'4'Cash, Shootout Pool and Club Kart Prize
     * F355 Deluxe and Touch de Uno 1 & 2 printer
     * Sega Driving Simulator
     * Android Scoped Storage
     * SH4 under/overclock option
     * Mushiking series
     * Naomi Alien Front worldwide ranking server
     * NetDIMM 3.7 networking high-level emulation
     * Racing Controller, Fishing Controller, Maracas, Densha de Go
       controller, Pop'n'Music Controller (@AltoRetrato)
     * Real time Video Routing for streamers (@vkedwardli)
     * SystemSP RFID chip emulation: Dinosaur King, Love & Berry
     * Dreamcast 32 MB RAM option (@cepawiel)

What's Improved

     * Support for Windows CE games on 32-bit x86 arch
     * Hotkeys for Save and Load State
     * Force feedback info netcast to Boomlangnz's FFB plugin: F355, 18
       Wheeler, Club Kart, King of Route 66
     * Use a gamepad with arcade lightgun games
     * Per-game VMU A1 option
     * Improved detection of Windows CE games
     * Latin-1 and Asian fonts support in HLE BIOS
     * Video centering support (San Francisco Rush 2049, Street Fighter III -
       3rd strike, Metropolis Street Racer)
     * Daytona USA networking
     * Eldorado Gate 4 to 7 compatibility
     * Implement dithering in Full Framebuffer Emulation mode
     * Upgrade dependencies, build improvements, and more thanks to @scribam
     * And many, many, many bug fixes thanks to @kihato and all bug reporters


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/flycast/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/flycast/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/flycast/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/flycast/options.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/emulators/flycast/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/flycast/patches/patch-core_deps_khronos_GL4_gl3w.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/emulators/flycast/patches/patch-core_khronos_GL4_gl3w.c \
    pkgsrc/emulators/flycast/patches/patch-core_linux_context.cpp \
    pkgsrc/emulators/flycast/patches/patch-core_log_StringUtil.h
cvs rdiff -u -r1.9 -r1.10 pkgsrc/emulators/libretro-flycast/Makefile

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

Modified files:

Index: pkgsrc/emulators/flycast/Makefile
diff -u pkgsrc/emulators/flycast/Makefile:1.3 pkgsrc/emulators/flycast/Makefile:1.4
--- pkgsrc/emulators/flycast/Makefile:1.3       Wed Nov  8 13:19:05 2023
+++ pkgsrc/emulators/flycast/Makefile   Fri Nov 17 09:27:51 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.3 2023/11/08 13:19:05 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2023/11/17 09:27:51 nia Exp $
 
-PKGREVISION= 2
 .include "Makefile.common"
 
 MAINTAINER=    nia%NetBSD.org@localhost
@@ -9,13 +8,13 @@ COMMENT=      Sega Dreamcast/Naomi/Atomiswave
 NOT_PAX_MPROTECT_SAFE+=        bin/flycast
 
 .include "options.mk"
-.include "../../mk/bsd.fast.prefs.mk"
-.if ${OPSYS} != "Darwin"
-.  include "../../www/curl/buildlink3.mk"
-.endif
 .include "../../audio/libao/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} != "Darwin"
+.  include "../../lang/lua52/buildlink3.mk"
+.  include "../../www/curl/buildlink3.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/flycast/Makefile.common
diff -u pkgsrc/emulators/flycast/Makefile.common:1.4 pkgsrc/emulators/flycast/Makefile.common:1.5
--- pkgsrc/emulators/flycast/Makefile.common:1.4        Fri Aug  4 14:27:56 2023
+++ pkgsrc/emulators/flycast/Makefile.common    Fri Nov 17 09:27:51 2023
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.4 2023/08/04 14:27:56 nia Exp $
+# $NetBSD: Makefile.common,v 1.5 2023/11/17 09:27:51 nia Exp $
 # used by emulators/flycast/Makefile
 # used by emulators/libretro-flycast/Makefile
 
-DISTNAME=      flycast-2.1
+DISTNAME=      flycast-2.2
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=flyinghead/}
 GITHUB_PROJECT=        flycast
-GITHUB_TAG=    V${PKGVERSION_NOREV}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 HOMEPAGE=      https://github.com/flyinghead/flycast
 LICENSE=       gnu-gpl-v2
@@ -23,9 +23,11 @@ USE_LANGUAGES=       c c++
 GCC_REQD+=     10
 
 CMAKE_ARGS+=   -DUSE_HOST_LIBZIP=ON
+CMAKE_ARGS+=   -DUSE_HOST_SDL=ON
 CMAKE_ARGS+=   -DUSE_VULKAN=OFF
 CMAKE_ARGS+=   -DUSE_DX9=OFF
 CMAKE_ARGS+=   -DUSE_DX11=OFF
+CMAKE_ARGS+=   -DWITH_SYSTEM_ZLIB=ON
 
 CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
 
@@ -34,8 +36,8 @@ PATCHDIR=     ${.CURDIR}/../../emulators/fly
 
 USE_CXX_FEATURES+=     c++17
 
-GITHUB_SUBMODULES+=    rtissera libchdr 2781322c4a7f8315c5fd6499129ad4b718e35843 core/deps/libchdr
-GITHUB_SUBMODULES+=    flyinghead mingw-breakpad 4c3d5fce1a4fef4decfbfeaf20f3746ecd209775 core/deps/breakpad
+GITHUB_SUBMODULES+=    flyinghead libchdr 925400c4c4b67bafdff8dfad9a1474b22d980777 core/deps/libchdr
+GITHUB_SUBMODULES+=    flyinghead mingw-breakpad 1ab24bcc817ebe629bf77daa53529d02361cb1e9 core/deps/breakpad
 GITHUB_SUBMODULES+=    vinniefalco LuaBridge fab7b33b896a42dcc865ba5ecdbacd9f40 core/deps/luabridge
 
 .include "../../archivers/libzip/buildlink3.mk"

Index: pkgsrc/emulators/flycast/distinfo
diff -u pkgsrc/emulators/flycast/distinfo:1.2 pkgsrc/emulators/flycast/distinfo:1.3
--- pkgsrc/emulators/flycast/distinfo:1.2       Fri Jul  7 07:31:50 2023
+++ pkgsrc/emulators/flycast/distinfo   Fri Nov 17 09:27:51 2023
@@ -1,19 +1,17 @@
-$NetBSD: distinfo,v 1.2 2023/07/07 07:31:50 nia Exp $
+$NetBSD: distinfo,v 1.3 2023/11/17 09:27:51 nia Exp $
 
-BLAKE2s (flycast-2.1.tar.gz) = 00b437bf7ff8731b0784cbc919641a1ead0c518f49e146a3ed82faa8e4f1cf49
-SHA512 (flycast-2.1.tar.gz) = 98db9c4c2b843bbfd3a6b9d15ed1d487891c42e4c91113f6167c5afcbf0bcd70a034e1d488c2ec0c74e71fc829a117d7f61f0a094cf25326b655be94e8a6e556
-Size (flycast-2.1.tar.gz) = 13006518 bytes
-BLAKE2s (flyinghead-mingw-breakpad-4c3d5fce1a4fef4decfbfeaf20f3746ecd209775.tar.gz) = a4f0710f929156a43117286b72de0f7b9a70ed39b4ded3d4f6b1528d10906470
-SHA512 (flyinghead-mingw-breakpad-4c3d5fce1a4fef4decfbfeaf20f3746ecd209775.tar.gz) = 
0eb0b9fff44c87a6cbb55e958de8ba8a4e32a4a30dac58472a04dd3a143e6a3d980de5bda5740c4b82561296e236b655b76159e6b74868248b0c5a8c8b36b044
-Size (flyinghead-mingw-breakpad-4c3d5fce1a4fef4decfbfeaf20f3746ecd209775.tar.gz) = 5384166 bytes
-BLAKE2s (rtissera-libchdr-2781322c4a7f8315c5fd6499129ad4b718e35843.tar.gz) = 3d2bd14f6aa24f0102b7f1dbacbd1826625baa1b1e7585353ec44aaae2940cf2
-SHA512 (rtissera-libchdr-2781322c4a7f8315c5fd6499129ad4b718e35843.tar.gz) = 
49bf3133667dde34ddb1e84c52f65d1d132c2e55f32685175465ee224202321e153c63c605154a3e9b1f57e7c108c94f88c57e30478537f86c6845760428ccb1
-Size (rtissera-libchdr-2781322c4a7f8315c5fd6499129ad4b718e35843.tar.gz) = 416898 bytes
+BLAKE2s (flycast-2.2.tar.gz) = 3df8031cf57a9031883ebe03c2d0812f71e6f48025d1f7fee6401992a6a41d6a
+SHA512 (flycast-2.2.tar.gz) = 23415ca804f9a6b3c77cf5c94c8de2813b8ce15ad04b9a726a3817cb81a84de2a6c3057684c18832955f2bf537ca30f5bff7ae34c26bd3684bb68723143d6b74
+Size (flycast-2.2.tar.gz) = 14510385 bytes
+BLAKE2s (flyinghead-libchdr-925400c4c4b67bafdff8dfad9a1474b22d980777.tar.gz) = fe973a99dc88e956e7ced84d2bcd10461abaebb409efc00da762354991554359
+SHA512 (flyinghead-libchdr-925400c4c4b67bafdff8dfad9a1474b22d980777.tar.gz) = 
2c439fd1f8b1e97deaf2b92968ec069c067e8824bacb03f2a65570eec032d3af9ff2b2f28eb2066d4ab25b5c8e90fc87462de47c53b7b86b6839b39850fe7235
+Size (flyinghead-libchdr-925400c4c4b67bafdff8dfad9a1474b22d980777.tar.gz) = 1748616 bytes
+BLAKE2s (flyinghead-mingw-breakpad-1ab24bcc817ebe629bf77daa53529d02361cb1e9.tar.gz) = 8ac9757b984e33bd7d486f0719758671e07aab5101c3ad3b80cecc8eeb7c04c6
+SHA512 (flyinghead-mingw-breakpad-1ab24bcc817ebe629bf77daa53529d02361cb1e9.tar.gz) = 
57f0ef0f5f05343d516c1bcc2af372d02c535dfbdb25d6dc0d8a4587411385d5da3c73383e1a61d30ba028fff8f806bf0a337a278f214caee79d50868aa568ed
+Size (flyinghead-mingw-breakpad-1ab24bcc817ebe629bf77daa53529d02361cb1e9.tar.gz) = 5383206 bytes
 BLAKE2s (vinniefalco-LuaBridge-fab7b33b896a42dcc865ba5ecdbacd9f40.tar.gz) = 2b0d728012815bb58fa974be88e37abaf37e8509eec9fa68356a2eff9616954d
 SHA512 (vinniefalco-LuaBridge-fab7b33b896a42dcc865ba5ecdbacd9f40.tar.gz) = 
b47ac42637d615bd6497a8d09f6c7c6e8f7a762b80fc1a4b284cb65754302def2a7b1339c8aeb146900ad5ad247a5b33fb381ce07451f97b60a155f7f1b41a9a
 Size (vinniefalco-LuaBridge-fab7b33b896a42dcc865ba5ecdbacd9f40.tar.gz) = 543800 bytes
-SHA1 (patch-CMakeLists.txt) = 72339dbcf395a8a91c1684700cfb61d9165f1e7d
-SHA1 (patch-core_khronos_GL4_gl3w.c) = 83f5d38c3cdcb6ffaf4a0d7ff45a2185d55dec33
-SHA1 (patch-core_linux_context.cpp) = 4640cb74d38f0919deadd7efc740b353dc387571
-SHA1 (patch-core_log_StringUtil.h) = dc0cf0ee8a6926ca2e63b01e636c49646c534cf3
+SHA1 (patch-CMakeLists.txt) = d33897aa0b53fdf1f559909b6e194263c9489f5d
+SHA1 (patch-core_deps_khronos_GL4_gl3w.c) = f987eb1415f9155b590a7d319ba2aa2994973236
 SHA1 (patch-core_rend_gui.cpp) = 8cf1beb83758dc72e1ceb4097f660449400fb666

Index: pkgsrc/emulators/flycast/options.mk
diff -u pkgsrc/emulators/flycast/options.mk:1.1 pkgsrc/emulators/flycast/options.mk:1.2
--- pkgsrc/emulators/flycast/options.mk:1.1     Sun Jul  2 17:32:30 2023
+++ pkgsrc/emulators/flycast/options.mk Fri Nov 17 09:27:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/07/02 17:32:30 nia Exp $
+# $NetBSD: options.mk,v 1.2 2023/11/17 09:27:51 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.flycast
 
@@ -7,10 +7,10 @@ PKG_SUGGESTED_OPTIONS.Linux+= alsa
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if !empty(MACHINE_ARCH:M*arm*)
+.if ${MACHINE_ARCH:M*arm*}
 PKG_SUPPORTED_OPTIONS+=                rpi
 .endif
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv6hf)
+.if ${MACHINE_PLATFORM:MNetBSD-*-earmv6hf}
 PKG_SUGGESTED_OPTIONS+=                rpi
 .endif
 

Index: pkgsrc/emulators/flycast/patches/patch-CMakeLists.txt
diff -u pkgsrc/emulators/flycast/patches/patch-CMakeLists.txt:1.2 pkgsrc/emulators/flycast/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/emulators/flycast/patches/patch-CMakeLists.txt:1.2   Fri Jul  7 07:31:50 2023
+++ pkgsrc/emulators/flycast/patches/patch-CMakeLists.txt       Fri Nov 17 09:27:51 2023
@@ -1,41 +1,37 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2023/07/07 07:31:50 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2023/11/17 09:27:51 nia Exp $
 
-- Always prefer SDL2 from pkgsrc.
 - Treat APPLE less specially.
 - Use proper dependencies when building libretro core.
 
---- CMakeLists.txt.orig        2023-02-15 17:59:44.000000000 +0000
+--- CMakeLists.txt.orig        2023-10-27 22:19:54.000000000 +0000
 +++ CMakeLists.txt
-@@ -207,7 +207,7 @@ if(NINTENDO_SWITCH)
- endif()
- 
- if(NOT LIBRETRO)
--      if((WIN32 AND NOT MSVC) OR (UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|OpenBSD|NetBSD)"))
-+      if((WIN32 AND NOT MSVC) OR (CMAKE_SYSTEM_NAME MATCHES "Linux"))
-               add_subdirectory(core/deps/breakpad)
-               if(WIN32)
-                       target_link_options(${PROJECT_NAME} PRIVATE "-Wl,--build-id")
-@@ -356,9 +356,7 @@ if(NOT LIBRETRO)
-       endif()
- 
-       if(NOT ANDROID AND NOT IOS)
--              if(NOT APPLE AND (NOT UNIX OR CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|OpenBSD|NetBSD)"))
--                      find_package(SDL2)
--              endif()
-+              find_package(SDL2)
-               if(NOT SDL2_FOUND)
-                       add_subdirectory(core/deps/SDL EXCLUDE_FROM_ALL)
-                       set(SDL2_FOUND 1)
-@@ -395,7 +393,7 @@ if(NOT LIBRETRO)
+@@ -429,12 +429,6 @@ if(NOT LIBRETRO)
+               endif()
        endif()
  
-       find_package(Lua)
--      if(NOT APPLE AND LUA_FOUND)
-+      if(LUA_FOUND)
+-      find_package(ZLIB)
+-      if(TARGET ZLIB::ZLIB AND NOT ANDROID AND (NOT WIN32 OR WINDOWS_STORE))
+-              set(WITH_SYSTEM_ZLIB ON CACHE BOOL "Use system provided zlib library")
+-              target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
+-      endif()
+-
+       find_package(Lua 5.2)
+       if(NOT APPLE AND LUA_FOUND)
                target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA)
-               target_include_directories(${PROJECT_NAME} PRIVATE ${LUA_INCLUDE_DIR} core/deps/luabridge/Source)
-               list(TRANSFORM LUA_LIBRARIES REPLACE "\.dll" "")
-@@ -418,7 +416,7 @@ if(NOT WITH_SYSTEM_ZLIB)
+@@ -448,6 +442,12 @@ add_subdirectory(core/deps/libchdr EXCLU
+ target_link_libraries(${PROJECT_NAME} PRIVATE chdr-static)
+ target_include_directories(${PROJECT_NAME} PRIVATE core/deps/libchdr/include)
+ 
++find_package(ZLIB)
++if(TARGET ZLIB::ZLIB AND NOT ANDROID AND (NOT WIN32 OR WINDOWS_STORE))
++      set(WITH_SYSTEM_ZLIB ON CACHE BOOL "Use system provided zlib library")
++      target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
++endif()
++
+ if(NOT WITH_SYSTEM_ZLIB)
+       target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/core/deps/libchdr/deps/zlib-1.2.11")
+       target_link_libraries(${PROJECT_NAME} PRIVATE zlib)
+@@ -459,7 +459,7 @@ if(NOT WITH_SYSTEM_ZLIB)
  endif()
  
  find_package(PkgConfig)
@@ -44,50 +40,27 @@ $NetBSD: patch-CMakeLists.txt,v 1.2 2023
        pkg_check_modules(AO IMPORTED_TARGET ao)
        if(AO_FOUND)
                target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LIBAO)
-@@ -445,22 +443,22 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND 
+@@ -485,7 +485,9 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND 
+               target_compile_definitions(${PROJECT_NAME} PRIVATE USE_PULSEAUDIO)
                target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBPULSE)
        endif()
- 
--      if(USE_HOST_LIBZIP)
--              pkg_check_modules(LIBZIP IMPORTED_TARGET libzip)
--              if(LIBZIP_FOUND)
--                      target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBZIP)
--              endif()
--      endif()
--
-       if(ENABLE_OPROFILE)
-               target_compile_definitions(${PROJECT_NAME} PRIVATE DYNA_OPROF)
-               target_link_libraries(${PROJECT_NAME} PRIVATE opagent)
-       endif()
 +endif()
  
--      find_package(MiniUPnPc)
--      if(MINIUPNP_FOUND)
--              target_include_directories(${PROJECT_NAME} PRIVATE ${MINIUPNP_INCLUDE_DIRS})
--              target_link_libraries(${PROJECT_NAME} PRIVATE ${MINIUPNP_LIBRARIES})
-+find_package(MiniUPnPc)
-+if(MINIUPNP_FOUND)
-+      target_include_directories(${PROJECT_NAME} PRIVATE ${MINIUPNP_INCLUDE_DIRS})
-+      target_link_libraries(${PROJECT_NAME} PRIVATE ${MINIUPNP_LIBRARIES})
-+endif()
-+
-+if(USE_HOST_LIBZIP)
-+      pkg_check_modules(LIBZIP IMPORTED_TARGET libzip)
-+      if(LIBZIP_FOUND)
-+              target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBZIP)
-       endif()
++if(PKG_CONFIG_FOUND)
+       if(USE_HOST_LIBZIP)
+               pkg_check_modules(LIBZIP IMPORTED_TARGET libzip)
+               if(LIBZIP_FOUND)
+@@ -510,7 +512,7 @@ if(NINTENDO_SWITCH AND USE_GLES)
+       target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::GLESV2)
  endif()
  
-@@ -1664,10 +1662,14 @@ if(IOS)
- elseif(NINTENDO_SWITCH AND NOT LIBRETRO)
-       install(FILES ${CMAKE_BINARY_DIR}/flycast.nro DESTINATION "${CMAKE_INSTALL_BINDIR}")
- else()
--      install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}")
-+      if(NOT LIBRETRO)
-+              install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}")
-+      else()
-+              install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}/libretro")
-+      endif()
+-if(UNIX AND NOT APPLE AND NOT ANDROID)
++if(UNIX AND NOT ANDROID)
+       add_definitions(
+               -DFLYCAST_DATADIR="${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}/"
+               -DFLYCAST_SYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}/${PROJECT_NAME}/"
+@@ -1795,7 +1797,7 @@ else()
+       install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}")
  endif()
  
 -if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT LIBRETRO)

Index: pkgsrc/emulators/libretro-flycast/Makefile
diff -u pkgsrc/emulators/libretro-flycast/Makefile:1.9 pkgsrc/emulators/libretro-flycast/Makefile:1.10
--- pkgsrc/emulators/libretro-flycast/Makefile:1.9      Wed Nov  8 13:19:06 2023
+++ pkgsrc/emulators/libretro-flycast/Makefile  Fri Nov 17 09:27:51 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.9 2023/11/08 13:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2023/11/17 09:27:51 nia Exp $
 
-PKGREVISION= 2
 .include "../../emulators/flycast/Makefile.common"
 
 PKGNAME=       libretro-${DISTNAME}
@@ -9,6 +8,7 @@ MAINTAINER=     nia%NetBSD.org@localhost
 COMMENT=       Libretro core based on the Flycast Sega Dreamcast emulator
 
 CMAKE_ARGS+=   -DLIBRETRO=ON
+CMAKE_ARGS+=   -DCMAKE_INSTALL_BINDIR=lib/libretro
 
 .include "options.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/emulators/flycast/patches/patch-core_deps_khronos_GL4_gl3w.c
diff -u /dev/null pkgsrc/emulators/flycast/patches/patch-core_deps_khronos_GL4_gl3w.c:1.1
--- /dev/null   Fri Nov 17 09:27:51 2023
+++ pkgsrc/emulators/flycast/patches/patch-core_deps_khronos_GL4_gl3w.c Fri Nov 17 09:27:51 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-core_deps_khronos_GL4_gl3w.c,v 1.1 2023/11/17 09:27:51 nia Exp $
+
+Support OpenGL on NetBSD - so version differs between xsrc and pkgsrc.
+
+--- core/deps/khronos/GL4/gl3w.c.orig  2023-10-27 22:19:54.000000000 +0000
++++ core/deps/khronos/GL4/gl3w.c
+@@ -115,7 +115,7 @@ static GL3WglProc (*glx_get_proc_address
+ 
+ static int open_libgl(void)
+ {
+-#if defined(__OpenBSD__)
++#if defined(__OpenBSD__) || defined(__NetBSD__)
+       libgl = dlopen("libGL.so", RTLD_LAZY | RTLD_LOCAL);
+ #else
+       libgl = dlopen("libGL.so.1", RTLD_LAZY | RTLD_LOCAL);

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