Refactored repository layout

Each package now lives in its own top level directory.

Author: roelvandijk

.gitignore

@@ -1,4 +1,4 @@
-src/**/*.cpp
+opencv/src/**/*.cpp
 opencv-extra/src/**/*.cpp
 dist
 .stack-work

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015—2016 Lumi Guide Fietsdetectie B.V.
+Copyright 2015–2017 Lumi Guide Fietsdetectie B.V.
 
 All rights reserved.
 

examples/lib/OpenCV/Example.hs

@@ -3,10 +3,10 @@
     let
       haskellOverrides = {
         overrides = self: super: {
-          opencv                = self.callPackage (import ./haskell-opencv.nix) {};
-          opencv-examples       = self.callPackage (import ./examples/opencv-examples.nix) {};
+          opencv                = self.callPackage (import ./opencv/opencv.nix) {};
+          opencv-examples       = self.callPackage (import ./opencv-examples/opencv-examples.nix) {};
           opencv-extra          = self.callPackage (import ./opencv-extra/opencv-extra.nix) {};
-          opencv-extra-examples = self.callPackage (import ./opencv-extra/examples/opencv-extra-examples.nix) {};
+          opencv-extra-examples = self.callPackage (import ./opencv-extra-examples/opencv-extra-examples.nix) {};
         };
       };
       osx = builtins.currentSystem == "x86_64-darwin";

examples/opencv-examples.cabal

@@ -0,0 +1 @@
+../LICENSE

nixpkgs-config.nix

