From f28996acf7afa6b8a588997d028d2015d55cb7cd Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 26 Nov 2009 19:23:22 +0100 Subject: [PATCH] Updated to compile correctly with FRSH Modified submodules: * src/fwp debb9e1...8368f4f (1): > Do not use connect() for UDP sockets --- build/Makefile.omk.ffmpeg | 2 ++ build/config.target | 2 ++ src/fwp | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build/Makefile.omk.ffmpeg b/build/Makefile.omk.ffmpeg index b5afe2c..a6a3a38 100644 --- a/build/Makefile.omk.ffmpeg +++ b/build/Makefile.omk.ffmpeg @@ -8,7 +8,9 @@ SUBDIRS = tools libavcodec libavdevice libavfilter libavformat \ libavutil libpostproc libswscale renamed_include_HEADERS= +ifneq ($(CONFIG_FFMPEG_WITH_FRSH),y) bin_PROGRAMS = ffmpeg #pktdumper +endif pktdumper_SOURCES = tools/pktdumper.c pktdumper_LIBS = avformat diff --git a/build/config.target b/build/config.target index d0a80c7..7f97b0e 100644 --- a/build/config.target +++ b/build/config.target @@ -1,6 +1,8 @@ # -*- makefile -*- # Config file for compilation by OMK for AQuoSA/Linux OS target +OMIT_KERNEL_PASSES=y + # For the FFMPEG2OMK hack, we need RELATIVE_DIR earlier: ifndef RELATIVE_DIR RELATIVE_DIR := $(SOURCES_DIR:$(OUTPUT_DIR)%=%) diff --git a/src/fwp b/src/fwp index debb9e1..8368f4f 160000 --- a/src/fwp +++ b/src/fwp @@ -1 +1 @@ -Subproject commit debb9e19b181a65f07226e719990567651f87fec +Subproject commit 8368f4f3c03bfb998692c3f4c272858c050d7fdd -- 2.39.2