Project

General

Profile

Feature #8977

Import BSD specific patches upstream

Added by Henrik Andersson almost 7 years ago. Updated over 2 years ago.

Status:
Fixed
Priority:
Low
Assignee:
-
Category:
General
Target version:
Start date:
10/07/2012
Due date:
% Done:

100%

Affected Version:
git development version
System:
FreeBSD
bitness:
64-bit
hardware architecture:
amd64/x86

Description

There are a few patches for BSD hosted at the following url, go though them and
incooperate as much we can to minimize the amount of special patches needed for BSD.

http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/graphics/darktable/patches/?only_with_tag=MAIN

Associated revisions

Revision 7bff9a5a
Added by Henrik Andersson almost 7 years ago

BSD patches, Part of issue #8977

Revision 4936f0d6
Added by Henrik Andersson almost 7 years ago

BSD patches, Part of issue #8977

Revision 5c18a299
Added by Henrik Andersson almost 7 years ago

BSD Patches, Part of issue #8977

History

#1 Updated by Henrik Andersson almost 7 years ago

patch-src_common_darktable.c - Added upstream
patch-src_common_darktable.h - Invalid patch

#2 Updated by Henrik Andersson almost 7 years ago

patch-src_control_jobs_control__jobs.c - Added upstream

#3 Updated by Henrik Andersson almost 7 years ago

patch-src_develop_blend.c - Added upstream

#4 Updated by Tobias Astrom almost 7 years ago

yoda$ ./build.sh

Darktable build script

Building directory: ./build
Installation prefix: /opt/darktable/
Build type: Release
Make program: make
Make tasks: 6

-- The CXX compiler identification is GNU 4.5.3
-- The C compiler identification is GNU 4.5.3
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working C compiler: /usr/bin/gcc
-- Check for working C compiler: /usr/bin/gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Found PkgConfig: /usr/pkg/bin/pkg-config (found version "0.27.1")
-- checking for module 'Gettext'
-- package 'Gettext' not found
-- Found Gettext
-- Found msgfmt to convert language file. Translation enabled
-- Found xsltproc
-- Try OpenMP C flag = [-fopenmp]
-- Performing Test OpenMP_FLAG_DETECTED
-- Performing Test OpenMP_FLAG_DETECTED - Success
-- Try OpenMP CXX flag = [-fopenmp]
-- Performing Test OpenMP_FLAG_DETECTED
-- Performing Test OpenMP_FLAG_DETECTED - Success
-- Found OpenMP: fopenmp
-
checking for module 'glib-2.0'
-- found glib-2.0, version 2.32.4
-- Found Glib
CMake Warning (dev) at src/CMakeLists.txt:113 (find_package):
Policy CMP0011 is not set: Included scripts do automatic cmake_policy PUSH
and POP. Run "cmake --help-policy CMP0011" for policy details. Use the
cmake_policy command to set the policy and suppress this warning.

The included script
/home/tobias/tmp/darktable-build/darktable/cmake/modules/FindGlib.cmake
affects policy settings.  CMake is implying the NO_POLICY_SCOPE option for
compatibility, so the effects are applied to the including context.
This warning is for project developers. Use -Wno-dev to suppress it.

-- Some or all of the gtk libraries were not found. (missing: GTK2_GLIB_INCLUDE_DIR GTK2_GLIBCONFIG_INCLUDE_DIR GTK2_GDKCONFIG_INCLUDE_DIR)
CMake Warning (dev) at src/CMakeLists.txt:118 (find_package):
Policy CMP0011 is not set: Included scripts do automatic cmake_policy PUSH
and POP. Run "cmake --help-policy CMP0011" for policy details. Use the
cmake_policy command to set the policy and suppress this warning.

The included script
/home/tobias/tmp/darktable-build/darktable/cmake/modules/FindGTK2.cmake
affects policy settings.  CMake is implying the NO_POLICY_SCOPE option for
compatibility, so the effects are applied to the including context.
This warning is for project developers. Use -Wno-dev to suppress it.

