CVS commit: pkgsrc/emulators/visualboyadvance-m

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators/visualboyadvance-m
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Mon, 29 Apr 2024 09:18:40 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Apr 29 09:18:40 UTC 2024

Modified Files:
        pkgsrc/emulators/visualboyadvance-m: DESCR Makefile PLIST distinfo
Added Files:
        pkgsrc/emulators/visualboyadvance-m/patches: patch-CMakeLists.txt
            patch-src_wx_CMakeLists.txt patch-src_wx_openal.h
Removed Files:
        pkgsrc/emulators/visualboyadvance-m/patches:
            patch-src_filters_xBRZ_xbrz.cpp

Log Message:
visualboyadvance-m: Various build and usability fixes.

- Disable i386 ASM, fails with PIC
- Disable OpenGL on NetBSD - segfaults on NetBSD 10.
  Needs investigation. Maybe Mesa ELF TLS again.
- Improve detection of iconv/gettext.
- Fix build of OpenAL audio plugin (OpenAL audio plugin still
  does not work, but also, this fails to build if you disable it...)

This has been sitting in my tree for a while.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/visualboyadvance-m/DESCR \
    pkgsrc/emulators/visualboyadvance-m/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/emulators/visualboyadvance-m/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/visualboyadvance-m/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/visualboyadvance-m/patches/patch-CMakeLists.txt \
    pkgsrc/emulators/visualboyadvance-m/patches/patch-src_wx_CMakeLists.txt \
    pkgsrc/emulators/visualboyadvance-m/patches/patch-src_wx_openal.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/emulators/visualboyadvance-m/patches/patch-src_filters_xBRZ_xbrz.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/visualboyadvance-m/DESCR
diff -u pkgsrc/emulators/visualboyadvance-m/DESCR:1.1 pkgsrc/emulators/visualboyadvance-m/DESCR:1.2
--- pkgsrc/emulators/visualboyadvance-m/DESCR:1.1       Sun Jun 14 07:45:49 2020
+++ pkgsrc/emulators/visualboyadvance-m/DESCR   Mon Apr 29 09:18:39 2024
@@ -1 +1 @@
-Visual Boy Advance - M is Game Boy and Game Boy Advance Emulator.
+Visual Boy Advance M is a Game Boy and Game Boy Advance emulator.
Index: pkgsrc/emulators/visualboyadvance-m/PLIST
diff -u pkgsrc/emulators/visualboyadvance-m/PLIST:1.1 pkgsrc/emulators/visualboyadvance-m/PLIST:1.2
--- pkgsrc/emulators/visualboyadvance-m/PLIST:1.1       Sun Jun 14 07:45:49 2020
+++ pkgsrc/emulators/visualboyadvance-m/PLIST   Mon Apr 29 09:18:40 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/06/14 07:45:49 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/04/29 09:18:40 nia Exp $
 bin/visualboyadvance-m
 man/man6/visualboyadvance-m.6
 share/appdata/wxvbam.appdata.xml

Index: pkgsrc/emulators/visualboyadvance-m/Makefile
diff -u pkgsrc/emulators/visualboyadvance-m/Makefile:1.20 pkgsrc/emulators/visualboyadvance-m/Makefile:1.21
--- pkgsrc/emulators/visualboyadvance-m/Makefile:1.20   Sun Apr  7 07:33:58 2024
+++ pkgsrc/emulators/visualboyadvance-m/Makefile        Mon Apr 29 09:18:39 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2024/04/07 07:33:58 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2024/04/29 09:18:39 nia Exp $
 
 DISTNAME=      visualboyadvance-m-2.1.4
-PKGREVISION=   16
+PKGREVISION=   17
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=visualboyadvance-m/}
 GITHUB_PROJECT=        visualboyadvance-m
@@ -9,22 +9,29 @@ GITHUB_TAG=   v${PKGVERSION_NOREV}
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://vba-m.com/
-COMMENT=       Game Boy and Game Boy Advance Emulator
+COMMENT=       Game Boy and Game Boy Advance emulator (wxWidgets port)
 LICENSE=       gnu-gpl-v2
 
-.include "../../mk/bsd.prefs.mk"
+# ASM is i386-only, problems with PIE and others
+CMAKE_ARGS+=   -DENABLE_ASM=OFF
+CMAKE_ARGS+=   -DENABLE_ASM_SCALERS=OFF
+CMAKE_ARGS+=   -DENABLE_LINK=OFF
+CMAKE_ARGS+=   -DENABLE_LTO=OFF
+CMAKE_ARGS+=   -DENABLE_MMX=OFF
 
-.if ${MACHINE_ARCH} == "i386"
-TOOL_DEPENDS+= nasm-[0-9]*:../../devel/nasm
-.endif
-
-USE_CMAKE=             yes
 USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            pkg-config msgmerge zip
 
+USE_CXX_FEATURES+=     c++17
+
+.include "../../devel/cmake/build.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/visualboyadvance-m/distinfo
diff -u pkgsrc/emulators/visualboyadvance-m/distinfo:1.4 pkgsrc/emulators/visualboyadvance-m/distinfo:1.5
--- pkgsrc/emulators/visualboyadvance-m/distinfo:1.4    Tue Oct 26 10:24:14 2021
+++ pkgsrc/emulators/visualboyadvance-m/distinfo        Mon Apr 29 09:18:40 2024
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:24:14 nia Exp $
+$NetBSD: distinfo,v 1.5 2024/04/29 09:18:40 nia Exp $
 
 BLAKE2s (visualboyadvance-m-2.1.4.tar.gz) = ffbfbdf69f7f5df30e8dea8cb2983932c78a60dfde08275ddbb1a129803bd0b9
 SHA512 (visualboyadvance-m-2.1.4.tar.gz) = 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896
 Size (visualboyadvance-m-2.1.4.tar.gz) = 3891574 bytes
