Update to 1.2.0

9 files changed, 68 insertions, 324 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c896818162fd..b16081b8af1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,9 @@
-# Generated by mksrcinfo v8
-# Wed May 30 21:31:39 UTC 2018
 pkgbase = rbdoom-3-bfg
 	pkgdesc = Enhanced Doom 3: BFG Edition engine
-	pkgver = 1.1.0preview3.r122.g0e2890f9
+	pkgver = 1.2.0
 	pkgrel = 1
 	url = https://github.com/RobertBeckebans/RBDOOM-3-BFG
 	install = rbdoom-3-bfg.install
-	arch = i686
 	arch = x86_64
 	groups = games
 	license = GPL3
@@ -22,26 +19,20 @@ pkgbase = rbdoom-3-bfg
 	optdepends = alsa-plugins: pulseaudio-support
 	optdepends = libpulse: pulseaudio support
 	conflicts = rbdoom3-bfg-git
-	source = https://github.com/RobertBeckebans/RBDOOM-3-BFG/archive/0e2890f923398761ddd571c817226ee888adce5c.tar.gz
+	source = https://github.com/RobertBeckebans/RBDOOM-3-BFG/archive/3f7cf5387d887b44ed9cf7786f090b7b761550e8.tar.gz
 	source = rbdoom-3-bfg.desktop
 	source = 20-reproducible.patch
-	source = 30-init-sdl2.patch
 	source = 40-libpng16.patch
-	source = 50-system-rapidjson.patch
 	source = 60-spelling-errors.patch
-	source = 70-disable-hdr-by-default.patch
 	source = 80-gcc7.patch
-	source = 90-doomclassic-build.patch
-	sha512sums = 3adf47fc15819f7bd60d2f8b0cc14134d3c51301397a170b4f3b6da1560ca27027f7bb1e34526c93cc9d924d2b6d9d1065d2b2c25e3f18beaeb089fafd5f8278
+	source = 90-fix-include-path.patch
+	sha512sums = 85e7165295e23a70859168f4ede3730ceb490535dccd011e1adfb1879c528be4f1b83a3506caece3b32a3923bf7a4862c9a9968ef006b4230ae1c58d40e063e2
 	sha512sums = f1a74a79c369bec1c371eb74f7e8c415b4d1993fae995b0e476eb7c7e3b0a42dfb8ee5ae1f2e960c1443603f36abe37409ffeac0c29fd085ef5045388ff905f8
-	sha512sums = db8c51b9bcdb35e81bdc8c5a0ba2575060948ed2fb9837f92cfb9ff73b5f709d8f0909b12cc7715d72dad91cf79d769fd27817c8442bf642af967b1d237974fd
-	sha512sums = c60b508f5f5c3e19a0ef2431b3d2119b405e8f610356a98c931c16a53ac1b319c485ebe9d454b884a6d66829573377e3f94220bc50dc70efde45c9312f172859
+	sha512sums = f76d82dd92ef85c381c597578556019d624c6da70f5487072f2069604866fb2d067681ec8d48de1ad890289d452d6f0ee3c659105b31ac67dea41943f22b4767
 	sha512sums = efd74dacb3cdd28b7d78b348e884de0e23170908504f32f1dad2ded81c49a1c7e3b0f80da4fca96c14e52c4aeb2c4591a5877ada81ea2fcd3ab9e59b78d3989e
-	sha512sums = f7ca60ca455be6cfc7a1367edc3850a97b701e3f3d34ebe67d7f8a2b5412d5006fc7554712147cba450d7de0b4fab18a4eb292ca88272dc4ecc3a9462428bc16
-	sha512sums = bc1f8bf5ae2025d776080ec41496a16c3e09b1737d4f1c1f76bddb48f97a394dda3ba1f6e08ac8c5d8731a4acc5212a43f90daf41ba7d0f50f8dba5dc18b1069
-	sha512sums = 6cdf1650709a85cc96a57bc1e6fa127fa6b25ac980984a9f60f77daf4a761589a41eaff61fd7ca9946218a20edd835f4fb28d9844cbac8e6b28769ff149e6dec
+	sha512sums = 20cf661f8ad4dc06d1e4ffe3d2f63bae3d1e2002618e58d5a05f027d15a87ba7e47c2ef14ce5c98e18d759ff76d9e144767195200fa78983f12505a93d739beb
 	sha512sums = 5b473c8fa55c53d57044e0a1713443f2012c8e88e7f6349eb9e81f482e6ca958b501e95c88f55cac74dca84b3c015414617dfdb159c08d17d134543d7da5dc74
