From b00be166b811201f7c9102befc62d54155a05259 Mon Sep 17 00:00:00 2001 From: Michael Baeuerle Date: Fri, 16 Oct 2020 13:29:28 +0200 Subject: [PATCH] qzdoom: Import version 4.4.2 QZDoom is a continuation of dpJudas's truecolor software rendering, merged with and forked from GZDoom. --- Makefile | 1 + qzdoom/COMMIT_MSG | 4 +++ qzdoom/DESCR | 2 ++ qzdoom/Makefile | 27 +++++++++++++++++++ qzdoom/PLIST | 2 ++ qzdoom/TODO | 1 + qzdoom/distinfo | 7 +++++ qzdoom/files/INSTALL.pkgsrc | 6 +++++ qzdoom/patches/patch-CMakeLists.txt | 40 +++++++++++++++++++++++++++++ 9 files changed, 90 insertions(+) create mode 100644 qzdoom/COMMIT_MSG create mode 100644 qzdoom/DESCR create mode 100644 qzdoom/Makefile create mode 100644 qzdoom/PLIST create mode 100644 qzdoom/TODO create mode 100644 qzdoom/distinfo create mode 100644 qzdoom/files/INSTALL.pkgsrc create mode 100644 qzdoom/patches/patch-CMakeLists.txt diff --git a/Makefile b/Makefile index d7d5ccbfde..c37c7557e7 100644 --- a/Makefile +++ b/Makefile @@ -4406,6 +4406,7 @@ SUBDIR+= quickjs SUBDIR+= quiterss SUBDIR+= qupzilla SUBDIR+= quvi +SUBDIR+= qzdoom SUBDIR+= r8s SUBDIR+= radare2-git SUBDIR+= radiotray diff --git a/qzdoom/COMMIT_MSG b/qzdoom/COMMIT_MSG new file mode 100644 index 0000000000..5e478685b3 --- /dev/null +++ b/qzdoom/COMMIT_MSG @@ -0,0 +1,4 @@ +qzdoom: Import version 4.4.2 + +QZDoom is a continuation of dpJudas's truecolor software rendering, merged +with and forked from GZDoom. diff --git a/qzdoom/DESCR b/qzdoom/DESCR new file mode 100644 index 0000000000..d2d5126e6f --- /dev/null +++ b/qzdoom/DESCR @@ -0,0 +1,2 @@ +QZDoom is a continuation of dpJudas's truecolor software rendering, merged +with and forked from GZDoom. diff --git a/qzdoom/Makefile b/qzdoom/Makefile new file mode 100644 index 0000000000..79010114fa --- /dev/null +++ b/qzdoom/Makefile @@ -0,0 +1,27 @@ +# $NetBSD$ + +DISTNAME= qzdoom-4.4.2 +CATEGORIES= games +MASTER_SITES= ${MASTER_SITE_GITHUB:=madame-rachelle/} +GITHUB_TAG= ${DISTNAME:S/qzdoom-/g/} + +MAINTAINER= micha@NetBSD.org +HOMEPAGE= https://qzdoom.drdteam.org/ +COMMENT= Continuation of dpJudas's truecolor software renderer for ZDoom +LICENSE= gnu-gpl-v3 + +.include "../../mk/bsd.prefs.mk" + +USE_LANGUAGES= c c++ +USE_TOOLS+= pkg-config +USE_CMAKE= yes +WRKSRC= ${WRKDIR}/${DISTNAME:S/-/-g/} + +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../devel/SDL2/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../wip/ZMusic/buildlink3.mk" + +.include "../../mk/bsd.pkg.mk" diff --git a/qzdoom/PLIST b/qzdoom/PLIST new file mode 100644 index 0000000000..3923944c07 --- /dev/null +++ b/qzdoom/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD$ +bin/qzdoom diff --git a/qzdoom/TODO b/qzdoom/TODO new file mode 100644 index 0000000000..53a9b199b8 --- /dev/null +++ b/qzdoom/TODO @@ -0,0 +1 @@ +[X] Package ZMusic dependency diff --git a/qzdoom/distinfo b/qzdoom/distinfo new file mode 100644 index 0000000000..cb4c450d88 --- /dev/null +++ b/qzdoom/distinfo @@ -0,0 +1,7 @@ +$NetBSD$ + +SHA1 (qzdoom-4.4.2.tar.gz) = 167618be5c2f2fb59fc14139492194a2341e431b +RMD160 (qzdoom-4.4.2.tar.gz) = 15e4d3982b12732bdd1ba81810803b2ad4327dfa +SHA512 (qzdoom-4.4.2.tar.gz) = 552b612a84db4dbb181406f633a2d8102f0b23e75fed1ac240ba05ae2953a5bca7c460ffeb52b6d1408171fad74b26260ec4d64745300b6186bbb546bac20fc4 +Size (qzdoom-4.4.2.tar.gz) = 12613887 bytes +SHA1 (patch-CMakeLists.txt) = f76aeda76718398f10872ecbe1f6f3175111be6b diff --git a/qzdoom/files/INSTALL.pkgsrc b/qzdoom/files/INSTALL.pkgsrc new file mode 100644 index 0000000000..d077a196a0 --- /dev/null +++ b/qzdoom/files/INSTALL.pkgsrc @@ -0,0 +1,6 @@ +The location of the crispy-doom WAD directory has been set to: + + DOOMWADDIR + +This is the pkgsrc standard Doom WAD directory location (shared with other +Doom packages). diff --git a/qzdoom/patches/patch-CMakeLists.txt b/qzdoom/patches/patch-CMakeLists.txt new file mode 100644 index 0000000000..4cbdc816d7 --- /dev/null +++ b/qzdoom/patches/patch-CMakeLists.txt @@ -0,0 +1,40 @@ +$NetBSD$ + +fts_set is not detected because NetBSD has renamed the symbol. +Remove the check and assume it is available. + +--- CMakeLists.txt.orig 2020-06-16 17:19:13.000000000 +0000 ++++ CMakeLists.txt +@@ -247,19 +247,19 @@ else() + set( ALL_C_FLAGS "-ffp-contract=off -DHAVE_SOFTPOLY" ) + endif() + +- if ( UNIX ) +- include(CheckSymbolExists) +- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS ) +- if ( NOT HAVE_FTS ) +- include ( FindPkgConfig ) +- pkg_check_modules( MUSL_FTS musl-fts ) +- if ( MUSL_FTS_FOUND ) +- set ( ALL_C_FLAGS "${ALL_C_FLAGS} ${MUSL_FTS_LDFLAGS}" ) +- else ( MUSL_FTS_FOUND ) +- message (ERROR "fts_* functions not found in the system" ) +- endif ( MUSL_FTS_FOUND ) +- endif ( NOT HAVE_FTS ) +- endif ( UNIX ) ++# if ( UNIX ) ++# include(CheckSymbolExists) ++# check_symbol_exists( "fts_set" "fts.h" HAVE_FTS ) ++# if ( NOT HAVE_FTS ) ++# include ( FindPkgConfig ) ++# pkg_check_modules( MUSL_FTS musl-fts ) ++# if ( MUSL_FTS_FOUND ) ++# set ( ALL_C_FLAGS "${ALL_C_FLAGS} ${MUSL_FTS_LDFLAGS}" ) ++# else ( MUSL_FTS_FOUND ) ++# message (ERROR "fts_* functions not found in the system" ) ++# endif ( MUSL_FTS_FOUND ) ++# endif ( NOT HAVE_FTS ) ++# endif ( UNIX ) + + set( REL_C_FLAGS "" ) + set( DEB_C_FLAGS "" )