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

gpac: fix build #6405

Merged
merged 2 commits into from
Jan 18, 2025
+17 −13
Merged

gpac: fix build #6405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ffeec2
gpac: fix build
hgy59 Jan 18, 2025
4e72b06
fic gpac:
hgy59 Jan 18, 2025
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
20 changes: 12 additions & 8 deletions cross/gpac/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PKG_NAME = gpac
PKG_VERS = 2.2.1
PKG_REV = 1
GPAC_GIT_REVISION = "1 (SynoCommunity)"
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/gpac/gpac/archive
Expand All @@ -11,18 +11,22 @@ HOMEPAGE = https://gpac.io
COMMENT = Home of MP4Box.
LICENSE = LGPLv2

# incompatible toolchain
# toolchains lacking atomic support
UNSUPPORTED_ARCHS = $(PPC_ARCHS) $(ARMv5_ARCHS) $(ARMv7L_ARCHS)

DEPENDS = cross/zlib

CONFIGURE_ARGS = --enable-pic
CONFIGURE_ARGS += --extra-cflags="-Wno-pointer-sign"
GNU_CONFIGURE = 1

PRE_COMPILE_TARGET = gpac_precompile
CONFIGURE_ARGS = --enable-pic
# suppress some compiler warnings:
CONFIGURE_ARGS += --extra-cflags="-Wno-pointer-sign -Wno-array-bounds -Wno-maybe-uninitialized"

PRE_COMPILE_TARGET = gpac_pre_compile

include ../../mk/spksrc.cross-cc.mk

.PHONY: gpac_precompile
gpac_precompile:
@echo "#define GPAC_GIT_REVISION \"$(PKG_REV) (SynoCommunity)\"" > $(WORK_DIR)/$(PKG_DIR)/include/gpac/revision.h
.PHONY: gpac_pre_compile
gpac_pre_compile:
@$(MSG) "Patch revision.h to avoid UNKNOWN_REV (used when build is not in gpac git repository)"
@sed -e 's/"UNKNOWN_REV"/$(GPAC_GIT_REVISION)/' -i $(WORK_DIR)/$(PKG_DIR)/include/gpac/revision.h
4 changes: 0 additions & 4 deletions cross/gpac/PLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,4 @@ lib:lib/gpac/gm_validator.so
lnk:lib/libgpac.so
lnk:lib/libgpac.so.12
lib:lib/libgpac.so.12.10.1
lnk:lib/libz.so
lnk:lib/libz.so.1
lib:lib/libz.so.1.2.13
rsc:share/gpac/
rsc:share/man/
2 changes: 2 additions & 0 deletions cross/gpac/patches/001-configure.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# prefere tools defined as environment variables
#
--- configure
+++ configure
@@ -48,13 +48,13 @@ if test "$cxx_orig" = "" ; then
Expand Down
4 changes: 3 additions & 1 deletion spk/gpac/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ SPK_REV = 1

SPK_ICON = src/gpac.png

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

UNSUPPORTED_ARCHS = $(PPC_ARCHS) $(ARMv5_ARCHS) $(ARMv7L_ARCHS)

MAINTAINER = wmanth
DISPLAY_NAME = GPAC
Expand Down