* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/files/, media-libs/gexiv2/
@ 2018-12-29 13:32 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-12-29 13:32 UTC (permalink / raw
To: gentoo-commits
commit: d8579cdf3ab340aeb8aecb4c3af8b411ce7799ed
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 12:50:28 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 13:31:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8579cdf
media-libs/gexiv2: Really fix build with exiv2-0.27
Bug: https://bugs.gentoo.org/673722
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch | 178 +++++++++++++++++++++
media-libs/gexiv2/gexiv2-0.10.9.ebuild | 2 +
2 files changed, 180 insertions(+)
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch b/media-libs/gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch
new file mode 100644
index 00000000000..ca68a8475a1
--- /dev/null
+++ b/media-libs/gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch
@@ -0,0 +1,178 @@
+From d8f96634e1df693eb0393cf82893a86dd2a92d2b Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Tue, 20 Nov 2018 12:43:21 +0100
+Subject: [PATCH] Replace single-file includes
+
+To improve compatibility with exiv2 0.27 as recommended in
+
+Fixes #34
+
+https://github.com/Exiv2/exiv2/issues/555#issuecomment-440023260
+---
+ gexiv2/gexiv2-metadata-exif.cpp | 2 +-
+ gexiv2/gexiv2-metadata-gps.cpp | 2 +-
+ gexiv2/gexiv2-metadata-iptc.cpp | 2 +-
+ gexiv2/gexiv2-metadata-private.h | 6 +-----
+ gexiv2/gexiv2-metadata-xmp.cpp | 2 +-
+ gexiv2/gexiv2-metadata.cpp | 9 ++-------
+ gexiv2/gexiv2-preview-image-private.h | 2 +-
+ gexiv2/gexiv2-preview-properties-private.h | 2 +-
+ gexiv2/gexiv2-startup.cpp | 2 +-
+ gexiv2/gexiv2-stream-io.cpp | 2 +-
+ gexiv2/gexiv2-stream-io.h | 2 +-
+ 11 files changed, 12 insertions(+), 21 deletions(-)
+
+diff --git a/gexiv2/gexiv2-metadata-exif.cpp b/gexiv2/gexiv2-metadata-exif.cpp
+index c87a460..f931b95 100644
+--- a/gexiv2/gexiv2-metadata-exif.cpp
++++ b/gexiv2/gexiv2-metadata-exif.cpp
+@@ -12,7 +12,7 @@
+ #include "gexiv2-metadata-private.h"
+ #include <string>
+ #include <glib-object.h>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+
+ G_BEGIN_DECLS
+
+diff --git a/gexiv2/gexiv2-metadata-gps.cpp b/gexiv2/gexiv2-metadata-gps.cpp
+index d49d97c..47592ec 100644
+--- a/gexiv2/gexiv2-metadata-gps.cpp
++++ b/gexiv2/gexiv2-metadata-gps.cpp
+@@ -15,7 +15,7 @@
+ #include <stdexcept>
+ #include <stdio.h>
+ #include <glib-object.h>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+
+ #include <limits>
+
+diff --git a/gexiv2/gexiv2-metadata-iptc.cpp b/gexiv2/gexiv2-metadata-iptc.cpp
+index 2371708..aeac1c7 100644
+--- a/gexiv2/gexiv2-metadata-iptc.cpp
++++ b/gexiv2/gexiv2-metadata-iptc.cpp
+@@ -12,7 +12,7 @@
+ #include "gexiv2-metadata-private.h"
+ #include <string>
+ #include <glib-object.h>
+-#include <exiv2/iptc.hpp>
++#include <exiv2/exiv2.hpp>
+
+ G_BEGIN_DECLS
+
+diff --git a/gexiv2/gexiv2-metadata-private.h b/gexiv2/gexiv2-metadata-private.h
+index d85453c..8818c22 100644
+--- a/gexiv2/gexiv2-metadata-private.h
++++ b/gexiv2/gexiv2-metadata-private.h
+@@ -11,11 +11,7 @@
+ #define GEXIV2_METADATA_PRIVATE_H
+
+ #include <gexiv2/gexiv2-metadata.h>
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
+-#include <exiv2/iptc.hpp>
+-#include <exiv2/xmp.hpp>
+-#include <exiv2/preview.hpp>
++#include <exiv2/exiv2.hpp>
+
+ G_BEGIN_DECLS
+
+diff --git a/gexiv2/gexiv2-metadata-xmp.cpp b/gexiv2/gexiv2-metadata-xmp.cpp
+index e4900f2..6f60cd0 100644
+--- a/gexiv2/gexiv2-metadata-xmp.cpp
++++ b/gexiv2/gexiv2-metadata-xmp.cpp
+@@ -12,7 +12,7 @@
+ #include "gexiv2-metadata-private.h"
+ #include <string>
+ #include <glib-object.h>
+-#include <exiv2/xmp.hpp>
++#include <exiv2/exiv2.hpp>
+
+ G_BEGIN_DECLS
+
+diff --git a/gexiv2/gexiv2-metadata.cpp b/gexiv2/gexiv2-metadata.cpp
+index 98ded9d..9c791ef 100644
+--- a/gexiv2/gexiv2-metadata.cpp
++++ b/gexiv2/gexiv2-metadata.cpp
+@@ -22,13 +22,8 @@
+ #include <cmath>
+ #include <glib-object.h>
+ #include <gio/gio.h>
+-#include <exiv2/image.hpp>
+-#include <exiv2/xmpsidecar.hpp>
+-#include <exiv2/exif.hpp>
+-#include <exiv2/iptc.hpp>
+-#include <exiv2/xmp.hpp>
+-#include <exiv2/preview.hpp>
+-#include <exiv2/jpgimage.hpp>
++
++#include <exiv2/exiv2.hpp>
+
+
+ G_BEGIN_DECLS
+diff --git a/gexiv2/gexiv2-preview-image-private.h b/gexiv2/gexiv2-preview-image-private.h
+index 810304c..b52a84f 100644
+--- a/gexiv2/gexiv2-preview-image-private.h
++++ b/gexiv2/gexiv2-preview-image-private.h
+@@ -11,7 +11,7 @@
+ #define GEXIV2_PREVIEW_IMAGE_PRIVATE_H
+
+ #include <gexiv2/gexiv2-preview-image.h>
+-#include <exiv2/preview.hpp>
++#include <exiv2/exiv2.hpp>
+
+ G_BEGIN_DECLS
+
+diff --git a/gexiv2/gexiv2-preview-properties-private.h b/gexiv2/gexiv2-preview-properties-private.h
+index bacb392..b057604 100644
+--- a/gexiv2/gexiv2-preview-properties-private.h
++++ b/gexiv2/gexiv2-preview-properties-private.h
+@@ -11,7 +11,7 @@
+ #define GEXIV2_PREVIEW_PROPERTIES_PRIVATE_H
+
+ #include <gexiv2/gexiv2-preview-properties.h>
+-#include <exiv2/preview.hpp>
++#include <exiv2/exiv2.hpp>
+
+ G_BEGIN_DECLS
+
+diff --git a/gexiv2/gexiv2-startup.cpp b/gexiv2/gexiv2-startup.cpp
+index 179b6c7..de438de 100644
+--- a/gexiv2/gexiv2-startup.cpp
++++ b/gexiv2/gexiv2-startup.cpp
+@@ -7,7 +7,7 @@
+ * This is free software. See COPYING for details.
+ */
+
+-#include <exiv2/xmp.hpp>
++#include <exiv2/exiv2.hpp>
+ #include "gexiv2-startup.h"
+ #include "gexiv2-version.h"
+
+diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp
+index b772b74..454305d 100644
+--- a/gexiv2/gexiv2-stream-io.cpp
++++ b/gexiv2/gexiv2-stream-io.cpp
+@@ -13,7 +13,7 @@
+ #include "gexiv2-stream-io.h"
+ #include "gexiv2-managed-stream.h"
+
+-#include <exiv2/basicio.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <gio/gio.h>
+ #include <glib.h>
+ #include <stdio.h>
+diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h
+index 430ac01..8d1fe76 100644
+--- a/gexiv2/gexiv2-stream-io.h
++++ b/gexiv2/gexiv2-stream-io.h
+@@ -16,7 +16,7 @@
+ #define GEXIV2_STREAM_IO_H
+
+ #include <gexiv2/gexiv2-managed-stream.h>
+-#include <exiv2/basicio.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <gio/gio.h>
+
+
diff --git a/media-libs/gexiv2/gexiv2-0.10.9.ebuild b/media-libs/gexiv2/gexiv2-0.10.9.ebuild
index 02c3359c1ca..eea5a85a5cc 100644
--- a/media-libs/gexiv2/gexiv2-0.10.9.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.9.ebuild
@@ -39,6 +39,8 @@ BDEPEND="
)
"
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
+
src_prepare() {
xdg_environment_reset
tc-export CXX
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/files/, media-libs/gexiv2/
@ 2019-01-03 14:40 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-01-03 14:40 UTC (permalink / raw
To: gentoo-commits
commit: 92d9ec58b92616dce6df9e08400671281a9cf8c7
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Tue Jan 1 16:33:26 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 3 14:39:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d9ec58
media-libs/gexiv2: version bump to 0.10.10
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Marty E. Plummer <hanetzer <AT> startmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10720
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/gexiv2/Manifest | 1 +
.../gexiv2/files/gexiv2-0.10.10-meson-fixup.patch | 29 ++++++++
media-libs/gexiv2/gexiv2-0.10.10.ebuild | 79 ++++++++++++++++++++++
media-libs/gexiv2/gexiv2-9999.ebuild | 73 ++++++++++++++++++++
4 files changed, 182 insertions(+)
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 01458e8b3ec..2fc80a510e8 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,2 +1,3 @@
+DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
DIST gexiv2-0.10.9.tar.xz 380348 BLAKE2B 6e1479f1a4ac74f622f71eb554c42a5170091d6b1b790962ef415eab4b2528dececa2f2f7147cc662fa00503ec66766294f7efd9401bae4771e72c56724398ec SHA512 40683ce341c5eb09ad67a4a25ad14a791247a5b5f459acba424815e98d5797b0a7fb338fb4d4f1c234147c9268abe34570698fd4259cb80f7f7af76af0f0fba3
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch
new file mode 100644
index 00000000000..03f0e4fd316
--- /dev/null
+++ b/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch
@@ -0,0 +1,29 @@
+--- a/meson.build
++++ b/meson.build
+@@ -9,12 +9,12 @@ gir = find_program('g-ir-scanner', requi
+ vapigen = find_program('vapigen', required: false)
+ vala = find_program('valac', required: false)
+
+-introspection_available = gir.found() and not get_option('disable-introspection')
+-vapi_available = introspection_available and vapigen.found() and not get_option('disable-vala')
++introspection_available = gir.found() and get_option('introspection')
++vapi_available = introspection_available and vapigen.found() and get_option('vapi')
+
+ subdir('gexiv2')
+
+-if get_option('enable-gtk-doc')
++if get_option('gtk_doc')
+ subdir('docs')
+ endif
+
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,5 +1,5 @@
+-option('enable-gtk-doc', type: 'boolean', value: false, description: 'Enable generating the API reference (depends on GTK-Doc)')
+-option('disable-introspection', type: 'boolean', value : false, description: 'Disable GObject Introspection')
+-option('disable-vala', type: 'boolean', value: false, description: 'Disable generation of vala vapi file')
++option('gtk_doc', type: 'boolean', value: false, description: 'Enable or disable generating the API reference (depends on GTK-Doc)')
++option('introspection', type: 'boolean', value : true, description: 'Enable or disable GObject Introspection')
++option('vapi', type: 'boolean', value: true, description: 'Enable or disable generation of vala vapi file')
+ option('python2-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject2 overrides (default = auto, no disables python2)')
+ option('python3-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3 overrides (default = auto, no disables python3)')
diff --git a/media-libs/gexiv2/gexiv2-0.10.10.ebuild b/media-libs/gexiv2/gexiv2-0.10.10.ebuild
new file mode 100644
index 00000000000..ad4135f9b2a
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.10.10.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit meson python-r1 vala xdg-utils
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="gtk-doc +introspection python static-libs test vala"
+
+REQUIRED_USE="
+ python? ( introspection ${PYTHON_REQUIRED_USE} )
+ test? ( python introspection )
+ vala? ( introspection )
+"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.38.0:2
+ >=media-gfx/exiv2-0.21:=
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+ test? (
+ dev-python/pygobject:3
+ media-gfx/exiv2[xmp]
+ )
+ vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+ # renames meson options to current git HEAD's names, current naming scheme
+ # is rather awkward
+ "${FILESDIR}"/${PN}-0.10.10-meson-fixup.patch
+)
+
+src_prepare() {
+ xdg_environment_reset
+ use vala && vala_src_prepare
+ default
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use introspection)
+ $(meson_use vala vapi)
+ $(meson_use gtk-doc gtk_doc)
+ # prevents installation of python modules (uses install_data from meson
+ # which does not optimize the modules
+ -Dpython2-girdir=no
+ -Dpython3-girdir=no
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if use python ; then
+ python_moduleinto gi/overrides/
+ python_foreach_impl python_domodule GExiv2.py
+ fi
+}
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
new file mode 100644
index 00000000000..2547c6a9ca9
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit meson python-r1 vala xdg-utils
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="gtk-doc +introspection python static-libs test vala"
+
+REQUIRED_USE="
+ python? ( introspection ${PYTHON_REQUIRED_USE} )
+ test? ( python introspection )
+ vala? ( introspection )
+"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.38.0:2
+ >=media-gfx/exiv2-0.21:=
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+ test? (
+ dev-python/pygobject:3
+ media-gfx/exiv2[xmp]
+ )
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ xdg_environment_reset
+ use vala && vala_src_prepare
+ default
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use introspection)
+ $(meson_use vala vapi)
+ $(meson_use gtk-doc gtk_doc)
+ # prevents installation of python modules (uses install_data from meson
+ # which does not optimize the modules
+ -Dpython2-girdir=no
+ -Dpython3-girdir=no
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if use python ; then
+ python_moduleinto gi/overrides/
+ python_foreach_impl python_domodule GExiv2.py
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/files/, media-libs/gexiv2/
@ 2019-01-03 14:40 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-01-03 14:40 UTC (permalink / raw
To: gentoo-commits
commit: f2761fa07fc6c9e75a27da4ff9cd52551e7d7b1f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 3 10:38:22 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 3 14:40:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2761fa0
media-libs/gexiv2: Drop 0.10.9
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-libs/gexiv2/Manifest | 1 -
.../gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch | 178 ---------------------
media-libs/gexiv2/gexiv2-0.10.9.ebuild | 71 --------
3 files changed, 250 deletions(-)
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 2fc80a510e8..03b2c919d20 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,3 +1,2 @@
DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
-DIST gexiv2-0.10.9.tar.xz 380348 BLAKE2B 6e1479f1a4ac74f622f71eb554c42a5170091d6b1b790962ef415eab4b2528dececa2f2f7147cc662fa00503ec66766294f7efd9401bae4771e72c56724398ec SHA512 40683ce341c5eb09ad67a4a25ad14a791247a5b5f459acba424815e98d5797b0a7fb338fb4d4f1c234147c9268abe34570698fd4259cb80f7f7af76af0f0fba3
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch b/media-libs/gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch
deleted file mode 100644
index ca68a8475a1..00000000000
--- a/media-libs/gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From d8f96634e1df693eb0393cf82893a86dd2a92d2b Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Tue, 20 Nov 2018 12:43:21 +0100
-Subject: [PATCH] Replace single-file includes
-
-To improve compatibility with exiv2 0.27 as recommended in
-
-Fixes #34
-
-https://github.com/Exiv2/exiv2/issues/555#issuecomment-440023260
----
- gexiv2/gexiv2-metadata-exif.cpp | 2 +-
- gexiv2/gexiv2-metadata-gps.cpp | 2 +-
- gexiv2/gexiv2-metadata-iptc.cpp | 2 +-
- gexiv2/gexiv2-metadata-private.h | 6 +-----
- gexiv2/gexiv2-metadata-xmp.cpp | 2 +-
- gexiv2/gexiv2-metadata.cpp | 9 ++-------
- gexiv2/gexiv2-preview-image-private.h | 2 +-
- gexiv2/gexiv2-preview-properties-private.h | 2 +-
- gexiv2/gexiv2-startup.cpp | 2 +-
- gexiv2/gexiv2-stream-io.cpp | 2 +-
- gexiv2/gexiv2-stream-io.h | 2 +-
- 11 files changed, 12 insertions(+), 21 deletions(-)
-
-diff --git a/gexiv2/gexiv2-metadata-exif.cpp b/gexiv2/gexiv2-metadata-exif.cpp
-index c87a460..f931b95 100644
---- a/gexiv2/gexiv2-metadata-exif.cpp
-+++ b/gexiv2/gexiv2-metadata-exif.cpp
-@@ -12,7 +12,7 @@
- #include "gexiv2-metadata-private.h"
- #include <string>
- #include <glib-object.h>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
-
- G_BEGIN_DECLS
-
-diff --git a/gexiv2/gexiv2-metadata-gps.cpp b/gexiv2/gexiv2-metadata-gps.cpp
-index d49d97c..47592ec 100644
---- a/gexiv2/gexiv2-metadata-gps.cpp
-+++ b/gexiv2/gexiv2-metadata-gps.cpp
-@@ -15,7 +15,7 @@
- #include <stdexcept>
- #include <stdio.h>
- #include <glib-object.h>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
-
- #include <limits>
-
-diff --git a/gexiv2/gexiv2-metadata-iptc.cpp b/gexiv2/gexiv2-metadata-iptc.cpp
-index 2371708..aeac1c7 100644
---- a/gexiv2/gexiv2-metadata-iptc.cpp
-+++ b/gexiv2/gexiv2-metadata-iptc.cpp
-@@ -12,7 +12,7 @@
- #include "gexiv2-metadata-private.h"
- #include <string>
- #include <glib-object.h>
--#include <exiv2/iptc.hpp>
-+#include <exiv2/exiv2.hpp>
-
- G_BEGIN_DECLS
-
-diff --git a/gexiv2/gexiv2-metadata-private.h b/gexiv2/gexiv2-metadata-private.h
-index d85453c..8818c22 100644
---- a/gexiv2/gexiv2-metadata-private.h
-+++ b/gexiv2/gexiv2-metadata-private.h
-@@ -11,11 +11,7 @@
- #define GEXIV2_METADATA_PRIVATE_H
-
- #include <gexiv2/gexiv2-metadata.h>
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
--#include <exiv2/iptc.hpp>
--#include <exiv2/xmp.hpp>
--#include <exiv2/preview.hpp>
-+#include <exiv2/exiv2.hpp>
-
- G_BEGIN_DECLS
-
-diff --git a/gexiv2/gexiv2-metadata-xmp.cpp b/gexiv2/gexiv2-metadata-xmp.cpp
-index e4900f2..6f60cd0 100644
---- a/gexiv2/gexiv2-metadata-xmp.cpp
-+++ b/gexiv2/gexiv2-metadata-xmp.cpp
-@@ -12,7 +12,7 @@
- #include "gexiv2-metadata-private.h"
- #include <string>
- #include <glib-object.h>
--#include <exiv2/xmp.hpp>
-+#include <exiv2/exiv2.hpp>
-
- G_BEGIN_DECLS
-
-diff --git a/gexiv2/gexiv2-metadata.cpp b/gexiv2/gexiv2-metadata.cpp
-index 98ded9d..9c791ef 100644
---- a/gexiv2/gexiv2-metadata.cpp
-+++ b/gexiv2/gexiv2-metadata.cpp
-@@ -22,13 +22,8 @@
- #include <cmath>
- #include <glib-object.h>
- #include <gio/gio.h>
--#include <exiv2/image.hpp>
--#include <exiv2/xmpsidecar.hpp>
--#include <exiv2/exif.hpp>
--#include <exiv2/iptc.hpp>
--#include <exiv2/xmp.hpp>
--#include <exiv2/preview.hpp>
--#include <exiv2/jpgimage.hpp>
-+
-+#include <exiv2/exiv2.hpp>
-
-
- G_BEGIN_DECLS
-diff --git a/gexiv2/gexiv2-preview-image-private.h b/gexiv2/gexiv2-preview-image-private.h
-index 810304c..b52a84f 100644
---- a/gexiv2/gexiv2-preview-image-private.h
-+++ b/gexiv2/gexiv2-preview-image-private.h
-@@ -11,7 +11,7 @@
- #define GEXIV2_PREVIEW_IMAGE_PRIVATE_H
-
- #include <gexiv2/gexiv2-preview-image.h>
--#include <exiv2/preview.hpp>
-+#include <exiv2/exiv2.hpp>
-
- G_BEGIN_DECLS
-
-diff --git a/gexiv2/gexiv2-preview-properties-private.h b/gexiv2/gexiv2-preview-properties-private.h
-index bacb392..b057604 100644
---- a/gexiv2/gexiv2-preview-properties-private.h
-+++ b/gexiv2/gexiv2-preview-properties-private.h
-@@ -11,7 +11,7 @@
- #define GEXIV2_PREVIEW_PROPERTIES_PRIVATE_H
-
- #include <gexiv2/gexiv2-preview-properties.h>
--#include <exiv2/preview.hpp>
-+#include <exiv2/exiv2.hpp>
-
- G_BEGIN_DECLS
-
-diff --git a/gexiv2/gexiv2-startup.cpp b/gexiv2/gexiv2-startup.cpp
-index 179b6c7..de438de 100644
---- a/gexiv2/gexiv2-startup.cpp
-+++ b/gexiv2/gexiv2-startup.cpp
-@@ -7,7 +7,7 @@
- * This is free software. See COPYING for details.
- */
-
--#include <exiv2/xmp.hpp>
-+#include <exiv2/exiv2.hpp>
- #include "gexiv2-startup.h"
- #include "gexiv2-version.h"
-
-diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp
-index b772b74..454305d 100644
---- a/gexiv2/gexiv2-stream-io.cpp
-+++ b/gexiv2/gexiv2-stream-io.cpp
-@@ -13,7 +13,7 @@
- #include "gexiv2-stream-io.h"
- #include "gexiv2-managed-stream.h"
-
--#include <exiv2/basicio.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <gio/gio.h>
- #include <glib.h>
- #include <stdio.h>
-diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h
-index 430ac01..8d1fe76 100644
---- a/gexiv2/gexiv2-stream-io.h
-+++ b/gexiv2/gexiv2-stream-io.h
-@@ -16,7 +16,7 @@
- #define GEXIV2_STREAM_IO_H
-
- #include <gexiv2/gexiv2-managed-stream.h>
--#include <exiv2/basicio.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <gio/gio.h>
-
-
diff --git a/media-libs/gexiv2/gexiv2-0.10.9.ebuild b/media-libs/gexiv2/gexiv2-0.10.9.ebuild
deleted file mode 100644
index eea5a85a5cc..00000000000
--- a/media-libs/gexiv2/gexiv2-0.10.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-MY_PV=$(ver_cut 1-2)
-inherit autotools python-r1 toolchain-funcs vala xdg-utils
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="introspection python static-libs test vala"
-
-REQUIRED_USE="
- python? ( introspection ${PYTHON_REQUIRED_USE} )
- test? ( python introspection )
- vala? ( introspection )
-"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/glib:2
- media-gfx/exiv2:=
- introspection? ( dev-libs/gobject-introspection:= )
- vala? ( $(vala_depend) )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-libs/gobject-introspection-common
- virtual/pkgconfig
- test? (
- dev-python/pygobject
- media-gfx/exiv2[xmp]
- )
-"
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
-
-src_prepare() {
- xdg_environment_reset
- tc-export CXX
- use vala && vala_src_prepare
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable introspection) \
- $(use_enable static-libs static) \
- $(use_enable vala)
-}
-
-src_install() {
- emake DESTDIR="${D}" LIB="$(get_libdir)" install
- einstalldocs
-
- if use python ; then
- python_moduleinto gi/overrides/
- python_foreach_impl python_domodule GExiv2.py
- fi
-
- if ! use static-libs; then
- find "${D}" -name '*.la' -delete || die
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/files/, media-libs/gexiv2/
@ 2019-01-16 21:00 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-01-16 21:00 UTC (permalink / raw
To: gentoo-commits
commit: c6c1f1cbd103caf0cceaa21bb4af2e92b4f195b6
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Wed Jan 16 20:19:56 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 21:00:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c1f1cb
media-libs/gexiv2: fix vapi file generation and install
Bug: https://bugs.gentoo.org/675294
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Marty E. Plummer <hanetzer <AT> startmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10850
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../gexiv2/files/gexiv2-0.10.10-vala-fixup.patch | 49 ++++++++++++++++++++++
...iv2-0.10.10.ebuild => gexiv2-0.10.10-r1.ebuild} | 1 +
media-libs/gexiv2/gexiv2-9999.ebuild | 4 +-
3 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch
new file mode 100644
index 00000000000..daf72ef3a85
--- /dev/null
+++ b/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch
@@ -0,0 +1,49 @@
+From: "Marty E. Plummer" <hanetzer@startmail.com>
+Date: Sun, 13 Jan 2019 13:33:32 -0600
+Subject: [PATCH] meson.build: improve handling of vapi
+
+As it currently stands the vapi files are not generatable on linux
+distros which do not provide unversioned valac/vapigen. Use instead
+meson's add_languages function to handle detection of existing vala
+toolchain, which will check the VALAC and VAPIGEN env vars.
+
+Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
+
+--- a/meson.build
++++ b/meson.build
+@@ -6,11 +6,9 @@ exiv2 = dependency('exiv2', version : '>
+ gobject = dependency('gobject-2.0', version : '>= 2.38.0')
+
+ gir = find_program('g-ir-scanner', required: false)
+-vapigen = find_program('vapigen', required: false)
+-vala = find_program('valac', required: false)
+
+ introspection_available = gir.found() and get_option('introspection')
+-vapi_available = introspection_available and vapigen.found() and get_option('vapi')
++vapi_available = introspection_available and add_languages('vala', required: false) and get_option('vapi')
+
+ subdir('gexiv2')
+
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -17,15 +17,11 @@ regression_test = executable('gexiv2-reg
+ test('regression', regression_test, env : test_env)
+
+ if vapi_available
+- valac = find_program('valac')
+- if valac.found()
+- add_languages('vala')
+- executable('gexiv2-dump',
+- 'gexiv2-dump.vala',
+- include_directories : include_directories('..'),
+- dependencies : [gobject, vapi],
+- link_with : gexiv2)
+- endif
++ executable('gexiv2-dump',
++ 'gexiv2-dump.vala',
++ include_directories : include_directories('..'),
++ dependencies : [gobject, vapi],
++ link_with : gexiv2)
+ endif
+
+ if python2_available
diff --git a/media-libs/gexiv2/gexiv2-0.10.10.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
similarity index 97%
rename from media-libs/gexiv2/gexiv2-0.10.10.ebuild
rename to media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index ad4135f9b2a..d0fea160c64 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
# renames meson options to current git HEAD's names, current naming scheme
# is rather awkward
"${FILESDIR}"/${PN}-0.10.10-meson-fixup.patch
+ "${FILESDIR}"/${PN}-0.10.10-vala-fixup.patch
)
src_prepare() {
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
index 2547c6a9ca9..1c6c54fc4d1 100644
--- a/media-libs/gexiv2/gexiv2-9999.ebuild
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -57,8 +57,8 @@ src_configure() {
$(meson_use gtk-doc gtk_doc)
# prevents installation of python modules (uses install_data from meson
# which does not optimize the modules
- -Dpython2-girdir=no
- -Dpython3-girdir=no
+ -Dpython2_girdir=no
+ -Dpython3_girdir=no
)
meson_src_configure
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/files/, media-libs/gexiv2/
@ 2020-11-07 15:23 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2020-11-07 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 1a0f9aa095600fd54cd4595470732c314b0bd7ec
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 7 14:52:04 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 15:21:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0f9aa0
media-libs/gexiv2: remove old
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-libs/gexiv2/Manifest | 2 -
.../gexiv2/files/gexiv2-0.10.10-meson-fixup.patch | 29 --------
.../gexiv2/files/gexiv2-0.10.10-vala-fixup.patch | 49 -------------
media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild | 81 ----------------------
media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild | 74 --------------------
media-libs/gexiv2/gexiv2-0.12.0.ebuild | 73 -------------------
6 files changed, 308 deletions(-)
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 9b4983dc4f6..81c2d8bcc74 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,3 +1 @@
-DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
-DIST gexiv2-0.12.0.tar.xz 370816 BLAKE2B 7768cffafedf41948ca6ddd22614f0eb3b44a317a23ade3c8d39d5ec5ff77c0d8c61dd8dcca5108b3403e0e3ec8be6659c16445de27163e8689c6c40f5313566 SHA512 c89e7d307359c718dff1f3991acb4ece66bce985a3d8bee1c8fccf4ce39187af62684c87eaae9b0425a6fdbf147b7330902041d9588e52a4bad1da4255d245e9
DIST gexiv2-0.12.1.tar.xz 372104 BLAKE2B e712bc8056e0e02d66ee831425776c26b65275db8f4cb4a526dbe9f00bddc473312f6c4c8e011906ca02ff256c00c7fe8d602acd64c787b05e13ad582ff8ebee SHA512 cbf83ea79eead9aab15ba760217fd6a1b55a5c60059f14f243327ad7d3c09d6a0528dbdb33a8ee235c76dac5aab0afa8b7d2ab4367fe9128a096dce5da19a68d
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch
deleted file mode 100644
index 03f0e4fd316..00000000000
--- a/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -9,12 +9,12 @@ gir = find_program('g-ir-scanner', requi
- vapigen = find_program('vapigen', required: false)
- vala = find_program('valac', required: false)
-
--introspection_available = gir.found() and not get_option('disable-introspection')
--vapi_available = introspection_available and vapigen.found() and not get_option('disable-vala')
-+introspection_available = gir.found() and get_option('introspection')
-+vapi_available = introspection_available and vapigen.found() and get_option('vapi')
-
- subdir('gexiv2')
-
--if get_option('enable-gtk-doc')
-+if get_option('gtk_doc')
- subdir('docs')
- endif
-
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,5 +1,5 @@
--option('enable-gtk-doc', type: 'boolean', value: false, description: 'Enable generating the API reference (depends on GTK-Doc)')
--option('disable-introspection', type: 'boolean', value : false, description: 'Disable GObject Introspection')
--option('disable-vala', type: 'boolean', value: false, description: 'Disable generation of vala vapi file')
-+option('gtk_doc', type: 'boolean', value: false, description: 'Enable or disable generating the API reference (depends on GTK-Doc)')
-+option('introspection', type: 'boolean', value : true, description: 'Enable or disable GObject Introspection')
-+option('vapi', type: 'boolean', value: true, description: 'Enable or disable generation of vala vapi file')
- option('python2-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject2 overrides (default = auto, no disables python2)')
- option('python3-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3 overrides (default = auto, no disables python3)')
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch
deleted file mode 100644
index daf72ef3a85..00000000000
--- a/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: "Marty E. Plummer" <hanetzer@startmail.com>
-Date: Sun, 13 Jan 2019 13:33:32 -0600
-Subject: [PATCH] meson.build: improve handling of vapi
-
-As it currently stands the vapi files are not generatable on linux
-distros which do not provide unversioned valac/vapigen. Use instead
-meson's add_languages function to handle detection of existing vala
-toolchain, which will check the VALAC and VAPIGEN env vars.
-
-Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
-
---- a/meson.build
-+++ b/meson.build
-@@ -6,11 +6,9 @@ exiv2 = dependency('exiv2', version : '>
- gobject = dependency('gobject-2.0', version : '>= 2.38.0')
-
- gir = find_program('g-ir-scanner', required: false)
--vapigen = find_program('vapigen', required: false)
--vala = find_program('valac', required: false)
-
- introspection_available = gir.found() and get_option('introspection')
--vapi_available = introspection_available and vapigen.found() and get_option('vapi')
-+vapi_available = introspection_available and add_languages('vala', required: false) and get_option('vapi')
-
- subdir('gexiv2')
-
---- a/test/meson.build
-+++ b/test/meson.build
-@@ -17,15 +17,11 @@ regression_test = executable('gexiv2-reg
- test('regression', regression_test, env : test_env)
-
- if vapi_available
-- valac = find_program('valac')
-- if valac.found()
-- add_languages('vala')
-- executable('gexiv2-dump',
-- 'gexiv2-dump.vala',
-- include_directories : include_directories('..'),
-- dependencies : [gobject, vapi],
-- link_with : gexiv2)
-- endif
-+ executable('gexiv2-dump',
-+ 'gexiv2-dump.vala',
-+ include_directories : include_directories('..'),
-+ dependencies : [gobject, vapi],
-+ link_with : gexiv2)
- endif
-
- if python2_available
diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
deleted file mode 100644
index 87a3618d7c7..00000000000
--- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit meson python-r1 vala xdg-utils
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
- inherit git-r3
-else
- SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="gtk-doc +introspection python static-libs test +vala"
-REQUIRED_USE="
- python? ( introspection ${PYTHON_REQUIRED_USE} )
- test? ( python introspection )
- vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.38.0:2
- >=media-gfx/exiv2-0.21:=
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- test? (
- dev-python/pygobject:3
- media-gfx/exiv2[xmp]
- )
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- # renames meson options to current git HEAD's names, current naming scheme
- # is rather awkward
- "${FILESDIR}"/${PN}-0.10.10-meson-fixup.patch
- "${FILESDIR}"/${PN}-0.10.10-vala-fixup.patch
-)
-
-src_prepare() {
- xdg_environment_reset
- use vala && vala_src_prepare
- default
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use introspection)
- $(meson_use vala vapi)
- $(meson_use gtk-doc gtk_doc)
- # prevents installation of python modules (uses install_data from meson
- # which does not optimize the modules
- -Dpython2-girdir=no
- -Dpython3-girdir=no
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if use python ; then
- python_moduleinto gi/overrides/
- python_foreach_impl python_domodule GExiv2.py
- fi
-}
diff --git a/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild b/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild
deleted file mode 100644
index 814a3757847..00000000000
--- a/media-libs/gexiv2/gexiv2-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit meson python-r1 vala
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
- inherit git-r3
-else
- SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-fi
-
-LICENSE="LGPL-2.1+ GPL-2"
-SLOT="0"
-IUSE="gtk-doc +introspection python static-libs test +vala"
-REQUIRED_USE="
- python? ( introspection ${PYTHON_REQUIRED_USE} )
- test? ( python introspection )
- vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=media-gfx/exiv2-0.26:=
- >=dev-libs/glib-2.38.0:2
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- python? ( ${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- gtk-doc? ( dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.3 )
- test? ( media-gfx/exiv2[xmp] )
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- default
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use gtk-doc gtk_doc)
- $(meson_use introspection)
- $(meson_use vala vapi)
- -Dtools=false # requires vala, freshly promoted tool that some other distros don't ship yet either
- # Prevents installation of python modules (uses install_data from meson
- # which does not optimize the modules)
- -Dpython2_girdir=no
- -Dpython3_girdir=no
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if use python ; then
- python_moduleinto gi/overrides/
- python_foreach_impl python_domodule GExiv2.py
- fi
-}
diff --git a/media-libs/gexiv2/gexiv2-0.12.0.ebuild b/media-libs/gexiv2/gexiv2-0.12.0.ebuild
deleted file mode 100644
index e496ad32ab1..00000000000
--- a/media-libs/gexiv2/gexiv2-0.12.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit meson python-r1 vala
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
- inherit git-r3
-else
- SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2.1+ GPL-2"
-SLOT="0"
-IUSE="gtk-doc +introspection python static-libs test +vala"
-REQUIRED_USE="
- python? ( introspection ${PYTHON_REQUIRED_USE} )
- test? ( python introspection )
- vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- test? (
- dev-python/pygobject:3
- media-gfx/exiv2[xmp]
- )
- vala? ( $(vala_depend) )
-"
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.38.0:2
- >=media-gfx/exiv2-0.21:=
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use introspection)
- $(meson_use vala vapi)
- $(meson_use gtk-doc gtk_doc)
- # Prevents installation of python modules (uses install_data from meson
- # which does not optimize the modules)
- -Dpython2_girdir=no
- -Dpython3_girdir=no
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if use python ; then
- python_moduleinto gi/overrides/
- python_foreach_impl python_domodule GExiv2.py
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/files/, media-libs/gexiv2/
@ 2023-06-27 3:40 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2023-06-27 3:40 UTC (permalink / raw
To: gentoo-commits
commit: a7dcbbef2915072d38f156095fe183ae17885add
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 03:35:11 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 03:39:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7dcbbef
media-libs/gexiv2: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/gexiv2/Manifest | 1 -
.../files/0.14.0-clean-up-python-support.patch | 175 ---------------------
media-libs/gexiv2/gexiv2-0.14.0.ebuild | 82 ----------
3 files changed, 258 deletions(-)
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index bc962176c1a2..db7ca2a350ba 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,2 +1 @@
-DIST gexiv2-0.14.0.tar.xz 387288 BLAKE2B bdbb4547486a248cd9c6559276ebac20d3af5211474b86eb6ebfb3a8c76670ff7c2d162435e0cbcb270f96c64f5bc1eedc2d63c021b65f57e1ad9ec8cf9a4bf8 SHA512 d745ae2d8ddcf0c8a2a7980eaa489f9b520af54242c5e4ddded9c3ae4a579c824c8cb659bd7e985ffa09f9fe37bdf73d6d9181d456711e0953b73023eb0f9f50
DIST gexiv2-0.14.1.tar.xz 387604 BLAKE2B 5939e377d8b20cfa0c000b1fb0311a0a904acb35b5cbb7841e9def80b20b79f42393524e761fa0d20dba5095b55b46a712759569eb869b832190f7448896de82 SHA512 f510e49c0b2633bcc370ca21af0822032f04f5d5b57c7f76807797601b0a98b7749fdf68df37a405c9d90734adf75282a3dad59c24830874f64f7bd33152052d
diff --git a/media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch b/media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch
deleted file mode 100644
index 0e2fbaa33fe8..000000000000
--- a/media-libs/gexiv2/files/0.14.0-clean-up-python-support.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-https://gitlab.gnome.org/GNOME/gexiv2/-/merge_requests/64
-
-From 7e36a7dfeadfff134beabf502ca4d551f505fd8e Mon Sep 17 00:00:00 2001
-From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
-Date: Fri, 24 Sep 2021 11:48:34 -0400
-Subject: [PATCH] clean up python support
-
-- fix always failing gexiv2 test due to missing import gi
-- actually use override during testing
-- fix totally ignoring gexiv2 test status
-- fix broken build with -Dpython3=false
-- remove unnecessary configure_file
-- remove misleading explanation of -Dpython3=false (it also disables
- installing GExiv2.py)
-- remove unnecessary python3_girdir
----
- meson.build | 21 +++++--------------
- meson_options.txt | 1 -
- test/meson.build | 13 +++---------
- test/python/{gexiv2.py.in => gexiv2.py} | 3 ++-
- test/python/meson.build | 10 ---------
- .../{test_metadata.py.in => test_metadata.py} | 4 ++--
- test/python3-test.in | 4 ----
- 7 files changed, 12 insertions(+), 44 deletions(-)
- rename test/python/{gexiv2.py.in => gexiv2.py} (94%)
- rename test/python/{test_metadata.py.in => test_metadata.py} (99%)
- delete mode 100755 test/python3-test.in
-
-diff --git a/meson.build b/meson.build
-index 42f70cb..3f9426f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -23,7 +23,6 @@ gio = dependency('gio-2.0', version : '>= 2.46.0')
- cc = meson.get_compiler('c')
- cpp = meson.get_compiler('cpp')
- math = cc.find_library('m', required : false)
--python3 = import('python').find_installation('python3', modules: 'gi', required: get_option('python3'))
-
- bmff_test = '''#include <exiv2/exiv2.hpp>
- #ifndef EXV_ENABLE_BMFF
-@@ -48,24 +47,14 @@ if get_option('gtk_doc')
- subdir('docs')
- endif
-
--if get_option('python3') == false
-- warning('\'python3\' is disabled, any Python tests will not be run.')
--else
-+if get_option('python3')
- if get_option('introspection') == false
- error('Build option \'python3\' requires \'introspection\' to be enabled.')
- endif
--
-- girdir = get_option('python3_girdir')
-- if girdir == 'auto'
-- python3_output = run_command(python3, ['-c', 'import gi; print(gi._overridesdir)'])
-- if python3_output.returncode() != 0
-- error('Finding the Python 3 gi/override path: ' + python3_output.stderr())
-- endif
-- girdir = python3_output.stdout().strip()
-- endif
--
-- message('Installing \'GExiv2.py\' into \'' + girdir + '\'')
-- python3.install_sources('GExiv2.py', subdir : girdir)
-+ python3 = import('python').find_installation('python3', modules: 'gi')
-+ python3.install_sources('GExiv2.py', subdir: 'gi/overrides')
-+else
-+ python3 = disabler()
- endif
-
- subdir('test')
-diff --git a/meson_options.txt b/meson_options.txt
-index 5e76789..edb3cfd 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -2,5 +2,4 @@ option('gtk_doc', type: 'boolean', value: false, description: 'Enable or disable
- option('introspection', type: 'boolean', value : true, description: 'Enable or disable GObject Introspection')
- option('vapi', type: 'boolean', value: true, description: 'Enable or disable generation of vala vapi file')
- option('tools', type: 'boolean', value: true, description: 'Enable or disable building the commandline tools')
--option('python3_girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3 overrides (default = auto)')
- option('python3', type: 'boolean', value : true, description : 'Enable or disable using Python 3 (and PyGObject module)')
-diff --git a/test/meson.build b/test/meson.build
-index c4f287d..0ae50ed 100644
---- a/test/meson.build
-+++ b/test/meson.build
-@@ -1,12 +1,11 @@
- test_sample_path = join_paths(meson.current_source_dir(), 'data')
--python_module_path = join_paths(meson.current_build_dir(), 'python')
-
- test_env = environment()
- test_env.set('G_SLICE', 'always-malloc')
- test_env.set('TEST_DATA_DIR', test_sample_path)
- test_env.prepend('GI_TYPELIB_PATH', typelib_path)
- test_env.prepend('LD_LIBRARY_PATH', typelib_path)
--test_env.prepend('PYTHONPATH', python_module_path)
-+test_env.prepend('PYTHONPATH', join_paths(meson.current_source_dir(), 'python'))
-
- regression_test = executable('gexiv2-regression', 'gexiv2-regression.c',
- dependencies : [gobject, gio, math],
-@@ -19,11 +18,5 @@ regression_test = executable('gexiv2-regression', 'gexiv2-regression.c',
-
- test('regression', regression_test, env : test_env)
-
--subdir('python')
--
--python3_test_conf = configuration_data()
--python3_test_conf.set('PYTHON3_PATH', python3.path())
--python3_test = configure_file(input: 'python3-test.in',
-- output : 'python3-test',
-- configuration: python3_test_conf)
--test('python3', find_program(python3_test), env : test_env)
-+test('python3-gexiv2', python3, args: ['-m', 'unittest', 'gexiv2'], env: test_env)
-+test('python3-metadata', python3, args: ['-m', 'unittest', 'test_metadata'], env: test_env)
-diff --git a/test/python/gexiv2.py.in b/test/python/gexiv2.py
-similarity index 94%
-rename from test/python/gexiv2.py.in
-rename to test/python/gexiv2.py
-index 4e01ff5..503815c 100644
---- a/test/python/gexiv2.py.in
-+++ b/test/python/gexiv2.py
-@@ -22,7 +22,8 @@
- import unittest
- import os
-
--gi.require_version('GExiv2', '@PROJECT_API_VERSION@')
-+import gi.overrides
-+gi.overrides.__path__.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
- from gi.repository import GExiv2
-
-
-diff --git a/test/python/meson.build b/test/python/meson.build
-index 783ba0b..e69de29 100644
---- a/test/python/meson.build
-+++ b/test/python/meson.build
-@@ -1,10 +0,0 @@
--python_conf = configuration_data()
--python_conf.set('PROJECT_API_VERSION', project_api_version)
--
--gexiv2_py_file = configure_file(input: 'gexiv2.py.in',
-- output : 'gexiv2.py',
-- configuration: python_conf)
--
--test_metadata_py_file = configure_file(input: 'test_metadata.py.in',
-- output : 'test_metadata.py',
-- configuration: python_conf)
-diff --git a/test/python/test_metadata.py.in b/test/python/test_metadata.py
-similarity index 99%
-rename from test/python/test_metadata.py.in
-rename to test/python/test_metadata.py
-index 45d9d45..8d4296c 100644
---- a/test/python/test_metadata.py.in
-+++ b/test/python/test_metadata.py
-@@ -30,8 +30,8 @@ import tempfile
-
- PY3K = sys.version_info[0] == 3
-
--import gi
--gi.require_version('GExiv2', '@PROJECT_API_VERSION@')
-+import gi.overrides
-+gi.overrides.__path__.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
- from gi.repository import GExiv2, GLib
- from fractions import Fraction
-
-diff --git a/test/python3-test.in b/test/python3-test.in
-deleted file mode 100755
-index 6fb3bf8..0000000
---- a/test/python3-test.in
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#!/bin/sh
--
--'@PYTHON3_PATH@' -m unittest gexiv2
--'@PYTHON3_PATH@' -m unittest test_metadata
---
-2.34.1
-
diff --git a/media-libs/gexiv2/gexiv2-0.14.0.ebuild b/media-libs/gexiv2/gexiv2-0.14.0.ebuild
deleted file mode 100644
index 7b22a47b0e67..000000000000
--- a/media-libs/gexiv2/gexiv2-0.14.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-r1 vala
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
- inherit git-r3
-else
- SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-fi
-
-LICENSE="LGPL-2.1+ GPL-2"
-SLOT="0"
-IUSE="gtk-doc +introspection python static-libs test +vala"
-REQUIRED_USE="
- python? ( introspection ${PYTHON_REQUIRED_USE} )
- test? ( python introspection )
- vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=media-gfx/exiv2-0.26:=
- >=dev-libs/glib-2.46.0:2
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- python? (
- ${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- gtk-doc? (
- dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.3
- )
- test? ( media-gfx/exiv2[xmp] )
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-clean-up-python-support.patch
-)
-
-src_prepare() {
- default
- use vala && vala_setup
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use gtk-doc gtk_doc)
- $(meson_use introspection)
- $(meson_use vala vapi)
- -Dtools=false # requires vala, freshly promoted tool that some other distros don't ship yet either
- # Prevents installation of python modules (uses install_data from meson
- # which does not optimize the modules)
- -Dpython3=false
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if use python ; then
- python_moduleinto gi/overrides/
- python_foreach_impl python_domodule GExiv2.py
- python_foreach_impl python_optimize
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-06-27 3:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-03 14:40 [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/files/, media-libs/gexiv2/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-06-27 3:40 Matt Turner
2020-11-07 15:23 Mart Raudsepp
2019-01-16 21:00 Andreas Sturmlechner
2019-01-03 14:40 Andreas Sturmlechner
2018-12-29 13:32 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox