* [Buildroot] [PATCH 2/9] package/darktable: new package
2017-03-05 15:09 [Buildroot] [PATCH 1/9] package/lensfun: new package Romain Naour
@ 2017-03-05 15:09 ` Romain Naour
2017-03-05 16:44 ` Baruch Siach
2017-03-05 15:09 ` [Buildroot] [PATCH 3/9] package/darktable: add webp optional dependency Romain Naour
` (8 subsequent siblings)
9 siblings, 1 reply; 15+ messages in thread
From: Romain Naour @ 2017-03-05 15:09 UTC (permalink / raw)
To: buildroot
Add a small note about adwaita icon to avoid a Gtk warning:
Gtk-WARNING **: Could not find the icon 'pan-down-symbolic-ltr'. The 'hicolor' theme
was not found either, perhaps you need to install it.
You can get a copy from:
http://icon-theme.freedesktop.org/releases
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Jeremy Rosen <jeremy.rosen@enst-bretagne.fr>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/darktable/Config.in | 59 ++++++++++++++++++++++++++++++++++++
package/darktable/darktable.hash | 2 ++
package/darktable/darktable.mk | 64 ++++++++++++++++++++++++++++++++++++++++
5 files changed, 127 insertions(+)
create mode 100644 package/darktable/Config.in
create mode 100644 package/darktable/darktable.hash
create mode 100644 package/darktable/darktable.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index c9c9255..8b64244 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1286,6 +1286,7 @@ F: package/vnstat/
N: Romain Naour <romain.naour@gmail.com>
F: package/aubio/
F: package/bullet/
+F: package/darktable/
F: package/efl/
F: package/enlightenment/
F: package/expedite/
diff --git a/package/Config.in b/package/Config.in
index 8b5ba05..7f11791 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -236,6 +236,7 @@ endmenu
menu "Graphic libraries and applications (graphic/text)"
comment "Graphic applications"
+ source "package/darktable/Config.in"
source "package/expedite/Config.in"
source "package/fswebcam/Config.in"
source "package/glmark2/Config.in"
diff --git a/package/darktable/Config.in b/package/darktable/Config.in
new file mode 100644
index 0000000..6a4f81b
--- /dev/null
+++ b/package/darktable/Config.in
@@ -0,0 +1,59 @@
+
+# Darktable is only available for x86_64 or aarch64 little endian system only.
+# Experimental support for i386 (not recommended).
+# Building without SSE2 on x86_64 is highly experimental.
+# See src/is_supported_platform.h
+config BR2_PACKAGE_DARKTABLE_ARCH_SUPPORTS
+ bool
+ default y if (BR2_x86_64 && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2) || \
+ BR2_aarch64
+
+config BR2_PACKAGE_DARKTABLE
+ bool "darktable"
+ depends on BR2_PACKAGE_DARKTABLE_ARCH_SUPPORTS
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+ depends on BR2_USE_WCHAR # libgtk3 -> glib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk3 -> glib2
+ depends on BR2_USE_MMU # libgtk3 -> glib2
+ depends on BR2_INSTALL_LIBSTDCPP # libgtk3 -> pango
+ depends on !BR2_STATIC_LIBS # exiv2
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk3 -> pango -> harfbuzz
+ depends on BR2_PACKAGE_HAS_LIBGL # libgtk3
+ select BR2_PACKAGE_EXIV2
+ select BR2_PACKAGE_JPEG # jpeg-turbo only
+ select BR2_PACKAGE_JPEG_TURBO
+ select BR2_PACKAGE_JSON_GLIB
+ select BR2_PACKAGE_LCMS2
+ select BR2_PACKAGE_LENSFUN
+ select BR2_PACKAGE_LIBCURL
+ select BR2_PACKAGE_LIBGTK3
+ select BR2_PACKAGE_LIBRSVG
+ select BR2_PACKAGE_LIBXML2
+ select BR2_PACKAGE_PUGIXML
+ select BR2_PACKAGE_SQLITE
+ select BR2_PACKAGE_TIFF
+ help
+ Darktable is an open source photography workflow application
+ and raw developer. A virtual lighttable and darkroom for
+ photographers. It manages your digital negatives in a
+ database, lets you view them through a zoomable lighttable
+ and enables you to develop raw images and enhance them.
+
+ adwaita-icon-theme can be selected to provide some icon to
+ Gtk3.
+
+ http://www.darktable.org
+
+comment "darktable needs a toolchain w/ gcc >= 4.8, dynamic library, wchar, threads, C++"
+ depends on BR2_USE_MMU
+ depends on BR2_PACKAGE_DARKTABLE_ARCH_SUPPORTS
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \
+ !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+
+comment "darktable needs an OpenGL or an OpenGL-EGL/wayland backend"
+ depends on BR2_USE_MMU
+ depends on BR2_PACKAGE_DARKTABLE_ARCH_SUPPORTS
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/darktable/darktable.hash b/package/darktable/darktable.hash
new file mode 100644
index 0000000..cbb9bae
--- /dev/null
+++ b/package/darktable/darktable.hash
@@ -0,0 +1,2 @@
+# From https://github.com/darktable-org/darktable/releases/tag/release-2.2.3
+sha256 1b33859585bf283577680c61e3c0ea4e48214371453b9c17a86664d2fbda48a0 darktable-2.2.3.tar.xz
diff --git a/package/darktable/darktable.mk b/package/darktable/darktable.mk
new file mode 100644
index 0000000..53a8637
--- /dev/null
+++ b/package/darktable/darktable.mk
@@ -0,0 +1,64 @@
+################################################################################
+#
+# darktable
+#
+################################################################################
+
+DARKTABLE_VERSION = 2.2.3
+DARKTABLE_SITE = https://github.com/darktable-org/darktable/releases/download/release-$(DARKTABLE_VERSION)
+DARKTABLE_SOURCE = darktable-$(DARKTABLE_VERSION).tar.xz
+
+DARKTABLE_LICENSE = GPLv3+
+DARKTABLE_LICENSE_FILES = LICENSE
+
+# Darktable doesn't support in source build.
+DARKTABLE_SUPPORTS_IN_SOURCE_BUILD = NO
+
+# Install some shared libraries in /usr/lib/darktable/plugins
+DARKTABLE_INSTALL_STAGING = YES
+
+# From: http://redmine.darktable.org/projects/darktable/wiki/Building_darktable_20
+# Minimal dependencies.
+# host-gettext: Native Language Support.
+# host-libxml2: provide xmllint host tool.
+# host-libxslt: provide xsltproc host tool.
+# Force to use a bundled version of rawspeed library (linked statically).
+DARKTABLE_DEPENDENCIES = host-gettext host-intltool host-libxml2 host-libxslt \
+ exiv2 jpeg json-glib lcms2 lensfun libcurl libgtk3 librsvg libxml2 \
+ pugixml sqlite tiff
+
+# Disable cmstest: needs colord.
+# Disable print module: needs cups.
+# Disable Camera support: needs Gphoto2.
+# Disable colord: needs libcolord-gtk.
+# Disable Map View parts: needs libosmgpsmap.
+# Disable OpenCL support (needs llvm compiler).
+# Disable OpenExr: no openexr package.
+# Use CFLAGS provided by Buildroot.
+DARKTABLE_CONF_OPTS = \
+ -DBUILD_CMSTEST=OFF \
+ -DBUILD_PRINT=OFF \
+ -DBUILD_USERMANUAL=OFF \
+ -DCUSTOM_CFLAGS=ON \
+ -DUSE_CAMERA_SUPPORT=OFF \
+ -DUSE_COLORD=OFF \
+ -DUSE_FLICKR=OFF \
+ -DUSE_GRAPHICSMAGICK=OFF \
+ -DUSE_KWALLET=OFF \
+ -DUSE_LIBSECRET=OFF \
+ -DUSE_LUA=OFF \
+ -DUSE_MAP=OFF \
+ -DUSE_NLS=ON \
+ -DUSE_OPENCL=OFF \
+ -DUSE_OPENJPEG=OFF \
+ -DUSE_OPENMP=OFF \
+ -DUSE_OPENEXR=OFF \
+ -DUSE_WEBP=OFF
+
+ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
+DARKTABLE_CONF_OPTS += -DBUILD_SSE2_CODEPATHS=ON
+else
+DARKTABLE_CONF_OPTS += -DBUILD_SSE2_CODEPATHS=OFF
+endif
+
+$(eval $(cmake-package))
--
2.9.3
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 2/9] package/darktable: new package
2017-03-05 15:09 ` [Buildroot] [PATCH 2/9] package/darktable: " Romain Naour
@ 2017-03-05 16:44 ` Baruch Siach
2017-06-05 18:44 ` Bernd Kuhls
0 siblings, 1 reply; 15+ messages in thread
From: Baruch Siach @ 2017-03-05 16:44 UTC (permalink / raw)
To: buildroot
Hi Romain,
On Sun, Mar 05, 2017 at 04:09:57PM +0100, Romain Naour wrote:
> Add a small note about adwaita icon to avoid a Gtk warning:
>
> Gtk-WARNING **: Could not find the icon 'pan-down-symbolic-ltr'. The 'hicolor' theme
> was not found either, perhaps you need to install it.
> You can get a copy from:
> http://icon-theme.freedesktop.org/releases
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Jeremy Rosen <jeremy.rosen@enst-bretagne.fr>
[...]
> +# Darktable is only available for x86_64 or aarch64 little endian system only.
> +# Experimental support for i386 (not recommended).
> +# Building without SSE2 on x86_64 is highly experimental.
> +# See src/is_supported_platform.h
> +config BR2_PACKAGE_DARKTABLE_ARCH_SUPPORTS
> + bool
> + default y if (BR2_x86_64 && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2) || \
> + BR2_aarch64
BR2_X86_CPU_HAS_SSE2=y implies BR2_X86_CPU_HAS_SSE=y. So this is equivalent to
(BR2_x86_64 && BR2_X86_CPU_HAS_SSE2) || BR2_aarch64.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 2/9] package/darktable: new package
2017-03-05 16:44 ` Baruch Siach
@ 2017-06-05 18:44 ` Bernd Kuhls
2017-06-12 21:34 ` Romain Naour
0 siblings, 1 reply; 15+ messages in thread
From: Bernd Kuhls @ 2017-06-05 18:44 UTC (permalink / raw)
To: buildroot
Am Sun, 05 Mar 2017 18:44:33 +0200 schrieb Baruch Siach:
>> +# Darktable is only available for x86_64 or aarch64 little endian
system only.
>> +# Experimental support for i386 (not recommended).
>> +# Building without SSE2 on x86_64 is highly experimental.
>> +# See src/is_supported_platform.h
>> +config BR2_PACKAGE_DARKTABLE_ARCH_SUPPORTS
>> + bool
>> + default y if (BR2_x86_64 && BR2_X86_CPU_HAS_SSE &&
BR2_X86_CPU_HAS_SSE2) || \
>> + BR2_aarch64
>
> BR2_X86_CPU_HAS_SSE2=y implies BR2_X86_CPU_HAS_SSE=y. So this is
equivalent to
> (BR2_x86_64 && BR2_X86_CPU_HAS_SSE2) || BR2_aarch64.
Hi,
maybe even simplier?
default y if BR2_aarch64 || BR2_x86_64
All x86_64 CPUs have sse2 support, it started with the Pentium4.
Do we need the BR2_PACKAGE_DARKTABLE_ARCH_SUPPORTS option at all after
this simplification?
depends on !BR2_TOOLCHAIN_USES_MUSL
needs to be added as well since
https://git.buildroot.net/buildroot/commit/?
id=d887fde42540bb6079c66f72e1462bfcda402006
The patch also needs a rebase, it does not apply cleanly against
package/Config.in anymore.
Regards, Bernd
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 2/9] package/darktable: new package
2017-06-05 18:44 ` Bernd Kuhls
@ 2017-06-12 21:34 ` Romain Naour
0 siblings, 0 replies; 15+ messages in thread
From: Romain Naour @ 2017-06-12 21:34 UTC (permalink / raw)
To: buildroot
Hi Bernd, Baruch,
Thank for the review!
Le 05/06/2017 ? 20:44, Bernd Kuhls a ?crit :
> Am Sun, 05 Mar 2017 18:44:33 +0200 schrieb Baruch Siach:
>
>>> +# Darktable is only available for x86_64 or aarch64 little endian
> system only.
>>> +# Experimental support for i386 (not recommended).
>>> +# Building without SSE2 on x86_64 is highly experimental.
>>> +# See src/is_supported_platform.h
>>> +config BR2_PACKAGE_DARKTABLE_ARCH_SUPPORTS
>>> + bool
>>> + default y if (BR2_x86_64 && BR2_X86_CPU_HAS_SSE &&
> BR2_X86_CPU_HAS_SSE2) || \
>>> + BR2_aarch64
>>
>> BR2_X86_CPU_HAS_SSE2=y implies BR2_X86_CPU_HAS_SSE=y. So this is
> equivalent to
>> (BR2_x86_64 && BR2_X86_CPU_HAS_SSE2) || BR2_aarch64.
>
> Hi,
>
> maybe even simplier?
>
> default y if BR2_aarch64 || BR2_x86_64
>
> All x86_64 CPUs have sse2 support, it started with the Pentium4.
Ok
>
> Do we need the BR2_PACKAGE_DARKTABLE_ARCH_SUPPORTS option at all after
> this simplification?
>
> depends on !BR2_TOOLCHAIN_USES_MUSL
>
> needs to be added as well since
> https://git.buildroot.net/buildroot/commit/?
> id=d887fde42540bb6079c66f72e1462bfcda402006
Thank for the info, Glibc or uClibc-ng dependency added!
Best regards,
Romain
>
> The patch also needs a rebase, it does not apply cleanly against
> package/Config.in anymore.
>
> Regards, Bernd
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 3/9] package/darktable: add webp optional dependency
2017-03-05 15:09 [Buildroot] [PATCH 1/9] package/lensfun: new package Romain Naour
2017-03-05 15:09 ` [Buildroot] [PATCH 2/9] package/darktable: " Romain Naour
@ 2017-03-05 15:09 ` Romain Naour
2017-03-05 15:09 ` [Buildroot] [PATCH 4/9] package/darktable: add libsecret " Romain Naour
` (7 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Romain Naour @ 2017-03-05 15:09 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Jeremy Rosen <jeremy.rosen@enst-bretagne.fr>
---
package/darktable/darktable.mk | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/package/darktable/darktable.mk b/package/darktable/darktable.mk
index 53a8637..3cb83f9 100644
--- a/package/darktable/darktable.mk
+++ b/package/darktable/darktable.mk
@@ -52,8 +52,7 @@ DARKTABLE_CONF_OPTS = \
-DUSE_OPENCL=OFF \
-DUSE_OPENJPEG=OFF \
-DUSE_OPENMP=OFF \
- -DUSE_OPENEXR=OFF \
- -DUSE_WEBP=OFF
+ -DUSE_OPENEXR=OFF
ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
DARKTABLE_CONF_OPTS += -DBUILD_SSE2_CODEPATHS=ON
@@ -61,4 +60,11 @@ else
DARKTABLE_CONF_OPTS += -DBUILD_SSE2_CODEPATHS=OFF
endif
+ifeq ($(BR2_PACKAGE_WEBP),y)
+DARKTABLE_CONF_OPTS += -DUSE_WEBP=ON
+DARKTABLE_DEPENDENCIES += webp
+else
+DARKTABLE_CONF_OPTS += -DUSE_WEBP=OFF
+endif
+
$(eval $(cmake-package))
--
2.9.3
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 4/9] package/darktable: add libsecret optional dependency
2017-03-05 15:09 [Buildroot] [PATCH 1/9] package/lensfun: new package Romain Naour
2017-03-05 15:09 ` [Buildroot] [PATCH 2/9] package/darktable: " Romain Naour
2017-03-05 15:09 ` [Buildroot] [PATCH 3/9] package/darktable: add webp optional dependency Romain Naour
@ 2017-03-05 15:09 ` Romain Naour
2017-03-05 15:10 ` [Buildroot] [PATCH 5/9] package/darktable: add flickcurl " Romain Naour
` (6 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Romain Naour @ 2017-03-05 15:09 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Jeremy Rosen <jeremy.rosen@enst-bretagne.fr>
---
package/darktable/darktable.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/darktable/darktable.mk b/package/darktable/darktable.mk
index 3cb83f9..d46032ca 100644
--- a/package/darktable/darktable.mk
+++ b/package/darktable/darktable.mk
@@ -45,7 +45,6 @@ DARKTABLE_CONF_OPTS = \
-DUSE_FLICKR=OFF \
-DUSE_GRAPHICSMAGICK=OFF \
-DUSE_KWALLET=OFF \
- -DUSE_LIBSECRET=OFF \
-DUSE_LUA=OFF \
-DUSE_MAP=OFF \
-DUSE_NLS=ON \
@@ -60,6 +59,13 @@ else
DARKTABLE_CONF_OPTS += -DBUILD_SSE2_CODEPATHS=OFF
endif
+ifeq ($(BR2_PACKAGE_LIBSECRET),y)
+DARKTABLE_CONF_OPTS += -DUSE_LIBSECRET=ON
+DARKTABLE_DEPENDENCIES += libsecret
+else
+DARKTABLE_CONF_OPTS += -DUSE_LIBSECRET=OFF
+endif
+
ifeq ($(BR2_PACKAGE_WEBP),y)
DARKTABLE_CONF_OPTS += -DUSE_WEBP=ON
DARKTABLE_DEPENDENCIES += webp
--
2.9.3
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 5/9] package/darktable: add flickcurl optional dependency
2017-03-05 15:09 [Buildroot] [PATCH 1/9] package/lensfun: new package Romain Naour
` (2 preceding siblings ...)
2017-03-05 15:09 ` [Buildroot] [PATCH 4/9] package/darktable: add libsecret " Romain Naour
@ 2017-03-05 15:10 ` Romain Naour
2017-03-05 15:10 ` [Buildroot] [PATCH 6/9] package/darktable: add openjpeg " Romain Naour
` (5 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Romain Naour @ 2017-03-05 15:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Jeremy Rosen <jeremy.rosen@enst-bretagne.fr>
---
package/darktable/darktable.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/darktable/darktable.mk b/package/darktable/darktable.mk
index d46032ca..0e7aa9a 100644
--- a/package/darktable/darktable.mk
+++ b/package/darktable/darktable.mk
@@ -42,7 +42,6 @@ DARKTABLE_CONF_OPTS = \
-DCUSTOM_CFLAGS=ON \
-DUSE_CAMERA_SUPPORT=OFF \
-DUSE_COLORD=OFF \
- -DUSE_FLICKR=OFF \
-DUSE_GRAPHICSMAGICK=OFF \
-DUSE_KWALLET=OFF \
-DUSE_LUA=OFF \
@@ -59,6 +58,13 @@ else
DARKTABLE_CONF_OPTS += -DBUILD_SSE2_CODEPATHS=OFF
endif
+ifeq ($(BR2_PACKAGE_FLICKCURL),y)
+DARKTABLE_CONF_OPTS += -DUSE_FLICKR=ON
+DARKTABLE_DEPENDENCIES += flickcurl
+else
+DARKTABLE_CONF_OPTS += -DUSE_FLICKR=OFF
+endif
+
ifeq ($(BR2_PACKAGE_LIBSECRET),y)
DARKTABLE_CONF_OPTS += -DUSE_LIBSECRET=ON
DARKTABLE_DEPENDENCIES += libsecret
--
2.9.3
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 6/9] package/darktable: add openjpeg optional dependency
2017-03-05 15:09 [Buildroot] [PATCH 1/9] package/lensfun: new package Romain Naour
` (3 preceding siblings ...)
2017-03-05 15:10 ` [Buildroot] [PATCH 5/9] package/darktable: add flickcurl " Romain Naour
@ 2017-03-05 15:10 ` Romain Naour
2017-03-05 15:10 ` [Buildroot] [PATCH 7/9] package/darktable: add libsoup " Romain Naour
` (4 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Romain Naour @ 2017-03-05 15:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Jeremy Rosen <jeremy.rosen@enst-bretagne.fr>
---
package/darktable/darktable.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/darktable/darktable.mk b/package/darktable/darktable.mk
index 0e7aa9a..bd2d079 100644
--- a/package/darktable/darktable.mk
+++ b/package/darktable/darktable.mk
@@ -48,7 +48,6 @@ DARKTABLE_CONF_OPTS = \
-DUSE_MAP=OFF \
-DUSE_NLS=ON \
-DUSE_OPENCL=OFF \
- -DUSE_OPENJPEG=OFF \
-DUSE_OPENMP=OFF \
-DUSE_OPENEXR=OFF
@@ -72,6 +71,13 @@ else
DARKTABLE_CONF_OPTS += -DUSE_LIBSECRET=OFF
endif
+ifeq ($(BR2_PACKAGE_OPENJPEG),y)
+DARKTABLE_CONF_OPTS += -DUSE_OPENJPEG=ON
+DARKTABLE_DEPENDENCIES += openjpeg
+else
+DARKTABLE_CONF_OPTS += -DUSE_OPENJPEG=OFF
+endif
+
ifeq ($(BR2_PACKAGE_WEBP),y)
DARKTABLE_CONF_OPTS += -DUSE_WEBP=ON
DARKTABLE_DEPENDENCIES += webp
--
2.9.3
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 7/9] package/darktable: add libsoup optional dependency
2017-03-05 15:09 [Buildroot] [PATCH 1/9] package/lensfun: new package Romain Naour
` (4 preceding siblings ...)
2017-03-05 15:10 ` [Buildroot] [PATCH 6/9] package/darktable: add openjpeg " Romain Naour
@ 2017-03-05 15:10 ` Romain Naour
2017-03-05 15:10 ` [Buildroot] [PATCH 8/9] package/libgphoto2: new package Romain Naour
` (3 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Romain Naour @ 2017-03-05 15:10 UTC (permalink / raw)
To: buildroot
libsoup checked in src/CMakeLists.txt without USE_LIBSOUP option.
find_package(LibSoup2)
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Jeremy Rosen <jeremy.rosen@enst-bretagne.fr>
---
package/darktable/darktable.mk | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/package/darktable/darktable.mk b/package/darktable/darktable.mk
index bd2d079..de08af0 100644
--- a/package/darktable/darktable.mk
+++ b/package/darktable/darktable.mk
@@ -71,6 +71,11 @@ else
DARKTABLE_CONF_OPTS += -DUSE_LIBSECRET=OFF
endif
+# There is no option to handle libsoup dependency
+ifeq ($(BR2_PACKAGE_LIBSOUP),y)
+DARKTABLE_DEPENDENCIES += libsoup
+endif
+
ifeq ($(BR2_PACKAGE_OPENJPEG),y)
DARKTABLE_CONF_OPTS += -DUSE_OPENJPEG=ON
DARKTABLE_DEPENDENCIES += openjpeg
--
2.9.3
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 8/9] package/libgphoto2: new package
2017-03-05 15:09 [Buildroot] [PATCH 1/9] package/lensfun: new package Romain Naour
` (5 preceding siblings ...)
2017-03-05 15:10 ` [Buildroot] [PATCH 7/9] package/darktable: add libsoup " Romain Naour
@ 2017-03-05 15:10 ` Romain Naour
2017-03-05 15:10 ` [Buildroot] [PATCH 9/9] package/darktable: add libgphoto2 optional dependency Romain Naour
` (2 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Romain Naour @ 2017-03-05 15:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Jeremy Rosen <jeremy.rosen@enst-bretagne.fr>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/libgphoto2/Config.in | 20 ++++++++++++++++++++
package/libgphoto2/libgphoto2.hash | 5 +++++
package/libgphoto2/libgphoto2.mk | 16 ++++++++++++++++
5 files changed, 43 insertions(+)
create mode 100644 package/libgphoto2/Config.in
create mode 100644 package/libgphoto2/libgphoto2.hash
create mode 100644 package/libgphoto2/libgphoto2.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 8b64244..b7b203e 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1293,6 +1293,7 @@ F: package/expedite/
F: package/iqvlinux/
F: package/liblinear/
F: package/lensfun/
+F: package/libgphoto2/
F: package/linux-syscall-support/
F: package/lugaru/
F: package/mcelog/
diff --git a/package/Config.in b/package/Config.in
index 7f11791..fd010ba 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1071,6 +1071,7 @@ menu "Hardware handling"
source "package/libfreefare/Config.in"
source "package/libftdi/Config.in"
source "package/libftdi1/Config.in"
+ source "package/libgphoto2/Config.in"
source "package/libgpiod/Config.in"
source "package/libgudev/Config.in"
source "package/libhid/Config.in"
diff --git a/package/libgphoto2/Config.in b/package/libgphoto2/Config.in
new file mode 100644
index 0000000..eb48f9c
--- /dev/null
+++ b/package/libgphoto2/Config.in
@@ -0,0 +1,20 @@
+config BR2_PACKAGE_LIBGPHOTO2
+ bool "libgphoto2"
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ select BR2_PACKAGE_GD
+ select BR2_PACKAGE_JPEG
+ select BR2_PACKAGE_LIBEXIF
+ select BR2_PACKAGE_LIBTOOL
+ select BR2_PACKAGE_LIBUSB
+ select BR2_PACKAGE_LIBXML2
+ select BR2_PACKAGE_LOCKDEV
+ help
+ libgphoto2 is a library that can be used by applications to
+ access various digital cameras.
+
+ http://www.gphoto.org
+
+comment "libgphoto2 needs a toolchain w/ C++, threads"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+# depends on BR2_INSTALL_LIBSTDCPP
diff --git a/package/libgphoto2/libgphoto2.hash b/package/libgphoto2/libgphoto2.hash
new file mode 100644
index 0000000..4612fda
--- /dev/null
+++ b/package/libgphoto2/libgphoto2.hash
@@ -0,0 +1,5 @@
+# https://sourceforge.net/projects/gphoto/files/libgphoto/2.5.12/
+md5 a5999acc204c31515a6ec8e517d2cd91 libgphoto2-2.5.12.tar.bz2
+sha1 4ded403b87d46ad49ba88b22b9410789ed3cef10 libgphoto2-2.5.12.tar.bz2
+# Locally computed
+sha256 b9bb28990fde45ac385e4851a07dbad2e1250404b535b0a3a3b898bb431e4e2e libgphoto2-2.5.12.tar.bz2
diff --git a/package/libgphoto2/libgphoto2.mk b/package/libgphoto2/libgphoto2.mk
new file mode 100644
index 0000000..bb57091
--- /dev/null
+++ b/package/libgphoto2/libgphoto2.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libgphoto2
+#
+################################################################################
+
+LIBGPHOTO2_VERSION = 2.5.12
+LIBGPHOTO2_SITE = https://sourceforge.net/projects/gphoto/files/libgphoto/$(LIBGPHOTO2_VERSION)
+LIBGPHOTO2_SOURCE = libgphoto2-$(LIBGPHOTO2_VERSION).tar.bz2
+LIBGPHOTO2_LICENSE = LGPLv2.1+
+LIBGPHOTO2_LICENSE_FILES = COPYING
+LIBGPHOTO2_INSTALL_STAGING = YES
+
+LIBGPHOTO2_DEPENDENCIES = host-pkgconf gd jpeg libexif libtool libusb libxml2 lockdev
+
+$(eval $(autotools-package))
--
2.9.3
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 9/9] package/darktable: add libgphoto2 optional dependency
2017-03-05 15:09 [Buildroot] [PATCH 1/9] package/lensfun: new package Romain Naour
` (6 preceding siblings ...)
2017-03-05 15:10 ` [Buildroot] [PATCH 8/9] package/libgphoto2: new package Romain Naour
@ 2017-03-05 15:10 ` Romain Naour
2017-03-05 16:37 ` [Buildroot] [PATCH 1/9] package/lensfun: new package Baruch Siach
2017-03-29 19:50 ` Thomas Petazzoni
9 siblings, 0 replies; 15+ messages in thread
From: Romain Naour @ 2017-03-05 15:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Jeremy Rosen <jeremy.rosen@enst-bretagne.fr>
---
package/darktable/darktable.mk | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/darktable/darktable.mk b/package/darktable/darktable.mk
index de08af0..fab5fdd 100644
--- a/package/darktable/darktable.mk
+++ b/package/darktable/darktable.mk
@@ -29,7 +29,6 @@ DARKTABLE_DEPENDENCIES = host-gettext host-intltool host-libxml2 host-libxslt \
# Disable cmstest: needs colord.
# Disable print module: needs cups.
-# Disable Camera support: needs Gphoto2.
# Disable colord: needs libcolord-gtk.
# Disable Map View parts: needs libosmgpsmap.
# Disable OpenCL support (needs llvm compiler).
@@ -40,7 +39,6 @@ DARKTABLE_CONF_OPTS = \
-DBUILD_PRINT=OFF \
-DBUILD_USERMANUAL=OFF \
-DCUSTOM_CFLAGS=ON \
- -DUSE_CAMERA_SUPPORT=OFF \
-DUSE_COLORD=OFF \
-DUSE_GRAPHICSMAGICK=OFF \
-DUSE_KWALLET=OFF \
@@ -64,6 +62,13 @@ else
DARKTABLE_CONF_OPTS += -DUSE_FLICKR=OFF
endif
+ifeq ($(BR2_PACKAGE_LIBGPHOTO2),y)
+DARKTABLE_CONF_OPTS += -DUSE_CAMERA_SUPPORT=ON
+DARKTABLE_DEPENDENCIES += libgphoto2
+else
+DARKTABLE_CONF_OPTS += -DUSE_CAMERA_SUPPORT=OFF
+endif
+
ifeq ($(BR2_PACKAGE_LIBSECRET),y)
DARKTABLE_CONF_OPTS += -DUSE_LIBSECRET=ON
DARKTABLE_DEPENDENCIES += libsecret
--
2.9.3
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 1/9] package/lensfun: new package
2017-03-05 15:09 [Buildroot] [PATCH 1/9] package/lensfun: new package Romain Naour
` (7 preceding siblings ...)
2017-03-05 15:10 ` [Buildroot] [PATCH 9/9] package/darktable: add libgphoto2 optional dependency Romain Naour
@ 2017-03-05 16:37 ` Baruch Siach
2017-03-05 16:42 ` Romain Naour
2017-03-29 19:50 ` Thomas Petazzoni
9 siblings, 1 reply; 15+ messages in thread
From: Baruch Siach @ 2017-03-05 16:37 UTC (permalink / raw)
To: buildroot
Hi Romain,
On Sun, Mar 05, 2017 at 04:09:56PM +0100, Romain Naour wrote:
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Jeremy Rosen <jeremy.rosen@enst-bretagne.fr>
[...]
> diff --git a/package/lensfun/Config.in b/package/lensfun/Config.in
> new file mode 100644
> index 0000000..3095238
> --- /dev/null
> +++ b/package/lensfun/Config.in
> @@ -0,0 +1,28 @@
> +config BR2_PACKAGE_LENSFUN
> + bool "lensfun"
> + depends on BR2_INSTALL_LIBSTDCPP
> + depends on BR2_USE_WCHAR # libglib2
> + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
> + depends on BR2_USE_MMU # libglib2
Missing 'select BR2_PACKAGE_LIBGLIB2'.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 1/9] package/lensfun: new package
2017-03-05 16:37 ` [Buildroot] [PATCH 1/9] package/lensfun: new package Baruch Siach
@ 2017-03-05 16:42 ` Romain Naour
0 siblings, 0 replies; 15+ messages in thread
From: Romain Naour @ 2017-03-05 16:42 UTC (permalink / raw)
To: buildroot
Hi Baruch,
Le 05/03/2017 ? 17:37, Baruch Siach a ?crit :
> Hi Romain,
>
> On Sun, Mar 05, 2017 at 04:09:56PM +0100, Romain Naour wrote:
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> Cc: Jeremy Rosen <jeremy.rosen@enst-bretagne.fr>
>
> [...]
>
>> diff --git a/package/lensfun/Config.in b/package/lensfun/Config.in
>> new file mode 100644
>> index 0000000..3095238
>> --- /dev/null
>> +++ b/package/lensfun/Config.in
>> @@ -0,0 +1,28 @@
>> +config BR2_PACKAGE_LENSFUN
>> + bool "lensfun"
>> + depends on BR2_INSTALL_LIBSTDCPP
>> + depends on BR2_USE_WCHAR # libglib2
>> + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
>> + depends on BR2_USE_MMU # libglib2
>
> Missing 'select BR2_PACKAGE_LIBGLIB2'.
Thanks, fixed.
I'm waiting for more review on darktable package before sending v2.
Best regards,
Romain
>
> baruch
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 1/9] package/lensfun: new package
2017-03-05 15:09 [Buildroot] [PATCH 1/9] package/lensfun: new package Romain Naour
` (8 preceding siblings ...)
2017-03-05 16:37 ` [Buildroot] [PATCH 1/9] package/lensfun: new package Baruch Siach
@ 2017-03-29 19:50 ` Thomas Petazzoni
9 siblings, 0 replies; 15+ messages in thread
From: Thomas Petazzoni @ 2017-03-29 19:50 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 5 Mar 2017 16:09:56 +0100, Romain Naour wrote:
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Jeremy Rosen <jeremy.rosen@enst-bretagne.fr>
> ---
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> package/lensfun/Config.in | 28 ++++++++++++++++++++++++++++
> package/lensfun/lensfun.hash | 5 +++++
> package/lensfun/lensfun.mk | 41 +++++++++++++++++++++++++++++++++++++++++
> 5 files changed, 76 insertions(+)
> create mode 100644 package/lensfun/Config.in
> create mode 100644 package/lensfun/lensfun.hash
> create mode 100644 package/lensfun/lensfun.mk
Applied to master, after fixing the missing select noticed by Baruch.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 15+ messages in thread