Yes…see the first line proposed by @!kofa…
And once there, continue with:
I don’t know what that directory would be with my setup.
I have run down to
Bill Martz@DESKTOP-U6S1FBL MINGW64 ~
$ cd ..
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home
$ cd darktable
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home/darktable
$ git clean -d -f -x
Removing build/
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home/darktable
$ git pull --rebase
remote: Enumerating objects: 35, done.
remote: Counting objects: 100% (35/35), done.
remote: Compressing objects: 100% (21/21), done.
remote: Total 35 (delta 16), reused 25 (delta 14), pack-reused 0
Unpacking objects: 100% (35/35), 188.00 KiB | 1.79 MiB/s, done.
From https://github.com/darktable-org/darktable
c0fc3bf56..4ea7e5d5c master -> origin/master
061933c4c..5a48c69ea darktable-4.0.x -> origin/darktable-4.0.x
Updating c0fc3bf56..4ea7e5d5c
Fast-forward
data/CMakeLists.txt | 67 ++++++++++++++++++------------------
data/darktable.desktop.in | 2 +-
data/supported_extensions.cmake | 3 ++
po/pt_BR.po | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------
src/CMakeLists.txt | 1 +
5 files changed, 141 insertions(+), 132 deletions(-)
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home/darktable
$ git submodule update
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home/darktable
$ ^C
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home/darktable
$
and my file structure looks like this:
all good but the extra darktable directory in home is likely old and can be deleted…
Kofa runs linux so his next command removes the installed version…
You can likely run the build script with no extra parameters and then at the end you will be prompted to run the install text…copy and paste that and change the target from install to package and this will make a windows .exe installer and save it in your build directory…
Text is something like…
cmake --build . --target package
You need to update your MSYS2 packages.
2 Likes
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home/darktable
mkdir build
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home/darktable
cd build
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home/darktable/build
cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/darktable ../.
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home/darktable/build
cmake --build .
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home/darktable/build
cmake --build . --target package
Should work…
It worked. Now, what do I do to add the Jens-Hanno Schwalm branch?
And once I do that, I will start all over with updating my MSYS2 packages.
I did it this way and then it tracks that branch… so I did
And as I was not clear
There are other solutions back in the original thread…
but use the 2 lines above and then do all the normal steps… git pull etc etc…
I’m pretty lost with this, but I have to stop for the day.
1 Like
@priort, @kofa BTW, thanks for all the help today. You are very generous with your time and knowledge.
@kofa is the rock…I probably just confused you more but glad you got your builds back up and running…that’s the main thing…if you don’t want to futz with it I can just send you a link or you can use the one I posted the other day…not much has changed yet either in the HLR or DT since I posted it …the generic one should work fine for you…Just install it as a test version along side your main one…
Reinstalled MSYS2. All seemed to be going well, until it wasn’t.
Ran
pacman -S mingw-w64-x86_64-{exiv2,lcms2,lensfun,dbus-glib,openexr,sqlite3,libxslt,libsoup,libavif,libwebp,libsecret,lua,graphicsmagick,openjpeg2,gtk3,pugixml,libexif,osm-gps-map,libgphoto2,flickcurl,drmingw,gettext,python3,iso-codes,python3-jsonschema,python3-setuptools}
Received these messages:
warning: mingw-w64-x86_64-sqlite3-3.39.1-1 is up to date -- reinstalling
warning: mingw-w64-x86_64-gettext-0.21-3 is up to date -- reinstalling
warning: mingw-w64-x86_64-python-3.10.5-2 is up to date -- reinstalling
resolving dependencies...
looking for conflicting packages...
warning: dependency cycle detected:
warning: mingw-w64-x86_64-libwebp will be installed before its mingw-w64-x86_64-libtiff dependency
warning: dependency cycle detected:
warning: mingw-w64-x86_64-harfbuzz will be installed before its mingw-w64-x86_64-freetype dependency
I continued installing because I hoped it would resolve itself, but when I was done at first neither MSYS2 nor MINGW64 would run. But now they do.
Got to run again.
1 Like
Normally use this to update MSYS2 and the packages:
- Run
pacman -Syuu. Follow the instructions. Repeat this step until it says there are no packages to update.
1 Like
git switch -c new_branch
git pull https://github.com/<user>/<forked-repo>.git <branch>
1/ = “jenshannoschwalm” 2/ = "darktable.git 3/ = i would find by clicking on the “Pull Request” tab, and then click on the PR I’m interested in, and then I can find him on the top of the next page, after the name. (as Jorismak explained yesterday).
Is that:
git pull https://github.com/jenshannoschwalm/darktable.git <branch>
I’m looking at https://github.com/darktable-org/darktable/pull/12210, and I don’t see what goes into branch?
I think its gl_recovery_v4 but you might also want to try @Kofa’s method…
gh pr checkout 12345
I think the HR PR is 12210
This:
git switch -c new_branch
git pull https://github.com/jenshannoschwalm/gl_recovery_v4.git 12210
And where does it go in the build sequence?
Bill Martz@DESKTOP-U6S1FBL MINGW64
$ cd ..
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home
$ git switch -c new_branch
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home
$ git pull https://github.com/jenshannoschwalm/gl_recovery_v4.git 12210
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home
$ git clone https://github.com/darktable-org/darktable.git
Bill Martz@DESKTOP-U6S1FBL MINGW64 /home
$ cd darktable
and so on.Please don’t take this the wrong way, but you should really take your time and try to understand git better and what all the commands do instead of throwing them together in random order and expect the source tree to be in a state you intended to. Likewise for MSYS2 package (see also step 5 of getting started) and environment management.
2 Likes
Your point is a good one. I will start with the tutorial. Thanks.