Fixes for building on my computer

diff --git a/build/aquosa/config.target b/build/aquosa/config.target
index 973007a3d302962552ff28ec2f03fa406330c0a9..7f345e6f6adf39253026cb47eca87a80d4a3d172 100644 (file)
--- a/build/aquosa/config.target
+++ b/build/aquosa/config.target
@@ -33,7 +33,7 @@ forb_shared_LIBRARIES = shared_LIBRARIES
 
 CFLAGS=$(ARCH_GCC_OPTS) -fpic -Wall -Wuninitialized -g -O1 -D_REENTRANT -D$(PLATFORM) -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
 LDFLAGS=$(ARCH_LD_OPTS) $(LIBS_PATH) $(LIBS)
-LDFLAGS += '-Wl,-rpath,$$ORIGIN/../lib' -z origin --enable-new-dtags
+LDFLAGS += '-Wl,-rpath,$$ORIGIN/../lib' -z origin -Wl,--enable-new-dtags
 
 IDL_COMPILER = $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)/bin/forb-idl
 

diff --git a/src/frsh/demo/dcamera/capture_v4l.h b/src/frsh/demo/dcamera/capture_v4l.h
index b2baadd230dbce232d99074675a6c915878dd64e..f3d9b7d6e72016cf720270e9fdba52b6f9448330 100644 (file)
--- a/src/frsh/demo/dcamera/capture_v4l.h
+++ b/src/frsh/demo/dcamera/capture_v4l.h
@@ -18,7 +18,7 @@
 #include <unistd.h>            /* for mmap() */
 #include <sys/mman.h>
 
-#include <linux/videodev.h>    /* for V4L */
+#include <libv4l1-videodev.h>  /* for V4L */
 
 /*=====================================================
   Definitions for Video4Linux