commit: 81f653a24e06d7cf7048802531a83b432914e5f2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sun Sep 8 19:48:49 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Sep 8 19:50:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f653a2
media-gfx/imagemagick: Revert some upstream changes to Perl build system Closes: https://bugs.gentoo.org/939324 Bug: https://github.com/ImageMagick/ImageMagick/issues/7602 Bug: https://github.com/ImageMagick/ImageMagick/issues/7191 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> .../files/imagemagick-7.1.1.38-perl-1.patch | 28 +++ .../files/imagemagick-7.1.1.38-perl-2.patch | 27 +++ .../imagemagick/imagemagick-7.1.1.38-r1.ebuild | 254 +++++++++++++++++++++ 3 files changed, 309 insertions(+) diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch new file mode 100644 index 000000000000..afd45b3417eb --- /dev/null +++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch @@ -0,0 +1,28 @@ +From 3862ebc02771f33c309e9ee91b696aff0fbdc20e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> +Date: Sun, 8 Sep 2024 21:10:01 +0200 +Subject: [PATCH 1/2] Revert "install perl module into user-specified prefix + (#7192)" + +This reverts commit c09d35f22090585a0357ecfbd58786022a37aae7. +--- + PerlMagick/Makefile.PL.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/PerlMagick/Makefile.PL.in b/PerlMagick/Makefile.PL.in +index 902f01dc2..622a502ea 100644 +--- a/PerlMagick/Makefile.PL.in ++++ b/PerlMagick/Makefile.PL.in +@@ -223,9 +223,6 @@ WriteMakefile + # Linker flags for building a dynamically loadable module + 'LDDLFLAGS' => $LDDLFLAGS_magick, + +- # Install PerlMagick into ImageMagick prefix +- 'INSTALL_BASE' => '@PREFIX_DIR@', +- + # Install PerlMagick binary into ImageMagick bin directory + 'INSTALLBIN' => '@BIN_DIR@', + +-- +2.44.2 + diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch new file mode 100644 index 000000000000..10418d8555e6 --- /dev/null +++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch @@ -0,0 +1,27 @@ +From 5e08a2474436574d7ed6de006573dd9bc036cd5c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> +Date: Sun, 8 Sep 2024 21:10:13 +0200 +Subject: [PATCH 2/2] Revert "set perl install base to that of ImageMagick's" + +This reverts commit 2d5edb26e22dd34ac1e43936b5c461bf0dbdb03a. +--- + PerlMagick/quantum/Makefile.PL.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/PerlMagick/quantum/Makefile.PL.in b/PerlMagick/quantum/Makefile.PL.in +index fabebd300..fa0bf3384 100644 +--- a/PerlMagick/quantum/Makefile.PL.in ++++ b/PerlMagick/quantum/Makefile.PL.in +@@ -220,9 +220,6 @@ WriteMakefile + # Linker flags for building a dynamically loadable module + 'LDDLFLAGS' => $LDDLFLAGS_magick, + +- # Install PerlMagick into ImageMagick prefix +- 'INSTALL_BASE' => '@PREFIX_DIR@', +- + # Install PerlMagick binary into ImageMagick bin directory + 'INSTALLBIN' => '@BIN_DIR@', + +-- +2.44.2 + diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild new file mode 100644 index 000000000000..16ef267001e2 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild @@ -0,0 +1,254 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QA_PKGCONFIG_VERSION=$(ver_cut 1-3) +inherit autotools flag-o-matic perl-functions toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"; + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://www.imagemagick.org/"; + +LICENSE="imagemagick" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-18" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" + +REQUIRED_USE=" + corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts ) +" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !media-gfx/graphicsmagick[imagemagick] + dev-libs/libltdl + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:=[x265] ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + jpegxl? ( >=media-libs/libjxl-0.6:= ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:= ) + png? ( media-libs/libpng:= ) + postscript? ( app-text/ghostscript-gpl:= ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2 ) + lzma? ( app-arch/xz-utils ) + zip? ( dev-libs/libzip:= ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-7.1.1.38-perl-1.patch" + "${FILESDIR}/${PN}-7.1.1.38-perl-2.patch" + "${FILESDIR}/${PN}-9999-nocputuning.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + #elibtoolize # for Darwin modules + eautoreconf + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + $(use_enable openmp) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zip) + $(use_with zlib) + --without-autotrace + --with-uhdr + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with jpegxl jxl) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + + # Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open + # For now, let's make USE=hardened do 'limited', and have USE=-hardened + # reflect the upstream default of 'open'. + # + # We might change it to 'secure' and 'limited' at some point. + # See also bug #716674. + --with-security-policy=$(usex hardened limited open) + ) + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in $HOME for test suite, bug #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + if [[ ${PV} == 9999 ]] ; then + IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild + else + IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + fi + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + einstalldocs + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +}
