[openmw] Fix armv7hl build issue with 0.46.0
by Ben Rosser
commit 599c2e770be6274a44723b8aa7fb4fb0be60fe0a
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Aug 31 19:58:57 2020 -0400
Fix armv7hl build issue with 0.46.0
208a50340db5506dded60c05272ce9692773baa9.patch | 220 +++++++++++++++++++++++++
openmw.spec | 7 +
2 files changed, 227 insertions(+)
---
diff --git a/208a50340db5506dded60c05272ce9692773baa9.patch b/208a50340db5506dded60c05272ce9692773baa9.patch
new file mode 100644
index 0000000..26868b5
--- /dev/null
+++ b/208a50340db5506dded60c05272ce9692773baa9.patch
@@ -0,0 +1,220 @@
+From 208a50340db5506dded60c05272ce9692773baa9 Mon Sep 17 00:00:00 2001
+From: elsid <elsid.mail(a)gmail.com>
+Date: Mon, 13 Apr 2020 20:45:07 +0200
+Subject: [PATCH] Specialize DetourNavigator::ObjectId ctor for pointers
+
+To fix msvc error:
+components\detournavigator\objectid.hpp(14,13): error C2440: 'reinterpret_cast': cannot convert from 'const T' to 'size_t'
+ with
+ [
+ T=unsigned long
+ ]
+---
+ .../tilecachedrecastmeshmanager.cpp | 54 +++++++++----------
+ components/detournavigator/objectid.hpp | 2 +-
+ 2 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+index 5275d9119..e44ae4878 100644
+--- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
++++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
+@@ -61,15 +61,15 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- EXPECT_TRUE(manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
++ EXPECT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+ }
+
+ TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_for_existing_object_should_return_false)
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+- EXPECT_FALSE(manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
+ }
+
+ TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, update_object_for_changed_object_should_return_changed_tiles)
+@@ -77,9 +77,9 @@ namespace
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+ const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+- manager.addObject(ObjectId(1ul), boxShape, transform, AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
+ EXPECT_THAT(
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground),
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground),
+ ElementsAre(TilePosition(-1, -1), TilePosition(-1, 0), TilePosition(0, -1), TilePosition(0, 0),
+ TilePosition(1, -1), TilePosition(1, 0))
+ );
+@@ -89,9 +89,9 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground),
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground),
+ std::vector<TilePosition>()
+ );
+ }
+@@ -100,7 +100,7 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
+@@ -111,7 +111,7 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getMesh(TilePosition(1, 0)), nullptr);
+ }
+
+@@ -121,13 +121,13 @@ namespace
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+ const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+
+- manager.addObject(ObjectId(1ul), boxShape, transform, AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
+ EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(1, 0)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(1, -1)), nullptr);
+
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
+@@ -140,11 +140,11 @@ namespace
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+ const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+
+- manager.addObject(ObjectId(1ul), boxShape, transform, AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getMesh(TilePosition(-1, -1)), nullptr);
+ EXPECT_EQ(manager.getMesh(TilePosition(-1, 0)), nullptr);
+
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getMesh(TilePosition(1, 0)), nullptr);
+ EXPECT_EQ(manager.getMesh(TilePosition(1, -1)), nullptr);
+ }
+@@ -153,8 +153,8 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+- manager.removeObject(ObjectId(1ul));
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.removeObject(ObjectId(&boxShape));
+ EXPECT_EQ(manager.getMesh(TilePosition(-1, -1)), nullptr);
+ EXPECT_EQ(manager.getMesh(TilePosition(-1, 0)), nullptr);
+ EXPECT_EQ(manager.getMesh(TilePosition(0, -1)), nullptr);
+@@ -166,13 +166,13 @@ namespace
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
+
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
+ EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
+@@ -184,7 +184,7 @@ namespace
+ TileCachedRecastMeshManager manager(mSettings);
+ const auto initialRevision = manager.getRevision();
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getRevision(), initialRevision + 1);
+ }
+
+@@ -192,9 +192,9 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ const auto beforeAddRevision = manager.getRevision();
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getRevision(), beforeAddRevision);
+ }
+
+@@ -203,9 +203,9 @@ namespace
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+ const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
+- manager.addObject(ObjectId(1ul), boxShape, transform, AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
+ const auto beforeUpdateRevision = manager.getRevision();
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getRevision(), beforeUpdateRevision + 1);
+ }
+
+@@ -213,9 +213,9 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ const auto beforeUpdateRevision = manager.getRevision();
+- manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ EXPECT_EQ(manager.getRevision(), beforeUpdateRevision);
+ }
+
+@@ -223,9 +223,9 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const btBoxShape boxShape(btVector3(20, 20, 100));
+- manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
++ manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
+ const auto beforeRemoveRevision = manager.getRevision();
+- manager.removeObject(ObjectId(1ul));
++ manager.removeObject(ObjectId(&boxShape));
+ EXPECT_EQ(manager.getRevision(), beforeRemoveRevision + 1);
+ }
+
+@@ -233,7 +233,7 @@ namespace
+ {
+ TileCachedRecastMeshManager manager(mSettings);
+ const auto beforeRemoveRevision = manager.getRevision();
+- manager.removeObject(ObjectId(1ul));
++ manager.removeObject(ObjectId(&manager));
+ EXPECT_EQ(manager.getRevision(), beforeRemoveRevision);
+ }
+ }
+diff --git a/components/detournavigator/objectid.hpp b/components/detournavigator/objectid.hpp
+index 3b56924b1..6ddcc9169 100644
+--- a/components/detournavigator/objectid.hpp
++++ b/components/detournavigator/objectid.hpp
+@@ -10,7 +10,7 @@ namespace DetourNavigator
+ {
+ public:
+ template <class T>
+- explicit ObjectId(const T value) throw()
++ explicit ObjectId(T* value) throw()
+ : mValue(reinterpret_cast<std::size_t>(value))
+ {
+ }
+--
+GitLab
+
diff --git a/openmw.spec b/openmw.spec
index 75aff53..2e9f269 100644
--- a/openmw.spec
+++ b/openmw.spec
@@ -23,6 +23,10 @@ Patch1: %{name}.undundle-tango-icons.patch
# Fix compilation problem in components/detournavigator/offmeshconnectionsmanager.hpp
Patch2: openmw-foreach-offmeshconnectionsmanager.patch
+# Fix armv7hl build issue with 0.46.0.
+# https://gitlab.com/OpenMW/openmw/-/commit/208a50340db5506dded60c05272ce96...
+Patch3: https://gitlab.com/OpenMW/openmw/-/commit/208a50340db5506dded60c05272ce96...
+
# Openmw has problems with big indian cpu
ExcludeArch: ppc64
@@ -89,6 +93,9 @@ rm -rf files/launcher/icons/
%patch2 -p1
+# These can probably be replaced with autosetup?
+%patch3 -p1
+
%build
rm -rf build
%cmake3 -DDATADIR:PATH=%{_datadir}/%{name} \
4 years, 3 months
[kdenlive] Use modern cmake macros and disable LTO (rfbz #5733)
by Sérgio M. Basto
commit 2fb3241f88158aa5d7b2d54962ae559e34952834
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Aug 31 22:24:57 2020 +0100
Use modern cmake macros and disable LTO (rfbz #5733)
kdenlive.spec | 20 +++++++++-----------
rttr.CMakeLists.patch | 2 +-
2 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/kdenlive.spec b/kdenlive.spec
index 7eb5610..4d013a3 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -1,10 +1,10 @@
-%global __cmake_in_source_build 1
-%global __cmake_in_source_build 1
+%undefine __cmake_in_source_build
+%global _lto_cflags %{nil}
Name: kdenlive
Summary: Non-linear video editor
Version: 20.08.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: http://www.kdenlive.org
@@ -102,19 +102,14 @@ recent video technologies.
%build
-mkdir %{_target_platform}
-pushd %{_target_platform}
-mv ../rttr-0.9.6/ rttr/
-
-%{cmake_kf5} .. \
+%{cmake_kf5} \
-DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=ON -Wno-dev
-popd
-%make_build -C %{_target_platform}
+%cmake_build
%install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
## unpackaged files
rm -rfv %{buildroot}%{_datadir}/doc/Kdenlive/
@@ -174,6 +169,9 @@ fi
%changelog
+* Mon Aug 31 2020 Sérgio Basto <sergio(a)serjux.com> - 20.08.0-2
+- Use modern cmake macros and disable LTO (rfbz #5733)
+
* Tue Aug 25 2020 Sérgio Basto <sergio(a)serjux.com> - 20.08.0-1
- Update kdenlive to 20.08.0
diff --git a/rttr.CMakeLists.patch b/rttr.CMakeLists.patch
index 849048a..8a9e9aa 100644
--- a/rttr.CMakeLists.patch
+++ b/rttr.CMakeLists.patch
@@ -5,7 +5,7 @@
ExternalProject_Add(rttr_project
PREFIX rttr
- URL https://github.com/rttrorg/rttr/archive/v0.9.6.tar.gz
-+ SOURCE_DIR "rttr/"
++ SOURCE_DIR "../rttr-0.9.6"
UPDATE_COMMAND ""
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DBUILD_UNIT_TESTS=OFF -DBUILD_PACKAGE=OFF -DBUILD_STATIC=ON
)
4 years, 3 months
[ndiswrapper/f33] Update to 1.63
by Leigh Scott
Summary of changes:
0237218... Update to 1.63 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[ndiswrapper-kmod] Update to 1.63
by Leigh Scott
commit ee709a95bcbbee07259c92d88bd95a37250f40e5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 31 16:06:49 2020 +0100
Update to 1.63
kernel-5.3.patch | 69 -----------------------------------------
kernel-5.4.patch | 22 -------------
kernel-5.5.patch | 72 -------------------------------------------
kernel-5.6.patch | 85 ---------------------------------------------------
kernel-5.8.patch | 45 +++++++++++++++++++++++++++
ndiswrapper-kmod.spec | 16 +++++-----
sources | 2 +-
7 files changed, 53 insertions(+), 258 deletions(-)
---
diff --git a/kernel-5.8.patch b/kernel-5.8.patch
new file mode 100644
index 0000000..95b9f2a
--- /dev/null
+++ b/kernel-5.8.patch
@@ -0,0 +1,45 @@
+--- a/driver/loader.c 2020-05-03 13:18:33.000000000 +0100
++++ b/driver/loader.c 2020-08-31 15:43:53.379776002 +0100
+@@ -155,8 +155,12 @@ static int load_sys_files(struct wrap_dr
+ #elif defined PAGE_KERNEL_EXEC
+ pe_image->image =
+ __vmalloc(load_driver->sys_files[i].size,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
++ GFP_KERNEL | __GFP_HIGHMEM);
++#else
+ GFP_KERNEL | __GFP_HIGHMEM,
+ PAGE_KERNEL_EXEC);
++#endif
+ #else
+ #error x86_64 should have either PAGE_KERNEL_EXECUTABLE or PAGE_KERNEL_EXEC
+ #endif
+--- a/driver/pe_linker.c 2020-05-03 13:18:33.000000000 +0100
++++ b/driver/pe_linker.c 2020-08-31 15:49:48.147882380 +0100
+@@ -417,8 +417,12 @@ static int fix_pe_image(struct pe_image
+ image = __vmalloc(image_size, GFP_KERNEL | __GFP_HIGHMEM,
+ PAGE_KERNEL_EXECUTABLE);
+ #elif defined PAGE_KERNEL_EXEC
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
++ image = __vmalloc(image_size, GFP_KERNEL | __GFP_HIGHMEM);
++#else
+ image = __vmalloc(image_size, GFP_KERNEL | __GFP_HIGHMEM,
+ PAGE_KERNEL_EXEC);
++#endif
+ #else
+ #error x86_64 should have either PAGE_KERNEL_EXECUTABLE or PAGE_KERNEL_EXEC
+ #endif
+--- a/driver/ntoskernel.c 2020-05-03 13:18:33.000000000 +0100
++++ b/driver/ntoskernel.c 2020-08-31 15:55:47.458977337 +0100
+@@ -821,8 +821,12 @@ wstdcall void *WIN_FUNC(ExAllocatePoolWi
+ addr = kmalloc(size, irql_gfp());
+ else {
+ if (irql_gfp() & GFP_ATOMIC) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
++ addr = __vmalloc(size, GFP_ATOMIC | __GFP_HIGHMEM);
++#else
+ addr = __vmalloc(size, GFP_ATOMIC | __GFP_HIGHMEM,
+ PAGE_KERNEL);
++#endif
+ TRACE1("%p, %zu", addr, size);
+ } else {
+ addr = vmalloc(size);
diff --git a/ndiswrapper-kmod.spec b/ndiswrapper-kmod.spec
index 8d83b0a..17fb3af 100644
--- a/ndiswrapper-kmod.spec
+++ b/ndiswrapper-kmod.spec
@@ -12,17 +12,14 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
-Version: 1.62
-Release: 2%{?pre}%{?dist}
+Version: 1.63
+Release: 1%{?pre}%{?dist}
License: GPLv2
URL: http://ndiswrapper.sourceforge.net
Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?pre}.tar.gz
Source11: ndiswrapper-kmodtool-excludekernel-filterfile
Patch0: ndiswrapper-kmod-nomodinfo.patch
-Patch1: kernel-5.3.patch
-Patch2: kernel-5.4.patch
-Patch3: kernel-5.5.patch
-Patch4: kernel-5.6.patch
+Patch1: kernel-5.8.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -54,9 +51,6 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfi
(cd ndiswrapper-%{version}%{?pre} ;
%patch0 -p1 -b .orig
%patch1 -p1 -b .orig
-%patch2 -p1 -b .orig
-%patch3 -p1 -b .orig
-%patch4 -p1 -b .orig
)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
@@ -79,6 +73,10 @@ done
%changelog
+* Mon Aug 31 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.63-1
+- Update to 1.63
+- Patch for 5.8 kernel
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.62-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 649f4c6..0b44e12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ndiswrapper-1.62.tar.gz) = a6e111bc699572642e44d6d31cc2f06374648a01b8dd7dd4e74d6ad5e187e39f99faee38f792c83a94d4618ae4d8866914fb3f60b1d80e838a753285ea7cf783
+SHA512 (ndiswrapper-1.63.tar.gz) = 694802655d775ba55cfc0ec0b8c4d0cbdb659ead613d46f158eed79c8985393cf22ded757fff06b0e1a6e3c94bdaace7dd4cb1059d2960244e9f955f097fb7ad
4 years, 3 months