From ecf011d7eedbfea2cde7095b48491cb21d03b29b Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 23 Jan 2020 18:01:10 +0100 Subject: [PATCH 1/2] New package: vips-8.9.0 --- common/shlibs | 2 + srcpkgs/libvips | 1 + srcpkgs/libvips-devel | 1 + .../vips/patches/autogen-noconfigure.patch | 7 ++++ srcpkgs/vips/template | 39 +++++++++++++++++++ 5 files changed, 50 insertions(+) create mode 120000 srcpkgs/libvips create mode 120000 srcpkgs/libvips-devel create mode 100644 srcpkgs/vips/patches/autogen-noconfigure.patch create mode 100644 srcpkgs/vips/template diff --git a/common/shlibs b/common/shlibs index 35fcd4de243..909f2405240 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3700,6 +3700,8 @@ libtss2-tcti-device.so.0 tpm2-tss-2.3.1_1 libtss2-rc.so.0 tpm2-tss-2.3.1_1 libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1 libtss2-tctildr.so.0 tpm2-tss-2.3.1_1 +libvips.so.42 libvips-8.9.0_1 +libvips-cpp.so.42 libvips-8.9.0_1 libzfs.so.2 zfs-0.8.2_1 libnvpair.so.1 zfs-0.8.2_1 libjsonnet.so.0 jsonnet-0.14.0_2 diff --git a/srcpkgs/libvips b/srcpkgs/libvips new file mode 120000 index 00000000000..6faa116eb8a --- /dev/null +++ b/srcpkgs/libvips @@ -0,0 +1 @@ +vips \ No newline at end of file diff --git a/srcpkgs/libvips-devel b/srcpkgs/libvips-devel new file mode 120000 index 00000000000..6faa116eb8a --- /dev/null +++ b/srcpkgs/libvips-devel @@ -0,0 +1 @@ +vips \ No newline at end of file diff --git a/srcpkgs/vips/patches/autogen-noconfigure.patch b/srcpkgs/vips/patches/autogen-noconfigure.patch new file mode 100644 index 00000000000..d76fba67dd5 --- /dev/null +++ b/srcpkgs/vips/patches/autogen-noconfigure.patch @@ -0,0 +1,7 @@ +--- autogen.sh ++++ autogen.sh +@@ -61,4 +61,3 @@ + $LIBTOOLIZE --copy --force --automake + automake --add-missing --copy + +-./configure $* diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template new file mode 100644 index 00000000000..ee7e24302ed --- /dev/null +++ b/srcpkgs/vips/template @@ -0,0 +1,39 @@ +# Template file for 'vips' +pkgname=vips +version=8.9.0 +revision=1 +wrksrc=libvips-${version} +build_style=gnu-configure +build_helper="qemu" +hostmakedepends="automake autogen libtool pkg-config gtk-doc + gobject-introspection glib-devel prelink-cross" +makedepends="glib-devel librsvg-devel giflib-devel libgsf-devel fftw-devel + libjpeg-turbo-devel libpng-devel libexif-devel libmagick-devel" +short_desc="Fast image processing library with low memory needs" +maintainer="Piraty " +license="LGPL-2.1-or-later" +homepage="https://libvips.github.io/libvips/" +distfiles="https://github.com/libvips/libvips/archive/v${version}.tar.gz" +checksum=da14ba61bede36a04f1e5ee5db7f46eaafce99235014247db63f5f057336b054 + +pre_configure() { + ./autogen.sh +} + +libvips_package() { + short_desc+=" - runtime libraries" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} + +libvips-devel_package() { + short_desc+=" - development files" + depends="libvips>=${version}_${revision} $makedepends" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From 470e71604ab45c621457268daf60d5c54b1a1820 Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 23 Jan 2020 19:49:56 +0100 Subject: [PATCH 2/2] WIP: New package: photoflow-0.2.8 TODO: * FTBFS due to rawspeed... make rawspeed it's own (source-only) package? [ci skip] --- srcpkgs/photoflow/patches/darktables.patch | 31 +++++++++++++ srcpkgs/photoflow/patches/exiv2-header.patch | 11 +++++ srcpkgs/photoflow/patches/vips-compat.patch | 10 +++++ srcpkgs/photoflow/template | 47 ++++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 srcpkgs/photoflow/patches/darktables.patch create mode 100644 srcpkgs/photoflow/patches/exiv2-header.patch create mode 100644 srcpkgs/photoflow/patches/vips-compat.patch create mode 100644 srcpkgs/photoflow/template diff --git a/srcpkgs/photoflow/patches/darktables.patch b/srcpkgs/photoflow/patches/darktables.patch new file mode 100644 index 00000000000..00a3ff06b48 --- /dev/null +++ b/srcpkgs/photoflow/patches/darktables.patch @@ -0,0 +1,31 @@ +# link against system's libdarktable instead of building it +# seems to work + +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -176,16 +176,6 @@ + + + +-FILE(GLOB DTIncludes external/darktable/src/common/*.h external/darktable/src/develop/*.h) +-FILE(GLOB DTSources external/darktable/src/common/*.c external/darktable/src/develop/masks/*.c) +- +-add_library (pfdt STATIC +- ${DTIncludes} +- ${DTSources} +-) +- +-SET_TARGET_PROPERTIES(pfdt PROPERTIES COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/src/dt -std=gnu99") +- + + FILE(GLOB BaseIncludes version.hh base/*.hh) + if (AUTOMATED_VERSION_CHECK) +@@ -428,7 +418,7 @@ + pfgui + pfbase + pfgmic +- pfdt ++ darktable + ${STATIC_LIBS} + ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} + ${VIPS_LIBRARIES} ${VIPSCC_LIBRARIES} diff --git a/srcpkgs/photoflow/patches/exiv2-header.patch b/srcpkgs/photoflow/patches/exiv2-header.patch new file mode 100644 index 00000000000..832e63fcea6 --- /dev/null +++ b/srcpkgs/photoflow/patches/exiv2-header.patch @@ -0,0 +1,11 @@ +--- src/base/exif_data.hh ++++ src/base/exif_data.hh +@@ -41,7 +41,7 @@ + #include + #else + #include +-#include ++#include + #include + #include + #include diff --git a/srcpkgs/photoflow/patches/vips-compat.patch b/srcpkgs/photoflow/patches/vips-compat.patch new file mode 100644 index 00000000000..d98427207fd --- /dev/null +++ b/srcpkgs/photoflow/patches/vips-compat.patch @@ -0,0 +1,10 @@ +--- src/base/pftypes.hh ++++ src/base/pftypes.hh +@@ -32,6 +32,7 @@ + + #include + #include ++#include + + #include "property.hh" + diff --git a/srcpkgs/photoflow/template b/srcpkgs/photoflow/template new file mode 100644 index 00000000000..8429dbf76a4 --- /dev/null +++ b/srcpkgs/photoflow/template @@ -0,0 +1,47 @@ +# Template file for 'photoflow' +pkgname=photoflow +version=0.2.8 +revision=1 +# bundled sources of rawspeed are outdated and FTBFS +_rawspeed_version=3.3 +wrksrc=PhotoFlow-${version} +#archs="i686 x86_64" +build_style=cmake +configure_args="-DBUNDLED_LENSFUN=OFF -DBUNDLED_GEXIV2=OFF" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/dir 0755 root root" +hostmakedepends="pkg-config gettext" +makedepends="tiff-devel libpng-devel expat-devel lcms2-devel fftw-devel + libxml2-devel libexif-devel libsigc++-devel pixman-devel libmagick-devel + libvips-devel gtkmm2-devel pugixml-devel exiv2-devel lensfun-devel" +short_desc="Photo retouching program" +maintainer="Piraty " +license="GPL-3.0-or-later" +homepage="https://aferrero2707.github.io/PhotoFlow" +distfiles=" + https://github.com/aferrero2707/PhotoFlow/archive/v${version}.tar.gz + https://github.com/darktable-org/rawspeed/archive/v${_rawspeed_version}.tar.gz" +checksum=" + 196c0d84c0e1dd49bfde55a9930afbc28a30aa061f3bd1cba6d18792f601f5d2 + f8cc1c896c43bedc6a4a37e2f2f78be0e88c149887651413f5be1aa90710c389" + +post_extract() { + ## don't use bundled libraries + ## * darktables: photoflow requries colorspaces.h + ## * rawspeed :currently not a stand-alone library + #for ext in lensfun exiv2; do + # rm -r src/external/$ext + #done + + # use a more recent rawspeed than the one bundled + rm -r src/external/rawspeed + ln -s ${XBPS_BUILDDIR}/rawspeed-${_rawspeed_version} src/external/rawspeed + + # some patching... + vsed -i src/external/rawspeed/cmake/compiler-flags.cmake \ + -e 's/CMAKE_CXX_STANDARD 14/CMAKE_CXX_STANDARD 11/' + vsed -i src/external/rawspeed/src/librawspeed/common/Array2DRef.h \ + -e 's/enable_if_t/enable_if/' +}