| 1 |
commit: 644e75b4dd33d890841d51cf8ccef4c16c96e217 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 28 08:19:30 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 28 08:19:30 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=644e75b4 |
| 7 |
|
| 8 |
x11-libs/gdk-pixbuf: [QA] Remove media-libs/jasper dep |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/689784 |
| 11 |
Package-Manager: Portage-2.3.68, Repoman-2.3.16 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild | 5 ++--- |
| 15 |
x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild | 5 ++--- |
| 16 |
2 files changed, 4 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild |
| 19 |
index fba332527c1..abf08b26b45 100644 |
| 20 |
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild |
| 21 |
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild |
| 22 |
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" |
| 23 |
LICENSE="LGPL-2+" |
| 24 |
SLOT="2" |
| 25 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 26 |
-IUSE="X debug +introspection jpeg jpeg2k tiff test" |
| 27 |
+IUSE="X debug +introspection jpeg tiff test" |
| 28 |
|
| 29 |
# Remove SRC_URI when gnome bug #795069 is fixed |
| 30 |
SRC_URI="${SRC_URI} test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> ${PN}-2.36.12-bug753605-atsize.jpg )" |
| 31 |
@@ -22,7 +22,6 @@ COMMON_DEPEND=" |
| 32 |
>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] |
| 33 |
introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) |
| 34 |
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
| 35 |
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) |
| 36 |
tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) |
| 37 |
X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) |
| 38 |
" |
| 39 |
@@ -74,7 +73,7 @@ multilib_src_configure() { |
| 40 |
gnome2_src_configure \ |
| 41 |
$(usex debug --enable-debug=yes "") \ |
| 42 |
$(use_with jpeg libjpeg) \ |
| 43 |
- $(use_with jpeg2k libjasper) \ |
| 44 |
+ --without-libjasper \ |
| 45 |
$(use_with tiff libtiff) \ |
| 46 |
$(multilib_native_use_enable introspection) \ |
| 47 |
$(use_with X x11) \ |
| 48 |
|
| 49 |
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild |
| 50 |
index feca458cf8d..8a883eb57ee 100644 |
| 51 |
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild |
| 52 |
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild |
| 53 |
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" |
| 54 |
LICENSE="LGPL-2+" |
| 55 |
SLOT="2" |
| 56 |
KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 57 |
-IUSE="X gtk-doc +introspection jpeg jpeg2k tiff" |
| 58 |
+IUSE="X gtk-doc +introspection jpeg tiff" |
| 59 |
|
| 60 |
# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review |
| 61 |
COMMON_DEPEND=" |
| 62 |
@@ -20,7 +20,6 @@ COMMON_DEPEND=" |
| 63 |
>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] |
| 64 |
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
| 65 |
tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) |
| 66 |
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) |
| 67 |
X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) |
| 68 |
introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
| 69 |
" |
| 70 |
@@ -64,9 +63,9 @@ src_prepare() { |
| 71 |
multilib_src_configure() { |
| 72 |
local emesonargs=( |
| 73 |
-Dpng=true |
| 74 |
+ -Djasper=false |
| 75 |
$(meson_use tiff) |
| 76 |
$(meson_use jpeg) |
| 77 |
- $(meson_use jpeg2k jasper) |
| 78 |
$(meson_use X x11) |
| 79 |
-Dbuiltin_loaders=png |
| 80 |
-Drelocatable=false |
Archives
