[dhewm3/el7] Update to latest snapshot
by Simone Caronni
commit 6f0370b309aed22c229993e2f9bfa25864d52ca1
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Mon Dec 30 12:15:12 2019 +0100
Update to latest snapshot
.gitignore | 1 +
dhewm3-carmack.patch | 24 ++++++-------
dhewm3-def-fixedtic.patch | 11 ------
dhewm3-no-cdkey.patch | 88 +++++++++++++++++++++++------------------------
dhewm3.spec | 54 ++++++++++++++++++++---------
sources | 2 +-
6 files changed, 95 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 2f4e93b..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: 1%{?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
@@ -25,6 +27,7 @@ Provides: doom3-engine = 1.3.1.1304
Provides: bundled(minizip-idsoftware) = 1.2.7
BuildRequires: cmake
+BuildRequires: gcc-c++
BuildRequires: libcurl-devel
BuildRequires: libjpeg-turbo-devel
BuildRequires: libogg-devel
@@ -41,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
@@ -71,12 +73,30 @@ 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
+
+* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.4.2-5.20170402gitd535e54
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.4.2-4.20170402gitd535e54
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 28 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.4.2-3.20170402gitd535e54
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.4.2-2.20170402gitd535e54
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Thu Apr 06 2017 Simone Caronni <negativo17(a)gmail.com> - 1.4.2-1.20170402gitd535e54
- Update to latest snapshot (UHD resolution).
- Set snapshot release as per packaging guidelines.
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
[svt-hevc/el8] Update to 1.4.3.
by Vasiliy Glazov
Summary of changes:
7234294... Update to 1.4.3. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[svt-hevc/f30] Update to 1.4.3.
by Vasiliy Glazov
Summary of changes:
7234294... Update to 1.4.3. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[svt-hevc/f31] Update to 1.4.3.
by Vasiliy Glazov
Summary of changes:
7234294... Update to 1.4.3. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[svt-hevc] Update to 1.4.3.
by Vasiliy Glazov
commit 723429497a99707d22d86ef16303d015eb1ab163
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Mon Dec 30 11:19:38 2019 +0300
Update to 1.4.3.
.gitignore | 1 +
d313b632ede3c47945e42289672c08013bc6a56f.patch | 55 --------------------------
sources | 2 +-
svt-hevc-build.patch | 34 ++++++++++++++++
svt-hevc.spec | 16 ++++----
5 files changed, 43 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dfb6aee..b9b4b92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/SVT-HEVC-1.4.1.tar.gz
+/SVT-HEVC-1.4.3.tar.gz
diff --git a/sources b/sources
index ce172f9..800c627 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (SVT-HEVC-1.4.1.tar.gz) = 0a41068e7ecbb7d7ec2bd709bfb8b8da3028dbdc7c5c52d1e5bc689722c61fc359312c55ab1b043c9a0d7e8957fce43075f6ec1b24363b0551e4b17c12b5a30f
+SHA512 (SVT-HEVC-1.4.3.tar.gz) = 93ab43c05b1dc7154f08d848e3ac2dd1ec5ee278abbb022718e8c8601efa4a25179144dbf0c9950da4c27052a53604d37edec471fce46b309e3c84eb99dd88c4
diff --git a/svt-hevc-build.patch b/svt-hevc-build.patch
new file mode 100644
index 0000000..a972876
--- /dev/null
+++ b/svt-hevc-build.patch
@@ -0,0 +1,34 @@
+diff -uNdr SVT-HEVC-1.4.3_orig/CMakeLists.txt SVT-HEVC-1.4.3/CMakeLists.txt
+--- SVT-HEVC-1.4.3_orig/CMakeLists.txt 2019-12-14 23:28:40.000000000 +0300
++++ SVT-HEVC-1.4.3/CMakeLists.txt 2019-12-30 11:09:01.437899907 +0300
+@@ -119,8 +119,7 @@
+ endif()
+ endif()
+ set(release_flags_to_test
+- -O2
+- -O3)
++ -O2)
+ set(debug_flags_to_test
+ -O0)
+
+diff -uNdr SVT-HEVC-1.4.3_orig/gstreamer-plugin/meson.build SVT-HEVC-1.4.3/gstreamer-plugin/meson.build
+--- SVT-HEVC-1.4.3_orig/gstreamer-plugin/meson.build 2019-12-14 23:28:40.000000000 +0300
++++ SVT-HEVC-1.4.3/gstreamer-plugin/meson.build 2019-12-30 11:09:01.446899587 +0300
+@@ -17,7 +17,6 @@
+ plugins_install_dir = '@0(a)/gstreamer-1.0'.format(get_option('libdir'))
+
+ # common meson configuration
+-svthevcenc_dep = dependency('SvtHevcEnc')
+
+ cc = meson.get_compiler('c')
+ cc_flags = [
+@@ -47,7 +46,7 @@
+
+ gstSvtHevcEnc = library('gstsvthevcenc',
+ 'gstsvthevcenc.c',
+- dependencies: [gstbase_dep, gstpbutils_dep , gstvideo_dep, svthevcenc_dep],
+- install: true,
++ dependencies: [gstbase_dep, gstpbutils_dep , gstvideo_dep],
++ install: true, include_directories : include_directories('../Source/API'), link_args : '-lSvtHevcEnc',
+ install_dir: plugins_install_dir
+ )
diff --git a/svt-hevc.spec b/svt-hevc.spec
index eb13db2..948e763 100644
--- a/svt-hevc.spec
+++ b/svt-hevc.spec
@@ -1,13 +1,13 @@
Name: svt-hevc
-Version: 1.4.1
-Release: 2%{?dist}
+Version: 1.4.3
+Release: 1%{?dist}
Summary: Scalable Video Technology for HEVC Encoder
License: BSD-2-Clause-Patent
URL: https://github.com/OpenVisualCloud/SVT-HEVC
Source0: %url/archive/v%{version}/SVT-HEVC-%{version}.tar.gz
-# https://github.com/OpenVisualCloud/SVT-HEVC/issues/364
-Patch0: d313b632ede3c47945e42289672c08013bc6a56f.patch
+# Correct build flags and gstreamer plugin
+Patch0: svt-hevc-build.patch
BuildRequires: gcc
BuildRequires: cmake
@@ -48,11 +48,6 @@ This package provides %{name}-based GStreamer plug-in.
%prep
%autosetup -p1 -n SVT-HEVC-%{version}
-# Remove unneeded flags
-sed -i 's|-O3)|)|' CMakeLists.txt
-# Patch build gstreamer plugin
-sed -e "s|install: true,|install: true, include_directories : include_directories('../Source/API'), link_args : '-lSvtHevcEnc',|" \
--e "/svthevcenc_dep =/d" -e 's|, svthevcenc_dep||' -e "s|svthevcenc_dep.found()|true|" -i gstreamer-plugin/meson.build
%build
@@ -93,6 +88,9 @@ popd
%{_libdir}/gstreamer-1.0/libgstsvthevcenc.so
%changelog
+* Mon Dec 30 2019 Vasiliy Glazov <vascom2(a)gmail.com> - 1.4.3-1
+- Update to 1.4.3
+
* Tue Sep 17 2019 Vasiliy Glazov <vascom2(a)gmail.com> - 1.4.1-2
- Correct build gstreamer plugin
4 years, 10 months
[nvidia-kmod] Patch for 5.5rc kernel
by Leigh Scott
commit ff138cc283782a40aed72abb760b0f60a571a6ab
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 30 06:42:53 2019 +0000
Patch for 5.5rc kernel
buildfix_kernel-5.5.patch | 412 ++++++++++++++++++++++++++++++++++++++++++++++
nvidia-kmod.spec | 7 +-
2 files changed, 418 insertions(+), 1 deletion(-)
---
diff --git a/buildfix_kernel-5.5.patch b/buildfix_kernel-5.5.patch
new file mode 100644
index 0000000..2cd11ce
--- /dev/null
+++ b/buildfix_kernel-5.5.patch
@@ -0,0 +1,412 @@
+From 237dbf195aa9e0341579821fcbcca1947040582c Mon Sep 17 00:00:00 2001
+From: MilhouseVH <milhouseVH.github(a)nmacleod.com>
+Date: Tue, 24 Dec 2019 02:38:46 +0000
+Subject: [PATCH] Fix for kernel 5.5-rc
+
+Credit: https://devtalk.nvidia.com/default/topic/1068332/linux/nvidia-driver-does...
+---
+ kernel/common/inc/nv-drm.h | 36 +++++++++++++++++++++
+ kernel/conftest.sh | 31 ++++++++++++++++++
+ kernel/nvidia-drm/nvidia-drm-connector.c | 14 ++++++++
+ kernel/nvidia-drm/nvidia-drm-connector.h | 2 +-
+ kernel/nvidia-drm/nvidia-drm-crtc.h | 2 +-
+ kernel/nvidia-drm/nvidia-drm-drv.c | 2 +-
+ kernel/nvidia-drm/nvidia-drm-encoder.h | 2 +-
+ kernel/nvidia-drm/nvidia-drm-fb.h | 2 +-
+ kernel/nvidia-drm/nvidia-drm-gem.h | 2 +-
+ kernel/nvidia-drm/nvidia-drm-helper.c | 2 +-
+ kernel/nvidia-drm/nvidia-drm-helper.h | 2 +-
+ kernel/nvidia-drm/nvidia-drm-modeset.h | 2 +-
+ kernel/nvidia-drm/nvidia-drm-os-interface.h | 2 +-
+ kernel/nvidia-drm/nvidia-drm-prime-fence.h | 2 +-
+ kernel/nvidia-drm/nvidia-drm-priv.h | 2 +-
+ kernel/nvidia-drm/nvidia-drm-utils.h | 2 +-
+ 16 files changed, 94 insertions(+), 13 deletions(-)
+ create mode 100644 kernel/common/inc/nv-drm.h
+
+diff --git a/kernel/common/inc/nv-drm.h b/kernel/common/inc/nv-drm.h
+new file mode 100644
+index 0000000..07e9f3c
+--- /dev/null
++++ b/kernel/common/inc/nv-drm.h
+@@ -0,0 +1,36 @@
++#ifndef _NV_DRM_H_
++#define _NV_DRM_H_
++
++#include "conftest.h"
++
++#if defined(NV_DRM_DRMP_H_PRESENT)
++#include <drm/drmP.h>
++#else
++#include <linux/agp_backend.h>
++#include <linux/file.h>
++#include <linux/init.h>
++#include <linux/jiffies.h>
++#include <linux/kernel.h>
++#include <linux/mutex.h>
++#include <linux/slab.h>
++#include <linux/types.h>
++#include <asm/pgalloc.h>
++#include <linux/uaccess.h>
++
++#include <uapi/drm/drm.h>
++#include <uapi/drm/drm_mode.h>
++
++#include <drm/drm_agpsupport.h>
++#include <drm/drm_crtc.h>
++#include <drm/drm_drv.h>
++#include <drm/drm_prime.h>
++#include <drm/drm_pci.h>
++#include <drm/drm_ioctl.h>
++#include <drm/drm_sysfs.h>
++#include <drm/drm_vblank.h>
++#include <drm/drm_device.h>
++
++#include <drm/drm_gem.h>
++#endif
++
++#endif
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index c9c2db3..dd22bb0 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1150,6 +1150,9 @@ compile_test() {
+ CODE="
+ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #else
++ #include <drm/drm_drv.h>
++ #include <drm/drm_prime.h>
+ #endif
+ #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
+ #error DRM not enabled
+@@ -1781,6 +1784,8 @@ compile_test() {
+ echo "$CONFTEST_PREAMBLE
+ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #else
++ #include <drm/drm_drv.h>
+ #endif
+ #include <drm/drm_atomic.h>
+ #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
+@@ -1909,7 +1914,11 @@ compile_test() {
+ # attached drivers") in v3.14 (2013-12-11)
+ #
+ CODE="
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #else
++ #include <drm/drm_drv.h>
++ #endif
+ int conftest_drm_driver_has_legacy_dev_list(void) {
+ return offsetof(struct drm_driver, legacy_dev_list);
+ }"
+@@ -1933,7 +1942,11 @@ compile_test() {
+ # 2017-07-23 e6fc3b68558e4c6d8d160b5daf2511b99afa8814
+ #
+ CODE="
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #else
++ #include <drm/drm_crtc.h>
++ #endif
+
+ int conftest_drm_crtc_init_with_planes_has_name_arg(void) {
+ return
+@@ -1949,7 +1962,11 @@ compile_test() {
+ compile_check_conftest "$CODE" "NV_DRM_CRTC_INIT_WITH_PLANES_HAS_NAME_ARG" "" "types"
+
+ CODE="
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #else
++ #include <drm/drm_encoder.h>
++ #endif
+
+ int conftest_drm_encoder_init_has_name_arg(void) {
+ return
+@@ -1964,7 +1981,11 @@ compile_test() {
+ compile_check_conftest "$CODE" "NV_DRM_ENCODER_INIT_HAS_NAME_ARG" "" "types"
+
+ echo "$CONFTEST_PREAMBLE
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #else
++ #include <drm/drm_plane.h>
++ #endif
+
+ int conftest_drm_universal_plane_init_has_format_modifiers_arg(void) {
+ return
+@@ -1991,7 +2012,11 @@ compile_test() {
+ echo "#undef NV_DRM_UNIVERSAL_PLANE_INIT_HAS_FORMAT_MODIFIERS_ARG" | append_conftest "types"
+
+ echo "$CONFTEST_PREAMBLE
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #else
++ #include <drm/drm_plane.h>
++ #endif
+
+ int conftest_drm_universal_plane_init_has_name_arg(void) {
+ return
+@@ -3084,7 +3109,9 @@ compile_test() {
+ # drm_framebuffer_{get,put}()") in v4.12 (2017-02-28).
+ #
+ CODE="
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #endif
+ #if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)
+ #include <drm/drm_framebuffer.h>
+ #endif
+@@ -3103,7 +3130,9 @@ compile_test() {
+ # drm_gem_object_{get,put}()") in v4.12 (2017-02-28).
+ #
+ CODE="
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #endif
+ #if defined(NV_DRM_DRM_GEM_H_PRESENT)
+ #include <drm/drm_gem.h>
+ #endif
+@@ -3122,7 +3151,9 @@ compile_test() {
+ # functions") in v4.15 (2017-09-26).
+ #
+ CODE="
++ #if defined(NV_DRM_DRMP_H_PRESENT)
+ #include <drm/drmP.h>
++ #endif
+ #if defined(NV_DRM_DRM_DRV_H_PRESENT)
+ #include <drm/drm_drv.h>
+ #endif
+diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
+index 1553ebc..f851561 100644
+--- a/kernel/nvidia-drm/nvidia-drm-connector.c
++++ b/kernel/nvidia-drm/nvidia-drm-connector.c
+@@ -20,6 +20,8 @@
+ * DEALINGS IN THE SOFTWARE.
+ */
+
++#include <linux/version.h>
++
+ #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+@@ -71,7 +73,11 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
+ struct nv_drm_encoder *nv_detected_encoder = NULL;
+
+ struct NvKmsKapiDynamicDisplayParams *pDetectParams = NULL;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
+ unsigned int i;
++#else
++ struct drm_encoder *encoder = NULL;
++#endif
+
+ BUG_ON(!mutex_is_locked(&dev->mode_config.mutex));
+
+@@ -87,11 +93,16 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
+ goto done;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
+ for (i = 0;
+ i < DRM_CONNECTOR_MAX_ENCODER && detected_encoder == NULL; i++) {
+ struct drm_encoder *encoder;
++#else
++ drm_connector_for_each_possible_encoder(connector, encoder) {
++#endif
+ struct nv_drm_encoder *nv_encoder;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
+ if (connector->encoder_ids[i] == 0) {
+ break;
+ }
+@@ -102,6 +113,7 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
+ BUG_ON(encoder != NULL);
+ continue;
+ }
++#endif
+
+ /*
+ * DVI-I connectors can drive both digital and analog
+@@ -169,6 +181,8 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
+ }
+
+ detected_encoder = encoder;
++
++ break;
+ }
+ }
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-connector.h b/kernel/nvidia-drm/nvidia-drm-connector.h
+index f74e22c..099390d 100644
+--- a/kernel/nvidia-drm/nvidia-drm-connector.h
++++ b/kernel/nvidia-drm/nvidia-drm-connector.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ #include "nvtypes.h"
+ #include "nvkms-api-types.h"
+diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.h b/kernel/nvidia-drm/nvidia-drm-crtc.h
+index 31ef3b5..5de3a51 100644
+--- a/kernel/nvidia-drm/nvidia-drm-crtc.h
++++ b/kernel/nvidia-drm/nvidia-drm-crtc.h
+@@ -29,7 +29,7 @@
+
+ #include "nvidia-drm-helper.h"
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #include "nvtypes.h"
+ #include "nvkms-kapi.h"
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+index a66d3cc..06bf859 100644
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -39,7 +39,7 @@
+
+ #include "nvidia-drm-ioctl.h"
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ /*
+ * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
+diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.h b/kernel/nvidia-drm/nvidia-drm-encoder.h
+index bbaf986..af341a8 100644
+--- a/kernel/nvidia-drm/nvidia-drm-encoder.h
++++ b/kernel/nvidia-drm/nvidia-drm-encoder.h
+@@ -32,7 +32,7 @@
+ #if defined(NV_DRM_DRM_ENCODER_H_PRESENT)
+ #include <drm/drm_encoder.h>
+ #else
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #endif
+
+ #include "nvkms-kapi.h"
+diff --git a/kernel/nvidia-drm/nvidia-drm-fb.h b/kernel/nvidia-drm/nvidia-drm-fb.h
+index 7f292ce..d13bc4c 100644
+--- a/kernel/nvidia-drm/nvidia-drm-fb.h
++++ b/kernel/nvidia-drm/nvidia-drm-fb.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #include "nvidia-drm-gem-nvkms-memory.h"
+ #include "nvkms-kapi.h"
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h
+index b621969..326f810 100644
+--- a/kernel/nvidia-drm/nvidia-drm-gem.h
++++ b/kernel/nvidia-drm/nvidia-drm-gem.h
+@@ -29,7 +29,7 @@
+
+ #include "nvidia-drm-priv.h"
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #include "nvkms-kapi.h"
+
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
+diff --git a/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c
+index da602ac..e5d6daa 100644
+--- a/kernel/nvidia-drm/nvidia-drm-helper.c
++++ b/kernel/nvidia-drm/nvidia-drm-helper.c
+@@ -31,7 +31,7 @@
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #if defined(NV_DRM_DRM_ATOMIC_UAPI_H_PRESENT)
+ #include <drm/drm_atomic_uapi.h>
+ #endif
+diff --git a/kernel/nvidia-drm/nvidia-drm-helper.h b/kernel/nvidia-drm/nvidia-drm-helper.h
+index 8f050d8..71c4b90 100644
+--- a/kernel/nvidia-drm/nvidia-drm-helper.h
++++ b/kernel/nvidia-drm/nvidia-drm-helper.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ /*
+ * drm_dev_put() is added by commit 9a96f55034e41b4e002b767e9218d55f03bdff7d
+diff --git a/kernel/nvidia-drm/nvidia-drm-modeset.h b/kernel/nvidia-drm/nvidia-drm-modeset.h
+index 06659c5..e9d7b70 100644
+--- a/kernel/nvidia-drm/nvidia-drm-modeset.h
++++ b/kernel/nvidia-drm/nvidia-drm-modeset.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ struct drm_atomic_state *nv_drm_atomic_state_alloc(struct drm_device *dev);
+ void nv_drm_atomic_state_clear(struct drm_atomic_state *state);
+diff --git a/kernel/nvidia-drm/nvidia-drm-os-interface.h b/kernel/nvidia-drm/nvidia-drm-os-interface.h
+index f43f851..7f4ff8b 100644
+--- a/kernel/nvidia-drm/nvidia-drm-os-interface.h
++++ b/kernel/nvidia-drm/nvidia-drm-os-interface.h
+@@ -29,7 +29,7 @@
+
+ #if defined(NV_DRM_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ /* Set to true when the atomic modeset feature is enabled. */
+ extern bool nv_drm_modeset_module_param;
+diff --git a/kernel/nvidia-drm/nvidia-drm-prime-fence.h b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
+index 20da923..f3cc2b4 100644
+--- a/kernel/nvidia-drm/nvidia-drm-prime-fence.h
++++ b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-priv.h b/kernel/nvidia-drm/nvidia-drm-priv.h
+index 9076835..77a95f3 100644
+--- a/kernel/nvidia-drm/nvidia-drm-priv.h
++++ b/kernel/nvidia-drm/nvidia-drm-priv.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+
+ #if defined(NV_DRM_DRM_GEM_H_PRESENT)
+ #include <drm/drm_gem.h>
+diff --git a/kernel/nvidia-drm/nvidia-drm-utils.h b/kernel/nvidia-drm/nvidia-drm-utils.h
+index 6d24120..95190c4 100644
+--- a/kernel/nvidia-drm/nvidia-drm-utils.h
++++ b/kernel/nvidia-drm/nvidia-drm-utils.h
+@@ -27,7 +27,7 @@
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+
+-#include <drm/drmP.h>
++#include "nv-drm.h"
+ #include "nvkms-kapi.h"
+
+ struct NvKmsKapiConnectorInfo*
+--
+2.20.1
+
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 547d3a1..63ac4c4 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -12,12 +12,13 @@ Name: nvidia-kmod
Epoch: 3
Version: 440.44
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
+Patch0: buildfix_kernel-5.5.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: x86_64
@@ -41,6 +42,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
+%patch0 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -68,6 +70,9 @@ done
%changelog
+* Mon Dec 30 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3:440.44-2
+- Patch for 5.5rc kernel
+
* Wed Dec 11 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3:440.44-1
- Update to 440.44 release
4 years, 10 months
[mpv/el8: 6/6] Merge branch 'master' into el8
by Leigh Scott
commit 5bb39158a80e8eb500c0f2f5f93a0218c75a05da
Merge: 4746231 413f543
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Dec 28 13:55:33 2019 +0000
Merge branch 'master' into el8
mpv.spec | 17 +++++++++++++++--
sources | 2 +-
2 files changed, 16 insertions(+), 3 deletions(-)
---
4 years, 11 months
[mpv/el8] (6 commits) ...Merge branch 'master' into el8
by Leigh Scott
Summary of changes:
d87a226... Upstream reduced the required libavutil version (*)
6e46cff... f30 and below doesn't have ppc64le luajit (*)
2d06fd4... rebuild for libdvdread ABI bump (*)
68fd3b8... Rebuild for new libplacebo version (*)
413f543... Update to 0.31.0 (*)
5bb3915... Merge branch 'master' into el8
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
