From 2066708c925c5a1aee57751f5010ce96988f05fc Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Wed, 7 Feb 2007 02:14:12 +0000 Subject: Add patch to build with experimental alsa-lib without sequencer (midi) support enabled. (Portage version: 2.1.2-r8) --- kde-base/kscd/ChangeLog | 7 +- kde-base/kscd/files/digest-kscd-3.5.6 | 3 - kde-base/kscd/files/kscd-3.5.6-alsa-tests.patch | 154 ++++++++++++++++++++++++ kde-base/kscd/kscd-3.5.6.ebuild | 9 +- 4 files changed, 164 insertions(+), 9 deletions(-) create mode 100644 kde-base/kscd/files/kscd-3.5.6-alsa-tests.patch (limited to 'kde-base') diff --git a/kde-base/kscd/ChangeLog b/kde-base/kscd/ChangeLog index 66bd5eecc9fc..5c12326b1045 100644 --- a/kde-base/kscd/ChangeLog +++ b/kde-base/kscd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kscd # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.64 2007/02/04 02:53:46 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.65 2007/02/07 02:14:12 flameeyes Exp $ + + 07 Feb 2007; Diego Pettenò + +files/kscd-3.5.6-alsa-tests.patch, kscd-3.5.6.ebuild: + Add patch to build with experimental alsa-lib without sequencer (midi) + support enabled. 04 Feb 2007; Diego Pettenò -kscd-3.5.2.ebuild: Remove old versions. diff --git a/kde-base/kscd/files/digest-kscd-3.5.6 b/kde-base/kscd/files/digest-kscd-3.5.6 index bedbfe7f6ca5..189f4e8bd94c 100644 --- a/kde-base/kscd/files/digest-kscd-3.5.6 +++ b/kde-base/kscd/files/digest-kscd-3.5.6 @@ -1,6 +1,3 @@ -MD5 2484cdd588665a5cb3d6090afea1737c kdemultimedia-3.5-patchset-01.tar.bz2 1434 -RMD160 021a379c8a11e0a463889b77e3b62d665683ce78 kdemultimedia-3.5-patchset-01.tar.bz2 1434 -SHA256 edcbc4727d962368d64c809a969b024feeb0bbe0627912d1c95adc0dacf85d38 kdemultimedia-3.5-patchset-01.tar.bz2 1434 MD5 57c50bfcb0147324a1af02ebcc103376 kdemultimedia-3.5.6.tar.bz2 6291692 RMD160 7411019e2765f740ad0f3fd592e74f62e04b8387 kdemultimedia-3.5.6.tar.bz2 6291692 SHA256 1a08f71c73cacb1da1d2269d0376193c23de727235a255866f869caeea300719 kdemultimedia-3.5.6.tar.bz2 6291692 diff --git a/kde-base/kscd/files/kscd-3.5.6-alsa-tests.patch b/kde-base/kscd/files/kscd-3.5.6-alsa-tests.patch new file mode 100644 index 000000000000..bec0893b66ca --- /dev/null +++ b/kde-base/kscd/files/kscd-3.5.6-alsa-tests.patch @@ -0,0 +1,154 @@ +Index: kdemultimedia-3.5.6/configure.in.in +=================================================================== +--- kdemultimedia-3.5.6.orig/configure.in.in ++++ kdemultimedia-3.5.6/configure.in.in +@@ -152,88 +152,19 @@ AC_DEFUN([KDE_CHECK_OSSAUDIO], + + AC_DEFUN([KDE_CHECK_ALSA], + [ +- have_alsa=no ++ AC_CHECK_LIB([asound], [snd_pcm_open], [have_alsa05=yes], [have_alsa04=no]) + +- AC_CHECK_HEADERS([sys/asoundlib.h alsa/asoundlib.h], +- [have_alsa=yes]) ++ PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], [have_alsa09=yes], [have_alsa09=no]) + +- AC_CHECK_LIB(asound, snd_seq_create_simple_port, +- [:], [have_alsa=no]) +- +- AC_LANG_SAVE +- AC_LANG_C +- if test "x$have_alsa" = xyes; then +- AC_TRY_COMPILE([ +- #include "confdefs.h" +- #ifdef HAVE_SYS_ASOUNDLIB_H +- #include +- #endif +- #ifdef HAVE_ALSA_ASOUNDLIB_H +- #include +- #endif +- ],[ +- #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5) +- /* we have ALSA 0.5.x */ +- #else +- #error not ALSA 0.5.x +- #endif +- ], +- have_alsa_0_5=yes) +- +- AC_TRY_COMPILE([ +- #include "confdefs.h" +- #ifdef HAVE_SYS_ASOUNDLIB_H +- #include +- #endif +- #ifdef HAVE_ALSA_ASOUNDLIB_H +- #include +- #endif +- ],[ +- #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9) +- /* we have ALSA 0.9.x */ +- #else +- #error not ALSA 0.9.x +- #endif +- ], +- have_alsa_0_9=yes) +- +- AC_TRY_COMPILE([ +- #include "confdefs.h" +- #ifdef HAVE_SYS_ASOUNDLIB_H +- #include +- #endif +- #ifdef HAVE_ALSA_ASOUNDLIB_H +- #include +- #endif +- ],[ +- #if (SND_LIB_MAJOR == 1) +- /* we have ALSA 1.x */ +- #else +- #error not ALSA 1.x +- #endif +- ], +- have_alsa_1=yes) +- fi +- AC_LANG_RESTORE +- +- if test "x$have_alsa_0_9" = xyes || test "x$have_alsa_1" = xyes; then +- # for kmix/ and akode/ +- LIBASOUND="-lasound" ++ if test "x$have_alsa09" = "xyes"; then ++ have_alsa="yes" + AC_DEFINE(HAVE_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)]) +- +- # for arts/ +- ARTS_LIBASOUND="-lasound" +- AC_DEFINE(HAVE_ARTS_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)]) ++ elif test "x$have_alsa05" = "xyes"; then ++ have_alsa="yes" ++ AC_DEFINE(HAVE_LIBASOUND1, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)]) ++ ALSA_LIBS="-lasound" ++ AC_SUBST([ALSA_LIBS]) + fi +- +- if test "x$have_alsa_0_5" = xyes; then +- # for arts/ +- ARTS_LIBASOUND="-lasound" +- AC_DEFINE(HAVE_ARTS_LIBASOUND, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)]) +- fi +- +- AC_SUBST(LIBASOUND) +- AC_SUBST(ARTS_LIBASOUND) + ]) + + AC_DEFUN([KDE_CHECK_CDPARANOIA], +Index: kdemultimedia-3.5.6/kscd/kscd.cpp +=================================================================== +--- kdemultimedia-3.5.6.orig/kscd/kscd.cpp ++++ kdemultimedia-3.5.6/kscd/kscd.cpp +@@ -108,7 +108,7 @@ KSCD::KSCD( QWidget *parent, const char + #if defined(BUILD_CDDA) + audio_systems_list + << "arts" +-#if defined(HAVE_ARTS_LIBASOUND2) ++#if defined(HAVE_LIBASOUND2) + << "alsa" + #endif + #ifdef USE_SUN_AUDIO +Index: kdemultimedia-3.5.6/kscd/libwm/audio/audio_alsa.c +=================================================================== +--- kdemultimedia-3.5.6.orig/kscd/libwm/audio/audio_alsa.c ++++ kdemultimedia-3.5.6/kscd/libwm/audio/audio_alsa.c +@@ -18,7 +18,7 @@ + + #include + +-#if defined(HAVE_ARTS_LIBASOUND2) ++#if defined(HAVE_LIBASOUND2) + + #include + #include "audio.h" +Index: kdemultimedia-3.5.6/kscd/libwm/audio/audio.c +=================================================================== +--- kdemultimedia-3.5.6.orig/kscd/libwm/audio/audio.c ++++ kdemultimedia-3.5.6/kscd/libwm/audio/audio.c +@@ -16,7 +16,7 @@ struct audio_oops* setup_soundsystem(con + if(!strcmp(ss, "arts")) + return setup_arts(dev, ctl); + #endif +-#if defined(HAVE_ARTS_LIBASOUND2) ++#if defined(HAVE_LIBASOUND2) + if(!strcmp(ss, "alsa")) + return setup_alsa(dev, ctl); + #endif +Index: kdemultimedia-3.5.6/kscd/libwm/Makefile.am +=================================================================== +--- kdemultimedia-3.5.6.orig/kscd/libwm/Makefile.am ++++ kdemultimedia-3.5.6/kscd/libwm/Makefile.am +@@ -10,7 +10,7 @@ INCLUDES = $(all_includes) + noinst_LTLIBRARIES = libworkman.la + + libworkman_la_LDFLAGS = $(ARTSC_LIBS) $(all_libraries) +-libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTS_LIBASOUND) ++libworkman_la_LIBADD = audio/libworkmanaudio.la $(ALSA_LIBS) + + libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\ + database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\ diff --git a/kde-base/kscd/kscd-3.5.6.ebuild b/kde-base/kscd/kscd-3.5.6.ebuild index 1d66c7a5ad1c..996500e9f5bd 100644 --- a/kde-base/kscd/kscd-3.5.6.ebuild +++ b/kde-base/kscd/kscd-3.5.6.ebuild @@ -1,14 +1,13 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-3.5.6.ebuild,v 1.1 2007/01/16 21:16:17 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-3.5.6.ebuild,v 1.2 2007/02/07 02:14:12 flameeyes Exp $ KMNAME=kdemultimedia MAXKDEVER=$PV KM_DEPRANGE="$PV $MAXKDEVER" inherit kde-meta eutils -SRC_URI="${SRC_URI} - mirror://gentoo/kdemultimedia-3.5-patchset-01.tar.bz2" +SRC_URI="${SRC_URI}" DESCRIPTION="KDE CD player" KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" @@ -19,11 +18,11 @@ DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb)" RDEPEND="${DEPEND}" KMCOPYLIB="libkcddb libkcddb" -KMEXTRACTONLY=" - mpeglib_artsplug/configure.in.in" KMCOMPILEONLY="libkcddb" +PATCHES="${FILESDIR}/${P}-alsa-tests.patch" + src_compile() { DO_NOT_COMPILE=libkcddb kde-meta_src_compile myconf configure cd $S/libkcddb && make configbase.h -- cgit v1.2.3-65-gdbad