summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus D. Hanwell <cryos@gentoo.org>2007-03-25 18:25:25 +0000
committerMarcus D. Hanwell <cryos@gentoo.org>2007-03-25 18:25:25 +0000
commitea06decadfcd181268eee9169792ef38e4869044 (patch)
treec69f8ed033bc6f00770390e88edf29852ca994f0 /app-cdr
parentpatch added; ready for VDR-1.5.x (diff)
downloadgentoo-2-ea06decadfcd181268eee9169792ef38e4869044.tar.gz
gentoo-2-ea06decadfcd181268eee9169792ef38e4869044.tar.bz2
gentoo-2-ea06decadfcd181268eee9169792ef38e4869044.zip
Fix alsa configure issue, closes bug 152321, patch from upstream SVN commit.
(Portage version: 2.1.2.2)
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/k3b/ChangeLog6
-rw-r--r--app-cdr/k3b/files/k3b-1.0-alsa-fix.patch19
-rw-r--r--app-cdr/k3b/k3b-1.0.ebuild6
3 files changed, 28 insertions, 3 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 105c5e1ce508..1147011da061 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-cdr/k3b
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.184 2007/03/17 12:09:35 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.185 2007/03/25 18:25:25 cryos Exp $
+
+ 25 Mar 2007; Marcus D. Hanwell <cryos@gentoo.org>
+ +files/k3b-1.0-alsa-fix.patch, k3b-1.0.ebuild:
+ Fix alsa configure issue, closes bug 152321, patch from upstream SVN commit.
*k3b-1.0 (17 Mar 2007)
diff --git a/app-cdr/k3b/files/k3b-1.0-alsa-fix.patch b/app-cdr/k3b/files/k3b-1.0-alsa-fix.patch
new file mode 100644
index 000000000000..431242b7d0d6
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-1.0-alsa-fix.patch
@@ -0,0 +1,19 @@
+diff -ur k3b-1.0.orig/plugins/audiooutput/alsa/configure.in.in k3b-1.0/plugins/audiooutput/alsa/configure.in.in
+--- k3b-1.0.orig/plugins/audiooutput/alsa/configure.in.in 2007-03-25 19:13:45.000000000 +0100
++++ k3b-1.0/plugins/audiooutput/alsa/configure.in.in 2007-03-25 19:14:09.000000000 +0100
+@@ -5,8 +5,6 @@
+ PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], [have_alsa=yes], [have_alsa=no])
+ AC_SUBST([ALSA_CFLAGS])
+ AC_SUBST([ALSA_LIBS])
+-
+- AM_CONDITIONAL(include_ALSA, [test "x$have_alsa" = "xyes"])
+ ])
+
+ AC_ARG_WITH(alsa,
+@@ -23,4 +21,6 @@
+ fi
+ fi
+
++AM_CONDITIONAL(include_ALSA, [test "x$have_alsa" = "xyes"])
++
+ dnl --------- ALSA CHECK END ---------------
diff --git a/app-cdr/k3b/k3b-1.0.ebuild b/app-cdr/k3b/k3b-1.0.ebuild
index 59b5ae687ae6..2df752505c4c 100644
--- a/app-cdr/k3b/k3b-1.0.ebuild
+++ b/app-cdr/k3b/k3b-1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.ebuild,v 1.1 2007/03/17 12:09:35 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.ebuild,v 1.2 2007/03/25 18:25:25 cryos Exp $
inherit kde eutils
@@ -49,7 +49,9 @@ RDEPEND="${DEPEND}
DEPEND="${DEPEND}
dev-util/pkgconfig"
-need-kde 3.2
+need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-alsa-fix.patch"
# The following commented lines will have to be uncommented once the final
# release is done. This pre-release version does not support i18n.