Begin upgrading code, starting with src/refocus.c

refocus.c appeared to be a good starting point for updating refocus
since compile stops at this file. Importing several code structures
into refocus from in gimp-fix-ca and some from gimp-fourier too.

gimp-2.10 complains of several deprecated functions during compile,
and compiling still stops with refocus.c, mainly due to preview but
will work on the deprecated next.

At this point, except for resetting default values, it appears that
gimp-refocus-plugin builds and runs okay.

Begin shedding gimppreview as it conflicts with GIMP's gimppreview.

Author: JoesCat

.github/workflows/main.yml

@@ -0,0 +1,73 @@
+name: CI
+on: [push,pull_request]
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        choiceL: [--disable-silent-rules, --enable-silent-rules, --enable-debug]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Create configure
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install autoconf automake libtool gcc gimp libgimp2.0-dev
+          autoreconf -i
+          automake
+      - name: Choose configure
+        run: ./configure --prefix=/usr ${{ matrix.choiceL }}
+      - name: Make gimp-refocus-plugin
+        run: make
+      - name: Test make strip
+        if: matrix.choiceL == '--disable-silent-rules'
+        run: make strip
+      - name: Do a make check
+        if: matrix.choiceL == '--enable-silent-rules'
+        run: make check
+      - name: Test user-level install/uninstall
+        if: matrix.choiceL == '--disable-silent-rules'
+        run: |
+          make install-bin
+          make uninstall-bin
+      - name: Test 'make install' GIMP shared plugin
+        if: matrix.choiceL == '--disable-silent-rules'
+        run: |
+          sudo make install
+          sudo make uninstall
+      - name: Test make distcheck
+        if: matrix.choiceL == '--disable-silent-rules'
+        run: make distcheck
+  win:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        include: [
+          {msystem: MINGW32, toolchain: mingw-w64-i686, version: x32 },
+          {msystem: MINGW64, toolchain: mingw-w64-x86_64, version: x64 },
+          {msystem: UCRT64, toolchain: mingw-w64-ucrt-x86_64, version: x64 },
+          {msystem: CLANG64, toolchain: mingw-w64-clang-x86_64, version: x64 },
+        ]
+    name: ${{ matrix.msystem }}
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ matrix.msystem }}
+          update: true
+          install: autotools base-devel git ${{ matrix.toolchain }}-toolchain ${{ matrix.toolchain }}-gimp
+      - name: Create configure
+        run: |
+          autoreconf -i
+          automake
+      - name: run ./configure
+        run: ./configure
+      - name: Make gimp-refocus-plugin
+        run: make
+      - name: Test user-level install/uninstall
+        run: |
+          make install-bin
+          make uninstall-bin

README.md

@@ -3,6 +3,7 @@
 - Introduction
 - Documentation
 - Examples
+- Build and Install
 - News
 - Links
 - Author
@@ -41,6 +42,38 @@ and optimal refocussing
 
 ![](img/wilber-refocussed.png)
 
+## Build and Install
+
+As there are many files in the src directory, it will be easier to build
+Refocus using the autoconf tools. You can use gimptool-2.0 to install or
+use make install. To build Refocus from Git master requires 2 preparatory
+steps:
+
+First, you need to create the `./configure` script if you do not have it yet
+```sh
+autoreconf -i  (or use 'autoreconf --install --force' for more modern setups)
+automake --foreign -Wall
+```
+
+Second, you then use the usual steps to compile the Refocus plugin.
+Various operating systems and setups will need ./configure options set.
+The INSTALLATION file has detailed info for `configure' options.
+Example install steps shown below are for Linux:
+```sh
+./configure --prefix=/usr
+make
+make check
+sudo make install
+```
+and to uninstall, use `make uninstall`.
+
+If you want to use `gimptool-2.0`, you can select to run either
+`make install-bin` for a single local user, or if you have administration
+root access, you can run `sudo make install-admin-bin`.
+
+If Gimp is already running in your system, exit and restart Gimp for the
+new Refocus plug-in to be detected in menu "Filters > Enhance > Refocus".
+
 ## News
 
 - V-0-9-1, 2014 Apr 7 - Additional patches by Ernst Lippe 2004, and added patches by Gentoo, copied from [FreeBSD 2014](https://www.freshports.org/graphics/gimp-refocus-plugin/).

configure.ac

@@ -168,6 +168,13 @@ fi
 AC_SUBST(GIMP_CFLAGS)
 AC_SUBST(GIMP_LIBS)
 AM_CONDITIONAL([HAVEGIMPTOOL],[test "${GIMPTOOL}"x != x])
+# Pass GIMP_LIBDIR to automake for default GIMP plug-ins directory
+GIMP_GIMPLIBDIR=`$PKG_CONFIG --variable=gimplibdir gimp-2.0`
+# Seems that gimp does not follow libdir of the distro, so just replacing prefix
+GIMP_PREFIX=`$PKG_CONFIG --variable=exec_prefix gimp-2.0`
+GIMP_RELATIVE=${GIMP_GIMPLIBDIR#$GIMP_PREFIX}
+GIMP_BINDIR=\${exec_prefix}"$GIMP_RELATIVE"
+AC_SUBST(GIMP_BINDIR)
 
 GTK_CFLAGS=
 GTK_LIBS=

src/Makefile.am

@@ -1,27 +1,30 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CFLAGS = ${CFLAGS} ${GTK_CFLAGS} ${GIMP_CFLAGS} ${LAPACK_INCLUDES}
+AM_CFLAGS = ${CFLAGS} ${CPPFLAGS} ${GTK_CFLAGS} ${GIMP_CFLAGS} ${LAPACK_INCLUDES}
+
+AM_CPPFLAGS = -I${builddir} -I${srcdir} ${GIMP_CFLAGS} -I${includedir}
 
 noinst_HEADERS = bdclosure.h refocus.h matrix.h tilebuf.h conv.h \
-		 fwlapack.h gimppreview.h prevman.h util.h
+		 fwlapack.h prevman.h util.h
 EXTRA_DIST = dummy-plugin.c
 nodist_EXTRA_DATA = .dep .lib
 
 bin_PROGRAMS = refocus
+bindir = $(GIMP_BINDIR)/plug-ins
 noinst_PROGRAMS = test-matrix
 
 ldadd_atlas=@LAPACK_LIBS@
 
-refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c \
+refocus_SOURCES = refocus.c conv.c prevman.c util.c \
 		  matrix.c tilebuf.c bdclosure.c fwlapack.c
-refocus_LDADD = -lm ${ldadd_atlas} ${@GIMP_LIBS} ${GTK_LIBS}
+refocus_LDADD = -lm ${ldadd_atlas} ${LIBS} ${GIMP_LIBS} ${GTK_LIBS}
 if HAVE_ATLAS
 else
 refocus_DEPENDENCIES=@BUNDLED_LAPACK_LIB_DIR@/liblapack.a
 endif
 
 test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c
-test_matrix_LDADD = -lm ${ldadd_atlas} ${GLIB_LIBS} ${GTK_LIBS}
+test_matrix_LDADD = -lm ${ldadd_atlas} ${LIBS} ${GLIB_LIBS} ${GTK_LIBS}
 if HAVE_ATLAS
 else
 test_matrix_DEPENDENCIES=@BUNDLED_LAPACK_LIB_DIR@/liblapack.a