-	sha512sums = b2eecd0cf8c5d3a037695989d93d6ec3bb504cc31cda01a8a24f7867db171419282d6d6d9a0accbac94558bf5b7884bc4428a5af532ebe23849740cfaff1e974
+	sha512sums = d30f418f19608d94251cb2076c7c38e08ed6f19f0db55b0646c5119fc645f6ebe9d6ac4ee1183e3959ad75d70c33027226f39cb588681599f5874ea557c990e4
 
 pkgname = rbdoom-3-bfg
 
diff --git a/20-reproducible.patch b/20-reproducible.patch
index f74b78d623ba..aefe0c6e7511 100644
--- a/20-reproducible.patch
+++ b/20-reproducible.patch
@@ -18,17 +18,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  } version;
 --- a/neo/d3xp/Game_local.cpp
 +++ b/neo/d3xp/Game_local.cpp
-@@ -317,7 +317,6 @@
+@@ -317,7 +317,7 @@
  	
  	Printf( "--------- Initializing Game ----------\n" );
  	Printf( "gamename: %s\n", GAME_VERSION );
 -	Printf( "gamedate: %s\n", __DATE__ );
++	// Printf( "gamedate: %s\n", __DATE__ );
  	
  	// register game specific decl types
  	declManager->RegisterDeclType( "model",				DECL_MODELDEF,		idDeclAllocator<idDeclModelDef> );
 --- a/neo/d3xp/gamesys/SysCvar.cpp
 +++ b/neo/d3xp/gamesys/SysCvar.cpp
