remove winlibs

Author: pachadotdev

configure

@@ -35,17 +35,6 @@ elif [ "$PKGCONFIG_CFLAGS_TESSERACT" ] || [ "$PKGCONFIG_LIBS_TESSERACT" ]; then
   echo "Found pkg-config cflags and libs!"
   PKG_CFLAGS="${PKGCONFIG_CFLAGS_TESSERACT}"
   PKG_LIBS="${PKGCONFIG_LIBS_TESSERACT}"
-elif [ `uname` = "Darwin" ]; then
-  test ! "$CI" && brew --version 2>/dev/null
-  if [ $? -eq 0 ]; then
-    BREWDIR=`brew --prefix`
-    PKG_CFLAGS="-I$BREWDIR/include/tesseract -I$BREWDIR/include/leptonica"
-    PKG_LIBS="-L$BREWDIR/lib $PKG_LIBS"
-  else
-    echo "Homebrew is not installed. Visit https://brew.sh/ for information on how to install it."
-    echo "Tesseract can be installed with 'brew install tesseract'."
-    exit 1
-  fi
 fi
 
 # For debugging

man/cpp11tesseract-package.Rd

@@ -1,9 +1,2 @@
 PKG_CPPFLAGS=@cflags@
 PKG_LIBS=@libs@
-
-PKG_CXXFLAGS=$(C_VISIBILITY)
-
-all: clean
-
-clean:
-	rm -f $(SHLIB) $(OBJECTS)

src/Makevars.in

@@ -1,26 +1,6 @@
 # Tesseract configuration
 
-RWINLIB = ../windows/tesseract
-PKG_CPPFLAGS = -I${RWINLIB}/include -I${RWINLIB}/include/leptonica
-
-PKG_LIBS = -L${RWINLIB}/lib${subst gcc,,${COMPILED_BY}}${R_ARCH} \
-	-L${RWINLIB}/lib \
-	-ltesseract -lleptonica \
-	-ltiff -lopenjp2 -lwebp -lsharpyuv -ljpeg -lgif -lpng16 -lz \
-	-lws2_32
-
-# Compile
-
-all: clean winlibs
-
-clean:
-	rm -Rf $(OBJECTS) $(SHLIB)
-
-winlibs:
-	mkdir -p ../inst
-	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" ${VERSION}
-	cp -Rf ../windows/tessdata ../inst/
-	cp -Rf ${RWINLIB}/share/tessdata ../inst/
-
-.PHONY: all winlibs clean
-
+PKG_CONFIG_NAME = tesseract-ocr
+PKG_CONFIG ?= $(BINPREF)pkg-config
+PKG_LIBS := $(shell $(PKG_CONFIG) --libs $(PKG_CONFIG_NAME))
+PKG_CPPFLAGS := $(shell $(PKG_CONFIG) --cflags $(PKG_CONFIG_NAME))

src/Makevars.win

@@ -1,34 +1,4 @@
-#include <memory>
-#include <list>
-#include <string>
-#include <vector>
-#include <tesseract/baseapi.h> // tesseract
-#include <allheaders.h> // leptonica
-#include <cpp11.hpp>
-
-using namespace cpp11;
-
-inline void tess_finalizer(tesseract::TessBaseAPI* engine) {
-  engine->End();
-  delete engine;
-}
-
-typedef cpp11::external_pointer<tesseract::TessBaseAPI, tess_finalizer> TessPtr;
-
-inline void set_tesseract_options(tesseract::TessBaseAPI* engine,
-                                  cpp11::list options) {
-  for (int i = 0; i < options.size(); ++i) {
-    std::string key = cpp11::as_cpp<std::string>(options.names()[i]);
-    std::string value = cpp11::as_cpp<std::string>(options[i]);
-    engine->SetVariable(key.c_str(), value.c_str());
-  }
-}
-
-inline TessPtr make_tess_ptr(tesseract::TessBaseAPI* engine,
-                             cpp11::list options = cpp11::list()) {
-  set_tesseract_options(engine, options);
-  return TessPtr(engine);
-}
+#include "cpp11tesseract_types.h"
 
 #if TESSERACT_MAJOR_VERSION < 5
 #include <tesseract/genericvector.h>
@@ -37,10 +7,17 @@ inline TessPtr make_tess_ptr(tesseract::TessBaseAPI* engine,
 #define GenericVector std::vector
 #endif
 
+#include <memory>
+#include <list>
+#include <string>
+#include <vector>
+
 [[cpp11::register]] int tesseract_major_version() {
   return TESSERACT_MAJOR_VERSION;
 }
 
+using namespace cpp11;
+
 /* libtesseract 4.0 insisted that the engine is initiated in 'C' locale.
  * We do this as exemplified in the example code in the libc manual:
  * https://www.gnu.org/software/libc/manual/html_node/Setting-the-Locale.html

src/cpp11tesseract.cpp

@@ -0,0 +1,26 @@
+#include <tesseract/baseapi.h> // tesseract
+#include <allheaders.h> // leptonica
+
+#include <cpp11.hpp>
+
+inline void tess_finalizer(tesseract::TessBaseAPI* engine) {
+  engine->End();
+  delete engine;
+}
+
+typedef cpp11::external_pointer<tesseract::TessBaseAPI, tess_finalizer> TessPtr;
+
+inline void set_tesseract_options(tesseract::TessBaseAPI* engine,
+                                  cpp11::list options) {
+  for (int i = 0; i < options.size(); ++i) {
+    std::string key = cpp11::as_cpp<std::string>(options.names()[i]);
+    std::string value = cpp11::as_cpp<std::string>(options[i]);
+    engine->SetVariable(key.c_str(), value.c_str());
+  }
+}
+
+inline TessPtr make_tess_ptr(tesseract::TessBaseAPI* engine,
+                             cpp11::list options = cpp11::list()) {
+  set_tesseract_options(engine, options);
+  return TessPtr(engine);
+}