From 155fd3f2e88d85fb3929fc02473a5658fbebe027f27c7495251383689a62d1cf Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 10 Jun 2020 19:09:37 +0000
Subject: [PATCH 1/6] - Update to release 4.4.0
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=44
---
g4.3.3.tar.gz | 3 --
g4.4.0.tar.gz | 3 ++
gzdoom-dl.patch | 27 -----------------
gzdoom-lzma.patch | 46 ++++++++++++++--------------
gzdoom-system-gme.patch | 67 -----------------------------------------
gzdoom-vulkan.patch | 52 ++++++++++++++++----------------
gzdoom-waddir.patch | 14 ++++-----
gzdoom.changes | 27 +++++++++++++++--
gzdoom.spec | 45 +++++----------------------
9 files changed, 91 insertions(+), 193 deletions(-)
delete mode 100644 g4.3.3.tar.gz
create mode 100644 g4.4.0.tar.gz
delete mode 100644 gzdoom-dl.patch
delete mode 100644 gzdoom-system-gme.patch
diff --git a/g4.3.3.tar.gz b/g4.3.3.tar.gz
deleted file mode 100644
index 44d4cd4..0000000
--- a/g4.3.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
-size 13704956
diff --git a/g4.4.0.tar.gz b/g4.4.0.tar.gz
new file mode 100644
index 0000000..1a95e34
--- /dev/null
+++ b/g4.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c94656fe85759a10a975f9478e2ae4c2b7018374cd7e0773ea281b1d9c375615
+size 12605718
diff --git a/gzdoom-dl.patch b/gzdoom-dl.patch
deleted file mode 100644
index 958dd19..0000000
--- a/gzdoom-dl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2019-12-19 22:50:13.191470704 +0100
-
-Fix linker error on i586(only) on -ldl.
-
-[ 756s] cd /home/abuild/rpmbuild/BUILD/gzdoom-g4.2.4/build/src && /usr/bin/cmake -E cmake_link_script CMakeFiles/zdoom.dir/link.txt --verbose=1
-[ 757s] /usr/bin/c++ -std=gnu++14 -Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers -ffp-contract=off -Wno-unused-result -fomit-frame-pointer -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -msse -msse2 -DNDEBUG -ffp-contract=off -fPIE -fopenmp -fno-rtti -fomit-frame-pointer -O2 -g -DNDEBUG -pie -rdynamic CMakeFiles/zdoom.dir/__autostart.cpp.o CMakeFiles/zdoom.dir/posix/i_steam.cpp.o CMakeFiles/zdoom.dir/posix/sdl/crashcatcher.c.o CMakeFiles/zdoom.dir/posix/sdl/hardware.cpp.o CMakeFiles/zdoom.dir/posix/sdl/i_gui.cpp.o CMakeFiles/zdoom.dir/posix/sdl/i_input.cpp.o CMakeFiles/zdoom.dir/posix/sdl/i_joystick.cpp.o CMakeFiles/zdoom.dir/posix/sdl/i_main.cpp.o CMakeFiles/zdoom.dir/posix/sdl/i_system.cpp.o CMakeFiles/zdoom.dir/posix/sdl/sdlglvideo.cpp.o CMakeFiles/zdoom.dir/posix/sdl/st_start.cpp.o CMakeFiles/zdoom.dir/posix/unix/i_specialpaths.cpp.o CMakeFiles/zdoom.dir/posix/unix/gtk_dialogs.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx_asm/hq2x_asm.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx_asm/hq3x_asm.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx_asm/hq4x_asm.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx_asm/hqnx_asm_Image.cpp.o CMakeFiles/zdoom.dir/rendering/swrenderer/r_all.cpp.o CMakeFiles/zdoom.dir/rendering/swrenderer/r_swscene.cpp.o CMakeFiles/zdoom.dir/rendering/polyrenderer/poly_all.cpp.o CMakeFiles/zdoom.dir/sound/music/music_midi_base.cpp.o CMakeFiles/zdoom.dir/sound/backend/oalsound.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx/init.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx/hq2x.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx/hq3x.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqnx/hq4x.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/xbr/xbrz.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/xbr/xbrz_old.cpp.o CMakeFiles/zdoom.dir/rendering/gl_load/gl_load.c.o CMakeFiles/zdoom.dir/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/dynlights/hw_dynlightdata.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_bsp.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_fakeflat.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_decal.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_drawinfo.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_drawlist.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_clipper.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_flats.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_portal.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_renderhacks.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_sky.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_skyportal.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_sprites.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_spritelight.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_walls.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_walls_vertex.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_weapon.cpp.o CMakeFiles/zdoom.dir/r_data/models/models.cpp.o CMakeFiles/zdoom.dir/utility/matrix.cpp.o CMakeFiles/zdoom.dir/am_map.cpp.o CMakeFiles/zdoom.dir/playsim/bots/b_bot.cpp.o CMakeFiles/zdoom.dir/playsim/bots/b_func.cpp.o CMakeFiles/zdoom.dir/playsim/bots/b_game.cpp.o CMakeFiles/zdoom.dir/playsim/bots/b_move.cpp.o CMakeFiles/zdoom.dir/playsim/bots/b_think.cpp.o CMakeFiles/zdoom.dir/bbannouncer.cpp.o CMakeFiles/zdoom.dir/console/c_bind.cpp.o CMakeFiles/zdoom.dir/console/c_cmds.cpp.o CMakeFiles/zdoom.dir/console/c_console.cpp.o CMakeFiles/zdoom.dir/console/c_consolebuffer.cpp.o CMakeFiles/zdoom.dir/console/c_cvars.cpp.o CMakeFiles/zdoom.dir/console/c_dispatch.cpp.o CMakeFiles/zdoom.dir/console/c_expr.cpp.o CMakeFiles/zdoom.dir/console/c_functions.cpp.o CMakeFiles/zdoom.dir/ct_chat.cpp.o CMakeFiles/zdoom.dir/d_iwad.cpp.o CMakeFiles/zdoom.dir/d_main.cpp.o CMakeFiles/zdoom.dir/d_anonstats.cpp.o CMakeFiles/zdoom.dir/d_net.cpp.o CMakeFiles/zdoom.dir/d_netinfo.cpp.o CMakeFiles/zdoom.dir/d_protocol.cpp.o CMakeFiles/zdoom.dir/dobject.cpp.o CMakeFiles/zdoom.dir/dobjgc.cpp.o CMakeFiles/zdoom.dir/dobjtype.cpp.o CMakeFiles/zdoom.dir/doomstat.cpp.o CMakeFiles/zdoom.dir/g_cvars.cpp.o CMakeFiles/zdoom.dir/g_dumpinfo.cpp.o CMakeFiles/zdoom.dir/g_game.cpp.o CMakeFiles/zdoom.dir/g_hub.cpp.o CMakeFiles/zdoom.dir/g_level.cpp.o CMakeFiles/zdoom.dir/gameconfigfile.cpp.o CMakeFiles/zdoom.dir/gitinfo.cpp.o CMakeFiles/zdoom.dir/hu_scores.cpp.o CMakeFiles/zdoom.dir/i_net.cpp.o CMakeFiles/zdoom.dir/m_cheat.cpp.o CMakeFiles/zdoom.dir/m_joy.cpp.o CMakeFiles/zdoom.dir/m_misc.cpp.o CMakeFiles/zdoom.dir/playsim/p_acs.cpp.o CMakeFiles/zdoom.dir/playsim/p_actionfunctions.cpp.o CMakeFiles/zdoom.dir/p_conversation.cpp.o CMakeFiles/zdoom.dir/playsim/p_destructible.cpp.o CMakeFiles/zdoom.dir/playsim/p_effect.cpp.o CMakeFiles/zdoom.dir/playsim/p_enemy.cpp.o CMakeFiles/zdoom.dir/playsim/p_interaction.cpp.o CMakeFiles/zdoom.dir/playsim/p_lnspec.cpp.o CMakeFiles/zdoom.dir/playsim/p_map.cpp.o CMakeFiles/zdoom.dir/playsim/p_maputl.cpp.o CMakeFiles/zdoom.dir/playsim/p_mobj.cpp.o CMakeFiles/zdoom.dir/p_openmap.cpp.o CMakeFiles/zdoom.dir/playsim/p_pspr.cpp.o CMakeFiles/zdoom.dir/p_saveg.cpp.o CMakeFiles/zdoom.dir/p_setup.cpp.o CMakeFiles/zdoom.dir/playsim/p_spec.cpp.o CMakeFiles/zdoom.dir/p_states.cpp.o CMakeFiles/zdoom.dir/playsim/p_things.cpp.o CMakeFiles/zdoom.dir/p_tick.cpp.o CMakeFiles/zdoom.dir/playsim/p_user.cpp.o CMakeFiles/zdoom.dir/rendering/r_utility.cpp.o CMakeFiles/zdoom.dir/rendering/r_sky.cpp.o CMakeFiles/zdoom.dir/rendering/r_videoscale.cpp.o CMakeFiles/zdoom.dir/sound/s_advsound.cpp.o CMakeFiles/zdoom.dir/sound/s_environment.cpp.o CMakeFiles/zdoom.dir/sound/s_sndseq.cpp.o CMakeFiles/zdoom.dir/sound/s_sound.cpp.o CMakeFiles/zdoom.dir/sound/s_music.cpp.o CMakeFiles/zdoom.dir/serializer.cpp.o CMakeFiles/zdoom.dir/scriptutil.cpp.o CMakeFiles/zdoom.dir/st_stuff.cpp.o CMakeFiles/zdoom.dir/rendering/v_framebuffer.cpp.o CMakeFiles/zdoom.dir/r_data/v_palette.cpp.o CMakeFiles/zdoom.dir/rendering/v_video.cpp.o CMakeFiles/zdoom.dir/wi_stuff.cpp.o CMakeFiles/zdoom.dir/gamedata/a_keys.cpp.o CMakeFiles/zdoom.dir/gamedata/a_weapons.cpp.o CMakeFiles/zdoom.dir/gamedata/decallib.cpp.o CMakeFiles/zdoom.dir/gamedata/g_mapinfo.cpp.o CMakeFiles/zdoom.dir/gamedata/g_skill.cpp.o CMakeFiles/zdoom.dir/gamedata/gi.cpp.o CMakeFiles/zdoom.dir/gamedata/stringtable.cpp.o CMakeFiles/zdoom.dir/gamedata/umapinfo.cpp.o CMakeFiles/zdoom.dir/gamedata/w_wad.cpp.o CMakeFiles/zdoom.dir/gamedata/d_dehacked.cpp.o CMakeFiles/zdoom.dir/gamedata/g_doomedmap.cpp.o CMakeFiles/zdoom.dir/gamedata/info.cpp.o CMakeFiles/zdoom.dir/gamedata/keysections.cpp.o CMakeFiles/zdoom.dir/gamedata/p_terrain.cpp.o CMakeFiles/zdoom.dir/gamedata/statistics.cpp.o CMakeFiles/zdoom.dir/gamedata/teaminfo.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/a_decalfx.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/a_doors.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/a_lightning.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/a_quake.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/a_ceiling.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/a_floor.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/a_lights.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/a_lighttransfer.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/a_pillar.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/a_plats.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/a_pusher.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/a_scroll.cpp.o CMakeFiles/zdoom.dir/playsim/mapthinkers/dsectoreffect.cpp.o CMakeFiles/zdoom.dir/playsim/a_pickups.cpp.o CMakeFiles/zdoom.dir/playsim/a_action.cpp.o CMakeFiles/zdoom.dir/playsim/a_decals.cpp.o CMakeFiles/zdoom.dir/playsim/a_dynlight.cpp.o CMakeFiles/zdoom.dir/playsim/a_flashfader.cpp.o CMakeFiles/zdoom.dir/playsim/a_morph.cpp.o CMakeFiles/zdoom.dir/playsim/a_specialspot.cpp.o CMakeFiles/zdoom.dir/playsim/p_secnodes.cpp.o CMakeFiles/zdoom.dir/playsim/p_sectors.cpp.o CMakeFiles/zdoom.dir/playsim/p_sight.cpp.o CMakeFiles/zdoom.dir/playsim/p_switch.cpp.o CMakeFiles/zdoom.dir/playsim/p_tags.cpp.o CMakeFiles/zdoom.dir/playsim/p_teleport.cpp.o CMakeFiles/zdoom.dir/playsim/actorptrselect.cpp.o CMakeFiles/zdoom.dir/playsim/dthinker.cpp.o CMakeFiles/zdoom.dir/playsim/p_3dfloors.cpp.o CMakeFiles/zdoom.dir/playsim/p_3dmidtex.cpp.o CMakeFiles/zdoom.dir/playsim/p_linkedsectors.cpp.o CMakeFiles/zdoom.dir/playsim/p_trace.cpp.o CMakeFiles/zdoom.dir/playsim/po_man.cpp.o CMakeFiles/zdoom.dir/playsim/portal.cpp.o CMakeFiles/zdoom.dir/g_statusbar/hudmessages.cpp.o CMakeFiles/zdoom.dir/g_statusbar/shared_hud.cpp.o CMakeFiles/zdoom.dir/g_statusbar/sbarinfo.cpp.o CMakeFiles/zdoom.dir/g_statusbar/sbar_mugshot.cpp.o CMakeFiles/zdoom.dir/g_statusbar/shared_sbar.cpp.o CMakeFiles/zdoom.dir/rendering/2d/f_wipe.cpp.o CMakeFiles/zdoom.dir/rendering/2d/v_2ddrawer.cpp.o CMakeFiles/zdoom.dir/rendering/2d/v_drawtext.cpp.o CMakeFiles/zdoom.dir/rendering/2d/v_blend.cpp.o CMakeFiles/zdoom.dir/rendering/2d/v_draw.cpp.o CMakeFiles/zdoom.dir/rendering/gl/renderer/gl_renderer.cpp.o CMakeFiles/zdoom.dir/rendering/gl/renderer/gl_renderstate.cpp.o CMakeFiles/zdoom.dir/rendering/gl/renderer/gl_renderbuffers.cpp.o CMakeFiles/zdoom.dir/rendering/gl/renderer/gl_postprocess.cpp.o CMakeFiles/zdoom.dir/rendering/gl/renderer/gl_postprocessstate.cpp.o CMakeFiles/zdoom.dir/rendering/gl/renderer/gl_stereo3d.cpp.o CMakeFiles/zdoom.dir/rendering/gl/renderer/gl_scene.cpp.o CMakeFiles/zdoom.dir/rendering/gl/shaders/gl_shader.cpp.o CMakeFiles/zdoom.dir/rendering/gl/shaders/gl_shaderprogram.cpp.o CMakeFiles/zdoom.dir/rendering/gl_load/gl_interface.cpp.o CMakeFiles/zdoom.dir/rendering/gl/system/gl_framebuffer.cpp.o CMakeFiles/zdoom.dir/rendering/gl/system/gl_debug.cpp.o CMakeFiles/zdoom.dir/rendering/gl/system/gl_buffers.cpp.o CMakeFiles/zdoom.dir/rendering/gl/textures/gl_hwtexture.cpp.o CMakeFiles/zdoom.dir/rendering/gl/textures/gl_samplers.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/data/hw_vertexbuilder.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/data/flatvertices.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/data/hw_viewpointbuffer.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/dynlights/hw_aabbtree.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/dynlights/hw_shadowmap.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/dynlights/hw_lightbuffer.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/models/hw_models.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_skydome.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_drawlistadd.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/scene/hw_renderstate.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/postprocessing/hw_postprocess.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/textures/hw_material.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/textures/hw_precache.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/utility/hw_clock.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/utility/hw_cvars.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/utility/hw_draw2d.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/utility/hw_lighting.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/utility/hw_shaderpatcher.cpp.o CMakeFiles/zdoom.dir/rendering/hwrenderer/utility/hw_vrmodes.cpp.o CMakeFiles/zdoom.dir/maploader/edata.cpp.o CMakeFiles/zdoom.dir/maploader/specials.cpp.o CMakeFiles/zdoom.dir/maploader/maploader.cpp.o CMakeFiles/zdoom.dir/maploader/slopes.cpp.o CMakeFiles/zdoom.dir/maploader/glnodes.cpp.o CMakeFiles/zdoom.dir/maploader/udmf.cpp.o CMakeFiles/zdoom.dir/maploader/usdf.cpp.o CMakeFiles/zdoom.dir/maploader/strifedialogue.cpp.o CMakeFiles/zdoom.dir/maploader/polyobjects.cpp.o CMakeFiles/zdoom.dir/maploader/renderinfo.cpp.o CMakeFiles/zdoom.dir/maploader/compatibility.cpp.o CMakeFiles/zdoom.dir/menu/joystickmenu.cpp.o CMakeFiles/zdoom.dir/menu/loadsavemenu.cpp.o CMakeFiles/zdoom.dir/menu/menu.cpp.o CMakeFiles/zdoom.dir/menu/menudef.cpp.o CMakeFiles/zdoom.dir/menu/messagebox.cpp.o CMakeFiles/zdoom.dir/menu/optionmenu.cpp.o CMakeFiles/zdoom.dir/menu/playermenu.cpp.o CMakeFiles/zdoom.dir/menu/resolutionmenu.cpp.o CMakeFiles/zdoom.dir/gamedata/resourcefiles/ancientzip.cpp.o CMakeFiles/zdoom.dir/gamedata/resourcefiles/file_7z.cpp.o CMakeFiles/zdoom.dir/gamedata/resourcefiles/file_grp.cpp.o CMakeFiles/zdoom.dir/gamedata/resourcefiles/file_lump.cpp.o CMakeFiles/zdoom.dir/gamedata/resourcefiles/file_rff.cpp.o CMakeFiles/zdoom.dir/gamedata/resourcefiles/file_wad.cpp.o CMakeFiles/zdoom.dir/gamedata/resourcefiles/file_zip.cpp.o CMakeFiles/zdoom.dir/gamedata/resourcefiles/file_pak.cpp.o CMakeFiles/zdoom.dir/gamedata/resourcefiles/file_directory.cpp.o CMakeFiles/zdoom.dir/gamedata/resourcefiles/resourcefile.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/animations.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/anim_switches.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/bitmap.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/texture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/image.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/imagetexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/texturemanager.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/multipatchtexturebuilder.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/skyboxtexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/automaptexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/brightmaptexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/buildtexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/canvastexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/ddstexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/flattexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/fontchars.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/imgztexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/jpegtexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/md5check.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/multipatchtexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/patchtexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/pcxtexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/pngtexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/rawpagetexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/emptytexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/shadertexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/tgatexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/formats/stbtexture.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hqresize.cpp.o CMakeFiles/zdoom.dir/gamedata/textures/hires/hirestex.cpp.o CMakeFiles/zdoom.dir/gamedata/fonts/singlelumpfont.cpp.o CMakeFiles/zdoom.dir/gamedata/fonts/singlepicfont.cpp.o CMakeFiles/zdoom.dir/gamedata/fonts/specialfont.cpp.o CMakeFiles/zdoom.dir/gamedata/fonts/font.cpp.o CMakeFiles/zdoom.dir/gamedata/fonts/hexfont.cpp.o CMakeFiles/zdoom.dir/gamedata/fonts/v_font.cpp.o CMakeFiles/zdoom.dir/gamedata/fonts/v_text.cpp.o CMakeFiles/zdoom.dir/gamedata/p_xlat.cpp.o CMakeFiles/zdoom.dir/gamedata/xlat/parse_xlat.cpp.o CMakeFiles/zdoom.dir/gamedata/xlat/parsecontext.cpp.o CMakeFiles/zdoom.dir/playsim/fragglescript/t_func.cpp.o CMakeFiles/zdoom.dir/playsim/fragglescript/t_load.cpp.o CMakeFiles/zdoom.dir/playsim/fragglescript/t_oper.cpp.o CMakeFiles/zdoom.dir/playsim/fragglescript/t_parse.cpp.o CMakeFiles/zdoom.dir/playsim/fragglescript/t_prepro.cpp.o CMakeFiles/zdoom.dir/playsim/fragglescript/t_script.cpp.o CMakeFiles/zdoom.dir/playsim/fragglescript/t_spec.cpp.o CMakeFiles/zdoom.dir/playsim/fragglescript/t_variable.cpp.o CMakeFiles/zdoom.dir/playsim/fragglescript/t_cmd.cpp.o CMakeFiles/zdoom.dir/intermission/intermission.cpp.o CMakeFiles/zdoom.dir/intermission/intermission_parse.cpp.o CMakeFiles/zdoom.dir/r_data/colormaps.cpp.o CMakeFiles/zdoom.dir/r_data/cycler.cpp.o CMakeFiles/zdoom.dir/r_data/gldefs.cpp.o CMakeFiles/zdoom.dir/r_data/a_dynlightdata.cpp.o CMakeFiles/zdoom.dir/r_data/r_translate.cpp.o CMakeFiles/zdoom.dir/r_data/sprites.cpp.o CMakeFiles/zdoom.dir/r_data/portalgroups.cpp.o CMakeFiles/zdoom.dir/r_data/voxels.cpp.o CMakeFiles/zdoom.dir/r_data/renderstyle.cpp.o CMakeFiles/zdoom.dir/r_data/r_canvastexture.cpp.o CMakeFiles/zdoom.dir/r_data/r_interpolate.cpp.o CMakeFiles/zdoom.dir/r_data/r_vanillatrans.cpp.o CMakeFiles/zdoom.dir/r_data/r_sections.cpp.o CMakeFiles/zdoom.dir/r_data/models/models_md3.cpp.o CMakeFiles/zdoom.dir/r_data/models/models_md2.cpp.o CMakeFiles/zdoom.dir/r_data/models/models_voxel.cpp.o CMakeFiles/zdoom.dir/r_data/models/models_ue1.cpp.o CMakeFiles/zdoom.dir/r_data/models/models_obj.cpp.o CMakeFiles/zdoom.dir/scripting/symbols.cpp.o CMakeFiles/zdoom.dir/scripting/vmiterators.cpp.o CMakeFiles/zdoom.dir/scripting/vmthunks.cpp.o CMakeFiles/zdoom.dir/scripting/vmthunks_actors.cpp.o CMakeFiles/zdoom.dir/scripting/types.cpp.o CMakeFiles/zdoom.dir/scripting/thingdef.cpp.o CMakeFiles/zdoom.dir/scripting/thingdef_data.cpp.o CMakeFiles/zdoom.dir/scripting/thingdef_properties.cpp.o CMakeFiles/zdoom.dir/scripting/backend/codegen.cpp.o CMakeFiles/zdoom.dir/scripting/backend/scopebarrier.cpp.o CMakeFiles/zdoom.dir/scripting/backend/dynarrays.cpp.o CMakeFiles/zdoom.dir/scripting/backend/vmbuilder.cpp.o CMakeFiles/zdoom.dir/scripting/backend/vmdisasm.cpp.o CMakeFiles/zdoom.dir/scripting/decorate/olddecorations.cpp.o CMakeFiles/zdoom.dir/scripting/decorate/thingdef_exp.cpp.o CMakeFiles/zdoom.dir/scripting/decorate/thingdef_parse.cpp.o CMakeFiles/zdoom.dir/scripting/decorate/thingdef_states.cpp.o CMakeFiles/zdoom.dir/scripting/vm/vmexec.cpp.o CMakeFiles/zdoom.dir/scripting/vm/vmframe.cpp.o CMakeFiles/zdoom.dir/scripting/zscript/ast.cpp.o CMakeFiles/zdoom.dir/scripting/zscript/zcc_compile.cpp.o CMakeFiles/zdoom.dir/scripting/zscript/zcc_parser.cpp.o CMakeFiles/zdoom.dir/utility/sfmt/SFMT.cpp.o CMakeFiles/zdoom.dir/sound/music/i_music.cpp.o CMakeFiles/zdoom.dir/sound/music/i_soundfont.cpp.o CMakeFiles/zdoom.dir/sound/backend/i_sound.cpp.o CMakeFiles/zdoom.dir/sound/music/music_config.cpp.o CMakeFiles/zdoom.dir/rendering/swrenderer/textures/r_swtexture.cpp.o CMakeFiles/zdoom.dir/rendering/swrenderer/textures/warptexture.cpp.o CMakeFiles/zdoom.dir/rendering/swrenderer/textures/swcanvastexture.cpp.o CMakeFiles/zdoom.dir/events.cpp.o CMakeFiles/zdoom.dir/utility/palette.cpp.o CMakeFiles/zdoom.dir/utility/files.cpp.o CMakeFiles/zdoom.dir/utility/files_decompress.cpp.o CMakeFiles/zdoom.dir/utility/m_png.cpp.o CMakeFiles/zdoom.dir/utility/m_random.cpp.o CMakeFiles/zdoom.dir/utility/memarena.cpp.o CMakeFiles/zdoom.dir/utility/md5.cpp.o CMakeFiles/zdoom.dir/utility/nodebuilder/nodebuild.cpp.o CMakeFiles/zdoom.dir/utility/nodebuilder/nodebuild_classify_nosse2.cpp.o CMakeFiles/zdoom.dir/utility/nodebuilder/nodebuild_events.cpp.o CMakeFiles/zdoom.dir/utility/nodebuilder/nodebuild_extract.cpp.o CMakeFiles/zdoom.dir/utility/nodebuilder/nodebuild_gl.cpp.o CMakeFiles/zdoom.dir/utility/nodebuilder/nodebuild_utility.cpp.o CMakeFiles/zdoom.dir/utility/sc_man.cpp.o CMakeFiles/zdoom.dir/utility/stats.cpp.o CMakeFiles/zdoom.dir/utility/cmdlib.cpp.o CMakeFiles/zdoom.dir/utility/configfile.cpp.o CMakeFiles/zdoom.dir/utility/i_time.cpp.o CMakeFiles/zdoom.dir/utility/m_alloc.cpp.o CMakeFiles/zdoom.dir/utility/m_argv.cpp.o CMakeFiles/zdoom.dir/utility/m_bbox.cpp.o CMakeFiles/zdoom.dir/utility/name.cpp.o CMakeFiles/zdoom.dir/utility/s_playlist.cpp.o CMakeFiles/zdoom.dir/utility/v_collection.cpp.o CMakeFiles/zdoom.dir/utility/utf8.cpp.o CMakeFiles/zdoom.dir/utility/zstrformat.cpp.o CMakeFiles/zdoom.dir/utility/x86.cpp.o CMakeFiles/zdoom.dir/utility/strnatcmp.c.o CMakeFiles/zdoom.dir/utility/zstring.cpp.o CMakeFiles/zdoom.dir/utility/math/asin.c.o CMakeFiles/zdoom.dir/utility/math/atan.c.o CMakeFiles/zdoom.dir/utility/math/const.c.o CMakeFiles/zdoom.dir/utility/math/cosh.c.o CMakeFiles/zdoom.dir/utility/math/exp.c.o CMakeFiles/zdoom.dir/utility/math/isnan.c.o CMakeFiles/zdoom.dir/utility/math/log.c.o CMakeFiles/zdoom.dir/utility/math/log10.c.o CMakeFiles/zdoom.dir/utility/math/mtherr.c.o CMakeFiles/zdoom.dir/utility/math/polevl.c.o CMakeFiles/zdoom.dir/utility/math/pow.c.o CMakeFiles/zdoom.dir/utility/math/powi.c.o CMakeFiles/zdoom.dir/utility/math/sin.c.o CMakeFiles/zdoom.dir/utility/math/sinh.c.o CMakeFiles/zdoom.dir/utility/math/sqrt.c.o CMakeFiles/zdoom.dir/utility/math/tan.c.o CMakeFiles/zdoom.dir/utility/math/tanh.c.o CMakeFiles/zdoom.dir/utility/math/fastsin.cpp.o CMakeFiles/zdoom.dir/zzautozend.cpp.o -o ../gzdoom -lopenal -lSDL2 -lpthread -lrt -lz -ljpeg -lbz2 -lgme -ldl ../libraries/gdtoa/libgdtoa.a ../libraries/dumb/libdumb.a -lclzma ../libraries/adlmidi/libadl.a ../libraries/opnmidi/libopn.a ../libraries/timidity/libtimidity.a ../libraries/timidityplus/libtimidityplus.a ../libraries/wildmidi/libwildmidi.a ../libraries/oplsynth/liboplsynth.a ../libraries/zmusic/libzmusic.a -lgme ../libraries/dumb/libdumb.a ../libraries/adlmidi/libadl.a ../libraries/opnmidi/libopn.a ../libraries/timidity/libtimidity.a ../libraries/timidityplus/libtimidityplus.a ../libraries/wildmidi/libwildmidi.a ../libraries/oplsynth/liboplsynth.a -lsndfile -lmpg123 -lfluidsynth
-[ 757s] /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: ../libraries/zmusic/libzmusic.a(i_module.cpp.o): undefined reference to symbol 'dlclose@@GLIBC_2.0'
-[ 757s] /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: /usr/lib/gcc/i586-suse-linux/9/../../../libdl.so: error adding symbols: DSO missing from command line
-
----
- libraries/zmusic/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gzdoom-g4.2.4/libraries/zmusic/CMakeLists.txt
-===================================================================
---- gzdoom-g4.2.4.orig/libraries/zmusic/CMakeLists.txt
-+++ gzdoom-g4.2.4/libraries/zmusic/CMakeLists.txt
-@@ -94,7 +94,7 @@ add_library( zmusic STATIC
- zmusic/zmusic.cpp
- ${PLAT_SOURCES}
- )
--target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-+target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi -ldl )
-
- if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
- include_directories( "${SNDFILE_INCLUDE_DIRS}" )
diff --git a/gzdoom-lzma.patch b/gzdoom-lzma.patch
index ec9ad69..3c51a7d 100644
--- a/gzdoom-lzma.patch
+++ b/gzdoom-lzma.patch
@@ -9,10 +9,10 @@ Use LZMA system libraries instead of bundled code.
tools/zipdir/CMakeLists.txt | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
-Index: gzdoom-g4.2.4/CMakeLists.txt
+Index: gzdoom-g4.4.0/CMakeLists.txt
===================================================================
---- gzdoom-g4.2.4.orig/CMakeLists.txt
-+++ gzdoom-g4.2.4/CMakeLists.txt
+--- gzdoom-g4.4.0.orig/CMakeLists.txt
++++ gzdoom-g4.4.0/CMakeLists.txt
@@ -12,6 +12,7 @@ endif()
list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
@@ -21,28 +21,28 @@ Index: gzdoom-g4.2.4/CMakeLists.txt
# Support cross compiling
option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO )
-@@ -403,7 +404,7 @@ else()
- set( GME_LIBRARIES gme )
+@@ -369,7 +370,7 @@ else()
endif()
+
-set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" )
+pkg_check_modules(LZMA REQUIRED clzma)
- set( ADL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/adlmidi" )
- set( OPN_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/opnmidi" )
- set( TIMIDITYPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/timidityplus" )
-@@ -433,7 +434,6 @@ option( DYN_OPENAL "Dynamically load Ope
- option( DYN_SNDFILE "Dynamically load libsndfile" ON )
- option( DYN_MPG123 "Dynamically load libmpg123" ON )
+
+ if( NOT CMAKE_CROSSCOMPILING )
+ if( NOT CROSS_EXPORTS )
+@@ -389,7 +390,6 @@ install(DIRECTORY docs/
+
+ option( DYN_OPENAL "Dynamically load OpenAL" ON )
-add_subdirectory( libraries/lzma )
add_subdirectory( tools )
- add_subdirectory( libraries/dumb )
add_subdirectory( libraries/gdtoa )
-Index: gzdoom-g4.2.4/src/CMakeLists.txt
+ add_subdirectory( wadsrc )
+Index: gzdoom-g4.4.0/src/CMakeLists.txt
===================================================================
---- gzdoom-g4.2.4.orig/src/CMakeLists.txt
-+++ gzdoom-g4.2.4/src/CMakeLists.txt
-@@ -436,7 +436,7 @@ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LI
+--- gzdoom-g4.4.0.orig/src/CMakeLists.txt
++++ gzdoom-g4.4.0/src/CMakeLists.txt
+@@ -437,7 +437,7 @@ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LI
if (HAVE_VULKAN)
set( ZDOOM_LIBS ${ZDOOM_LIBS} "glslang" "SPIRV" "OGLCompiler")
endif()
@@ -51,19 +51,19 @@ Index: gzdoom-g4.2.4/src/CMakeLists.txt
if( ${HAVE_VM_JIT} )
add_definitions( -DHAVE_VM_JIT )
-@@ -1211,7 +1211,7 @@ if( UNIX )
+@@ -1238,7 +1238,7 @@ if( UNIX )
endif()
endif()
--target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES} adl opn timidity timidityplus wildmidi oplsynth zmusic )
+-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa lzma ${ZMUSIC_LIBRARIES} )
++target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa ${LZMA_LIBRARIES} ${ZMUSIC_LIBRARIES} )
include_directories( .
- g_statusbar
-Index: gzdoom-g4.2.4/tools/zipdir/CMakeLists.txt
+ common/audio/sound
+Index: gzdoom-g4.4.0/tools/zipdir/CMakeLists.txt
===================================================================
---- gzdoom-g4.2.4.orig/tools/zipdir/CMakeLists.txt
-+++ gzdoom-g4.2.4/tools/zipdir/CMakeLists.txt
+--- gzdoom-g4.4.0.orig/tools/zipdir/CMakeLists.txt
++++ gzdoom-g4.4.0/tools/zipdir/CMakeLists.txt
@@ -1,9 +1,9 @@
cmake_minimum_required( VERSION 2.8.7 )
diff --git a/gzdoom-system-gme.patch b/gzdoom-system-gme.patch
deleted file mode 100644
index ce962eb..0000000
--- a/gzdoom-system-gme.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2019-12-18 23:10:30.098185171 +0100
-
-Use GME system libraries instead of bundled code.
-
----
- CMakeLists.txt | 13 ++++---------
- libraries/zmusic/CMakeLists.txt | 2 +-
- 2 files changed, 5 insertions(+), 10 deletions(-)
-
-Index: gzdoom-g4.3.1/CMakeLists.txt
-===================================================================
---- gzdoom-g4.3.1.orig/CMakeLists.txt
-+++ gzdoom-g4.3.1/CMakeLists.txt
-@@ -196,12 +196,7 @@ endif()
- #endif()
-
- # GME
--#find_path( GME_INCLUDE_DIR gme/gme.h )
--#find_library( GME_LIBRARIES gme )
--#mark_as_advanced( GME_INCLUDE_DIR GME_LIBRARIES )
--#FIND_PACKAGE_HANDLE_STANDARD_ARGS( GME
--# REQUIRED_VARS GME_LIBRARIES GME_INCLUDE_DIR
--#)
-+pkg_check_modules(GME libgme)
-
- if( MSVC )
- # Eliminate unreferenced functions and data
-@@ -325,7 +320,7 @@ set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_
- option(FORCE_INTERNAL_ZLIB "Use internal zlib")
- option(FORCE_INTERNAL_JPEG "Use internal jpeg")
- option(FORCE_INTERNAL_BZIP2 "Use internal bzip2")
--option(FORCE_INTERNAL_GME "Use internal gme" ON)
-+option(FORCE_INTERNAL_GME "Use internal gme" OFF)
- mark_as_advanced( FORCE_INTERNAL_GME )
- option(FORCE_INTERNAL_ASMJIT "Use internal asmjit" ON)
- mark_as_advanced( FORCE_INTERNAL_ASMJIT )
-@@ -391,14 +386,14 @@ else()
- endif()
-
- if( GME_FOUND AND NOT FORCE_INTERNAL_GME )
-- message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" )
-+ message( STATUS "Using system gme library, includes found at ${GME_INCLUDEDIR}" )
- else()
- message( STATUS "Using internal gme library" )
- # Use MAME as it's balanced emulator: well-accurate, but doesn't eats lot of CPU
- # Nuked OPN2 is very accurate emulator, but it eats too much CPU for the workflow
- set( GME_YM2612_EMU "MAME" )
- add_subdirectory( libraries/game-music-emu )
-- set( GME_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/game-music-emu" )
-+ set( GME_INCLUDEDIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/game-music-emu" )
- set( GME_LIBRARIES gme )
- endif()
-
-Index: gzdoom-g4.3.1/libraries/zmusic/CMakeLists.txt
-===================================================================
---- gzdoom-g4.3.1.orig/libraries/zmusic/CMakeLists.txt
-+++ gzdoom-g4.3.1/libraries/zmusic/CMakeLists.txt
-@@ -46,7 +46,7 @@ else()
- endif()
-
-
--include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../libraries/dumb/include" "${ZLIB_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" "${OPN_INCLUDE_DIR}" "${TIMIDITYPP_INCLUDE_DIR}" "${TIMIDITY_INCLUDE_DIR}" "${WILDMIDI_INCLUDE_DIR}" "${OPLSYNTH_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" )
-+include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/../libraries/dumb/include" "${ZLIB_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" "${OPN_INCLUDE_DIR}" "${TIMIDITYPP_INCLUDE_DIR}" "${TIMIDITY_INCLUDE_DIR}" "${WILDMIDI_INCLUDE_DIR}" "${OPLSYNTH_INCLUDE_DIR}" "${GME_INCLUDEDIR}" "${CMAKE_CURRENT_SOURCE_DIR}" )
-
- if (WIN32)
- set( PLAT_SOURCES
diff --git a/gzdoom-vulkan.patch b/gzdoom-vulkan.patch
index 1de41de..d3f5071 100644
--- a/gzdoom-vulkan.patch
+++ b/gzdoom-vulkan.patch
@@ -4,17 +4,17 @@ Date: 2019-04-13 15:02:22.799297208 +0200
Use Vulkan system libraries instead of bundled code.
---
- CMakeLists.txt | 3 ---
- src/CMakeLists.txt | 2 +-
- src/rendering/vulkan/shaders/vk_shader.cpp | 2 +-
- src/rendering/vulkan/system/vk_builders.cpp | 4 ++--
+ CMakeLists.txt | 3 ---
+ src/CMakeLists.txt | 2 +-
+ src/common/rendering/vulkan/shaders/vk_shader.cpp | 2 +-
+ src/common/rendering/vulkan/system/vk_builders.cpp | 4 ++--
4 files changed, 4 insertions(+), 7 deletions(-)
-Index: gzdoom-g4.2.4/CMakeLists.txt
+Index: gzdoom-g4.4.0/CMakeLists.txt
===================================================================
---- gzdoom-g4.2.4.orig/CMakeLists.txt
-+++ gzdoom-g4.2.4/CMakeLists.txt
-@@ -330,9 +330,6 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
+--- gzdoom-g4.4.0.orig/CMakeLists.txt
++++ gzdoom-g4.4.0/CMakeLists.txt
+@@ -307,9 +307,6 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
mark_as_advanced( FORCE_INTERNAL_ASMJIT )
if (HAVE_VULKAN)
@@ -24,40 +24,40 @@ Index: gzdoom-g4.2.4/CMakeLists.txt
endif()
if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB )
-Index: gzdoom-g4.2.4/src/CMakeLists.txt
+Index: gzdoom-g4.4.0/src/CMakeLists.txt
===================================================================
---- gzdoom-g4.2.4.orig/src/CMakeLists.txt
-+++ gzdoom-g4.2.4/src/CMakeLists.txt
-@@ -434,7 +434,7 @@ add_custom_target( revision_check ALL
+--- gzdoom-g4.4.0.orig/src/CMakeLists.txt
++++ gzdoom-g4.4.0/src/CMakeLists.txt
+@@ -435,7 +435,7 @@ add_custom_target( revision_check ALL
- set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${CMAKE_DL_LIBS}" )
+ set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" )
if (HAVE_VULKAN)
- set( ZDOOM_LIBS ${ZDOOM_LIBS} "glslang" "SPIRV" "OGLCompiler")
+ set( ZDOOM_LIBS ${ZDOOM_LIBS} -lglslang -lSPIRV -lOGLCompiler)
endif()
include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" )
-Index: gzdoom-g4.2.4/src/rendering/vulkan/shaders/vk_shader.cpp
+Index: gzdoom-g4.4.0/src/common/rendering/vulkan/shaders/vk_shader.cpp
===================================================================
---- gzdoom-g4.2.4.orig/src/rendering/vulkan/shaders/vk_shader.cpp
-+++ gzdoom-g4.2.4/src/rendering/vulkan/shaders/vk_shader.cpp
-@@ -4,7 +4,7 @@
- #include "hwrenderer/utility/hw_shaderpatcher.h"
- #include "w_wad.h"
- #include "doomerrors.h"
+--- gzdoom-g4.4.0.orig/src/common/rendering/vulkan/shaders/vk_shader.cpp
++++ gzdoom-g4.4.0/src/common/rendering/vulkan/shaders/vk_shader.cpp
+@@ -25,7 +25,7 @@
+ #include "hw_shaderpatcher.h"
+ #include "filesystem.h"
+ #include "engineerrors.h"
-#include <ShaderLang.h>
+#include <glslang/Public/ShaderLang.h>
VkShaderManager::VkShaderManager(VulkanDevice *device) : device(device)
{
-Index: gzdoom-g4.2.4/src/rendering/vulkan/system/vk_builders.cpp
+Index: gzdoom-g4.4.0/src/common/rendering/vulkan/system/vk_builders.cpp
===================================================================
---- gzdoom-g4.2.4.orig/src/rendering/vulkan/system/vk_builders.cpp
-+++ gzdoom-g4.2.4/src/rendering/vulkan/system/vk_builders.cpp
-@@ -2,8 +2,8 @@
+--- gzdoom-g4.4.0.orig/src/common/rendering/vulkan/system/vk_builders.cpp
++++ gzdoom-g4.4.0/src/common/rendering/vulkan/system/vk_builders.cpp
+@@ -23,8 +23,8 @@
#include "vk_builders.h"
- #include "doomerrors.h"
- #include "r_data/renderstyle.h"
+ #include "engineerrors.h"
+ #include "renderstyle.h"
-#include <ShaderLang.h>
-#include <GlslangToSpv.h>
+#include <glslang/Public/ShaderLang.h>
diff --git a/gzdoom-waddir.patch b/gzdoom-waddir.patch
index 4c8ad69..334b123 100644
--- a/gzdoom-waddir.patch
+++ b/gzdoom-waddir.patch
@@ -1,17 +1,17 @@
From: Jan Engelhardt <jengelh@inai.de>
-2018-01-02 15:25:05.669125932 +0100
+Date: 2018-01-02 15:25:05.669125932 +0100
Ensure same IWAD directory across all Doom source ports in openSUSE
---
- src/posix/i_system.h | 2 +-
+ src/common/platform/posix/i_system.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: gzdoom-4.0.0/src/posix/i_system.h
+Index: gzdoom-g4.4.0/src/common/platform/posix/i_system.h
===================================================================
---- gzdoom-4.0.0.orig/src/posix/i_system.h
-+++ gzdoom-4.0.0/src/posix/i_system.h
-@@ -42,7 +42,7 @@ struct ticcmd_t;
+--- gzdoom-g4.4.0.orig/src/common/platform/posix/i_system.h
++++ gzdoom-g4.4.0/src/common/platform/posix/i_system.h
+@@ -17,7 +17,7 @@ struct ticcmd_t;
struct WadStuff;
#ifndef SHARE_DIR
@@ -19,4 +19,4 @@ Index: gzdoom-4.0.0/src/posix/i_system.h
+#define SHARE_DIR "/usr/share/doom/"
#endif
-
+ void CalculateCPUSpeed(void);
diff --git a/gzdoom.changes b/gzdoom.changes
index 18f3740..07ac10e 100644
--- a/gzdoom.changes
+++ b/gzdoom.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sun Jun 7 23:39:42 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 4.4.0
+ * Heretic's "bag of holding" had incorrectly given mace ammo.
+ * Added per pixel lighting for decals.
+ * Added a compatibility option for a bad teleporter in the
+ final map of Strife.
+ * Add a cvar to control weapon bobbing while firing.
+ * Fixed crash on maps with out of range sidedef and sector
+ numbers.
+ * Fixed missing sound for Polyobj_MoveTo.
+ * Attenuated lights for Strife.
+ * Added MTF_NOCOUNT to spawn flags.
+- Drop gzdoom-system-gme.patch (moved to zmusic.spec),
+ gzdoom-dl.patch (unnecessary)
+
-------------------------------------------------------------------
Wed Jan 29 17:43:59 UTC 2020 - Michael Scafidi <raptir@gmail.com>
@@ -7,10 +24,14 @@ Wed Jan 29 17:43:59 UTC 2020 - Michael Scafidi <raptir@gmail.com>
* fixed calling a function on string CVar
* added ability to filter VM disassembly dump
* add check for unity version of Nerve.wad
- * infrastructure in place in case Nerve.wad changes again, this can be extended
- * customized invulnerability colormap does not interfere with Powerup.ColorMap
+ * infrastructure in place in case Nerve.wad changes again, this
+ can be extended.
+ * customized invulnerability colormap does not interfere with
+ Powerup.ColorMap.
* precache a few sounds being referenced in common game code.
- * define misc/secret for Hexen, too. By now there are some mods defining secrets for the game so this sound should be present there.
+ * define misc/secret for Hexen, too. By now there are some mods
+ defining secrets for the game so this sound should be present
+ there.
* Implement special colormap support for softpoly
* Softpoly: Fix broken fixed camera light for walls
* make nosave standalone CVar flag, alongside server and user
diff --git a/gzdoom.spec b/gzdoom.spec
index f6923c5..848ed9b 100644
--- a/gzdoom.spec
+++ b/gzdoom.spec
@@ -17,7 +17,7 @@
Name: gzdoom
-Version: 4.3.3
+Version: 4.4.0
Release: 0
Summary: A DOOM source port with graphic and modding extensions
License: GPL-3.0-only
@@ -30,8 +30,6 @@ Patch1: gzdoom-waddir.patch
Patch2: gzdoom-lzma.patch
Patch3: gzdoom-vulkan.patch
Patch4: gzdoom-asmjit.patch
-Patch5: gzdoom-system-gme.patch
-Patch6: gzdoom-dl.patch
BuildRequires: cmake >= 2.8.7
BuildRequires: gcc-c++
BuildRequires: glslang-devel
@@ -40,34 +38,22 @@ BuildRequires: nasm
BuildRequires: pkg-config
BuildRequires: spirv-tools-devel
BuildRequires: unzip
-BuildRequires: xz
+BuildRequires: zmusic-devel
BuildRequires: pkgconfig(bzip2)
+BuildRequires: pkgconfig(clzma) >= 17.01
BuildRequires: pkgconfig(flac)
-BuildRequires: pkgconfig(fluidsynth)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(gtk+-3.0)
-BuildRequires: pkgconfig(libgme)
-BuildRequires: pkgconfig(libmpg123)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(sdl2)
-BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(vulkan)
BuildRequires: pkgconfig(zlib)
-%if 0%{?suse_version} >= 1500
-BuildRequires: pkgconfig(clzma) >= 17.01
-%else
-Provides: bundled(lzma-sdk) = 19.00
-%endif
-%if 0%{?suse_version} == 1315
-BuildRequires: gcc6-c++
-%endif
Recommends: freedoom
Recommends: timidity
Recommends: timidity-eawpats
Provides: qzdoom = 1.3.0
Provides: zdoom = 2.8.1
# DUMB is modified to read OggVorbis samples
-Provides: bundled(dumb) = 0.9.3
Provides: bundled(gdtoa)
Provides: bundled(re2c) = 0.16.0
Provides: bundled(xbrz) = 1.7
@@ -85,41 +71,26 @@ GZDoom is a port (a modification) of the original Doom source code, featuring:
* Demo record/playback of classic and Boom demos is not supported.
%prep
-%setup -q -n %name-g%version
-%patch -P 1 -p1
-
-%if 0%{?suse_version} >= 1500
-%patch -P 2 -p1
-%endif
-%if 0%{?suse_version} >= 1550
-%patch -P 3 -p1
+%autosetup -p1 -n %name-g%version
rm -Rfv glslang src/rendering/vulkan/thirdparty/vulkan
-%endif
-%patch -P 4 -P 5 -P 6 -p1
perl -i -pe 's{__DATE__}{""}g' src/posix/sdl/i_main.cpp
-perl -i -pe 's{<unknown version>}{%version}g' \
- tools/updaterevision/updaterevision.c
%build
+# There is handcrafted assembler, which LTO does not play nice with.
%define _lto_cflags %nil
-# We must not strip - %%debug_package will take care of it
-# Deactivate -Wl,--as-needed
%ifarch %ix86
-# program does a cpuid check, so it is ok to enable
+# Allow sw to use intrinsics (functions like _mm_set_sd).
+# Guarded by cpuid calls by sw.
export CFLAGS="%optflags -msse -msse2"
export CXXFLAGS="%optflags -msse -msse2"
%endif
%cmake -DNO_STRIP=1 \
-%if 0%{suse_version} == 1315
- -DCMAKE_C_COMPILER=gcc-6 -DCMAKE_CXX_COMPILER=g++-6 \
-%endif
-DCMAKE_SHARED_LINKER_FLAGS="" \
-DCMAKE_EXE_LINKER_FLAGS="" -DCMAKE_MODULE_LINKER_FLAGS="" \
-DINSTALL_DOCS_PATH="%_defaultdocdir/%name" \
-DINSTALL_PK3_PATH="%_datadir/doom" \
- -DDYN_FLUIDSYNTH=OFF -DDYN_OPENAL=OFF \
- -DDYN_SNDFILE=OFF -DDYN_MPG123=OFF
+ -DDYN_OPENAL=OFF
make %{?_smp_mflags}
%install
From 47bf5f3c9bac743e1a4b6c0916dd1e59336c7b079c01694603a0e3c0430907fa Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 11 Jun 2020 08:16:01 +0000
Subject: [PATCH 2/6] OBS-URL:
https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=45
---
gzdoom-vulkan.patch | 52 ++++++++++++++++-----------------------------
gzdoom.spec | 20 +++++++++++------
2 files changed, 32 insertions(+), 40 deletions(-)
diff --git a/gzdoom-vulkan.patch b/gzdoom-vulkan.patch
index d3f5071..bdc8a3a 100644
--- a/gzdoom-vulkan.patch
+++ b/gzdoom-vulkan.patch
@@ -4,26 +4,38 @@ Date: 2019-04-13 15:02:22.799297208 +0200
Use Vulkan system libraries instead of bundled code.
---
- CMakeLists.txt | 3 ---
- src/CMakeLists.txt | 2 +-
- src/common/rendering/vulkan/shaders/vk_shader.cpp | 2 +-
- src/common/rendering/vulkan/system/vk_builders.cpp | 4 ++--
- 4 files changed, 4 insertions(+), 7 deletions(-)
+ CMakeLists.txt | 4 +---
+ libraries/glslang/spirv/CMakeLists.txt | 1 +
+ src/CMakeLists.txt | 2 +-
+ 3 files changed, 3 insertions(+), 4 deletions(-)
Index: gzdoom-g4.4.0/CMakeLists.txt
===================================================================
--- gzdoom-g4.4.0.orig/CMakeLists.txt
+++ gzdoom-g4.4.0/CMakeLists.txt
-@@ -307,9 +307,6 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
+@@ -307,9 +307,7 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
mark_as_advanced( FORCE_INTERNAL_ASMJIT )
if (HAVE_VULKAN)
- add_subdirectory( libraries/glslang/glslang)
- add_subdirectory( libraries/glslang/spirv )
- add_subdirectory( libraries/glslang/OGLCompilersDLL )
++ include_directories(/usr/include/glslang/Public /usr/include/SPIRV)
endif()
if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB )
+Index: gzdoom-g4.4.0/libraries/glslang/spirv/CMakeLists.txt
+===================================================================
+--- gzdoom-g4.4.0.orig/libraries/glslang/spirv/CMakeLists.txt
++++ gzdoom-g4.4.0/libraries/glslang/spirv/CMakeLists.txt
+@@ -50,6 +50,7 @@ set(SPVREMAP_HEADERS
+ doc.h)
+
+ add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
++set_property(TARGET SPIRV OUTPUT_NAME libSPIRV-zdoom)
+ set_property(TARGET SPIRV PROPERTY FOLDER glslang)
+ set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
+ target_include_directories(SPIRV PUBLIC
Index: gzdoom-g4.4.0/src/CMakeLists.txt
===================================================================
--- gzdoom-g4.4.0.orig/src/CMakeLists.txt
@@ -37,31 +49,3 @@ Index: gzdoom-g4.4.0/src/CMakeLists.txt
endif()
include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" )
-Index: gzdoom-g4.4.0/src/common/rendering/vulkan/shaders/vk_shader.cpp
-===================================================================
---- gzdoom-g4.4.0.orig/src/common/rendering/vulkan/shaders/vk_shader.cpp
-+++ gzdoom-g4.4.0/src/common/rendering/vulkan/shaders/vk_shader.cpp
-@@ -25,7 +25,7 @@
- #include "hw_shaderpatcher.h"
- #include "filesystem.h"
- #include "engineerrors.h"
--#include <ShaderLang.h>
-+#include <glslang/Public/ShaderLang.h>
-
- VkShaderManager::VkShaderManager(VulkanDevice *device) : device(device)
- {
-Index: gzdoom-g4.4.0/src/common/rendering/vulkan/system/vk_builders.cpp
-===================================================================
---- gzdoom-g4.4.0.orig/src/common/rendering/vulkan/system/vk_builders.cpp
-+++ gzdoom-g4.4.0/src/common/rendering/vulkan/system/vk_builders.cpp
-@@ -23,8 +23,8 @@
- #include "vk_builders.h"
- #include "engineerrors.h"
- #include "renderstyle.h"
--#include <ShaderLang.h>
--#include <GlslangToSpv.h>
-+#include <glslang/Public/ShaderLang.h>
-+#include <SPIRV/GlslangToSpv.h>
-
- static const TBuiltInResource DefaultTBuiltInResource = {
- /* .MaxLights = */ 32,
diff --git a/gzdoom.spec b/gzdoom.spec
index 848ed9b..720905d 100644
--- a/gzdoom.spec
+++ b/gzdoom.spec
@@ -28,15 +28,13 @@ URL: https://zdoom.org/
Source: https://github.com/coelckers/gzdoom/archive/g%version.tar.gz
Patch1: gzdoom-waddir.patch
Patch2: gzdoom-lzma.patch
-Patch3: gzdoom-vulkan.patch
-Patch4: gzdoom-asmjit.patch
+Patch3: gzdoom-asmjit.patch
+Patch4: gzdoom-vulkan.patch
BuildRequires: cmake >= 2.8.7
BuildRequires: gcc-c++
-BuildRequires: glslang-devel
BuildRequires: libjpeg-devel
BuildRequires: nasm
BuildRequires: pkg-config
-BuildRequires: spirv-tools-devel
BuildRequires: unzip
BuildRequires: zmusic-devel
BuildRequires: pkgconfig(bzip2)
@@ -48,6 +46,11 @@ BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(vulkan)
BuildRequires: pkgconfig(zlib)
+%if 0%{?sle_version} >= 150200
+BuildRequires: glslang-devel >= 6.3
+%else
+Provides: bundled(glslang) = 8.13.3559
+%endif
Recommends: freedoom
Recommends: timidity
Recommends: timidity-eawpats
@@ -71,8 +74,13 @@ GZDoom is a port (a modification) of the original Doom source code, featuring:
* Demo record/playback of classic and Boom demos is not supported.
%prep
-%autosetup -p1 -n %name-g%version
-rm -Rfv glslang src/rendering/vulkan/thirdparty/vulkan
+%setup -qn %name-g%version
+%patch -P 1 -P 2 -P 3 -p1
+%if 1 || 0%{?sle_version} >= 150200
+%patch -P 4 -p1
+rm -Rf glslang
+%endif
+rm -Rf src/common/rendering/vulkan/thirdparty/vulkan
perl -i -pe 's{__DATE__}{""}g' src/posix/sdl/i_main.cpp
%build
From f4dc07095ce1fd3cefbccb01ebeed2b33761cae96b8404264798fc22420012f6 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 11 Jun 2020 15:19:08 +0000
Subject: [PATCH 3/6] OBS-URL:
https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=46
---
gzdoom-spirv.patch | 23 +++++++++++++++++++++++
gzdoom-vulkan.patch | 21 ++++-----------------
gzdoom.changes | 2 +-
gzdoom.spec | 15 ++++++++-------
4 files changed, 36 insertions(+), 25 deletions(-)
create mode 100644 gzdoom-spirv.patch
diff --git a/gzdoom-spirv.patch b/gzdoom-spirv.patch
new file mode 100644
index 0000000..456408b
--- /dev/null
+++ b/gzdoom-spirv.patch
@@ -0,0 +1,23 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2020-06-11 15:48:28.422839234 +0200
+
+gzdoom is the only user of its own libSPIRV.so, so there is no need for a
+shared library.
+
+---
+ libraries/glslang/spirv/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: gzdoom-g4.4.0/libraries/glslang/spirv/CMakeLists.txt
+===================================================================
+--- gzdoom-g4.4.0.orig/libraries/glslang/spirv/CMakeLists.txt
++++ gzdoom-g4.4.0/libraries/glslang/spirv/CMakeLists.txt
+@@ -49,7 +49,7 @@ set(SPVREMAP_HEADERS
+ SPVRemapper.h
+ doc.h)
+
+-add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
++add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS})
+ set_property(TARGET SPIRV PROPERTY FOLDER glslang)
+ set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
+ target_include_directories(SPIRV PUBLIC
diff --git a/gzdoom-vulkan.patch b/gzdoom-vulkan.patch
index bdc8a3a..42c7bc7 100644
--- a/gzdoom-vulkan.patch
+++ b/gzdoom-vulkan.patch
@@ -1,13 +1,12 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2019-04-13 15:02:22.799297208 +0200
-Use Vulkan system libraries instead of bundled code.
+Use Vulkan/glslang/spirv system libraries instead of bundled code.
---
- CMakeLists.txt | 4 +---
- libraries/glslang/spirv/CMakeLists.txt | 1 +
- src/CMakeLists.txt | 2 +-
- 3 files changed, 3 insertions(+), 4 deletions(-)
+ CMakeLists.txt | 4 +---
+ src/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 4 deletions(-)
Index: gzdoom-g4.4.0/CMakeLists.txt
===================================================================
@@ -24,18 +23,6 @@ Index: gzdoom-g4.4.0/CMakeLists.txt
endif()
if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB )
-Index: gzdoom-g4.4.0/libraries/glslang/spirv/CMakeLists.txt
-===================================================================
---- gzdoom-g4.4.0.orig/libraries/glslang/spirv/CMakeLists.txt
-+++ gzdoom-g4.4.0/libraries/glslang/spirv/CMakeLists.txt
-@@ -50,6 +50,7 @@ set(SPVREMAP_HEADERS
- doc.h)
-
- add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
-+set_property(TARGET SPIRV OUTPUT_NAME libSPIRV-zdoom)
- set_property(TARGET SPIRV PROPERTY FOLDER glslang)
- set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
- target_include_directories(SPIRV PUBLIC
Index: gzdoom-g4.4.0/src/CMakeLists.txt
===================================================================
--- gzdoom-g4.4.0.orig/src/CMakeLists.txt
diff --git a/gzdoom.changes b/gzdoom.changes
index 07ac10e..11ddc00 100644
--- a/gzdoom.changes
+++ b/gzdoom.changes
@@ -13,7 +13,7 @@ Sun Jun 7 23:39:42 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
* Attenuated lights for Strife.
* Added MTF_NOCOUNT to spawn flags.
- Drop gzdoom-system-gme.patch (moved to zmusic.spec),
- gzdoom-dl.patch (unnecessary)
+ gzdoom-dl.patch (unnecessary). Add gzdoom-spirv.patch.
-------------------------------------------------------------------
Wed Jan 29 17:43:59 UTC 2020 - Michael Scafidi <raptir@gmail.com>
diff --git a/gzdoom.spec b/gzdoom.spec
index 720905d..e21e7d1 100644
--- a/gzdoom.spec
+++ b/gzdoom.spec
@@ -29,7 +29,8 @@ Source: https://github.com/coelckers/gzdoom/archive/g%version.tar.gz
Patch1: gzdoom-waddir.patch
Patch2: gzdoom-lzma.patch
Patch3: gzdoom-asmjit.patch
-Patch4: gzdoom-vulkan.patch
+Patch4: gzdoom-spirv.patch
+Patch5: gzdoom-vulkan.patch
BuildRequires: cmake >= 2.8.7
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
@@ -44,12 +45,13 @@ BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(sdl2)
-BuildRequires: pkgconfig(vulkan)
BuildRequires: pkgconfig(zlib)
%if 0%{?sle_version} >= 150200
BuildRequires: glslang-devel >= 6.3
+BuildRequires: pkgconfig(vulkan) >= 1.1.77
%else
Provides: bundled(glslang) = 8.13.3559
+Provides: bundled(vulkan) = 1.1.114
%endif
Recommends: freedoom
Recommends: timidity
@@ -75,12 +77,11 @@ GZDoom is a port (a modification) of the original Doom source code, featuring:
%prep
%setup -qn %name-g%version
-%patch -P 1 -P 2 -P 3 -p1
-%if 1 || 0%{?sle_version} >= 150200
-%patch -P 4 -p1
-rm -Rf glslang
+%patch -P 1 -P 2 -P 3 -P 4 -p1
+%if 0%{?sle_version} >= 150200
+%patch -P 5 -p1
+rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan
%endif
-rm -Rf src/common/rendering/vulkan/thirdparty/vulkan
perl -i -pe 's{__DATE__}{""}g' src/posix/sdl/i_main.cpp
%build
From 7faf227ae97ab14632760a7d89a9694c18fcd00904480bc7c148ded12fa15bc5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 11 Jun 2020 15:29:42 +0000
Subject: [PATCH 4/6] - Update to release 4.4.1
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=47
---
g4.4.0.tar.gz | 3 ---
g4.4.1.tar.gz | 3 +++
gzdoom.changes | 12 ++++++++++++
gzdoom.spec | 2 +-
4 files changed, 16 insertions(+), 4 deletions(-)
delete mode 100644 g4.4.0.tar.gz
create mode 100644 g4.4.1.tar.gz
diff --git a/g4.4.0.tar.gz b/g4.4.0.tar.gz
deleted file mode 100644
index 1a95e34..0000000
--- a/g4.4.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c94656fe85759a10a975f9478e2ae4c2b7018374cd7e0773ea281b1d9c375615
-size 12605718
diff --git a/g4.4.1.tar.gz b/g4.4.1.tar.gz
new file mode 100644
index 0000000..586399c
--- /dev/null
+++ b/g4.4.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e88fba1c0d9283ee2abf4529bee2d6ea56aa0ad6af187abedbd3cf3d86185e51
+size 12614753
diff --git a/gzdoom.changes b/gzdoom.changes
index 11ddc00..9550d99 100644
--- a/gzdoom.changes
+++ b/gzdoom.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jun 11 15:19:30 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 4.4.1
+ * Heretic's "bag of holding" had incorrectly given mace capacity.
+ * Mapped "Smooth mouse" back to the "m_filter" CVAR, and
+ removed the "smooth_mouse" CVAR.
+ * Fixed crash with texture upscaling in the truecolor software
+ renderer.
+ * Fixed crash rendering 3D floors without ceiling or floor
+ textures in software.
+
-------------------------------------------------------------------
Sun Jun 7 23:39:42 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
diff --git a/gzdoom.spec b/gzdoom.spec
index e21e7d1..3acffcd 100644
--- a/gzdoom.spec
+++ b/gzdoom.spec
@@ -17,7 +17,7 @@
Name: gzdoom
-Version: 4.4.0
+Version: 4.4.1
Release: 0
Summary: A DOOM source port with graphic and modding extensions
License: GPL-3.0-only
From 2968b01b0e0890ca6009baa75f763f251e2efe99d7ca2b224e1bd596424e8914 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 12 Jun 2020 00:26:48 +0000
Subject: [PATCH 5/6] - Add gzdoom-sdlbug.patch.
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=48
---
gzdoom-sdlbug.patch | 35 +++++++++++++++++++++++++++++++++++
gzdoom.changes | 5 +++++
gzdoom.spec | 7 ++++---
3 files changed, 44 insertions(+), 3 deletions(-)
create mode 100644 gzdoom-sdlbug.patch
diff --git a/gzdoom-sdlbug.patch b/gzdoom-sdlbug.patch
new file mode 100644
index 0000000..a6ddd73
--- /dev/null
+++ b/gzdoom-sdlbug.patch
@@ -0,0 +1,35 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2020-06-12 02:05:34.009865606 +0200
+
+When a SDL_PollEvent is sandwiched between SDL_CreateWindow and
+SDL_CreateRenderer, SDL crashes during SDL_IME_PumpEvents because dbus message
+still references the old window (still exists and pointer is non-NULL) and
+tries to access members of window->driverdata (block was freed and pointer is
+NULL.)
+
+Workaround this by recreating the SDL_Window object and immediately afterwards
+creating the renderer.
+
+This crash only happens for gzdoom when running with the SoftPoly rasterizer,
+as that is the only place that issues SDL_CreateRenderer after the mainloop has
+started.
+
+Needs a bugreport on libsdl.org.
+
+---
+ src/common/platform/posix/sdl/sdlglvideo.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: gzdoom-g4.4.1/src/common/platform/posix/sdl/sdlglvideo.cpp
+===================================================================
+--- gzdoom-g4.4.1.orig/src/common/platform/posix/sdl/sdlglvideo.cpp
++++ gzdoom-g4.4.1/src/common/platform/posix/sdl/sdlglvideo.cpp
+@@ -294,6 +294,8 @@ uint8_t *I_PolyPresentLock(int w, int h,
+ {
+ polyvsync = vsync;
+
++ Priv::DestroyWindow();
++ Priv::CreateWindow(Priv::VulkanWindowFlag | (Priv::softpolyEnabled ? SDL_WINDOW_HIDDEN : 0));
+ polyrendertarget = SDL_CreateRenderer(Priv::window, -1, vsync ? SDL_RENDERER_PRESENTVSYNC : 0);
+ if (!polyrendertarget)
+ {
diff --git a/gzdoom.changes b/gzdoom.changes
index 9550d99..49f6659 100644
--- a/gzdoom.changes
+++ b/gzdoom.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 12 00:26:10 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Add gzdoom-sdlbug.patch.
+
-------------------------------------------------------------------
Thu Jun 11 15:19:30 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
diff --git a/gzdoom.spec b/gzdoom.spec
index 3acffcd..15ceb80 100644
--- a/gzdoom.spec
+++ b/gzdoom.spec
@@ -30,7 +30,8 @@ Patch1: gzdoom-waddir.patch
Patch2: gzdoom-lzma.patch
Patch3: gzdoom-asmjit.patch
Patch4: gzdoom-spirv.patch
-Patch5: gzdoom-vulkan.patch
+Patch5: gzdoom-sdlbug.patch
+Patch6: gzdoom-vulkan.patch
BuildRequires: cmake >= 2.8.7
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
@@ -77,9 +78,9 @@ GZDoom is a port (a modification) of the original Doom source code, featuring:
%prep
%setup -qn %name-g%version
-%patch -P 1 -P 2 -P 3 -P 4 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
%if 0%{?sle_version} >= 150200
-%patch -P 5 -p1
+%patch -P 6 -p1
rm -Rf glslang src/common/rendering/vulkan/thirdparty/vulkan
%endif
perl -i -pe 's{__DATE__}{""}g' src/posix/sdl/i_main.cpp
From 8ed5dc9f166cc9514f95fd4319c8c1e9ea404ca969ebc638a2f932c1e6339a22 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 17 Jun 2020 14:40:58 +0000
Subject: [PATCH 6/6] - Update to release 4.4.2
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=49
---
g4.4.1.tar.gz | 3 ---
g4.4.2.tar.gz | 3 +++
gzdoom.changes | 6 ++++++
gzdoom.spec | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
delete mode 100644 g4.4.1.tar.gz
create mode 100644 g4.4.2.tar.gz
diff --git a/g4.4.1.tar.gz b/g4.4.1.tar.gz
deleted file mode 100644
index 586399c..0000000
--- a/g4.4.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e88fba1c0d9283ee2abf4529bee2d6ea56aa0ad6af187abedbd3cf3d86185e51
-size 12614753
diff --git a/g4.4.2.tar.gz b/g4.4.2.tar.gz
new file mode 100644
index 0000000..d39e1f6
--- /dev/null
+++ b/g4.4.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+size 12613806
diff --git a/gzdoom.changes b/gzdoom.changes
index 49f6659..51fc2e1 100644
--- a/gzdoom.changes
+++ b/gzdoom.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 17 14:33:30 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 4.4.2
+ * Made the new "Build" light mode operational
+
-------------------------------------------------------------------
Fri Jun 12 00:26:10 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
diff --git a/gzdoom.spec b/gzdoom.spec
index 15ceb80..a23cdd8 100644
--- a/gzdoom.spec
+++ b/gzdoom.spec
@@ -17,7 +17,7 @@
Name: gzdoom
-Version: 4.4.1
+Version: 4.4.2
Release: 0
Summary: A DOOM source port with graphic and modding extensions
License: GPL-3.0-only