v4l2: new camera plugin

parent ca6887e5
......@@ -121,3 +121,6 @@
[submodule "camera/hamamatsu"]
path = camera/hamamatsu
url = git://github.com/esrf-bliss/Lima-camera-hamamatsu.git
[submodule "camera/v4l2"]
path = camera/v4l2
url = git://github.com/esrf-bliss/Lima-camera-v4l2.git
......@@ -725,7 +725,28 @@ $(call lib-full,$(meta-name),$(meta-ver)): $(meta-objs)
$(call create-links,$(meta-name),$(meta-ver))
build_targets += $(call lib-full,$(meta-name),$(meta-ver))
endif
############################
# LIMA - V4l2
############################
ifneq ($(COMPILE_V4l2),0)
V4l2_LDFLAGS := $(LDFLAGS)
V4l2_LDLIBS := $(LDLIBS) -lv4l2
v4l2-name := v4l2
v4l2-objs := ../camera/v4l2/src/V4L2.o
v4l2-ver := ../camera/v4l2/VERSION
v4l2-flags := $(V4l2_LDFLAGS)
v4l2-deps := $(V4l2_LDLIBS)
$(call lib-full,$(v4l2-name),$(v4l2-ver)): $(v4l2-objs)
$(call compile-lib,$(v4l2-name),$(v4l2-ver),\
$(v4l2-flags),$(v4l2-deps),$@,$+)
$(call create-links,$(v4l2-name),$(v4l2-ver))
build_targets += $(call lib-full,$(v4l2-name),$(v4l2-ver))
endif
src: $(build_targets)
......
......@@ -208,4 +208,12 @@ ifneq ($(COMPILE_AVIEX),0)
sub-dirs += aviex
endif
ifndef COMPILE_V4l2
COMPILE_V4l2 = 0
endif
ifneq ($(COMPILE_V4l2),0)
sub-dirs += v4l2
endif
include ../global.inc
Subproject commit 531170d68f5bbe652d024cad90ee0af241f49494
......@@ -51,6 +51,7 @@ COMPILE_RAYONIXHS=0
COMPILE_AVIEX=0
COMPILE_META=0
COMPILE_MERLIN=0
COMPILE_V4l2=0
COMPILE_CBF_SAVING=0
COMPILE_NXS_SAVING=0
COMPILE_FITS_SAVING=0
......@@ -65,7 +66,7 @@ export COMPILE_CORE COMPILE_SPS_IMAGE COMPILE_SIMULATOR \
COMPILE_BASLER COMPILE_PROSILICA COMPILE_ROPERSCIENTIFIC COMPILE_ADSC \
COMPILE_MYTHEN COMPILE_UEYE COMPILE_XH COMPILE_XSPRESS3 COMPILE_ULTRA COMPILE_XPAD COMPILE_PERKINELMER \
COMPILE_ANDOR COMPILE_ANDOR3 COMPILE_PHOTONICSCIENCE COMPILE_PCO COMPILE_MARCCD COMPILE_DEXELA\
COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_RAYONIXHS COMPILE_AVIEX COMPILE_META COMPILE_MERLIN \
COMPILE_POINTGREY COMPILE_IMXPAD COMPILE_RAYONIXHS COMPILE_AVIEX COMPILE_META COMPILE_MERLIN COMPILE_V4l2\
COMPILE_CBF_SAVING COMPILE_NXS_SAVING COMPILE_FITS_SAVING COMPILE_EDFGZ_SAVING COMPILE_TIFF_SAVING \
COMPILE_HDF5_SAVING COMPILE_CONFIG COMPILE_GLDISPLAY \
LINK_STRICT_VERSION
......@@ -224,6 +224,12 @@ MERLIN_FULL_VERSION = $(shell cat camera/merlin/VERSION)
INSTALL_MERLIN_VDIR = $(INSTALL_MERLIN_DIR)/v$(MERLIN_FULL_VERSION)
endif
ifneq ($(COMPILE_V4l2), 0)
INSTALL_V4l2_DIR = $(INSTALL_PLAT_DIR)/v4l2
V4l2_FULL_VERSION = $(shell cat camera/v4l2/VERSION)
INSTALL_V4l2_VDIR = $(INSTALL_V4l2_DIR)/v$(V4l2_FULL_VERSION)
endif
ifneq ($(COMPILE_SPS_IMAGE),0)
INSTALL_CONFIG_DEFINES += -DWITH_SPS_IMAGE
endif
......@@ -598,3 +604,13 @@ ifneq ($(COMPILE_META), 0)
cp sip/meta/limameta.so $(INSTALL_META_VDIR)
cp camera/common/meta/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_V4l2), 0)
mkdir -p $(INSTALL_V4l2_VDIR)
cp camera/v4l2/python/__init__.py $(INSTALL_V4l2_DIR)
$(call install_core_dep,$(INSTALL_V4l2_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimav4l2.so*
cp -d build/liblimav4l2.so* $(INSTALL_LIB_DIR)
cp sip/v4l2/limav4l2.so $(INSTALL_V4l2_VDIR)
cp camera/v4l2/include/*.h $(INSTALL_INCLUDE_DIR)
endif
......@@ -33,6 +33,7 @@ rayonixhs
aviex
meta
merlin
v4l2
*.obj
lima*.exp
lima*.lib
......
......@@ -132,6 +132,10 @@ ifneq ($(COMPILE_MERLIN), 0)
sip-modules += merlin
endif
ifneq ($(COMPILE_V4l2), 0)
sip-modules += v4l2
endif
all: src
src:
......
......@@ -62,6 +62,7 @@ modules = [('core', ['common', 'hardware', 'control']),
('aviex', [os.path.join('camera','aviex')]),
('ultra', [os.path.join('camera','ultra')]),
('meta', [os.path.join('camera','common','meta')]),
('v4l2', [os.path.join('camera','v4l2')]),
]
espiaModules = ['espia', 'frelon', 'maxipix']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment