Add patch to build with experimental alsa-lib without sequencer (midi) support enabled.

Package-Manager: portage-2.1.2-r8

4 files changed, 156 insertions, 17 deletions

diff --git a/kde-base/kmix/ChangeLog b/kde-base/kmix/ChangeLog
index 9540388d6740..7bcff0192773 100644
--- a/kde-base/kmix/ChangeLog
+++ b/kde-base/kmix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kmix
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.63 2007/02/04 02:37:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.64 2007/02/07 02:08:28 flameeyes Exp $
+
+  07 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kmix-3.5.6-alsa-tests.patch, kmix-3.5.6.ebuild:
+  Add patch to build with experimental alsa-lib without sequencer (midi)
+  support enabled.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kmix-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/kmix/Manifest b/kde-base/kmix/Manifest
index ba0e1b3633ba..e7f70e363e59 100644
--- a/kde-base/kmix/Manifest
+++ b/kde-base/kmix/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kmix-3.5.6-alsa-tests.patch 4393 RMD160 189d5ddbae46bed006e3524bf099dd0bb80aaa3d SHA1 21b3e7bf123dd4eaf8d5882a82b7e1cf1219af77 SHA256 8b195a267abae101388c938ff4d12e0bf8cab89bd9c44025e669bfbe253aa341
+MD5 9445b4a4a00ff28d38dc32dd3b0f3907 files/kmix-3.5.6-alsa-tests.patch 4393
+RMD160 189d5ddbae46bed006e3524bf099dd0bb80aaa3d files/kmix-3.5.6-alsa-tests.patch 4393
+SHA256 8b195a267abae101388c938ff4d12e0bf8cab89bd9c44025e669bfbe253aa341 files/kmix-3.5.6-alsa-tests.patch 4393
 DIST kdemultimedia-3.5.5.tar.bz2 6287234 RMD160 c31d81efeb02cea29048fbdefcb8c4f13726fded SHA1 8ddc3174d400827e58e2e5cf87a5bd279a6bfdc1 SHA256 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c
 DIST kdemultimedia-3.5.6.tar.bz2 6291692 RMD160 7411019e2765f740ad0f3fd592e74f62e04b8387 SHA1 030ca0b5e79f04c6baa99108f1c871f194effee7 SHA256 1a08f71c73cacb1da1d2269d0376193c23de727235a255866f869caeea300719
 EBUILD kmix-3.5.5.ebuild 675 RMD160 751ae5e00aefde43c3251cec5a09af05b8a53558 SHA1 59c75fbc97de158bdcd10427b6085a9371c72962 SHA256 eb65724a64d2b62312e4009edb02fc90d885f3d3cc2d1c12ab5da5172b1fee69
 MD5 63ba2e36660baad841d02907f09da29f kmix-3.5.5.ebuild 675
 RMD160 751ae5e00aefde43c3251cec5a09af05b8a53558 kmix-3.5.5.ebuild 675
 SHA256 eb65724a64d2b62312e4009edb02fc90d885f3d3cc2d1c12ab5da5172b1fee69 kmix-3.5.5.ebuild 675
