remove native nasm

- remove native nasm, it is a prerequisite in the dev. environment since update to debian 12
- remove native yasm
- update related Makefiles

cross/dav1d/Makefile

@@ -22,10 +22,11 @@ include ../../mk/spksrc.archs.mk
 
 # Define x86asm
 ifeq ($(findstring $(ARCH),$(i686_ARCHS) $(x64_ARCHS)),$(ARCH))
-BUILD_DEPENDS = native/nasm
-NASM_PATH = $(abspath $(PWD)/../../native/nasm/work-native/install/usr/local/bin)
-ENV += AS=$(NASM_PATH)/nasm
-ENV += PATH=$(NASM_PATH):$$PATH
+NASM_BINARY = $(shell which nasm)
+ifeq ($(NASM_BINARY),)
+$(error nasm not found. Please install NASM assembler)
+endif
+ENV += AS=$(NASM_BINARY)
 CONFIGURE_ARGS += -Denable_asm=true
 
 # Allow ASM on aarch64, disable on all others

cross/ffmpeg4/Makefile

@@ -36,8 +36,7 @@ CONFIGURE_ARGS += --extra-cflags=-Wno-deprecated-declarations
 
 include ../../mk/spksrc.common.mk
 
-OPTIONAL_DEPENDS  = native/nasm
-OPTIONAL_DEPENDS += cross/chromaprint-fftw
+OPTIONAL_DEPENDS  = cross/chromaprint-fftw
 OPTIONAL_DEPENDS += cross/dav1d
 OPTIONAL_DEPENDS += cross/frei0r
 OPTIONAL_DEPENDS += cross/libass
@@ -59,10 +58,11 @@ OPTIONAL_DEPENDS += cross/shine
 
 # Define x86asm
 ifeq ($(findstring $(ARCH),$(i686_ARCHS) $(x64_ARCHS)),$(ARCH))
-BUILD_DEPENDS = native/nasm
-NASM_PATH = $(abspath $(PWD)/../../native/nasm/work-native/install/usr/local/bin)
-ENV += AS=$(NASM_PATH)/nasm
-ENV += PATH=$(NASM_PATH):$$PATH
+NASM_BINARY = $(shell which nasm)
+ifeq ($(NASM_BINARY),)
+$(error nasm not found. Please intall NASM assembler)
+endif
+ENV += AS=$(NASM_BINARY)
 CONFIGURE_ARGS += --x86asmexe=nasm
 
 # Allow ASM on aarch64, disable on all others

cross/lame/Makefile

@@ -2,11 +2,10 @@ PKG_NAME = lame
 PKG_VERS = 3.100
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://downloads.sourceforge.net/project/lame/$(PKG_NAME)/$(PKG_VERS)
+PKG_DIST_SITE = https://downloads.sourceforge.net/project/lame/lame/$(PKG_VERS)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
-OPTIONAL_DEPENDS = native/nasm
 
 HOMEPAGE = https://lame.sourceforge.net/
 COMMENT  = High quality MPEG Audio Layer III encoder.
@@ -17,9 +16,10 @@ GNU_CONFIGURE = 1
 include ../../mk/spksrc.cross-cc.mk
 
 ifeq ($(findstring $(ARCH),$(x64_ARCHS) $(i686_ARCHS)),$(ARCH))
-BUILD_DEPENDS = native/nasm
-NASM_PATH = $(realpath $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin)
-ENV += AS=$(NASM_PATH)/nasm
-ENV += PATH=$(NASM_PATH):$$PATH
+NASM_BINARY = $(shell which nasm)
+ifeq ($(NASM_BINARY),)
+$(error nasm not found. Please install NASM assembler)
+endif
+ENV += AS=$(NASM_BINARY)
 CONFIGURE_ARGS += --enable-nasm
 endif

cross/libvpx/Makefile

@@ -7,7 +7,6 @@ PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
-OPTIONAL_DEPENDS = native/nasm
 
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 
@@ -48,10 +47,11 @@ endif
 
 # Define x86asm
 ifeq ($(findstring $(ARCH),$(i686_ARCHS) $(x64_ARCHS)),$(ARCH))
-BUILD_DEPENDS = native/nasm
-NASM_PATH = $(abspath $(PWD)/../../native/nasm/work-native/install/usr/local/bin)
-ENV += AS=$(NASM_PATH)/nasm
-ENV += PATH=$(NASM_PATH):$$PATH
+NASM_BINARY = $(shell which nasm)
+ifeq ($(NASM_BINARY),)
+$(error nasm not found. Please install NASM assembler)
+endif
+ENV += AS=$(NASM_BINARY)
 CONFIGURE_ARGS += --as=nasm
 CONFIGURE_ARGS += --disable-sse4_1
 endif

cross/openh264/Makefile

@@ -6,7 +6,7 @@ PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/cisco/openh264/archive/refs/tags
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = 
+DEPENDS =
 
 HOMEPAGE = http://www.openh264.org/
 COMMENT  = OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.
@@ -18,10 +18,11 @@ CONFIGURE_ARGS += -Dtests=disabled
 
 POST_INSTALL_TARGET = openh264-post_install
 
-BUILD_DEPENDS = native/nasm
-NASM_PATH = $(realpath $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin)
-ENV += PATH=$(NASM_PATH):$$PATH
-ENV += AS=$(NASM_PATH)/nasm
+NASM_BINARY = $(shell which nasm)
+ifeq ($(NASM_BINARY),)
+$(error nasm not found. Please install NASM assembler)
+endif
+ENV += AS=$(NASM_BINARY)
 
 include ../../mk/spksrc.cross-meson.mk
 

cross/x264/Makefile

