As libkdcraw from KDE git master depends on libraw-0.16 built with CMake I've created working libraw-0.16.0_alpha2 wbuild that works with CMake. I'm no expert, but hope it could help in getting this bump upstreamed or at least overlayed somewhere (possibly KDE). I've tested it and it builds and works for me. Also libkdcraw builds with it. Reproducible: Always
Created attachment 361078 [details] libraw-0.16.0_alpha2.ebuild
Comment on attachment 361078 [details] libraw-0.16.0_alpha2.ebuild --- libraw-0.15.4.ebuild 2013-08-31 18:48:28.000000000 +0200 +++ - 2013-10-17 15:05:39.953464341 +0200 @@ -4,9 +4,9 @@ EAPI=5 -inherit eutils autotools toolchain-funcs +inherit eutils toolchain-funcs cmake-utils -MY_PV=${PV/_b/-B} +MY_PV=${PV/_a/-A} MY_P=LibRaw-${MY_PV} DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras" @@ -19,7 +19,7 @@ # can be obtained from here: # http://www.libraw.org/data/LICENSE.LibRaw.pdf LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3" -SLOT="0/9" # subslot = libraw soname version +SLOT="0/10" # subslot = libraw soname version KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="demosaic examples jpeg jpeg2k +lcms openmp static-libs" @@ -33,30 +33,26 @@ DOCS=( Changelog.txt README ) +PATCHES=( + "${FILESDIR}/${PN}-0.13.4-docs.patch" +) + pkg_pretend() { if use openmp ; then tc-has-openmp || die "Please switch to an openmp compatible compiler" fi } -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.13.4-docs.patch - eautoreconf -} - src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable openmp) \ - $(use_enable jpeg) \ - $(use_enable jpeg2k jasper) \ - $(use_enable lcms) \ - $(use_enable examples) \ - $(use_enable demosaic demosaic-pack-gpl2) \ - $(use_enable demosaic demosaic-pack-gpl3) -} - -src_install() { - default - prune_libtool_files + local mycmakeargs=( + $(cmake-utils_use_with static-libs static) \ + $(cmake-utils_use_with openmp) \ + $(cmake-utils_use_with jpeg) \ + $(cmake-utils_use_with jpeg2k jasper) \ + $(cmake-utils_use_with lcms) \ + $(cmake-utils_use_with examples) \ + $(cmake-utils_use_with demosaic demosaic-pack-gpl2) \ + $(cmake-utils_use_with demosaic demosaic-pack-gpl3) + ) + cmake-utils_src_configure }
Added to the tree. I'm probably not going to move to cmake until the autotools support is officially obsoleted and/or dropped.
When using your ebuild libkdcraw cannot find libraw: CMake Error at CMakeLists.txt:39 (FIND_PACKAGE): By not providing "FindLibRaw.cmake" in CMAKE_MODULE_PATH this project has asked CMake to find a package configuration file provided by "LibRaw", but CMake did not find one. Could not find a package configuration file provided by "LibRaw" (requested version 0.16) with any of the following names: LibRawConfig.cmake libraw-config.cmake Add the installation prefix of "LibRaw" to CMAKE_PREFIX_PATH or set "LibRaw_DIR" to a directory containing one of the above files. If "LibRaw" provides a separate development package or SDK, be sure it has been installed. -- Configuring incomplete, errors occurred! And that was exactly the reason why I've attempted migration to cmake.
(In reply to Tim Harder from comment #3) > I'm probably not going to move to cmake until the autotools support is > officially obsoleted and/or dropped. As noted by Jakub, switching to CMake installs additional files (libraw_config.h & FindLibRaw.cmake). Unfortunately, the next release of libkdcraw hard-depends on >=libraw-0.16.0 and these additional files, so this issue becomes a blocker and probably other dependants in the future.
(In reply to Michael Palimaka (kensington) from comment #5) > As noted by Jakub, switching to CMake installs additional files > (libraw_config.h & FindLibRaw.cmake). > > Unfortunately, the next release of libkdcraw hard-depends on >=libraw-0.16.0 > and these additional files, so this issue becomes a blocker and probably > other dependants in the future. libraw-0.16.0_alpha2-r1 now uses cmake, and you should notice from the five patches against the cmake build system why I wanted to put it off. :P
