* [gentoo-commits] proj/gnome:master commit in: media-libs/libmediaart/, media-libs/libmediaart/files/
@ 2015-05-03 21:56 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-03 21:56 UTC (permalink / raw
To: gentoo-commits
commit: a8b841a89a623430920b471d065d3437a3e10997
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 3 21:35:37 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 3 21:54:49 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a8b841a8
media-libs/libmediaart: 0.7.0 → 1.9.0
.../libmediaart/files/libmediaart-0.7.0-qt5.patch | 47 +++++++++++++
media-libs/libmediaart/libmediaart-0.4.0.ebuild | 60 ----------------
media-libs/libmediaart/libmediaart-1.9.0.ebuild | 81 ++++++++++++++++++++++
3 files changed, 128 insertions(+), 60 deletions(-)
diff --git a/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch b/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch
new file mode 100644
index 0000000..ecf9de9
--- /dev/null
+++ b/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch
@@ -0,0 +1,47 @@
+Solves automagic selection of Qt version.
+
+https://bugs.gentoo.org/show_bug.cgi?id=523122
+https://bugzilla.gnome.org/show_bug.cgi?id=737174
+
+diff --git a/configure.ac b/configure.ac
+index e9ead09..3ee710a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -206,6 +206,10 @@ AC_ARG_ENABLE(qt,
+ AS_HELP_STRING([--enable-qt],
+ [enable Qt support, (MP3 album art) [[default=auto]]]),,
+ [enable_qt=auto])
++AC_ARG_WITH(qt-version,
++ AS_HELP_STRING([--with-qt-version=major],
++ [Force specific Qt version [[default=auto]]]),,
++ [with_qt_version=auto])
+
+ selected_for_media_art="no (disabled)"
+
+@@ -218,14 +222,18 @@ if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then
+ fi
+
+ if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
+- PKG_CHECK_MODULES(QT5,
+- [Qt5Gui >= $QT5_REQUIRED],
+- [have_qt5=yes],
+- [have_qt5=no])
+- PKG_CHECK_MODULES(QT4,
+- [QtGui >= $QT4_REQUIRED],
+- [have_qt4=yes],
+- [have_qt4=no])
++ if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x5"; then
++ PKG_CHECK_MODULES(QT5,
++ [Qt5Gui >= $QT5_REQUIRED],
++ [have_qt5=yes],
++ [have_qt5=no])
++ fi
++ if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x4"; then
++ PKG_CHECK_MODULES(QT4,
++ [QtGui >= $QT4_REQUIRED],
++ [have_qt4=yes],
++ [have_qt4=no])
++ fi
+
+ if test "x$have_qt5" = "xyes"; then
+ BACKEND_CFLAGS="$QT5_CFLAGS -fPIC"
diff --git a/media-libs/libmediaart/libmediaart-0.4.0.ebuild b/media-libs/libmediaart/libmediaart-0.4.0.ebuild
deleted file mode 100644
index 6fd519f..0000000
--- a/media-libs/libmediaart/libmediaart-0.4.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.16"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Manages, extracts and handles media art caches"
-HOMEPAGE="https://github.com/curlybeast/libmediaart"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk +introspection qt4 qt5 vala"
-REQUIRED_USE="
- ?? ( gtk qt4 qt5 )
- vala? ( introspection )
-"
-
-RDEPEND="
- >=dev-libs/glib-2.35.1:2
- gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 )
- introspection? ( >=dev-libs/gobject-introspection-1.30 )
- qt4? ( dev-qt/qtgui:4 )
- qt5? ( dev-qt/qtgui:5 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.8
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf=""
- if use qt4 -o use qt5 ; then
- myconf="${myconf} --enable-qt"
- else
- myconf="${myconf} --disable-qt"
- fi
-
- gnome2_src_configure \
- --enable-unit-tests \
- $(use_enable gtk gdkpixbuf) \
- $(use_enable introspection) \
- $(use_enable vala) \
- ${myconf}
-}
-
-src_test() {
- Xemake check
-}
diff --git a/media-libs/libmediaart/libmediaart-1.9.0.ebuild b/media-libs/libmediaart/libmediaart-1.9.0.ebuild
new file mode 100644
index 0000000..ca0fee9
--- /dev/null
+++ b/media-libs/libmediaart/libmediaart-1.9.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.16"
+
+inherit autotools eutils gnome2 vala virtualx
+
+DESCRIPTION="Manages, extracts and handles media art caches"
+HOMEPAGE="https://github.com/GNOME/libmediaart"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk +introspection qt4 qt5 vala"
+REQUIRED_USE="
+ ?? ( gtk qt4 qt5 )
+ vala? ( introspection )
+"
+
+RDEPEND="
+ >=dev-libs/glib-2.38.0:2
+ gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 )
+ introspection? ( >=dev-libs/gobject-introspection-1.30 )
+ qt4? ( dev-qt/qtgui:4 )
+ qt5? ( dev-qt/qtgui:5 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.8
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ # Fix QT automagic selection, bug #523122
+ epatch "${FILESDIR}"/${PN}-0.7.0-qt5.patch
+
+ # Make doc parallel installable
+ cd "${S}"/docs/reference/${PN}
+ sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
+ -e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
+ -i Makefile.am Makefile.in || die
+ sed -e "s/\(<book.*name=\"\)libmediaart/\1${PN}-${SLOT}/" \
+ -i html/libmediaart.devhelp2 || die
+ mv libmediaart-docs{,-${SLOT}}.sgml || die
+ mv libmediaart-overrides{,-${SLOT}}.txt || die
+ mv libmediaart-sections{,-${SLOT}}.txt || die
+ #mv libmediaart{,-${SLOT}}.types || die
+ mv html/libmediaart{,-${SLOT}}.devhelp2
+ cd "${S}"
+
+ eautoreconf
+
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf=""
+ if use qt4 ; then
+ myconf="${myconf} --enable-qt --with-qt-version=4"
+ elif use qt5 ; then
+ myconf="${myconf} --enable-qt --with-qt-version=5"
+ else
+ myconf="${myconf} --disable-qt"
+ fi
+
+ gnome2_src_configure \
+ --enable-unit-tests \
+ $(use_enable gtk gdkpixbuf) \
+ $(use_enable introspection) \
+ $(use_enable vala) \
+ ${myconf}
+}
+
+src_test() {
+ dbus-launch Xemake check #513502
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/libmediaart/, media-libs/libmediaart/files/
@ 2015-05-14 22:50 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-14 22:50 UTC (permalink / raw
To: gentoo-commits
commit: d5910a2a3b3441ccb4dabd61959957330e1a8dc3
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 22:49:56 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu May 14 22:49:56 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d5910a2a
media-libs/libmediaart: moved to gentoo-x86
.../libmediaart/files/libmediaart-0.7.0-qt5.patch | 47 -------------
media-libs/libmediaart/libmediaart-1.9.0.ebuild | 81 ----------------------
media-libs/libmediaart/metadata.xml | 5 --
3 files changed, 133 deletions(-)
diff --git a/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch b/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch
deleted file mode 100644
index ecf9de9..0000000
--- a/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Solves automagic selection of Qt version.
-
-https://bugs.gentoo.org/show_bug.cgi?id=523122
-https://bugzilla.gnome.org/show_bug.cgi?id=737174
-
-diff --git a/configure.ac b/configure.ac
-index e9ead09..3ee710a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -206,6 +206,10 @@ AC_ARG_ENABLE(qt,
- AS_HELP_STRING([--enable-qt],
- [enable Qt support, (MP3 album art) [[default=auto]]]),,
- [enable_qt=auto])
-+AC_ARG_WITH(qt-version,
-+ AS_HELP_STRING([--with-qt-version=major],
-+ [Force specific Qt version [[default=auto]]]),,
-+ [with_qt_version=auto])
-
- selected_for_media_art="no (disabled)"
-
-@@ -218,14 +222,18 @@ if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then
- fi
-
- if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
-- PKG_CHECK_MODULES(QT5,
-- [Qt5Gui >= $QT5_REQUIRED],
-- [have_qt5=yes],
-- [have_qt5=no])
-- PKG_CHECK_MODULES(QT4,
-- [QtGui >= $QT4_REQUIRED],
-- [have_qt4=yes],
-- [have_qt4=no])
-+ if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x5"; then
-+ PKG_CHECK_MODULES(QT5,
-+ [Qt5Gui >= $QT5_REQUIRED],
-+ [have_qt5=yes],
-+ [have_qt5=no])
-+ fi
-+ if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x4"; then
-+ PKG_CHECK_MODULES(QT4,
-+ [QtGui >= $QT4_REQUIRED],
-+ [have_qt4=yes],
-+ [have_qt4=no])
-+ fi
-
- if test "x$have_qt5" = "xyes"; then
- BACKEND_CFLAGS="$QT5_CFLAGS -fPIC"
diff --git a/media-libs/libmediaart/libmediaart-1.9.0.ebuild b/media-libs/libmediaart/libmediaart-1.9.0.ebuild
deleted file mode 100644
index ca0fee9..0000000
--- a/media-libs/libmediaart/libmediaart-1.9.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.16"
-
-inherit autotools eutils gnome2 vala virtualx
-
-DESCRIPTION="Manages, extracts and handles media art caches"
-HOMEPAGE="https://github.com/GNOME/libmediaart"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk +introspection qt4 qt5 vala"
-REQUIRED_USE="
- ?? ( gtk qt4 qt5 )
- vala? ( introspection )
-"
-
-RDEPEND="
- >=dev-libs/glib-2.38.0:2
- gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 )
- introspection? ( >=dev-libs/gobject-introspection-1.30 )
- qt4? ( dev-qt/qtgui:4 )
- qt5? ( dev-qt/qtgui:5 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.8
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- # Fix QT automagic selection, bug #523122
- epatch "${FILESDIR}"/${PN}-0.7.0-qt5.patch
-
- # Make doc parallel installable
- cd "${S}"/docs/reference/${PN}
- sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
- -e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
- -i Makefile.am Makefile.in || die
- sed -e "s/\(<book.*name=\"\)libmediaart/\1${PN}-${SLOT}/" \
- -i html/libmediaart.devhelp2 || die
- mv libmediaart-docs{,-${SLOT}}.sgml || die
- mv libmediaart-overrides{,-${SLOT}}.txt || die
- mv libmediaart-sections{,-${SLOT}}.txt || die
- #mv libmediaart{,-${SLOT}}.types || die
- mv html/libmediaart{,-${SLOT}}.devhelp2
- cd "${S}"
-
- eautoreconf
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf=""
- if use qt4 ; then
- myconf="${myconf} --enable-qt --with-qt-version=4"
- elif use qt5 ; then
- myconf="${myconf} --enable-qt --with-qt-version=5"
- else
- myconf="${myconf} --disable-qt"
- fi
-
- gnome2_src_configure \
- --enable-unit-tests \
- $(use_enable gtk gdkpixbuf) \
- $(use_enable introspection) \
- $(use_enable vala) \
- ${myconf}
-}
-
-src_test() {
- dbus-launch Xemake check #513502
-}
diff --git a/media-libs/libmediaart/metadata.xml b/media-libs/libmediaart/metadata.xml
deleted file mode 100644
index 6e0e2ec..0000000
--- a/media-libs/libmediaart/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>gnome</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-14 22:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-14 22:50 [gentoo-commits] proj/gnome:master commit in: media-libs/libmediaart/, media-libs/libmediaart/files/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2015-05-03 21:56 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox