diff --git a/cross/dav1d/Makefile b/cross/dav1d/Makefile index 3fd37cb7981..2597d2b3b57 100644 --- a/cross/dav1d/Makefile +++ b/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 diff --git a/cross/ffmpeg4/Makefile b/cross/ffmpeg4/Makefile index 2715995c68f..673c320c3ce 100644 --- a/cross/ffmpeg4/Makefile +++ b/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 diff --git a/cross/lame/Makefile b/cross/lame/Makefile index 3ced943c589..500c95d96cc 100644 --- a/cross/lame/Makefile +++ b/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 diff --git a/cross/libvpx/Makefile b/cross/libvpx/Makefile index c30303e7c2a..124510107dd 100644 --- a/cross/libvpx/Makefile +++ b/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 diff --git a/cross/openh264/Makefile b/cross/openh264/Makefile index 04db374c2e9..121858e31d3 100644 --- a/cross/openh264/Makefile +++ b/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 diff --git a/cross/x264/Makefile b/cross/x264/Makefile index ae64d18792b..f7c72f810ff 100644 --- a/cross/x264/Makefile +++ b/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)) diff --git a/cross/x265/Makefile b/cross/x265/Makefile index 18bbd895137..09ac8b82159 100644 --- a/cross/x265/Makefile +++ b/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 diff --git a/mk/spksrc.cross-cmake-env.mk b/mk/spksrc.cross-cmake-env.mk index 5c53a57c059..19d452a6c36 100644 --- a/mk/spksrc.cross-cmake-env.mk +++ b/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 diff --git a/mk/spksrc.native-cmake-env.mk b/mk/spksrc.native-cmake-env.mk index e8bc272b9ee..487cb594e64 100644 --- a/mk/spksrc.native-cmake-env.mk +++ b/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 diff --git a/native/nasm/Makefile b/native/nasm/Makefile deleted file mode 100644 index d47efd9ab7e..00000000000 --- a/native/nasm/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -PKG_NAME = nasm -PKG_VERS = 2.16.03 -PKG_EXT = tar.xz -PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://fossies.org/linux/misc -PKG_DIR = $(PKG_NAME)-$(PKG_VERS) - -DEPENDS = - -HOMEPAGE = https://www.nasm.us/ -COMMENT = The Netwide Assembler (NASM), an asssembler for the x86 CPU architecture portable to nearly every modern platform, and with code generation for many platforms old and new. -LICENSE = 2-clause BSD - -GNU_CONFIGURE = 1 - -include ../../mk/spksrc.native-cc.mk diff --git a/native/nasm/digests b/native/nasm/digests deleted file mode 100644 index 5b94283afd7..00000000000 --- a/native/nasm/digests +++ /dev/null @@ -1,3 +0,0 @@ -nasm-2.16.03.tar.xz SHA1 d3ceab29f8c62bdf9240032349deb594cb642863 -nasm-2.16.03.tar.xz SHA256 1412a1c760bbd05db026b6c0d1657affd6631cd0a63cddb6f73cc6d4aa616148 -nasm-2.16.03.tar.xz MD5 2b8c72c52eee4f20085065e68ac83b55 diff --git a/native/nasm/patches/001-remove-invalid-pure_func-qualifiers.patch b/native/nasm/patches/001-remove-invalid-pure_func-qualifiers.patch deleted file mode 100644 index 8e071daf43d..00000000000 --- a/native/nasm/patches/001-remove-invalid-pure_func-qualifiers.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- include/nasmlib.h.orig 2019-01-11 10:27:42.527098886 +0100 -+++ include/nasmlib.h 2019-01-11 10:30:53.731190121 +0100 -@@ -150,7 +150,7 @@ - #elif defined(HAVE_STRICMP) - #define nasm_stricmp stricmp - #else --int pure_func nasm_stricmp(const char *, const char *); -+int nasm_stricmp(const char *, const char *); - #endif - - #if defined(HAVE_STRNCASECMP) -@@ -158,10 +158,10 @@ - #elif defined(HAVE_STRNICMP) - #define nasm_strnicmp strnicmp - #else --int pure_func nasm_strnicmp(const char *, const char *, size_t); -+int nasm_strnicmp(const char *, const char *, size_t); - #endif - --int pure_func nasm_memicmp(const char *, const char *, size_t); -+int nasm_memicmp(const char *, const char *, size_t); - - #if defined(HAVE_STRSEP) - #define nasm_strsep strsep -@@ -170,7 +170,7 @@ - #endif - - #ifndef HAVE_DECL_STRNLEN --size_t pure_func strnlen(const char *, size_t); -+size_t strnlen(const char *, size_t); - #endif - - /* This returns the numeric value of a given 'digit'. */ -@@ -306,7 +306,7 @@ - char * safe_alloc nasm_basename(const char *path); - char * safe_alloc nasm_catfile(const char *dir, const char *path); - --const char * pure_func prefix_name(int); -+const char * prefix_name(int); - - /* - * Wrappers around fopen()... for future change to a dedicated structure diff --git a/native/yasm/Makefile b/native/yasm/Makefile deleted file mode 100644 index 064e18b51f9..00000000000 --- a/native/yasm/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -PKG_NAME = yasm -PKG_VERS = 1.3.0 -PKG_EXT = tar.gz -PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/yasm/yasm/releases/download/v$(PKG_VERS) -PKG_DIR = $(PKG_NAME)-$(PKG_VERS) - -DEPENDS = - -HOMEPAGE = https://yasm.tortall.net -COMMENT = Yasm is a complete rewrite of the NASM assembler under the new BSD License. -LICENSE = BSD - -GNU_CONFIGURE = 1 - -include ../../mk/spksrc.native-cc.mk diff --git a/native/yasm/digests b/native/yasm/digests deleted file mode 100644 index 5fa49c61a5f..00000000000 --- a/native/yasm/digests +++ /dev/null @@ -1,3 +0,0 @@ -yasm-1.3.0.tar.gz SHA1 b7574e9f0826bedef975d64d3825f75fbaeef55e -yasm-1.3.0.tar.gz SHA256 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f -yasm-1.3.0.tar.gz MD5 fc9e586751ff789b34b1f21d572d96af