@@ -3,13 +3,11 @@ PKG_VERS = 20240512-stable
 PKG_EXT = tar.gz
 PKG_GIT_HASH = 4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1
 PKG_DIST_NAME = $(PKG_NAME)-master.$(PKG_EXT)
-PKG_DIST_FILE = $(PKG_NAME)-$(PKG_GIT_HASH).$(PKG_EXT)
 PKG_DIST_SITE = https://code.videolan.org/videolan/x264/-/archive/$(PKG_GIT_HASH)
 PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)
 
 DEPENDS =
-OPTIONAL_DEPENDS = native/nasm
 
 HOMEPAGE = https://www.videolan.org/developers/x264.html
 COMMENT  = x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC forma
@@ -47,10 +45,11 @@ endif
 
 # Define x86asm
 ifeq ($(findstring $(ARCH),$(i686_ARCHS) $(x64_ARCHS)),$(ARCH))
-BUILD_DEPENDS = native/nasm
-NASM_PATH = $(abspath $(PWD)/../../native/nasm/work-native/install/usr/local/bin)
-ENV += AS=$(NASM_PATH)/nasm
-ENV += PATH=$(NASM_PATH):$$PATH
+NASM_BINARY = $(shell which nasm)
+ifeq ($(NASM_BINARY),)
+$(error nasm not found. Please install NASM assembler)
+endif
+ENV += AS=$(NASM_BINARY)
 endif
 
 ifeq ($(findstring $(ARCH),$(x64_ARCHS)),$(ARCH))

cross/x265/Makefile

@@ -5,8 +5,6 @@ PKG_DIST_NAME = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://bitbucket.org/multicoreware/x265_git/downloads
 PKG_DIR = $(PKG_NAME)_$(PKG_VERS)
 
-OPTIONAL_DEPENDS = native/nasm
-
 HOMEPAGE = http://x265.org/
 COMMENT  = x265 is an open source HEVC encoder.
 LICENSE  = GPL

mk/spksrc.cross-cmake-env.mk

@@ -102,18 +102,13 @@ endif
 ifeq ($(strip $(CMAKE_USE_NASM)),1)
   # Define x86asm
   ifeq ($(findstring $(ARCH),$(i686_ARCHS) $(x64_ARCHS)),$(ARCH))
-    HOST_NASM = $(shell command -v nasm 2>/dev/null)
-    ENABLE_ASSEMBLY = ON
-    ifneq ($(HOST_NASM),)
-      ENV += AS=$(HOST_NASM)
-      CMAKE_ASM_COMPILER = $(HOST_NASM)
-    else
-      DEPENDS += native/nasm
-      NASM_PATH = $(abspath $(CURDIR)/../../native/nasm/work-native/install/usr/local/bin)
-      ENV += PATH=$(NASM_PATH):$$PATH
-      ENV += AS=$(NASM_PATH)/nasm
-      CMAKE_ASM_COMPILER = $(NASM_PATH)/nasm
+    NASM_BINARY = $(shell which nasm)
+    ifeq ($(NASM_BINARY),)
+      $(error nasm not found. Please install NASM assembler for CMAKE_USE_NASM=1)
     endif
+    ENABLE_ASSEMBLY = ON
+    ENV += AS=$(NASM_BINARY)
+    CMAKE_ASM_COMPILER = $(NASM_BINARY)
   endif
 else
   CMAKE_USE_NASM = 0

mk/spksrc.native-cmake-env.mk

@@ -1,7 +1,10 @@
-# Configuration for CMake build
+# Configuration for CMake build of native packages
 #
 CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX)
 CMAKE_ARGS += -DCMAKE_BUILD_TYPE=Release
+# CMAKE_SYSTEM_NAME soll nicht gesetzt werden, sonst wird cross compiling angenommen...
+#CMAKE_SYSTEM_NAME = Linux
+#CMAKE_ARGS += -DCMAKE_SYSTEM_NAME=$(CMAKE_SYSTEM_NAME)
 
 # Use native cmake (latest stable)
 ifeq ($(strip $(USE_NATIVE_CMAKE)),1)
@@ -14,7 +17,7 @@ endif
 # Use native cmake (Debian 10 "Buster")
 ifeq ($(strip $(USE_NATIVE_CMAKE_LEGACY)),1)
   BUILD_DEPENDS += native/cmake-legacy
-  CMAKE_PATH = $(abspath $(CURDIR)/../../native/cmake-legacy/work-native/install/usr/local/bin)
+  CMAKE_PATH = $(abspath $(CURDIR)/../../native/cmake-3.2.6/work-native/install/usr/local/bin)
   ENV += PATH=$(CMAKE_PATH):$$PATH
   export PATH := $(CMAKE_PATH):$(PATH)
 endif
@@ -29,12 +32,13 @@ endif
 
 # set default ASM build environment
 ifeq ($(strip $(CMAKE_USE_NASM)),1)
-  DEPENDS += native/nasm
-  NASM_PATH = $(realpath $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin)
-  ENV += PATH=$(NASM_PATH):$$PATH
-  ENV += AS=$(NASM_PATH)/nasm
+  NASM_BINARY = $(shell which nasm)
+  ifeq ($(NASM_BINARY),)
+    $(error nasm not found. Please install NASM assembler for CMAKE_USE_NASM=1)
+  endif
+  ENV += AS=$(NASM_BINARY)
   CMAKE_ARGS += -DENABLE_ASSEMBLY=ON
-  CMAKE_ARGS += -DCMAKE_ASM_COMPILER=$(NASM_PATH)/nasm
+  CMAKE_ARGS += -DCMAKE_ASM_COMPILER=$(NASM_BINARY)
 else
   CMAKE_USE_NASM = 0
 endif