From 3533d9617e66ea37cb1b4b4b2076f48ac03e3c4b Mon Sep 17 00:00:00 2001 From: Simon Stelling Date: Mon, 12 Feb 2007 22:26:25 +0000 Subject: [PATCH] mark ~amd64 after applying patch from David Watzke; bug 156144 Package-Manager: portage-2.1.2-r9 --- media-sound/wavsplit/ChangeLog | 10 ++- media-sound/wavsplit/Manifest | 61 +++++++++------- .../wavsplit/files/digest-wavsplit-1.0 | 2 + .../wavsplit/files/digest-wavsplit-1.1.0 | 2 + .../wavsplit/files/digest-wavsplit-1.2.1-r1 | 3 + .../wavsplit/files/wavsplit-1.2.1-64bit.patch | 69 +++++++++++++++++++ media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild | 36 ++++++++++ 7 files changed, 156 insertions(+), 27 deletions(-) create mode 100644 media-sound/wavsplit/files/digest-wavsplit-1.2.1-r1 create mode 100644 media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch create mode 100644 media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild diff --git a/media-sound/wavsplit/ChangeLog b/media-sound/wavsplit/ChangeLog index 2efb7240649b..80207b4cd26b 100644 --- a/media-sound/wavsplit/ChangeLog +++ b/media-sound/wavsplit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/wavsplit -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/ChangeLog,v 1.11 2006/03/30 09:30:34 tove Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/ChangeLog,v 1.12 2007/02/12 22:26:25 blubb Exp $ + +*wavsplit-1.2.1-r1 (12 Feb 2007) + + 12 Feb 2007; Simon Stelling + +files/wavsplit-1.2.1-64bit.patch, +wavsplit-1.2.1-r1.ebuild: + mark ~amd64 after applying patch from David Watzke; bug 156144 30 Mar 2006; Torsten Veller +files/wavsplit-1.2.1-Makefile.patch, diff --git a/media-sound/wavsplit/Manifest b/media-sound/wavsplit/Manifest index c3db643a6f38..5225c5e6bc6e 100644 --- a/media-sound/wavsplit/Manifest +++ b/media-sound/wavsplit/Manifest @@ -1,40 +1,51 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 337eca0dbed39e2db8c16b1d8f3105af ChangeLog 1554 -RMD160 49c56f1475b61179ae752d76ba537b7a8b5cc2af ChangeLog 1554 -SHA256 073240e567b05262df25fe1184f59595fc2c563b37c5804b03f61300e24337b9 ChangeLog 1554 -MD5 614dc021dbcc9eeff1f7f30e81c6070d files/digest-wavsplit-1.0 60 -RMD160 a8891f10972061ab67e1b557bf888695a7a77241 files/digest-wavsplit-1.0 60 -SHA256 21e4f6711094141aa21d3f81ee9a9348207c7246630ae642b8b5decd7bfd193b files/digest-wavsplit-1.0 60 -MD5 db9e42a4c6a9b5af5fafcd4ad40de35b files/digest-wavsplit-1.1.0 65 -RMD160 271df4d2962aef053c070ea49b34b88f7c1695fe files/digest-wavsplit-1.1.0 65 -SHA256 0e78e5d553a3f085b99e9d7256817cbb324ed8664a7f718b8be24ce96ed1abdc files/digest-wavsplit-1.1.0 65 -MD5 847e1d7f35307144d9069e4c8203b46a files/digest-wavsplit-1.2.1 241 -RMD160 0b1c7ee991a4f17b4d61d4fd59d1a6b414223f0e files/digest-wavsplit-1.2.1 241 -SHA256 97e03fb1c3ba2a3bc101a25c60484992250d5890df3fa79a44f8983b0073cf5f files/digest-wavsplit-1.2.1 241 +AUX wavsplit-1.2.1-64bit.patch 1929 RMD160 eb668e36288927e4f021464655d25149496f5456 SHA1 9e7cdb4ea6c6e5933104a81e6a05dcdd9ce1f285 SHA256 00a57a379d9e46853ea0489300abe0011e179cb15184795e45f15016b6014ad7 +MD5 a94025012143f1334fa09c3286f69906 files/wavsplit-1.2.1-64bit.patch 1929 +RMD160 eb668e36288927e4f021464655d25149496f5456 files/wavsplit-1.2.1-64bit.patch 1929 +SHA256 00a57a379d9e46853ea0489300abe0011e179cb15184795e45f15016b6014ad7 files/wavsplit-1.2.1-64bit.patch 1929 +AUX wavsplit-1.2.1-Makefile.patch 495 RMD160 bff83202a5788ef784e77a2a0d24e7d3a687e4e1 SHA1 5657c44da91674c8329ac8e4fbbe3baa0297c193 SHA256 969e09af86f71b9d35008ac564d1ec1818b090205fe279e57c931ddb6a3d0007 MD5 261051ab4ccee921fce0db78a9e75a34 files/wavsplit-1.2.1-Makefile.patch 495 RMD160 bff83202a5788ef784e77a2a0d24e7d3a687e4e1 files/wavsplit-1.2.1-Makefile.patch 495 SHA256 969e09af86f71b9d35008ac564d1ec1818b090205fe279e57c931ddb6a3d0007 files/wavsplit-1.2.1-Makefile.patch 495 +AUX wavsplit-1.2.1-large-files.patch 6265 RMD160 94addfecfd6b4341d8f435ca79f45d10ad59bc80 SHA1 b0f7101c0b3a89ca327869f0d764e55a92a64778 SHA256 00598bfa0530ae841dedf708b802b4ee20aac3d30712ba0f556ee816fb9590e7 MD5 a105da6d4cfd3db6c6061e1e64c6855e files/wavsplit-1.2.1-large-files.patch 6265 RMD160 94addfecfd6b4341d8f435ca79f45d10ad59bc80 files/wavsplit-1.2.1-large-files.patch 6265 SHA256 00598bfa0530ae841dedf708b802b4ee20aac3d30712ba0f556ee816fb9590e7 files/wavsplit-1.2.1-large-files.patch 6265 -MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 -RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 -SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158 +DIST wavsplit-1.0.tgz 18488 RMD160 b49f8d13761e3e6e2c876724d702d2f150cd4310 SHA1 72484208902fb6c59cc8ef4b01127f32aa177648 SHA256 dea3f4c129fc7bbd5b958095780663ec48d5a55827346fcc452f8583857dfbaa +DIST wavsplit-1.1.0.tar.gz 30848 RMD160 e242c96b82418eca384817aa4393a80607013845 SHA1 af7b814f155e743c8e0b016b750b7315969afa29 SHA256 51cd59881268958d5502d832bf1621b7cdb69b3c91e2bff22ee06e3ba3f3dbf3 +DIST wavsplit-1.2.1.tar.gz 32246 RMD160 374e6b5c792a30e2072cf758630178d7d981854c SHA1 d16f708a25445d3b3b6b97bf6a1e2c1c1b1712d5 SHA256 266970b06888a9030573de07adf85c316bd0850eb663ed3a65248b6f64107e8a +EBUILD wavsplit-1.0.ebuild 676 RMD160 9db3575be266f4fee4c4d4274e7f7dedd908affa SHA1 04b3bfca8ba15a5c5267a36868919e280b953a35 SHA256 22f4ff63fc6a62f2541f25add015727561da6349f68fe8ffb90f01ebd8f7841a MD5 b402735415dce0755a2413b300310c4a wavsplit-1.0.ebuild 676 RMD160 9db3575be266f4fee4c4d4274e7f7dedd908affa wavsplit-1.0.ebuild 676 SHA256 22f4ff63fc6a62f2541f25add015727561da6349f68fe8ffb90f01ebd8f7841a wavsplit-1.0.ebuild 676 +EBUILD wavsplit-1.1.0.ebuild 696 RMD160 2f012e0892779b002ad0d7a51524b00abfe6aa47 SHA1 e4699ac202385c42729b895a24389b17bc932f18 SHA256 f505027850424aa30decdfbaa2bef7533ddc146ca4f7ca9be9fb9f5e59aaa3aa MD5 1c33ef68829f20e3f7493e1aadbcf74d wavsplit-1.1.0.ebuild 696 RMD160 2f012e0892779b002ad0d7a51524b00abfe6aa47 wavsplit-1.1.0.ebuild 696 SHA256 f505027850424aa30decdfbaa2bef7533ddc146ca4f7ca9be9fb9f5e59aaa3aa wavsplit-1.1.0.ebuild 696 +EBUILD wavsplit-1.2.1-r1.ebuild 1058 RMD160 4f452ded14c6964132367b788142b82e2e6e5a5e SHA1 ab26db2a322d81375e2f7ba58d8cd6206fcc7afa SHA256 4ba9d16a2c4a05520c488193acf8475dfcf445e91c293daa5d51816018b75901 +MD5 b366a11d291488ed5bf70c14fc6bbfa2 wavsplit-1.2.1-r1.ebuild 1058 +RMD160 4f452ded14c6964132367b788142b82e2e6e5a5e wavsplit-1.2.1-r1.ebuild 1058 +SHA256 4ba9d16a2c4a05520c488193acf8475dfcf445e91c293daa5d51816018b75901 wavsplit-1.2.1-r1.ebuild 1058 +EBUILD wavsplit-1.2.1.ebuild 1014 RMD160 6754e7b6b65dbe5ec9909e8bed8300f883329824 SHA1 449950b10f73e913df36bf9d92c7df65631b0cfa SHA256 ecc6cf4ba76f73462a9bc9e125cbb847482150a7df09ebfe3415a2bc5bf7beb1 MD5 eddf68f18528db0a6f846dfee41a8477 wavsplit-1.2.1.ebuild 1014 RMD160 6754e7b6b65dbe5ec9909e8bed8300f883329824 wavsplit-1.2.1.ebuild 1014 SHA256 ecc6cf4ba76f73462a9bc9e125cbb847482150a7df09ebfe3415a2bc5bf7beb1 wavsplit-1.2.1.ebuild 1014 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) - -iD8DBQFEK6VIV3J2n04EauwRAuKMAJ4hyrAoid9jhByAypeLdN6w+vj4ZwCgxamJ -wTTSM1aFflGqxX6q/QyU+0o= -=JjHa ------END PGP SIGNATURE----- +MISC ChangeLog 1768 RMD160 76969826a0b457384848e320fb89633015d7769f SHA1 a1b1456e378cd74ddb53d07fd3aeb22ebcb0f679 SHA256 274a50bc9036fc206579c950e81321f110b2d665d800781286af24368bc0d512 +MD5 c30f41e6878a18a89f002b20b81091fa ChangeLog 1768 +RMD160 76969826a0b457384848e320fb89633015d7769f ChangeLog 1768 +SHA256 274a50bc9036fc206579c950e81321f110b2d665d800781286af24368bc0d512 ChangeLog 1768 +MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b +MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 +RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 +SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158 +MD5 f4f6a20f4ab5de2dae19edec8fafc533 files/digest-wavsplit-1.0 226 +RMD160 facbd1795606be1fbce6b52329d6052117e3503a files/digest-wavsplit-1.0 226 +SHA256 6ec0e2d054e5c31dc53856e18d6f42148758e5f471d7a3657cf80607b6a6008b files/digest-wavsplit-1.0 226 +MD5 a166627dec142591a081a4275b4d3f65 files/digest-wavsplit-1.1.0 241 +RMD160 2f2191606c1ac34c47e7f20f5b0109411bb90cdc files/digest-wavsplit-1.1.0 241 +SHA256 5e0c40c240e40a8df487f33d923d661a6664491d5759538b508ba841ea54f1e1 files/digest-wavsplit-1.1.0 241 +MD5 847e1d7f35307144d9069e4c8203b46a files/digest-wavsplit-1.2.1 241 +RMD160 0b1c7ee991a4f17b4d61d4fd59d1a6b414223f0e files/digest-wavsplit-1.2.1 241 +SHA256 97e03fb1c3ba2a3bc101a25c60484992250d5890df3fa79a44f8983b0073cf5f files/digest-wavsplit-1.2.1 241 +MD5 847e1d7f35307144d9069e4c8203b46a files/digest-wavsplit-1.2.1-r1 241 +RMD160 0b1c7ee991a4f17b4d61d4fd59d1a6b414223f0e files/digest-wavsplit-1.2.1-r1 241 +SHA256 97e03fb1c3ba2a3bc101a25c60484992250d5890df3fa79a44f8983b0073cf5f files/digest-wavsplit-1.2.1-r1 241 diff --git a/media-sound/wavsplit/files/digest-wavsplit-1.0 b/media-sound/wavsplit/files/digest-wavsplit-1.0 index 1f450c3200aa..c39fc8af5291 100644 --- a/media-sound/wavsplit/files/digest-wavsplit-1.0 +++ b/media-sound/wavsplit/files/digest-wavsplit-1.0 @@ -1 +1,3 @@ MD5 f6283b46e367c8efddcaf29b31167611 wavsplit-1.0.tgz 18488 +RMD160 b49f8d13761e3e6e2c876724d702d2f150cd4310 wavsplit-1.0.tgz 18488 +SHA256 dea3f4c129fc7bbd5b958095780663ec48d5a55827346fcc452f8583857dfbaa wavsplit-1.0.tgz 18488 diff --git a/media-sound/wavsplit/files/digest-wavsplit-1.1.0 b/media-sound/wavsplit/files/digest-wavsplit-1.1.0 index 5382ac968463..8af626606c49 100644 --- a/media-sound/wavsplit/files/digest-wavsplit-1.1.0 +++ b/media-sound/wavsplit/files/digest-wavsplit-1.1.0 @@ -1 +1,3 @@ MD5 8bb9b7d18df841b69fc43e3ff710349d wavsplit-1.1.0.tar.gz 30848 +RMD160 e242c96b82418eca384817aa4393a80607013845 wavsplit-1.1.0.tar.gz 30848 +SHA256 51cd59881268958d5502d832bf1621b7cdb69b3c91e2bff22ee06e3ba3f3dbf3 wavsplit-1.1.0.tar.gz 30848 diff --git a/media-sound/wavsplit/files/digest-wavsplit-1.2.1-r1 b/media-sound/wavsplit/files/digest-wavsplit-1.2.1-r1 new file mode 100644 index 000000000000..d22924180fcf --- /dev/null +++ b/media-sound/wavsplit/files/digest-wavsplit-1.2.1-r1 @@ -0,0 +1,3 @@ +MD5 bf204fe0b809b0ab72202f5ba14e4587 wavsplit-1.2.1.tar.gz 32246 +RMD160 374e6b5c792a30e2072cf758630178d7d981854c wavsplit-1.2.1.tar.gz 32246 +SHA256 266970b06888a9030573de07adf85c316bd0850eb663ed3a65248b6f64107e8a wavsplit-1.2.1.tar.gz 32246 diff --git a/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch b/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch new file mode 100644 index 000000000000..abfaf424113b --- /dev/null +++ b/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch @@ -0,0 +1,69 @@ +--- bak/wavsplit.c 2006-11-24 17:53:36.056883000 +0100 ++++ wavsplit.c 2006-11-24 17:52:38.345276250 +0100 +@@ -403,7 +403,7 @@ + ptr += 4; /* we move past fmt_ */ + memcpy (&waveformat, ptr, sizeof (WAVEFORMAT)); + +- if (waveformat.dwSize < (sizeof (WAVEFORMAT) - sizeof (u_long))) { ++ if (waveformat.dwSize < (sizeof (WAVEFORMAT) - sizeof (u_int))) { + fprintf (stderr, "Bad format: Bad fmt size\n"); + return 1; + } +@@ -423,7 +423,7 @@ + } + + ptr += 4; /* we move past data */ +- memcpy (&databytes, ptr, sizeof (u_long)); ++ memcpy (&databytes, ptr, sizeof (u_int)); + + struct stat stat_buf; + +@@ -446,7 +446,7 @@ + + if (verbose) { + printf ("Channels: %d\n", waveformat.wChannels); +- printf ("Samplerate: %ldHz\n", waveformat.dwSamplesPerSec); ++ printf ("Samplerate: %dHz\n", waveformat.dwSamplesPerSec); + printf ("Samplebits: %d\n", waveformat.wBitsPerSample); + printf ("Databytes: %llu\n\n", databytes); + printf ("Split Hours Mins Seconds Bytes %%\n"); +--- bak/wavsplit.h 2006-11-24 17:53:36.056883000 +0100 ++++ wavsplit.h 2006-11-24 17:43:58.648797250 +0100 +@@ -46,29 +46,29 @@ + } TIMEFORMAT; + + typedef struct { +- u_long dwSize; ++ u_int dwSize; + u_short wFormatTag; + u_short wChannels; +- u_long dwSamplesPerSec; +- u_long dwAvgBytesPerSec; ++ u_int dwSamplesPerSec; ++ u_int dwAvgBytesPerSec; + u_short wBlockAlign; + u_short wBitsPerSample; + } WAVEFORMAT; + + typedef struct { + char RiffID[4]; +- u_long RiffSize; ++ u_int RiffSize; + char WaveID[4]; + char FmtID[4]; +- u_long FmtSize; ++ u_int FmtSize; + u_short wFormatTag; + u_short nChannels; +- u_long nSamplesPerSec; +- u_long nAvgBytesPerSec; ++ u_int nSamplesPerSec; ++ u_int nAvgBytesPerSec; + u_short nBlockAlign; + u_short wBitsPerSample; + char DataID[4]; +- u_long nDataBytes; ++ u_int nDataBytes; + } WAVE_HEADER; + + typedef struct { diff --git a/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild b/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild new file mode 100644 index 000000000000..aa955d005f2f --- /dev/null +++ b/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild,v 1.1 2007/02/12 22:26:25 blubb Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="WavSplit is a simple command line tool to split WAV files" +HOMEPAGE="http://sourceforge.net/projects/wavsplit/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +#-sparc, -amd64: 1.0: "Only supports PCM wave format" error message. +KEYWORDS="~amd64 -sparc ~x86" +IUSE="" +DEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + # remove precomplied binaries + rm "${S}"/{wavren,wavsplit} || die + epatch "${FILESDIR}"/${P}-Makefile.patch + epatch "${FILESDIR}"/${P}-large-files.patch + epatch "${FILESDIR}"/${P}-64bit.patch +} + +src_compile(){ + emake CC="$(tc-getCC)" || die "make failed" +} +src_install() { + dobin wavren wavsplit || die "dobin failed" + doman wavren.1 wavsplit.1 || die "doman failed" + dodoc BUGS CHANGES CREDITS README README.wavren || die "dodoc failed" +} + -- 2.26.2