update nasm to version 2.14.02

xbmc · Sep 24, 2019 · ec4aed7 · ec4aed7
1 parent bb8eec8
commit ec4aed7
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 6 deletions.
diff --git a/depends/windows/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch b/depends/windows/nasmw/0001-Set-EXTERNAL_DEPENDENCIES-to-0-needed-to-prevent-Per.patch
@@ -0,0 +1,25 @@
+From: Alwin Esch <[email protected]>
+Date: Thu, 19 Sep 2019 19:29:39 +0100
+Subject: [PATCH] Set EXTERNAL_DEPENDENCIES to 0, needed to prevent Perl
+
+Perl not available on build system, but test without was OK.
+---
+ Mkfiles/msvc.mak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
+index 4112c7f..22da9c6 100644
+--- a/Mkfiles/msvc.mak
++++ b/Mkfiles/msvc.mak
+@@ -364,7 +364,7 @@ everything: all docs nsis
+ # Does this version of this file have external dependencies?  This definition
+ # will be automatically updated by mkdep.pl as needed.
+ #
+-EXTERNAL_DEPENDENCIES = 1
++EXTERNAL_DEPENDENCIES = 0
+
+ #
+ # Generate dependency information for this Makefile only.
+-- 
+2.19.2.windows.1
+
diff --git a/depends/windows/nasmw/CMakeLists.txt b/depends/windows/nasmw/CMakeLists.txt
@@ -1,7 +1,15 @@
 cmake_minimum_required(VERSION 3.5)
 project(nasmw)
 
-install(
-	DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-)
+include(ExternalProject)
+
+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 "")
+
+install(PROGRAMS nasm.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+                          RENAME nasmw.exe)
diff --git a/depends/windows/nasmw/nasmw.sha256 b/depends/windows/nasmw/nasmw.sha256
@@ -1 +1 @@
-91b9f784b1286e3de73dabfdc7466c198b96fef7080e00710411119959935809
+b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc
diff --git a/depends/windows/nasmw/nasmw.txt b/depends/windows/nasmw/nasmw.txt
@@ -1 +1 @@
-nasmw http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip
+nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02.tar.gz
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
@@ -0,0 +1,25 @@
+From: Alwin Esch <[email protected]>
+Date: Thu, 19 Sep 2019 19:29:39 +0100
+Subject: [PATCH] Set EXTERNAL_DEPENDENCIES to 0, needed to prevent Perl
+
+Perl not available on build system, but test without was OK.
+---
+ Mkfiles/msvc.mak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
+index 4112c7f..22da9c6 100644
+--- a/Mkfiles/msvc.mak
++++ b/Mkfiles/msvc.mak
+@@ -364,7 +364,7 @@ everything: all docs nsis
+ # Does this version of this file have external dependencies?  This definition
+ # will be automatically updated by mkdep.pl as needed.
+ #
+-EXTERNAL_DEPENDENCIES = 1
++EXTERNAL_DEPENDENCIES = 0
+
+ #
+ # Generate dependency information for this Makefile only.
+-- 
+2.19.2.windows.1
+
diff --git a/depends/windowsstore/nasmw/CMakeLists.txt b/depends/windowsstore/nasmw/CMakeLists.txt
@@ -0,0 +1,27 @@
+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)
diff --git a/depends/windowsstore/nasmw/nasmw.sha256 b/depends/windowsstore/nasmw/nasmw.sha256
@@ -0,0 +1 @@
+b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc
diff --git a/depends/windowsstore/nasmw/nasmw.txt b/depends/windowsstore/nasmw/nasmw.txt
@@ -0,0 +1 @@
+nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02.tar.gz
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		91b9f784b1286e3de73dabfdc7466c198b96fef7080e00710411119959935809
		b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		nasmw http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip
		nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02.tar.gz
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc