* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.8.8.10-r1.ebuild ChangeLog
@ 2014-04-08 11:49 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 6+ messages in thread
From: Samuli Suominen (ssuominen) @ 2014-04-08 11:49 UTC (permalink / raw
To: gentoo-commits
ssuominen 14/04/08 11:49:24
Modified: ChangeLog
Added: imagemagick-6.8.8.10-r1.ebuild
Log:
Use _LIBOPENJP2_DELEGATE instead of _JP2_DELEGATE to fix jpeg2k support for PDFs wrt #503692#c7 by Alexander Miller. The patch has been accepted by upstream, and applied in trunk for upcoming 6.9.0-0 release.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.547 media-gfx/imagemagick/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.547&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.547&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.546&r2=1.547
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -r1.546 -r1.547
--- ChangeLog 7 Apr 2014 19:42:51 -0000 1.546
+++ ChangeLog 8 Apr 2014 11:49:24 -0000 1.547
@@ -1,6 +1,15 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.546 2014/04/07 19:42:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.547 2014/04/08 11:49:24 ssuominen Exp $
+
+*imagemagick-6.8.8.10-r1 (08 Apr 2014)
+
+ 08 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+ +files/imagemagick-6.8.8.10-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch,
+ +imagemagick-6.8.8.10-r1.ebuild:
+ Use _LIBOPENJP2_DELEGATE instead of _JP2_DELEGATE to fix jpeg2k support for
+ PDFs wrt #503692#c7 by Alexander Miller. The patch has been accepted by
+ upstream, and applied in trunk for upcoming 6.9.0-0 release.
07 Apr 2014; Markus Meier <maekke@gentoo.org> imagemagick-6.8.8.10.ebuild:
arm stable, bug #506562
1.1 media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.1&content-type=text/plain
Index: imagemagick-6.8.8.10-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.1 2014/04/08 11:49:24 ssuominen Exp $
EAPI=5
inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
MY_P=ImageMagick-$(replace_version_separator 3 '-')
DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="http://www.imagemagick.org/"
SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
RESTRICT="perl? ( userpriv )"
RDEPEND=">=sys-devel/libtool-2.2.6b
autotrace? ( >=media-gfx/autotrace-0.31.1 )
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 )
jbig? ( media-libs/jbigkit )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:2 )
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:0= )
png? ( media-libs/libpng:0= )
postscript? ( app-text/ghostscript-gpl )
raw? ( media-gfx/ufraw )
svg? ( gnome-base/librsvg )
tiff? ( media-libs/tiff:0 )
truetype? (
media-fonts/urw-fonts
>=media-libs/freetype-2
)
webp? ( media-libs/libwebp:0= )
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 )
zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}
!media-gfx/graphicsmagick[imagemagick]
virtual/pkgconfig
X? ( x11-proto/xextproto )"
REQUIRED_USE="corefonts? ( truetype )
test? ( corefonts )"
S=${WORKDIR}/${MY_P}
src_prepare() {
# These both have been accepted by upstream, remove once 6.9.0-0 is out:
epatch \
"${FILESDIR}"/${PN}-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch \
"${FILESDIR}"/${P}-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch
epatch_user
elibtoolize # for Darwin modules
# For testsuite, see http://bugs.gentoo.org/show_bug.cgi?id=500580#c3
shopt -s nullglob
cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
if test -n "${cards}"; then
addpredict "${cards}"
fi
shopt -u nullglob
}
src_configure() {
local depth=16
use q8 && depth=8
use q32 && depth=32
use q64 && depth=64
local openmp=disable
use openmp && { tc-has-openmp && openmp=enable; }
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
econf \
$(use_enable static-libs static) \
$(use_enable hdri) \
$(use_enable opencl) \
--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 zlib) \
$(use_with autotrace) \
$(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 jbig) \
$(use_with jpeg) \
$(use_with jpeg2k openjp2) \
--without-lcms \
$(use_with lcms lcms2) \
$(use_with lqr) \
$(use_with lzma) \
--without-mupdf \
$(use_with openexr) \
$(use_with pango) \
$(use_with png) \
$(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) \
--${openmp}-openmp
}
src_test() {
LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
emake -j1 check
}
src_install() {
# Ensure documentation installation files and paths with each release!
emake \
DESTDIR="${D}" \
DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
install
rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
dodoc {AUTHORS,README}.txt ChangeLog
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:=.*:='':" {} +
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
SANDBOX_PREDICT="/dev/dri/card"
EOF
insinto /etc/sandbox.d
doins "${T}"/99${PN} #472766
fi
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.8.8.10-r1.ebuild ChangeLog
@ 2014-05-14 17:04 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 6+ messages in thread
From: Samuli Suominen (ssuominen) @ 2014-05-14 17:04 UTC (permalink / raw
To: gentoo-commits
ssuominen 14/05/14 17:04:52
Modified: imagemagick-6.8.8.10-r1.ebuild ChangeLog
Log:
Stabilize for everyone to gain 1 trivial bugfix for typing errors in 2 files for #ifdef's. No other changes to from -r0 -> -r1.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.2 media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?r1=1.1&r2=1.2
Index: imagemagick-6.8.8.10-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imagemagick-6.8.8.10-r1.ebuild 8 Apr 2014 11:49:24 -0000 1.1
+++ imagemagick-6.8.8.10-r1.ebuild 14 May 2014 17:04:51 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.1 2014/04/08 11:49:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.2 2014/05/14 17:04:51 ssuominen Exp $
EAPI=5
inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -13,7 +13,7 @@
LICENSE="imagemagick"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
RESTRICT="perl? ( userpriv )"
1.555 media-gfx/imagemagick/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.555&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.555&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.554&r2=1.555
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -r1.554 -r1.555
--- ChangeLog 14 May 2014 17:02:26 -0000 1.554
+++ ChangeLog 14 May 2014 17:04:51 -0000 1.555
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.554 2014/05/14 17:02:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.555 2014/05/14 17:04:51 ssuominen Exp $
+
+ 14 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+ imagemagick-6.8.8.10-r1.ebuild:
+ Stabilize for everyone to gain 1 trivial bugfix for typing errors in 2 files
+ for #ifdef's. No other changes to from -r0 -> -r1.
14 May 2014; Samuli Suominen <ssuominen@gentoo.org>
-files/imagemagick-6.7.8.7-freetype.patch, -imagemagick-6.7.8.7.ebuild,
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.8.8.10-r1.ebuild ChangeLog
@ 2014-05-14 17:13 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 6+ messages in thread
From: Samuli Suominen (ssuominen) @ 2014-05-14 17:13 UTC (permalink / raw
To: gentoo-commits
ssuominen 14/05/14 17:13:30
Modified: imagemagick-6.8.8.10-r1.ebuild ChangeLog
Log:
Improve support for openjpeg-2.1.0 with conditional patching for now as a temporary solution; will go away with next ebuild.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.3 media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?r1=1.2&r2=1.3
Index: imagemagick-6.8.8.10-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- imagemagick-6.8.8.10-r1.ebuild 14 May 2014 17:04:51 -0000 1.2
+++ imagemagick-6.8.8.10-r1.ebuild 14 May 2014 17:13:30 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.2 2014/05/14 17:04:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.3 2014/05/14 17:13:30 ssuominen Exp $
EAPI=5
inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -27,10 +27,10 @@
fontconfig? ( media-libs/fontconfig )
fpx? ( >=media-libs/libfpx-1.3.0-r1 )
graphviz? ( media-gfx/graphviz )
- jbig? ( media-libs/jbigkit )
+ jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:2 )
- lcms? ( media-libs/lcms:2 )
+ jpeg2k? ( >=media-libs/openjpeg-2.0.0:2 )
+ lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
@@ -40,7 +40,7 @@
postscript? ( app-text/ghostscript-gpl )
raw? ( media-gfx/ufraw )
svg? ( gnome-base/librsvg )
- tiff? ( media-libs/tiff:0 )
+ tiff? ( media-libs/tiff:0= )
truetype? (
media-fonts/urw-fonts
>=media-libs/freetype-2
@@ -53,9 +53,9 @@
x11-libs/libXext
x11-libs/libXt
)
- xml? ( dev-libs/libxml2 )
+ xml? ( dev-libs/libxml2:= )
lzma? ( app-arch/xz-utils )
- zlib? ( sys-libs/zlib )"
+ zlib? ( sys-libs/zlib:= )"
DEPEND="${RDEPEND}
!media-gfx/graphicsmagick[imagemagick]
virtual/pkgconfig
@@ -67,10 +67,11 @@
S=${WORKDIR}/${MY_P}
src_prepare() {
- # These both have been accepted by upstream, remove once 6.9.0-0 is out:
- epatch \
- "${FILESDIR}"/${PN}-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch \
- "${FILESDIR}"/${P}-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch
+ # These both have been accepted by upstream:
+ if use jpeg2k && has_version '<media-libs/openjpeg-2.1.0'; then
+ epatch "${FILESDIR}"/${PN}-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch
+ fi
+ epatch "${FILESDIR}"/${P}-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch
epatch_user
1.556 media-gfx/imagemagick/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.556&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.556&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.555&r2=1.556
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -r1.555 -r1.556
--- ChangeLog 14 May 2014 17:04:51 -0000 1.555
+++ ChangeLog 14 May 2014 17:13:30 -0000 1.556
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.555 2014/05/14 17:04:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.556 2014/05/14 17:13:30 ssuominen Exp $
+
+ 14 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+ imagemagick-6.8.8.10-r1.ebuild:
+ Improve support for openjpeg-2.1.0 with conditional patching for now as a
+ temporary solution; will go away with next ebuild.
14 May 2014; Samuli Suominen <ssuominen@gentoo.org>
imagemagick-6.8.8.10-r1.ebuild:
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.8.8.10-r1.ebuild ChangeLog
@ 2014-05-16 10:31 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 6+ messages in thread
From: Samuli Suominen (ssuominen) @ 2014-05-16 10:31 UTC (permalink / raw
To: gentoo-commits
ssuominen 14/05/16 10:31:09
Modified: imagemagick-6.8.8.10-r1.ebuild ChangeLog
Log:
Missing SLOT operator in conditional patching re: has_version.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.4 media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?r1=1.3&r2=1.4
Index: imagemagick-6.8.8.10-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- imagemagick-6.8.8.10-r1.ebuild 14 May 2014 17:13:30 -0000 1.3
+++ imagemagick-6.8.8.10-r1.ebuild 16 May 2014 10:31:08 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.3 2014/05/14 17:13:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.4 2014/05/16 10:31:08 ssuominen Exp $
EAPI=5
inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -68,7 +68,7 @@
src_prepare() {
# These both have been accepted by upstream:
- if use jpeg2k && has_version '<media-libs/openjpeg-2.1.0'; then
+ if use jpeg2k && has_version '<media-libs/openjpeg-2.1.0:2'; then
epatch "${FILESDIR}"/${PN}-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch
fi
epatch "${FILESDIR}"/${P}-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch
1.558 media-gfx/imagemagick/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.558&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.558&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.557&r2=1.558
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -r1.557 -r1.558
--- ChangeLog 14 May 2014 17:15:20 -0000 1.557
+++ ChangeLog 16 May 2014 10:31:09 -0000 1.558
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.557 2014/05/14 17:15:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.558 2014/05/16 10:31:09 ssuominen Exp $
+
+ 16 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+ imagemagick-6.8.8.10-r1.ebuild:
+ Missing SLOT operator in conditional patching re: has_version.
14 May 2014; Samuli Suominen <ssuominen@gentoo.org>
-imagemagick-6.8.8.10.ebuild:
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.8.8.10-r1.ebuild ChangeLog
@ 2014-06-03 6:43 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 6+ messages in thread
From: Samuli Suominen (ssuominen) @ 2014-06-03 6:43 UTC (permalink / raw
To: gentoo-commits
ssuominen 14/06/03 06:43:08
Modified: imagemagick-6.8.8.10-r1.ebuild ChangeLog
Log:
Include /dev/ati/card in the SANDBOX_PREDICT line (user from Freenode proofed it fails with ati-drivers too)
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.5 media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?r1=1.4&r2=1.5
Index: imagemagick-6.8.8.10-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- imagemagick-6.8.8.10-r1.ebuild 16 May 2014 10:31:08 -0000 1.4
+++ imagemagick-6.8.8.10-r1.ebuild 3 Jun 2014 06:43:08 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.4 2014/05/16 10:31:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.5 2014/06/03 06:43:08 ssuominen Exp $
EAPI=5
inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -165,7 +165,7 @@
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
- SANDBOX_PREDICT="/dev/dri/card"
+ SANDBOX_PREDICT="/dev/ati/card:/dev/dri/card"
EOF
insinto /etc/sandbox.d
1.559 media-gfx/imagemagick/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.559&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.559&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.558&r2=1.559
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -r1.558 -r1.559
--- ChangeLog 16 May 2014 10:31:09 -0000 1.558
+++ ChangeLog 3 Jun 2014 06:43:08 -0000 1.559
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.558 2014/05/16 10:31:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.559 2014/06/03 06:43:08 ssuominen Exp $
+
+ 03 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+ imagemagick-6.8.8.10-r1.ebuild:
+ Include /dev/ati/card in the SANDBOX_PREDICT line (user from Freenode proofed
+ it fails with ati-drivers too)
16 May 2014; Samuli Suominen <ssuominen@gentoo.org>
imagemagick-6.8.8.10-r1.ebuild:
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.8.8.10-r1.ebuild ChangeLog
@ 2014-08-24 15:41 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 6+ messages in thread
From: Samuli Suominen (ssuominen) @ 2014-08-24 15:41 UTC (permalink / raw
To: gentoo-commits
ssuominen 14/08/24 15:41:26
Modified: imagemagick-6.8.8.10-r1.ebuild ChangeLog
Log:
Restrict old copy of ImageMagick to old copy of OpenJPEG.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.6 media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?r1=1.5&r2=1.6
Index: imagemagick-6.8.8.10-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- imagemagick-6.8.8.10-r1.ebuild 3 Jun 2014 06:43:08 -0000 1.5
+++ imagemagick-6.8.8.10-r1.ebuild 24 Aug 2014 15:41:26 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.5 2014/06/03 06:43:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.6 2014/08/24 15:41:26 ssuominen Exp $
EAPI=5
inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -29,7 +29,7 @@
graphviz? ( media-gfx/graphviz )
jbig? ( >=media-libs/jbigkit-2:= )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.0.0:2 )
+ jpeg2k? ( <media-libs/openjpeg-2.1.0:2 )
lcms? ( media-libs/lcms:2= )
lqr? ( media-libs/liblqr )
opencl? ( virtual/opencl )
1.561 media-gfx/imagemagick/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.561&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.561&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.560&r2=1.561
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -r1.560 -r1.561
--- ChangeLog 24 Aug 2014 15:37:23 -0000 1.560
+++ ChangeLog 24 Aug 2014 15:41:26 -0000 1.561
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.560 2014/08/24 15:37:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.561 2014/08/24 15:41:26 ssuominen Exp $
+
+ 24 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+ imagemagick-6.8.8.10-r1.ebuild:
+ Restrict old copy of ImageMagick to old copy of OpenJPEG.
*imagemagick-6.8.9.7 (24 Aug 2014)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-08-24 15:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-14 17:04 [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.8.8.10-r1.ebuild ChangeLog Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2014-08-24 15:41 Samuli Suominen (ssuominen)
2014-06-03 6:43 Samuli Suominen (ssuominen)
2014-05-16 10:31 Samuli Suominen (ssuominen)
2014-05-14 17:13 Samuli Suominen (ssuominen)
2014-04-08 11:49 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox