Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/kde-base
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/arts/ChangeLog7
-rw-r--r--kde-base/arts/Manifest8
-rw-r--r--kde-base/arts/arts-1.1.4.ebuild5
-rw-r--r--kde-base/arts/arts-1.2.0_beta2.ebuild5
-rw-r--r--kde-base/arts/files/arts-1.1.4-alsafix.diff48
-rw-r--r--kde-base/arts/files/arts-1.2.0_beta2-alsafix.diff48
6 files changed, 113 insertions, 8 deletions
diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 23fd4d243312..8dd2f3d29eb6 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/arts
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.67 2004/01/03 13:50:23 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.68 2004/01/03 13:58:27 caleb Exp $
+
+ 03 Jan 2004; Caleb Tennis <caleb@gentoo.org> arts-1.1.4.ebuild,
+ arts-1.2.0_beta2.ebuild, files/arts-1.1.4-alsafix.diff,
+ files/arts-1.2.0_beta2-alsafix.diff:
+ Add a patch to let arts work with alsa 1.0
03 Jan 2004; Caleb Tennis <caleb@gentoo.org> arts-1.1.4.ebuild,
arts-1.2.0_beta2.ebuild:
diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index 38f835944e69..04686d1cf506 100644
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -4,20 +4,22 @@ MD5 6a6c45bdbbc95118032c31644c63f2ef arts-1.1.3.ebuild 2936
MD5 607f672ecc731b167ca9f2a98646fea9 arts-1.2.0_beta1-r1.ebuild 2790
MD5 e419d02f1b1d63659351f826d353442b arts-1.0.5b.ebuild 1439
MD5 fbaf43a8376702c18d2975d9064d8dbd arts-1.1.2.ebuild 2741
-MD5 27dea671fd87cafaa937cfcd8f9ec09c arts-1.2.0_beta2.ebuild 2796
+MD5 ea07433f20d10ffcbc342ca100c768c3 arts-1.2.0_beta2.ebuild 2826
MD5 84e7f3bac423a53ca09cd5a130897670 arts-1.1.2-r1.ebuild 2718
-MD5 66dc55f505e1d34b08b50aad8c4fb2c2 ChangeLog 9409
+MD5 72029c57fb12afd4f956573a0dcb5f65 ChangeLog 9618
MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 427905a4acbb34c3368558c3e6b32291 arts-1.1.4.ebuild 2993
+MD5 11f66268354452f1416e0f34dc384dd3 arts-1.1.4.ebuild 3023
MD5 9ffc978b18c6e1ad49a0c7eec49074f6 files/optional-deps.diff 3154
MD5 0618185a5569820b71b70e635ac9cd2a files/digest-arts-1.1.1 63
MD5 8a2eb6e84c39661304e7c3c395ecb5b5 files/digest-arts-1.1.2 63
MD5 a501dd1ce9294fceb81a87c056db568f files/digest-arts-1.1.3 63
MD5 be627646b998d386b73ecb0f03922ead files/digest-arts-1.1.4 63
MD5 783f52e41abb732466bec517c6ff1ae1 files/digest-arts-1.0.5b 200
+MD5 9eb075bd57fb70c3cafa5cd05d36640b files/arts-1.1.4-alsafix.diff 1543
MD5 e694f9e5ae5ca5755ea6938c0d90ec9c files/arts-1.1.4-amd64.patch 623
MD5 1b00ca71ff1ea0b5ed8387a0d5f9020d files/digest-arts-1.0.4-r1 64
MD5 8a2eb6e84c39661304e7c3c395ecb5b5 files/digest-arts-1.1.2-r1 63
MD5 6550aed931c1af783a99da52b50e6b8d files/digest-arts-1.2.0_beta2 64
MD5 851c801fd248d2db3884a2c229f39e06 files/digest-arts-1.2.0_beta1-r1 65
+MD5 5ccfe8f5031a0922ed54d92d674ffc1e files/arts-1.2.0_beta2-alsafix.diff 1535
MD5 226c503848cbc85a5daacb28eef4a0a6 files/tmp-mcop-user-fix.patch 1045
diff --git a/kde-base/arts/arts-1.1.4.ebuild b/kde-base/arts/arts-1.1.4.ebuild
index 15a3a2cfb0a4..910f2b416b97 100644
--- a/kde-base/arts/arts-1.1.4.ebuild
+++ b/kde-base/arts/arts-1.1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.1.4.ebuild,v 1.12 2004/01/03 13:50:23 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.1.4.ebuild,v 1.13 2004/01/03 13:58:27 caleb Exp $
inherit kde flag-o-matic
IUSE="alsa oggvorbis artswrappersuid mad"
@@ -13,7 +13,7 @@ DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manag
KEYWORDS="x86 ppc sparc ~alpha hppa amd64"
-DEPEND="alsa? ( <=media-libs/alsa-lib-0.9.8 )
+DEPEND="alsa? ( media-libs/alsa-lib )
oggvorbis? ( media-libs/libvorbis media-libs/libogg )
mad? ( media-libs/libmad media-libs/libid3tag )
media-libs/audiofile
@@ -43,6 +43,7 @@ PATCHES="$FILESDIR/optional-deps.diff"
src_unpack() {
kde_src_unpack
+ epatch ${FILESDIR}/${P}-alsafix.diff
kde_sandbox_patch ${S}/soundserver
# for the configure.in.in patch, for some reason it's not automatically picked up
rm $S/configure
diff --git a/kde-base/arts/arts-1.2.0_beta2.ebuild b/kde-base/arts/arts-1.2.0_beta2.ebuild
index 815d4a9c143c..aa7b0a2ae699 100644
--- a/kde-base/arts/arts-1.2.0_beta2.ebuild
+++ b/kde-base/arts/arts-1.2.0_beta2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.2.0_beta2.ebuild,v 1.7 2004/01/03 13:50:23 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.2.0_beta2.ebuild,v 1.8 2004/01/03 13:58:27 caleb Exp $
inherit kde flag-o-matic
IUSE="alsa oggvorbis esd artswrappersuid mad"
@@ -16,7 +16,7 @@ DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manag
KEYWORDS="~x86"
-DEPEND="alsa? ( <=media-libs/alsa-lib-0.9.8 virtual/alsa )
+DEPEND="alsa? ( media-libs/alsa-lib virtual/alsa )
oggvorbis? ( media-libs/libvorbis media-libs/libogg )
esd? ( media-sound/esound )
mad? ( media-libs/libmad media-libs/libid3tag )
@@ -48,6 +48,7 @@ myconf="$myconf `use_enable mad libmad`"
src_unpack() {
kde_src_unpack
+ epatch ${FILESDIR}/${P}-alsafix.diff
kde_sandbox_patch ${S}/soundserver
# for the configure.in.in patch, for some reason it's not automatically picked up
# rm -f $S/configure
diff --git a/kde-base/arts/files/arts-1.1.4-alsafix.diff b/kde-base/arts/files/arts-1.1.4-alsafix.diff
new file mode 100644
index 000000000000..09e6aa68617b
--- /dev/null
+++ b/kde-base/arts/files/arts-1.1.4-alsafix.diff
@@ -0,0 +1,48 @@
+--- arts/configure.in.in 2003/09/03 00:02:52 1.81.2.7
++++ arts/configure.in.in 2003/11/24 15:53:20 1.81.2.8
+@@ -497,6 +497,26 @@ AC_DEFUN([AC_CHECK_LIBASOUND],
+ #include <alsa/asoundlib.h>
+ #endif
+ ],[
++ #if (SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)
++ /* we have ALSA 1.x */
++ #else
++ #error not ALSA 1.x
++ #endif
++ ],
++ kde_has_alsa_1_0=yes,
++ kde_has_alsa_1_0=no)
++ fi
++
++ if test "x$kde_has_asoundlib" = "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
+@@ -523,6 +543,18 @@ AC_DEFUN([AC_CHECK_LIBASOUND],
+ AC_DEFINE(HAVE_SND_PCM_RESUME, 1,
+ [Define if libasound has snd_pcm_resume()])])
+ fi
++ if test "x$kde_has_alsa_1_0" = "xyes"; then
++ LIBASOUND="-lasound"
++ AC_DEFINE(HAVE_LIBASOUND2, 1,
++ [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)])
++ AC_DEFINE(ALSA_PCM_OLD_SW_PARAMS_API, 1,
++ [Define if you have alsa 1.x])
++ AC_DEFINE(ALSA_PCM_OLD_HW_PARAMS_API, 1,
++ [Define if you have alsa 1.x])
++ AC_CHECK_LIB(asound,snd_pcm_resume,[
++ AC_DEFINE(HAVE_SND_PCM_RESUME, 1,
++ [Define if libasound has snd_pcm_resume()])])
++ fi
+ ])
+ fi
+ AC_SUBST(LIBASOUND)
diff --git a/kde-base/arts/files/arts-1.2.0_beta2-alsafix.diff b/kde-base/arts/files/arts-1.2.0_beta2-alsafix.diff
new file mode 100644
index 000000000000..010d261a27c6
--- /dev/null
+++ b/kde-base/arts/files/arts-1.2.0_beta2-alsafix.diff
@@ -0,0 +1,48 @@
+--- arts/configure.in.in 2003/08/28 17:28:59 1.94
++++ arts/configure.in.in 2003/11/24 20:13:09 1.95
+@@ -549,6 +549,26 @@ AC_DEFUN([AC_CHECK_LIBASOUND],
+ #include <alsa/asoundlib.h>
+ #endif
+ ],[
++ #if (SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)
++ /* we have ALSA 1.x */
++ #else
++ #error not ALSA 1.x
++ #endif
++ ],
++ kde_has_alsa_1_0=yes,
++ kde_has_alsa_1_0=no)
++ fi
++
++ if test "x$kde_has_asoundlib" = "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
+@@ -575,6 +595,18 @@ AC_DEFUN([AC_CHECK_LIBASOUND],
+ AC_DEFINE(HAVE_SND_PCM_RESUME, 1,
+ [Define if libasound has snd_pcm_resume()])])
+ fi
++ if test "x$kde_has_alsa_1_0" = "xyes"; then
++ LIBASOUND="-lasound"
++ AC_DEFINE(HAVE_LIBASOUND2, 1,
++ [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)])
++ AC_DEFINE(ALSA_PCM_OLD_SW_PARAMS_API, 1,
++ [Define if you have alsa 1.x])
++ AC_DEFINE(ALSA_PCM_OLD_HW_PARAMS_API, 1,
++ [Define if you have alsa 1.x])
++ AC_CHECK_LIB(asound,snd_pcm_resume,[
++ AC_DEFINE(HAVE_SND_PCM_RESUME, 1,
++ [Define if libasound has snd_pcm_resume()])])
++ fi
+ ])
+ fi
+ AC_SUBST(LIBASOUND)