3 files changed, 73 insertions, 1 deletions
diff --git a/kernel/kls_camera/CMakeLists.txt b/kernel/kls_camera/CMakeLists.txt
new file mode 100644
index 0000000..83ad471
--- /dev/null
+++ b/kernel/kls_camera/CMakeLists.txt
@@ -0,0 +1,52 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/kernel/include
+  ${CMAKE_BINARY_DIR}
+)
+
+
+add_definitions(
+  -DCAMERA_UI="${SHARE_INSTALL_PREFIX}/ksquirrel-libs/libkls_camera.so.ui"
+  -DCODEC_CAMERA
+  -DCODEC_ANOTHER
+  -DKLDCRAW_S="${BIN_INSTALL_DIR}/ksquirrel-libs-camera2ppm"
+  -DKLDCRAW="${BIN_INSTALL_DIR}/ksquirrel-libs-dcraw"
+)
+
+
+if( NOT WITH_JPEG )
+  add_definitions( -DNO_JPEG )
+endif( )
+
+if( NOT WITH_LCMS )
+  add_definitions( -DNO_LCMS )
+endif( )
+
+
+##### codecs
+
+tde_add_library( kls_camera SHARED AUTOMOC
+  SOURCES fmt_codec_pnm.cpp
+  LINK ksquirrel-libs-shared ${LCMS_LIBRARIES}
+  VERSION 0.8.0
+  DESTINATION ${LIB_INSTALL_DIR}/ksquirrel-libs
+)
+
+tde_add_executable( ksquirrel-libs-dcraw
+  SOURCES dcraw.c
+  LINK ${JPEG_LIBRARY} ${LCMS_LIBRARIES} ${MATH_LIBC}
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+  FILES libkls_camera.so.ui
+  DESTINATION ${SHARE_INSTALL_PREFIX}/ksquirrel-libs
+)
+
+install(
+  PROGRAMS ksquirrel-libs-camera2ppm
+  DESTINATION ${BIN_INSTALL_DIR}
+)
diff --git a/kernel/kls_camera/Makefile.am b/kernel/kls_camera/Makefile.am
index d5e1a79..5081038 100644
--- a/kernel/kls_camera/Makefile.am
+++ b/kernel/kls_camera/Makefile.am
@@ -30,7 +30,7 @@ libkls_camera_la_SOURCES = fmt_codec_pnm.cpp fmt_codec_pnm_defs.h
 libkls_camera_la_LDFLAGS = ${SQ_RELEASE}
 libkls_camera_la_LIBADD = ${SQ_LOCAL_RPATH}
 
-AM_CXXFLAGS = ${camera_cms} -DCAMERA_UI=\"${pkgdatadir}/libkls_camera.so.ui\" -DCODEC_CAMERA -DCODEC_ANOTHER -DKLDCRAW_S=\"${bindir}/ksquirrel-libs-camera2ppm\" -DKLDCRAW=\"${bindir}/ksquirrel-libs-dcraw\" 
+AM_CXXFLAGS = ${camera_cms} -DCAMERA_UI=\"${pkgdatadir}/libkls_camera.so.ui\" -DCODEC_CAMERA -DCODEC_ANOTHER -DKLDCRAW_S=\"${bindir}/ksquirrel-libs-camera2ppm\" -DKLDCRAW=\"${bindir}/ksquirrel-libs-dcraw\" $(all_includes)
 
 EXTRA_DIST = libkls_camera.so.ui ksquirrel-libs-camera2ppm.in
 
diff --git a/kernel/kls_camera/ksquirrel-libs-camera2ppm b/kernel/kls_camera/ksquirrel-libs-camera2ppm
new file mode 100644
index 0000000..5ee4063
--- /dev/null
+++ b/kernel/kls_camera/ksquirrel-libs-camera2ppm
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+kls_camera_i=""
+kls_camera_o=""
+kls_camera_bin=""
+kls_camera_params=""
+
+while [ "$1" ] ; do
+
+    case "$1" in
+        "--input")  kls_camera_i="$2"   shift ;;
+        "--output") kls_camera_o="$2"   shift ;;
+        "--binary") kls_camera_bin="$2" shift ;;
+        *) kls_camera_params="$kls_camera_params $1"     ;;
+    esac
+
+shift
+done
+
+$kls_camera_bin $kls_camera_params "$kls_camera_i" > "$kls_camera_o"
+\ No newline at end of file