Merge pull request #15 from AlwinEsch/Matrix-change

increase version to 2.2.2 (API related)
xbmc · Dec 4, 2019 · 7f14803 · 7f14803
2 parents f4b8726 + 22208e0
commit 7f14803
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 52 deletions.
diff --git a/depends/windowsstore/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch b/depends/windowsstore/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch
diff --git a/depends/windowsstore/nasmw/CMakeLists.txt b/depends/windowsstore/nasmw/CMakeLists.txt
@@ -1,27 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 project(nasmw)
 
-include(ExternalProject)
-
-# Prevent this on UWP ARM build
-if(NOT CMAKE_GENERATOR MATCHES ARM)
-  externalproject_add(nasmw
-                      SOURCE_DIR ${PROJECT_SOURCE_DIR}
-                      BINARY_DIR ${PROJECT_SOURCE_DIR}
-                      INSTALL_DIR ${PROJECT_SOURCE_DIR}
-                      CONFIGURE_COMMAND ""
-                      BUILD_COMMAND nmake /f Mkfiles/msvc.mak
-                      INSTALL_COMMAND "")
-else()
-  externalproject_add(nasmw
-                      SOURCE_DIR ${PROJECT_SOURCE_DIR}
-                      BINARY_DIR ${PROJECT_SOURCE_DIR}
-                      INSTALL_DIR ${PROJECT_SOURCE_DIR}
-                      CONFIGURE_COMMAND ""
-                      BUILD_COMMAND cmake -E echo "NASM not used on UWP ARM"
-                      INSTALL_COMMAND "")
-endif()
-
-install(PROGRAMS nasm.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-                          RENAME nasmw.exe
-                          OPTIONAL)
+install(
+  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+)
diff --git a/depends/windowsstore/nasmw/nasmw.sha256 b/depends/windowsstore/nasmw/nasmw.sha256
@@ -1 +1 @@
-b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc
+250f9b5eeb2111e8c7b494a977490985b8604fe7518a6f5041cde37cc727a067
diff --git a/depends/windowsstore/nasmw/nasmw.txt b/depends/windowsstore/nasmw/nasmw.txt
@@ -1 +1 @@
-nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02.tar.gz
+nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02-win32.zip
diff --git a/visualization.milkdrop2/addon.xml.in b/visualization.milkdrop2/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="visualization.milkdrop2"
-  version="2.2.1"
+  version="2.2.2"
   name="MilkDrop 2"
   provider-name="Ryan Geiss, ported by MrC, DX11 by afedchin">
   <requires>@ADDON_DEPENDS@</requires>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc
		250f9b5eeb2111e8c7b494a977490985b8604fe7518a6f5041cde37cc727a067
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02.tar.gz
		nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02-win32.zip