Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove native nasm #6263

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
+56 −248
Open

remove native nasm #6263

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7889de7
remove native nasm
hgy59 Oct 7, 2024
2c4a9cb
temp add output to analyze prepare action
hgy59 Oct 7, 2024
d880967
Revert "temp add output to analyze prepare action"
hgy59 Oct 7, 2024
448c879
avoid variable in DEPENDS
hgy59 Oct 7, 2024
52b31b8
revert unintended changes
hgy59 Oct 7, 2024
db7c4ba
Merge branch 'master' of https://github.com/hgy59/spksrc into remove_…
hgy59 Dec 17, 2024
e5b50fa
cross/dav1d: update from v1.4.2 to v1.4.3
hgy59 Dec 17, 2024
db9b00f
cross/openh264: remove nasm definitions
hgy59 Dec 17, 2024
f7381e6
remove CMAKE_USE_NASM
hgy59 Dec 17, 2024
bffe33b
cross/x264: update build
hgy59 Dec 19, 2024
49d2ca7
update build of cross/libvpx
hgy59 Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions cross/dav1d/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions cross/ffmpeg4/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Comment on lines +61 to +65
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that test even needed? I did not bother with that for ffmpeg5-6-7, maybe worth either using it everywhere or I would suggest not at all.

CONFIGURE_ARGS += --x86asmexe=nasm

# Allow ASM on aarch64, disable on all others
Expand Down
12 changes: 6 additions & 6 deletions cross/lame/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
10 changes: 5 additions & 5 deletions cross/libvpx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions cross/openh264/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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)
hgy59 marked this conversation as resolved.
Show resolved Hide resolved

include ../../mk/spksrc.cross-meson.mk

Expand Down
11 changes: 5 additions & 6 deletions cross/x264/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand Down
2 changes: 0 additions & 2 deletions cross/x265/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 6 additions & 11 deletions mk/spksrc.cross-cmake-env.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions mk/spksrc.native-cmake-env.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Configuration for CMake build
# Configuration for CMake build of native packages
#
CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX)
CMAKE_ARGS += -DCMAKE_BUILD_TYPE=Release
Expand Down Expand Up @@ -29,12 +29,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
Expand Down
16 changes: 0 additions & 16 deletions native/nasm/Makefile
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions native/nasm/digests
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions native/nasm/patches/001-remove-invalid-pure_func-qualifiers.patch
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions native/yasm/Makefile
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions native/yasm/digests
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion spk/chromaprint/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SPK_REV = 22
SPK_ICON = src/chromaprint.png

FFMPEG_PACKAGE = ffmpeg7
DEPENDS = cross/$(SPK_NAME)
DEPENDS = cross/chromaprint
SPK_DEPENDS = $(FFMPEG_PACKAGE)

# ffmpeg7 requires c11 support
Expand Down
2 changes: 1 addition & 1 deletion spk/comskip/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SPK_REV = 12
SPK_ICON = src/comskip.png

FFMPEG_PACKAGE = ffmpeg5
DEPENDS = cross/$(SPK_NAME)
DEPENDS = cross/comskip
SPK_DEPENDS = $(FFMPEG_PACKAGE)

STARTABLE = no
Expand Down
2 changes: 1 addition & 1 deletion spk/ffmpeg5/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SPK_REV = 6
SPK_ICON = src/ffmpeg.png
CHANGELOG = "1. Update to version 5.1.6"

DEPENDS = cross/$(SPK_NAME)
DEPENDS = cross/ffmpeg5

MAINTAINER = th0ma7
DESCRIPTION = FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library. More information from SynoCommunity FFmpeg package available at https://github.com/SynoCommunity/spksrc/wiki/FAQ-FFmpeg
Expand Down
2 changes: 1 addition & 1 deletion spk/ffmpeg7/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SPK_REV = 1
SPK_ICON = src/ffmpeg.png
CHANGELOG = "1. Initial release of version 7 release"

DEPENDS = cross/$(SPK_NAME)
DEPENDS = cross/ffmpeg7

# requires c11 support
UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
Expand Down
2 changes: 1 addition & 1 deletion spk/tvheadend/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ UNSUPPORTED_ARCHS += $(ARMv5_ARCHS)

WHEELS = src/requirements-pure.txt

DEPENDS = cross/$(SPK_NAME)
DEPENDS = cross/tvheadend
DEPENDS += cross/dtv-scan-tables
DEPENDS += cross/zap2epg cross/docker-tvheadend

Expand Down