[neon/backports-focal/assimp/Neon/release] debian/patches: Drop patches applied upstream.

[IOhannes m zmölnig (Debian/GNU)]

Git commit ead60b27f3bff65e6332e1e1d69694b9a1b847f4 by IOhannes m zmölnig (Debian/GNU).
Committed on 21/12/2021 at 23:31.
Pushed by jriddell into branch 'Neon/release'.

Drop patches applied upstream.

D  +0    -21   debian/patches/fix-LWOLoader.patch
D  +0    -29   debian/patches/fix-redundant-materials.patch
M  +0    -2    debian/patches/series

https://invent.kde.org/neon/backports-focal/assimp/commit/ead60b27f3bff65e6332e1e1d69694b9a1b847f4

diff --git a/debian/patches/fix-LWOLoader.patch b/debian/patches/fix-LWOLoader.patch
deleted file mode 100644
index 5121bce..0000000
--- a/debian/patches/fix-LWOLoader.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix typo in LWOLoader that leads to crashes
-Author: IOhannes m zmölnig
-Forwarded: https://github.com/assimp/assimp/pull/4226
-Last-Update: 2021-12-07
----
- code/AssetLib/LWO/LWOLoader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/code/AssetLib/LWO/LWOLoader.cpp b/code/AssetLib/LWO/LWOLoader.cpp
-index bc62152..801da1d 100644
---- a/code/AssetLib/LWO/LWOLoader.cpp
-+++ b/code/AssetLib/LWO/LWOLoader.cpp
-@@ -393,7 +393,7 @@ void LWOImporter::InternReadFile(const std::string &pFile,
- 
-                             // If a RGB color map is explicitly requested delete the
-                             // alpha channel - it could theoretically be != 1.
--                            if (_mSurfaces[i].mVCMapType == AI_LWO_RGB)
-+                            if (_mSurfaces[j].mVCMapType == AI_LWO_RGB)
-                                 pvVC[w]->a = 1.f;
- 
-                             pvVC[w]++;
diff --git a/debian/patches/fix-redundant-materials.patch b/debian/patches/fix-redundant-materials.patch
deleted file mode 100644
index 8611527..0000000
--- a/debian/patches/fix-redundant-materials.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix crash if a model has no materials
-Author: IOhannes m zmölnig
-Forwarded: https://github.com/assimp/assimp/pull/4226
-Last-Update: 2021-12-07
----
- code/PostProcessing/RemoveRedundantMaterials.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/code/PostProcessing/RemoveRedundantMaterials.cpp b/code/PostProcessing/RemoveRedundantMaterials.cpp
-index 36745fb..f6355fc 100644
---- a/code/PostProcessing/RemoveRedundantMaterials.cpp
-+++ b/code/PostProcessing/RemoveRedundantMaterials.cpp
-@@ -50,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <assimp/ParsingUtils.h>
- #include "ProcessHelper.h"
- #include "Material/MaterialSystem.h"
-+#include <assimp/Exceptional.h>
- #include <stdio.h>
- 
- using namespace Assimp;
-@@ -171,6 +172,8 @@ void RemoveRedundantMatsProcess::Execute( aiScene* pScene)
-         }
-         // If the new material count differs from the original,
-         // we need to rebuild the material list and remap mesh material indexes.
-+        if(iNewNum < 1)
-+          throw DeadlyImportError("No materials remaining");
-         if (iNewNum != pScene->mNumMaterials) {
-             ai_assert(iNewNum > 0);
-             aiMaterial** ppcMaterials = new aiMaterial*[iNewNum];
diff --git a/debian/patches/series b/debian/patches/series
index 965c897..6a91ea6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,3 @@ use-system-libdraco.patch
 pyassimp.patch
 pyassimp_faces.patch
 doxygen.patch
-fix-LWOLoader.patch
-fix-redundant-materials.patch