-- Found LibXml2: /usr/pkg/lib/libxml2.so (found suitable version "2.9.0", required is "2.6")
-- Found GPHOTO2: /usr/pkg/lib/libgphoto2.so
-- Could NOT find INOTIFY (missing: INOTIFY_INCLUDE_DIR)
-- Found LENSFUN: /usr/pkg/lib/liblensfun.so
-- checking for module 'gio-2.0'
-- found gio-2.0, version 2.32.4
-- Found GIO
CMake Error at /usr/pkg/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:97 (MESSAGE):
Could NOT find GThread (missing: GTHREAD_INCLUDE_DIR)
Call Stack (most recent call first):
/usr/pkg/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:288 (_FPHSA_FAILURE_MESSAGE)
cmake/modules/FindGThread.cmake:27 (find_package_handle_standard_args)
src/CMakeLists.txt:147 (find_package)

-- Configuring incomplete, errors occurred!
yoda$

yoda$

yoda$ locate gthread.h
/usr/pkg/include/glib/glib-2.0/glib/deprecated/gthread.h
/usr/pkg/include/glib/glib-2.0/glib/gthread.h

#5 Updated by Henrik Andersson almost 7 years ago

patch-src_rawspeed_RawSpeed_Common.h - reported upstream @ http://bugzilla.rawstudio.org/show_bug.cgi?id=574

#6 Updated by Tobias Astrom almost 7 years ago

[ 4%] Building C object src/external/osm-gps-map/CMakeFiles/osmgpsmap.dir/src/osd-utils.c.o
In file included from /var/tmp/darktable-git/darktable/src/external/osm-gps-map/src/converter.c:24:0:
/var/tmp/darktable-git/darktable/src/external/osm-gps-map/src/private.h:26:21: fatal error: gdk/gdk.h: No such file or directory
compilation terminated.
In file included from /var/tmp/darktable-git/darktable/src/external/osm-gps-map/src/osd-utils.c:24:0:
/var/tmp/darktable-git/darktable/src/external/osm-gps-map/src/osd-utils.h:22:21: fatal error: gdk/gdk.h: No such file or directory
compilation terminated.

#7 Updated by Tobias Ellinghaus almost 7 years ago

  • Target version changed from 1.0.5 to Candidate for next minor release

#8 Updated by Henrik Andersson almost 7 years ago

The upstream bug http://bugzilla.rawstudio.org/show_bug.cgi?id=574 is now
fixed, pulling new rawspeed source will fix this.

#9 Updated by Henrik Andersson almost 7 years ago

Tobias Astrom wrote:

[ 4%] Building C object src/external/osm-gps-map/CMakeFiles/osmgpsmap.dir/src/osd-utils.c.o
In file included from /var/tmp/darktable-git/darktable/src/external/osm-gps-map/src/converter.c:24:0:
/var/tmp/darktable-git/darktable/src/external/osm-gps-map/src/private.h:26:21: fatal error: gdk/gdk.h: No such file or directory
compilation terminated.
In file included from /var/tmp/darktable-git/darktable/src/external/osm-gps-map/src/osd-utils.c:24:0:
/var/tmp/darktable-git/darktable/src/external/osm-gps-map/src/osd-utils.h:22:21: fatal error: gdk/gdk.h: No such file or directory
compilation terminated.

Can you test to remove the file: src/cmake/modules/FindGTK.cmake to force use of cmake package provided find module.

Make sure to clean build dir and run cmake again..

#10 Updated by Pascal de Bruijn almost 5 years ago

  • Affected Version set to git development version
  • System set to unknown
  • bitness set to 64-bit

Is this still relevant for modern versions of Darktable?

As far as I'm aware we should build just fine on FreeBSD at least these days.

#11 Updated by M. Andree over 2 years ago

I'd propose to close this. FreeBSD has darktable 2.0.7, and I've offered https://reviews.freebsd.org/D8994 to the current port maintainer, Jean-Sébastien Pédron, which would update the port to v2.2.1.

#12 Updated by Roman Lebedev over 2 years ago

  • System changed from unknown to FreeBSD
  • Status changed from In Progress to Fixed
  • Assignee deleted (Henrik Andersson)
  • % Done changed from 50 to 100

#13 Updated by Roman Lebedev over 2 years ago

  • Target version changed from Candidate for next minor release to 2.4.0

Also available in: Atom PDF