From e1d0018f509258af70fcce8302d9074c04657cba70a8499f7235489094afa2c4 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 11 Jan 2020 22:49:24 +0000
Subject: [PATCH] - Update to release 4.3.1

OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=39
---
 g4.2.4.tar.gz           |  3 ---
 g4.3.1.tar.gz           |  3 +++
 gzdoom-system-gme.patch | 22 +++++++++++-----------
 gzdoom.changes          | 12 ++++++++++++
 gzdoom.spec             |  6 +++---
 5 files changed, 29 insertions(+), 17 deletions(-)
 delete mode 100644 g4.2.4.tar.gz
 create mode 100644 g4.3.1.tar.gz

diff --git a/g4.2.4.tar.gz b/g4.2.4.tar.gz
deleted file mode 100644
index 3e9022c..0000000
--- a/g4.2.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d5b441fe7fc449eb934b87d920c2f76529c331747eb4fe6cb1cdf185465c51c
-size 13683768
diff --git a/g4.3.1.tar.gz b/g4.3.1.tar.gz
new file mode 100644
index 0000000..34c895a
--- /dev/null
+++ b/g4.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b569d155bc374878c2ebe425763b266736e8c36591b50aad968ffff7f6f5cce8
+size 13689272
diff --git a/gzdoom-system-gme.patch b/gzdoom-system-gme.patch
index cbdb722..ce962eb 100644
--- a/gzdoom-system-gme.patch
+++ b/gzdoom-system-gme.patch
@@ -8,11 +8,11 @@ Use GME system libraries instead of bundled code.
  libraries/zmusic/CMakeLists.txt |    2 +-
  2 files changed, 5 insertions(+), 10 deletions(-)
 
-Index: gzdoom-g4.2.4/CMakeLists.txt
+Index: gzdoom-g4.3.1/CMakeLists.txt
 ===================================================================
---- gzdoom-g4.2.4.orig/CMakeLists.txt
-+++ gzdoom-g4.2.4/CMakeLists.txt
-@@ -195,12 +195,7 @@ endif()
+--- gzdoom-g4.3.1.orig/CMakeLists.txt
++++ gzdoom-g4.3.1/CMakeLists.txt
+@@ -196,12 +196,7 @@ endif()
  #endif()
  
  # GME
@@ -26,7 +26,7 @@ Index: gzdoom-g4.2.4/CMakeLists.txt
  
  if( MSVC )
  	# Eliminate unreferenced functions and data
-@@ -323,7 +318,7 @@ set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_
+@@ -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")
@@ -35,7 +35,7 @@ Index: gzdoom-g4.2.4/CMakeLists.txt
  mark_as_advanced( FORCE_INTERNAL_GME )
  option(FORCE_INTERNAL_ASMJIT "Use internal asmjit" ON)
  mark_as_advanced( FORCE_INTERNAL_ASMJIT )
-@@ -392,14 +387,14 @@ else()
+@@ -391,14 +386,14 @@ else()
  endif()
  
  if( GME_FOUND AND NOT FORCE_INTERNAL_GME )
@@ -52,11 +52,11 @@ Index: gzdoom-g4.2.4/CMakeLists.txt
  	set( GME_LIBRARIES gme )
  endif()
  
-Index: gzdoom-g4.2.4/libraries/zmusic/CMakeLists.txt
+Index: gzdoom-g4.3.1/libraries/zmusic/CMakeLists.txt
 ===================================================================
---- gzdoom-g4.2.4.orig/libraries/zmusic/CMakeLists.txt
-+++ gzdoom-g4.2.4/libraries/zmusic/CMakeLists.txt
-@@ -41,7 +41,7 @@ else()
+--- gzdoom-g4.3.1.orig/libraries/zmusic/CMakeLists.txt
++++ gzdoom-g4.3.1/libraries/zmusic/CMakeLists.txt
+@@ -46,7 +46,7 @@ else()
  endif()
  
  
@@ -64,4 +64,4 @@ Index: gzdoom-g4.2.4/libraries/zmusic/CMakeLists.txt
 +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
+     set( PLAT_SOURCES
diff --git a/gzdoom.changes b/gzdoom.changes
index ae92561..61abdfe 100644
--- a/gzdoom.changes
+++ b/gzdoom.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Jan 11 22:33:30 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 4.3.1
+  * New softpoly backend for the hardware renderer.
+  * Advanced texture colorization options.
+  * Scripted map postprocessor.
+  * Dictionary class for ZScript.
+  * Add PSPF_PLAYERTRANSLATED flag (makes a PSprite layer
+    translated to the user's color).
+  * Support for MIDI on Linux via ALSA sequencer.
+
 -------------------------------------------------------------------
 Tue Dec 17 00:10:32 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/gzdoom.spec b/gzdoom.spec
index 350870a..d5d6e88 100644
--- a/gzdoom.spec
+++ b/gzdoom.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gzdoom
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,12 +17,12 @@
 
 
 Name:           gzdoom
-Version:        4.2.4
+Version:        4.3.1
 Release:        0
 Summary:        A DOOM source port with graphic and modding extensions
 License:        GPL-3.0-only
 Group:          Amusements/Games/3D/Shoot
-URL:            http://zdoom.org/
+URL:            https://zdoom.org/
 
 #Git-Clone:     https://github.com/coelckers/gzdoom
 Source:         https://github.com/coelckers/gzdoom/archive/g%version.tar.gz