@@ -0,0 +1,57 @@
+{-# language LambdaCase #-}
+{-# language OverloadedStrings #-}
+{-# language PackageImports #-}
+{-# language TemplateHaskell #-}
+
+module OpenCV.Example
+   ( createCapture
+   , createCaptureArg
+   , withEmbededFile
+   ) where
+
+import "base" System.Environment
+import "base" System.Exit
+import qualified "bytestring" Data.ByteString as B
+import "file-embed" Data.FileEmbed
+import "filepath" System.FilePath.Posix
+import qualified "opencv" OpenCV as CV
+import "template-haskell" Language.Haskell.TH.Syntax
+import "temporary" System.IO.Temp
+
+createCapture :: String  -> IO (Maybe CV.VideoCapture)
+createCapture input = do
+    cap <- CV.newVideoCapture
+    let openSource src = CV.exceptErrorIO $ CV.videoCaptureOpen cap src
+    if input `elem` ["0","1","2","3","4","5","6","7","8","9"]
+      then openSource $ CV.VideoDeviceSource (read input) Nothing
+      else openSource $ CV.VideoFileSource input Nothing
+    isOpened <- CV.videoCaptureIsOpened cap
+    if isOpened
+      then return $ Just cap
+      else return Nothing
+
+-- | Use first argument to the program to create capture device
+-- it should be usefull for creating demos. Numbers are for cameras and
+-- files for videos
+createCaptureArg :: IO CV.VideoCapture
+createCaptureArg =
+   getArgs >>= \case
+      []      -> createCapture "0"
+      (inp:_) -> createCapture inp
+    >>= maybe (die "could not open capture input ") return
+
+embedCallHelp :: B.ByteString -> FilePath -> (FilePath -> IO a) -> IO a
+embedCallHelp ef templ f =
+    withSystemTempFile templ $ \fn fh -> do
+      B.hPutStr fh ef
+      f fn
+
+-- | Embedder for strictly used files, it allows to embed a file, and still allow
+-- some method to use filename
+withEmbededFile :: FilePath -> Q Exp
+withEmbededFile filePath = do
+    templ <- [| $(lift $ takeFileName filePath) |]
+    ef <- embedFile filePath
+    var <- newName "f"
+    return $ LamE [VarP var] $
+      AppE (AppE ( AppE (VarE 'embedCallHelp) ef ) templ ) (VarE var)

opencv-examples/LICENSE

@@ -0,0 +1,105 @@
+name:          opencv-examples
+version:       0.0.0.0
+homepage:      lumiguide.eu
+bug-reports:   https://github.com/LumiGuide/haskell-opencv/issues
+license:       BSD3
+license-file:  LICENSE
+author:        Roel van Dijk <roel@lambdacube.nl>, Bas van Dijk <v.dijk.bas@gmail.com>
+maintainer:    Roel van Dijk <roel@lambdacube.nl>, Bas van Dijk <v.dijk.bas@gmail.com>
+build-type:    Simple
+cabal-version: >=1.10
+
+extra-source-files:
+    data/*.png
+    data/*.jpg
+    data/*.xml
+
+library
+    hs-source-dirs: lib
+    exposed-modules:
+      OpenCV.Example
+    build-depends:
+        base             >= 4.8 && < 4.10
+      , opencv
+      , temporary        >= 1.2
+      , bytestring       >= 0.10.6
+      , filepath         >= 1.4
+      , file-embed       >= 0.0
+      , template-haskell >= 2.10
+
+    default-language: Haskell2010
+
+executable highgui
+    main-is: highgui.hs
+    hs-source-dirs: src
+    ghc-options: -Wall -O2
+
+    build-depends:
+        base       >= 4.8 && < 4.10
+      , bytestring >= 0.10.6
+      , opencv
+
+    default-language: Haskell2010
+
+executable videoio
+    main-is: videoio.hs
+    hs-source-dirs: src
+    ghc-options: -Wall -O2
+
+    build-depends:
+        base >= 4.8 && < 4.10
+      , opencv
+
+    default-language: Haskell2010
+
+executable videoio-noise-multi
+    main-is: videoio-noise-multi.hs
+    hs-source-dirs: src
+    ghc-options: -Wall -O2
+
+    build-depends:
+        base   >= 4.8 && < 4.10
+      , opencv
+      , opencv-examples
+      , vector >= 0.11
+
+    default-language: Haskell2010
+
+executable videoio-decolor
+    main-is: videoio-decolor.hs
+    hs-source-dirs: src
+    ghc-options: -Wall -O2
+
+    build-depends:
+        base >= 4.8 && < 4.10
+      , opencv
+      , opencv-examples
+
+    default-language: Haskell2010
+
+executable videoio-background-sub
+    main-is: videoio-background-sub.hs
+    hs-source-dirs: src
+    ghc-options: -Wall -O2
+
+    build-depends:
+        base >= 4.8 && < 4.10
+      , opencv
+      , opencv-examples
+
+    default-language: Haskell2010
+
+executable face-detect
+    main-is: face-detect.hs
+    hs-source-dirs: src
+    ghc-options: -Wall -O2
+
+    build-depends:
+        base         >= 4.8 && < 4.10
+      , opencv
+      , opencv-examples
+      , linear       >= 1.20.4
+      , vector       >= 0.11
+      , transformers >= 0.4.2
+
+    default-language: Haskell2010

examples/data opencv-examples/data

@@ -27,10 +27,12 @@ mkDerivation {
         "^opencv-examples.cabal$"
       ];
       data = ../data;
-    } ''
+      LICENSE = ../LICENSE;
+   } ''
       mkdir -p $out
       cp -r $files/* $out #*/
       cp -r $data    $out/data
+      cp $LICENSE    $out/LICENSE
     '';
   isLibrary = true;
   isExecutable = true;

examples/default.nix opencv-examples/default.nix

@@ -0,0 +1 @@
+../LICENSE

opencv-examples/lib/OpenCV/Example.hs

@@ -1,4 +1,4 @@
-{ nixpkgs ? import (import ../../nixpkgs.nix) {config = import ../../nixpkgs-config.nix;}
+{ nixpkgs ? import (import ../nixpkgs.nix) {config = import ../nixpkgs-config.nix;}
 , compiler ? "default"
 }: