* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-contacts/, gnome-extra/gnome-contacts/files/
@ 2012-08-18 10:40 Priit Laes
0 siblings, 0 replies; 2+ messages in thread
From: Priit Laes @ 2012-08-18 10:40 UTC (permalink / raw
To: gentoo-commits
commit: 3f47f7dbeedc0bec8cf1ae18b132c04bd67aab8d
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Aug 18 10:39:17 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Aug 18 10:39:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3f47f7db
gnome-extra/gnome-contacts: Add 3.5.4.1 to overlay
---
.../files/gnome-contacts-3.5.4.1-gst-flag.patch | 52 ++++++++++++++++++++
...s-9999.ebuild => gnome-contacts-3.5.4.1.ebuild} | 26 ++++++++--
.../gnome-contacts/gnome-contacts-9999.ebuild | 16 ++++--
3 files changed, 83 insertions(+), 11 deletions(-)
diff --git a/gnome-extra/gnome-contacts/files/gnome-contacts-3.5.4.1-gst-flag.patch b/gnome-extra/gnome-contacts/files/gnome-contacts-3.5.4.1-gst-flag.patch
new file mode 100644
index 0000000..ea69b83
--- /dev/null
+++ b/gnome-extra/gnome-contacts/files/gnome-contacts-3.5.4.1-gst-flag.patch
@@ -0,0 +1,52 @@
+From d67be14782eebfdc0685936071516de39ce4ce09 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Sat, 18 Aug 2012 13:25:07 +0300
+Subject: [PATCH] Add --{en,dis}able-gst flag to configure
+
+https://bugzilla.gnome.org/show_bug.cgi?id=682146
+---
+ configure.ac | 26 +++++++++++++++++++++++---
+ 1 files changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 445a30e..3520f61 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,11 +57,31 @@ gstreamers_modules="gdk-x11-3.0
+ cheese-gtk >= 3.3.5
+ cheese
+ "
+-PKG_CHECK_MODULES(CONTACTS_GSTREAMER,
++
++AC_MSG_CHECKING([whether to enable gstreamer/cheese support])
++AC_ARG_ENABLE([gst],
++ AS_HELP_STRING([--enable-gst], [Whether to enable gstreamer and cheese support @<:@default=auto@:>@]),
++ [], [enable_gst=auto])
++AC_MSG_RESULT([$enable_gst])
++if test "$enable_gst" != "no"; then
++ PKG_CHECK_MODULES(CONTACTS_GSTREAMER,
+ [$gstreamers_modules],
+- AM_CONDITIONAL(USE_GSTREAMER, true),
+- AM_CONDITIONAL(USE_GSTREAMER, false))
++ [have_gst=yes], [have_gst=no])
++ if test "$enable_gst" = "yes" -a "$have_gst" = "no"; then
++ AC_MSG_ERROR([GStreamer/Cheese support was requested but requirements were not met])
++ elif test "$have_gst" = "yes"; then
++ enable_gst=yes
++ else
++ enable_gst=no
++ fi
++fi
++
++if test "$enable_gst" = "yes"; then
++ AC_DEFINE([USE_GSTREAMER], 1,
++ [Define to enable gstreamer/cheese support])
++fi
+
++AM_CONDITIONAL(USE_GSTREAMER, test "$enable_gst" = "yes")
+ CONTACTS_GSTREAMER_PACKAGES="--pkg gdk-x11-3.0 --pkg gstreamer-0.10 --pkg gstreamer-interfaces-0.10"
+ AC_SUBST(CONTACTS_GSTREAMER_PACKAGES)
+
+--
+1.7.8.6
+
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.5.4.1.ebuild
similarity index 64%
copy from gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
copy to gnome-extra/gnome-contacts/gnome-contacts-3.5.4.1.ebuild
index 08e43a6..5653f11 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.5.4.1.ebuild
@@ -5,7 +5,7 @@
EAPI="4"
GCONF_DEBUG="no"
-inherit gnome2
+inherit autotools eutils gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,20 +15,25 @@ HOMEPAGE="https://live.gnome.org/Design/Apps/Contacts"
LICENSE="GPL-2"
SLOT="0"
-IUSE=""
+IUSE="gstreamer"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~x86"
fi
-RDEPEND=">=dev-libs/folks-0.6.1.1[eds]
+RDEPEND=">=dev-libs/folks-0.7.2[eds]
>=dev-libs/glib-2.31.10:2
>=x11-libs/gtk+-3.4:3
- >=gnome-extra/evolution-data-server-3.2[gnome-online-accounts]
+ >=gnome-extra/evolution-data-server-3.5.3[gnome-online-accounts]
>=gnome-base/gnome-desktop-3.0:3
>=net-libs/telepathy-glib-0.17.5
+ gstreamer? ( media-libs/gstreamer
+ media-libs/gst-plugins-base
+ >=media-video/cheese-3.3.5
+ )
+
dev-libs/libgee:0
net-libs/gnome-online-accounts
x11-libs/cairo
@@ -40,12 +45,21 @@ DEPEND="${RDEPEND}
>=sys-devel/gettext-0.17
virtual/pkgconfig"
# Regenerating C from vala sources requires:
-# >=dev-lang/vala-0.14.0:0.14
+# >=dev-lang/vala-0.17.2:0.18
# net-libs/telepathy-glib[vala]
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS" # README is empty
# We do not need valac when building from pre-generated C sources,
# but configure checks for it anyway
- G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
+ G2CONF="${G2CONF} VALAC=$(type -P valac-0.18)
+ $(use_enable gstreamer gst)"
+}
+
+src_prepare() {
+ gnome2_src_prepare
+ # Automagic gstreamer
+ # https://bugzilla.gnome.org/show_bug.cgi?id=682146
+ epatch "${FILESDIR}/${P}-gst-flag.patch"
+ eautoreconf
}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
index 08e43a6..2ed69b1 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
@@ -15,20 +15,25 @@ HOMEPAGE="https://live.gnome.org/Design/Apps/Contacts"
LICENSE="GPL-2"
SLOT="0"
-IUSE=""
+IUSE="gstreamer"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~x86"
fi
-RDEPEND=">=dev-libs/folks-0.6.1.1[eds]
+RDEPEND=">=dev-libs/folks-0.7.2[eds]
>=dev-libs/glib-2.31.10:2
>=x11-libs/gtk+-3.4:3
- >=gnome-extra/evolution-data-server-3.2[gnome-online-accounts]
+ >=gnome-extra/evolution-data-server-3.5.3[gnome-online-accounts]
>=gnome-base/gnome-desktop-3.0:3
>=net-libs/telepathy-glib-0.17.5
+ gstreamer? ( media-libs/gstreamer
+ media-libs/gst-plugins-base
+ >=media-video/cheese-3.3.5
+ )
+
dev-libs/libgee:0
net-libs/gnome-online-accounts
x11-libs/cairo
@@ -40,12 +45,13 @@ DEPEND="${RDEPEND}
>=sys-devel/gettext-0.17
virtual/pkgconfig"
# Regenerating C from vala sources requires:
-# >=dev-lang/vala-0.14.0:0.14
+# >=dev-lang/vala-0.17.2:0.18
# net-libs/telepathy-glib[vala]
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS" # README is empty
# We do not need valac when building from pre-generated C sources,
# but configure checks for it anyway
- G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
+ G2CONF="${G2CONF} VALAC=$(type -P valac-0.18)
+ $(use_enable gstreamer gst)"
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-contacts/, gnome-extra/gnome-contacts/files/
@ 2012-09-09 12:43 Nirbheek Chauhan
0 siblings, 0 replies; 2+ messages in thread
From: Nirbheek Chauhan @ 2012-09-09 12:43 UTC (permalink / raw
To: gentoo-commits
commit: acca29502fb4123b71a50e1e2fe50de266969481
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 9 06:04:52 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Sep 9 12:11:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=acca2950
gnome-extra/gnome-contacts: 3.5.4.1 → 3.5.91
---
.../files/gnome-contacts-3.5.4.1-gst-flag.patch | 52 --------------------
...3.5.4.1.ebuild => gnome-contacts-3.5.91.ebuild} | 36 ++++++-------
.../gnome-contacts/gnome-contacts-9999.ebuild | 29 ++++++-----
3 files changed, 34 insertions(+), 83 deletions(-)
diff --git a/gnome-extra/gnome-contacts/files/gnome-contacts-3.5.4.1-gst-flag.patch b/gnome-extra/gnome-contacts/files/gnome-contacts-3.5.4.1-gst-flag.patch
deleted file mode 100644
index ea69b83..0000000
--- a/gnome-extra/gnome-contacts/files/gnome-contacts-3.5.4.1-gst-flag.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From d67be14782eebfdc0685936071516de39ce4ce09 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Sat, 18 Aug 2012 13:25:07 +0300
-Subject: [PATCH] Add --{en,dis}able-gst flag to configure
-
-https://bugzilla.gnome.org/show_bug.cgi?id=682146
----
- configure.ac | 26 +++++++++++++++++++++++---
- 1 files changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 445a30e..3520f61 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -57,11 +57,31 @@ gstreamers_modules="gdk-x11-3.0
- cheese-gtk >= 3.3.5
- cheese
- "
--PKG_CHECK_MODULES(CONTACTS_GSTREAMER,
-+
-+AC_MSG_CHECKING([whether to enable gstreamer/cheese support])
-+AC_ARG_ENABLE([gst],
-+ AS_HELP_STRING([--enable-gst], [Whether to enable gstreamer and cheese support @<:@default=auto@:>@]),
-+ [], [enable_gst=auto])
-+AC_MSG_RESULT([$enable_gst])
-+if test "$enable_gst" != "no"; then
-+ PKG_CHECK_MODULES(CONTACTS_GSTREAMER,
- [$gstreamers_modules],
-- AM_CONDITIONAL(USE_GSTREAMER, true),
-- AM_CONDITIONAL(USE_GSTREAMER, false))
-+ [have_gst=yes], [have_gst=no])
-+ if test "$enable_gst" = "yes" -a "$have_gst" = "no"; then
-+ AC_MSG_ERROR([GStreamer/Cheese support was requested but requirements were not met])
-+ elif test "$have_gst" = "yes"; then
-+ enable_gst=yes
-+ else
-+ enable_gst=no
-+ fi
-+fi
-+
-+if test "$enable_gst" = "yes"; then
-+ AC_DEFINE([USE_GSTREAMER], 1,
-+ [Define to enable gstreamer/cheese support])
-+fi
-
-+AM_CONDITIONAL(USE_GSTREAMER, test "$enable_gst" = "yes")
- CONTACTS_GSTREAMER_PACKAGES="--pkg gdk-x11-3.0 --pkg gstreamer-0.10 --pkg gstreamer-interfaces-0.10"
- AC_SUBST(CONTACTS_GSTREAMER_PACKAGES)
-
---
-1.7.8.6
-
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.5.4.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild
similarity index 66%
rename from gnome-extra/gnome-contacts/gnome-contacts-3.5.4.1.ebuild
rename to gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild
index 5653f11..6f7c8de 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.5.4.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild
@@ -15,24 +15,25 @@ HOMEPAGE="https://live.gnome.org/Design/Apps/Contacts"
LICENSE="GPL-2"
SLOT="0"
-IUSE="gstreamer"
+IUSE="v4l"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~x86"
fi
-RDEPEND=">=dev-libs/folks-0.7.2[eds]
+RDEPEND="
>=dev-libs/glib-2.31.10:2
>=x11-libs/gtk+-3.4:3
>=gnome-extra/evolution-data-server-3.5.3[gnome-online-accounts]
>=gnome-base/gnome-desktop-3.0:3
>=net-libs/telepathy-glib-0.17.5
+ >=dev-libs/folks-0.7.2[eds]
- gstreamer? ( media-libs/gstreamer
- media-libs/gst-plugins-base
- >=media-video/cheese-3.3.5
- )
+ v4l? (
+ media-libs/gstreamer
+ media-libs/gst-plugins-base
+ >=media-video/cheese-3.3.5 )
dev-libs/libgee:0
net-libs/gnome-online-accounts
@@ -44,22 +45,19 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.40
>=sys-devel/gettext-0.17
virtual/pkgconfig"
-# Regenerating C from vala sources requires:
-# >=dev-lang/vala-0.17.2:0.18
-# net-libs/telepathy-glib[vala]
+
+if [[ ${PV} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ >=dev-lang/vala-0.17.2:0.18
+ net-libs/telepathy-glib[vala]"
+fi
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS" # README is empty
# We do not need valac when building from pre-generated C sources,
# but configure checks for it anyway
- G2CONF="${G2CONF} VALAC=$(type -P valac-0.18)
- $(use_enable gstreamer gst)"
-}
-
-src_prepare() {
- gnome2_src_prepare
- # Automagic gstreamer
- # https://bugzilla.gnome.org/show_bug.cgi?id=682146
- epatch "${FILESDIR}/${P}-gst-flag.patch"
- eautoreconf
+ G2CONF="${G2CONF}
+ VALAC=$(type -P valac-0.18)
+ $(use_with v4l cheese)"
+ # FIXME: Fails to compile with USE=-v4l
}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
index 2ed69b1..326f5c3 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
@@ -5,7 +5,7 @@
EAPI="4"
GCONF_DEBUG="no"
-inherit gnome2
+inherit autotools eutils gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,24 +15,25 @@ HOMEPAGE="https://live.gnome.org/Design/Apps/Contacts"
LICENSE="GPL-2"
SLOT="0"
-IUSE="gstreamer"
+IUSE="v4l"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~x86"
fi
-RDEPEND=">=dev-libs/folks-0.7.2[eds]
+RDEPEND="
>=dev-libs/glib-2.31.10:2
>=x11-libs/gtk+-3.4:3
>=gnome-extra/evolution-data-server-3.5.3[gnome-online-accounts]
>=gnome-base/gnome-desktop-3.0:3
>=net-libs/telepathy-glib-0.17.5
+ >=dev-libs/folks-0.7.2[eds]
- gstreamer? ( media-libs/gstreamer
- media-libs/gst-plugins-base
- >=media-video/cheese-3.3.5
- )
+ v4l? (
+ media-libs/gstreamer
+ media-libs/gst-plugins-base
+ >=media-video/cheese-3.3.5 )
dev-libs/libgee:0
net-libs/gnome-online-accounts
@@ -44,14 +45,18 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.40
>=sys-devel/gettext-0.17
virtual/pkgconfig"
-# Regenerating C from vala sources requires:
-# >=dev-lang/vala-0.17.2:0.18
-# net-libs/telepathy-glib[vala]
+
+if [[ ${PV} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ >=dev-lang/vala-0.17.2:0.18
+ net-libs/telepathy-glib[vala]"
+fi
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS" # README is empty
# We do not need valac when building from pre-generated C sources,
# but configure checks for it anyway
- G2CONF="${G2CONF} VALAC=$(type -P valac-0.18)
- $(use_enable gstreamer gst)"
+ G2CONF="${G2CONF}
+ VALAC=$(type -P valac-0.18)
+ $(use_with v4l cheese)"
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-09 12:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-18 10:40 [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-contacts/, gnome-extra/gnome-contacts/files/ Priit Laes
-- strict thread matches above, loose matches on Subject: below --
2012-09-09 12:43 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox