diff options
| author |   Leonardo Boshell <leonardop@gentoo.org> | 2005-07-19 12:25:10 +0000 |
|---|---|---|
| committer | Leonardo Boshell <leonardop@gentoo.org> | 2005-07-19 12:25:10 +0000 |
| commit | c94291deb5215bc11fad1878f34a7138fda000cb (patch) | |
| tree | d882abef3b257d7472a980ce099a43dc42664afa /gnome-base/libgnome/files | |
| parent | remove old patch (diff) | |
| download | gentoo-2-c94291deb5215bc11fad1878f34a7138fda000cb.tar.gz gentoo-2-c94291deb5215bc11fad1878f34a7138fda000cb.tar.bz2 gentoo-2-c94291deb5215bc11fad1878f34a7138fda000cb.zip | |
New revision, adding support for the 'esd' USE flag (bug #6920)
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'gnome-base/libgnome/files')
| -rw-r--r-- | gnome-base/libgnome/files/digest-libgnome-2.10.1-r1 (renamed from gnome-base/libgnome/files/digest-libgnome-2.10.1) | 0 | ||||
| -rw-r--r-- | gnome-base/libgnome/files/libgnome-2.10.1-esd_switch.patch | 42 |
2 files changed, 42 insertions, 0 deletions
diff --git a/gnome-base/libgnome/files/digest-libgnome-2.10.1 b/gnome-base/libgnome/files/digest-libgnome-2.10.1-r1 index 1da158996924..1da158996924 100644 --- a/gnome-base/libgnome/files/digest-libgnome-2.10.1 +++ b/gnome-base/libgnome/files/digest-libgnome-2.10.1-r1 diff --git a/gnome-base/libgnome/files/libgnome-2.10.1-esd_switch.patch b/gnome-base/libgnome/files/libgnome-2.10.1-esd_switch.patch new file mode 100644 index 000000000000..a8b8a6c554ac --- /dev/null +++ b/gnome-base/libgnome/files/libgnome-2.10.1-esd_switch.patch @@ -0,0 +1,42 @@ +diff -NurdB libgnome-2.10.1/configure.in libgnome-2.10.1-patched/configure.in +--- libgnome-2.10.1/configure.in 2005-06-09 04:00:33.000000000 -0500 ++++ libgnome-2.10.1-patched/configure.in 2005-07-19 07:05:55.000000000 -0500 +@@ -119,19 +119,29 @@ + dnl + dnl Start of pkg-config checks + dnl ++ ++PKG_PROG_PKG_CONFIG() ++ + dnl We first check for esound and audiofile (which has conditional + dnl support built in) + dnl + +-SOUND_MODULES="esound >= esound_required_version dnl +- audiofile >= audiofile_required_version" +-PKG_CHECK_MODULES(SOUND_TEST, [$SOUND_MODULES], +-[ +- AC_DEFINE(HAVE_LIBAUDIOFILE,, [Compile with audiofile support]) +- AC_DEFINE(HAVE_ESD,, [Compile with esd support]) +-],[ +- SOUND_MODULES="" +-]) ++AC_MSG_CHECKING([whether ESounD support is requested]) ++AC_ARG_ENABLE([esd], ++ AS_HELP_STRING([--enable-esd],[Enable ESounD (default=yes)]), ++ [enable_esd=$enableval], ++ [enable_esd=yes]) ++AC_MSG_RESULT([$enable_esd]) ++ ++if test x$enable_esd = xyes; then ++ SOUND_MODULES="esound >= esound_required_version dnl ++ audiofile >= audiofile_required_version" ++ PKG_CHECK_MODULES(SOUND_TEST, [$SOUND_MODULES]) ++ AC_DEFINE(HAVE_LIBAUDIOFILE,, [Compile with audiofile support]) ++ AC_DEFINE(HAVE_ESD,, [Compile with esd support]) ++else ++ SOUND_MODULES="" ++fi + + PKG_CHECK_MODULES(LIBGNOME, dnl + [glib-2.0 >= glib_required_version dnl |