diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-05-20 13:42:37 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-05-20 13:42:37 +0000 |
commit | 4f9c7807b291218f668d3db0de45b66ac8720faa (patch) | |
tree | bf17fd95fcbae44ea1ee3f9ce228b6112b40b78e /media-sound/awesfx | |
parent | Marking xprop-1.0.4 ~ppc for bug 268581 (diff) | |
download | historical-4f9c7807b291218f668d3db0de45b66ac8720faa.tar.gz historical-4f9c7807b291218f668d3db0de45b66ac8720faa.tar.bz2 historical-4f9c7807b291218f668d3db0de45b66ac8720faa.zip |
Patch for getline in setfx.c wrt #270486, thanks to Thomas Lercher.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'media-sound/awesfx')
-rw-r--r-- | media-sound/awesfx/ChangeLog | 8 | ||||
-rw-r--r-- | media-sound/awesfx/Manifest | 5 | ||||
-rw-r--r-- | media-sound/awesfx/awesfx-0.5.1c.ebuild | 24 | ||||
-rw-r--r-- | media-sound/awesfx/files/awesfx-0.5.1c-getline.patch | 53 |
4 files changed, 78 insertions, 12 deletions
diff --git a/media-sound/awesfx/ChangeLog b/media-sound/awesfx/ChangeLog index 73c6492c1f41..f9cad1229583 100644 --- a/media-sound/awesfx/ChangeLog +++ b/media-sound/awesfx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/awesfx -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/ChangeLog,v 1.25 2008/01/14 17:40:52 chainsaw Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/ChangeLog,v 1.26 2009/05/20 13:42:36 ssuominen Exp $ + + 20 May 2009; Samuli Suominen <ssuominen@gentoo.org> awesfx-0.5.1c.ebuild, + +files/awesfx-0.5.1c-getline.patch: + Patch for getline in setfx.c wrt #270486, thanks to Thomas Lercher. 14 Jan 2008; Tony Vroon <chainsaw@gentoo.org> awesfx-0.5.0d.ebuild, awesfx-0.5.1.ebuild: diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest index 1d70c52aec3b..c7d229e0a7fe 100644 --- a/media-sound/awesfx/Manifest +++ b/media-sound/awesfx/Manifest @@ -1,7 +1,8 @@ AUX awesfx-0.5.1-include.patch 1475 RMD160 fd5c208364fb064fd5a1f8ce1a665b5b57c1e567 SHA1 bca7c9a05199bbc8e7ad01e2a4c09a78e21fa980 SHA256 cc1bc657df4d2a077e8e8df9d6347f05cce274e74ace813bc6d878a36d83f278 +AUX awesfx-0.5.1c-getline.patch 1266 RMD160 acc230af79b23208f2e9b0e3a0e99f07a06b5da2 SHA1 a6dedff432e98223b5ea6a95a42e0aa3d911c2c3 SHA256 8ea20036dfe738ad4c84e79d4b97f7615dc3500591303d91e9a3c59fb8fec464 DIST awesfx-0.5.1.tar.gz 406372 RMD160 353a499f82764fab900b5e1b1e524ba56f030df3 SHA1 7d21bfd8149650033e4469bfebc803d0909faa0f SHA256 fa3c24e12265d9cc153f633e1291a7103263a785834c5a3f0dcd7845ef81495c DIST awesfx-0.5.1c.tar.bz2 289565 RMD160 af1c876c957c71cda48dbb9c38a6186e6bdc34c9 SHA1 6d44ce7b0a7981645de3bc4f7ec44c6eae4e310f SHA256 04d47e07a01a82ee59ca0c37db4b77f97d1734cacfb08e02e5a4277671d5a54b EBUILD awesfx-0.5.1.ebuild 1049 RMD160 76580579c74c532f90ec8646297c08ca91de732c SHA1 9d898d5b7ecc7a61b19ddce02a700d0d492943c9 SHA256 59597891676affc63d30b34591ed045f02116986d5168f902e99f74bfb184d2e -EBUILD awesfx-0.5.1c.ebuild 929 RMD160 58027e81225dade3de337c5393f0aeb697af8c86 SHA1 6f42a5bcefca6fcceeb79f4539a37ac73891a589 SHA256 ceb58450c431598f55bd4fb66b6a6a49de22cb637ec1f74c7f2e9797e7553197 -MISC ChangeLog 3476 RMD160 1bc2fd25ccda538da17844281dac1d6f1af91c5a SHA1 d925e4f1bc00165747113b4b7017d10684f6e5d8 SHA256 70658c2f53187759e1f9af5631524698426d39f51fab3400feb3b3b209be6cf9 +EBUILD awesfx-0.5.1c.ebuild 1012 RMD160 043aa255fa1cb997ddf85fa607255e54ddc31c79 SHA1 390905b4d5e858f879ebc32b7d4a8f2cb8eb981f SHA256 1b1d6229b9ff170271ce59a5363a30a0119eff6ea24f5158baf84a6fbae08720 +MISC ChangeLog 3662 RMD160 4b16bd5e8a1a20de7570a1473a8f50aab13ba843 SHA1 5d2c2cb5a9d83bdae1bbfe033664b587a590cbe2 SHA256 1860697f3ea4476b6af199268017b0aab671ab2dc74b2ea4725d2ddebe66339c MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b diff --git a/media-sound/awesfx/awesfx-0.5.1c.ebuild b/media-sound/awesfx/awesfx-0.5.1c.ebuild index 257dfde8e01f..c1c9c2c08859 100644 --- a/media-sound/awesfx/awesfx-0.5.1c.ebuild +++ b/media-sound/awesfx/awesfx-0.5.1c.ebuild @@ -1,6 +1,9 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/awesfx-0.5.1c.ebuild,v 1.1 2008/01/14 15:16:23 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/awesfx-0.5.1c.ebuild,v 1.2 2009/05/20 13:42:36 ssuominen Exp $ + +EAPI=2 +inherit eutils DESCRIPTION="AWE32 Sound Driver Utility Programs" HOMEPAGE="http://ftp.suse.com/pub/people/tiwai/awesfx" @@ -11,19 +14,24 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="" -DEPEND=">=media-libs/alsa-lib-1" +RDEPEND="media-libs/alsa-lib" +DEPEND="${RDEPEND}" BANK_LOC="/usr/share/sounds/sf2" -src_compile() { - econf --with-sfpath=${BANK_LOC} - emake || die "emake failed." +src_prepare() { + epatch "${FILESDIR}"/${P}-getline.patch +} + +src_configure() { + econf \ + --with-sfpath=${BANK_LOC} } src_install() { - emake DESTDIR="${D}" install || die "emake install failed." + emake DESTDIR="${D}" install || die "emake install failed" dodoc AUTHORS ChangeLog README SBKtoSF2.txt samples/README-bank - rm "${D}"/usr/share/sounds/sf2/README-bank + rm -f "${D}"/usr/share/sounds/sf2/README-bank } pkg_postinst() { diff --git a/media-sound/awesfx/files/awesfx-0.5.1c-getline.patch b/media-sound/awesfx/files/awesfx-0.5.1c-getline.patch new file mode 100644 index 000000000000..cdc781b9755f --- /dev/null +++ b/media-sound/awesfx/files/awesfx-0.5.1c-getline.patch @@ -0,0 +1,53 @@ +--- setfx.c 2007-08-29 18:00:23.000000000 +0200 ++++ setfx.c 2009-05-19 22:19:56.140092119 +0200 +@@ -37,7 +37,7 @@ + /*----------------------------------------------------------------*/ + + static void usage(void); +-static int getline(FILE *fp); ++static int awesfx_getline(FILE *fp); + static int nextline(FILE *fp); + static char *gettok(FILE *fp); + static char *divtok(char *src, char *divs, int only_one); +@@ -126,7 +126,7 @@ + } + + curline = 0; +- if (!getline(fp)) ++ if (!awesfx_getline(fp)) + return 0; + + seq_init(seq_devname, seq_devidx); +@@ -370,7 +370,7 @@ + * read a line and parse tokens + *----------------------------------------------------------------*/ + +-static int getline(FILE *fp) ++static int awesfx_getline(FILE *fp) + { + char *p; + curline++; +@@ -393,12 +393,12 @@ + { + if (connected) { + do { +- if (! getline(fp)) ++ if (! awesfx_getline(fp)) + return FALSE; + } while (connected); + return TRUE; + } else { +- return getline(fp); ++ return awesfx_getline(fp); + } + } + +@@ -415,7 +415,7 @@ + tok = divtok(NULL, " \t\r\n", FALSE); + while (tok == NULL || *tok == 0) { + if (! connected) return NULL; +- if (! getline(fp)) return NULL; ++ if (! awesfx_getline(fp)) return NULL; + tok = divtok(line, " \t\r\n", FALSE); + } + return tok; |