-@@ -43,14 +43,13 @@
+@@ -43,14 +43,14 @@
  */
  
  struct gameVersion_s {
@@ -41,6 +42,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  // noset vars
  idCVar gamename(					"gamename",					GAME_VERSION,	CVAR_GAME | CVAR_ROM, "" );
 -idCVar gamedate(					"gamedate",					__DATE__,		CVAR_GAME | CVAR_ROM, "" );
++//idCVar gamedate(					"gamedate",					__DATE__,		CVAR_GAME | CVAR_ROM, "" );
  
  idCVar si_map(						"si_map",					"-1",			CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_INTEGER, "default map choice for profile" );
  idCVar si_mode(						"si_mode",					"-1",			CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_INTEGER, "default mode choice for profile", -1, GAME_COUNT - 1 );
@@ -64,7 +66,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	// RB begin
  	//idStr version = va( "%s.%i.%i", ENGINE_VERSION, BUILD_NUMBER, BUILD_NUMBER_MINOR );
 -	idStr version = va( "%s %s %s %s", ENGINE_VERSION, BUILD_STRING, __DATE__, __TIME__ );
-+	idStr version = va( "%s %s", ENGINE_VERSION, BUILD_STRING);
++	idStr version = va( "%s %s (Debian package)", ENGINE_VERSION, BUILD_STRING);
  	//idStr version = com_version.GetString();
  	// RB end
  	
diff --git a/30-init-sdl2.patch b/30-init-sdl2.patch
deleted file mode 100644
index df6cd657f7cd..000000000000
--- a/30-init-sdl2.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Description: Fix SDL2 initialistion
- SDL_GL_* should only  be called after the window created.
- Also, SDL_GL_MakeCurrent seems necessary.
-Author: Tobias Frost <tobi@debian.org>
-Forwarded: https://github.com/RobertBeckeba06/RBDOOM-3-BFG/issues/205
-Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/251
-Last-Update: 2014-12-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/neo/sys/sdl/sdl_glimp.cpp
-+++ b/neo/sys/sdl/sdl_glimp.cpp
-@@ -49,15 +49,7 @@
- idCVar r_waylandcompat( "r_waylandcompat", "0", CVAR_SYSTEM | CVAR_NOCHEAT | CVAR_ARCHIVE, "wayland compatible framebuffer" );
- 
- // RB: only relevant if using SDL 2.0
--#if defined(__APPLE__)
--// only core profile is supported on OS X
--idCVar r_useOpenGL32( "r_useOpenGL32", "2", CVAR_INTEGER, "0 = OpenGL 3.x, 1 = OpenGL 3.2 compatibility profile, 2 = OpenGL 3.2 core profile", 0, 2 );
--#elif defined(__linux__)
--// Linux open source drivers suck
--idCVar r_useOpenGL32( "r_useOpenGL32", "0", CVAR_INTEGER, "0 = OpenGL 3.x, 1 = OpenGL 3.2 compatibility profile, 2 = OpenGL 3.2 core profile", 0, 2 );
--#else
--idCVar r_useOpenGL32( "r_useOpenGL32", "1", CVAR_INTEGER, "0 = OpenGL 3.x, 1 = OpenGL 3.2 compatibility profile, 2 = OpenGL 3.2 core profile", 0, 2 );
--#endif
-+idCVar r_useOpenGL32( "r_useOpenGL32", "1", CVAR_INTEGER, "0 = OpenGL 2.0, 1 = OpenGL 3.2 compatibility profile, 2 = OpenGL 3.2 core profile", 0, 2 );
- // RB end
- 
- static bool grabbed = false;
-@@ -195,28 +187,6 @@
- 		
- #if SDL_VERSION_ATLEAST(2, 0, 0)
- 		
--		// RB begin
--		if( r_useOpenGL32.GetInteger() > 0 )
--		{
--			glConfig.driverType = GLDRV_OPENGL32_COMPATIBILITY_PROFILE;
--			
--			SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, 3 );
--			SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, 2 );
--			
--			if( r_debugContext.GetBool() )
--			{
--				SDL_GL_SetAttribute( SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG );
--			}
--		}
--		
--		if( r_useOpenGL32.GetInteger() > 1 )
--		{
--			glConfig.driverType = GLDRV_OPENGL32_CORE_PROFILE;
--			
--			SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE );
--		}
--		// RB end
--		
- 		// DG: set display num for fullscreen
- 		int windowPos = SDL_WINDOWPOS_UNDEFINED;
- 		if( parms.fullScreen > 0 )
-@@ -246,8 +216,6 @@
- 								   parms.width, parms.height, flags );
- 		// DG end
- 		
--		context = SDL_GL_CreateContext( window );
--		
- 		if( !window )
- 		{
- 			common->DPrintf( "Couldn't set GL mode %d/%d/%d: %s",
-@@ -255,6 +223,31 @@
- 			continue;
- 		}
- 		
-+		context = SDL_GL_CreateContext( window );
-+        SDL_GL_MakeCurrent(window, context);
-+
-+        // RB begin
-+        if( r_useOpenGL32.GetInteger() > 0 )
-+        {
-+            glConfig.driverType = GLDRV_OPENGL32_COMPATIBILITY_PROFILE;
-+
-+            SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, 3 );
-+            SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, 2 );
-+
-+            if( r_debugContext.GetBool() )
-+            {
-+                SDL_GL_SetAttribute( SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG );
-+            }
-+        }
-+
-+        if( r_useOpenGL32.GetInteger() > 1 )
-+        {
-+            glConfig.driverType = GLDRV_OPENGL32_CORE_PROFILE;
-+
-+            SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE );
-+        }
-+        // RB end
-+
- 		if( SDL_GL_SetSwapInterval( r_swapInterval.GetInteger() ) < 0 )
- 			common->Warning( "SDL_GL_SWAP_CONTROL not supported" );
- 			
diff --git a/50-system-rapidjson.patch b/50-system-rapidjson.patch
deleted file mode 100644
index 8706236bba5b..000000000000
--- a/50-system-rapidjson.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-Description: Patch to be able to use Debian's rapidjson
- This patch adds the CMake-snippet and the necessary changes to be able to
- compile with the pacakged rapidjson.
-Author: Tobias Frost <tobi@debian.org>
-Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/351
-Last-Update: 2016-10-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/neo/CMakeLists.txt
-+++ b/neo/CMakeLists.txt
-@@ -41,6 +41,9 @@
- 
- option(USE_SYSTEM_LIBGLEW
-                 "Use the system libglew instead of the bundled one" OFF)
-+                
-+option(USE_SYSTEM_RAPIDJSON
-+                "Use the system rapidjson instead of the bundled one" OFF)			
- 
- set(CPU_TYPE "" CACHE STRING "When set, passes this string as CPU-ID which will be embedded into the binary.")
- 
-@@ -273,6 +276,17 @@
-     add_definitions(-DGLEW_STATIC)
- endif (GLEW_FOUND)
- 
-+if(USE_SYSTEM_RAPIDJSON)
-+find_package(rapidjson REQUIRED)
-+endif(USE_SYSTEM_RAPIDJSON)
-+
-+if (RAPIDJSON_FOUND)
-+	include_directories("${RAPIDJSON_INCLUDE_DIRS}")
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RAPIDJSON_CXX_FLAGS}")
-+else (RAPIDJSON_FOUND)
-+	include_directories("libs/rapidjson/include")
-+endif (RAPIDJSON_FOUND)
-+
- add_subdirectory(idlib)
- 
- file(GLOB AAS_INCLUDES aas/*.h)
---- /dev/null
-+++ b/neo/cmake/Findrapidjson.cmake
-@@ -0,0 +1,97 @@
-+# Copyright (c) 2011 Milo Yip (miloyip@gmail.com)
-+# Copyright (c) 2013 Rafal Jeczalik (rjeczalik@gmail.com)
-+# Distributed under the MIT License (see license.txt file)
-+
-+# -----------------------------------------------------------------------------------
-+#
-+# Finds the rapidjson library
-+#
-+# -----------------------------------------------------------------------------------
-+#
-+# Variables used by this module, they can change the default behaviour.
-+# Those variables need to be either set before calling find_package
-+# or exported as environment variables before running CMake:
-+#
-+# RAPIDJSON_INCLUDEDIR - Set custom include path, useful when rapidjson headers are
-+#                        outside system paths
-+# RAPIDJSON_USE_SSE2   - Configure rapidjson to take advantage of SSE2 capabilities
-+# RAPIDJSON_USE_SSE42  - Configure rapidjson to take advantage of SSE4.2 capabilities
-+#
-+# -----------------------------------------------------------------------------------
-+#
-+# Variables defined by this module:
-+#
-+# RAPIDJSON_FOUND        - True if rapidjson was found
-+# RAPIDJSON_INCLUDE_DIRS - Path to rapidjson include directory
-+# RAPIDJSON_CXX_FLAGS    - Extra C++ flags required for compilation with rapidjson
-+#
-+# -----------------------------------------------------------------------------------
-+#
-+# Example usage:
-+#
-+#  set(RAPIDJSON_USE_SSE2 ON)
-+#  set(RAPIDJSON_INCLUDEDIR "/opt/github.com/rjeczalik/rapidjson/include")
-+#
-+#  find_package(rapidjson REQUIRED)
-+#
-+#  include_directories("${RAPIDJSON_INCLUDE_DIRS}")
-+#  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RAPIDJSON_CXX_FLAGS}")
-+#  add_executable(foo foo.cc)
-+#
-+# -----------------------------------------------------------------------------------
-+
-+foreach(opt RAPIDJSON_INCLUDEDIR RAPIDJSON_USE_SSE2 RAPIDJSON_USE_SSE42)
-+  if(${opt} AND DEFINED ENV{${opt}} AND NOT ${opt} STREQUAL "$ENV{${opt}}")
-+    message(WARNING "Conflicting ${opt} values: ignoring environment variable and using CMake cache entry.")
-+  elseif(DEFINED ENV{${opt}} AND NOT ${opt})
-+    set(${opt} "$ENV{${opt}}")
-+  endif()
-+endforeach()
-+
-+find_path(
-+  RAPIDJSON_INCLUDE_DIRS
-+  NAMES rapidjson/rapidjson.h
-+  PATHS ${RAPIDJSON_INCLUDEDIR}
-+  DOC "Include directory for the rapidjson library."
-+)
-+
-+mark_as_advanced(RAPIDJSON_INCLUDE_DIRS)
-+
-+if(RAPIDJSON_INCLUDE_DIRS)
-+  set(RAPIDJSON_FOUND TRUE)
-+endif()
-+
-+mark_as_advanced(RAPIDJSON_FOUND)
-+
-+if(RAPIDJSON_USE_SSE42)
-+  set(RAPIDJSON_CXX_FLAGS "-DRAPIDJSON_SSE42")
-+  if(MSVC)
-+    set(RAPIDJSON_CXX_FLAGS "${RAPIDJSON_CXX_FLAGS} /arch:SSE4.2")
-+  else()
-+    set(RAPIDJSON_CXX_FLAGS "${RAPIDJSON_CXX_FLAGS} -msse4.2")
-+  endif()
-+else()
-+  if(RAPIDJSON_USE_SSE2)
-+    set(RAPIDJSON_CXX_FLAGS "-DRAPIDJSON_SSE2")
-+    if(MSVC)
-+      set(RAPIDJSON_CXX_FLAGS "${RAPIDJSON_CXX_FLAGS} /arch:SSE2")
-+    else()
-+      set(RAPIDJSON_CXX_FLAGS "${RAPIDJSON_CXX_FLAGS} -msse2")
-+    endif()
-+  endif()
-+endif()
-+
-+mark_as_advanced(RAPIDJSON_CXX_FLAGS)
-+
-+if(RAPIDJSON_FOUND)
-+  if(NOT rapidjson_FIND_QUIETLY)
-+    message(STATUS "Found rapidjson header files in ${RAPIDJSON_INCLUDE_DIRS}")
-+    if(DEFINED RAPIDJSON_CXX_FLAGS)
-+      message(STATUS "Found rapidjson C++ extra compilation flags: ${RAPIDJSON_CXX_FLAGS}")
-+    endif()
-+  endif()
-+elseif(rapidjson_FIND_REQUIRED)
-+    message(FATAL_ERROR "Could not find rapidjson")
-+else()
-+  message(STATUS "Optional package rapidjson was not found")
-+endif()
---- a/neo/idlib/precompiled.h
-+++ b/neo/idlib/precompiled.h
-@@ -105,7 +105,10 @@
- #include "../ui/UserInterface.h"
- 
- // RB: required for SWF extensions
--#include "../libs/rapidjson/include/rapidjson/document.h"
-+//#include "../libs/rapidjson/include/rapidjson/document.h"
-+#include "rapidjson/document.h"
-+
-+
- 
- #include "../swf/SWF.h"
- 
diff --git a/60-spelling-errors.patch b/60-spelling-errors.patch
index 4f96e23290b4..e223491b9926 100644
--- a/60-spelling-errors.patch
+++ b/60-spelling-errors.patch
@@ -1,11 +1,11 @@
 Description: Fix several spelling errors found by lintian
 Author: Tobias Frost <tobi@debian.org>
-Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
-Last-Update: 2016-10-15
+Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/354
+Last-Update: 2018-04-04
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/base/renderprogs/SMAA.inc
-+++ b/base/renderprogs/SMAA.inc
+--- a/base/renderprogs/SMAA.inc.hlsl
++++ b/base/renderprogs/SMAA.inc.hlsl
 @@ -228,14 +228,14 @@
   *      - DX10.1:   D3D10_STANDARD_MULTISAMPLE_PATTERN or
   *      - DX11:     D3D11_STANDARD_MULTISAMPLE_PATTERN
@@ -301,7 +301,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		"        // better interleave arithmetic and memory accesses):\n"
  		"        d = abs(round(mad(SMAA_RT_METRICS.zz, d, -pixcoord.xx)));\n"
  		"\n"
-@@ -10542,7 +10542,7 @@
+@@ -10545,7 +10545,7 @@
  		"\n"
  		"Doom 3 BFG Edition GPL Source Code\n"
  		"Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. \n"
@@ -310,7 +310,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		"\n"
  		"This file is part of the Doom 3 BFG Edition GPL Source Code (\"Doom 3 BFG Edition Source Code\").  \n"
  		"\n"
-@@ -12320,7 +12320,7 @@
+@@ -12324,7 +12324,7 @@
  		"	float L = ( 1.0 - exp( -Yr * exposure ) );\n"
  		"	color.rgb *= L;\n"
  		"	\n"
@@ -383,7 +383,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	// all parms are read as idWinStr's but will be fixed up later
 --- a/README.txt
 +++ b/README.txt
-@@ -324,7 +324,7 @@
+@@ -349,7 +349,7 @@
  r_useHDR [0 or 1] - Use High Dynamic Range lighting
  
  r_hdrAutoExposure [0 or 1] - Adaptive tonemapping with HDR
@@ -392,3 +392,25 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	
  r_exposure [0 .. 1] - Default 0.5, Controls brightness and affects HDR exposure key
  	This is what you change in the video brightness options
+--- a/doomclassic/doom/doominterface.cpp
++++ b/doomclassic/doom/doominterface.cpp
+@@ -182,7 +182,7 @@
+ 
+ 		lastTicRun = iTime;
+ 	} else {
+-		printf( "Skipping this frame becase it's not time to run a tic yet.\n" );
++		printf( "Skipping this frame because it's not time to run a tic yet.\n" );
+ 	}
+ 
+ 	return bAllFinished;
+--- a/neo/renderer/ImageManager.cpp
++++ b/neo/renderer/ImageManager.cpp
+@@ -427,7 +427,7 @@
+ 			{
+ 				image->referencedOutsideLevelLoad = ( !insideLevelLoad && !preloadingMapImages );
+ 				image->ActuallyLoadImage( false );	// load is from front end
+-				declManager->MediaPrint( "%ix%i %s (reload for mixed referneces)\n", image->GetUploadWidth(), image->GetUploadHeight(), image->GetName() );
++				declManager->MediaPrint( "%ix%i %s (reload for mixed references)\n", image->GetUploadWidth(), image->GetUploadHeight(), image->GetName() );
+ 			}
+ 			return image;
+ 		}
diff --git a/70-disable-hdr-by-default.patch b/70-disable-hdr-by-default.patch
deleted file mode 100644
index 8d0ea8958118..000000000000
--- a/70-disable-hdr-by-default.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Change default to disable HDR rendering
- Sometimes with HDR and SSAO enabled, there will be black sticking artifacts.
- This patch sets the default for HDR to "off"
- See the upstream bug for detail.
-Author: Tobias Frost <tobi@debian.org>
-Bug: https://github.com/RobertBeckebans/RBDOOM-3-BFG/issues/308
-Last-Update: 2016-10-15
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/neo/renderer/RenderSystem_init.cpp
-+++ b/neo/renderer/RenderSystem_init.cpp
-@@ -252,7 +252,7 @@
- idCVar r_shadowMapSunDepthBiasScale( "r_shadowMapSunDepthBiasScale", "0.999991", CVAR_RENDERER | CVAR_FLOAT, "shadowmap bias to fight shadow acne for cascaded shadow mapping with parallel lights" );
- 
- // RB: HDR parameters
--idCVar r_useHDR( "r_useHDR", "1", CVAR_RENDERER | CVAR_ARCHIVE | CVAR_BOOL, "use high dynamic range rendering" );
-+idCVar r_useHDR( "r_useHDR", "0", CVAR_RENDERER | CVAR_ARCHIVE | CVAR_BOOL, "use high dynamic range rendering" );
- idCVar r_hdrAutoExposure( "r_hdrAutoExposure", "1", CVAR_RENDERER | CVAR_BOOL, "EXPENSIVE: enables adapative HDR tone mapping otherwise the exposure is derived by r_exposure" );
- idCVar r_hdrMinLuminance( "r_hdrMinLuminance", "0.005", CVAR_RENDERER | CVAR_FLOAT, "" );
- idCVar r_hdrMaxLuminance( "r_hdrMaxLuminance", "300", CVAR_RENDERER | CVAR_FLOAT, "" );
diff --git a/90-doomclassic-build.patch b/90-doomclassic-build.patch
deleted file mode 100644
index 1dabd509965a..000000000000
--- a/90-doomclassic-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/doomclassic/doom/p_setup.cpp b/doomclassic/doom/p_setup.cpp
-index d0aceff..8e064c0 100644
---- a/doomclassic/doom/p_setup.cpp
-+++ b/doomclassic/doom/p_setup.cpp
-@@ -655,7 +655,7 @@ P_SetupLevel
- 	// find map name
- 	if ( ::g->gamemode == commercial)
- 	{
--		if (map<10)
-+		if (map % 100 < 10)
- 			sprintf (lumpname,"map0%i", map);
- 		else
- 			sprintf (lumpname,"map%i", map);
diff --git a/90-fix-include-path.patch b/90-fix-include-path.patch
new file mode 100644
index 000000000000..789eeea73229
--- /dev/null
+++ b/90-fix-include-path.patch
@@ -0,0 +1,18 @@
+Description: Fix include path in RendererBackend.cpp
+Author: Tobias Frost <tobi@debian.org>
+Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/435
+Applied-Upstream: Yes
+Last-Update: 2019-10-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/neo/renderer/RenderBackend.cpp
++++ b/neo/renderer/RenderBackend.cpp
+@@ -31,7 +31,7 @@
+ #pragma hdrstop
+ #include "precompiled.h"
+ 
+-#include "../../framework/Common_local.h"
++#include "framework/Common_local.h"
+ #include "RenderCommon.h"
+ #include "Framebuffer.h"
+ 
diff --git a/PKGBUILD b/PKGBUILD
index da6b29cffef7..e92358ae92e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 # Based on the rbdoom3-bfg-git package by M0Rf30
 
 pkgname=rbdoom-3-bfg
-_commit=0e2890f923398761ddd571c817226ee888adce5c
-pkgver=1.1.0preview3.r122.g0e2890f9
+_commit=3f7cf5387d887b44ed9cf7786f090b7b761550e8
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Enhanced Doom 3: BFG Edition engine"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="https://github.com/RobertBeckebans/RBDOOM-3-BFG"
 license=('GPL3')
 groups=('games')
@@ -17,25 +17,19 @@ install=rbdoom-3-bfg.install
 optdepends=('alsa-plugins: pulseaudio-support'
             'libpulse: pulseaudio support')
 source=("https://github.com/RobertBeckebans/RBDOOM-3-BFG/archive/${_commit}.tar.gz"
-        'rbdoom-3-bfg.desktop'
+        rbdoom-3-bfg.desktop
         20-reproducible.patch
-        30-init-sdl2.patch
         40-libpng16.patch
-        50-system-rapidjson.patch
         60-spelling-errors.patch
-        70-disable-hdr-by-default.patch
         80-gcc7.patch
-        90-doomclassic-build.patch)
-sha512sums=('3adf47fc15819f7bd60d2f8b0cc14134d3c51301397a170b4f3b6da1560ca27027f7bb1e34526c93cc9d924d2b6d9d1065d2b2c25e3f18beaeb089fafd5f8278'
+        90-fix-include-path.patch)
+sha512sums=('85e7165295e23a70859168f4ede3730ceb490535dccd011e1adfb1879c528be4f1b83a3506caece3b32a3923bf7a4862c9a9968ef006b4230ae1c58d40e063e2'
             'f1a74a79c369bec1c371eb74f7e8c415b4d1993fae995b0e476eb7c7e3b0a42dfb8ee5ae1f2e960c1443603f36abe37409ffeac0c29fd085ef5045388ff905f8'
-            'db8c51b9bcdb35e81bdc8c5a0ba2575060948ed2fb9837f92cfb9ff73b5f709d8f0909b12cc7715d72dad91cf79d769fd27817c8442bf642af967b1d237974fd'
-            'c60b508f5f5c3e19a0ef2431b3d2119b405e8f610356a98c931c16a53ac1b319c485ebe9d454b884a6d66829573377e3f94220bc50dc70efde45c9312f172859'
+            'f76d82dd92ef85c381c597578556019d624c6da70f5487072f2069604866fb2d067681ec8d48de1ad890289d452d6f0ee3c659105b31ac67dea41943f22b4767'
             'efd74dacb3cdd28b7d78b348e884de0e23170908504f32f1dad2ded81c49a1c7e3b0f80da4fca96c14e52c4aeb2c4591a5877ada81ea2fcd3ab9e59b78d3989e'
-            'f7ca60ca455be6cfc7a1367edc3850a97b701e3f3d34ebe67d7f8a2b5412d5006fc7554712147cba450d7de0b4fab18a4eb292ca88272dc4ecc3a9462428bc16'
-            'bc1f8bf5ae2025d776080ec41496a16c3e09b1737d4f1c1f76bddb48f97a394dda3ba1f6e08ac8c5d8731a4acc5212a43f90daf41ba7d0f50f8dba5dc18b1069'
-            '6cdf1650709a85cc96a57bc1e6fa127fa6b25ac980984a9f60f77daf4a761589a41eaff61fd7ca9946218a20edd835f4fb28d9844cbac8e6b28769ff149e6dec'
+            '20cf661f8ad4dc06d1e4ffe3d2f63bae3d1e2002618e58d5a05f027d15a87ba7e47c2ef14ce5c98e18d759ff76d9e144767195200fa78983f12505a93d739beb'
             '5b473c8fa55c53d57044e0a1713443f2012c8e88e7f6349eb9e81f482e6ca958b501e95c88f55cac74dca84b3c015414617dfdb159c08d17d134543d7da5dc74'
-            'b2eecd0cf8c5d3a037695989d93d6ec3bb504cc31cda01a8a24f7867db171419282d6d6d9a0accbac94558bf5b7884bc4428a5af532ebe23849740cfaff1e974')
+            'd30f418f19608d94251cb2076c7c38e08ed6f19f0db55b0646c5119fc645f6ebe9d6ac4ee1183e3959ad75d70c33027226f39cb588681599f5874ea557c990e4')
 
 prepare() {
   cd "$srcdir/RBDOOM-3-BFG-$_commit"