-SHA1 (patch-src_filters_xBRZ_xbrz.cpp) = fcd461305ee5b88df27291a2f3fffbeeb1a25f13
+SHA1 (patch-CMakeLists.txt) = 47fcd47e6fd46607e5214f28c1bbd26185c42a7e
+SHA1 (patch-src_wx_CMakeLists.txt) = 3218a2ec2984a371cc101aa1d8cea0176abbdc01
+SHA1 (patch-src_wx_openal.h) = 37108109b993cd2748e51408cf030629f5dcc1c6

Added files:

Index: pkgsrc/emulators/visualboyadvance-m/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/emulators/visualboyadvance-m/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Mon Apr 29 09:18:40 2024
+++ pkgsrc/emulators/visualboyadvance-m/patches/patch-CMakeLists.txt    Mon Apr 29 09:18:40 2024
@@ -0,0 +1,37 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2024/04/29 09:18:40 nia Exp $
+
+Find libintl/libiconv in a more standard way, fixes a compilation issue.
+
+--- CMakeLists.txt.orig        2019-10-02 14:17:30.000000000 +0000
++++ CMakeLists.txt
+@@ -396,22 +396,14 @@ if(ENABLE_NLS)
+         endif()
+     endif()
+     if(ENABLE_LINK)
+-        find_path(LIBINTL_INC libintl.h)
+-        find_library(LIBINTL_LIB intl)
+-        find_library(LIBICONV_LIB iconv)
+-        if(LIBINTL_LIB)
+-            set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBINTL_LIB})
+-            set(VBAMCORE_LIBS ${VBAMCORE_LIBS} ${LIBINTL_LIB})
+-        endif()
+-        if(LIBICONV_LIB)
+-            set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBICONV_LIB})
+-            set(VBAMCORE_LIBS ${VBAMCORE_LIBS} ${LIBICONV_LIB})
+-        endif()
+-        include(CheckFunctionExists)
+-        check_function_exists(gettext GETTEXT_FN)
+-        if(NOT (LIBINTL_INC OR GETTEXT_FN))
+-            message(FATAL_ERROR "NLS requires libintl/gettext")
+-        endif()
++        find_package(Iconv REQUIRED)
++        list(APPEND CMAKE_REQUIRED_LIBRARIES ${Iconv_LIBRARIES})
++        list(APPEND VBAMCORE_LIBS ${Iconv_LIBRARIES})
++
++        find_package(Intl REQUIRED)
++        list(APPEND CMAKE_REQUIRED_LIBRARIES ${Intl_LIBRARIES})
++        list(APPEND VBAMCORE_LIBS ${Intl_LIBRARIES})
++
+         include_directories(${LIBINTL_INC})
+     endif()
+ endif()
Index: pkgsrc/emulators/visualboyadvance-m/patches/patch-src_wx_CMakeLists.txt
diff -u /dev/null pkgsrc/emulators/visualboyadvance-m/patches/patch-src_wx_CMakeLists.txt:1.1
--- /dev/null   Mon Apr 29 09:18:40 2024
+++ pkgsrc/emulators/visualboyadvance-m/patches/patch-src_wx_CMakeLists.txt     Mon Apr 29 09:18:40 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_wx_CMakeLists.txt,v 1.1 2024/04/29 09:18:40 nia Exp $
+
+OpenGL segfaults on NetBSD - needs investigating, might be ELF TLS
+issues in Mesa again
+
+--- src/wx/CMakeLists.txt.orig 2024-04-29 08:47:46.139352750 +0000
++++ src/wx/CMakeLists.txt
+@@ -385,7 +385,7 @@ int main(int argc, char** argv) {
+ }" WX_HAS_OPENGL)
+     endif()
+ 
+-    if(NOT WX_HAS_OPENGL)
++    if((NOT WX_HAS_OPENGL) OR (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD"))
+         add_definitions(-DNO_OGL)
+     endif()
+ 
Index: pkgsrc/emulators/visualboyadvance-m/patches/patch-src_wx_openal.h
diff -u /dev/null pkgsrc/emulators/visualboyadvance-m/patches/patch-src_wx_openal.h:1.1
--- /dev/null   Mon Apr 29 09:18:40 2024
+++ pkgsrc/emulators/visualboyadvance-m/patches/patch-src_wx_openal.h   Mon Apr 29 09:18:40 2024
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_wx_openal.h,v 1.1 2024/04/29 09:18:40 nia Exp $
+
+Fix build against openal-soft.
+
+--- src/wx/openal.h.orig       2024-04-29 08:29:39.129850245 +0000
++++ src/wx/openal.h
+@@ -1,14 +1,3 @@
+-// on win32 and mac, pointer typedefs only happen with AL_NO_PROTOTYPES
+-// on mac, ALC_NO_PROTOTYPES as well
+-
+-#define AL_NO_PROTOTYPES 1
+-
+-// on mac, alc pointer typedefs ony happen for ALC if ALC_NO_PROTOTYPES
+-// unfortunately, there is a bug in the system headers (use of ALCvoid when
+-// void should be used; shame on Apple for introducing this error, and shame
+-// on Creative for making a typedef to void in the first place)
+-//#define ALC_NO_PROTOTYPES 1
+-
+ #include <al.h>
+ #include <alc.h>
+

Prev by Date: CVS commit: pkgsrc/devel/hs-gitrev
Next by Date: CVS commit: pkgsrc/x11/xditview
Previous by Thread: CVS commit: pkgsrc/devel/hs-gitrev
Next by Thread: CVS commit: pkgsrc/x11/xditview
Indexes:

Home | Main Index | Thread Index | Old Index