From 46f92e19fed5c61fcaaa01317418ea12d26834dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 28 Aug 2015 12:30:30 +0000 Subject: [PATCH 1/4] Sox 14.4.2 --- media-sound/sox/patches/sox-14.4.2.patchset | 23 ++++++ media-sound/sox/sox-14.4.2.recipe | 80 +++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 media-sound/sox/patches/sox-14.4.2.patchset create mode 100644 media-sound/sox/sox-14.4.2.recipe diff --git a/media-sound/sox/patches/sox-14.4.2.patchset b/media-sound/sox/patches/sox-14.4.2.patchset new file mode 100644 index 000000000..0a1c909e1 --- /dev/null +++ b/media-sound/sox/patches/sox-14.4.2.patchset @@ -0,0 +1,23 @@ +From 36e7868b80c3f53896e647b06ad8d96baf925e05 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Fri, 28 Aug 2015 12:23:33 +0000 +Subject: Haiku acts like GLIBC + + +diff --git a/src/formats.c b/src/formats.c +index 724a4cd..079cd9a 100644 +--- a/src/formats.c ++++ b/src/formats.c +@@ -413,7 +413,7 @@ static void UNUSED rewind_pipe(FILE * fp) + #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__ + fp->_p -= PIPE_AUTO_DETECT_SIZE; + fp->_r += PIPE_AUTO_DETECT_SIZE; +-#elif defined __GLIBC__ ++#elif defined __GLIBC__ || defined __HAIKU__ + fp->_IO_read_ptr = fp->_IO_read_base; + #elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || \ + defined _ISO_STDIO_ISO_H || defined __sgi +-- +2.2.2 + diff --git a/media-sound/sox/sox-14.4.2.recipe b/media-sound/sox/sox-14.4.2.recipe new file mode 100644 index 000000000..ab4c12995 --- /dev/null +++ b/media-sound/sox/sox-14.4.2.recipe @@ -0,0 +1,80 @@ +SUMMARY="A command line utility to do audio format conversions" +DESCRIPTION=" +SoX is a cross-platform (Windows, Linux, MacOS X, etc.) command line utility \ +that can convert various formats of computer audio files in to other formats. \ +It can also apply various effects to these sound files, and, as an added \ +bonus, SoX can play and record audio files on most platforms +" +HOMEPAGE="http://sox.sourceforge.net" +SOURCE_URI="http://sourceforge.net/projects/sox/files/sox/14.4.2/sox-14.4.2.tar.bz2" +CHECKSUM_SHA256="81a6956d4330e75b5827316e44ae381e6f1e8928003c6aa45896da9041ea149c" +LICENSE="GNU GPL v2" +COPYRIGHT="1991-2015 Lance Norskog" +REVISION="1" +ARCHITECTURES="x86 !x86_gcc2 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + sox$secondaryArchSuffix = $portVersion compat >= 1 + cmd:sox$secondaryArchSuffix = $portVersion + cmd:play$secondaryArchSuffix = $portVersion + cmd:rec$secondaryArchSuffix = $portVersion + cmd:soxi$secondaryArchSuffix = $portVersion + lib:libsox$secondaryArchSuffix = 0.0.0 compat >= 0 +" + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libflac$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libmp3lame$secondaryArchSuffix + lib:libsndfile$secondaryArchSuffix + lib:libpng$secondaryArchSuffix +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libflac$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libmp3lame$secondaryArchSuffix + devel:libsndfile$secondaryArchSuffix + devel:libpng$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:autoconf +" + +PATCHES="sox-14.4.2.patchset" + +SOURCE_DIR="sox-14.4.2" + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libsox + fixPkgconfig + + packageEntries devel $developDir +} + +PROVIDES_devel=" + sox${secondaryArchSuffix}_devel = $portVersion + devel:libsox$secondaryArchSuffix = 0.0.0 compat >= 0 +" + +REQUIRES_devel=" + sox${secondaryArchSuffix} == $portVersion base +" From 4b91a0efde4a312c57fb043d90a44bf01ec7701a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 28 Aug 2015 14:33:47 +0000 Subject: [PATCH 2/4] HaikuPorter Guidelines to SoX --- media-sound/sox/sox-14.4.2.recipe | 46 ++++++++++++++----------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/media-sound/sox/sox-14.4.2.recipe b/media-sound/sox/sox-14.4.2.recipe index ab4c12995..e2de55940 100644 --- a/media-sound/sox/sox-14.4.2.recipe +++ b/media-sound/sox/sox-14.4.2.recipe @@ -1,16 +1,17 @@ SUMMARY="A command line utility to do audio format conversions" -DESCRIPTION=" -SoX is a cross-platform (Windows, Linux, MacOS X, etc.) command line utility \ +DESCRIPTION="SoX is a cross-platform (Windows, Linux, MacOS X, etc.) command line utility \ that can convert various formats of computer audio files in to other formats. \ It can also apply various effects to these sound files, and, as an added \ -bonus, SoX can play and record audio files on most platforms -" +bonus, SoX can play and record audio files on most platforms." HOMEPAGE="http://sox.sourceforge.net" +COPYRIGHT="1991-2015 Lance Norskog" +LICENSE="GNU GPL v2" +REVISION="1" SOURCE_URI="http://sourceforge.net/projects/sox/files/sox/14.4.2/sox-14.4.2.tar.bz2" CHECKSUM_SHA256="81a6956d4330e75b5827316e44ae381e6f1e8928003c6aa45896da9041ea149c" -LICENSE="GNU GPL v2" -COPYRIGHT="1991-2015 Lance Norskog" -REVISION="1" +SOURCE_DIR="sox-14.4.2" +PATCHES="sox-14.4.2.patchset" + ARCHITECTURES="x86 !x86_gcc2 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -21,8 +22,7 @@ PROVIDES=" cmd:rec$secondaryArchSuffix = $portVersion cmd:soxi$secondaryArchSuffix = $portVersion lib:libsox$secondaryArchSuffix = 0.0.0 compat >= 0 -" - + " REQUIRES=" haiku$secondaryArchSuffix lib:libflac$secondaryArchSuffix @@ -31,7 +31,15 @@ REQUIRES=" lib:libmp3lame$secondaryArchSuffix lib:libsndfile$secondaryArchSuffix lib:libpng$secondaryArchSuffix -" + " + +PROVIDES_devel=" + sox${secondaryArchSuffix}_devel = $portVersion + devel:libsox$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + sox${secondaryArchSuffix} == $portVersion base + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel @@ -41,18 +49,13 @@ BUILD_REQUIRES=" devel:libmp3lame$secondaryArchSuffix devel:libsndfile$secondaryArchSuffix devel:libpng$secondaryArchSuffix -" - + " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make cmd:autoconf -" - -PATCHES="sox-14.4.2.patchset" - -SOURCE_DIR="sox-14.4.2" + " BUILD() { @@ -69,12 +72,3 @@ INSTALL() packageEntries devel $developDir } - -PROVIDES_devel=" - sox${secondaryArchSuffix}_devel = $portVersion - devel:libsox$secondaryArchSuffix = 0.0.0 compat >= 0 -" - -REQUIRES_devel=" - sox${secondaryArchSuffix} == $portVersion base -" From 425dc83f9d6bc4dc5b2a0250851820e625465f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 28 Aug 2015 14:45:10 +0000 Subject: [PATCH 3/4] Remove trailing whitespace --- media-sound/sox/sox-14.4.2.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/sox/sox-14.4.2.recipe b/media-sound/sox/sox-14.4.2.recipe index e2de55940..e7e63bd33 100644 --- a/media-sound/sox/sox-14.4.2.recipe +++ b/media-sound/sox/sox-14.4.2.recipe @@ -1,6 +1,6 @@ SUMMARY="A command line utility to do audio format conversions" DESCRIPTION="SoX is a cross-platform (Windows, Linux, MacOS X, etc.) command line utility \ -that can convert various formats of computer audio files in to other formats. \ +that can convert various formats of computer audio files in to other formats.\ It can also apply various effects to these sound files, and, as an added \ bonus, SoX can play and record audio files on most platforms." HOMEPAGE="http://sox.sourceforge.net" From fde29f17ec466ffee4f742e1b214e57630a4d438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 28 Aug 2015 14:57:37 +0000 Subject: [PATCH 4/4] Finally fixed trailing whitespace --- media-sound/sox/sox-14.4.2.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/sox/sox-14.4.2.recipe b/media-sound/sox/sox-14.4.2.recipe index e7e63bd33..26270006c 100644 --- a/media-sound/sox/sox-14.4.2.recipe +++ b/media-sound/sox/sox-14.4.2.recipe @@ -66,9 +66,9 @@ BUILD() INSTALL() { make install - + prepareInstalledDevelLibs libsox fixPkgconfig - + packageEntries devel $developDir }