diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2008-11-03 23:34:15 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2008-11-03 23:34:15 +0000 |
commit | b432cb40655f748ba700ca5ba54bee1adb6cddbb (patch) | |
tree | 2ab4b65032e26f894783ba19fef698e3607e20fa | |
parent | add gnome-settings-daemon & gnome-control-center to the GNOME 2.24 mask since... (diff) | |
download | historical-b432cb40655f748ba700ca5ba54bee1adb6cddbb.tar.gz historical-b432cb40655f748ba700ca5ba54bee1adb6cddbb.tar.bz2 historical-b432cb40655f748ba700ca5ba54bee1adb6cddbb.zip |
New version for GNOME 2.24. Update code to use xrandr 1.2 capabilities, modernize sound support (pulseaudio in place of esd), ...
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64
4 files changed, 150 insertions, 2 deletions
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog index c7cba1e052c4..18375800fd92 100644 --- a/gnome-base/gnome-settings-daemon/ChangeLog +++ b/gnome-base/gnome-settings-daemon/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-base/gnome-settings-daemon # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.13 2008/09/26 08:35:21 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.14 2008/11/03 23:34:15 eva Exp $ + +*gnome-settings-daemon-2.24.0 (04 Nov 2008) + + 04 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org> + +files/gnome-settings-daemon-2.24.0-automagic.patch, + +gnome-settings-daemon-2.24.0.ebuild: + New version for GNOME 2.24. Update code to use xrandr 1.2 capabilities, + modernize sound support (pulseaudio in place of esd), ... 26 Sep 2008; Mart Raudsepp <leio@gentoo.org> gnome-settings-daemon-2.22.2.1.ebuild: diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index b22b323de28e..45e89f102e65 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,4 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX gnome-settings-daemon-2.24.0-automagic.patch 1656 RMD160 895fe60a74854d14229fa81fb534dc2379b3de8c SHA1 dfbfdc227104cc4339e8ff4c5bc8d3208a18f09c SHA256 ebf248ccbe911200ff256df37345f07c2291caf165b16331e6916ccf24be003d DIST gnome-settings-daemon-2.22.2.1.tar.bz2 1139262 RMD160 c79d531226f8e58e0acd8f23177a62c8818b70d7 SHA1 0424486b6e53ab0d2dd676c375d02e35341b3a20 SHA256 72cb9aee096019a2925fb5b99a5e880d01f7d529d4c9e75dfbbea1b1f654d7a9 +DIST gnome-settings-daemon-2.24.0.tar.bz2 1119609 RMD160 da517b2a5841ba4044c7ee69f784894f622ec5f3 SHA1 7d95a7550c465c9a64e4bda64331c92069958bfd SHA256 98377ed6d7c4abb75b746570f07e00a4346ba6f5924574130211beca764bb99d EBUILD gnome-settings-daemon-2.22.2.1.ebuild 1401 RMD160 4d2aa55f3911a0d4f6e83f2d5584934cf8b8f289 SHA1 07785f5aa99e9eef5bf34482c2a2e97a05d4bdf1 SHA256 f854a4ce12141167737d9c968cf55a1a346c818658a387db85b742c229c41590 -MISC ChangeLog 2360 RMD160 58eda4ce8f103f24c2afcb594fa6e2be3ade36c6 SHA1 0555aac02c6202be19ba3f822f0f0c1c629c90e9 SHA256 7016ecc10309b745e4c9ae4e7d294110e7cfae4e03b5d512ff61827f9d77139a +EBUILD gnome-settings-daemon-2.24.0.ebuild 2234 RMD160 78aaae6f79b4acfcd72953bbf3d6d9006bfa31bc SHA1 419f52a81eefc37764b1d137f3c8a7aa4a6c09c8 SHA256 226ad1906259e36c1277d0b770e5ac006d3a40a5d17f7490597a02bf7bd6f656 +MISC ChangeLog 2688 RMD160 508d0b7f0964b6b768e4d3ccb68d6c1d395e6309 SHA1 7e456285587dd65d237a5c8358159af530899485 SHA256 1219f4f60227c88ac592f3f0a8ba420a137b932a6ebb56e13c1bac24b568ff3a MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkkPmJAACgkQ1fmVwcYIWAYXEgCgyXjyDudCF5g57mo0INWhajwG +htoAoJw7ROdN2GV4UHKAds7y7x5OOZHR +=ih8o +-----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.0-automagic.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.0-automagic.patch new file mode 100644 index 000000000000..e7645161af1a --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.0-automagic.patch @@ -0,0 +1,44 @@ +--- configure.ac 2008-10-09 00:03:09.000000000 +0200 ++++ configure.ac.new 2008-10-09 00:03:46.000000000 +0200 +@@ -87,9 +87,16 @@ + dnl - Check for libnotify + dnl --------------------------------------------------------------------------- + +-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION, +- [AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available]) +- have_libnotify=yes], [have_libnotify=no]) ++have_libnotify=no ++AC_ARG_ENABLE(libnotify, ++ AS_HELP_STRING([--disable-libnotify], [Enable nice notifications]), ++ , enable_libnotify=yes) ++ ++if test "x$enable_libnotify" = "xyes"; then ++ have_libnotify=yes ++ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION) ++ AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available]) ++fi + AC_SUBST(LIBNOTIFY_CFLAGS) + AC_SUBST(LIBNOTIFY_LIBS) + +@@ -339,9 +346,18 @@ + # --------------------------------------------------------------------------- + # Enable Legacy Sound Preference + # --------------------------------------------------------------------------- +-PKG_CHECK_MODULES(PULSEAUDIO, libpulse, have_pulseaudio=yes, have_pulseaudio=no) +-if test x$have_pulseaudio = xyes; then +- default_enable_legacy_sound_pref=no ++ ++AC_ARG_ENABLE(libpulse, ++ AS_HELP_STRING([--enable-libpulse], [Prefer pulseaudio over ESD])) ++ ++if test x$enable_pulse = yes; then ++ PKG_CHECK_MODULES(PULSEAUDIO, libpulse, have_pulseaudio=yes, have_pulseaudio=no) ++ ++ if test x$have_pulseaudio = xyes; then ++ default_enable_legacy_sound_pref=no ++ else ++ AC_MSG_ERROR([Pulseaudio support required but libpulse not found]) ++ fi + else + default_enable_legacy_sound_pref=yes + fi diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.0.ebuild new file mode 100644 index 000000000000..60afea9fdba2 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.0.ebuild @@ -0,0 +1,83 @@ +# Copyright 2008-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.0.ebuild,v 1.1 2008/11/03 23:34:15 eva Exp $ + +inherit autotools eutils gnome2 + +DESCRIPTION="Gnome Settings Daemon" +HOMEPAGE="http://www.gnome.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="alsa debug esd gstreamer libnotify pulseaudio" + +RDEPEND=">=dev-libs/dbus-glib-0.74 + >=dev-libs/glib-2.18.0 + >=x11-libs/gtk+-2.10 + >=gnome-base/gconf-2.6.1 + >=gnome-base/libgnomekbd-2.21.4 + + >=gnome-base/libglade-2 + >=gnome-base/libgnome-2 + >=gnome-base/libgnomeui-2 + >=gnome-base/gnome-desktop-2.23.90 + + libnotify? ( >=x11-libs/libnotify-0.4.3 ) + + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXext + x11-libs/libXxf86misc + >=x11-libs/libxklavier-3.3 + media-libs/fontconfig + + esd? ( >=media-sound/esound-0.2.28 ) + gstreamer? ( + >=media-libs/gstreamer-0.10.1.2 + >=media-libs/gst-plugins-base-0.10.1.2 ) + !gstreamer? ( + alsa? ( >=media-libs/alsa-lib-0.99 ) )" +# In configure: gstreamer wins over alsa + +DEPEND="${RDEPEND} + !<gnome-base/gnome-control-center-2.22 + sys-devel/gettext + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.19 + x11-proto/inputproto + x11-proto/xproto" + +# FIXME: pulseaudio is used to detect if system should build +# old sound preference capplet (some braindead logic in there) +PDEPEND="pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )" + +# README is empty +DOCS="AUTHORS NEWS ChangeLog MAINTAINERS" + +pkg_setup() { + G2CONF="${G2CONF} + $(use_enable alsa) + $(use_enable debug) + $(use_enable esd) + $(use_enable gstreamer) + $(use_enable libnotify) + $(use_enable !pulseaudio legacy-sound-pref)" + # We use legacy-sound-pref instead of pulse because + # there is no gain in adding a build time dep on pulseaudio + + if use esd && use pulseaudio; then + ewarn "You selected conflicting USE flags. Please note that USE=\"esd\"" + ewarn "has no effect when USE=\"pulseaudio\" is selected." + fi +} + +src_unpack() { + gnome2_src_unpack + + # Fix libnotify & pulseaudio automagic dependencies + epatch "${FILESDIR}/${P}-automagic.patch" + + eautoreconf +} |