zandronum, zandronum-server: 3.1.0 -> 3.2.1 (#453636)

diff -r 4178904d7698 src/gitinfo.h

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

+++ b/src/gitinfo.h	Fri Dec 01 13:02:42 2023 -0300

@@ -0,0 +1,11 @@

+// 4178904d769879e6c2919fb647ee6dd2736399e9

+//

+// This file was automatically generated by the

+// updaterevision tool. Do not edit by hand.

+

+#define GIT_DESCRIPTION "ZA_3.0.1-572-4178904d7698"

+#define GIT_HASH "4178904d769879e6c2919fb647ee6dd2736399e9"

+#define GIT_TIME "2021-12-11 16:35:55 -0500"

+#define HG_REVISION_NUMBER 1639258555

+#define HG_REVISION_HASH_STRING "4178904d7698"

+#define HG_TIME "211211-2135"

{

  stdenv,

  lib,

  fetchhg,

  fetchFromGitLab,

  cmake,

  pkg-config,

  makeWrapper,

  soundfont-fluid,

  SDL_compat,

  libGL,

  libopus,

  glew,

  bzip2,

  zlib,

  clientLibPath = lib.makeLibraryPath [ fluidsynth ];

in

stdenv.mkDerivation {

stdenv.mkDerivation (finalAttrs: {

  pname = "zandronum${suffix}";

  version = "3.1.0";

  version = "3.2.1";

  src = fetchhg {

    # expired ssl certificate

    url = "http://hg.osdn.net/view/zandronum/zandronum-stable";

    rev = "4178904d7698";

    hash = "sha256-5t36CoRPPjDKQE0DVSv2Qqpqko6JAXBI53tuAYiylHQ=";

  src = fetchFromGitLab {

    domain = "foss.heptapod.net";

    owner = "zandronum";

    repo = "zandronum-stable";

    tag = "ZA_${finalAttrs.version}";

    hash = "sha256-A5sfZMiCypBxAUOsoB8yuinZf7b9D7+HH9rpVs3esgA=";

  };

  # zandronum tries to download sqlite now when running cmake, don't let it

  # it also needs the current mercurial revision info embedded in gitinfo.h

  # otherwise, the client will fail to connect to servers because the

  # protocol version doesn't match.

  patches = [

    ./zan_configure_impurity.patch

    ./dont_update_gitinfo.patch

    ./add_gitinfo.patch

  ];

  # I have no idea why would SDL and libjpeg be needed for the server part!

    glew

    fmod

    fluidsynth

    libopus

    gtk2

  ];

    inherit fmod sqlite;

  };

  meta = with lib; {

  meta = {

    homepage = "https://zandronum.com/";

    description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";

    mainProgram = "zandronum-server";

    maintainers = with maintainers; [ lassulus ];

    license = licenses.sleepycat;

    platforms = platforms.linux;

    maintainers = with lib.maintainers; [ lassulus ];

    license = lib.licenses.sleepycat;

    platforms = lib.platforms.linux;

  };

}

})

diff -r 4178904d7698 src/CMakeLists.txt

--- a/src/CMakeLists.txt	Sat Dec 11 16:35:55 2021 -0500

+++ b/src/CMakeLists.txt	Fri Dec 01 13:00:32 2023 -0300

@@ -642,15 +642,6 @@

 	add_definitions( -DBACKPATCH )

 endif( BACKPATCH )

-# Update gitinfo.h

-

-get_target_property( UPDATEREVISION_EXE updaterevision LOCATION )

-

-add_custom_target( revision_check ALL

-	COMMAND ${UPDATEREVISION_EXE} src/gitinfo.h

-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}

-	DEPENDS updaterevision )

-

 # Libraries ZDoom needs

 message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )

--- a/sqlite/CMakeLists.txt	Sat Dec 11 16:35:55 2021 -0500

+++ b/sqlite/CMakeLists.txt	Fri Dec 01 12:57:55 2023 -0300

@@ -1,65 +1,5 @@

 cmake_minimum_required( VERSION 2.4 )

-# [BB/EP] Download SQLite archive and extract the sources if necessary.

-set( ZAN_SQLITE_VERSION 3360000 ) # SQL version 3.36.0

-set( ZAN_SQLITE_YEAR 2021 )