[kodi] Workaround for brp-mangle-shebangs behavior (RHBZ#1787088)
by Michael Cronenworth
commit 4769916d6e416ba06979ef31674190e0138e26a5
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Dec 31 14:33:27 2019 -0600
Workaround for brp-mangle-shebangs behavior (RHBZ#1787088)
kodi-18-brp-mangle-shebangs.patch | 11 +++++++++++
kodi.spec | 4 ++++
2 files changed, 15 insertions(+)
---
diff --git a/kodi-18-brp-mangle-shebangs.patch b/kodi-18-brp-mangle-shebangs.patch
new file mode 100644
index 0000000..4b0004f
--- /dev/null
+++ b/kodi-18-brp-mangle-shebangs.patch
@@ -0,0 +1,11 @@
+--- kodi-18.5/cmake/scripts/linux/Install.cmake-orig 2019-11-16 12:12:49.000000000 +0100
++++ kodi-18.5/cmake/scripts/linux/Install.cmake 2019-12-31 20:30:14.262789039 +0100
+@@ -200,7 +200,7 @@ if(ENABLE_EVENTCLIENTS)
+ COMPONENT kodi-eventclients-common)
+
+ # Install kodi-eventclients-common python files
+- file(WRITE ${CMAKE_BINARY_DIR}/packages/deb/defs.py ICON_PATH="usr/share/pixmaps/${APP_NAME_LC}/")
++ file(WRITE ${CMAKE_BINARY_DIR}/packages/deb/defs.py ICON_PATH="usr/share/pixmaps/${APP_NAME_LC}/"\n)
+ install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/deb/defs.py
+ ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/__init__.py
+ ${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/PS3BDRemote/ps3_remote.py
diff --git a/kodi.spec b/kodi.spec
index 55c999b..fe0f67a 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -83,6 +83,9 @@ Patch5: kodi-18-python3-0002.patch
# Fix missing include (gcc requirement)
Patch6: kodi-18-assert.patch
+# Workaround for brp-mangle-shebangs behavior (RHBZ#1787088)
+Patch7: kodi-18-brp-mangle-shebangs.patch
+
%ifarch x86_64 i686
%global _with_crystalhd 1
%endif
@@ -372,6 +375,7 @@ This package contains the Kodi binary for X11 servers.
%endif
%patch6 -p1 -b.assert
+%patch7 -p1 -b.brp-mangle-shebangs
# Fix up Python shebangs
%if 0%{?fedora} > 31
4 years, 10 months
[kodi] Disable Debug Fission feature, creates broken debug info on Red Hat based systems
by Michael Cronenworth
commit 874d31e590289e202fbaa95141428294f1e4993d
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Dec 30 23:23:08 2019 -0600
Disable Debug Fission feature, creates broken debug info on Red Hat based systems
kodi.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/kodi.spec b/kodi.spec
index e978824..55c999b 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -409,6 +409,7 @@ do
-DFFMPEG_URL=%{SOURCE5} \
%endif
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DENABLE_DEBUGFISSION=OFF \
-GNinja \
-DENABLE_EVENTCLIENTS=ON \
-DENABLE_INTERNAL_CROSSGUID=OFF \
4 years, 10 months
[kodi/f30] (3 commits) ...Update to 18.5
by Michael Cronenworth
Summary of changes:
42048a0... Fix Python 2 search and drop SDL/SDL2 (*)
5484569... Rebuild for new libnfs version (*)
32b2692... Update to 18.5 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[dhewm3] Remove useless patch
by Simone Caronni
Summary of changes:
2478c7c... Remove useless patch (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[dhewm3/f31] Remove useless patch
by Simone Caronni
Summary of changes:
2478c7c... Remove useless patch (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[dhewm3/f30] Remove useless patch
by Simone Caronni
commit 2478c7ca1525dfcd6bff6eadacea8bd436480b60
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Mon Dec 30 12:29:18 2019 +0100
Remove useless patch
dhewm3-carmack.patch | 50 --------------------------------------------------
1 file changed, 50 deletions(-)
4 years, 10 months
[dhewm3/el7] Remove useless patch
by Simone Caronni
commit 10f141248cc427d0adbfb6185760b8ca556c8c3e
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Mon Dec 30 12:29:18 2019 +0100
Remove useless patch
dhewm3-carmack.patch | 50 --------------------------------------------------
1 file changed, 50 deletions(-)
4 years, 10 months
[dhewm3] Update to latest snapshot
by Simone Caronni
Summary of changes:
782c290... Update to latest snapshot (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[dhewm3/f31] Update to latest snapshot
by Simone Caronni
Summary of changes:
782c290... Update to latest snapshot (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[dhewm3/f30: 2/2] Update to latest snapshot
by Simone Caronni
commit 782c290e45b6b2971df22a445c208aa69b11148e
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Mon Dec 30 12:12:10 2019 +0100
Update to latest snapshot
.gitignore | 1 +
dhewm3-carmack.patch | 24 ++++++-------
dhewm3-def-fixedtic.patch | 11 ------
dhewm3-no-cdkey.patch | 88 +++++++++++++++++++++++------------------------
dhewm3.spec | 38 +++++++++++---------
sources | 2 +-
6 files changed, 79 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ffa4fd0..3257e56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
dhewm3-1.3.1.1304-657ad99.tar.gz
dhewm3-89f227b.tar.gz
/dhewm3-d535e54.tar.gz
+/dhewm3-f24f18a.tar.gz
diff --git a/dhewm3-carmack.patch b/dhewm3-carmack.patch
index 4914b06..83a550c 100644
--- a/dhewm3-carmack.patch
+++ b/dhewm3-carmack.patch
@@ -1,7 +1,7 @@
-diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/CMakeLists.txt dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/CMakeLists.txt
---- dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/CMakeLists.txt 2016-01-23 10:16:16.845525612 +0100
-+++ dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/CMakeLists.txt 2016-01-23 10:23:06.175713253 +0100
-@@ -39,6 +39,7 @@
+diff -Naur dhewm3-1.5.0.old/neo/CMakeLists.txt dhewm3-1.5.0/neo/CMakeLists.txt
+--- dhewm3-1.5.0.old/neo/CMakeLists.txt 2019-01-06 16:58:20.269094586 +0100
++++ dhewm3-1.5.0/neo/CMakeLists.txt 2019-01-06 17:02:03.725252014 +0100
+@@ -52,6 +52,7 @@
option(DEDICATED "Build the dedicated server" OFF)
option(ONATIVE "Optimize for the host CPU" OFF)
option(SDL2 "Use SDL2 instead of SDL1.2" ON)
@@ -9,19 +9,19 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/CMakeLists.tx
if(NOT CMAKE_SYSTEM_PROCESSOR)
message(FATAL_ERROR "No target CPU architecture set")
-@@ -752,6 +753,9 @@
- ${src_sys_base}
- ${src_sys_core}
+@@ -766,6 +767,9 @@
+ sys/win32/win_syscon.cpp
+ sys/win32/SDL_win32_main.c
)
+ if(ZFAIL)
+ add_definitions( -DDEFY_PATENTS )
+ endif()
- set_target_properties(dhewm3 PROPERTIES COMPILE_DEFINITIONS "__DOOM_DLL__")
- set_target_properties(dhewm3 PROPERTIES LINK_FLAGS "${ldflags}")
-diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/renderer/draw_common.cpp dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/renderer/draw_common.cpp
---- dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/renderer/draw_common.cpp 2016-01-23 10:16:17.172529795 +0100
-+++ dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/renderer/draw_common.cpp 2016-01-23 10:21:43.729669761 +0100
+ set(src_sys_core
+ sys/glimp.cpp
+diff -Naur dhewm3-1.5.0.old/neo/renderer/draw_common.cpp dhewm3-1.5.0/neo/renderer/draw_common.cpp
+--- dhewm3-1.5.0.old/neo/renderer/draw_common.cpp 2019-01-06 16:58:20.324095608 +0100
++++ dhewm3-1.5.0/neo/renderer/draw_common.cpp 2019-01-06 17:02:03.726252033 +0100
@@ -1140,6 +1140,7 @@
return;
}
diff --git a/dhewm3-no-cdkey.patch b/dhewm3-no-cdkey.patch
index 20c2e8f..ea90573 100644
--- a/dhewm3-no-cdkey.patch
+++ b/dhewm3-no-cdkey.patch
@@ -1,6 +1,6 @@
-diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/async/AsyncClient.cpp dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/async/AsyncClient.cpp
---- dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/async/AsyncClient.cpp 2016-01-23 10:16:16.945526891 +0100
-+++ dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/async/AsyncClient.cpp 2016-01-23 10:16:31.525713410 +0100
+diff -Naur dhewm3-1.5.0.old/neo/framework/async/AsyncClient.cpp dhewm3-1.5.0/neo/framework/async/AsyncClient.cpp
+--- dhewm3-1.5.0.old/neo/framework/async/AsyncClient.cpp 2019-01-06 16:58:20.380096648 +0100
++++ dhewm3-1.5.0/neo/framework/async/AsyncClient.cpp 2019-01-06 16:58:38.595434937 +0100
@@ -1262,93 +1262,6 @@
/*
@@ -151,9 +151,9 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/asy
===============
idAsyncClient::CheckTimeout
===============
-diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/async/AsyncClient.h dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/async/AsyncClient.h
---- dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/async/AsyncClient.h 2016-01-23 10:16:16.945526891 +0100
-+++ dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/async/AsyncClient.h 2016-01-23 10:16:31.530713474 +0100
+diff -Naur dhewm3-1.5.0.old/neo/framework/async/AsyncClient.h dhewm3-1.5.0/neo/framework/async/AsyncClient.h
+--- dhewm3-1.5.0.old/neo/framework/async/AsyncClient.h 2019-01-06 16:58:20.379096629 +0100
++++ dhewm3-1.5.0/neo/framework/async/AsyncClient.h 2019-01-06 16:58:38.596434956 +0100
@@ -114,9 +114,6 @@
void SendReliableGameMessage( const idBitMsg &msg );
@@ -172,9 +172,9 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/asy
void ProcessVersionMessage( const netadr_t from, const idBitMsg &msg );
void ConnectionlessMessage( const netadr_t from, const idBitMsg &msg );
void ProcessMessage( const netadr_t from, idBitMsg &msg );
-diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/BuildDefines.h dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/BuildDefines.h
---- dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/BuildDefines.h 2016-01-23 10:16:16.939526814 +0100
-+++ dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/BuildDefines.h 2016-01-23 10:17:42.613621754 +0100
+diff -Naur dhewm3-1.5.0.old/neo/framework/BuildDefines.h dhewm3-1.5.0/neo/framework/BuildDefines.h
+--- dhewm3-1.5.0.old/neo/framework/BuildDefines.h 2019-01-06 16:58:20.378096611 +0100
++++ dhewm3-1.5.0/neo/framework/BuildDefines.h 2019-01-06 16:58:38.597434974 +0100
@@ -75,24 +75,6 @@
#define ID_ALLOW_TOOLS
#endif
@@ -200,10 +200,10 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Bui
// async network
/*
-diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Common.cpp dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/Common.cpp
---- dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Common.cpp 2016-01-23 10:16:16.940526827 +0100
-+++ dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/Common.cpp 2016-01-23 10:16:37.409788683 +0100
-@@ -1049,7 +1049,6 @@
+diff -Naur dhewm3-1.5.0.old/neo/framework/Common.cpp dhewm3-1.5.0/neo/framework/Common.cpp
+--- dhewm3-1.5.0.old/neo/framework/Common.cpp 2019-01-06 16:58:20.378096611 +0100
++++ dhewm3-1.5.0/neo/framework/Common.cpp 2019-01-06 16:58:38.598434993 +0100
+@@ -1068,7 +1068,6 @@
com_developer.SetBool( false );
WriteConfigToFile( CONFIG_FILE );
@@ -211,7 +211,7 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Com
// restore the developer cvar
com_developer.SetBool( developer );
-@@ -2832,11 +2831,7 @@
+@@ -2939,11 +2938,7 @@
InitGame();
// don't add startup commands if no CD key is present
@@ -223,9 +223,9 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Com
// if the user didn't give any commands, run default action
session->StartMenu( true );
}
-diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/FileSystem.cpp dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/FileSystem.cpp
---- dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/FileSystem.cpp 2016-01-23 10:16:16.943526865 +0100
-+++ dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/FileSystem.cpp 2016-01-23 10:16:37.413788734 +0100
+diff -Naur dhewm3-1.5.0.old/neo/framework/FileSystem.cpp dhewm3-1.5.0/neo/framework/FileSystem.cpp
+--- dhewm3-1.5.0.old/neo/framework/FileSystem.cpp 2019-01-06 16:58:20.380096648 +0100
++++ dhewm3-1.5.0/neo/framework/FileSystem.cpp 2019-01-06 16:58:38.600435030 +0100
@@ -2969,12 +2969,6 @@
return NULL;
}
@@ -239,12 +239,12 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Fil
//
// search through the path, one element at a time
//
-diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Licensee.h dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/Licensee.h
---- dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Licensee.h 2016-01-23 10:16:16.944526878 +0100
-+++ dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/Licensee.h 2016-01-23 10:16:37.414788747 +0100
-@@ -92,12 +92,4 @@
- // Linux info
+diff -Naur dhewm3-1.5.0.old/neo/framework/Licensee.h dhewm3-1.5.0/neo/framework/Licensee.h
+--- dhewm3-1.5.0.old/neo/framework/Licensee.h 2019-01-06 16:58:20.380096648 +0100
++++ dhewm3-1.5.0/neo/framework/Licensee.h 2019-01-06 16:58:38.600435030 +0100
+@@ -101,12 +101,4 @@
#define LINUX_DEFAULT_PATH "/usr/local/games/doom3"
+ #endif
-// CD Key file info
-// goes into BASE_GAMEDIR whatever the fs_game is set to
@@ -255,10 +255,10 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Lic
- "// id Software or Zenimax will NEVER ask you to send this file to them.\n"
-
#define CONFIG_SPEC "config.spec"
-diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Session.cpp dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/Session.cpp
---- dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Session.cpp 2016-01-23 10:16:16.944526878 +0100
-+++ dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/Session.cpp 2016-01-23 10:16:37.415788760 +0100
-@@ -210,86 +210,6 @@
+diff -Naur dhewm3-1.5.0.old/neo/framework/Session.cpp dhewm3-1.5.0/neo/framework/Session.cpp
+--- dhewm3-1.5.0.old/neo/framework/Session.cpp 2019-01-06 16:58:20.377096593 +0100
++++ dhewm3-1.5.0/neo/framework/Session.cpp 2019-01-06 16:58:38.601435048 +0100
+@@ -218,86 +218,6 @@
}
/*
@@ -345,7 +345,7 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Ses
===============================================================================
SESSION LOCAL
-@@ -1151,23 +1071,6 @@
+@@ -1159,23 +1079,6 @@
common->Printf( "Dedicated servers cannot start singleplayer games.\n" );
return;
#else
@@ -369,7 +369,7 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Ses
if ( idAsyncNetwork::server.IsActive() ) {
common->Printf("Server running, use si_map / serverMapRestart\n");
return;
-@@ -2601,16 +2504,9 @@
+@@ -2609,16 +2512,9 @@
StopBox();
authWaitBox = false;
}
@@ -386,7 +386,7 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Ses
}
}
-@@ -2869,8 +2765,6 @@
+@@ -2877,8 +2773,6 @@
cmdSystem->AddCommand( "rescanSI", Session_RescanSI_f, CMD_FL_SYSTEM, "internal - rescan serverinfo cvars and tell game" );
@@ -395,7 +395,7 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Ses
cmdSystem->AddCommand( "hitch", Session_Hitch_f, CMD_FL_SYSTEM|CMD_FL_CHEAT, "hitches the game" );
// the same idRenderWorld will be used for all games
-@@ -2899,8 +2793,6 @@
+@@ -2907,8 +2801,6 @@
guiActive = NULL;
guiHandle = NULL;
@@ -404,7 +404,7 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Ses
}
/*
-@@ -2950,335 +2842,6 @@
+@@ -2958,335 +2850,6 @@
}
/*
@@ -419,7 +419,7 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Ses
-
- cdkey_state = CDKEY_UNKNOWN;
-
-- filename = "../" BASE_GAMEDIR "/" CDKEY_FILE;
+- filename = CDKEY_FILEPATH;
- f = fileSystem->OpenExplicitFileRead( fileSystem->RelativePathToOSPath( filename, "fs_configpath" ) );
-
- // try the install path, which is where the cd installer and steam put it
@@ -438,7 +438,7 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Ses
-
- xpkey_state = CDKEY_UNKNOWN;
-
-- filename = "../" BASE_GAMEDIR "/" XPKEY_FILE;
+- filename = XPKEY_FILEPATH;
- f = fileSystem->OpenExplicitFileRead( fileSystem->RelativePathToOSPath( filename, "fs_configpath" ) );
-
- // try the install path, which is where the cd installer and steam put it
@@ -466,7 +466,7 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Ses
- idFile *f;
- const char *OSPath;
-
-- filename = "../" BASE_GAMEDIR "/" CDKEY_FILE;
+- filename = CDKEY_FILEPATH;
- // OpenFileWrite advertises creating directories to the path if needed, but that won't work with a '..' in the path
- // occasionally on windows, but mostly on Linux and OSX, the fs_configpath/base may not exist in full
- OSPath = fileSystem->BuildOSPath( cvarSystem->GetCVarString( "fs_configpath" ), BASE_GAMEDIR, CDKEY_FILE );
@@ -479,7 +479,7 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Ses
- f->Printf( "%s%s", cdkey, CDKEY_TEXT );
- fileSystem->CloseFile( f );
-
-- filename = "../" BASE_GAMEDIR "/" XPKEY_FILE;
+- filename = XPKEY_FILEPATH;
- f = fileSystem->OpenFileWrite( filename, "fs_configpath" );
- if ( !f ) {
- common->Printf( "Couldn't write %s.\n", filename.c_str() );
@@ -740,9 +740,9 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Ses
===============
idSessionLocal::GetCurrentMapName
===============
-diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Session.h dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/Session.h
---- dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Session.h 2016-01-23 10:16:16.944526878 +0100
-+++ dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/Session.h 2016-01-23 10:16:39.892820448 +0100
+diff -Naur dhewm3-1.5.0.old/neo/framework/Session.h dhewm3-1.5.0/neo/framework/Session.h
+--- dhewm3-1.5.0.old/neo/framework/Session.h 2019-01-06 16:58:20.378096611 +0100
++++ dhewm3-1.5.0/neo/framework/Session.h 2019-01-06 16:58:38.601435048 +0100
@@ -60,7 +60,6 @@
MSG_OKCANCEL,
MSG_YESNO,
@@ -792,9 +792,9 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Ses
virtual const char *GetCurrentMapName( void ) = 0;
virtual int GetSaveGameVersion( void ) = 0;
-diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Session_local.h dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/Session_local.h
---- dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Session_local.h 2016-01-23 10:16:16.944526878 +0100
-+++ dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/Session_local.h 2016-01-23 10:16:39.893820460 +0100
+diff -Naur dhewm3-1.5.0.old/neo/framework/Session_local.h dhewm3-1.5.0/neo/framework/Session_local.h
+--- dhewm3-1.5.0.old/neo/framework/Session_local.h 2019-01-06 16:58:20.379096629 +0100
++++ dhewm3-1.5.0/neo/framework/Session_local.h 2019-01-06 16:58:38.601435048 +0100
@@ -124,16 +124,6 @@
virtual void TimeHitch( int msec );
@@ -844,9 +844,9 @@ diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Ses
int authEmitTimeout;
bool authWaitBox;
-diff -Naur dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Session_menu.cpp dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/Session_menu.cpp
---- dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792.old/neo/framework/Session_menu.cpp 2016-01-23 10:16:16.944526878 +0100
-+++ dhewm3-89f227b365c2086dbe8818d82324f074a8ab4792/neo/framework/Session_menu.cpp 2016-01-23 10:16:39.893820460 +0100
+diff -Naur dhewm3-1.5.0.old/neo/framework/Session_menu.cpp dhewm3-1.5.0/neo/framework/Session_menu.cpp
+--- dhewm3-1.5.0.old/neo/framework/Session_menu.cpp 2019-01-06 16:58:20.380096648 +0100
++++ dhewm3-1.5.0/neo/framework/Session_menu.cpp 2019-01-06 16:58:38.601435048 +0100
@@ -313,7 +313,6 @@
guiMainMenu->SetStateString( "inGame", "0" );
}
diff --git a/dhewm3.spec b/dhewm3.spec
index 1a351ad..7281db7 100644
--- a/dhewm3.spec
+++ b/dhewm3.spec
@@ -1,21 +1,23 @@
-%global commit0 d535e54c90d6d3f22aa2faa4f9a07e04f3e04dc5
-%global date 20170402
+%global commit0 f24f18a61e7c05e1d8e2bf1da962e2587b1ef97a
+%global date 20191103
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+#global tag %{version}
Name: dhewm3
-Version: 1.4.2
-Release: 6%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist}
+Version: 1.5.1
+Release: 2%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: Dhewm's Doom 3 engine
License: GPLv3+ with exceptions
-URL: https://github.com/dhewm/%{name}
+URL: https://dhewm3.org/
+%if 0%{?tag:1}
+Source0: https://github.com/dhewm/%{name}/archive/%{version}.tar.gz#/%{name}-%{ver...
+%else
Source0: https://github.com/dhewm/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{sho...
+%endif
+
Source1: %{name}-README.txt
-# Compatibility with stock Doom 3 has been removed long ago and we don't ship
-# Doom 3 / Doom 3 Resurrection of Evil content.
Patch0: %{name}-no-cdkey.patch
-Patch1: %{name}-def-fixedtic.patch
-Patch2: %{name}-carmack.patch
ExcludeArch: ppc64le
@@ -42,22 +44,21 @@ original DOOM 3 will be fixed (when identified) without altering the original
game-play.
%prep
-%setup -qn %{name}-%{commit0}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-cp %{SOURCE1} ./README.txt
+%autosetup -p1 -n %{name}-%{commit0}
+cp %{SOURCE1} ./Fedora-README.txt
iconv -f iso8859-1 -t utf-8 COPYING.txt > COPYING.txt.conv && mv -f COPYING.txt.conv COPYING.txt
%build
# Passing a fake build name avoids default CMAKE_BUILD_TYPE="RelWithDebInfo"
# which has hard coded GCC optimizations.
+export CXXFLAGS="%{optflags} -std=c++0x"
%cmake \
-DCMAKE_BUILD_TYPE=Fedora \
+ -DCORE=ON -DBASE=ON -DD3XP=ON \
-DDEDICATED=ON \
- -DZFAIL=1 \
+ -DSDL2=ON \
neo
-make %{?_smp_mflags}
+%make_build
%post
/usr/sbin/alternatives --install %{_bindir}/doom3-engine doom3-engine %{_bindir}/%{name} 10
@@ -72,12 +73,15 @@ fi
%files
%license COPYING.txt
-%doc README.md README.txt
+%doc README.md Fedora-README.txt
%{_bindir}/%{name}
%{_bindir}/%{name}ded
%{_libdir}/%{name}
%changelog
+* Sun Nov 03 2019 Simone Caronni <negativo17(a)gmail.com> - 1.5.1-2.20191103gitf24f18a
+- Update to snapshot post 1.5.1 Prerelease 1.
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.4.2-6.20170402gitd535e54
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index 7d95810..c1e4b04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb5d4731ee319c81e46937b04bc0d1d2 dhewm3-d535e54.tar.gz
+SHA512 (dhewm3-f24f18a.tar.gz) = 3ee1999e93df22574cc871130da3b1c1f490f825fb60ab405d19dedc68831987f0c51dd46114e39a11435108eb116f3c7fee4b210a0005683be7f50adb3333ff
4 years, 10 months