diff --git a/doc/README.md b/doc/README.md index 92861660ad8d..efd599c15154 100644 --- a/doc/README.md +++ b/doc/README.md @@ -7,6 +7,7 @@ Build dependencies for many platforms are listed here: https://redmine.darktable.org/projects/darktable/wiki/Building_darktable_20 ### Requirements + In summary, you'll need: - `gcc`, `g++`, GNU `make` and `cmake` @@ -19,16 +20,15 @@ Optionally, you might need for special features: - `libcups2` (for the print module) - `gphoto2` (for camera support, recommended) - - `flickcurl` (for Flickr support) - - SDL, SDL-image and Mesa OpenGL (to build darktable-viewer) + - `SDL`, SDL-image and Mesa OpenGL (to build darktable-viewer) - `osm-gps-map` for geo tagging view - `lensfun` (lens distortion plugin) - `libheif` for reading HEIF/HEIC images - - OpenEXR for HDR export + - `OpenEXR` for HDR export - `libsecret` for storing passwords - `libcolord-dev` `libcolord-gtk-dev` for colour profile support - `webp` and `openjpeg` libraries for WebP and JPEG 2000 support - - GraphicsMagick library for TIFF-encoded EXIF thumbnails and LDR image format support + - `GraphicsMagick` library for TIFF-encoded EXIF thumbnails and LDR image format support - `exiftool` for creating whitebalance presets ### Build diff --git a/packaging/Solaris_11/darktable-manifest.pkg5.base b/packaging/Solaris_11/darktable-manifest.pkg5.base index f7a8a189b8c7..f7143264e6b3 100644 --- a/packaging/Solaris_11/darktable-manifest.pkg5.base +++ b/packaging/Solaris_11/darktable-manifest.pkg5.base @@ -56,12 +56,8 @@ file path=opt/darktable/lib/darktable/plugins/imageio/storage/libdisk.so \ owner=root group=root mode=755 file path=opt/darktable/lib/darktable/plugins/imageio/storage/libemail.so \ owner=root group=root mode=755 -file path=opt/darktable/lib/darktable/plugins/imageio/storage/libflickr.so \ - owner=root group=root mode=755 file path=opt/darktable/lib/darktable/plugins/imageio/storage/libgallery.so \ owner=root group=root mode=755 -file path=opt/darktable/lib/darktable/plugins/imageio/storage/libpicasa.so \ - owner=root group=root mode=755 file path=opt/darktable/lib/darktable/plugins/libatrous.so owner=root \ group=root mode=755 file path=opt/darktable/lib/darktable/plugins/libbasecurve.so owner=root \ @@ -584,7 +580,6 @@ file path=usr/share/icons/hicolor/scalable/apps/darktable.svg owner=root \ group=root mode=644 depend type=require fmri=pkg://JMCP/darktable/library/OpenEXR depend type=require fmri=pkg://JMCP/darktable/library/exiv2 -depend type=require fmri=pkg://JMCP/darktable/library/flickcurl depend type=require fmri=pkg://JMCP/darktable/library/ilmbase depend type=require fmri=pkg://JMCP/darktable/library/lcms2 depend type=require fmri=pkg://JMCP/darktable/library/lensfun @@ -606,4 +601,3 @@ depend type=require fmri=pkg://solaris/system/library depend type=require fmri=pkg://solaris/web/curl depend type=require fmri=pkg://solaris/x11/library/libxevie depend type=require fmri=pkg://solaris/x11/library/mesa - diff --git a/packaging/macosx/BUILD.txt b/packaging/macosx/BUILD.txt index 77ee47dded2d..4af26deca910 100644 --- a/packaging/macosx/BUILD.txt +++ b/packaging/macosx/BUILD.txt @@ -42,7 +42,7 @@ How to make disk image with darktable application bundle (64 bit Intel only): $ portindex ~/ports Add "file:///Users//ports" (change to your actual login) to /opt/local/etc/macports/sources.conf before [default] line. Install required dependencies: - $ sudo port install git exiv2 libgphoto2 gtk-osx-application-gtk3 lensfun librsvg libsoup openexr json-glib flickcurl GraphicsMagick openjpeg webp libsecret pugixml osm-gps-map adwaita-icon-theme tango-icon-theme intltool iso-codes libomp gmic libheif portmidi libsdl2 + $ sudo port install git exiv2 libgphoto2 gtk-osx-application-gtk3 lensfun librsvg libsoup openexr json-glib GraphicsMagick openjpeg webp libsecret pugixml osm-gps-map adwaita-icon-theme tango-icon-theme intltool iso-codes libomp gmic libheif portmidi libsdl2 $ sudo port select --set python2 python27 Clone darktable git repository (in this example into ~/src): $ mkdir ~/src @@ -55,7 +55,7 @@ How to make disk image with darktable application bundle (64 bit Intel only): Finally build and install darktable: $ mkdir build $ cd build - $ cmake .. -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_OBJCXX_FLAGS=-stdlib=libc++ -DOpenMP_C_INCLUDE_DIR=/opt/local/include/libomp -DOpenMP_CXX_INCLUDE_DIR=/opt/local/include/libomp -DCMAKE_LIBRARY_PATH=/opt/local/lib/libomp -DBINARY_PACKAGE_BUILD=ON -DRAWSPEED_ENABLE_LTO=ON -DBUILD_CURVE_TOOLS=ON -DBUILD_NOISE_TOOLS=ON -DDONT_USE_INTERNAL_LUA=OFF + $ cmake .. -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_OBJCXX_FLAGS=-stdlib=libc++ -DOpenMP_C_INCLUDE_DIR=/opt/local/include/libomp -DOpenMP_CXX_INCLUDE_DIR=/opt/local/include/libomp -DCMAKE_LIBRARY_PATH=/opt/local/lib/libomp -DBINARY_PACKAGE_BUILD=ON -DRAWSPEED_ENABLE_LTO=ON -DBUILD_CURVE_TOOLS=ON -DBUILD_NOISE_TOOLS=ON -DDONT_USE_INTERNAL_LUA=OFF $ make $ sudo make install After this darktable will be installed in /usr/local directory and can be started by typing the following command in terminal: diff --git a/packaging/opensuse/darktable.spec b/packaging/opensuse/darktable.spec index 1684d97ce951..0f0960eea770 100644 --- a/packaging/opensuse/darktable.spec +++ b/packaging/opensuse/darktable.spec @@ -34,7 +34,6 @@ BuildRequires: intltool BuildRequires: lensfun-devel BuildRequires: libcurl-devel BuildRequires: libexiv2-devel -BuildRequires: libflickcurl-devel BuildRequires: libglade2-devel BuildRequires: libgphoto2-devel BuildRequires: libjpeg-devel @@ -50,8 +49,8 @@ License: GPL-3.0+ Group: Productivity/Graphics/Viewers %description -darktable is a virtual lighttable and darkroom for photographers: it manages -your digital negatives in a database and lets you view them through a zoomable +darktable is a virtual lighttable and darkroom for photographers: it manages +your digital negatives in a database and lets you view them through a zoomable lighttable. it also enables you to develop raw images and enhance them. @@ -62,13 +61,13 @@ lighttable. it also enables you to develop raw images and enhance them. [ ! -d "build" ] && mkdir build cd build -export CXXFLAGS="%{optflags} -fno-strict-aliasing " +export CXXFLAGS="%{optflags} -fno-strict-aliasing " export CFLAGS="$CXXFLAGS" cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_LIBDIR=%{_lib} \ -DCMAKE_BUILD_TYPE=Release \ - -DBINARY_PACKAGE_BUILD=1 .. + -DBINARY_PACKAGE_BUILD=1 .. %__make %{_smp_mflags} VERBOSE=1 %install diff --git a/packaging/windows/BUILD.md b/packaging/windows/BUILD.md index 4638474528a0..68ac8a037279 100644 --- a/packaging/windows/BUILD.md +++ b/packaging/windows/BUILD.md @@ -1,8 +1,8 @@ -To build darktable for Windows operating system you have two basic option: -A) Native compile using MSYS +To build darktable for Windows operating system you have two basic option: +A) Native compile using MSYS B) Cross compile on Linux -## A) Native compile using MSYS2: +## A) Native compile using MSYS2: How to make a darktable windows installer (64 bit only): * Install MSYS2 (instructions and prerequisites can be found on official website: https://msys2.github.io/). @@ -17,7 +17,7 @@ How to make a darktable windows installer (64 bit only): ``` * Install required libraries and dependencies: ``` - $ pacman -S mingw-w64-x86_64-{exiv2,lcms2,lensfun,dbus-glib,openexr,sqlite3,libxslt,libsoup,libavif,libheif,libwebp,libsecret,lua,graphicsmagick,openjpeg2,gtk3,pugixml,libexif,osm-gps-map,libgphoto2,flickcurl,drmingw,gettext,python3,iso-codes,python3-jsonschema,python3-setuptools} + $ pacman -S mingw-w64-x86_64-{exiv2,lcms2,lensfun,dbus-glib,openexr,sqlite3,libxslt,libsoup,libavif,libheif,libwebp,libsecret,lua,graphicsmagick,openjpeg2,gtk3,pugixml,libexif,osm-gps-map,libgphoto2,drmingw,gettext,python3,iso-codes,python3-jsonschema,python3-setuptools} ``` * Install optional libraries and dependencies: @@ -48,7 +48,7 @@ How to make a darktable windows installer (64 bit only): ``` * From MINGW64 terminal, update your lensfun database: - `lensfun-update-data` + `lensfun-update-data` Also use this program to install USB driver on Windows for your camera: http://zadig.akeo.ie/ @@ -87,19 +87,19 @@ How to make a darktable windows installer (64 bit only): $ cmake --build . $ cmake --build . --target install ``` - After this darktable will be installed in `/opt/darktable `directory and can be started by typing `/opt/darktable/bin/darktable.exe` in MSYS2 MINGW64 terminal. + After this darktable will be installed in `/opt/darktable `directory and can be started by typing `/opt/darktable/bin/darktable.exe` in MSYS2 MINGW64 terminal. - *NOTE: If you are using the Lua scripts, build the installer and install darktable. - The Lua scripts check the operating system and see windows and expect a windows shell when executing system commands. + *NOTE: If you are using the Lua scripts, build the installer and install darktable. + The Lua scripts check the operating system and see windows and expect a windows shell when executing system commands. Running darktable from the MSYS2 MINGW64 terminal gives a bash shell and therefore the commands will not work.* -* For building the installer image, which will create darktable-.exe installer in current build directory, use: `$ cmake --build . --target package` +* For building the installer image, which will create darktable-.exe installer in current build directory, use: `$ cmake --build . --target package` *NOTE: The package created will be optimized for the machine on which it has been built, but it could not run on other PCs with different hardware or different Windows version. If you want to create a "generic" package, change the first cmake command line as follows:* ``` $ cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/darktable -DBINARY_PACKAGE_BUILD=ON ../. ``` -It is now possible to build darktable on Windows using Ninja rather than Make. This offers advantages of reduced build times for incremental builds (builds on Windows are significantly slower than with linux based systems). To use Ninja you need to install it from an MSYS terminal with: +It is now possible to build darktable on Windows using Ninja rather than Make. This offers advantages of reduced build times for incremental builds (builds on Windows are significantly slower than with linux based systems). To use Ninja you need to install it from an MSYS terminal with: `$ pacman -S mingw-w64-x86_64-ninja`