I am compiling for intel on MacOS 10.12.6 (Sierra) via the development
tools from macports. As far as I can tell no development libs from
macports are being linked in. Attached below is the diff patches to
the hugin sources that I used to build my dmg.
-phil
Quoting dudek53 <[email protected]>:
Hi Weballey.
If you have a fully working environment based on macports I would like to
test that over here. Are you compiling for Intel or arm64? Did you modify
any of the sources or is everything working based on your macports sources?
If possible share exact sources used etc.
Thanks
/D
Den lör 5 aug. 2023 00:[email protected] <[email protected]> skrev:
I'm not sure of what to choose for the repo, since it appears that the
orginal README.md has instructions for installing llvm via homebrew. I am
using macports which uses a different set of compiler paths and didn't want
to mess up my system with another package system, so I adjusted the CC and
CXX to work with the what I had.
Maybe this can be resolved by updating to README.md to state that the CC
and CXX paths need to be modified according to whether homebrew or macports
is used to install llvm?
On Wednesday, July 26, 2023 at 9:10:49 AM UTC-7 [email protected] wrote:
Yes, it should be a fully automated script solution. Getting a base for
that should be fairly easy. It would probably require consolidate with the
loose ends on the wiki page or other links recommending ports and what not
which contradicts some of the sources from the scripts.
This all takes time. And honestly. Personally I cannot make hugin compile
without heavy digging solving strange conflicting behaviours. What is
worse, I can't see why my solutions work either.
Best way to start off would be on a fairly vanilla Mac and start without
different brew and port libs. That is not gonna happen on my end for a
while. I will be at assistance if anyone wants to start the work 👌
Den ons 26 juli 2023 17:24T. Modes <[email protected]> skrev:
[email protected] schrieb am Dienstag, 25. Juli 2023 um 23:09:10 UTC+2:
We should add an additional mac_intel folder as opposed to mac_arm64. I
tested on both architectures and intel based scripts works pretty much as
is right now but arm64 is another ballpark.
This is the opposite I meant with consolidate. There are already a lot of
scripts for mac alone. Duplicating them for different case is a no go (with
only a minor differences). This becomes a maintenance nightmare.
All necessary things should be in one set of scripts. The architecture
and/or compiler can then be chosen by a command line switch or an
environment variable and then evaluated in the scripts.
--
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
---
You received this message because you are subscribed to the Google Groups
"hugin and other free panoramic software" group.
To unsubscribe from this group and stop receiving emails from it, send an
email to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/hugin-ptx/4ed654a9-050e-4360-adc2-ffd3dae69011n%40googlegroups.com
<https://groups.google.com/d/msgid/hugin-ptx/4ed654a9-050e-4360-adc2-ffd3dae69011n%40googlegroups.com?utm_medium=email&utm_source=footer>
.
--
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
---
You received this message because you are subscribed to the Google Groups
"hugin and other free panoramic software" group.
To unsubscribe from this group and stop receiving emails from it, send an
email to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/hugin-ptx/9211be10-f7f9-4eb5-aba2-8e737d96c814n%40googlegroups.com
<https://groups.google.com/d/msgid/hugin-ptx/9211be10-f7f9-4eb5-aba2-8e737d96c814n%40googlegroups.com?utm_medium=email&utm_source=footer>
.
--
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
---
You received this message because you are subscribed to the Google
Groups "hugin and other free panoramic software" group.
To unsubscribe from this group and stop receiving emails from it,
send an email to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/hugin-ptx/CAHk3tqi6mk0COzwvCv_PH2NM%3DvBWiQrjfOKZKMMHO3Muhv2jNw%40mail.gmail.com.
--
"Pretending that the all-but-inevitable is inconceivable doesn't
make it impossible."
Phillip W. Wong, PE ([email protected])
--
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
---
You received this message because you are subscribed to the Google Groups "hugin and other free panoramic software" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/hugin-ptx/20230805160133.Horde.3dCCt-WBLw9oOBNHr6RFQFa%40webmail.weballey.com.
diff -aur --exclude=.DS_Store hugin-2022.0.0/mac/ExternalPrograms/scripts/SetEnv.sh hugin/mac/ExternalPrograms/scripts/SetEnv.sh
--- hugin-2022.0.0/mac/ExternalPrograms/scripts/SetEnv.sh 2022-06-24 05:13:13.000000000 -0700
+++ hugin/mac/ExternalPrograms/scripts/SetEnv.sh 2023-01-13 15:03:54.000000000 -0800
@@ -9,13 +9,13 @@
# The compiler(s) to use
-CC="/usr/local/opt/llvm/bin/clang"
-CXX="/usr/local/opt/llvm/bin/clang++"
+CC="/opt/local//bin/clang"
+CXX="/opt/local/bin/clang++"
# The minimum macOS version required to run the compiled files
# USE AT LEAST VERSION 10.9
-DEPLOY_TARGET="10.10"
+DEPLOY_TARGET="10.12"
# The version of your Xcode macOS-SDK.
diff -aur --exclude=.DS_Store hugin-2022.0.0/mac/ExternalPrograms/scripts/download-all.sh hugin/mac/ExternalPrograms/scripts/download-all.sh
--- hugin-2022.0.0/mac/ExternalPrograms/scripts/download-all.sh 2021-02-05 08:54:43.000000000 -0800
+++ hugin/mac/ExternalPrograms/scripts/download-all.sh 2023-01-11 13:00:57.000000000 -0800
@@ -29,16 +29,16 @@
rm -rf _build
mkdir -p _src && cd _src
-download "boost" "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz";
-download "exiv2" "https://www.exiv2.org/builds/exiv2-0.27.2-Source.tar.gz";
+download "boost" "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2";
+download "exiv2" "https://github.com/Exiv2/exiv2/releases/download/v0.27.2/exiv2-0.27.2-Source.tar.gz";
download "fftw" "http://www.fftw.org/fftw-3.3.8.tar.gz";
download "gettext" "https://ftp.gnu.org/pub/gnu/gettext/gettext-0.20.1.tar.gz";
download "glew" "https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0.zip/download"; "glew-2.1.0.tgz"
download "glib" "https://ftp.gnome.org/pub/gnome/sources/glib/2.59/glib-2.59.0.tar.xz";
download "gsl" "http://ftpmirror.gnu.org/gsl/gsl-2.6.tar.gz";
download "openexr" "https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.4.tar.gz"; "openexr-v2.5.4.tar.gz"
-download "exiftool" "http://owl.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.76.tar.gz";
-download "jpeg" "http://www.ijg.org/files/jpegsrc.v9c.tar.gz";
+download "exiftool" "https://exiftool.org/Image-ExifTool-12.52.tar.gz";
+download "jpeg" "http://www.ijg.org/files/jpegsrc.v9e.tar.gz";
download "lcms2" "https://sourceforge.net/projects/lcms/files/lcms/2.9/lcms2-2.9.tar.gz/download"; "lcms2-2.9.tar.gz"
download "libffi" "ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz";
download "libomp" "https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/openmp-11.0.1.src.tar.xz";
@@ -46,7 +46,7 @@
download "libpng" "https://download.sourceforge.net/libpng/libpng-1.6.37.tar.gz"; "libpng-1.6.37.tar.gz"
download "tiff" "http://download.osgeo.org/libtiff/tiff-4.1.0.tar.gz";
download "vigra" "https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz";
-download "wxWidgets" "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.4/wxWidgets-3.1.4.tar.bz2";
+download "wxWidgets" "https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.1/wxWidgets-3.2.1.tar.bz2";
cd ..
@@ -56,4 +56,4 @@
for f in _src/*; do
echo "Extracting $f"
tar xf "$f";
-done
\ No newline at end of file
+done
diff -aur --exclude=.DS_Store hugin-2022.0.0/mac/ExternalPrograms/scripts/enblend.sh hugin/mac/ExternalPrograms/scripts/enblend.sh
--- hugin-2022.0.0/mac/ExternalPrograms/scripts/enblend.sh 2022-06-24 05:13:13.000000000 -0700
+++ hugin/mac/ExternalPrograms/scripts/enblend.sh 2023-01-02 17:53:08.000000000 -0800
@@ -17,6 +17,7 @@
# -------------------------------
# prevent naming conflict with clang headers
+mv VERSION ENBLEND_VERSION
patch -p1 -N < ../../patches/enblend.patch
LDFLAGS="-L$REPOSITORYDIR/lib $LDARGS" \
Only in hugin/mac/ExternalPrograms/scripts: enblend.sh.ORIG
Only in hugin/mac/ExternalPrograms/scripts: libjpeg.sh.ORIG
diff -aur --exclude=.DS_Store hugin-2022.0.0/mac/ExternalPrograms/scripts/libomp.sh hugin/mac/ExternalPrograms/scripts/libomp.sh
--- hugin-2022.0.0/mac/ExternalPrograms/scripts/libomp.sh 2022-06-24 05:13:13.000000000 -0700
+++ hugin/mac/ExternalPrograms/scripts/libomp.sh 2023-01-02 18:52:20.000000000 -0800
@@ -10,5 +10,7 @@
make $MAKEARGS || fail "failed at make step of $ARCH";
make install || fail "make install step of $ARCH";
-install_name_tool -id "$REPOSITORYDIR/lib/libiomp5.dylib" "$REPOSITORYDIR/lib/libiomp5.dylib"
-ln -sf "libiomp5.dylib" "$REPOSITORYDIR/lib/libomp.dylib"
+#install_name_tool -id "$REPOSITORYDIR/lib/libiomp5.dylib" "$REPOSITORYDIR/lib/libiomp5.dylib"
+echo "aaa"
+install_name_tool -id "$REPOSITORYDIR/lib/libomp.dylib" "$REPOSITORYDIR/lib/libomp.dylib"
+#ln -sf "libiomp5.dylib" "$REPOSITORYDIR/lib/libomp.dylib"
Only in hugin/mac/ExternalPrograms/scripts: libomp.sh.ORIG
diff -aur --exclude=.DS_Store hugin-2022.0.0/mac/ExternalPrograms/scripts/pano13.sh hugin/mac/ExternalPrograms/scripts/pano13.sh
--- hugin-2022.0.0/mac/ExternalPrograms/scripts/pano13.sh 2017-05-13 23:09:13.000000000 -0700
+++ hugin/mac/ExternalPrograms/scripts/pano13.sh 2023-01-07 17:35:58.000000000 -0800
@@ -29,7 +29,7 @@
PKGCONFIG="$REPOSITORYDIR/lib" \
./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \
--without-java \
- --with-zlib=/usr \
+ --with-zlib=/opt/local \
--with-png="$REPOSITORYDIR" \
--with-jpeg="$REPOSITORYDIR" \
--with-tiff="$REPOSITORYDIR" \
Only in hugin/mac/ExternalPrograms/scripts: pano13.sh.ORIG
diff -aur --exclude=.DS_Store hugin-2022.0.0/mac/configure-bundle.sh hugin/mac/configure-bundle.sh
--- hugin-2022.0.0/mac/configure-bundle.sh 2021-02-08 10:32:44.000000000 -0800
+++ hugin/mac/configure-bundle.sh 2023-01-17 10:35:17.000000000 -0800
@@ -3,12 +3,14 @@
REPOSITORYDIR=$(cd .. && pwd)"/hugin/mac/ExternalPrograms/repository"
-MACOSX_DEPLOYMENT_TARGET=10.10 \
+MACOSX_DEPLOYMENT_TARGET=10.12 \
PKG_CONFIG_PATH=$REPOSITORYDIR/lib/pkgconfig \
-CC=/usr/local/opt/llvm/bin/clang CXX=/usr/local/opt/llvm/bin/clang++ \
+CC=/opt/local/bin/clang CXX=/opt/local/bin/clang++ \
cmake ../hugin -B. \
-DCMAKE_OSX_SYSROOT="$(xcrun --show-sdk-path)" \
-DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_FIND_ROOT_PATH="$REPOSITORYDIR" \
-DBUILD_HSI=OFF -DENABLE_LAPACK=ON -DMAC_SELF_CONTAINED_BUNDLE=ON \
-DCMAKE_BUILD_TYPE="$TYPE" -G "Unix Makefiles" \
--DCMAKE_C_FLAGS="-march=core2" -DCMAKE_CXX_FLAGS="-march=core2"
\ No newline at end of file
+-DCMAKE_C_FLAGS="-march=core2" -DCMAKE_CXX_FLAGS="-march=core2" \
+-DHUGIN_BUILDER="pww"
+
diff -aur --exclude=.DS_Store hugin-2022.0.0/src/hugin1/hugin/MaskImageCtrl.cpp hugin/src/hugin1/hugin/MaskImageCtrl.cpp
--- hugin-2022.0.0/src/hugin1/hugin/MaskImageCtrl.cpp 2022-05-15 02:04:55.000000000 -0700
+++ hugin/src/hugin1/hugin/MaskImageCtrl.cpp 2023-01-15 16:18:51.000000000 -0800
@@ -1362,10 +1362,12 @@
void MaskImageCtrl::ClearOverlay()
{
+ { // pww 01.15.2023
wxClientDC dc(this);
PrepareDC(dc);
wxDCOverlay overlaydc(m_overlay, &dc);
overlaydc.Clear();
+ } // pww 01.15.2023
m_overlay.Reset();
}