-EBUILD kmix-3.5.6.ebuild 685 RMD160 9ba77d5c5692b221e0996e966bae5542e535f757 SHA1 0e5092d13338f93c5630e8a119e3d595e4f44a5e SHA256 46d03743bd842b24f2bfb36ffb4d4833e8a9abaded6dd4c77c2c2aa9e6e9dad5
-MD5 fd1e283d79f0a60a27c88bf668befa4f kmix-3.5.6.ebuild 685
-RMD160 9ba77d5c5692b221e0996e966bae5542e535f757 kmix-3.5.6.ebuild 685
-SHA256 46d03743bd842b24f2bfb36ffb4d4833e8a9abaded6dd4c77c2c2aa9e6e9dad5 kmix-3.5.6.ebuild 685
-MISC ChangeLog 7308 RMD160 eaf67985c2020a4c18e5f8b6f28157b3f891cac8 SHA1 d8018f1e72a93d2c6c8aa730fab0372d2d56ca8e SHA256 db0b094544ed20fbed8bd8a03c8d6983112594610a55b3bc5b8fc5d82d3cc7e3
-MD5 d281a73a245b181fa399a2c770e4b8be ChangeLog 7308
-RMD160 eaf67985c2020a4c18e5f8b6f28157b3f891cac8 ChangeLog 7308
-SHA256 db0b094544ed20fbed8bd8a03c8d6983112594610a55b3bc5b8fc5d82d3cc7e3 ChangeLog 7308
+EBUILD kmix-3.5.6.ebuild 590 RMD160 4c53d80c1d62f0089b3f314bb1704dbdc7d350f7 SHA1 9cdc36947256fdf12362eec16b0af316b280aff9 SHA256 0cf02c0e36a518644bcd1e3a2cee40691e9412979d304e606b8951c4ca55003c
+MD5 f59ad3e6feeaf2c0db73f269897d3d28 kmix-3.5.6.ebuild 590
+RMD160 4c53d80c1d62f0089b3f314bb1704dbdc7d350f7 kmix-3.5.6.ebuild 590
+SHA256 0cf02c0e36a518644bcd1e3a2cee40691e9412979d304e606b8951c4ca55003c kmix-3.5.6.ebuild 590
+MISC ChangeLog 7511 RMD160 cd08f2c1c0f43340f5276c22acde5bb9a88ba7a7 SHA1 86d28e5865399875949dc15bf2907b1831989975 SHA256 b32fa0064162d697ba8d843b323b6b90aa76a86b08257e8a59831cd0a4efc78f
+MD5 db1d90e368238832f393e303f9da6be9 ChangeLog 7511
+RMD160 cd08f2c1c0f43340f5276c22acde5bb9a88ba7a7 ChangeLog 7511
+SHA256 b32fa0064162d697ba8d843b323b6b90aa76a86b08257e8a59831cd0a4efc78f ChangeLog 7511
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -28,7 +32,7 @@ SHA256 8c8f0b56dd810d9202f532206814eed4c4ff4e6062a88e0bbee4523b8cf5f4d7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFxUb1AiZjviIA2XgRAuvdAKDOAv/it3p5jz5HMKQVrr0LY1am/QCgw1kx
-nnkQy5nfwKDOS/kydLKYK0Y=
-=BdEJ
+iD8DBQFFyTSlAiZjviIA2XgRAmy0AJ9JYAsrL2PFBT2YmPojiPb8q5om/QCfSgD0
+/TKTPQij0ZVQQPs4Wd9uXl0=
+=qgvm
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kmix/files/kmix-3.5.6-alsa-tests.patch b/kde-base/kmix/files/kmix-3.5.6-alsa-tests.patch
new file mode 100644
index 000000000000..898de4454612
--- /dev/null
+++ b/kde-base/kmix/files/kmix-3.5.6-alsa-tests.patch
@@ -0,0 +1,131 @@
+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 <sys/asoundlib.h>
+-      #endif
+-      #ifdef HAVE_ALSA_ASOUNDLIB_H
+-      #include <alsa/asoundlib.h>
+-      #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 <sys/asoundlib.h>
+-      #endif
+-      #ifdef HAVE_ALSA_ASOUNDLIB_H
+-      #include <alsa/asoundlib.h>
+-      #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 <sys/asoundlib.h>
+-      #endif
+-      #ifdef HAVE_ALSA_ASOUNDLIB_H
+-      #include <alsa/asoundlib.h>
+-      #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/kmix/Makefile.am
+===================================================================
+--- kdemultimedia-3.5.6.orig/kmix/Makefile.am
++++ kdemultimedia-3.5.6/kmix/Makefile.am
+@@ -25,13 +25,13 @@ kmix_la_SOURCES = main.cpp kmix.cpp kmix
+ 	volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
+ 	kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
+ 
+-kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
++kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS)
+ kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version
+ 
+ kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
+ 	mixertoolbox.cpp mixer_backend.cpp
+ 
+-kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
++kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS)
+ kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+ kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
+@@ -42,7 +42,7 @@ kmix_panelapplet_la_SOURCES = kmixapplet
+ 	kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp
+ 
+ kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
++kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS)
+ 
+ xdg_apps_DATA = kmix.desktop
+ 
diff --git a/kde-base/kmix/kmix-3.5.6.ebuild b/kde-base/kmix/kmix-3.5.6.ebuild
index 913aca137a52..a75a74a6789a 100644
--- a/kde-base/kmix/kmix-3.5.6.ebuild
+++ b/kde-base/kmix/kmix-3.5.6.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/kde-base/kmix/kmix-3.5.6.ebuild,v 1.1 2007/01/16 20:50:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-3.5.6.ebuild,v 1.2 2007/02/07 02:08:28 flameeyes Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -12,11 +12,10 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="alsa"
 DEPEND="alsa? ( media-libs/alsa-lib )"
 RDEPEND="${DEPEND}"
-KMEXTRACTONLY="kscd/configure.in.in"
 
-src_compile() {
-	# alsa 0.9 not supported
-	use alsa && myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa"
+PATCHES="${FILESDIR}/${P}-alsa-tests.patch"
 
+src_compile() {
+	local myconf="$(use_with alsa)"
 	kde-meta_src_compile
 }