From eb99616ca0759b8b66427793f3b302138f85944d Mon Sep 17 00:00:00 2001 From: Yourself Date: Mon, 22 Dec 2014 15:20:57 +0000 Subject: [PATCH 01/75] Added Snapshot recipe --- haiku-apps/snapshot/snapshot-1.0.recipe | 43 +++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 haiku-apps/snapshot/snapshot-1.0.recipe diff --git a/haiku-apps/snapshot/snapshot-1.0.recipe b/haiku-apps/snapshot/snapshot-1.0.recipe new file mode 100644 index 000000000..d04396364 --- /dev/null +++ b/haiku-apps/snapshot/snapshot-1.0.recipe @@ -0,0 +1,43 @@ +SUMMARY="Tracker add-on to take snapshots of files or folders" +DESCRIPTION="This Tracker add-on lets you take snapshots of a folder, saving it \ +as zip file, with a timestamp, to a preset folder. Snapshots are \ +currently saved to /boot/home/Snapshots" +HOMEPAGE="https://github.com/HaikuArchives/SnapShot" +SRC_URI="git+https://github.com/HaikuArchives/Snapshot#9ba592336a0d54707b7e5983dce93f8958b61d37 +LICENSE="BSD (3-clause)" +COPYRIGHT="2000 Jonas Sundström" + +USER_SETTINGS_FILES="settings/Kirilla/Snapshot/settings" + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + snapshot = $portVersion + addon:snapshot = $portVersion + " + +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + cd Source + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $addOnsDir/Tracker + cp -a Source/objects/Snapshot $addOnsDir/Tracker +} From 031a13aefb7fabc539345503f943709ee2c36bc1 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 23 Dec 2014 05:55:24 +0000 Subject: [PATCH 02/75] librsync: Update version Also addresses Adrien's request of using the full Git commit hash, which unfortunately is still needed although in the Git history it seems the version has already been released. Signed-off-by: Timothy Gu --- ...-1.0.0pre.recipe => librsync-1.0.0.recipe} | 30 +++++++++++-------- .../librsync/patches/librsync-1.0.0.patchset | 28 +++++++++++++++++ 2 files changed, 46 insertions(+), 12 deletions(-) rename net-libs/librsync/{librsync-1.0.0pre.recipe => librsync-1.0.0.recipe} (64%) create mode 100644 net-libs/librsync/patches/librsync-1.0.0.patchset diff --git a/net-libs/librsync/librsync-1.0.0pre.recipe b/net-libs/librsync/librsync-1.0.0.recipe similarity index 64% rename from net-libs/librsync/librsync-1.0.0pre.recipe rename to net-libs/librsync/librsync-1.0.0.recipe index f50168be7..1153bc485 100644 --- a/net-libs/librsync/librsync-1.0.0pre.recipe +++ b/net-libs/librsync/librsync-1.0.0.recipe @@ -7,10 +7,20 @@ design similar to that of zlib with the aim of allowing it to be embedded \ into many different applications." HOMEPAGE="http://librsync.sourcefrog.net" -GIT_HASH='ad8d065bfd' -SRC_URI="git://github.com/librsync/librsync.git#$GIT_HASH" -#CHECKSUM_SHA256="" + +# Unfortunately the maintainer of librsync did not publish a tag or released +# tarball for the 1.0.0 release (yet?). Use a static tarball with Git hash +# for now (which comparing to directly cloning allows for double-checking +# correctness of the source). +GIT_HASH='02f1cc19182845d37cfb6a893f54af220a294ce7' +# Attach the $GIT_HASH to the file name just in case upstream publishes an +# official release tarball. +SRC_FILENAME="librsync-${portVersion}-${GIT_HASH}.tar.gz" +SRC_URI="https://github.com/librsync/librsync/archive/${GIT_HASH}.tar.gz" +CHECKSUM_SHA256='25d046a8cbc6e075cc68925b5070c1f0e731e3a018446f6bda20ec9723a5631a' REVISION="1" +SOURCE_DIR="librsync-${GIT_HASH}" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" LICENSE="GNU LGPL v2.1" @@ -53,17 +63,11 @@ BUILD_PREREQUIRES=" PROVIDES=" $portName = $portVersion cmd:rdiff$secondaryArchSuffix = $portVersion - lib:librsync$secondaryArchSuffix = 1.0.2 compat >= 1 + lib:librsync$secondaryArchSuffix = 2.0.0 compat >= 2 " -PATCH() -{ - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac -} - BUILD() { - mkdir -p m4 autoreconf -fi runConfigure ./configure \ --enable-shared @@ -84,9 +88,11 @@ TEST() make check } +# Although the librsync soname is bumped to 2.0.0, it is purely an ABI change, +# so the compat level for the devel package remains at 1. PROVIDES_devel=" - ${portName}_devel = $portVersion - devel:librsync$secondaryArchSuffix = 1.0.2 compat >= 1 + ${portName}_devel = $portVersion compat >= 1 + devel:librsync$secondaryArchSuffix = 2.0.0 compat >= 1 " REQUIRES_devel=" librsync$secondaryArchSuffix == $portVersion base diff --git a/net-libs/librsync/patches/librsync-1.0.0.patchset b/net-libs/librsync/patches/librsync-1.0.0.patchset new file mode 100644 index 000000000..70a04f5bd --- /dev/null +++ b/net-libs/librsync/patches/librsync-1.0.0.patchset @@ -0,0 +1,28 @@ +From 6fdcdff86e215e06817462c0fe4d63a0ca64cf21 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Tue, 23 Dec 2014 06:15:47 +0000 +Subject: blake2b: Separate declaration and code + +Fixes old compilers like gcc 2.95.3. + +Signed-off-by: Timothy Gu + +diff --git a/blake2b-ref.c b/blake2b-ref.c +index bcf81da..43cf4c1 100644 +--- a/blake2b-ref.c ++++ b/blake2b-ref.c +@@ -149,10 +149,10 @@ static inline int blake2b_init0( blake2b_state *S ) + /* init xors IV with input parameter block */ + int blake2b_init_param( blake2b_state *S, const blake2b_param *P ) + { +- blake2b_init0( S ); + uint8_t *p = ( uint8_t * )( P ); + size_t i; + ++ blake2b_init0( S ); + /* IV XOR ParamBlock */ + for( i = 0; i < 8; ++i ) + S->h[i] ^= load64( p + sizeof( S->h[i] ) * i ); +-- +1.8.3.4 + From 58775420acbdbba23a8c7b97448ec6176761a211 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 23 Dec 2014 07:34:58 +0000 Subject: [PATCH 03/75] librsync: Do not depend on zlib and libbz2 They are not actually used upstream, although a configure check is in place. This commit warrants a rev bump but it should be in the same push as the previous commit which updates the package, so I skipped over it. Signed-off-by: Timothy Gu --- net-libs/librsync/librsync-1.0.0.recipe | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net-libs/librsync/librsync-1.0.0.recipe b/net-libs/librsync/librsync-1.0.0.recipe index 1153bc485..6d132d571 100644 --- a/net-libs/librsync/librsync-1.0.0.recipe +++ b/net-libs/librsync/librsync-1.0.0.recipe @@ -33,16 +33,12 @@ COPYRIGHT="1995 Patrick Powell REQUIRES=" haiku$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix lib:libpopt$secondaryArchSuffix - lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libbz2$secondaryArchSuffix devel:libpopt$secondaryArchSuffix - devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -66,6 +62,8 @@ PROVIDES=" lib:librsync$secondaryArchSuffix = 2.0.0 compat >= 2 " +PATCHES="librsync-${portVersion}.patchset" + BUILD() { autoreconf -fi From abab702011f773bbe3bcfb0e4f8e3bf76ca5d28b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 23 Dec 2014 10:34:49 +0100 Subject: [PATCH 04/75] Beam: avoid triggering #6400. --- haiku-apps/beam/beam-1.2alpha.recipe | 2 +- .../beam/patches/beam-1.2alpha.patchset | 28 ++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/haiku-apps/beam/beam-1.2alpha.recipe b/haiku-apps/beam/beam-1.2alpha.recipe index 86dc8d459..1fe158b50 100644 --- a/haiku-apps/beam/beam-1.2alpha.recipe +++ b/haiku-apps/beam/beam-1.2alpha.recipe @@ -1,7 +1,7 @@ SUMMARY="An e-mail client." HOMEPAGE="http://beam.sourceforge.net" SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86" PROVIDES=" beam = $portVersion diff --git a/haiku-apps/beam/patches/beam-1.2alpha.patchset b/haiku-apps/beam/patches/beam-1.2alpha.patchset index 5ac3ffe2d..fbb9c2df8 100644 --- a/haiku-apps/beam/patches/beam-1.2alpha.patchset +++ b/haiku-apps/beam/patches/beam-1.2alpha.patchset @@ -1,4 +1,4 @@ -From 6545d15dfc53594f4141047bf4c84d55cfccda6d Mon Sep 17 00:00:00 2001 +From e6115845893578b237144c1660a686802598ff9a Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 14 Nov 2013 02:12:56 -0700 Subject: Adjust search path for libbnetapi @@ -20,3 +20,29 @@ index d411b68..4874ac6 100644 -- 1.8.3.4 + +From 63db87fb177e6c1649bf0aad0aa1922af47dd59e Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 23 Dec 2014 10:18:56 +0100 +Subject: Remove leftover unlock. + +I can't find any place where the lock would be locked matching this call +to Unlock. Must be an error then. + +Triggers #6400 on Haiku. + +diff --git a/src-beam/BmGuiRoster.cpp b/src-beam/BmGuiRoster.cpp +index d16e0f1..cd4bf59 100644 +--- a/src-beam/BmGuiRoster.cpp ++++ b/src-beam/BmGuiRoster.cpp +@@ -516,7 +516,6 @@ void BmGuiRoster::RebuildLogMenu( BmMenuControllerBase* logMenu) { + } + logMenu->AddItem( smtpMenu); + } +- TheLogHandler->mLocker.Unlock(); + } + + /*------------------------------------------------------------------------------*\ +-- +1.8.3.4 + From 3782bb3e175e96a1146dcaefb657a3a8c5baddf0 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 23 Dec 2014 18:01:49 +0000 Subject: [PATCH 05/75] libpng*: bump versions. --- .../{libpng-1.5.20.recipe => libpng-1.5.21.recipe} | 10 +++++----- ...bpng12-1.2.51.recipe => libpng12-1.2.52.recipe} | 14 +++++++------- ...bpng16-1.6.15.recipe => libpng16-1.6.16.recipe} | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) rename media-libs/libpng/{libpng-1.5.20.recipe => libpng-1.5.21.recipe} (83%) rename media-libs/libpng/{libpng12-1.2.51.recipe => libpng12-1.2.52.recipe} (79%) rename media-libs/libpng/{libpng16-1.6.15.recipe => libpng16-1.6.16.recipe} (85%) diff --git a/media-libs/libpng/libpng-1.5.20.recipe b/media-libs/libpng/libpng-1.5.21.recipe similarity index 83% rename from media-libs/libpng/libpng-1.5.20.recipe rename to media-libs/libpng/libpng-1.5.21.recipe index a47415858..2c9db48c5 100644 --- a/media-libs/libpng/libpng-1.5.20.recipe +++ b/media-libs/libpng/libpng-1.5.21.recipe @@ -11,15 +11,15 @@ COPYRIGHT=" " LICENSE="LibPNG" SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz" -CHECKSUM_SHA256="ca16b85feea75604d6ee2072486afe3fb52d867b4105e0bc60dbea78b4bc2ee0" +CHECKSUM_SHA256="835ce1d42ea9f50eddf74754f2b06b1c0f7a1d8e46deb89b839a5ca018599793" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libpng$secondaryArchSuffix = $portVersion compat >= 1.5 - lib:libpng$secondaryArchSuffix = 15.20.0 compat >= 15 - lib:libpng15$secondaryArchSuffix = 15.20.0 compat >= 15 + lib:libpng$secondaryArchSuffix = 15.21.0 compat >= 15 + lib:libpng15$secondaryArchSuffix = 15.21.0 compat >= 15 " REQUIRES=" haiku$secondaryArchSuffix @@ -70,8 +70,8 @@ PROVIDES_devel=" libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.5 cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.5 cmd:libpng15_config$secondaryArchSuffix = $portVersion compat >= 1.5 - devel:libpng$secondaryArchSuffix = 15.20.0 compat >= 15 - devel:libpng15$secondaryArchSuffix = 15.20.0 compat >= 15 + devel:libpng$secondaryArchSuffix = 15.21.0 compat >= 15 + devel:libpng15$secondaryArchSuffix = 15.21.0 compat >= 15 " REQUIRES_devel=" libpng$secondaryArchSuffix == $portVersion base diff --git a/media-libs/libpng/libpng12-1.2.51.recipe b/media-libs/libpng/libpng12-1.2.52.recipe similarity index 79% rename from media-libs/libpng/libpng12-1.2.51.recipe rename to media-libs/libpng/libpng12-1.2.52.recipe index 8406b6ca9..6fb3d3cc6 100644 --- a/media-libs/libpng/libpng12-1.2.51.recipe +++ b/media-libs/libpng/libpng12-1.2.52.recipe @@ -13,17 +13,17 @@ COPYRIGHT=" 1995-1996 Guy Eric Schalnat, Group 42, Inc. " LICENSE="LibPNG" -SRC_URI="http://sourceforge.net/projects/libpng/files/libpng12/1.2.51/libpng-1.2.51.tar.bz2" -CHECKSUM_SHA256="b0ad409d7048c851eadb2abab6c1a1a1e131bc4d3d07501ff7c820cce5bec811" -SOURCE_DIR="libpng-1.2.51" +SRC_URI="http://sourceforge.net/projects/libpng/files/libpng12/$portVersion/libpng-$portVersion.tar.bz2" +CHECKSUM_SHA256="e90ede6d543152e68c08c91c45f39565185ac7eb8cb2b5d058a196050ab04229" +SOURCE_DIR="libpng-$portVersion" REVISION="1" ARCHITECTURES="x86_gcc2" SECONDARY_ARCHITECTURES="x86_gcc2" PROVIDES=" libpng12$secondaryArchSuffix = $portVersion compat >= 1.2 - lib:libpng$secondaryArchSuffix = 3.51.0 compat >= 3 - lib:libpng12$secondaryArchSuffix = 3.51.0 compat >= 3 + lib:libpng$secondaryArchSuffix = 3.52.0 compat >= 3 + lib:libpng12$secondaryArchSuffix = 3.52.0 compat >= 3 " REQUIRES=" haiku$secondaryArchSuffix @@ -72,8 +72,8 @@ PROVIDES_devel=" libpng12${secondaryArchSuffix}_devel = $portVersion compat >= 1.2 cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.2 cmd:libpng12_config$secondaryArchSuffix = $portVersion compat >= 1.2 - devel:libpng$secondaryArchSuffix = 3.51.0 compat >= 3 - devel:libpng12$secondaryArchSuffix = 3.51.0 compat >= 3 + devel:libpng$secondaryArchSuffix = 3.52.0 compat >= 3 + devel:libpng12$secondaryArchSuffix = 3.52.0 compat >= 3 " REQUIRES_devel=" libpng12$secondaryArchSuffix == $portVersion base diff --git a/media-libs/libpng/libpng16-1.6.15.recipe b/media-libs/libpng/libpng16-1.6.16.recipe similarity index 85% rename from media-libs/libpng/libpng16-1.6.15.recipe rename to media-libs/libpng/libpng16-1.6.16.recipe index 39fde2cdc..db5882161 100644 --- a/media-libs/libpng/libpng16-1.6.15.recipe +++ b/media-libs/libpng/libpng16-1.6.16.recipe @@ -11,7 +11,7 @@ COPYRIGHT=" " LICENSE="LibPNG" SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz" -CHECKSUM_SHA256="dc4f90ff3ba4559b5eb653da9058e3d862d5e8162fe2612f9339a6f6d2a2139d" +CHECKSUM_SHA256="02f96b6bad5a381d36d7ba7a5d9be3b06f7fe6c274da00707509c23592a073ad" SOURCE_DIR="libpng-$portVersion" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" @@ -19,8 +19,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libpng16$secondaryArchSuffix = $portVersion compat >= 1.6 - lib:libpng$secondaryArchSuffix = 16.15.0 compat >= 16 - lib:libpng16$secondaryArchSuffix = 16.15.0 compat >= 16 + lib:libpng$secondaryArchSuffix = 16.16.0 compat >= 16 + lib:libpng16$secondaryArchSuffix = 16.16.0 compat >= 16 " REQUIRES=" haiku$secondaryArchSuffix @@ -69,8 +69,8 @@ PROVIDES_devel=" cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6 cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6 cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6 - devel:libpng$secondaryArchSuffix = 16.15.0 compat >= 16 - devel:libpng16$secondaryArchSuffix = 16.15.0 compat >= 16 + devel:libpng$secondaryArchSuffix = 16.16.0 compat >= 16 + devel:libpng16$secondaryArchSuffix = 16.16.0 compat >= 16 " REQUIRES_devel=" libpng16$secondaryArchSuffix == $portVersion base From ffdb78ace579d4022d80477cba76dcba7f30f8db Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Tue, 23 Dec 2014 18:46:42 +0100 Subject: [PATCH 06/75] binary_clock: Rename to binaryclock --- .../binaryclock-2.0.recipe} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename haiku-apps/{binary_clock/binary_clock-2.0.recipe => binaryclock/binaryclock-2.0.recipe} (100%) diff --git a/haiku-apps/binary_clock/binary_clock-2.0.recipe b/haiku-apps/binaryclock/binaryclock-2.0.recipe similarity index 100% rename from haiku-apps/binary_clock/binary_clock-2.0.recipe rename to haiku-apps/binaryclock/binaryclock-2.0.recipe From 271a57f7faa274994f53d16189ff6c6175b0ed8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 23 Dec 2014 18:59:34 +0000 Subject: [PATCH 07/75] OpenSceneGraph 3.2.1 --- games-engines/openscenegraph/licenses/OSGPL | 578 ++++++++++++++++++ .../openscenegraph-3.2.1.recipe | 151 +++++ 2 files changed, 729 insertions(+) create mode 100644 games-engines/openscenegraph/licenses/OSGPL create mode 100644 games-engines/openscenegraph/openscenegraph-3.2.1.recipe diff --git a/games-engines/openscenegraph/licenses/OSGPL b/games-engines/openscenegraph/licenses/OSGPL new file mode 100644 index 000000000..6340792d7 --- /dev/null +++ b/games-engines/openscenegraph/licenses/OSGPL @@ -0,0 +1,578 @@ + OpenSceneGraph Public License, Version 0.0 + ========================================== + + Copyright (C) 2002 Robert Osfield. + + Everyone is permitted to copy and distribute verbatim copies + of this licence document, but changing it is not allowed. + + OPENSCENEGRAPH PUBLIC LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + This library is free software; you can redistribute it and/or modify it + under the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 + or later. + + Notes: the OSGPL is based on the LGPL, with the 4 exceptions laid + out in the wxWindows section below. The LGPL is contained in the + final section of this license. + + +------------------------------------------------------------------------------- + + wxWindows Library Licence, Version 3 + ==================================== + + Copyright (C) 1998 Julian Smart, Robert Roebling [, ...] + + Everyone is permitted to copy and distribute verbatim copies + of this licence document, but changing it is not allowed. + + WXWINDOWS LIBRARY LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public Licence as published by + the Free Software Foundation; either version 2 of the Licence, or (at + your option) any later version. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library + General Public Licence for more details. + + You should have received a copy of the GNU Library General Public Licence + along with this software, usually in a file named COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Boston, MA 02111-1307 USA. + + EXCEPTION NOTICE + + 1. As a special exception, the copyright holders of this library give + permission for additional uses of the text contained in this release of + the library as licenced under the wxWindows Library Licence, applying + either version 3 of the Licence, or (at your option) any later version of + the Licence as published by the copyright holders of version 3 of the + Licence document. + + 2. The exception is that you may use, copy, link, modify and distribute + under the user's own terms, binary object code versions of works based + on the Library. + + 3. If you copy code from files distributed under the terms of the GNU + General Public Licence or the GNU Library General Public Licence into a + copy of this library, as this licence permits, the exception does not + apply to the code that you add in this way. To avoid misleading anyone as + to the status of such modified files, you must delete this exception + notice from such code and/or adjust the licensing conditions notice + accordingly. + + 4. If you write modifications of your own for this library, it is your + choice whether to permit this exception to apply to your modifications. + If you do not wish that, you must delete the exception notice from such + code and/or adjust the licensing conditions notice accordingly. + + +------------------------------------------------------------------------------ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe new file mode 100644 index 000000000..eae625f33 --- /dev/null +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -0,0 +1,151 @@ +SUMMARY="The OpenSceneGraph is open source, real-time graphics middle-ware used by application developers" +DESCRIPTION=" +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used +by application developers in fields such as visual simulation, games, virtual +reality, scientific visualization and modelling. Written entirely in Standard +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well +established as the world leading scene graph technology, used widely in the +vis-sim, space, scientific, oil-gas, games and virtual reality industries." +HOMEPAGE="http://www.openscenegraph.org" +SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip" +CHECKSUM_SHA256="d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d" +REVISION="1" +LICENSE="OSGPL" +COPYRIGHT="Copyright (C) 2002-2014 Robert Osfield and others" + +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + openscenegraph$secondaryArchSuffix = $portVersion + lib:libOpenThreads$secondaryArchSuffix = $portVersion + lib:libosg$secondaryArchSuffix = $portVersion + lib:libosgAnimation$secondaryArchSuffix = $portVersion + lib:libosgDB$secondaryArchSuffix = $portVersion + lib:libosgFX$secondaryArchSuffix = $portVersion + lib:libosgGA$secondaryArchSuffix = $portVersion + lib:libosgManipulator$secondaryArchSuffix = $portVersion + lib:libosgParticle$secondaryArchSuffix = $portVersion + lib:libosgPresentation$secondaryArchSuffix = $portVersion + lib:libosgShadow$secondaryArchSuffix = $portVersion + lib:libosgSim$secondaryArchSuffix = $portVersion + lib:libosgTerrain$secondaryArchSuffix = $portVersion + lib:libosgText$secondaryArchSuffix = $portVersion + lib:libosgUtil$secondaryArchSuffix = $portVersion + lib:libosgViewer$secondaryArchSuffix = $portVersion + lib:libosgVolume$secondaryArchSuffix = $portVersion + lib:libosgWidget$secondaryArchSuffix = $portVersion +" + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + mesa$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + mesa${secondaryArchSuffix}_devel + devel:libsdl$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:cmake + cmd:make + cmd:pkg_config$secondaryArchSuffix +" + +SOURCE_DIR="OpenSceneGraph-3.2.1" + +BUILD() +{ + cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DOSG_USE_QT=OFF -DBUILD_OSG_APPLICATIONS=OFF -DOSG_WINDOWING_SYSTEM=None + make + +} + +INSTALL() +{ + make install + + mkdir -p $includeDir + mv $prefix/include/* $includeDir/ + rm -rf $prefix/include + + mkdir -p $prefix/lib-temp + mv $prefix/lib/* $prefix/lib-temp/ + ls $prefix/lib-temp + mkdir -p $libDir + mv $prefix/lib-temp/* $libDir + rm -rf $prefix/lib-temp + + prepareInstalledDevelLibs libOpenThreads + prepareInstalledDevelLibs libosg + prepareInstalledDevelLibs libosgAnimation + prepareInstalledDevelLibs libosgDB + prepareInstalledDevelLibs libosgFX + prepareInstalledDevelLibs libosgGA + prepareInstalledDevelLibs libosgManipulator + prepareInstalledDevelLibs libosgParticle + prepareInstalledDevelLibs libosgPresentation + prepareInstalledDevelLibs libosgShadow + prepareInstalledDevelLibs libosgSim + prepareInstalledDevelLibs libosgTerrain + prepareInstalledDevelLibs libosgText + prepareInstalledDevelLibs libosgUtil + prepareInstalledDevelLibs libosgViewer + prepareInstalledDevelLibs libosgVolume + prepareInstalledDevelLibs libosgWidget + + fixPkgconfig + + packageEntries devel $developDir + +} + +PROVIDES_devel=" + devel:openscenegraph$secondaryArchSuffix = $portVersion + devel:libOpenThreads$secondaryArchSuffix = $portVersion + devel:libosg$secondaryArchSuffix = $portVersion + devel:libosgAnimation$secondaryArchSuffix = $portVersion + devel:libosgDB$secondaryArchSuffix = $portVersion + devel:libosgFX$secondaryArchSuffix = $portVersion + devel:libosgGA$secondaryArchSuffix = $portVersion + devel:libosgManipulator$secondaryArchSuffix = $portVersion + devel:libosgParticle$secondaryArchSuffix = $portVersion + devel:libosgPresentation$secondaryArchSuffix = $portVersion + devel:libosgShadow$secondaryArchSuffix = $portVersion + devel:libosgSim$secondaryArchSuffix = $portVersion + devel:libosgTerrain$secondaryArchSuffix = $portVersion + devel:libosgText$secondaryArchSuffix = $portVersion + devel:libosgUtil$secondaryArchSuffix = $portVersion + devel:libosgViewer$secondaryArchSuffix = $portVersion + devel:libosgVolume$secondaryArchSuffix = $portVersion + devel:libosgWidget$secondaryArchSuffix = $portVersion + +" +REQUIRES_devel=" + openscenegraph$secondaryArchSuffix == $portVersion +" From 2ad8737b49fa0545f3896fe895dd254294288b2d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 23 Dec 2014 18:13:16 +0000 Subject: [PATCH 08/75] dgen: the URL without download definitely works. --- games-emulation/dgen/dgen-1.33.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/games-emulation/dgen/dgen-1.33.recipe b/games-emulation/dgen/dgen-1.33.recipe index 9e5f00cae..619d0b82c 100644 --- a/games-emulation/dgen/dgen-1.33.recipe +++ b/games-emulation/dgen/dgen-1.33.recipe @@ -9,8 +9,7 @@ Genesis and Mega Drive systems. Features: * Screenshots, demos recording and playback" HOMEPAGE="http://dgen.sourceforge.net/" COPYRIGHT="1998-2014 tamentis & zamaz" -SRC_URI="http://sourceforge.net/projects/dgen/files/dgen/$portVersion/dgen-sdl-$portVersion.tar.gz/download" -SRC_FILENAME="dgen-sdl-$portVersion.tar.gz" +SRC_URI="http://sourceforge.net/projects/dgen/files/dgen/$portVersion/dgen-sdl-$portVersion.tar.gz" CHECKSUM_SHA256="99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e" SOURCE_DIR="dgen-sdl-$portVersion" REVISION="1" From 45f29ab922e5836e3695d21e47b4278c05725a97 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 23 Dec 2014 18:59:36 +0000 Subject: [PATCH 09/75] subversion: bump version --- ...{subversion-1.8.10.patchset => subversion-1.8.11.patchset} | 0 .../{subversion-1.8.10.recipe => subversion-1.8.11.recipe} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename dev-vcs/subversion/patches/{subversion-1.8.10.patchset => subversion-1.8.11.patchset} (100%) rename dev-vcs/subversion/{subversion-1.8.10.recipe => subversion-1.8.11.recipe} (97%) diff --git a/dev-vcs/subversion/patches/subversion-1.8.10.patchset b/dev-vcs/subversion/patches/subversion-1.8.11.patchset similarity index 100% rename from dev-vcs/subversion/patches/subversion-1.8.10.patchset rename to dev-vcs/subversion/patches/subversion-1.8.11.patchset diff --git a/dev-vcs/subversion/subversion-1.8.10.recipe b/dev-vcs/subversion/subversion-1.8.11.recipe similarity index 97% rename from dev-vcs/subversion/subversion-1.8.10.recipe rename to dev-vcs/subversion/subversion-1.8.11.recipe index 2d64dd0f5..aa05c4f6c 100644 --- a/dev-vcs/subversion/subversion-1.8.10.recipe +++ b/dev-vcs/subversion/subversion-1.8.11.recipe @@ -10,7 +10,7 @@ HOMEPAGE="http://subversion.apache.org" LICENSE="Apache-Subversion" COPYRIGHT="2010-2014 The Apache Software Foundation" SRC_URI="http://wwwftp.ciril.fr/pub/apache/subversion/subversion-$portVersion.tar.bz2" -CHECKSUM_SHA256="1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc" +CHECKSUM_SHA256="10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -81,7 +81,7 @@ USER_SETTINGS_FILES=" " -PATCHES="subversion-1.8.10.patchset" +PATCHES="subversion-$portVersion.patchset" BUILD() { From 2a840bccd7752b8778637cefa53e7ef5c11601f8 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Tue, 23 Dec 2014 19:04:04 +0100 Subject: [PATCH 10/75] binaryclock: Update to latest version --- ...2.0.recipe => binaryclock-20141223.recipe} | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) rename haiku-apps/binaryclock/{binaryclock-2.0.recipe => binaryclock-20141223.recipe} (63%) diff --git a/haiku-apps/binaryclock/binaryclock-2.0.recipe b/haiku-apps/binaryclock/binaryclock-20141223.recipe similarity index 63% rename from haiku-apps/binaryclock/binaryclock-2.0.recipe rename to haiku-apps/binaryclock/binaryclock-20141223.recipe index ef07650c9..a685cdd21 100644 --- a/haiku-apps/binaryclock/binaryclock-2.0.recipe +++ b/haiku-apps/binaryclock/binaryclock-20141223.recipe @@ -5,7 +5,7 @@ quite enjoyable to reprogram my brain to learn to read it at a glance. It just \ takes a little getting used to. " HOMEPAGE="http://github.com/HaikuArchives/BinaryClock" -SRC_URI="git://github.com/HaikuArchives/BinaryClock#5d04da1137" +SRC_URI="git://github.com/HaikuArchives/BinaryClock#bfefbf7f93e7a07c841fdb1162e119b0364fee85" REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="2000 David Enderson" @@ -13,7 +13,7 @@ COPYRIGHT="2000 David Enderson" ARCHITECTURES="x86_gcc2 !x86 !x86_64" PROVIDES=" - binary_clock = $portVersion + binaryclock = $portVersion app:BinaryClock = $portVersion " @@ -26,26 +26,32 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" + makefile_engine cmd:make cmd:gcc cmd:ld " USER_SETTINGS_FILES=" - settings/BinaryClock_2.xx + settings/BinaryClock " BUILD() { cd Application - g++ -o BinaryClock *.cpp -lbe -ltranslation - xres -o BinaryClock BinaryClock.rsrc - mimeset -f BinaryClock + make $jobArgs OBJ_DIR=objects + + cd ../Screensaver + make $jobArgs OBJ_DIR=objects } INSTALL() { - mkdir -p $appsDir - cp Application/BinaryClock $appsDir + mkdir -p $appsDir + mkdir -p $addOnsDir/Screen\ Savers/ + + cp Application/objects/BinaryClock $appsDir addAppDeskbarSymlink $appsDir/BinaryClock "Binary Clock" + + cp Screensaver/objects/BinaryClock $addOnsDir/Screen\ Savers } From 3ded2df0ab4f0fc6263c836b83dfab4157b9a1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 23 Dec 2014 19:11:35 +0000 Subject: [PATCH 11/75] Add the patchset for OpenSceneGraph 3.2.1 --- .../openscenegraph-3.2.1.recipe | 2 + .../patches/openscenegraph_x86-3.2.1.patchset | 52 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe index eae625f33..88ddb08bf 100644 --- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -77,6 +77,8 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +PATCH="openscenegraph_x86-3.2.1.patchset" + SOURCE_DIR="OpenSceneGraph-3.2.1" BUILD() diff --git a/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset b/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset new file mode 100644 index 000000000..6871ef357 --- /dev/null +++ b/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset @@ -0,0 +1,52 @@ +From c4669d4e62e056fc2b29cc1372e41fcba9d286da Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Tue, 23 Dec 2014 19:08:44 +0000 +Subject: Haiku specific cases + + +diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp +index affd682..47436d5 100644 +--- a/src/osgDB/FileUtils.cpp ++++ b/src/osgDB/FileUtils.cpp +@@ -71,12 +71,13 @@ typedef char TCHAR; + // variable. (MIN_ALLOWED is set low by default so it is + // unhelpful in this case.) + // Unfortunately, we can't use the label MAC_OS_X_VERSION_10_4 +- // for older OS's like Jaguar, Panther since they are not defined, ++ // for older OS's like Jaguar, Panther ++ since they are not defined, + // so I am going to hardcode the number. + #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) + #define stat64 stat + #endif +-#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ ++#elif defined(__CYGWIN__) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ + (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) + #define stat64 stat + #endif +@@ -100,7 +101,7 @@ typedef char TCHAR; + #include + + #include +-#include ++#include + #include + + #include +diff --git a/src/osgPlugins/osc/osc/OscHostEndianness.h b/src/osgPlugins/osc/osc/OscHostEndianness.h +index 3720ea6..6f4c6bc 100644 +--- a/src/osgPlugins/osc/osc/OscHostEndianness.h ++++ b/src/osgPlugins/osc/osc/OscHostEndianness.h +@@ -51,7 +51,7 @@ + + #else + +- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) ++ #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) || defined(__HAIKU__) + #include + #if (__BYTE_ORDER == __LITTLE_ENDIAN) + #define __LITTLE_ENDIAN__ +-- +1.8.3.4 + From 700f39af1eeaa361b61ca01a55f6b7369fc48f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 23 Dec 2014 19:27:23 +0000 Subject: [PATCH 12/75] Style fixes --- .../openscenegraph-3.2.1.recipe | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe index 88ddb08bf..79af87fb7 100644 --- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -1,18 +1,18 @@ -SUMMARY="The OpenSceneGraph is open source, real-time graphics middle-ware used by application developers" +SUMMARY="An open source, real-time graphics middle-ware used by application developers" DESCRIPTION=" -The OpenSceneGraph is an open source high performance 3D graphics toolkit, used -by application developers in fields such as visual simulation, games, virtual -reality, scientific visualization and modelling. Written entirely in Standard -C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris -, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well -established as the world leading scene graph technology, used widely in the +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used\ +by application developers in fields such as visual simulation, games, virtual\ +reality, scientific visualization and modelling. Written entirely in Standard\ +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris\ +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well\ +established as the world leading scene graph technology, used widely in the\ vis-sim, space, scientific, oil-gas, games and virtual reality industries." HOMEPAGE="http://www.openscenegraph.org" SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip" CHECKSUM_SHA256="d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d" REVISION="1" LICENSE="OSGPL" -COPYRIGHT="Copyright (C) 2002-2014 Robert Osfield and others" +COPYRIGHT="2002-2014 Robert Osfield and others" ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -46,7 +46,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix mesa$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -58,7 +58,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel mesa${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:libpng$secondaryArchSuffix From ee279b31f703fee2840ea122d3fc709d160d8f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 23 Dec 2014 19:57:14 +0000 Subject: [PATCH 13/75] Fixing a type bug --- .../patches/openscenegraph_x86-3.2.1.patchset | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset b/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset index 6871ef357..593a5cef1 100644 --- a/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset +++ b/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset @@ -50,3 +50,28 @@ index 3720ea6..6f4c6bc 100644 -- 1.8.3.4 + +From 7fa67738f702dc39b16f2caa05b9301e09209a5b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Tue, 23 Dec 2014 19:56:17 +0000 +Subject: Stupid type-bug + + +diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp +index 47436d5..060eb29 100644 +--- a/src/osgDB/FileUtils.cpp ++++ b/src/osgDB/FileUtils.cpp +@@ -71,8 +71,7 @@ typedef char TCHAR; + // variable. (MIN_ALLOWED is set low by default so it is + // unhelpful in this case.) + // Unfortunately, we can't use the label MAC_OS_X_VERSION_10_4 +- // for older OS's like Jaguar, Panther +- since they are not defined, ++ // for older OS's like Jaguar, Panther since they are not defined, + // so I am going to hardcode the number. + #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) + #define stat64 stat +-- +1.8.3.4 + From ec041f4f81cd6fd6141a9e9cf121608f9f78add0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 23 Dec 2014 20:05:23 +0000 Subject: [PATCH 14/75] OpenSceneGraph Git --- .../openscenegraph/openscenegraph-git.recipe | 152 ++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 games-engines/openscenegraph/openscenegraph-git.recipe diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe new file mode 100644 index 000000000..61b17c0a4 --- /dev/null +++ b/games-engines/openscenegraph/openscenegraph-git.recipe @@ -0,0 +1,152 @@ +SUMMARY="An open source, real-time graphics middle-ware used by application developers" +DESCRIPTION=" +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used\ +by application developers in fields such as visual simulation, games, virtual\ +reality, scientific visualization and modelling. Written entirely in Standard\ +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris\ +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well\ +established as the world leading scene graph technology, used widely in the\ +vis-sim, space, scientific, oil-gas, games and virtual reality industries." +HOMEPAGE="http://www.openscenegraph.org" +SRC_URI="git://github.com/openscenegraph/osg.git" +REVISION="1" +LICENSE="OSGPL" +COPYRIGHT="2002-2014 Robert Osfield and others" + +ARCHITECTURES="?x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES ?x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + openscenegraph$secondaryArchSuffix = $portVersion + lib:libOpenThreads$secondaryArchSuffix = $portVersion + lib:libosg$secondaryArchSuffix = $portVersion + lib:libosgAnimation$secondaryArchSuffix = $portVersion + lib:libosgDB$secondaryArchSuffix = $portVersion + lib:libosgFX$secondaryArchSuffix = $portVersion + lib:libosgGA$secondaryArchSuffix = $portVersion + lib:libosgManipulator$secondaryArchSuffix = $portVersion + lib:libosgParticle$secondaryArchSuffix = $portVersion + lib:libosgPresentation$secondaryArchSuffix = $portVersion + lib:libosgShadow$secondaryArchSuffix = $portVersion + lib:libosgSim$secondaryArchSuffix = $portVersion + lib:libosgTerrain$secondaryArchSuffix = $portVersion + lib:libosgText$secondaryArchSuffix = $portVersion + lib:libosgUtil$secondaryArchSuffix = $portVersion + lib:libosgViewer$secondaryArchSuffix = $portVersion + lib:libosgVolume$secondaryArchSuffix = $portVersion + lib:libosgWidget$secondaryArchSuffix = $portVersion +" + +REQUIRES=" + haiku$secondaryArchSuffix + mesa$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + mesa${secondaryArchSuffix}_devel + devel:libsdl$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:cmake + cmd:make + cmd:pkg_config$secondaryArchSuffix +" + +PATCH="openscenegraph_x86-3.2.1.patchset" + +SOURCE_DIR="OpenSceneGraph" + +BUILD() +{ + cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DOSG_USE_QT=OFF -DBUILD_OSG_APPLICATIONS=OFF -DOSG_WINDOWING_SYSTEM=None + make + +} + +INSTALL() +{ + make install + + mkdir -p $includeDir + mv $prefix/include/* $includeDir/ + rm -rf $prefix/include + + mkdir -p $prefix/lib-temp + mv $prefix/lib/* $prefix/lib-temp/ + ls $prefix/lib-temp + mkdir -p $libDir + mv $prefix/lib-temp/* $libDir + rm -rf $prefix/lib-temp + + prepareInstalledDevelLibs libOpenThreads + prepareInstalledDevelLibs libosg + prepareInstalledDevelLibs libosgAnimation + prepareInstalledDevelLibs libosgDB + prepareInstalledDevelLibs libosgFX + prepareInstalledDevelLibs libosgGA + prepareInstalledDevelLibs libosgManipulator + prepareInstalledDevelLibs libosgParticle + prepareInstalledDevelLibs libosgPresentation + prepareInstalledDevelLibs libosgShadow + prepareInstalledDevelLibs libosgSim + prepareInstalledDevelLibs libosgTerrain + prepareInstalledDevelLibs libosgText + prepareInstalledDevelLibs libosgUtil + prepareInstalledDevelLibs libosgViewer + prepareInstalledDevelLibs libosgVolume + prepareInstalledDevelLibs libosgWidget + + fixPkgconfig + + packageEntries devel $developDir + +} + +PROVIDES_devel=" + devel:openscenegraph$secondaryArchSuffix = $portVersion + devel:libOpenThreads$secondaryArchSuffix = $portVersion + devel:libosg$secondaryArchSuffix = $portVersion + devel:libosgAnimation$secondaryArchSuffix = $portVersion + devel:libosgDB$secondaryArchSuffix = $portVersion + devel:libosgFX$secondaryArchSuffix = $portVersion + devel:libosgGA$secondaryArchSuffix = $portVersion + devel:libosgManipulator$secondaryArchSuffix = $portVersion + devel:libosgParticle$secondaryArchSuffix = $portVersion + devel:libosgPresentation$secondaryArchSuffix = $portVersion + devel:libosgShadow$secondaryArchSuffix = $portVersion + devel:libosgSim$secondaryArchSuffix = $portVersion + devel:libosgTerrain$secondaryArchSuffix = $portVersion + devel:libosgText$secondaryArchSuffix = $portVersion + devel:libosgUtil$secondaryArchSuffix = $portVersion + devel:libosgViewer$secondaryArchSuffix = $portVersion + devel:libosgVolume$secondaryArchSuffix = $portVersion + devel:libosgWidget$secondaryArchSuffix = $portVersion + +" +REQUIRES_devel=" + openscenegraph$secondaryArchSuffix == $portVersion +" From 36b2f3f5affe97663aa59c3d8c1b165f490af6d2 Mon Sep 17 00:00:00 2001 From: DarkmatterVale Date: Tue, 23 Dec 2014 20:59:18 +0000 Subject: [PATCH 15/75] Added mythes recipe --- app-dicts/mythes/mythes-1.2.4.recipe | 84 ++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 app-dicts/mythes/mythes-1.2.4.recipe diff --git a/app-dicts/mythes/mythes-1.2.4.recipe b/app-dicts/mythes/mythes-1.2.4.recipe new file mode 100644 index 000000000..eb22a9f02 --- /dev/null +++ b/app-dicts/mythes/mythes-1.2.4.recipe @@ -0,0 +1,84 @@ +SUMMARY="A simple thesaurus" +DESCRIPTION="MyThes is a simple thesaurus that used a structured text \ +data file and an index file with binary search to lookup words \ +and phrases and return information on part of speech, \ +meanings, and synonyms. + +- written in C++ to make it easier to interface with \ +LibreOffice, OpenOffice, AbiWord, Pspell, etc +- it is stateless, uses no static variables and \ +should be completely reentrant with no ifdefs +- it compiles with -ansi and -pedantic and -Wall \ +with no warnigns so it shouldbe quite portable +- it uses a simple perl program to read the structured \ +text file and create the index needed for binary \ +searching +- it is very simple with *lots* of comments. \ +The main "smarts" are in the structure of the \ +text file that makes up the thesaurus data +- It comes with a ready-to-go structured thesaurus \ +data file for en_US extracted from the WordNet-2.0 data. +- Please see WordNet_license.txt and WordNet_readme.txt \ +for more information on the very useful project! +- See http://www.danielnaber.de/wn2ooo/ for utilities to \ +regenerate an up to date English thesaurus from the most \ +recent WordNet data." +HOMEPAGE="http://sourceforge.net/projects/hunspell/files/MyThes/1.2.4" +SRC_URI="http://prdownloads.sf.net/hunspell/mythes-1.2.4.tar.gz" +CHECKSUM_SHA256="1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f" +COPYRIGHT="1994 - 2009 Free Software Foundation, Inc." +LICENSE="BSD (2-clause)" +REVISION="1" + +PROVIDES=" + mythes$secondaryArchSuffix = $portVersion + cmd:mythes = $portVersion + cmd:th_gen_idx.pl + lib:libmythes_1.2$secondaryArchSuffix = $portVersion + " + +PROVIDES_devel=" + devel:libmythes_1.2$secondaryArchSuffix = $portVersion + mythes${secondaryArchSuffix}_devel = $portVersion + " + +ARCHITECTURES="x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libhunspell_1.3$secondaryArchSuffix + cmd:perl + " + +REQUIRES_devel=" + mythes$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + devel:libhunspell_1.3$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:awk + haiku${secondaryArchSuffix}_devel + " + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs \ + libmythes-1.2 + packageEntries devel \ + $developDir +} \ No newline at end of file From 487e1c8b9486abec3a1025002f35c0e0177534da Mon Sep 17 00:00:00 2001 From: DarkmatterVale Date: Tue, 23 Dec 2014 21:22:52 +0000 Subject: [PATCH 16/75] Updated recipe for iozone --- app-benchmarks/iozone/iozone-3.326.recipe | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-benchmarks/iozone/iozone-3.326.recipe b/app-benchmarks/iozone/iozone-3.326.recipe index 398529eac..e51ee9554 100644 --- a/app-benchmarks/iozone/iozone-3.326.recipe +++ b/app-benchmarks/iozone/iozone-3.326.recipe @@ -47,7 +47,9 @@ BUILD() INSTALL() { cd src/current/ - mkdir -p $binDir/iozone - cp iozone $binDir/iozone + cp iozone $binDir cp fileop $binDir + + mkdir -p $manDir/man1 + cp ../../docs/iozone.1 $manDir/man1 } \ No newline at end of file From 21676bb201cde132e2c6d50f5fd373193c7c672f Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 23 Dec 2014 16:39:34 +0000 Subject: [PATCH 17/75] Fix directory of installation of fonts Also, do not install README as it only contains licensing information or is the same text as the DESCRIPTION. --- media-fonts/ahem/ahem-1.0.recipe | 7 +++--- .../anonymous_pro-1.002.001.recipe | 5 ++-- .../arabeyes_fonts/arabeyes_fonts-1.1.recipe | 23 ++++++++----------- media-fonts/cardo/cardo-1.04.recipe | 4 ++-- .../courier_prime/courier_prime-1.0.recipe | 5 ++-- .../croscorefonts/croscorefonts-1.21.0.recipe | 8 +++---- media-fonts/droid/droid-113.recipe | 6 ++--- media-fonts/droid/droid-4.3_r2.2.recipe | 6 ++--- .../essays-1743/essays1743-2.001.recipe | 6 ++--- .../farsi_fonts/farsi_fonts-0.4.recipe | 4 ++-- media-fonts/humor_sans/humor_sans-1.0.recipe | 8 +++---- .../inconsolata/inconsolata-1.0.recipe | 4 ++-- .../kacst_fonts/kacst_fonts-5.0.recipe | 6 ++--- .../lateef_font/lateef_font-1.001.recipe | 4 ++-- .../liberation_fonts-1.06.0.20100721.recipe | 4 ++-- media-fonts/lohit/lohit-2.3.8.recipe | 6 ++--- media-fonts/mplus/mplus-2.2.4.recipe | 6 ++--- .../nafees_nastaleeq-1.02.recipe | 4 ++-- .../nafees_riqa/nafees_riqa-1.00.recipe | 4 ++-- media-fonts/nanumfont/nanumfont-2.0.recipe | 4 ++-- .../noto_sans_bengali-1.02.recipe | 4 ++-- .../noto_sans_cjk/noto_sans_cjk-1.001.recipe | 4 ++-- .../noto_sans_devanagari-1.05.recipe | 4 ++-- .../noto_sans_gujarati-1.02.recipe | 4 ++-- .../noto_sans_gurmukhi-1.01.recipe | 4 ++-- .../noto_sans_sinhala-1.01.recipe | 4 ++-- .../noto_sans_tamil-1.04.recipe | 4 ++-- .../noto_sans_telugu-1.02.recipe | 4 ++-- media-fonts/paratype/paratype-1.0.recipe | 11 +++++---- media-fonts/roboto/roboto-1.2.recipe | 4 ++-- .../scheherazade_font-1.005.recipe | 4 ++-- .../terminus_ttf/terminus_ttf-4.38.2.recipe | 4 ++-- .../ubuntu_font_family-0.80.recipe | 6 ++--- .../ukijorgfonts/ukijorgfonts-1.0.recipe | 4 ++-- media-fonts/unifont/unifont-7.0.06.recipe | 4 ++-- .../vl_gothic/vl_gothic-20140530.recipe | 4 ++-- media-fonts/vollkorn/vollkorn-2.1.recipe | 4 ++-- .../wqy_microhei-0.2.0~beta.recipe | 4 ++-- .../wqy_zenhei/wqy_zenhei-0.9.45.recipe | 4 ++-- .../x_series_fonts/x_series_fonts-2.0.recipe | 4 ++-- 40 files changed, 103 insertions(+), 110 deletions(-) diff --git a/media-fonts/ahem/ahem-1.0.recipe b/media-fonts/ahem/ahem-1.0.recipe index 215eef282..8080fb62a 100644 --- a/media-fonts/ahem/ahem-1.0.recipe +++ b/media-fonts/ahem/ahem-1.0.recipe @@ -20,7 +20,7 @@ SRC_URI="https://github.com/Kozea/Ahem/archive/1.0.tar.gz" CHECKSUM_SHA256="bae33954780217ea0e8e517f51e5a84c525ff22b39a508d50ab49e2d5cef7530" LICENSE="Public Domain" COPYRIGHT="Late-90s Todd Fahrner" -REVISION="1" +REVISION="2" SOURCE_DIR="Ahem-1.0" ARCHITECTURES="any" @@ -41,6 +41,7 @@ BUILD() INSTALL() { - mkdir -p $fontsDir/ahem - cp Ahem.ttf README $fontsDir/ahem + FONTDIR=$fontsDir/ttfonts + mkdir -p $FONTDIR + cp Ahem.ttf $FONTDIR } diff --git a/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe b/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe index c3b0ad6dd..b14cb74d3 100644 --- a/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe +++ b/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe @@ -10,7 +10,7 @@ SRC_URI="http://www.marksimonson.com/assets/content/fonts/AnonymousPro-1.002.zip CHECKSUM_SHA256="86665847a51cdfb58a1e1dfd8b1ba33f183485affe50b53e3304f63d3d3552ab" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2009 Mark Simonson, with reserved font name Anonymous Pro" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -29,8 +29,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/anonymous-pro + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} - cp README.txt ${FONTDIR}/anonymous-pro-readme.txt } diff --git a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe index 9a1b7b09a..16566f291 100644 --- a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe +++ b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe @@ -8,8 +8,7 @@ contributions. HOMEPAGE="http://projects.arabeyes.org/project.php?proj=Khotot" SRC_URI="http://sourceforge.net/projects/arabeyes/files/Fonts/ae_fonts/ae_fonts1_ttf_1.1.tar.bz2" CHECKSUM_SHA256="c517f6ac0643d2416101c9b375be38ec4fe7810b7ad3a1465438dd45b819e054" -REVISION="1" -DEPEND="" +REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="2003-2007 Arabeyes.org 2002-2005 Free Software Foundation" @@ -21,26 +20,24 @@ PROVIDES="arabeyes_fonts = $portVersion" REQUIRES="" BUILD_REQUIRES="" BUILD_PREREQUIRES=" - cmd:tar coreutils " -SOURCE_DIR="ae_fonts1-1.1" +SOURCE_DIR="ae_fonts1-1.1/" BUILD() { - tar xvjf $portDir/download/ae_fonts1_ttf_1.1.tar.bz2 + true } INSTALL() { - cd ae_fonts1-1.1 - FONTDIR=$fontsDir/arabeyes + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} - cp -rd AAHS ${FONTDIR}/ - cp -rd AGA ${FONTDIR}/ - cp -rd FS ${FONTDIR}/ - cp -rd Kasr ${FONTDIR}/ - cp -rd MCS ${FONTDIR}/ - cp -rd Shmookh ${FONTDIR}/ + cp AAHS/*.ttf ${FONTDIR}/ + cp AGA/*.ttf ${FONTDIR}/ + cp FS/*.ttf ${FONTDIR}/ + cp Kasr/*.ttf ${FONTDIR}/ + cp MCS/*.ttf ${FONTDIR}/ + cp Shmookh/*.ttf ${FONTDIR}/ } diff --git a/media-fonts/cardo/cardo-1.04.recipe b/media-fonts/cardo/cardo-1.04.recipe index c3c3274c7..87b719f3a 100644 --- a/media-fonts/cardo/cardo-1.04.recipe +++ b/media-fonts/cardo/cardo-1.04.recipe @@ -11,7 +11,7 @@ SRC_URI="http://scholarsfonts.net/cardo104.zip" CHECKSUM_SHA256="9401db6357cb71fa1f8791323679f81d6b0473d6280a7ec8abdf11b5e52f455f" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2004–2011 David J. Perry, with Reserved Font Name Cardo" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -30,7 +30,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/cardo + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } diff --git a/media-fonts/courier_prime/courier_prime-1.0.recipe b/media-fonts/courier_prime/courier_prime-1.0.recipe index 309374cbe..23bf94b70 100644 --- a/media-fonts/courier_prime/courier_prime-1.0.recipe +++ b/media-fonts/courier_prime/courier_prime-1.0.recipe @@ -8,7 +8,7 @@ should not change. HOMEPAGE="http://quoteunquoteapps.com/courierprime/" SRC_URI="http://quoteunquoteapps.com/downloads/courier-prime.zip" CHECKSUM_SHA256="d5d4faf1bee0d1f52bab1103cbfdfb354976331c86f999c110c22a098cb12d73" -REVISION="1" +REVISION="2" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2013 Quote-Unquote Apps" @@ -34,8 +34,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/courier-prime + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR}/ - cp Read\ me.txt ${FONTDIR}/README.txt } diff --git a/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe b/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe index 6fc578aa2..3282e1740 100644 --- a/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe +++ b/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe @@ -13,8 +13,8 @@ CHECKSUM_SHA256_3="89619d3f06b55495e94458eb8fbd69ae7c654db5782b2cecfdaffa2c8b291 SOURCE_DIR="" LICENSE="Apache v2" -COPYRIGHT="Mike Frysinger" -REVISION="1" +COPYRIGHT="2010-2013 Google Corporation" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" @@ -30,10 +30,10 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ttfonts/croscorefonts/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} cp ../sources-2/*.ttf ${FONTDIR} cp ../sources-3/*.ttf ${FONTDIR} -} \ No newline at end of file +} diff --git a/media-fonts/droid/droid-113.recipe b/media-fonts/droid/droid-113.recipe index 2b908a4b0..06ba3babd 100644 --- a/media-fonts/droid/droid-113.recipe +++ b/media-fonts/droid/droid-113.recipe @@ -10,7 +10,7 @@ SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-113.tar.gz" CHECKSUM_SHA256="c9339f0f1aaa055f8b06a2b28c1c3fb5ddffe6c6a6a7a7735fc0ad93d0eab12f" LICENSE="Apache v2" COPYRIGHT="2005-2008 The Android Open Source Project" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -30,9 +30,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/droid + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} - cp Ahem.ttf ${FONTDIR} cp DroidSans-Bold.ttf ${FONTDIR} cp DroidSansFallback.ttf ${FONTDIR} cp DroidSerif-Bold.ttf ${FONTDIR} @@ -41,5 +40,4 @@ INSTALL() cp DroidSansMono.ttf ${FONTDIR} cp DroidSerif-BoldItalic.ttf ${FONTDIR} cp DroidSerif-Regular.ttf ${FONTDIR} - cp README.txt ${FONTDIR}/droid-fonts-readme.txt } diff --git a/media-fonts/droid/droid-4.3_r2.2.recipe b/media-fonts/droid/droid-4.3_r2.2.recipe index 0b802f2c0..3923c917d 100644 --- a/media-fonts/droid/droid-4.3_r2.2.recipe +++ b/media-fonts/droid/droid-4.3_r2.2.recipe @@ -11,7 +11,7 @@ SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-4.3_r2.2.zi CHECKSUM_SHA256="221133c329efdb2b911c18ef222eeb3fcb011e5be7c37623e68faa90c15b8cd0" LICENSE="Apache v2" COPYRIGHT="2005-2008 The Android Open Source Project" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -31,7 +31,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/droid + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} - cp . ${FONTDIR} -R + cp *.ttf ${FONTDIR} } diff --git a/media-fonts/essays-1743/essays1743-2.001.recipe b/media-fonts/essays-1743/essays1743-2.001.recipe index 64afcbf84..5d5bc6bb8 100644 --- a/media-fonts/essays-1743/essays1743-2.001.recipe +++ b/media-fonts/essays-1743/essays1743-2.001.recipe @@ -12,7 +12,7 @@ SOURCE_DIR="" LICENSE="GNU LGPL v2.1" COPYRIGHT="John Stracke" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" @@ -28,8 +28,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ttfonts/essays1743/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp essays1743/*.ttf ${FONTDIR} -} \ No newline at end of file +} diff --git a/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe b/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe index 0ad6033be..3fd24740d 100644 --- a/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe +++ b/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Farsi (Perisian) Unicode fonts" HOMEPAGE="http://www.farsiweb.ir/" SRC_URI="http://www.farsiweb.ir/font/farsifonts-0.4.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="65a78975c923fd9db7b9441c32559c1b" @@ -12,7 +12,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} } diff --git a/media-fonts/humor_sans/humor_sans-1.0.recipe b/media-fonts/humor_sans/humor_sans-1.0.recipe index f010cebeb..bcd270a35 100644 --- a/media-fonts/humor_sans/humor_sans-1.0.recipe +++ b/media-fonts/humor_sans/humor_sans-1.0.recipe @@ -1,6 +1,6 @@ -SUMMARY="The Human-Sans font" +SUMMARY="The Humor-Sans font" DESCRIPTION=" -A sanserif typeface in the style of xkcd. Xkcd is a popular webcomics with \ +A sans-serif typeface in the style of xkcd. Xkcd is a popular webcomics with \ focus on computer science or everything else. " HOMEPAGE="http://antiyawn.com/uploads/humorsans.html" @@ -8,7 +8,7 @@ SRC_URI="http://antiyawn.com/uploads/Humor-Sans-1.0.ttf" CHECKSUM_SHA256="2ded6a27448c9ed30aaff177744e2bcf1e52e0aab018b2a8be64565df633318f" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2009, Michael Ciuffo, with Reserved Font Name Humor-Sans" -REVISION="1" +REVISION="2" ARCHITECTURES="!any" DISABLE_SOURCE_PACKAGE=yes @@ -27,7 +27,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/humor-sans + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } diff --git a/media-fonts/inconsolata/inconsolata-1.0.recipe b/media-fonts/inconsolata/inconsolata-1.0.recipe index 23cce1f39..eceb5c6c1 100644 --- a/media-fonts/inconsolata/inconsolata-1.0.recipe +++ b/media-fonts/inconsolata/inconsolata-1.0.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Inconsolata Programmer's font" HOMEPAGE="http://www.levien.com/type/myfonts/inconsolata.html" SRC_URI="http://media.nodnod.net/Inconsolata-dz.otf.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8510443343f43382566511e73abc06f8" @@ -12,7 +12,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/inconsolata + FONTDIR=${fontsDir}/otfonts mkdir -p ${FONTDIR} wget http://levien.com/type/myfonts/Inconsolata.otf wget http://www.cosmix.org/software/files/InconsolataHellenic.zip diff --git a/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe index c2a34ed0e..0bef51cbe 100644 --- a/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe +++ b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe @@ -1,7 +1,7 @@ DESCRIPTION="KACST Arabic Truetype Fonts" HOMEPAGE="http://www.arabeyes.org/project.php?proj=Khotot" SRC_URI="http://sourceforge.net/projects/arabeyes/files/latest/download?source=files" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="0a7ad4538d3b97adfbefa4c5cf8c2660" @@ -13,11 +13,9 @@ BUILD() INSTALL() { cd kacst_one_5.0 - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/arabeyes + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} - cp KacstOne-Bold.sfd ${FONTDIR}/ cp KacstOne-Bold.ttf ${FONTDIR}/ - cp KacstOne.sfd ${FONTDIR}/ cp KacstOne.ttf ${FONTDIR}/ } diff --git a/media-fonts/lateef_font/lateef_font-1.001.recipe b/media-fonts/lateef_font/lateef_font-1.001.recipe index 0de1633c9..69b0ac8e9 100644 --- a/media-fonts/lateef_font/lateef_font-1.001.recipe +++ b/media-fonts/lateef_font/lateef_font-1.001.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Arabic font" HOMEPAGE="http://scripts.sil.org/ArabicFonts_Download" SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Lateef_OT_1_001&filename=LateefRegOT_1.001.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c060ab84ab33ae8f991103258b8e7f22" @@ -12,7 +12,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} } diff --git a/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe index 57da7e16c..a6f4c14a4 100644 --- a/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe +++ b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe @@ -4,7 +4,7 @@ with Arial, Times New Roman, and Courier New. It is sponsored by Red Hat. " HOMEPAGE="https://fedorahosted.org/liberation-fonts" SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/liberation-fonts-1.06.0.20100721.tar.gz" -REVISION="1" +REVISION="2" STATUS_HAIKU="broken" DEPEND="fontforge" CHECKSUM_MD5="2f45bd873ab48cf0c3a00fbd350c0e80" @@ -17,7 +17,7 @@ BUILD() INSTALL() { cd liberation-fonts-1.06.0.20100721 - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/liberation + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp -a *.ttf ${FONTDIR}/. } diff --git a/media-fonts/lohit/lohit-2.3.8.recipe b/media-fonts/lohit/lohit-2.3.8.recipe index 2ebdbdbfe..9b2b05218 100644 --- a/media-fonts/lohit/lohit-2.3.8.recipe +++ b/media-fonts/lohit/lohit-2.3.8.recipe @@ -13,7 +13,7 @@ SRC_URI="http://rbhalera.fedorapeople.org/released/lohit/lohit-fonts-2.3.8.tar.g CHECKSUM_SHA256="68091ab047f9e4e22f069f802dceac52994267f126dc238b3815eed217a02991" LICENSE="GNU GPL v2" COPYRIGHT="2004-2011 Red Hat" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -34,8 +34,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/lohit + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} find . -name "*.ttf" -exec cp {} ${FONTDIR} \; - cp README ${FONTDIR}/lohit-readme.txt + cp README ${FONTDIR}/lohit.readme } diff --git a/media-fonts/mplus/mplus-2.2.4.recipe b/media-fonts/mplus/mplus-2.2.4.recipe index bd30c546a..df9750fd0 100644 --- a/media-fonts/mplus/mplus-2.2.4.recipe +++ b/media-fonts/mplus/mplus-2.2.4.recipe @@ -7,7 +7,7 @@ SOURCE_DIR="." CHECKSUM_SHA256="7862e113e04986646117267c4baee30aea163d43a382c14693f15287f16bbf25" LICENSE="GNU GPL v2" COPYRIGHT="2002-2008 M+ Fonts Project" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" @@ -23,8 +23,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ttfonts/mplus/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp mplus-TESTFLIGHT-059/*.ttf ${FONTDIR} -} \ No newline at end of file +} diff --git a/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe index 38f5396b4..bb1201e85 100644 --- a/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe +++ b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe @@ -4,7 +4,7 @@ style of one of the finest calligraphers of Pakistan (Nafees Raqam). " HOMEPAGE="http://www.crulp.org/software/localization/Fonts/nafeesNastaleeq.html" SRC_URI="http://www.crulp.org/Downloads/localization/fonts/NafeesNastaleeq/Nafees_Nastaleeq_v1.02.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="34ca164ce011b682522431fc332c0cb6" @@ -15,7 +15,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-nastaleeq + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp "Nafees Nastaleeq v1.02.ttf" ${FONTDIR} } diff --git a/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe index 7ec14d2d5..bcd18aa0c 100644 --- a/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe +++ b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe @@ -3,7 +3,7 @@ Open Type Font for writng Urdu in Riqa script based on Unicode standard. " HOMEPAGE="http://www.crulp.org/software/localization/Fonts/nafeesRiqa.html" SRC_URI="http://www.crulp.org/Downloads/localization/fonts/NafeesRiqa/Nafees_Riqa_v1.0.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="504c6ada41a408575a120daf2a110b6f" @@ -14,7 +14,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-riqa + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp "Nafees Riqa v1.0.ttf" ${FONTDIR} } diff --git a/media-fonts/nanumfont/nanumfont-2.0.recipe b/media-fonts/nanumfont/nanumfont-2.0.recipe index 957a28fe2..a9af8355a 100644 --- a/media-fonts/nanumfont/nanumfont-2.0.recipe +++ b/media-fonts/nanumfont/nanumfont-2.0.recipe @@ -3,7 +3,7 @@ Korean monospace font distributed by NHN. " HOMEPAGE="http://dev.naver.com/projects/nanumfont" SRC_URI="http://dev.naver.com/frs/download.php/441/NanumGothicCoding-2.0.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6214a5844454c96faeac9a60539c7daf" @@ -14,7 +14,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nanumfont + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR}/ } diff --git a/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe b/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe index 815468b0b..20d8d280f 100644 --- a/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe +++ b/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="bc9422930cb09b0736ed3ebf60f747bb0078e451087b52926a4ae0d1d50db42c" LICENSE="Apache v2" COPYRIGHT="2013 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe index fbcb049dd..c3d9dba0a 100644 --- a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe +++ b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe @@ -44,7 +44,7 @@ CHECKSUM_SHA256_7="e6e04ca22f7182eb87277d476564637b714a022cee51497737b0639e88c9f LICENSE="Apache v2" COPYRIGHT="2014 Adobe Systems Incorporated" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -65,7 +65,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/otfonts mkdir -p ${FONTDIR} cp `find ../sources* -type f -name \*.otf` ${FONTDIR} } diff --git a/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe b/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe index a75967fef..f4fbba9cc 100644 --- a/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe +++ b/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="8601d16cb04d740d2a2a27299ae59445971bbbed3d6b401c14e6fb1d461dd353" LICENSE="Apache v2" COPYRIGHT="2012 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe b/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe index 213e0fb14..04621f266 100644 --- a/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe +++ b/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="44e6925fa81c7a59992415ffce24434e7b2609af7921d10e735879ebbc5a593f" LICENSE="Apache v2" COPYRIGHT="2013 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe b/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe index 7217207e1..bde6c207a 100644 --- a/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe +++ b/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="c154bacc4998fa6e8eb380cf6823a07c2cf6bcafbad373446fbb7576f61d1e48" LICENSE="Apache v2" COPYRIGHT="2013 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe b/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe index 62e386d5e..e28dbef76 100644 --- a/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe +++ b/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="2cf8027b61f0657e64959e17eb16f4d84658a950c36ee483d4bf1ade8df9d683" LICENSE="Apache v2" COPYRIGHT="2014 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe b/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe index 12c1e2f14..7047fe32a 100644 --- a/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe +++ b/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="15d8f1e5310f4d2eecf2e46a9d74b52c5a30afae00b90d2fe92bc8f00a5c1ee8" LICENSE="Apache v2" COPYRIGHT="2012 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe b/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe index 13724e96a..efbe61d73 100644 --- a/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe +++ b/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="8d434121cb8e10b02f80a1a7ab87a9a70ef2eee96aababe4ec871e554578c460" LICENSE="Apache v2" COPYRIGHT="2013 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/paratype/paratype-1.0.recipe b/media-fonts/paratype/paratype-1.0.recipe index af546807b..14c2dcfc5 100644 --- a/media-fonts/paratype/paratype-1.0.recipe +++ b/media-fonts/paratype/paratype-1.0.recipe @@ -10,7 +10,7 @@ CHECKSUM_SHA256_2="e7a2a27ed0481d20973f0d3b589362d055269082e3fc4d96f81dacd58bad8 CHECKSUM_SHA256_3="e34e729f9509cf85acc52caadf68e96db90457b7164ba45719967d53e7a20dcc" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2009 ParaType" -REVISION="1" +REVISION="2" SOURCE_DIR="" ARCHITECTURES="any" @@ -31,9 +31,10 @@ BUILD() INSTALL() { - mkdir -p $fontsDir/paratype - cp *.ttf $fontsDir/paratype - cp ../sources-2/*.ttf $fontsDir/paratype - cp ../sources-3/*.ttf $fontsDir/paratype + FONTDIR=$fontsDir/ttfonts + mkdir -p $FONTDIR + cp *.ttf $FONTDIR + cp ../sources-2/*.ttf $FONTDIR + cp ../sources-3/*.ttf $FONTDIR } diff --git a/media-fonts/roboto/roboto-1.2.recipe b/media-fonts/roboto/roboto-1.2.recipe index 825c43caf..48d6d934b 100644 --- a/media-fonts/roboto/roboto-1.2.recipe +++ b/media-fonts/roboto/roboto-1.2.recipe @@ -16,7 +16,7 @@ SRC_URI="http://developer.android.com/downloads/design/roboto-1.2.zip" CHECKSUM_SHA256="5101b5bdb3b7b14cc922a771ba068bfcae8634467c1f446bc89bc2b4f8b4f1b5" LICENSE="Apache v2" COPYRIGHT="2013 Christian Robertson" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -36,7 +36,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/roboto + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cd Roboto_v$portVersion diff --git a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe index 68b702406..40681b41d 100644 --- a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe +++ b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe @@ -3,7 +3,7 @@ Arabic script font. " HOMEPAGE="http://scripts.sil.org/ArabicFonts_Download" SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Scheherazade_OT_1_005&filename=ScherazadeRegOT-1.005.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="3c7e7d7f93802162effe2b517af98be0" @@ -15,7 +15,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/scheherazade + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} } diff --git a/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe b/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe index 36a0677d4..9398cd1c2 100644 --- a/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe +++ b/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://files.ax86.net/terminus-ttf/" SRC_URI="http://files.ax86.net/terminus-ttf/files/$portVersion/terminus-ttf-$portVersion.zip" CHECKSUM_SHA256="95896b5711e8c96cae180e3c8c837f23618c611e1aebc40639bc983d519dd5bd" SOURCE_DIR="terminus-ttf-$portVersion" -REVISION="1" +REVISION="2" ARCHITECTURES="x86 x86_gcc2 x86_64" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2010 Dimitar Toshkov Zhekov @@ -26,7 +26,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/terminus-ttf + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR}/ } diff --git a/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe index 9d4763f48..7a71b61fd 100644 --- a/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe +++ b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe @@ -10,7 +10,7 @@ SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" CHECKSUM_SHA256="107170099bbc3beae8602b97a5c423525d363106c3c24f787d43e09811298e4c" LICENSE="Ubuntu Font License 1.0" COPYRIGHT="2011 Canonical Ltd." -REVISION="3" +REVISION="4" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -29,7 +29,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ubuntu-font-family + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp Ubuntu-B.ttf ${FONTDIR} cp Ubuntu-BI.ttf ${FONTDIR} @@ -44,5 +44,5 @@ INSTALL() cp UbuntuMono-BI.ttf ${FONTDIR} cp UbuntuMono-R.ttf ${FONTDIR} cp UbuntuMono-RI.ttf ${FONTDIR} - cp README.txt ${FONTDIR}/ubuntu-fonts-readme.txt + cp README.txt ${FONTDIR}/ubuntu_font_family.readme } diff --git a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe index 05e2c6a67..318ea6621 100644 --- a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe +++ b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Uyghur Computer Science Association font project" HOMEPAGE="http://www.ukij.org/fonts/" SRC_URI="http://ukijorgfonts.googlecode.com/files/ukijorgfonts.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e50ed1b90f96cad12e31f8769bd598dc" @@ -12,7 +12,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ukijorgfonts + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } diff --git a/media-fonts/unifont/unifont-7.0.06.recipe b/media-fonts/unifont/unifont-7.0.06.recipe index 918e787d4..6bb3fb79b 100644 --- a/media-fonts/unifont/unifont-7.0.06.recipe +++ b/media-fonts/unifont/unifont-7.0.06.recipe @@ -8,7 +8,7 @@ SRC_URI="http://unifoundry.com/pub/unifont-7.0.06.tar.gz" SOURCE_DIR="" LICENSE="GNU GPL v2" COPYRIGHT="Unifoundry" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" @@ -24,7 +24,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ttfonts/unifont/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp unifont-7.0.06/font/precompiled/*.ttf ${FONTDIR} diff --git a/media-fonts/vl_gothic/vl_gothic-20140530.recipe b/media-fonts/vl_gothic/vl_gothic-20140530.recipe index f63f269ac..f3f20e048 100644 --- a/media-fonts/vl_gothic/vl_gothic-20140530.recipe +++ b/media-fonts/vl_gothic/vl_gothic-20140530.recipe @@ -17,7 +17,7 @@ COPYRIGHT="1990-2003 Wada Laboratory, the University of Tokyo. 2006-2014 Daisuke SUZUKI . 2006-2014 Project Vine . " -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -36,7 +36,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/VL-Gothic + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp VL-Gothic-Regular.ttf ${FONTDIR} cp VL-PGothic-Regular.ttf ${FONTDIR} diff --git a/media-fonts/vollkorn/vollkorn-2.1.recipe b/media-fonts/vollkorn/vollkorn-2.1.recipe index 63bf217a8..8a30610d4 100644 --- a/media-fonts/vollkorn/vollkorn-2.1.recipe +++ b/media-fonts/vollkorn/vollkorn-2.1.recipe @@ -10,7 +10,7 @@ SRC_URI="http://friedrichalthausen.de/wp-content/plugins/cimy-counter/cc_redirec CHECKSUM_SHA256="2eaa427dbe42e37bfdc182c1e3446abdc889806fe0b6c9a14e0fc0c3acc997f5" LICENSE="SIL Open Font License v1.1" COPYRIGHT="Friedrich Althausen" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -29,7 +29,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/vollkorn + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } diff --git a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe index 38e19e6bb..c1c5747ec 100644 --- a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe +++ b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe @@ -14,7 +14,7 @@ COPYRIGHT=" 2007 Google Corp. 2008-2010 WenQuanYi Board of Trustees and Qianqian Fang " -REVISION="3" +REVISION="4" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -34,7 +34,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/wenquanyi + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp wqy-microhei.ttc ${FONTDIR}/wqy-microhei.ttf } diff --git a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe index c04558372..11b106ba3 100644 --- a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe +++ b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe @@ -10,7 +10,7 @@ LICENSE=" GNU GPL v2 with font embedding exception " COPYRIGHT="2005-2010 Qianqian Fang and The WenQuanYi Project Board of Trustees" -REVISION="2" +REVISION="3" ARCHITECTURES="any" PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/wenquanyi + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp wqy-zenhei.ttc ${FONTDIR}/wqy-zenhei.ttf } diff --git a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe index f4ac36b1b..7a4a295ab 100644 --- a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe +++ b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe @@ -5,7 +5,7 @@ Persian, Arabic, Urdu, Pashto, Dari, Uzbek, Kurdish, Uighur, old Turkish \ " HOMEPAGE="http://wiki.irmug.com/index.php/X_Series_2" SRC_URI="http://irmug.com/downloads/dl.php?id=21" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="1e45723ebad5e748d4b5f6f28074833f" @@ -16,7 +16,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/x-series + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} wget http://irmug.com/downloads/dl.php?id=21 unzip -o Zar.zip From 10d51828fc56b811bf971a214a304beb0566be42 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 24 Dec 2014 03:00:56 +0000 Subject: [PATCH 18/75] cantarell: Update to 0.0.16 Also install to otfonts/. --- ...tarell-0.0.7.recipe => cantarell-0.0.16.recipe} | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) rename media-fonts/cantarell/{cantarell-0.0.7.recipe => cantarell-0.0.16.recipe} (73%) diff --git a/media-fonts/cantarell/cantarell-0.0.7.recipe b/media-fonts/cantarell/cantarell-0.0.16.recipe similarity index 73% rename from media-fonts/cantarell/cantarell-0.0.7.recipe rename to media-fonts/cantarell/cantarell-0.0.16.recipe index b25153a71..d235ee43f 100644 --- a/media-fonts/cantarell/cantarell-0.0.7.recipe +++ b/media-fonts/cantarell/cantarell-0.0.16.recipe @@ -9,13 +9,15 @@ European, Dutch and Afrikaans writing systems. The Cantarell typeface is \ included in Google Fonts too. " HOMEPAGE="http://wiki.gnome.org/CantarellFonts" -SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.7.tar.bz2" -CHECKSUM_SHA256="79f69beca780d84c7c5753566d801ca14e46b6c111ec71527e37ae29377c2c79" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/cantarell-fonts/0.0/cantarell-fonts-${portVersion}.tar.xz" +CHECKSUM_SHA256="15bf87555321556750bc68ace360f3df420359a8ab257e15c44fb69710152f1c" LICENSE="SIL Open Font License v1.1" -COPYRIGHT="2009-2011 Understanding Limited, 2010-2011 Jakub Steiner" +COPYRIGHT="2009-2011 Understanding Limited +2010-2012 Jakub Steiner" REVISION="1" ARCHITECTURES="any" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" DISABLE_SOURCE_PACKAGE=yes PROVIDES="cantarell = $portVersion" @@ -23,7 +25,7 @@ REQUIRES="" BUILD_REQUIRES="" BUILD_PREREQUIRES="coreutils" -SOURCE_DIR="cantarell-fonts-0.0.7" +SOURCE_DIR="cantarell-fonts-$portVersion" BUILD() { @@ -32,8 +34,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/cantarell + FONTDIR=$fontsDir/otfonts mkdir -p ${FONTDIR} cp otf/*.otf ${FONTDIR} - cp README ${FONTDIR}/cantarell-readme.txt + cp README ${FONTDIR}/cantarell.readme } From f47ff3b92e52ea1aa599e422ba1f0d7cc2e94060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 24 Dec 2014 15:20:04 +0000 Subject: [PATCH 19/75] OpenSceneGraph 3.2.1 - More fixes --- .../openscenegraph-3.2.1.recipe | 41 ++++------ .../openscenegraph/openscenegraph-git.recipe | 49 +++++------- .../patches/openscenegraph-3.2.1.patchset | 36 +++++++++ .../patches/openscenegraph_x86-3.2.1.patchset | 77 ------------------- 4 files changed, 70 insertions(+), 133 deletions(-) create mode 100644 games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset delete mode 100644 games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe index 79af87fb7..e6a8785e8 100644 --- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -1,11 +1,11 @@ -SUMMARY="An open source, real-time graphics middle-ware used by application developers" +SUMMARY="An open source, real-time graphics middle-ware used by developers" DESCRIPTION=" -The OpenSceneGraph is an open source high performance 3D graphics toolkit, used\ -by application developers in fields such as visual simulation, games, virtual\ -reality, scientific visualization and modelling. Written entirely in Standard\ -C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris\ -, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well\ -established as the world leading scene graph technology, used widely in the\ +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used \ +by application developers in fields such as visual simulation, games, virtual \ +reality, scientific visualization and modelling. Written entirely in Standard \ +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris \ +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well \ +established as the world leading scene graph technology, used widely in the \ vis-sim, space, scientific, oil-gas, games and virtual reality industries." HOMEPAGE="http://www.openscenegraph.org" SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip" @@ -77,14 +77,14 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PATCH="openscenegraph_x86-3.2.1.patchset" +PATCHES="openscenegraph-3.2.1.patchset" SOURCE_DIR="OpenSceneGraph-3.2.1" BUILD() { cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DOSG_USE_QT=OFF -DBUILD_OSG_APPLICATIONS=OFF -DOSG_WINDOWING_SYSTEM=None - make + make $jobArgs } @@ -103,23 +103,12 @@ INSTALL() mv $prefix/lib-temp/* $libDir rm -rf $prefix/lib-temp - prepareInstalledDevelLibs libOpenThreads - prepareInstalledDevelLibs libosg - prepareInstalledDevelLibs libosgAnimation - prepareInstalledDevelLibs libosgDB - prepareInstalledDevelLibs libosgFX - prepareInstalledDevelLibs libosgGA - prepareInstalledDevelLibs libosgManipulator - prepareInstalledDevelLibs libosgParticle - prepareInstalledDevelLibs libosgPresentation - prepareInstalledDevelLibs libosgShadow - prepareInstalledDevelLibs libosgSim - prepareInstalledDevelLibs libosgTerrain - prepareInstalledDevelLibs libosgText - prepareInstalledDevelLibs libosgUtil - prepareInstalledDevelLibs libosgViewer - prepareInstalledDevelLibs libosgVolume - prepareInstalledDevelLibs libosgWidget + prepareInstalledDevelLibs libOpenThreads \ + libosg libosgAnimation libosgDB libosgFX \ + libosgGA libosgManipulator libosgParticle \ + libosgPresentation libosgShadow libosgSim \ + libosgTerrain libosgText libosgUtil libosgViewer \ + libosgVolume libosgWidget fixPkgconfig diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe index 61b17c0a4..474d351ec 100644 --- a/games-engines/openscenegraph/openscenegraph-git.recipe +++ b/games-engines/openscenegraph/openscenegraph-git.recipe @@ -1,23 +1,23 @@ -SUMMARY="An open source, real-time graphics middle-ware used by application developers" +SUMMARY="An open source, real-time graphics middle-ware used by developers" DESCRIPTION=" -The OpenSceneGraph is an open source high performance 3D graphics toolkit, used\ -by application developers in fields such as visual simulation, games, virtual\ -reality, scientific visualization and modelling. Written entirely in Standard\ -C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris\ -, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well\ -established as the world leading scene graph technology, used widely in the\ +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used \ +by application developers in fields such as visual simulation, games, virtual \ +reality, scientific visualization and modelling. Written entirely in Standard \ +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris \ +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well \ +established as the world leading scene graph technology, used widely in the \ vis-sim, space, scientific, oil-gas, games and virtual reality industries." HOMEPAGE="http://www.openscenegraph.org" -SRC_URI="git://github.com/openscenegraph/osg.git" +SRC_URI="git://github.com/openscenegraph/osg#77f09f9e649cfedd32608ed6ec67bf1de7cd53ac" REVISION="1" LICENSE="OSGPL" COPYRIGHT="2002-2014 Robert Osfield and others" -ARCHITECTURES="?x86 ?x86_64" +ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES ?x86_gcc2" + ARCHITECTURES="$ARCHITECTURES x86_gcc2" else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi @@ -76,14 +76,14 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PATCH="openscenegraph_x86-3.2.1.patchset" +PATCHES="openscenegraph-3.2.1.patchset" -SOURCE_DIR="OpenSceneGraph" +SOURCE_DIR="OpenSceneGraph-3.2.1" BUILD() { cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DOSG_USE_QT=OFF -DBUILD_OSG_APPLICATIONS=OFF -DOSG_WINDOWING_SYSTEM=None - make + make $jobArgs } @@ -102,23 +102,12 @@ INSTALL() mv $prefix/lib-temp/* $libDir rm -rf $prefix/lib-temp - prepareInstalledDevelLibs libOpenThreads - prepareInstalledDevelLibs libosg - prepareInstalledDevelLibs libosgAnimation - prepareInstalledDevelLibs libosgDB - prepareInstalledDevelLibs libosgFX - prepareInstalledDevelLibs libosgGA - prepareInstalledDevelLibs libosgManipulator - prepareInstalledDevelLibs libosgParticle - prepareInstalledDevelLibs libosgPresentation - prepareInstalledDevelLibs libosgShadow - prepareInstalledDevelLibs libosgSim - prepareInstalledDevelLibs libosgTerrain - prepareInstalledDevelLibs libosgText - prepareInstalledDevelLibs libosgUtil - prepareInstalledDevelLibs libosgViewer - prepareInstalledDevelLibs libosgVolume - prepareInstalledDevelLibs libosgWidget + prepareInstalledDevelLibs libOpenThreads \ + libosg libosgAnimation libosgDB libosgFX \ + libosgGA libosgManipulator libosgParticle \ + libosgPresentation libosgShadow libosgSim \ + libosgTerrain libosgText libosgUtil libosgViewer \ + libosgVolume libosgWidget fixPkgconfig diff --git a/games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset b/games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset new file mode 100644 index 000000000..28ee177e3 --- /dev/null +++ b/games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset @@ -0,0 +1,36 @@ +From 3e731d32a286903a4b75d445ec6fdf0b8359b5d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Wed, 24 Dec 2014 14:55:21 +0000 +Subject: Add __HAIKU__ when needed + + +diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp +index affd682..dcbb532 100644 +--- a/src/osgDB/FileUtils.cpp ++++ b/src/osgDB/FileUtils.cpp +@@ -76,7 +76,7 @@ typedef char TCHAR; + #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) + #define stat64 stat + #endif +-#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ ++#elif defined(__CYGWIN__) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ + (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) + #define stat64 stat + #endif +diff --git a/src/osgPlugins/osc/osc/OscHostEndianness.h b/src/osgPlugins/osc/osc/OscHostEndianness.h +index 3720ea6..6f4c6bc 100644 +--- a/src/osgPlugins/osc/osc/OscHostEndianness.h ++++ b/src/osgPlugins/osc/osc/OscHostEndianness.h +@@ -51,7 +51,7 @@ + + #else + +- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) ++ #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) || defined(__HAIKU__) + #include + #if (__BYTE_ORDER == __LITTLE_ENDIAN) + #define __LITTLE_ENDIAN__ +-- +1.8.3.4 + diff --git a/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset b/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset deleted file mode 100644 index 593a5cef1..000000000 --- a/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset +++ /dev/null @@ -1,77 +0,0 @@ -From c4669d4e62e056fc2b29cc1372e41fcba9d286da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= - -Date: Tue, 23 Dec 2014 19:08:44 +0000 -Subject: Haiku specific cases - - -diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp -index affd682..47436d5 100644 ---- a/src/osgDB/FileUtils.cpp -+++ b/src/osgDB/FileUtils.cpp -@@ -71,12 +71,13 @@ typedef char TCHAR; - // variable. (MIN_ALLOWED is set low by default so it is - // unhelpful in this case.) - // Unfortunately, we can't use the label MAC_OS_X_VERSION_10_4 -- // for older OS's like Jaguar, Panther since they are not defined, -+ // for older OS's like Jaguar, Panther -+ since they are not defined, - // so I am going to hardcode the number. - #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) - #define stat64 stat - #endif --#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ -+#elif defined(__CYGWIN__) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ - (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) - #define stat64 stat - #endif -@@ -100,7 +101,7 @@ typedef char TCHAR; - #include - - #include --#include -+#include - #include - - #include -diff --git a/src/osgPlugins/osc/osc/OscHostEndianness.h b/src/osgPlugins/osc/osc/OscHostEndianness.h -index 3720ea6..6f4c6bc 100644 ---- a/src/osgPlugins/osc/osc/OscHostEndianness.h -+++ b/src/osgPlugins/osc/osc/OscHostEndianness.h -@@ -51,7 +51,7 @@ - - #else - -- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) -+ #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) || defined(__HAIKU__) - #include - #if (__BYTE_ORDER == __LITTLE_ENDIAN) - #define __LITTLE_ENDIAN__ --- -1.8.3.4 - - -From 7fa67738f702dc39b16f2caa05b9301e09209a5b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= - -Date: Tue, 23 Dec 2014 19:56:17 +0000 -Subject: Stupid type-bug - - -diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp -index 47436d5..060eb29 100644 ---- a/src/osgDB/FileUtils.cpp -+++ b/src/osgDB/FileUtils.cpp -@@ -71,8 +71,7 @@ typedef char TCHAR; - // variable. (MIN_ALLOWED is set low by default so it is - // unhelpful in this case.) - // Unfortunately, we can't use the label MAC_OS_X_VERSION_10_4 -- // for older OS's like Jaguar, Panther -- since they are not defined, -+ // for older OS's like Jaguar, Panther since they are not defined, - // so I am going to hardcode the number. - #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) - #define stat64 stat --- -1.8.3.4 - From cac637fe1963a2211edc057155654bcdda70ad9f Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 24 Dec 2014 12:44:27 -0500 Subject: [PATCH 20/75] Create recipe for bash_completion v2.1. It doesn't work, I don't know why. Someone with more bash-fu than me should take a look at it. --- .../bash_completion-2.1.recipe | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 app-shells/bash_completion/bash_completion-2.1.recipe diff --git a/app-shells/bash_completion/bash_completion-2.1.recipe b/app-shells/bash_completion/bash_completion-2.1.recipe new file mode 100644 index 000000000..fd292206e --- /dev/null +++ b/app-shells/bash_completion/bash_completion-2.1.recipe @@ -0,0 +1,65 @@ +SUMMARY="Tab-completion for the Bash shell" +DESCRIPTION="Since v2.04, bash has allowed you to intelligently program \ +and extend its standard completion behavior to achieve complex command \ +lines with just a few keystrokes. Imagine typing ssh [Tab] and being \ +able to complete on hosts from your ~/.ssh/known_hosts files. Or typing \ +man 3 str [Tab] and getting a list of all string handling functions in \ +the UNIX manual. mount system: [Tab] would complete on all exported \ +file-systems from the host called system, while make [Tab] would complete \ +on all targets in Makefile. This project was conceived to produce \ +programmable completion routines for the most common Linux/UNIX commands, \ +reducing the amount of typing sysadmins and programmers need to do on \ +a daily basis." +HOMEPAGE="http://bash-completion.alioth.debian.org/" +SRC_URI="http://bash-completion.alioth.debian.org/files/bash-completion-$portVersion.tar.bz2" +CHECKSUM_SHA256="2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f" +SOURCE_DIR="bash-completion-$portVersion" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2006-2014 Debian Project" +ARCHITECTURES="any" + +PROVIDES=" + bash_completion = $portVersion + " +REQUIRES=" + cmd:bash + " +BUILD_REQUIRES=" + cmd:bash + " +BUILD_PREREQUIRES=" + haiku + cmd:bash + cmd:awk + cmd:make + " + +GLOBAL_WRITABLE_FILES=" + settings/profile.d/bash_completion.sh auto-merge + " +USER_SETTINGS_FILES=" + settings/profile.d/bash_completion.sh + " + +PATCH() +{ + cd completions + for file in * + do + chmod +x $file + done +} + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + chmod +x $settingsDir/profile.d/bash_completion.sh + chmod +x $dataDir/bash-completion/bash_completion +} From 8b3a2ef307ae25d1b071415b8cadb2f963634bc9 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 24 Dec 2014 13:33:16 -0500 Subject: [PATCH 21/75] rcs: recipe for 5.9.3. --- dev-vcs/rcs/rcs-5.9.3.recipe | 67 ++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 dev-vcs/rcs/rcs-5.9.3.recipe diff --git a/dev-vcs/rcs/rcs-5.9.3.recipe b/dev-vcs/rcs/rcs-5.9.3.recipe new file mode 100644 index 000000000..fa5e4376b --- /dev/null +++ b/dev-vcs/rcs/rcs-5.9.3.recipe @@ -0,0 +1,67 @@ +SUMMARY="Revision Control System" +DESCRIPTION="The Revision Control System (RCS) manages multiple revisions \ +of files. RCS automates the storing, retrieval, logging, identification, \ +and merging of revisions. RCS is useful for text that is revised \ +frequently, including source code, programs, documentation, graphics, \ +papers, and form letters. + +RCS is (mostly) deprecated now. Unless you have an existing RCS repository \ +that you need to access, using Subversion or Git is preferred." +HOMEPAGE="http://www.gnu.org/software/rcs/" +COPYRIGHT="1986-2005 Free Software Foundation, Inc." +LICENSE="GNU GPL v1 + GNU LGPL v2" +SRC_URI="https://ftp.gnu.org/gnu/rcs/rcs-5.9.3.tar.xz" +CHECKSUM_SHA256="68b0d1c1b8657766cd7dc78e10564ce4836220e64665fb35fbe74dbc1dff5b47" +REVISION="1" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + rcs = $portVersion compat >= 5.9 + cmd:ci = $portVersion compat >= 5.9 + cmd:co = $portVersion compat >= 5.9 + cmd:ident = $portVersion compat >= 5.9 + cmd:merge = $portVersion compat >= 5.9 + cmd:rcs = $portVersion compat >= 5.9 + cmd:rcsclean = $portVersion compat >= 5.9 + cmd:rcsdiff = $portVersion compat >= 5.9 + cmd:rcsmerge = $portVersion compat >= 5.9 + cmd:rlog = $portVersion compat >= 5.9 + " +REQUIRES=" + haiku$secondaryArchSuffix + cmd:ed + cmd:awk + cmd:diff + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + + cmd:ed + cmd:awk + cmd:diff + " + +BUILD() +{ + runConfigure --omit-dirs binDir ./configure --bindir=$prefix/bin + make $jobArgs +} + +INSTALL() +{ + make install +} From 2974de68352a7211518c85374fa1546d66ff10f1 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Wed, 24 Dec 2014 19:51:34 +0100 Subject: [PATCH 22/75] bevexed: Update to newest version --- .../{bevexed-1.1.recipe => bevexed-20141224.recipe} | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) rename haiku-games/bevexed/{bevexed-1.1.recipe => bevexed-20141224.recipe} (78%) diff --git a/haiku-games/bevexed/bevexed-1.1.recipe b/haiku-games/bevexed/bevexed-20141224.recipe similarity index 78% rename from haiku-games/bevexed/bevexed-1.1.recipe rename to haiku-games/bevexed/bevexed-20141224.recipe index 2dae91d2c..c7987d621 100644 --- a/haiku-games/bevexed/bevexed-1.1.recipe +++ b/haiku-games/bevexed/bevexed-20141224.recipe @@ -4,8 +4,8 @@ A maddeningly-addictive puzzle game. The concept is simple: put the tiles in \ the grid on the left such that the numbers match wherever 2 tiles touch. " HOMEPAGE="https://github.com/HaikuArchives/BeVexed" -SRC_URI="git+https://github.com/HaikuArchives/BeVexed#3a45d8f364" -REVISION="1" +SRC_URI="git+https://github.com/HaikuArchives/BeVexed#01613e90e6ce3c2b47a592efe8e248db3445f536" +REVISION="2" LICENSE="MIT" COPYRIGHT="2006 DarkWyrm" @@ -45,8 +45,11 @@ BUILD() INSTALL() { - cd source mkdir -p $appsDir - cp -a objects/BeVexed $appsDir + mkdir -p $dataDir/BeVexed + + cp -r backgrounds $dataDir/BeVexed + + cp -a source/objects/BeVexed $appsDir addAppDeskbarSymlink $appsDir/BeVexed } From 91a39ed24a012e5d3da58282fabe5e412d92ecbe Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 24 Dec 2014 23:29:13 +0000 Subject: [PATCH 23/75] Add flite port --- app-accessibility/flite/flite-2.0.0.recipe | 119 ++++++++++ app-accessibility/flite/licenses/Flite | 206 ++++++++++++++++++ .../flite/patches/flite-2.0.0.patchset | 102 +++++++++ 3 files changed, 427 insertions(+) create mode 100644 app-accessibility/flite/flite-2.0.0.recipe create mode 100644 app-accessibility/flite/licenses/Flite create mode 100644 app-accessibility/flite/patches/flite-2.0.0.patchset diff --git a/app-accessibility/flite/flite-2.0.0.recipe b/app-accessibility/flite/flite-2.0.0.recipe new file mode 100644 index 000000000..1c0a9a0df --- /dev/null +++ b/app-accessibility/flite/flite-2.0.0.recipe @@ -0,0 +1,119 @@ +SUMMARY="A light-weight text-to-speech engine" +DESCRIPTION="Flite is a text-to-speech engine developed by the Carnegie \ +Mellon University. As a light-weight alternative to the Festival engine, it \ +is desinged to fit into small embedded machines as well as large-scale \ +servers. In addition to its native format flite supports voices generated by \ +the FestVox project as well. +" +HOMEPAGE="http://www.festvox.org/flite/" +SRC_URI="http://www.festvox.org/flite/packed/flite-2.0/flite-${portVersion}-release.tar.bz2" +CHECKSUM_SHA256="678c3860fd539402b5d1699b921239072af6acb4e72dc4720494112807cae411" +SOURCE_DIR="flite-${portVersion}-release" +REVISION="1" + +# Although individually many files have different licenses, as a whole this +# license covers all the files. +LICENSE=" + Flite + " +COPYRIGHT=" + 1986 University of Toronto + 1992, 1995 Markus Mummert + 1996-2004 University of Edinburgh, UK + 1999-2014 Language Technologies Institute, Carnegie Mellon University + 2001 Cepstral, LLC + 2001 Sun Microsystems, Inc. + 2003-2004 Nagoya Institute of Technology + 2003-2004 Nara Institute of Science and Technology + 2008-2012 University of Illinois at Urbana-Champaign + " + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" + +EXTRA_CMD=" + cmu_time_awb + cmu_us_awb + cmu_us_kal + cmu_us_kal16 + cmu_us_rms + cmu_us_slt + " +EXTRA_LIBS=" + cmu_grapheme_lang + cmu_grapheme_lex + cmu_indic_lang + cmu_indic_lex + $EXTRA_CMD + cmulex + usenglish + " +PROVIDES=" + flite$secondaryArchSuffix = $portVersion + lib:libflite$secondaryArchSuffix = $portVersion compat >= 2 + flite_tools = $portVersion + cmd:flite$secondaryArchSuffix = $portVersion + cmd:flite_time$secondaryArchSuffix = $portVersion + " +DEVEL_LIBS="libflite" +for c in $EXTRA_CMD; do + PROVIDES=" + $PROVIDES + cmd:flite_${c} = $portVersion + " +done +PROVIDES_devel=" + flite${secondaryArchSuffix}_devel = $portVersion + devel:libflite$secondaryArchSuffix = $portVersion compat >= 2 + " +for l in $EXTRA_LIBS; do + PROVIDES=" + $PROVIDES + lib:libflite_${l}${secondaryArchSuffix} = $portVersion compat >= 2 + " + PROVIDES_devel=" + $PROVIDES_devel + devel:libflite_${l}${secondaryArchSuffix} = $portVersion compat >= 2 + " + DEVEL_LIBS=" + $DEVEL_LIBS + libflite_${l} + " +done +REQUIRES=" + haiku$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + flite$secondaryArchSuffix == $portVersion base + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:awk + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:mkdepend + " + +PATCHES="flite-${portVersion}.patchset" + +BUILD() +{ + autoconf + runConfigure ./configure \ + --enable-shared + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs \ + $DEVEL_LIBS + packageEntries devel \ + $developDir +} diff --git a/app-accessibility/flite/licenses/Flite b/app-accessibility/flite/licenses/Flite new file mode 100644 index 000000000..7ec1cd92e --- /dev/null +++ b/app-accessibility/flite/licenses/Flite @@ -0,0 +1,206 @@ + +Flite is free software. + +We have kept the core code to BSD-like copyright, thus the system is +free to use in commercial products, with commercial extensions. GPL +code is only included as part of the build process and does not +taint any of the run-time code. + +As a collection it is distributed under the following license. Note +a few files in this distribution have a different but equally free +non-conflicting licence, see below. + + Language Technologies Institute + Carnegie Mellon University + Copyright (c) 1999-2014 + All Rights Reserved. + + Permission is hereby granted, free of charge, to use and distribute + this software and its documentation without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of this work, and to + permit persons to whom this work is furnished to do so, subject to + the following conditions: + 1. The code must retain the above copyright notice, this list of + conditions and the following disclaimer. + 2. Any modifications must be clearly marked as such. + 3. Original authors' names are not deleted. + 4. The authors' names are not used to endorse or promote products + derived from this software without specific prior written + permission. + + CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK + DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT + SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF + THIS SOFTWARE. + +All files within this distribution have the above license except +the following + +src/cg/cst_mlpg.h +src/cg/cst_mlpg.c +src/cg/cst_mlsa.h +src/cg/cst_mlsa.c +src/cg/cst_vc.h +src/cg/cst_vc.c +/*********************************************************************/ +/* */ +/* Nagoya Institute of Technology, Aichi, Japan, */ +/* Nara Institute of Science and Technology, Nara, Japan */ +/* and */ +/* Carnegie Mellon University, Pittsburgh, PA */ +/* Copyright (c) 2003-2004 */ +/* All Rights Reserved. */ +/* */ +/* Permission is hereby granted, free of charge, to use and */ +/* distribute this software and its documentation without */ +/* restriction, including without limitation the rights to use, */ +/* copy, modify, merge, publish, distribute, sublicense, and/or */ +/* sell copies of this work, and to permit persons to whom this */ +/* work is furnished to do so, subject to the following conditions: */ +/* */ +/* 1. The code must retain the above copyright notice, this list */ +/* of conditions and the following disclaimer. */ +/* 2. Any modifications must be clearly marked as such. */ +/* 3. Original authors' names are not deleted. */ +/* */ +/* NAGOYA INSTITUTE OF TECHNOLOGY, NARA INSTITUTE OF SCIENCE AND */ +/* TECHNOLOGY, CARNEGIE MELLON UNIVERSITY, AND THE CONTRIBUTORS TO */ +/* THIS WORK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, */ +/* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, */ +/* IN NO EVENT SHALL NAGOYA INSTITUTE OF TECHNOLOGY, NARA */ +/* INSTITUTE OF SCIENCE AND TECHNOLOGY, CARNEGIE MELLON UNIVERSITY, */ +/* NOR THE CONTRIBUTORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR */ +/* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM */ +/* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, */ +/* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN */ +/* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* */ +/*********************************************************************/ + +These functions are derived from the versions in festvox/src/vc/ as +modified by Tomoki Toda which in turn contain code derived from +NITECH's HTS system. Their copyright has the same freedoms as +as Flite's but under NAIST, NITECH and/or CMU. + +src/audio/au_wince.c +src/utils/cst_file_stdio.c +src/utils/cst_mmap_posix.c +src/utils/cst_mmap_win32.c +src/utils/cst_mmap_none.c +src/utils/cst_file_wince.c +sapi/ + are copyright Cepstral, LLC rather than CMU but fall under the same + free licence as the above, except for the owner. (Note the SAPI stuff + probably doesn't work any more) + +doc/alice + Is the first two chapters of Alice in Wonderland as distributed by the + Gutenburg project and is now in the public domain + +src/regex/regexp.c +src/regex/regsub.c + + * Copyright (c) 1986 by University of Toronto. + * Written by Henry Spencer. Not derived from licensed software. + * + * Permission is granted to anyone to use this software for any + * purpose on any computer system, and to redistribute it freely, + * subject to the following restrictions: + * + * 1. The author is not responsible for the consequences of use of + * this software, no matter how awful, even if they arise + * from defects in it. + * + * 2. The origin of this software must not be misrepresented, either + * by explicit claim or by omission. + * + * 3. Altered versions must be plainly marked as such, and must not + * be misrepresented as being the original software. + +src/speech/rateconv.c + + * Copyright (c) 1992, 1995 by Markus Mummert + * + * Redistribution and use of this software, modifcation and inclusion + * into other forms of software are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of this software must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. If this software is redistributed in a modified condition + * it must reveal clearly that it has been modified. + +lang/usenglish/us_durz_cart.c +lang/usenglish/us_durz_cart.h +lang/usenglish/us_int_accent_cart.c +lang/usenglish/us_int_accent_cart.h +lang/usenglish/us_int_tone_cart.c +lang/usenglish/us_int_tone_cart.h +lang/usenglish/us_phoneset.c +lang/usenglish/us_f0lr.c + These are directly (or indirectly) compiled/derived from files that are + part of the Festival Speech Synthesis System (1.4.1). Hence they have + a joint copyright CMU/Edinburgh but with the same free licence + +configure + # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + +configure.sub +config.guess +missing +install-sh +mkinstalldirs + Copyright FSF, and under the GPL, these files are only used for + convenient configuration and are not part of the generated binary, + and therefore do not impose any GPL restrctions on the rest of the + system. But as they are standard methods for configuration they + are included. + +src/speech/g72x.h +src/speech/g721.c +src/speech/g72x.c +src/speech/g723_24.c +src/speech/g723_40.c + +/* + * This source code is a product of Sun Microsystems, Inc. and is provided + * for unrestricted use. Users may copy or modify this source code without + * charge. + * + * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING + * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. + * + * Sun source code is provided with no support and without any obligation on + * the part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. + * + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE + * OR ANY PART THEREOF. + * + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. + * + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 + */ + +lang/cmu_grapheme_lex/grapheme_unitran_tables.c +/* Copyright 2008-2012, University of Illinois at Urbana-Champaign */ +/* distributed under the Apache License, Version (2.0) */ +/* http://www.apache.org/licenses/LICENSE-2.0 */ +/* Original table developed by Richard Sproat and Kyoung-young Kim */ +/* Ported for Festvox by Gopala Anumachipalli gopalakr@cs.cmu.edu Sep 2012 */ +/* Then converted to C for CMU Flite (cmuflite.org) */ diff --git a/app-accessibility/flite/patches/flite-2.0.0.patchset b/app-accessibility/flite/patches/flite-2.0.0.patchset new file mode 100644 index 000000000..0d51c70e4 --- /dev/null +++ b/app-accessibility/flite/patches/flite-2.0.0.patchset @@ -0,0 +1,102 @@ +From b21c80cf33debb37b6638ab2be8d188c5a14eafb Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 24 Dec 2014 22:37:15 +0000 +Subject: Support shared libraries on Haiku + + +diff --git a/configure.in b/configure.in +index 972d818..c2472a6 100644 +--- a/configure.in ++++ b/configure.in +@@ -265,6 +265,10 @@ fi + + if test "$shared" = true; then + case "$target_os" in ++ haiku*) ++ SHFLAGS="-fPIC" ++ OTHERLIBS="-lnetwork" ++ ;; + linux*|k*bsd*-gnu|gnu*) + SHFLAGS="-fPIC" + ;; +-- +1.8.3.4 + + +From 95e4aff793bbef466ed151897d71585bcb7e0321 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 24 Dec 2014 22:38:03 +0000 +Subject: Do not unconditionally add `-lm` to linking commands + +TODO: make this more platform-independent. + +diff --git a/config/common_make_rules b/config/common_make_rules +index 7a03785..0dacbb6 100644 +--- a/config/common_make_rules ++++ b/config/common_make_rules +@@ -68,7 +68,7 @@ BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR) + + FLITELIBS = $(BUILDDIR)/lib/libflite.a + FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite +-LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS) ++LDFLAGS += $(AUDIOLIBS) $(OTHERLIBS) + + FULLOBJS = $(OBJS:%=$(OBJDIR)/%) + ifdef SHFLAGS +-- +1.8.3.4 + + +From 96416a919c8ea1fcafd457502ee2bc6fd3ef107f Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 24 Dec 2014 22:39:36 +0000 +Subject: cmu_indic_lex: Separate code and declaration + + +diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c +index 3c586cb..ee682d6 100644 +--- a/lang/cmu_indic_lex/cmu_indic_lex.c ++++ b/lang/cmu_indic_lex/cmu_indic_lex.c +@@ -334,6 +334,9 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords, + int cur_char_type = 0; + int next_char_type = 0; + ++ const cst_val *v, *vx; ++ cst_val *ph; ++ + // Ignore chars (filter) + in_ords = cmu_indic_lex_remove_ignore_chars(ords); + +@@ -431,8 +434,6 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords, + } + } + +- const cst_val *v, *vx; +- cst_val *ph; + for(v=out_phone_strings; v; v=val_cdr(v)) { + ph = val_readlist_string(val_string(val_car(v))); + for(vx=ph; vx; vx=val_cdr(vx)) { +-- +1.8.3.4 + + +From 8b998ca76f21a8bb7cf240fd7ed40627eafbc2d8 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 24 Dec 2014 23:44:02 +0000 +Subject: Bump shlib version to libflite.so.2 + +This way it is consistent with libflite.so.2.0.0 + +diff --git a/config/project.mak b/config/project.mak +index f42ee12..252f22a 100644 +--- a/config/project.mak ++++ b/config/project.mak +@@ -40,4 +40,4 @@ PROJECT_VERSION = 2.0.0 + PROJECT_DATE = Dec 2014 + PROJECT_STATE = release + +-PROJECT_SHLIB_VERSION = 1 ++PROJECT_SHLIB_VERSION = 2 +-- +1.8.3.4 + From 3888896cf99135de2706cdb658a6d3aff756d4f3 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Thu, 25 Dec 2014 10:49:41 +0300 Subject: [PATCH 24/75] Tolmach: remove libfSub from provides --- haiku-apps/tolmach/tolmach-1.1.0.recipe | 1 - 1 file changed, 1 deletion(-) diff --git a/haiku-apps/tolmach/tolmach-1.1.0.recipe b/haiku-apps/tolmach/tolmach-1.1.0.recipe index 089e2ccee..8b4214906 100644 --- a/haiku-apps/tolmach/tolmach-1.1.0.recipe +++ b/haiku-apps/tolmach/tolmach-1.1.0.recipe @@ -15,7 +15,6 @@ ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" tolmach = $portVersion app:Tolmach = $portVersion - lib:libfSub " REQUIRES=" From 2045b82d55d7825d3f80fd5b624774713d625a94 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 25 Dec 2014 23:09:43 +0100 Subject: [PATCH 25/75] beam: update recipe now that patches have been upstreamed. --- haiku-apps/beam/beam-1.2alpha.recipe | 6 +-- .../beam/patches/beam-1.2alpha.patchset | 48 ------------------- 2 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 haiku-apps/beam/patches/beam-1.2alpha.patchset diff --git a/haiku-apps/beam/beam-1.2alpha.recipe b/haiku-apps/beam/beam-1.2alpha.recipe index 1fe158b50..fab9f0f64 100644 --- a/haiku-apps/beam/beam-1.2alpha.recipe +++ b/haiku-apps/beam/beam-1.2alpha.recipe @@ -1,7 +1,7 @@ SUMMARY="An e-mail client." HOMEPAGE="http://beam.sourceforge.net" -SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam" -REVISION="4" +SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam#95dc769db2f9090a038bc5a2c46f009379b2d57b" +REVISION="5" ARCHITECTURES="x86_gcc2 x86" PROVIDES=" beam = $portVersion @@ -26,8 +26,6 @@ BUILD_PREREQUIRES=" cmd:flex " -PATCHES="beam-1.2alpha.patchset" - BUILD() { jam -q $jobArgs diff --git a/haiku-apps/beam/patches/beam-1.2alpha.patchset b/haiku-apps/beam/patches/beam-1.2alpha.patchset deleted file mode 100644 index fbb9c2df8..000000000 --- a/haiku-apps/beam/patches/beam-1.2alpha.patchset +++ /dev/null @@ -1,48 +0,0 @@ -From e6115845893578b237144c1660a686802598ff9a Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Thu, 14 Nov 2013 02:12:56 -0700 -Subject: Adjust search path for libbnetapi - - -diff --git a/build-jam/BuildSettings b/build-jam/BuildSettings -index d411b68..4874ac6 100644 ---- a/build-jam/BuildSettings -+++ b/build-jam/BuildSettings -@@ -44,7 +44,7 @@ if $(OSPLAT) = X86 { - PLATFORM = zeta ; - } - # check for libbnetapi... -- local haveLibbnetapi = [ GLOB /boot/develop/lib/x86 : libbnetapi.so ] ; -+ local haveLibbnetapi = [ GLOB /boot/system/develop/lib : libbnetapi.so ] ; - if $(haveLibbnetapi) { - LIBNETAPI = bnetapi ; - } --- -1.8.3.4 - - -From 63db87fb177e6c1649bf0aad0aa1922af47dd59e Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Tue, 23 Dec 2014 10:18:56 +0100 -Subject: Remove leftover unlock. - -I can't find any place where the lock would be locked matching this call -to Unlock. Must be an error then. - -Triggers #6400 on Haiku. - -diff --git a/src-beam/BmGuiRoster.cpp b/src-beam/BmGuiRoster.cpp -index d16e0f1..cd4bf59 100644 ---- a/src-beam/BmGuiRoster.cpp -+++ b/src-beam/BmGuiRoster.cpp -@@ -516,7 +516,6 @@ void BmGuiRoster::RebuildLogMenu( BmMenuControllerBase* logMenu) { - } - logMenu->AddItem( smtpMenu); - } -- TheLogHandler->mLocker.Unlock(); - } - - /*------------------------------------------------------------------------------*\ --- -1.8.3.4 - From b18c8663a3544780615bad3e3ca9181a0e7bf7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 26 Dec 2014 15:09:10 +0000 Subject: [PATCH 26/75] OpenSceneGraph fixing POLICY WARNINGS --- games-engines/openscenegraph/openscenegraph-3.2.1.recipe | 3 +++ games-engines/openscenegraph/openscenegraph-git.recipe | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe index e6a8785e8..90ebb2aa3 100644 --- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -48,6 +48,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix mesa$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix @@ -55,6 +56,8 @@ REQUIRES=" lib:libcurl$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe index 474d351ec..e5280374a 100644 --- a/games-engines/openscenegraph/openscenegraph-git.recipe +++ b/games-engines/openscenegraph/openscenegraph-git.recipe @@ -42,11 +42,13 @@ PROVIDES=" lib:libosgViewer$secondaryArchSuffix = $portVersion lib:libosgVolume$secondaryArchSuffix = $portVersion lib:libosgWidget$secondaryArchSuffix = $portVersion + lib:libosgUI$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix mesa$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix @@ -54,6 +56,8 @@ REQUIRES=" lib:libcurl$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" @@ -107,7 +111,7 @@ INSTALL() libosgGA libosgManipulator libosgParticle \ libosgPresentation libosgShadow libosgSim \ libosgTerrain libosgText libosgUtil libosgViewer \ - libosgVolume libosgWidget + libosgVolume libosgWidget libosgUI fixPkgconfig @@ -134,6 +138,7 @@ PROVIDES_devel=" devel:libosgViewer$secondaryArchSuffix = $portVersion devel:libosgVolume$secondaryArchSuffix = $portVersion devel:libosgWidget$secondaryArchSuffix = $portVersion + devel:libosgUI$secondaryArchSuffix = $portVersion " REQUIRES_devel=" From a0b01aaf2fc61498f4eb9ec557b1bd8c1a5f2c15 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 25 Dec 2014 18:15:18 -0800 Subject: [PATCH 27/75] Add Edinburgh Speech Tools port --- .../licenses/Edinburgh Speech Tools | 70 + .../patches/speech_tools-2.4.patchset | 2977 +++++++++++++++++ .../speech_tools/speech_tools-2.4.recipe | 150 + 3 files changed, 3197 insertions(+) create mode 100644 app-accessibility/speech_tools/licenses/Edinburgh Speech Tools create mode 100644 app-accessibility/speech_tools/patches/speech_tools-2.4.patchset create mode 100644 app-accessibility/speech_tools/speech_tools-2.4.recipe diff --git a/app-accessibility/speech_tools/licenses/Edinburgh Speech Tools b/app-accessibility/speech_tools/licenses/Edinburgh Speech Tools new file mode 100644 index 000000000..f26d8fce4 --- /dev/null +++ b/app-accessibility/speech_tools/licenses/Edinburgh Speech Tools @@ -0,0 +1,70 @@ + Centre for Speech Technology Research + University of Edinburgh, UK + Copyright (c) 1994-2014 + All Rights Reserved. + +Permission is hereby granted, free of charge, to use and distribute +this software and its documentation without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of this work, and to +permit persons to whom this work is furnished to do so, subject to +the following conditions: + 1. The code must retain the above copyright notice, this list of + conditions and the following disclaimer. + 2. Any modifications must be clearly marked as such. + 3. Original authors' names are not deleted. + 4. The authors' names are not used to endorse or promote products + derived from this software without specific prior written + permission. + +THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK +DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT +SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + +COPYING +------------------------------------------------------------------------ + +Some files in the distribution do not fall under the above copyright. +However none have any commercial restrictions, and no files fall under +the GPL. Specifically files that have different licences are as +follows: + +grammar/wfst/wfst_train.cc + Copyright Carnegie Mellon University (under the same + open licences as much of the rest of the code). +siod/ +include/siod*.h +lib/siod/siod.scm + Apart from some new functionality under our licence the SIOD + files fall under the licence given in siod/slib.cc copyright + Paradigm Associates. This code has been substantially modified + by us though our changes are under that licence. + + editline.c editline.h el_complete.c el_sysunix.c el_unix.h + are copyright 1992 Simmule Turner and Rich Salz under the + "BSD like" licence in siod/editline.c Again substantial + changes have been made by us which continue to be under that + licence + +rxp/ +include/rxp/ + Is Copyright Richard Tobin. We have a specific version of RXP + which allows free (including non-commercial) use. + +base_class/raveconv.cc + Is copyright 1992, 1995 by Markus Mummert + +base_class/string/reg*.{c,cc} + Copyright (c) 1986 by University of Toronto. + +base_class/string/EST_strcasecmp.c + Copyright (c) 1987, 1993 + The Regents of the University of California. All rights reserved. + + The 3-clause BSD licence diff --git a/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset b/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset new file mode 100644 index 000000000..ed06dd054 --- /dev/null +++ b/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset @@ -0,0 +1,2977 @@ +From e6652c7af6115fb1e3465f79fa7344fcb030389e Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:13:10 -0800 +Subject: Proper compiling routines + +Backported from Debian: debian_build.diff + +Signed-off-by: Timothy Gu + +diff --git a/config/compilers/gcc_defaults.mak b/config/compilers/gcc_defaults.mak +index 193ce24..befcd31 100644 +--- a/config/compilers/gcc_defaults.mak ++++ b/config/compilers/gcc_defaults.mak +@@ -39,7 +39,7 @@ + ########################################################################### + + CC=gcc +-CXX=gcc ++CXX=g++ + ifeq ($(OSTYPE),Darwin) + CXX=g++ + endif +@@ -47,8 +47,9 @@ endif + COMPILER_DESC=FSF gcc + COMPILER_VERSION_COMMAND=$(CXX) -v 2>&1 | tail -1 | sed -e 's/^....//' + +-CFLAGS = $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) +-CXXFLAGS = $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS) ++CFLAGS += $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) $(CPPFLAGS) ++CXXFLAGS += $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) $(CPPFLAGS) ++LINKFLAGS += $(LDFLAGS) + + DEBUG_CCFLAGS = -g + DEBUG_CXXFLAGS = -g +@@ -81,7 +82,7 @@ SHARED_CXXFLAGS = -fPIC + SHARED_LINKFLAGS = + + ifndef GCC_MAKE_SHARED_LIB +- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX ++ MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY + else + MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) + endif +diff --git a/config/project.mak b/config/project.mak +index 5e9c216..2578fc1 100644 +--- a/config/project.mak ++++ b/config/project.mak +@@ -103,12 +103,15 @@ PROJECT_LIBRARY_USES_estbase = eststring + + PROJECT_LIBRARY_USES_estjava = estbase eststring + +-PROJECT_LIBRARY_VERSION_estools = $(PROJECT_VERSION).1 +-PROJECT_LIBRARY_VERSION_estbase = $(PROJECT_VERSION).1 +-PROJECT_LIBRARY_VERSION_eststring = 1.2 +-PROJECT_LIBRARY_VERSION_estjava = $(PROJECT_VERSION).1 ++# These are used for the SONAME fields in ELF libraries ++PROJECT_LIBRARY_VERSION_estools = $(PROJECT_MAJOR_VERSION) ++PROJECT_LIBRARY_VERSION_estbase = $(PROJECT_MAJOR_VERSION) ++PROJECT_LIBRARY_VERSION_eststring = $(PROJECT_MAJOR_VERSION) ++PROJECT_LIBRARY_VERSION_estjava = $(PROJECT_MAJOR_VERSION) + + PROJECT_LIBRARY_NEEDS_SYSLIBS_estjava=1 ++# This line allows estbase to link with libpulse among others ++PROJECT_LIBRARY_NEEDS_SYSLIBS_estbase=1 + + PROJECT_DEFAULT_LIBRARY = estools + +diff --git a/config/rules/bin_process.mak b/config/rules/bin_process.mak +index a1b9807..7158f83 100644 +--- a/config/rules/bin_process.mak ++++ b/config/rules/bin_process.mak +@@ -59,6 +59,7 @@ endif + Makefile ) : ;; \ + VCLocalRules ) : ;; \ + RCS|CVS ) : ;; \ ++ SCCS|BitKeeper ) : ;; \ + * ) $(ECHO_N) " $$i"; $(RM) -f "$$i";; \ + esac \ + done +diff --git a/config/rules/library.mak b/config/rules/library.mak +index 0181988..497180f 100644 +--- a/config/rules/library.mak ++++ b/config/rules/library.mak +@@ -102,15 +102,44 @@ endif + ## ## + ########################################################################### + ++libestools.so : libestools.a ++ echo Make Shared Library estools ++ if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi ++ (cd shared_space ; $(AR) x ../$< ) ++ echo Link Shared Library estools ++ if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_estools)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ ++ $(subst YYY,$@.$(PROJECT_LIBRARY_VERSION_estools),\ ++ $(subst XXX,$@.$(PROJECT_VERSION),$(MAKE_SHARED_LIB))) \ ++ shared_space/*.o $(PROJECT_LIBRARY_USES_estools:%=-L. -l%) $$libs -L. -lestbase -leststring -lncurses ++ $(RM) -f shared_space/*.o $@ ++ -ln -sf $@.$(PROJECT_VERSION) $@.$(PROJECT_LIBRARY_VERSION_estools) ++ -ln -sf $@.$(PROJECT_LIBRARY_VERSION_estools) $@ ++ ++libestbase.so : libestbase.a ++ echo Make Shared Library estbase ++ if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi ++ (cd shared_space ; $(AR) x ../$< ) ++ echo Link Shared Library estbase ++ if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_estbase)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ ++ $(subst YYY,$@.$(PROJECT_LIBRARY_VERSION_estbase),\ ++ $(subst XXX,$@.$(PROJECT_VERSION),$(MAKE_SHARED_LIB))) \ ++ shared_space/*.o $(PROJECT_LIBRARY_USES_estbase:%=-L. -l%) $$libs -L. ++ $(RM) -f shared_space/*.o $@ ++ -ln -sf $@.$(PROJECT_VERSION) $@.$(PROJECT_LIBRARY_VERSION_estbase) ++ -ln -sf $@.$(PROJECT_LIBRARY_VERSION_estbase) $@ ++ + lib%.so : lib%.a +- @echo Make Shared Library $* +- @if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi +- @(cd shared_space ; $(AR) x ../$< ) +- @echo Link Shared Library $* ++ echo Make Shared Library $* ++ if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi ++ (cd shared_space ; $(AR) x ../$< ) ++ echo Link Shared Library $* + if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ +- $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs +- @$(RM) -f shared_space/*.o $@ +- @ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@ ++ $(subst YYY,$@.$(PROJECT_LIBRARY_VERSION_$*),\ ++ $(subst XXX,$@.$(PROJECT_VERSION),$(MAKE_SHARED_LIB))) \ ++ shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs ++ $(RM) -f shared_space/*.o $@ ++ -ln -sf $@.$(PROJECT_VERSION) $@.$(PROJECT_LIBRARY_VERSION_$*) ++ -ln -sf $@.$(PROJECT_LIBRARY_VERSION_$*) $@ + + ########################################################################### + ## ## +diff --git a/config/rules/targets.mak b/config/rules/targets.mak +index f052401..0c55b00 100644 +--- a/config/rules/targets.mak ++++ b/config/rules/targets.mak +@@ -71,7 +71,7 @@ ifdef ALL_DIRS + @ for i in $(ALL_DIRS) ; \ + do \ + echo "clean in $(DIRNAME)/$$i" ;\ +- $(MAKE) --no-print-directory -C $$i clean ; \ ++ $(MAKE) --no-print-directory -C $$i NO_DEPEND=1 clean ; \ + done + endif + ifdef EXTRA_LIB_BUILD_DIRS +diff --git a/config/system.sh b/config/system.sh +index af07781..71b271c 100644 +--- a/config/system.sh ++++ b/config/system.sh +@@ -60,8 +60,7 @@ OSREV=`{ uname -r || echo ""; } 2> /dev/null | + sed -e 's/^\([^.]*\)\(\.[^-. ]*\).*/\1\2/'` + + # Sort out various flavours of Linux +-if [ "$OSTYPE" = Linux ] +- then ++case "$OSTYPE" in Linux|GNU|GNU/*) + if [ -f "/etc/redhat-release" ] + then + OSTYPE=RedHatLinux +@@ -74,7 +73,8 @@ if [ "$OSTYPE" = Linux ] + # Generic unknown GNU/Linux system. + OSTYPE=Linux + fi +-fi ++;; ++esac + + # Make sure we actually have a .mak file for it, otherwise fall back + # to sensible defaults (for example, kernel version and architecture +-- +1.8.3.4 + + +From 0eca7062ef526b969b4bc63a396bf380838369ee Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:14:58 -0800 +Subject: Use datadir for architecure-independent runtime libs + +Backported from Debian: datadir_fhs.diff, revision 7ec39b344cab. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_cutils.h b/include/EST_cutils.h +index c285204..8c8dc31 100644 +--- a/include/EST_cutils.h ++++ b/include/EST_cutils.h +@@ -48,6 +48,7 @@ extern "C" { + extern const char * const est_tools_version; + extern const char * const est_name; + extern const char * const est_libdir; ++extern const char * const est_datadir; + extern const char * const est_ostype; + + #include "EST_walloc.h" +diff --git a/lib/siod/siod.scm b/lib/siod/siod.scm +index a910390..227d48f 100644 +--- a/lib/siod/siod.scm ++++ b/lib/siod/siod.scm +@@ -426,19 +426,28 @@ return values." + ;; will be set automatically on start-up + (defvar libdir ' + "libdir +- The pathname of the run-time libary directory. Note reseting is +- almost definitely not what you want to do. This value is automatically +- set at start up from the value specifed at compile-time or the value +- specifed with --libdir on the command line. A number of other variables +- depend on this value.") +- +-(defvar load-path (list libdir) ++ The pathname of the architecture-dependent run-time libary directory. ++ Note reseting is almost definitely not what you want to do. This ++ value is automatically set at start up from the value specifed at ++ compile-time or the value specifed with --libdir on the command line. ++ A number of other variables depend on this value.") ++ ++(defvar datadir ' ++ "datadir ++ The pathname of the architecture-independent run-time libary ++ directory. Note reseting is almost definitely not what you want to ++ do. This value is automatically set at start up from the value ++ specifed at compile-time or the value specifed with --datadir on the ++ command line. A number of other variables depend on this value.") ++ ++(defvar load-path (list datadir) + "load-path + A list of directories containing .scm files. Used for various functions + such as load_library and require. Follows the same use as EMACS. By +- default it is set up to the compile-time library directory but may be +- changed by the user at run time, by adding a user's own library directory +- or even replacing all of the standard library. [see Site initialization]") ++ default it is set up to the compile-time architecture-independent ++ library directory but may be changed by the user at run time, by ++ adding a user's own library directory or even replacing all of the ++ standard library. [see Site initialization]") + + ;; will be set automatically on start-up + (defvar *ostype* 'unknown +@@ -447,12 +456,6 @@ return values." + on, e.g. SunOS5, FreeBSD, linux etc. The value is taken from the Makefile + variable OSTYPE at compile time.") + +-(defvar etc-path (path-append libdir "etc/" *ostype*) +- "etc-path +- A list of directories where binaries specific to Festival may be located. +- This variable is automatically set to LIBDIR/etc/OSTYPE/ +- and that path is added to the end of the UNIX PATH environment variable.") +- + (define (library_expand_filename fname) + "(library_expand_filename FILENAME) + Search for filename by appending FILENAME to each member of load-path. +diff --git a/main/siod_main.cc b/main/siod_main.cc +index 2c4a1a0..e93ba6c 100644 +--- a/main/siod_main.cc ++++ b/main/siod_main.cc +@@ -178,7 +178,7 @@ static void siod_load_default_files(void) + EST_Pathname initfile; + + // Load library init first +- initfile = EST_Pathname(est_libdir).as_directory(); ++ initfile = EST_Pathname(est_datadir).as_directory(); + initfile += "siod"; + initfile += "init.scm"; + +@@ -197,9 +197,12 @@ static void siod_lisp_vars(void) + + lib = EST_Pathname(est_libdir).as_directory(); + lib += "siod"; +- + siod_set_lval("libdir",strintern(lib)); + ++ lib = EST_Pathname(est_datadir).as_directory(); ++ lib += "siod"; ++ siod_set_lval("datadir",strintern(lib)); ++ + if (!strcmp(est_ostype,"")) + siod_set_lval("*ostype*",rintern(est_ostype)); + siod_set_lval("est_version", +@@ -221,19 +224,10 @@ static void siod_lisp_vars(void) + cons(flocons(minor), + cons(flocons(subminor),NIL)))); + +- EST_Pathname etcdircommon = est_libdir; +- etcdircommon += "etc"; +- +- EST_Pathname etcdir = etcdircommon; +- etcdir += est_ostype; +- + // Modify my PATH to include these directories +- siod_set_lval("etc-path",cons(rintern(etcdir), +- cons(rintern(etcdircommon),NIL))); +- + EST_String path = getenv("PATH"); + +- path += ":" + EST_String(etcdir) + ":" + EST_String(etcdircommon); ++ path += ":" + EST_String(est_libdir); + + putenv(wstrdup("PATH=" + path)); + +diff --git a/main/xml_parser_main.cc b/main/xml_parser_main.cc +index 41579f6..8f8a7e1 100644 +--- a/main/xml_parser_main.cc ++++ b/main/xml_parser_main.cc +@@ -165,7 +165,7 @@ int main(int argc, char *argv[]) + al.sval("-sysdir") + "/\\1"); + + pclass.register_id("//CSTR//EST \\(.*\\)", +- EST_String::cat(est_libdir, "/\\1.dtd")); ++ EST_String::cat(est_datadir, "/\\1.dtd")); + + /* An individual parser runs over a single source. + */ +diff --git a/utils/EST_cutils.c b/utils/EST_cutils.c +index fd29653..af30aed 100644 +--- a/utils/EST_cutils.c ++++ b/utils/EST_cutils.c +@@ -54,12 +54,19 @@ const char * const est_name = STRINGIZE(ESTNAME); + #ifdef ESTLIBDIRC + # define ESTLIBDIR STRINGIZE(ESTLIBDIRC) + #endif +- + #ifndef ESTLIBDIR + #define ESTLIBDIR "/usr/local/lib/speech_tools" + #endif + ++#ifdef ESTDATADIRC ++# define ESTDATADIR STRINGIZE(ESTDATADIRC) ++#endif ++#ifndef ESTDATADIR ++#define ESTDATADIR "/usr/local/share/speech_tools" ++#endif ++ + const char * const est_libdir = ESTLIBDIR; ++const char * const est_datadir = ESTDATADIR; + + const char * const est_ostype = STRINGIZE(ESTOSTYPE); + +diff --git a/utils/Makefile b/utils/Makefile +index c17bab4..62a0de8 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -58,5 +58,5 @@ ALL = .buildlibs + include $(TOP)/config/common_make_rules + + EST_cutils.o: EST_cutils.c +- $(CC_COMMAND) -DESTNAME='$(PROJECT_NAME)' -DESTDATE='$(PROJECT_DATE)' -DESTVERSION='$(PROJECT_VERSION)' -DESTLIBDIRC='$(EST_HOME)/lib' -DESTSTATE='$(PROJECT_STATE)' -DESTOSTYPE='$(SYSTEM_TYPE)' EST_cutils.c ++ $(CC_COMMAND) -DESTNAME='$(PROJECT_NAME)' -DESTDATE='$(PROJECT_DATE)' -DESTVERSION='$(PROJECT_VERSION)' -DESTLIBDIR=\"$(EST_HOME)/lib\" -DESTDATADIR=\"$(EST_HOME)/share\" -DESTSTATE='$(PROJECT_STATE)' -DESTOSTYPE='$(SYSTEM_TYPE)' EST_cutils.c + +-- +1.8.3.4 + + +From 30567c705c2e5aaf1c45737ebc409a87e70bf690 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:17:52 -0800 +Subject: Use standard headers + +Backported from Debian: use_standard_headers.diff, rev fc5c7c603109 + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_dynamic_model.h b/include/EST_dynamic_model.h +index a54a0c5..7807f8a 100644 +--- a/include/EST_dynamic_model.h ++++ b/include/EST_dynamic_model.h +@@ -38,8 +38,8 @@ + /*=======================================================================*/ + + #include +-#include +-#include ++#include ++#include + #include "EST.h" + #include "EST_model_types.h" + +-- +1.8.3.4 + + +From a03f11db6ac385ceb2f2897214e56fec6a477eff Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:19:24 -0800 +Subject: Force the use of actual template of EST_TIterator + +Backported from Debian: include_EST_TIterator.h.diff, rev c16015e8c96. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_TIterator.h b/include/EST_TIterator.h +index 7ce188e..832e8e3 100644 +--- a/include/EST_TIterator.h ++++ b/include/EST_TIterator.h +@@ -228,7 +228,7 @@ private: + + public: + +- typedef EST_TIterator Iter; ++ typedef EST_TRwIterator Iter; + + /// Create an iterator not associated with any specific container. + EST_TRwIterator() {this->cont=NULL;} +@@ -278,7 +278,7 @@ class EST_TRwStructIterator + { + public: + +- typedef EST_TIterator Iter; ++ typedef EST_TRwStructIterator Iter; + + /// Create an iterator not associated with any specific container. + EST_TRwStructIterator() {this->cont=NULL;} +-- +1.8.3.4 + + +From 5a0d0a6091371c358a47f4a6c14eadbd300b1ac0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:22:25 -0800 +Subject: Modify data loading memory management to avoid crashes + +Author: Samuel Thibault + +Backported from Debian: speech_class/EST_WaveFile.cc, rev 1d2d56519d + +Signed-off-by: Timothy Gu + +diff --git a/speech_class/EST_WaveFile.cc b/speech_class/EST_WaveFile.cc +index ba8a362..7f07a31 100644 +--- a/speech_class/EST_WaveFile.cc ++++ b/speech_class/EST_WaveFile.cc +@@ -85,7 +85,10 @@ EST_read_status load_using(standard_load_fn_fp fn, + + if (status == read_ok) + { +- wv.values().set_memory(data, 0, nsamp, nchan, TRUE); ++ short *data2 = new short[nsamp*nchan]; ++ memcpy(data2, data, nsamp*nchan*sizeof(short)); ++ wfree(data); ++ wv.values().set_memory(data2, 0, nsamp, nchan, TRUE); + wv.set_sample_rate(srate); + } + +-- +1.8.3.4 + + +From 2a470daf58bcebc49461b08c678bb4dd694adf1b Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:24:19 -0800 +Subject: Use 3-clause BSD license for the files derived from BSD + +BSD (where these two files came from) already switched to 3-clause BSD. + +Backported from Debian: copyright_4clausefix.diff, rev 9d3453539788. + +Changes to README made by me (Timothy), with the same rationale as the original +Debian patch. + +Signed-off-by: Timothy Gu + +diff --git a/README b/README +index 88e3ded..dfdeae5 100644 +--- a/README ++++ b/README +@@ -126,7 +126,7 @@ base_class/string/EST_strcasecmp.c + Copyright (c) 1987, 1993 + The Regents of the University of California. All rights reserved. + +- The standard BSD licence ++ The 3-clause BSD licence + + + ACKNOWLEDGEMENTS +diff --git a/base_class/string/EST_strcasecmp.c b/base_class/string/EST_strcasecmp.c +index 72a9b7c..1c48a32 100755 +--- a/base_class/string/EST_strcasecmp.c ++++ b/base_class/string/EST_strcasecmp.c +@@ -10,11 +10,7 @@ + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. +- * 3. All advertising materials mentioning features or use of this software +- * must display the following acknowledgement: +- * This product includes software developed by the University of +- * California, Berkeley and its contributors. +- * 4. Neither the name of the University nor the names of its contributors ++ * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * +diff --git a/base_class/string/regexp.h b/base_class/string/regexp.h +index 578c968..8b310ae 100644 +--- a/base_class/string/regexp.h ++++ b/base_class/string/regexp.h +@@ -14,11 +14,7 @@ + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. +- * 3. All advertising materials mentioning features or use of this software +- * must display the following acknowledgement: +- * This product includes software developed by the University of +- * California, Berkeley and its contributors. +- * 4. Neither the name of the University nor the names of its contributors ++ * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * +-- +1.8.3.4 + + +From 3de08ae8da37beb2665fb8a256311315f5edd31c Mon Sep 17 00:00:00 2001 +From: Sergio Oller +Date: Thu, 25 Dec 2014 14:33:54 -0800 +Subject: Seeking and reading interface to istreams in EST_TokenStream + +Reduces IO disk usage when using HTS voices. + +Backported from Debian: tokenstream_istream.diff, rev b3d550a5aa330. + +Signed-off-by: Timothy Gu + +diff --git a/base_class/EST_Token.cc b/base_class/EST_Token.cc +index 4287d19..533467d 100644 +--- a/base_class/EST_Token.cc ++++ b/base_class/EST_Token.cc +@@ -287,8 +287,9 @@ int EST_TokenStream::seek_end() + return -1; + break; + case tst_istream: +- cerr << "EST_TokenStream seek on istream not yet supported" << endl; +- return -1; ++ is->seekg(0,is->end); ++ p_filepos = is->tellg(); ++ return p_filepos; + break; + case tst_string: + pos = buffer_length; +@@ -320,8 +321,9 @@ int EST_TokenStream::seek(int position) + return -1; + break; + case tst_istream: +- cerr << "EST_TokenStream seek on istream not yet supported" << endl; +- return -1; ++ p_filepos = position; ++ is->seekg(position, is->beg); ++ return 0; + break; + case tst_string: + if (position >= pos) +@@ -381,8 +383,9 @@ int EST_TokenStream::fread(void *buff, int size, int nitems) + return 0; + break; + case tst_istream: +- cerr << "EST_TokenStream fread istream not yet supported" << endl; +- return 0; ++ is->read((char*)buff, (size_t) size*nitems); ++ return is->gcount()/size; ++ break; + case tst_string: + if ((buffer_length-pos)/size < nitems) + items_read = (buffer_length-pos)/size; +-- +1.8.3.4 + + +From 1a4805cb16dd6d322b8736c0846748f1bf8fa2f0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:48:11 -0800 +Subject: Add ALAW support + +Backported from Debian: alaw.diff, rev da4af248. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_wave_aux.h b/include/EST_wave_aux.h +index 4995794..9d2bfde 100644 +--- a/include/EST_wave_aux.h ++++ b/include/EST_wave_aux.h +@@ -97,6 +97,7 @@ void alaw_to_short(const unsigned char *alaw,short *data,int length); + void uchar_to_short(const unsigned char *chars,short *data,int length); + void short_to_char(const short *data,unsigned char *chars,int length); + void short_to_ulaw(const short *data,unsigned char *ulaw,int length); ++void short_to_alaw(const short *data,unsigned char *alaw,int length); + + // Used when setting Waves in Features + VAL_REGISTER_CLASS_DCLS(wave,EST_Wave) +diff --git a/speech_class/EST_WaveFile.cc b/speech_class/EST_WaveFile.cc +index 7f07a31..5e8d46e 100644 +--- a/speech_class/EST_WaveFile.cc ++++ b/speech_class/EST_WaveFile.cc +@@ -315,6 +315,27 @@ EST_write_status EST_WaveFile::save_ulaw(FILE *fp, + return save_using(save_wave_ulaw, fp, localwv, stype, bo); + } + ++EST_read_status EST_WaveFile::load_alaw(EST_TokenStream &ts, ++ EST_Wave &wv, ++ int rate, ++ EST_sample_type_t stype, int bo, int nchan, ++ int offset, int length) ++{ ++ return load_using(load_wave_alaw, ++ ts, wv, rate, ++ stype, bo, nchan, ++ offset, length); ++} ++ ++EST_write_status EST_WaveFile::save_alaw(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_using(save_wave_alaw, fp, localwv, stype, bo); ++} ++ + static int parse_esps_r_option(EST_String arg, int &offset, int &length) + { + EST_String s, e; +@@ -385,6 +406,11 @@ EST_read_status read_wave(EST_Wave &sig, const EST_String &in_file, + al.add_item("-itype","ulaw"); + al.add_item("-f","8000"); + } ++ if (al.present("-alaw")) ++ { ++al.add_item("-itype","alaw"); ++al.add_item("-f","8000"); ++ } + if (al.present("-iswap")) + al.add_item("-ibo","other"); + +@@ -455,6 +481,11 @@ EST_read_status read_wave(EST_Wave &sig, const EST_String &in_file, + cerr << "Cannot recognize file format or cannot access file: \"" << in_file << "\"\n"; + return read_error; + } ++ if (file_type == "alaw") ++ { ++sample_rate = 8000; ++sample_type = "alaw"; ++ } + + if (al.present("-start") || al.present("-end") + || al.present("-to") || al.present("-from")) +diff --git a/speech_class/EST_WaveFile.h b/speech_class/EST_WaveFile.h +index 04fca06..e9217b9 100644 +--- a/speech_class/EST_WaveFile.h ++++ b/speech_class/EST_WaveFile.h +@@ -57,7 +57,8 @@ typedef enum EST_WaveFileType{ + wff_aiff, + wff_riff, + wff_raw, +- wff_ulaw ++ wff_ulaw, ++ wff_alaw + } EST_WaveFileType; + + class EST_WaveFile { +@@ -125,6 +126,9 @@ public: + static EST_write_status save_ulaw(SaveWave_TokenStreamArgs); + static EST_read_status load_ulaw(LoadWave_TokenStreamArgs); + ++ static EST_write_status save_alaw(SaveWave_TokenStreamArgs); ++ static EST_read_status load_alaw(LoadWave_TokenStreamArgs); ++ + static EST_TNamedEnumI map; + + static EST_String options_supported(void); +diff --git a/speech_class/EST_wave_aux.cc b/speech_class/EST_wave_aux.cc +index afd6a85..24eb430 100644 +--- a/speech_class/EST_wave_aux.cc ++++ b/speech_class/EST_wave_aux.cc +@@ -287,7 +287,7 @@ EST_String options_wave_input(void) + " endian)\n\n" + "-iswap Swap bytes. (For use on an unheadered input file)\n\n" + "-istype Sample type in an unheadered input file:\n" +- " short, mulaw, byte, ascii\n\n" ++ " short, alaw, mulaw, byte, ascii\n\n" + "-c Select a single channel (starts from 0). \n" + " Waveforms can have multiple channels. This option \n" + " extracts a single channel for progcessing and \n" +@@ -318,7 +318,7 @@ EST_String options_wave_output(void) + " Intel, Alpha, DEC Mips, Vax are LSB \n" + " (little endian)\n\n" + "-oswap Swap bytes when saving to output\n\n"+ +- "-ostype Output sample type: short, mulaw, byte or ascii\n\n"; ++ "-ostype Output sample type: short, alaw, mulaw, byte or ascii\n\n"; + } + + Declare_TNamedEnum(EST_sample_type_t) +diff --git a/speech_class/EST_wave_io.cc b/speech_class/EST_wave_io.cc +index e351d21..dae0963 100644 +--- a/speech_class/EST_wave_io.cc ++++ b/speech_class/EST_wave_io.cc +@@ -107,15 +107,17 @@ const char *sample_type_to_nist(enum EST_sample_type_t sample_type) + { + const char *c; + switch (sample_type) { +- case st_unknown: ++ case st_unknown: + c = ""; break; +- case st_schar: ++ case st_schar: + c = "PCM-1"; break; ++ case st_alaw: ++ c = "ALAW"; break; + case st_mulaw: + c = "ULAW"; break; +- case st_short: ++ case st_short: + c = "pcm"; break; +- case st_int: ++ case st_int: + c = "PCM-4"; break; + case st_float: + c = "REAL"; break; +@@ -141,6 +143,9 @@ enum EST_sample_type_t nist_to_sample_type(char *type) + (EST_strcasecmp(type,"mu-law",NULL) == 0) || + (EST_strcasecmp(type,"mulaw",NULL) == 0)) + return st_mulaw; ++ else if ((EST_strcasecmp(type,"ALAW",NULL) == 0) || ++ (EST_strcasecmp(type,"A-LAW",NULL) == 0)) ++ return st_alaw; + else if (strcmp(type,"alaw") == 0) + return st_alaw; + else if (strcmp(type,"PCM-1") == 0) +@@ -192,6 +197,11 @@ enum EST_read_status load_wave_nist(EST_TokenStream &ts, short **data, int + byte_order = wstrdup((EST_BIG_ENDIAN ? "10" : "01")); + sample_coding = wstrdup("ULAW"); + } ++ if (streq(byte_order,"a-law")) ++ { ++ byte_order = wstrdup((EST_BIG_ENDIAN ? "10" : "01")); ++ sample_coding = wstrdup("ALAW"); ++ } + + /* code for reading in Tony Robinson's shorten files. + This is a temporary fix which calls the unshorten program on the +@@ -473,12 +483,13 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + /* The follow are registered proprietary WAVE formats (?) */ + case WAVE_FORMAT_MULAW: + actual_sample_type = st_mulaw; break; ++ case WAVE_FORMAT_ALAW: ++ actual_sample_type = st_alaw; break; + case WAVE_FORMAT_ADPCM: +- fprintf(stderr, "RIFF file: unsupported proprietary sample format ADPCM\n"); ++ fprintf(stderr, "RIFF file: unsupported proprietary sample format ADPCM\n"); + actual_sample_type = st_short; + break; + /* actual_sample_type = st_adpcm; break; */ /* yes but which adpcm ! */ +- case WAVE_FORMAT_ALAW: + default: + fprintf(stderr, "RIFF file: unknown sample format\n"); + actual_sample_type = st_short; +@@ -843,50 +854,103 @@ enum EST_read_status load_wave_ulaw(EST_TokenStream &ts, short **data, int + { + unsigned char *ulaw; + int data_length,samps; +- ++ + ts.seek_end(); + samps = ts.tell(); +- ++ + if (length == 0) + data_length = samps - offset; + else + data_length = length; +- ++ + ulaw = walloc(unsigned char, data_length); + ts.seek(offset); + if (ts.fread(ulaw,1,data_length) != data_length) + { +- wfree(ulaw); ++ wfree(ulaw); + return misc_read_error; + } +- ++ + *data = walloc(short,data_length); + ulaw_to_short(ulaw,*data,data_length); + wfree(ulaw); +- ++ + *num_samples = data_length; + *sample_rate = 8000; + *num_channels = 1; + *sample_type = st_short; + *word_size = 2; + *bo = EST_NATIVE_BO; +- ++ + return format_ok; + } + + enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, +- int sample_rate, ++ int num_samples, int num_channels, ++ int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { + (void)sample_rate; + (void)sample_type; + return save_wave_raw(fp,data,offset,num_samples,num_channels, + 8000,st_mulaw,bo); +- +- ++ ++ ++} ++ ++enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int ++ *num_samples, int *num_channels, int *word_size, int ++ *sample_rate, enum EST_sample_type_t *sample_type, int *bo, ++ int offset, int length) ++ ++{ ++ unsigned char *alaw; ++ int data_length,samps; ++ ++ ts.seek_end(); ++ samps = ts.tell(); ++ ++ if (length == 0) ++ data_length = samps - offset; ++ else ++ data_length = length; ++ ++ alaw = walloc(unsigned char, data_length); ++ ts.seek(offset); ++ if (ts.fread(alaw,1,data_length) != data_length) ++ { ++ wfree(alaw); ++ return misc_read_error; ++ } ++ ++ *data = walloc(short,data_length); ++ alaw_to_short(alaw,*data,data_length); ++ wfree(alaw); ++ ++ *num_samples = data_length; ++ *sample_rate = 8000; ++ *num_channels = 1; ++ *sample_type = st_short; ++ *word_size = 2; ++ *bo = EST_NATIVE_BO; ++ ++ return format_ok; + } + ++enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ (void)sample_rate; ++ (void)sample_type; ++ return save_wave_raw(fp,data,offset,num_samples,num_channels, ++ 8000,st_alaw,bo); ++ ++ ++} ++ ++ + /*=======================================================================*/ + /* Sun and Next snd files */ + /*=======================================================================*/ +diff --git a/speech_class/EST_wave_utils.cc b/speech_class/EST_wave_utils.cc +index d70ee87..55878b9 100644 +--- a/speech_class/EST_wave_utils.cc ++++ b/speech_class/EST_wave_utils.cc +@@ -53,7 +53,9 @@ + #include "EST_error.h" + + static short st_ulaw_to_short(unsigned char ulawbyte); ++static short st_alaw_to_short(unsigned char alawbyte); + static unsigned char st_short_to_ulaw(short sample); ++static unsigned char st_short_to_alaw(short sample); + + /* + * This table is +@@ -202,6 +204,16 @@ void short_to_ulaw(const short *data,unsigned char *ulaw,int length) + + } + ++void short_to_alaw(const short *data,unsigned char *alaw,int length) ++{ ++ /* Convert alaw to shorts */ ++ int i; ++ ++ for (i=0; i + +-/* The follow two (raw and ulaw) cannot be in the table as they cannot */ ++/* The follow two (raw, alaw and ulaw) cannot be in the table as they cannot */ + /* identify themselves from files (both are unheadered) */ + enum EST_read_status load_wave_raw(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int +@@ -62,6 +62,15 @@ enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t, int bo); + ++enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int ++ *num_samples, int *num_channels, int *word_size, int ++ *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int ++ offset, int length); ++enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, ++ int length, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t, int bo); ++ + enum EST_read_status load_wave_nist(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +diff --git a/testsuite/correct/ch_wave_script.out b/testsuite/correct/ch_wave_script.out +index b656ff3..fa4aee1 100644 +--- a/testsuite/correct/ch_wave_script.out ++++ b/testsuite/correct/ch_wave_script.out +@@ -77,7 +77,7 @@ use "-" to make input and output files stdin/out + -iswap Swap bytes. (For use on an unheadered input file) + + -istype Sample type in an unheadered input file: +- short, mulaw, byte, ascii ++ short, alaw, mulaw, byte, ascii + + -c Select a single channel (starts from 0). + Waveforms can have multiple channels. This option +@@ -112,7 +112,7 @@ use "-" to make input and output files stdin/out + + -oswap Swap bytes when saving to output + +--ostype Output sample type: short, mulaw, byte or ascii ++-ostype Output sample type: short, alaw, mulaw, byte or ascii + + -scale Scaling factor. Increase or descrease the amplitude + of the whole waveform by the factor given +-- +1.8.3.4 + + +From 77a6c8d1f2fa93c2809ede4833d21e19b757df14 Mon Sep 17 00:00:00 2001 +From: Sergio Oller +Date: Thu, 25 Dec 2014 14:48:54 -0800 +Subject: Allow saving wave files in parts + +Backported from Debian: wave_save_parts.diff, rev 5cf72e31d. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_Wave.h b/include/EST_Wave.h +index 053e2a9..1e7324e 100644 +--- a/include/EST_Wave.h ++++ b/include/EST_Wave.h +@@ -295,11 +295,18 @@ public: + + EST_write_status save_file(const EST_String filename, + EST_String filetype, +- EST_String sample_type, int bo); ++ EST_String sample_type, int bo, const char *mode = "wb"); + + EST_write_status save_file(FILE *fp, + EST_String filetype, + EST_String sample_type, int bo); ++ ++ EST_write_status save_file_header(FILE *fp, ++ EST_String ftype, ++ EST_String stype, int obo); ++ EST_write_status save_file_data(FILE *fp, ++ EST_String ftype, ++ EST_String stype, int obo); + //@} + + /// Assignment operator +diff --git a/include/EST_wave_aux.h b/include/EST_wave_aux.h +index 9d2bfde..942ffb3 100644 +--- a/include/EST_wave_aux.h ++++ b/include/EST_wave_aux.h +@@ -116,6 +116,13 @@ enum EST_sample_type_t { + st_alaw, + st_ascii}; + ++ ++enum EST_write_status wave_io_save_header(FILE *fp, ++ const int num_samples, const int num_channels, ++ const int sample_rate, ++ const EST_String& stype, const int bo, ++ const EST_String& ftype); ++ + extern EST_TNamedEnum EST_sample_type_map; + + #endif /* __EST_WAVE_AUX_H__ */ +diff --git a/speech_class/EST_Wave.cc b/speech_class/EST_Wave.cc +index 7a882a0..816baec 100644 +--- a/speech_class/EST_Wave.cc ++++ b/speech_class/EST_Wave.cc +@@ -392,13 +392,13 @@ EST_write_status EST_Wave::save(FILE *fp, const EST_String type) + + EST_write_status EST_Wave::save_file(const EST_String filename, + EST_String ftype, +- EST_String stype, int obo) ++ EST_String stype, int obo, const char *mode) + { + FILE *fp; + + if (filename == "-") + fp = stdout; +- else if ((fp = fopen(filename,"wb")) == NULL) ++ else if ((fp = fopen(filename, mode)) == NULL) + { + cerr << "Wave save: can't open output file \"" << + filename << "\"" << endl; +@@ -433,7 +433,55 @@ EST_write_status EST_Wave::save_file(FILE *fp, + } + + return (*s_fun)(fp, *this, sample_type, obo); ++} ++ ++EST_write_status EST_Wave::save_file_data(FILE *fp, ++ EST_String ftype, ++ EST_String stype, int obo) ++{ ++ EST_WaveFileType t = EST_WaveFile::map.token(ftype); ++ EST_sample_type_t sample_type = EST_sample_type_map.token(stype); ++ ++ if (t == wff_none) ++ { ++ cerr << "Unknown Wave file type " << ftype << endl; ++ return write_fail; ++ } ++ ++ EST_WaveFile::Save_TokenStream * s_fun = EST_WaveFile::map.info(t).save_data; + ++ if (s_fun == NULL) ++ { ++ cerr << "Can't save wave data to files type " << ftype << endl; ++ return write_fail; ++ } ++ ++ return (*s_fun)(fp, *this, sample_type, obo); ++} ++ ++ ++EST_write_status EST_Wave::save_file_header(FILE *fp, ++ EST_String ftype, ++ EST_String stype, int obo) ++{ ++ EST_WaveFileType t = EST_WaveFile::map.token(ftype); ++ EST_sample_type_t sample_type = EST_sample_type_map.token(stype); ++ ++ if (t == wff_none) ++ { ++ cerr << "Unknown Wave file type " << ftype << endl; ++ return write_fail; ++ } ++ ++ EST_WaveFile::Save_TokenStream * s_fun = EST_WaveFile::map.info(t).save_header; ++ ++ if (s_fun == NULL) ++ { ++ cerr << "Can't save wave header to files type " << ftype << endl; ++ return write_fail; ++ } ++ ++ return (*s_fun)(fp, *this, sample_type, obo); + } + + void EST_Wave::resample(int new_freq) +diff --git a/speech_class/EST_WaveFile.cc b/speech_class/EST_WaveFile.cc +index 5e8d46e..61d5c23 100644 +--- a/speech_class/EST_WaveFile.cc ++++ b/speech_class/EST_WaveFile.cc +@@ -43,8 +43,8 @@ + #include "EST_cutils.h" + #include "EST_Option.h" + #include "EST_io_aux.h" +-#include "stdio.h" +-#include "math.h" ++#include ++#include + + void extract(EST_Wave &sig, EST_Option &al); + +@@ -62,7 +62,12 @@ EST_write_status (*standard_save_fn_fp)(FILE *fp, + int offset, int nsamp, + int nchan, int srate, + EST_sample_type_t stype, int bo); +- ++ ++typedef ++EST_write_status (*standard_save_header_fn_fp)(FILE *fp, ++ int nsamp, ++ int nchan, int srate, ++ EST_sample_type_t stype, int bo); + + static + EST_read_status load_using(standard_load_fn_fp fn, +@@ -109,6 +114,19 @@ EST_write_status status = (*fn)(fp, + return status; + } + ++static ++EST_write_status save_header_using(standard_save_header_fn_fp fn, ++ FILE *fp, const EST_Wave wv, ++ EST_sample_type_t stype, int bo) ++{ ++ ++EST_write_status status = (*fn)(fp, ++ wv.num_samples(), wv.num_channels(), ++ wv.sample_rate(), ++ stype, bo); ++return status; ++} ++ + EST_read_status EST_WaveFile::load_nist(EST_TokenStream &ts, + EST_Wave &wv, + int rate, +@@ -128,6 +146,20 @@ EST_write_status EST_WaveFile::save_nist(FILE *fp, + return save_using(save_wave_nist, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_nist_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_nist_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_nist_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_nist_header, fp, wv, stype, bo); ++} ++ + EST_read_status EST_WaveFile::load_est(EST_TokenStream &ts, + EST_Wave &wv, + int rate, +@@ -149,7 +181,24 @@ EST_write_status EST_WaveFile::save_est(FILE *fp, + return save_using(save_wave_est, + fp, wv, + stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_est_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_est_data, ++ fp, wv, ++ stype, bo); ++} + ++EST_write_status EST_WaveFile::save_est_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_est_header, ++ fp, wv, ++ stype, bo); + } + + EST_read_status EST_WaveFile::load_aiff(EST_TokenStream &ts, +@@ -171,6 +220,19 @@ EST_write_status EST_WaveFile::save_aiff(FILE *fp, + return save_using(save_wave_aiff, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_aiff_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_aiff_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_aiff_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_aiff_header, fp, wv, stype, bo); ++} + + EST_read_status EST_WaveFile::load_riff(EST_TokenStream &ts, + EST_Wave &wv, +@@ -191,6 +253,19 @@ EST_write_status EST_WaveFile::save_riff(FILE *fp, + return save_using(save_wave_riff, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_riff_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_riff_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_riff_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_riff_header, fp, wv, stype, bo); ++} + + EST_read_status EST_WaveFile::load_esps(EST_TokenStream &ts, + EST_Wave &wv, +@@ -213,6 +288,23 @@ EST_write_status EST_WaveFile::save_esps(FILE *fp, + stype, bo); + } + ++EST_write_status EST_WaveFile::save_esps_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_sd_data, ++ fp, wv, ++ stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_esps_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_sd_header, ++ fp, wv, ++ stype, bo); ++} + + EST_read_status EST_WaveFile::load_audlab(EST_TokenStream &ts, + EST_Wave &wv, +@@ -233,6 +325,19 @@ EST_write_status EST_WaveFile::save_audlab(FILE *fp, + return save_using(save_wave_audlab, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_audlab_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_audlab_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_audlab_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_audlab_header, fp, wv, stype, bo); ++} + + EST_read_status EST_WaveFile::load_snd(EST_TokenStream &ts, + EST_Wave &wv, +@@ -253,6 +358,21 @@ EST_write_status EST_WaveFile::save_snd(FILE *fp, + return save_using(save_wave_snd, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_snd_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_snd_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_snd_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_snd_header, fp, wv, stype, bo); ++} ++ ++ + + EST_read_status EST_WaveFile::load_raw(EST_TokenStream &ts, + EST_Wave &wv, +@@ -293,6 +413,20 @@ EST_write_status status = save_wave_raw(fp, + return status; + } + ++EST_write_status EST_WaveFile::save_raw_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++return save_raw(fp, wv, stype, bo); ++} ++ ++ ++EST_write_status EST_WaveFile::save_raw_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_raw_header, fp, wv, stype, bo); ++} + + EST_read_status EST_WaveFile::load_ulaw(EST_TokenStream &ts, + EST_Wave &wv, +@@ -315,6 +449,25 @@ EST_write_status EST_WaveFile::save_ulaw(FILE *fp, + return save_using(save_wave_ulaw, fp, localwv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_ulaw_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_using(save_wave_ulaw_data, fp, localwv, stype, bo); ++} ++ ++ ++EST_write_status EST_WaveFile::save_ulaw_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_header_using(save_wave_ulaw_header, fp, localwv, stype, bo); ++} ++ + EST_read_status EST_WaveFile::load_alaw(EST_TokenStream &ts, + EST_Wave &wv, + int rate, +@@ -575,25 +728,43 @@ static + EST_TValuedEnumDefinition wavefile_names[] = + { + { wff_none, { NULL }, +- { FALSE, NULL, NULL, "unknown track file type"} }, ++ { FALSE, NULL, NULL, NULL, NULL, "unknown track file type"} }, + { wff_nist, { "nist", "timit" }, +- { TRUE, EST_WaveFile::load_nist, EST_WaveFile::save_nist, "nist/timit" } }, ++ { TRUE, EST_WaveFile::load_nist, EST_WaveFile::save_nist, ++ EST_WaveFile::save_nist_header, EST_WaveFile::save_nist_data, ++ "nist/timit" } }, + { wff_est, { "est"}, +- { TRUE, EST_WaveFile::load_est, EST_WaveFile::save_est, "est" } }, ++ { TRUE, EST_WaveFile::load_est, EST_WaveFile::save_est, ++ EST_WaveFile::save_est_header, EST_WaveFile::save_est_data, ++ "est" } }, + { wff_esps, { "esps", "sd"}, +- { TRUE, EST_WaveFile::load_esps, EST_WaveFile::save_esps, "esps SD waveform" } }, ++ { TRUE, EST_WaveFile::load_esps, EST_WaveFile::save_esps, ++ EST_WaveFile::save_esps_header, EST_WaveFile::save_esps_data, ++ "esps SD waveform" } }, + { wff_audlab, { "audlab", "vox"}, +- { TRUE, EST_WaveFile::load_audlab, EST_WaveFile::save_audlab, "audlab waveform" } }, ++ { TRUE, EST_WaveFile::load_audlab, EST_WaveFile::save_audlab, ++ EST_WaveFile::save_audlab_header, EST_WaveFile::save_audlab_data, ++ "audlab waveform" } }, + { wff_snd, { "snd", "au"}, +- { TRUE, EST_WaveFile::load_snd, EST_WaveFile::save_snd, "Sun snd file" } }, ++ { TRUE, EST_WaveFile::load_snd, EST_WaveFile::save_snd, ++ EST_WaveFile::save_snd_header, EST_WaveFile::save_snd_data, ++ "Sun snd file" } }, + { wff_aiff, { "aiff" }, +- { TRUE, EST_WaveFile::load_aiff, EST_WaveFile::save_aiff, "Apple aiff file" } }, ++ { TRUE, EST_WaveFile::load_aiff, EST_WaveFile::save_aiff, ++ EST_WaveFile::save_aiff_header, EST_WaveFile::save_aiff_data, ++ "Apple aiff file" } }, + { wff_riff, { "riff", "wav" }, +- { TRUE, EST_WaveFile::load_riff, EST_WaveFile::save_riff, "Microsoft wav/riff file" } }, ++ { TRUE, EST_WaveFile::load_riff, EST_WaveFile::save_riff, ++ EST_WaveFile::save_riff_header, EST_WaveFile::save_riff_data, ++ "Microsoft wav/riff file" } }, + { wff_raw, { "raw" }, +- { FALSE, EST_WaveFile::load_raw, EST_WaveFile::save_raw, "Headerless File" } }, ++ { FALSE, EST_WaveFile::load_raw, EST_WaveFile::save_raw, ++ EST_WaveFile::save_raw_header, EST_WaveFile::save_raw_data, ++ "Headerless File" } }, + { wff_ulaw, { "ulaw", "basic" }, +- { FALSE, EST_WaveFile::load_ulaw, EST_WaveFile::save_ulaw, "Headerless 8K ulaw File" } }, ++ { FALSE, EST_WaveFile::load_ulaw, EST_WaveFile::save_ulaw, ++ EST_WaveFile::save_ulaw_header, EST_WaveFile::save_ulaw_data, ++ "Headerless 8K ulaw File" } }, + { wff_none, {NULL} } + }; + +diff --git a/speech_class/EST_WaveFile.h b/speech_class/EST_WaveFile.h +index e9217b9..a185f5a 100644 +--- a/speech_class/EST_WaveFile.h ++++ b/speech_class/EST_WaveFile.h +@@ -96,34 +96,54 @@ public: + bool recognise; + Load_TokenStream *load; + Save_TokenStream *save; ++ Save_TokenStream *save_header; ++ Save_TokenStream *save_data; + const char *description; + } Info; + + static EST_write_status save_nist(SaveWave_TokenStreamArgs); ++ static EST_write_status save_nist_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_nist_data(SaveWave_TokenStreamArgs); + static EST_read_status load_nist(LoadWave_TokenStreamArgs); + + static EST_write_status save_est(SaveWave_TokenStreamArgs); ++ static EST_write_status save_est_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_est_data(SaveWave_TokenStreamArgs); + static EST_read_status load_est(LoadWave_TokenStreamArgs); + + static EST_write_status save_esps(SaveWave_TokenStreamArgs); ++ static EST_write_status save_esps_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_esps_data(SaveWave_TokenStreamArgs); + static EST_read_status load_esps(LoadWave_TokenStreamArgs); + + static EST_write_status save_audlab(SaveWave_TokenStreamArgs); ++ static EST_write_status save_audlab_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_audlab_data(SaveWave_TokenStreamArgs); + static EST_read_status load_audlab(LoadWave_TokenStreamArgs); + + static EST_write_status save_snd(SaveWave_TokenStreamArgs); ++ static EST_write_status save_snd_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_snd_data(SaveWave_TokenStreamArgs); + static EST_read_status load_snd(LoadWave_TokenStreamArgs); + + static EST_write_status save_aiff(SaveWave_TokenStreamArgs); ++ static EST_write_status save_aiff_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_aiff_data(SaveWave_TokenStreamArgs); + static EST_read_status load_aiff(LoadWave_TokenStreamArgs); + + static EST_write_status save_riff(SaveWave_TokenStreamArgs); ++ static EST_write_status save_riff_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_riff_data(SaveWave_TokenStreamArgs); + static EST_read_status load_riff(LoadWave_TokenStreamArgs); + + static EST_write_status save_raw(SaveWave_TokenStreamArgs); ++ static EST_write_status save_raw_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_raw_data(SaveWave_TokenStreamArgs); + static EST_read_status load_raw(LoadWave_TokenStreamArgs); + + static EST_write_status save_ulaw(SaveWave_TokenStreamArgs); ++ static EST_write_status save_ulaw_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_ulaw_data(SaveWave_TokenStreamArgs); + static EST_read_status load_ulaw(LoadWave_TokenStreamArgs); + + static EST_write_status save_alaw(SaveWave_TokenStreamArgs); +diff --git a/speech_class/EST_wave_io.cc b/speech_class/EST_wave_io.cc +index dae0963..7cec8f4 100644 +--- a/speech_class/EST_wave_io.cc ++++ b/speech_class/EST_wave_io.cc +@@ -283,10 +283,10 @@ enum EST_read_status load_wave_nist(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_nist(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++enum EST_write_status save_wave_nist_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++ enum EST_sample_type_t sample_type, int bo) + { + char h[1024], p[1024]; + const char *t; +@@ -322,13 +322,37 @@ enum EST_write_status save_wave_nist(FILE *fp, const short *data, int offset, + strcat(h, "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + + if (fwrite(&h, 1024, 1, fp) != 1) +- return misc_write_error; ++ return misc_write_error; + ++ return write_ok; ++} ++ ++ ++enum EST_write_status save_wave_nist_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,bo); + + } + ++enum EST_write_status save_wave_nist(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_nist_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ return save_wave_nist_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); ++} ++ + /*=======================================================================*/ + /* EST's own format */ + /*=======================================================================*/ +@@ -401,10 +425,10 @@ enum EST_read_status load_wave_est(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_est(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++enum EST_write_status save_wave_est_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++ enum EST_sample_type_t sample_type, int bo) + { + fprintf(fp, "EST_File wave\n"); + fprintf(fp, "DataType binary\n"); +@@ -416,10 +440,32 @@ enum EST_write_status save_wave_est(FILE *fp, const short *data, int offset, + fprintf(fp, "ByteOrder %s\n", ((bo == bo_big) ? "10" : "01")); + + fprintf(fp, "EST_Header_End\n"); +- ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_est_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_raw_data(fp, data, offset, num_samples, num_channels, + sample_type, bo); ++} ++ ++enum EST_write_status save_wave_est(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_est_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); + ++ return save_wave_est_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); + } + + /*=======================================================================*/ +@@ -576,10 +622,9 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_riff(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, +- int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++enum EST_write_status save_wave_riff_header(FILE *fp, int num_samples, ++ int num_channels, int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) + { + (void)bo; + const char *info; +@@ -636,10 +681,35 @@ enum EST_write_status save_wave_riff(FILE *fp, const short *data, int offset, + if (EST_BIG_ENDIAN) data_size = SWAPINT(data_size); + fwrite(&data_size,1,4,fp); /* total number of bytes in data */ + ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_riff_data(FILE *fp, const short *data, ++ int offset, int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,bo_little); + } + ++ ++enum EST_write_status save_wave_riff(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_riff_header(fp, num_samples, num_channels, sample_rate, ++ sample_type, bo); ++ ++ return save_wave_riff_data(fp, data, offset, num_samples, ++ num_channels, sample_rate, sample_type, bo); ++ ++} ++ + /*=======================================================================*/ + /* Amiga/Apple AIFF waveform format */ + /* This was constructed using info in AudioIFF1.3.hqx found on the web */ +@@ -776,10 +846,11 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_aiff(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++ ++enum EST_write_status save_wave_aiff_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++ enum EST_sample_type_t sample_type, int bo) + { + (void)bo; + const char *info; +@@ -830,16 +901,40 @@ enum EST_write_status save_wave_aiff(FILE *fp, const short *data, int offset, + data_int = SWAPINT(data_int); + fwrite(&data_int,1,4,fp); /* blocksize */ + +- if ((sample_type == st_short) || +- (sample_type == st_uchar)) +- return save_raw_data(fp,data,offset,num_samples,num_channels, +- sample_type,bo_big); ++ return write_ok; ++ ++} ++ ++enum EST_write_status save_wave_aiff_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ ++ if (data == NULL) ++ return write_ok; ++ if ((sample_type == st_short) || (sample_type == st_uchar)) ++ return save_raw_data(fp,data, offset, num_samples, num_channels, ++ sample_type, bo_big); + else + { + fprintf(stderr,"AIFF: requested data type not uchar or short\n"); + return misc_write_error; + } +- ++} ++ ++ ++enum EST_write_status save_wave_aiff(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_aiff_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ ++ return save_wave_aiff_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); + } + + /*=======================================================================*/ +@@ -885,19 +980,47 @@ enum EST_read_status load_wave_ulaw(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, ++enum EST_write_status save_wave_ulaw_header(FILE *fp, + int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { +- (void)sample_rate; +- (void)sample_type; ++ (void) sample_rate; ++ (void) sample_type; ++ (void) fp; ++ (void) num_samples; ++ (void) num_channels; ++ (void) bo; ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_ulaw_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_wave_raw(fp,data,offset,num_samples,num_channels, + 8000,st_mulaw,bo); ++} + ++enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_ulaw_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); + ++ return save_wave_ulaw_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); + } + ++ ++ + enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, +@@ -1050,8 +1173,8 @@ enum EST_read_status load_wave_snd(EST_TokenStream &ts, short **data, int + return read_ok; + } + +-enum EST_write_status save_wave_snd(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++enum EST_write_status save_wave_snd_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { +@@ -1103,11 +1226,35 @@ enum EST_write_status save_wave_snd(FILE *fp, const short *data, int offset, + if (fwrite(&header, sizeof(header), 1, fp) != 1) + return misc_write_error; + ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_snd_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + /* snd files are always in BIG_ENDIAN (sun) byte order */ + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,bo_big); + } + ++ ++enum EST_write_status save_wave_snd(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_snd_header(fp, num_samples, num_channels, sample_rate, ++ sample_type, bo); ++ return save_wave_snd_data(fp, data, offset, num_samples, ++ num_channels, sample_rate, sample_type, bo); ++} ++ ++ + /*=======================================================================*/ + /* CSTR Audlab files (from the last century) */ + /* They are always bigendian */ +@@ -1219,8 +1366,8 @@ enum EST_read_status load_wave_audlab(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_audlab(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++enum EST_write_status save_wave_audlab_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { +@@ -1260,12 +1407,34 @@ enum EST_write_status save_wave_audlab(FILE *fp, const short *data, int offset, + fwrite (&fh, sizeof(fh), 1, fp); + fwrite (&sh, sizeof(sh), 1, fp); + fwrite (&sd, sizeof(sd), 1, fp); +- ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_audlab_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + /* write data*/ + return save_raw_data(fp,data,offset,num_samples,num_channels, + st_short,bo_big); + } + ++enum EST_write_status save_wave_audlab(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_audlab_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ return save_wave_audlab_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); ++} ++ + /*=======================================================================*/ + /* Entropic ESPS SD files: portable (non-proprietary) method */ + /*=======================================================================*/ +@@ -1356,8 +1525,9 @@ enum EST_read_status load_wave_sd(EST_TokenStream &ts, short **data, int + + } + +-enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++ ++enum EST_write_status save_wave_sd_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + +@@ -1382,6 +1552,7 @@ enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, + } + /* I believe all of the following are necessary and in this order */ + add_field(hdr,"samples",esps_type,num_channels); ++ /* FIXME: What is doing this path here?? */ + add_fea_special(hdr,ESPS_FEA_DIRECTORY,"margo:/disk/disk10/home/awb/projects/speech_tools/main"); + add_fea_special(hdr,ESPS_FEA_COMMAND, + "EDST waveform written as ESPS FEA_SD.\n\ +@@ -1397,11 +1568,37 @@ enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, + } + /* lets ignore desired bo and sample type for the time being */ + delete_esps_hdr(hdr); +- ++ return write_ok; ++} ++ ++ ++enum EST_write_status save_wave_sd_data(FILE *fp, const short *data, ++ int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++ ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,EST_NATIVE_BO); + } + ++enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++ ++{ ++ save_wave_sd_header(fp, num_samples, num_channels, sample_rate, ++ sample_type, bo); ++ return save_wave_sd_data(fp, data, offset, num_samples, ++ num_channels, sample_rate, sample_type, bo); ++ ++} ++ + /*=======================================================================*/ + /* Raw data files -- unheadered */ + /* THESE FUNCTIONS ARE DIFFERENT FROM THE REST */ +@@ -1496,21 +1693,151 @@ enum EST_read_status load_wave_raw(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_raw(FILE *fp, const short *data, ++enum EST_write_status save_wave_raw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_raw_data(FILE *fp, const short *data, + int offset, +- int num_samples, int num_channels, ++ int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++ enum EST_sample_type_t sample_type, int bo) + { +- (void)sample_rate; ++ if (data == NULL) ++ return write_ok; + + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,bo); + } + ++enum EST_write_status save_wave_raw(FILE *fp, const short *data, ++ int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ (void)sample_rate; ++ ++ return save_wave_raw_data(fp, data, offset, num_samples, ++ num_channels, sample_rate, sample_type, bo); ++} ++ + /***********************************************************************/ + /* */ + /* end of file type specific functions */ + /* */ + /***********************************************************************/ + ++enum EST_write_status wave_io_save_header(FILE *fp, ++ const int num_samples, const int num_channels, ++ const int sample_rate, ++ const EST_String& stype, const int bo, ++ const EST_String& ftype) ++{ ++ EST_WaveFileType t = EST_WaveFile::map.token(ftype); ++ EST_sample_type_t sample_type = EST_sample_type_map.token(stype); ++ switch(t) ++ { ++ case wff_nist: ++ return save_wave_nist_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_esps: ++ return save_wave_sd_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_est: ++ return save_wave_est_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_audlab: ++ return save_wave_audlab_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_snd: ++ return save_wave_snd_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_aiff: ++ return save_wave_aiff_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_riff: ++ return save_wave_riff_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_raw: ++ return save_wave_raw_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_ulaw: ++ return save_wave_ulaw_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ default: ++ case wff_none: ++ cerr << "Can't save wave header to files type " << ftype << endl; ++ break; ++ } ++ return write_ok; ++} ++ ++ ++enum EST_write_status wave_io_save_data(FILE *fp, const short * data, ++ const int offset, ++ const int num_samples, const int num_channels, ++ const int sample_rate, ++ const EST_String& stype, const int bo, ++ const EST_String& ftype) ++{ ++ EST_WaveFileType t = EST_WaveFile::map.token(ftype); ++ EST_sample_type_t sample_type = EST_sample_type_map.token(stype); ++ switch(t) ++ { ++ case wff_nist: ++ return save_wave_nist_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_esps: ++ return save_wave_sd_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_est: ++ return save_wave_est_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_audlab: ++ return save_wave_audlab_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_snd: ++ return save_wave_snd_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_aiff: ++ return save_wave_aiff_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_riff: ++ return save_wave_riff_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_raw: ++ return save_wave_raw_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_ulaw: ++ return save_wave_ulaw_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ default: ++ case wff_none: ++ cerr << "Can't save wave data to files type " << ftype << endl; ++ break; ++ } ++ return write_ok; ++} +diff --git a/speech_class/waveP.h b/speech_class/waveP.h +index 9af6096..406e4b1 100644 +--- a/speech_class/waveP.h ++++ b/speech_class/waveP.h +@@ -51,7 +51,17 @@ enum EST_read_status load_wave_raw(EST_TokenStream &ts, short **data, int + enum EST_write_status save_wave_raw(FILE *fp, const short *data, int offset, + int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ; ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_raw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_raw_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); + + enum EST_read_status load_wave_ulaw(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int +@@ -62,6 +72,16 @@ enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t, int bo); + ++enum EST_write_status save_wave_ulaw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_ulaw_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -81,6 +101,16 @@ enum EST_write_status save_wave_nist(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_nist_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_nist_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_est(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -91,6 +121,16 @@ enum EST_write_status save_wave_est(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_est_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_est_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_sd(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -101,6 +141,16 @@ enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_sd_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_sd_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_audlab(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -111,6 +161,16 @@ enum EST_write_status save_wave_audlab(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_audlab_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_audlab_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_snd(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -121,6 +181,16 @@ enum EST_write_status save_wave_snd(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_snd_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_snd_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -131,6 +201,16 @@ enum EST_write_status save_wave_aiff(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_aiff_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_aiff_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -141,4 +221,14 @@ enum EST_write_status save_wave_riff(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_riff_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_riff_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + #endif /* __EST_WAVEP_H__ */ +-- +1.8.3.4 + + +From cbb58d2c46f59b918f8bae060db2e7d2846edcca Mon Sep 17 00:00:00 2001 +From: Sergio Oller +Date: Thu, 25 Dec 2014 14:50:41 -0800 +Subject: Allow writing ALAW files in parts + +Backported from Debian: wave_save_parts_alaw.diff, rev f150a7a5c75c. + +Signed-off-by: Timothy Gu + +diff --git a/speech_class/EST_WaveFile.cc b/speech_class/EST_WaveFile.cc +index 61d5c23..6476849 100644 +--- a/speech_class/EST_WaveFile.cc ++++ b/speech_class/EST_WaveFile.cc +@@ -480,6 +480,24 @@ EST_read_status EST_WaveFile::load_alaw(EST_TokenStream &ts, + offset, length); + } + ++EST_write_status EST_WaveFile::save_alaw_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_header_using(save_wave_alaw_header, fp, localwv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_alaw_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_using(save_wave_alaw_data, fp, localwv, stype, bo); ++} ++ + EST_write_status EST_WaveFile::save_alaw(FILE *fp, + const EST_Wave &wv, + EST_sample_type_t stype, int bo) +diff --git a/speech_class/EST_WaveFile.h b/speech_class/EST_WaveFile.h +index a185f5a..cdf948c 100644 +--- a/speech_class/EST_WaveFile.h ++++ b/speech_class/EST_WaveFile.h +@@ -147,6 +147,8 @@ public: + static EST_read_status load_ulaw(LoadWave_TokenStreamArgs); + + static EST_write_status save_alaw(SaveWave_TokenStreamArgs); ++ static EST_write_status save_alaw_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_alaw_data(SaveWave_TokenStreamArgs); + static EST_read_status load_alaw(LoadWave_TokenStreamArgs); + + static EST_TNamedEnumI map; +diff --git a/speech_class/EST_wave_io.cc b/speech_class/EST_wave_io.cc +index 7cec8f4..1bdaf4f 100644 +--- a/speech_class/EST_wave_io.cc ++++ b/speech_class/EST_wave_io.cc +@@ -1060,17 +1060,44 @@ enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, ++enum EST_write_status save_wave_alaw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ (void) sample_rate; ++ (void) sample_type; ++ (void) fp; ++ (void) num_samples; ++ (void) num_channels; ++ (void) bo; ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_alaw_data(FILE *fp, const short *data, int offset, + int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { + (void)sample_rate; + (void)sample_type; ++ if (data == NULL) ++ return write_ok; + return save_wave_raw(fp,data,offset,num_samples,num_channels, + 8000,st_alaw,bo); ++} + ++enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_alaw_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); + ++ return save_wave_alaw_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); + } + + +diff --git a/speech_class/waveP.h b/speech_class/waveP.h +index 406e4b1..aa78512 100644 +--- a/speech_class/waveP.h ++++ b/speech_class/waveP.h +@@ -91,6 +91,16 @@ enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t, int bo); + ++enum EST_write_status save_wave_alaw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_alaw_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_nist(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +-- +1.8.3.4 + + +From 22e096d3b4122b80cce76b203fcdb8d2e75413ca Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:52:30 -0800 +Subject: Check all fread() calls + +Backported from Debian: check_fread.diff, rev 4a67fbe7e. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_Token.h b/include/EST_Token.h +index e6fe38d..6b9512f 100644 +--- a/include/EST_Token.h ++++ b/include/EST_Token.h +@@ -329,7 +329,7 @@ class EST_TokenStream{ + { if (!peeked_tokp) get(); + peeked_tokp = TRUE; return current_tok; } + /// Reading binary data, (don't use peek() immediately beforehand) +- int fread(void *buff,int size,int nitems); ++ int fread(void *buff,int size,int nitems) EST_WARN_UNUSED_RESULT; + //@} + /**@name stream initialization functions */ + //@{ +diff --git a/include/EST_common.h b/include/EST_common.h +index 42af9d9..ee63e1e 100644 +--- a/include/EST_common.h ++++ b/include/EST_common.h +@@ -43,6 +43,14 @@ + + /* all this stuff should be common to C and C++ */ + ++#if defined __GNUC__ ++ #define EST_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) ++#elif defined __clang__ ++ #define EST_WARN_UNUSED_RESULT __attribute__((annotate("lo_warn_unused"))) ++#else ++ #define EST_WARN_UNUSED_RESULT ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +diff --git a/speech_class/EST_wave_io.cc b/speech_class/EST_wave_io.cc +index 1bdaf4f..d3a35f0 100644 +--- a/speech_class/EST_wave_io.cc ++++ b/speech_class/EST_wave_io.cc +@@ -503,7 +503,8 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + return wrong_format; + + /* We've got a riff file */ +- ts.fread(&dsize,4,1); ++ /* Next 4 bytes are the file size */ ++ if(ts.fread(&dsize,4,1) != 1) return misc_read_error; + /* .wav files are always little endian */ + if (EST_BIG_ENDIAN) dsize = SWAPINT(dsize); + if ((ts.fread(info,sizeof(char),4) != 4) || +@@ -516,9 +517,9 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + (strncmp(info,"fmt ",4) != 0)) + return misc_read_error; /* something else wrong */ + +- ts.fread(&dsize,4,1); ++ if (ts.fread(&dsize,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) dsize = SWAPINT(dsize); +- ts.fread(&shortdata,2,1); ++ if (ts.fread(&shortdata,2,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) shortdata = SWAPSHORT(shortdata); + + switch (shortdata) +@@ -541,16 +542,16 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + actual_sample_type = st_short; + /* return misc_read_error; */ + } +- ts.fread(&shortdata,2,1); ++ if (ts.fread(&shortdata,2,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) shortdata = SWAPSHORT(shortdata); + *num_channels = shortdata; +- ts.fread(sample_rate,4,1); ++ if (ts.fread(sample_rate,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) *sample_rate = SWAPINT(*sample_rate); +- ts.fread(&intdata,4,1); /* average bytes per second -- ignored */ ++ if (ts.fread(&intdata,4,1) != 1) return misc_read_error; /* average bytes per second -- ignored */ + if (EST_BIG_ENDIAN) intdata = SWAPINT(intdata); +- ts.fread(&shortdata,2,1); /* block align ? */ ++ if (ts.fread(&shortdata,2,1) != 1) return misc_read_error; /* block align ? */ + if (EST_BIG_ENDIAN) shortdata = SWAPSHORT(shortdata); +- ts.fread(&shortdata,2,1); ++ if (ts.fread(&shortdata,2,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) shortdata = SWAPSHORT(shortdata); + + sample_width = (shortdata+7)/8; +@@ -567,14 +568,14 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + } + if (strncmp(info,"data",4) == 0) + { +- ts.fread(&samps,4,1); ++ if (ts.fread(&samps,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) samps = SWAPINT(samps); + samps /= (sample_width*(*num_channels)); + break; + } + else if (strncmp(info,"fact",4) == 0) + { /* some other type of chunk -- skip it */ +- ts.fread(&samps,4,1); ++ if (ts.fread(&samps,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) samps = SWAPINT(samps); + ts.seek(samps+ts.tell()); /* skip rest of header */ + /* Hope this is the right amount */ +@@ -584,7 +585,7 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + // fprintf(stderr,"Ignoring unsupported chunk type \"%c%c%c%c\" in RIFF file\n", + // info[0],info[1],info[2],info[3]); + //return misc_read_error; +- ts.fread(&dsize,4,1); ++ if(ts.fread(&dsize,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) dsize = SWAPINT(dsize); + ts.seek(dsize+ts.tell()); /* skip this chunk */ + } +@@ -750,7 +751,7 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + return wrong_format; + + /* We've got an aiff file, I hope */ +- ts.fread(&dsize,4,1); ++ if (ts.fread(&dsize,4,1) != 1) return misc_read_error; + if (EST_LITTLE_ENDIAN) /* file is in different byte order */ + dsize = SWAPINT(dsize); + if ((ts.fread(info,sizeof(char),4) != 4) || +@@ -760,7 +761,7 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + return misc_read_error; + } + +- for ( ; ts.fread(&chunk,1,sizeof(chunk)) == sizeof(chunk) ; ) ++ for ( ; ts.fread(&chunk, sizeof(chunk), 1) == 1 ; ) + { /* for each chunk in the file */ + if (EST_LITTLE_ENDIAN) /* file is in different byte order */ + chunk.size = SWAPINT(chunk.size); +@@ -771,10 +772,13 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + fprintf(stderr,"AIFF chunk: bad size\n"); + return misc_read_error; + } +- ts.fread(&comm_channels,1,sizeof(short)); +- ts.fread(&comm_samples,1,sizeof(int)); +- ts.fread(&comm_bits,1,sizeof(short)); +- if (ts.fread(ieee_ext_sample_rate,1,10) != 10) ++ if (ts.fread(&comm_channels, sizeof(short), 1) != 1) ++ return misc_read_error; ++ if (ts.fread(&comm_samples, sizeof(int), 1) != 1) ++ return misc_read_error; ++ if (ts.fread(&comm_bits, sizeof(short), 1) != 1) ++ return misc_read_error; ++ if (ts.fread(ieee_ext_sample_rate, 10, 1) != 1) + { + fprintf(stderr,"AIFF chunk: eof within COMM chunk\n"); + return misc_read_error; +@@ -789,7 +793,7 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + } + else if (strncmp(chunk.id,"SSND",4) == 0) + { +- if (ts.fread(&ssndchunk,1,sizeof(ssndchunk)) != sizeof(ssndchunk)) ++ if (ts.fread(&ssndchunk, sizeof(ssndchunk), 1) != 1) + { + fprintf(stderr,"AIFF chunk: eof within SSND chunk\n"); + return misc_read_error; +@@ -1127,7 +1131,8 @@ enum EST_read_status load_wave_snd(EST_TokenStream &ts, short **data, int + int current_pos; + + current_pos = ts.tell(); +- ts.fread(&header, sizeof(Sun_au_header), 1); ++ if (ts.fread(&header, sizeof(Sun_au_header), 1) != 1) ++ return misc_read_error; + + /* test for magic number */ + if ((EST_LITTLE_ENDIAN) && +@@ -1347,12 +1352,16 @@ enum EST_read_status load_wave_audlab(EST_TokenStream &ts, short **data, int + + /* Read header structures from char array */ + current_pos = ts.tell(); +- ts.fread(&fh, sizeof(struct audlabfh), 1); ++ ++ if (ts.fread(&fh, sizeof(struct audlabfh), 1) != 1) ++ return misc_read_error; + if (strcmp(fh.file_type, "Sample") != 0) + return wrong_format; + +- ts.fread(&sh, sizeof(struct audlabsh), 1); +- ts.fread(&sd, sizeof(struct audlabsd), 1); ++ if (ts.fread(&sh, sizeof(struct audlabsh), 1) != 1) ++ return misc_read_error; ++ if (ts.fread(&sd, sizeof(struct audlabsd), 1) != 1) ++ return misc_read_error; + hdr_length = sizeof(struct audlabfh) + + sizeof(struct audlabsh) + + sizeof(struct audlabsd); +-- +1.8.3.4 + + +From 644690fc0c8e45fe5c58caa9bd928eedb178fa49 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:55:07 -0800 +Subject: Fix a few memory handling bugs + +Backported from Debian: memory_bugs.diff, rev 0691e0f66a14c. + +Signed-off-by: Timothy Gu + +diff --git a/base_class/rateconv.cc b/base_class/rateconv.cc +index f27fb44..10ef465 100644 +--- a/base_class/rateconv.cc ++++ b/base_class/rateconv.cc +@@ -431,7 +431,7 @@ static int outmax; + + static int ioerr(void) + { +- delete g_coep; ++ delete[] g_coep; + return -1; + } + +@@ -585,7 +585,7 @@ int rateconv(short *in,int isize, short **out, int *osize, + return ioerr(); + } while (outsize == OUTBUFFSIZE); + +- delete g_coep; ++ delete[] g_coep; + + *osize = outpos; + +diff --git a/base_class/string/EST_String.cc b/base_class/string/EST_String.cc +index 3cab0f1..3e33da3 100644 +--- a/base_class/string/EST_String.cc ++++ b/base_class/string/EST_String.cc +@@ -329,6 +329,7 @@ int EST_String::gsub_internal (const char *os, int olength, const char *s, int l + p += length; + at=end; + } ++ if (p != from+at) + memcpy(p, from+at, size-at); + + p += size-at; +diff --git a/stats/EST_Discrete.cc b/stats/EST_Discrete.cc +index f151888..89d3d74 100644 +--- a/stats/EST_Discrete.cc ++++ b/stats/EST_Discrete.cc +@@ -151,7 +151,7 @@ Discretes::~Discretes() + + for (i=0; i +Date: Thu, 25 Dec 2014 14:56:46 -0800 +Subject: Allow `-pc longest` in lower case + +Backported from Debian: ch_wave-LONGEST.diff, rev: a9c9f0e91f. + +Signed-off-by: Timothy Gu + +diff --git a/main/ch_wave_main.cc b/main/ch_wave_main.cc +index 3e74a12..e7859ac 100644 +--- a/main/ch_wave_main.cc ++++ b/main/ch_wave_main.cc +@@ -199,7 +199,7 @@ int main (int argc, char *argv[]) + wave_info(sigload); + else if (al.present("-pc")) + { +- if ((al.val("-pc") == "longest") && ++ if ((downcase(al.val("-pc")) == "longest") && + (sig.num_samples() < sigload.num_samples())) + sig.resize(sigload.num_samples()); + else /* "first" or sig is longer */ +-- +1.8.3.4 + + +From 295c71122265d274429dd6712323d8f624a712fa Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 15:27:31 -0800 +Subject: Add Haiku configurations + + +diff --git a/config/systems/Haiku.mak b/config/systems/Haiku.mak +new file mode 100644 +index 0000000..5d78efd +--- /dev/null ++++ b/config/systems/Haiku.mak +@@ -0,0 +1,56 @@ ++ ########################################################################### ++ ## ## ++ ## Centre for Speech Technology Research ## ++ ## University of Edinburgh, UK ## ++ ## Copyright (c) 2014 ## ++ ## All Rights Reserved. ## ++ ## ## ++ ## Permission is hereby granted, free of charge, to use and distribute ## ++ ## this software and its documentation without restriction, including ## ++ ## without limitation the rights to use, copy, modify, merge, publish, ## ++ ## distribute, sublicense, and/or sell copies of this work, and to ## ++ ## permit persons to whom this work is furnished to do so, subject to ## ++ ## the following conditions: ## ++ ## 1. The code must retain the above copyright notice, this list of ## ++ ## conditions and the following disclaimer. ## ++ ## 2. Any modifications must be clearly marked as such. ## ++ ## 3. Original authors' names are not deleted. ## ++ ## 4. The authors' names are not used to endorse or promote products ## ++ ## derived from this software without specific prior written ## ++ ## permission. ## ++ ## ## ++ ## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ## ++ ## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## ++ ## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## ++ ## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ## ++ ## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## ++ ## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## ++ ## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## ++ ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## ++ ## THIS SOFTWARE. ## ++ ## ## ++ ########################################################################### ++ ## ## ++ ## Author: Tiancheng "Timothy" Gu ## ++ ## -------------------------------------------------------------------- ## ++ ## Settings for BeOS-derived systems, e.g. Haiku ## ++ ## ## ++ ########################################################################### ++ ++include $(EST)/config/systems/default.mak ++ ++## Don't assume echo -n works ++ECHO_N = /bin/printf "%s" ++ ++## No native audio ++NATIVE_AUDIO = ++ ++## ncurses available, and sockets operations are in libnetwork ++OS_LIBS = -lncurses -lnetwork ++ ++## No math library needed. Empty $(sort) needed so that `ifdef MATH_LIBRARY` ++## returns true. ++MATH_LIBRARY = $(sort ) ++ ++## awk is a compatible awk, usually gawk. ++NAWK=awk +diff --git a/config/systems/ix86_Haiku.mak b/config/systems/ix86_Haiku.mak +new file mode 100644 +index 0000000..3822625 +--- /dev/null ++++ b/config/systems/ix86_Haiku.mak +@@ -0,0 +1,41 @@ ++ ########################################################################### ++ ## ## ++ ## Centre for Speech Technology Research ## ++ ## University of Edinburgh, UK ## ++ ## Copyright (c) 2014 ## ++ ## All Rights Reserved. ## ++ ## ## ++ ## Permission is hereby granted, free of charge, to use and distribute ## ++ ## this software and its documentation without restriction, including ## ++ ## without limitation the rights to use, copy, modify, merge, publish, ## ++ ## distribute, sublicense, and/or sell copies of this work, and to ## ++ ## permit persons to whom this work is furnished to do so, subject to ## ++ ## the following conditions: ## ++ ## 1. The code must retain the above copyright notice, this list of ## ++ ## conditions and the following disclaimer. ## ++ ## 2. Any modifications must be clearly marked as such. ## ++ ## 3. Original authors' names are not deleted. ## ++ ## 4. The authors' names are not used to endorse or promote products ## ++ ## derived from this software without specific prior written ## ++ ## permission. ## ++ ## ## ++ ## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ## ++ ## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## ++ ## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## ++ ## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ## ++ ## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## ++ ## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## ++ ## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## ++ ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## ++ ## THIS SOFTWARE. ## ++ ## ## ++ ########################################################################### ++ ## ## ++ ## Author: Tiancheng "Timothy" Gu ## ++ ## -------------------------------------------------------------------- ## ++ ## Settings for BeOS-derived systems, e.g. Haiku ## ++ ## ## ++ ########################################################################### ++ ++include $(EST)/config/systems/Haiku.mak ++ +diff --git a/config/systems/x86_64_Haiku.mak b/config/systems/x86_64_Haiku.mak +new file mode 100644 +index 0000000..3822625 +--- /dev/null ++++ b/config/systems/x86_64_Haiku.mak +@@ -0,0 +1,41 @@ ++ ########################################################################### ++ ## ## ++ ## Centre for Speech Technology Research ## ++ ## University of Edinburgh, UK ## ++ ## Copyright (c) 2014 ## ++ ## All Rights Reserved. ## ++ ## ## ++ ## Permission is hereby granted, free of charge, to use and distribute ## ++ ## this software and its documentation without restriction, including ## ++ ## without limitation the rights to use, copy, modify, merge, publish, ## ++ ## distribute, sublicense, and/or sell copies of this work, and to ## ++ ## permit persons to whom this work is furnished to do so, subject to ## ++ ## the following conditions: ## ++ ## 1. The code must retain the above copyright notice, this list of ## ++ ## conditions and the following disclaimer. ## ++ ## 2. Any modifications must be clearly marked as such. ## ++ ## 3. Original authors' names are not deleted. ## ++ ## 4. The authors' names are not used to endorse or promote products ## ++ ## derived from this software without specific prior written ## ++ ## permission. ## ++ ## ## ++ ## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ## ++ ## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## ++ ## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## ++ ## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ## ++ ## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## ++ ## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## ++ ## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## ++ ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## ++ ## THIS SOFTWARE. ## ++ ## ## ++ ########################################################################### ++ ## ## ++ ## Author: Tiancheng "Timothy" Gu ## ++ ## -------------------------------------------------------------------- ## ++ ## Settings for BeOS-derived systems, e.g. Haiku ## ++ ## ## ++ ########################################################################### ++ ++include $(EST)/config/systems/Haiku.mak ++ +-- +1.8.3.4 + + +From ce49b8a8bf93cf694281be2e979ec58c3950635e Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 15:30:42 -0800 +Subject: Haiku-specific configuration + +Signed-off-by: Timothy Gu + +diff --git a/config/config.in b/config/config.in +index 15d563e..e7e6a65 100644 +--- a/config/config.in ++++ b/config/config.in +@@ -61,7 +61,7 @@ WARN=1 + # VERBOSE=1 + #DEBUG=1 + # PROFILE=gprof +-#SHARED=2 ++SHARED=2 + + ## Directory specific selections which override the above + +@@ -83,7 +83,7 @@ OPTIMISE_sigpr = 3 + # INCLUDE_MODULES += ESD_AUDIO + + ## Native audio for your platform (sun, linux, freebsd, irix, macosx, windows) +-INCLUDE_MODULES += NATIVE_AUDIO ++# INCLUDE_MODULES += NATIVE_AUDIO + + ## Special code to run Windows MPLAYER + # INCLUDE_MODULES += MPLAYER_AUDIO +@@ -172,7 +172,7 @@ INCLUDE_MODULES += RXP + + # Languages to generate wrappers for. Currently: PYTHON + # PERL5 is no longer supported +-CONFIG_WRAPPER_LANGUAGES = PYTHON ++CONFIG_WRAPPER_LANGUAGES = + + # Language specific includes should be set to correct site paths + CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.2/ +-- +1.8.3.4 + + +From a88060a26c29c6f61b6e18824d0164f82456c6ac Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 16:30:07 -0800 +Subject: Add missing library major version + + +diff --git a/config/project.mak b/config/project.mak +index 2578fc1..11884c5 100644 +--- a/config/project.mak ++++ b/config/project.mak +@@ -42,6 +42,7 @@ + PROJECT_NAME = Edinburgh Speech Tools Library + PROJECT_PREFIX = EST + PROJECT_VERSION = 2.4 ++PROJECT_MAJOR_VERSION = 2 + PROJECT_DATE = December 2014 + PROJECT_STATE = release + +-- +1.8.3.4 + + +From f50c1e621e9d510f475032474438b2df97ac07a0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 02:35:24 +0000 +Subject: config/system.sh: Use `uname -p` for machine type + +Fixes Haiku detection + +diff --git a/config/system.sh b/config/system.sh +index 71b271c..b7ac4a1 100644 +--- a/config/system.sh ++++ b/config/system.sh +@@ -46,9 +46,9 @@ OSTYPE=`uname -s | + sed -e '/^\([^_]*\).*/s//\1/' -e '/\//s///g'` + + # CPU, downcased, /s and some uninteresting details eliminated +-MACHINETYPE=`{ mach || uname -m || echo unknown ; } 2>/dev/null | ++MACHINETYPE=`{ mach || uname -p || echo unknown ; } 2>/dev/null | + tr ABCDEFGHIJKLMNOPQRSTUVWXYZ/ abcdefghijklmnopqrstuvwxyz_ | +- sed -e 's/i[0-9]86/ix86/' \ ++ sed -e 's/i\{0,1\}[0-9x]86/ix86/' \ + -e 's/sun4/sparc/' \ + -e 's/ip[0-9]*/ip/'\ + -e 's/ /_/g'\ +-- +1.8.3.4 + diff --git a/app-accessibility/speech_tools/speech_tools-2.4.recipe b/app-accessibility/speech_tools/speech_tools-2.4.recipe new file mode 100644 index 000000000..7c644a8f0 --- /dev/null +++ b/app-accessibility/speech_tools/speech_tools-2.4.recipe @@ -0,0 +1,150 @@ +SUMMARY="Edinburgh speech tools library" +SUMMARY_tools="Edinburgh Speech Tools" + +DESCRIPTION="The Edinburgh speech tools library is a collection of C++ classes \ +that aide in developing machine-synthesized voices. Developed by the University \ +of Edinburgh, it is used in Festival, a text-to-speech engine developed by \ +the University of Edinburgh as well. +" +HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/" +SRC_URI="http://www.festvox.org/packed/festival/${portVersion}/speech_tools-${portVersion}-release.tar.gz" +CHECKSUM_SHA256="fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010" +SOURCE_DIR="speech_tools" +REVISION="1" + +# Although individually many files have different licenses, as a whole this +# license covers all the files. +LICENSE=" + Edinburgh Speech Tools + " +COPYRIGHT=" + 1986 University of Toronto + 1987, 1993 The Regents of the University of California + 1992, 1995 Markus Mummert + 1992 Rich Salz + 1992 Simmule Turner + 1994-2014 University of Edinburgh, UK + 1997-1998 Richard Tobin + 1999-2003 Language Technologies Institute, Carnegie Mellon University + " + +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 !x86_gcc2" + +PROVIDES=" + speech_tools$secondaryArchSuffix = $portVersion + lib:libestbase$secondaryArchSuffix = $portVersion compat >= 2 + lib:libestools$secondaryArchSuffix = $portVersion compat >= 2 + lib:libeststring$secondaryArchSuffix = $portVersion compat >= 2 + " +PROVIDES_devel=" + flite${secondaryArchSuffix}_devel = $portVersion + devel:libestbase$secondaryArchSuffix = $portVersion compat >= 2 + devel:libestools$secondaryArchSuffix = $portVersion compat >= 2 + devel:libeststring$secondaryArchSuffix = $portVersion compat >= 2 + " +PROGS=" bcat ch_lab ch_track ch_utt ch_wave design_filter dp \ + na_play na_record ngram_build ngram_test ols \ + ols_test pda pitchmark scfg_make \ + scfg_parse scfg_test scfg_train sig2fv sigfilter spectgen \ + tilt_analysis tilt_synthesis viterbi wagon wagon_test \ + wfst_build wfst_run wfst_train xml_parser + " +SCRIPTS=" + make_wagon_desc + raw_to_xgraph + resynth + " +PROVIDES_tools=" + speech_tools_tools = $portVersion + cmd:simple_pitchmark = $portVersion + " +for p in $PROGS $SCRIPTS; do + PROVIDES_tools=" + $PROVIDES_tools + cmd:$p = $portVersion + " +done +REQUIRES=" + haiku$secondaryArchSuffix + gcc${secondaryArchSuffix}_syslibs + lib:libncurses$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + speech_tools$secondaryArchSuffix == $portVersion base + " +REQUIRES_tools=" + haiku$secondaryArchSuffix + gcc${secondaryArchSuffix}_syslibs + speech_tools$secondaryArchSuffix == $portVersion base + cmd:perl + lib:libncurses$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libncurses$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:awk + cmd:find + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:mkdepend + " + +PATCHES="speech_tools-${portVersion}.patchset" + +BUILD() +{ + runConfigure ./configure + # There are some problems with concurrency. + make +} + +INSTALL() +{ + cmdBinDir=$prefix/bin + mkdir -p $cmdBinDir + (cd main && cp $PROGS $cmdBinDir) + for s in $SCRIPTS; do + sed 's,__PERL__,/bin/perl,g' $cmdBinDir/$s + chmod +x $cmdBinDir/$s + done + sed 's,__PERL__,/bin/perl,g' \ + $cmdBinDir/simple-pitchmark + chmod +x $cmdBinDir/simple-pitchmark + + mkdir -p $libDir + # Install everything to lib/ and let prepareInstalledDevelLibs handle + # devel libs, etc. + cp lib/*.a lib/*.so lib/*.so.* $libDir + + # Installs possibly internal headers as well, as debian installs them + mkdir -p $includeDir/ + cp -a include/* $includeDir/ + rm -rf $includeDir/Makefile \ + $includeDir/*/Makefile \ + $includeDir/win32 + cp -a base_class/*.h $includeDir/ + mkdir -p $includeDir/base_class/ + cp -a base_class/*.cc $includeDir/base_class/ + + prepareInstalledDevelLibs \ + libestbase \ + libestools \ + libeststring + packageEntries devel \ + $developDir + packageEntries tools \ + $cmdBinDir +} From 37a03426ccf3628bae6740275e440f38c777a318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 26 Dec 2014 16:16:38 +0000 Subject: [PATCH 28/75] Fix version and description --- .../openscenegraph-3.2.1.recipe | 77 +++++++++-------- .../openscenegraph/openscenegraph-git.recipe | 83 +++++++++---------- 2 files changed, 79 insertions(+), 81 deletions(-) diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe index 90ebb2aa3..51a0b2afc 100644 --- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -5,7 +5,7 @@ by application developers in fields such as visual simulation, games, virtual \ reality, scientific visualization and modelling. Written entirely in Standard \ C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris \ , HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well \ -established as the world leading scene graph technology, used widely in the \ +established as the world leading scene graph technology, used widely in the \ vis-sim, space, scientific, oil-gas, games and virtual reality industries." HOMEPAGE="http://www.openscenegraph.org" SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip" @@ -25,30 +25,30 @@ fi SECONDARY_ARCHITECTURES="x86" PROVIDES=" - openscenegraph$secondaryArchSuffix = $portVersion - lib:libOpenThreads$secondaryArchSuffix = $portVersion - lib:libosg$secondaryArchSuffix = $portVersion - lib:libosgAnimation$secondaryArchSuffix = $portVersion - lib:libosgDB$secondaryArchSuffix = $portVersion - lib:libosgFX$secondaryArchSuffix = $portVersion - lib:libosgGA$secondaryArchSuffix = $portVersion - lib:libosgManipulator$secondaryArchSuffix = $portVersion - lib:libosgParticle$secondaryArchSuffix = $portVersion - lib:libosgPresentation$secondaryArchSuffix = $portVersion - lib:libosgShadow$secondaryArchSuffix = $portVersion - lib:libosgSim$secondaryArchSuffix = $portVersion - lib:libosgTerrain$secondaryArchSuffix = $portVersion - lib:libosgText$secondaryArchSuffix = $portVersion - lib:libosgUtil$secondaryArchSuffix = $portVersion - lib:libosgViewer$secondaryArchSuffix = $portVersion - lib:libosgVolume$secondaryArchSuffix = $portVersion - lib:libosgWidget$secondaryArchSuffix = $portVersion + openscenegraph$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libOpenThreads$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosg$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgAnimation$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgDB$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgFX$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgGA$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgManipulator$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgParticle$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgPresentation$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgShadow$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgSim$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgTerrain$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgText$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgUtil$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgViewer$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgVolume$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgWidget$secondaryArchSuffix = 3.2.1 compat >= 3 " REQUIRES=" haiku$secondaryArchSuffix mesa$secondaryArchSuffix - lib:libGL$secondaryArchSuffix + lib:libgl$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix @@ -101,7 +101,6 @@ INSTALL() mkdir -p $prefix/lib-temp mv $prefix/lib/* $prefix/lib-temp/ - ls $prefix/lib-temp mkdir -p $libDir mv $prefix/lib-temp/* $libDir rm -rf $prefix/lib-temp @@ -120,24 +119,24 @@ INSTALL() } PROVIDES_devel=" - devel:openscenegraph$secondaryArchSuffix = $portVersion - devel:libOpenThreads$secondaryArchSuffix = $portVersion - devel:libosg$secondaryArchSuffix = $portVersion - devel:libosgAnimation$secondaryArchSuffix = $portVersion - devel:libosgDB$secondaryArchSuffix = $portVersion - devel:libosgFX$secondaryArchSuffix = $portVersion - devel:libosgGA$secondaryArchSuffix = $portVersion - devel:libosgManipulator$secondaryArchSuffix = $portVersion - devel:libosgParticle$secondaryArchSuffix = $portVersion - devel:libosgPresentation$secondaryArchSuffix = $portVersion - devel:libosgShadow$secondaryArchSuffix = $portVersion - devel:libosgSim$secondaryArchSuffix = $portVersion - devel:libosgTerrain$secondaryArchSuffix = $portVersion - devel:libosgText$secondaryArchSuffix = $portVersion - devel:libosgUtil$secondaryArchSuffix = $portVersion - devel:libosgViewer$secondaryArchSuffix = $portVersion - devel:libosgVolume$secondaryArchSuffix = $portVersion - devel:libosgWidget$secondaryArchSuffix = $portVersion + openscenegraph${secondaryArchSuffix}_devel = 3.2.1 compat >= 3 + devel:libOpenThreads$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosg$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgAnimation$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgDB$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgFX$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgGA$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgManipulator$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgParticle$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgPresentation$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgShadow$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgSim$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgTerrain$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgText$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgUtil$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgViewer$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgVolume$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgWidget$secondaryArchSuffix = 3.2.1 compat >= 3 " REQUIRES_devel=" diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe index e5280374a..e499fb7ca 100644 --- a/games-engines/openscenegraph/openscenegraph-git.recipe +++ b/games-engines/openscenegraph/openscenegraph-git.recipe @@ -5,7 +5,7 @@ by application developers in fields such as visual simulation, games, virtual \ reality, scientific visualization and modelling. Written entirely in Standard \ C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris \ , HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well \ -established as the world leading scene graph technology, used widely in the \ +established as the world leading scene graph technology, used widely in the \ vis-sim, space, scientific, oil-gas, games and virtual reality industries." HOMEPAGE="http://www.openscenegraph.org" SRC_URI="git://github.com/openscenegraph/osg#77f09f9e649cfedd32608ed6ec67bf1de7cd53ac" @@ -24,31 +24,31 @@ fi SECONDARY_ARCHITECTURES="x86" PROVIDES=" - openscenegraph$secondaryArchSuffix = $portVersion - lib:libOpenThreads$secondaryArchSuffix = $portVersion - lib:libosg$secondaryArchSuffix = $portVersion - lib:libosgAnimation$secondaryArchSuffix = $portVersion - lib:libosgDB$secondaryArchSuffix = $portVersion - lib:libosgFX$secondaryArchSuffix = $portVersion - lib:libosgGA$secondaryArchSuffix = $portVersion - lib:libosgManipulator$secondaryArchSuffix = $portVersion - lib:libosgParticle$secondaryArchSuffix = $portVersion - lib:libosgPresentation$secondaryArchSuffix = $portVersion - lib:libosgShadow$secondaryArchSuffix = $portVersion - lib:libosgSim$secondaryArchSuffix = $portVersion - lib:libosgTerrain$secondaryArchSuffix = $portVersion - lib:libosgText$secondaryArchSuffix = $portVersion - lib:libosgUtil$secondaryArchSuffix = $portVersion - lib:libosgViewer$secondaryArchSuffix = $portVersion - lib:libosgVolume$secondaryArchSuffix = $portVersion - lib:libosgWidget$secondaryArchSuffix = $portVersion - lib:libosgUI$secondaryArchSuffix = $portVersion + openscenegraph$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libOpenThreads$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosg$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgAnimation$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgDB$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgFX$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgGA$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgManipulator$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgParticle$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgPresentation$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgShadow$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgSim$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgTerrain$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgText$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgUtil$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgViewer$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgVolume$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgWidget$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgUI$secondaryArchSuffix = 3.3.4 compat >= 3 " REQUIRES=" haiku$secondaryArchSuffix mesa$secondaryArchSuffix - lib:libGL$secondaryArchSuffix + lib:libgl$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix @@ -101,7 +101,6 @@ INSTALL() mkdir -p $prefix/lib-temp mv $prefix/lib/* $prefix/lib-temp/ - ls $prefix/lib-temp mkdir -p $libDir mv $prefix/lib-temp/* $libDir rm -rf $prefix/lib-temp @@ -120,27 +119,27 @@ INSTALL() } PROVIDES_devel=" - devel:openscenegraph$secondaryArchSuffix = $portVersion - devel:libOpenThreads$secondaryArchSuffix = $portVersion - devel:libosg$secondaryArchSuffix = $portVersion - devel:libosgAnimation$secondaryArchSuffix = $portVersion - devel:libosgDB$secondaryArchSuffix = $portVersion - devel:libosgFX$secondaryArchSuffix = $portVersion - devel:libosgGA$secondaryArchSuffix = $portVersion - devel:libosgManipulator$secondaryArchSuffix = $portVersion - devel:libosgParticle$secondaryArchSuffix = $portVersion - devel:libosgPresentation$secondaryArchSuffix = $portVersion - devel:libosgShadow$secondaryArchSuffix = $portVersion - devel:libosgSim$secondaryArchSuffix = $portVersion - devel:libosgTerrain$secondaryArchSuffix = $portVersion - devel:libosgText$secondaryArchSuffix = $portVersion - devel:libosgUtil$secondaryArchSuffix = $portVersion - devel:libosgViewer$secondaryArchSuffix = $portVersion - devel:libosgVolume$secondaryArchSuffix = $portVersion - devel:libosgWidget$secondaryArchSuffix = $portVersion - devel:libosgUI$secondaryArchSuffix = $portVersion + openscenegraph${secondaryArchSuffix}_devel = 3.3.4 compat >= 3 + devel:libOpenThreads$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libosg$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgAnimation$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgDB$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgFX$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgGA$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgManipulator$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgParticle$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgPresentation$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgShadow$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgSim$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgTerrain$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgText$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgUtil$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgViewer$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgVolume$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgWidget$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgUI$secondaryArchSuffix = 3.3.4 compat >= 3 " REQUIRES_devel=" - openscenegraph$secondaryArchSuffix == $portVersion + openscenegraph$secondaryArchSuffix == 3.3.4 " From b5e0e65187f86ca1b0bd05e8d3794ff41c6798fa Mon Sep 17 00:00:00 2001 From: Nolan Clark Date: Wed, 24 Dec 2014 17:54:55 -0600 Subject: [PATCH 29/75] Added recipe for unlzx --- .../additional-files/unlzx-expander-rules | 1 + app-arch/unlzx/unlzx-1.1.recipe | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 app-arch/unlzx/additional-files/unlzx-expander-rules create mode 100644 app-arch/unlzx/unlzx-1.1.recipe diff --git a/app-arch/unlzx/additional-files/unlzx-expander-rules b/app-arch/unlzx/additional-files/unlzx-expander-rules new file mode 100644 index 000000000..75b5f81ce --- /dev/null +++ b/app-arch/unlzx/additional-files/unlzx-expander-rules @@ -0,0 +1 @@ +"application/x-lzx" .lzx "unlzx -v %s" "unlzx %s" diff --git a/app-arch/unlzx/unlzx-1.1.recipe b/app-arch/unlzx/unlzx-1.1.recipe new file mode 100644 index 000000000..938de0dbc --- /dev/null +++ b/app-arch/unlzx/unlzx-1.1.recipe @@ -0,0 +1,41 @@ +SUMMARY="Decompresses LZX archives on multiple platforms" +DESCRIPTION="LZX is the name of an LZ77 family compression algorithm invented \ +by Johnathon Forbes and Tomi Poutanen. unlzx is a program designed to extract \ +these archives." +HOMEPAGE="http://aminet.net/package/misc/unix/unlzx.c.gz" +SRC_URI="git+https://github.com/tweakdeveloper/unlzx.git#36a85e7" +ADDITIONAL_FILES="unlzx-expander-rules" +REVISION="3" +LICENSE="Public Domain" +COPYRIGHT="2001 Erik Meusel" + +ARCHITECTURES="x86_gcc2 x86" + +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + cmd:gcc + cmd:strip + " + +PROVIDES=" + unlzx = $portVersion + cmd:unlzx + " + +BUILD() +{ + gcc unlzx.c -o unlzx + strip unlzx +} + +INSTALL() +{ + expanderRulesDir=$dataDir/expander/rules + mkdir -p $binDir $expanderRulesDir + cp unlzx $binDir + cp $portDir/additional-files/unlzx-expander-rules $expanderRulesDir +} From 2a60c74d7d79f0be8a22d1b8ed8717e254316623 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sun, 21 Dec 2014 22:03:22 +0200 Subject: [PATCH 30/75] Update plee-the-bear recipe and patchset * Mark plee-the-bear as working on x86 * Add lib:libplee_the_bear to PROVIDES * Rename boost devel requirement * Add -DNDEBUG to CXX_FLAGS * Regenerate patchset (i.e. add [PATCH N/M] to subject lines) * Make sure Plee the Bear library get installed in the appropriate directory if there is a secondary arch suffix * Change data directory on Haiku --- .../patches/plee_the_bear-0.7.0.patchset | 100 ++++++++++++++++-- .../plee_the_bear/plee_the_bear-0.7.0.recipe | 37 +++---- 2 files changed, 110 insertions(+), 27 deletions(-) diff --git a/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset b/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset index fdd9681f1..c121a7061 100644 --- a/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset +++ b/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset @@ -1,8 +1,12 @@ -From 03033c51349e01d5d06ee74545a15a534525d785 Mon Sep 17 00:00:00 2001 +From 33e29a8c2f19b290ed6e9056a60aac6fd27426c6 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 14:54:36 +0200 -Subject: Fix search paths for SDL2 header files. +Subject: [PATCH 1/4] Fix search paths for SDL2 header files. +--- + bear/cmake-helper/FindSDL2.cmake | 2 +- + bear/cmake-helper/FindSDL2_mixer.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bear/cmake-helper/FindSDL2.cmake b/bear/cmake-helper/FindSDL2.cmake index 7665a55..bcd3050 100644 @@ -33,12 +37,15 @@ index 59ed911..d795965 100644 -- 1.8.3.4 - -From 4a4404ab5a5b9c67925ec6d910ddc5f47fb1b910 Mon Sep 17 00:00:00 2001 +From 864a651724bec4acce7b92fd3e1bddaa00f17c19 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 17:02:35 +0200 -Subject: Link libintl on haiku. +Subject: [PATCH 2/4] Link libintl on haiku. +--- + bear/bear-engine/running_bear/CMakeLists.txt | 2 +- + plee-the-bear/launcher/src/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bear/bear-engine/running_bear/CMakeLists.txt b/bear/bear-engine/running_bear/CMakeLists.txt index 8b04d89..4fffd94 100644 @@ -69,12 +76,16 @@ index 9ed5d32..ff88206 100644 -- 1.8.3.4 - -From 415c83accad83bf6677dd3d578ab6712582910b9 Mon Sep 17 00:00:00 2001 +From c929f602fb74adcdf495e144b66f4981c0655ba5 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 19:41:58 +0200 -Subject: Fix install directories. +Subject: [PATCH 3/4] Fix install directories. +--- + bear/cmake-helper/bear-config.cmake | 2 +- + bear/cmake-module/CMakeLists.txt | 2 +- + plee-the-bear/CMakeLists.txt | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bear/cmake-helper/bear-config.cmake b/bear/cmake-helper/bear-config.cmake index e66d79e..b483445 100644 @@ -103,7 +114,7 @@ index e182689..24c2113 100644 set( BEAR_CMAKE_MODULES diff --git a/plee-the-bear/CMakeLists.txt b/plee-the-bear/CMakeLists.txt -index 6a123d9..9bc8df3 100644 +index 6a123d9..c3dbb90 100644 --- a/plee-the-bear/CMakeLists.txt +++ b/plee-the-bear/CMakeLists.txt @@ -23,7 +23,7 @@ include( docbook-to-man ) @@ -115,6 +126,15 @@ index 6a123d9..9bc8df3 100644 endif( NOT PTB_INSTALL_DATA_DIR ) # where the game executables are installed +@@ -38,7 +38,7 @@ if( NOT PTB_INSTALL_CUSTOM_LIBRARY_DIR ) + "${PTB_INSTALL_EXECUTABLE_DIR}" + ) + else( WIN32 ) +- set( PTB_INSTALL_CUSTOM_LIBRARY_DIR lib ) ++ set( PTB_INSTALL_CUSTOM_LIBRARY_DIR lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ) + endif( WIN32 ) + endif( NOT PTB_INSTALL_CUSTOM_LIBRARY_DIR ) + @@ -154,7 +154,7 @@ subdirs( install( @@ -127,3 +147,65 @@ index 6a123d9..9bc8df3 100644 -- 1.8.3.4 +From 34aca4d0b287e50d35957badf3e72060264f7a45 Mon Sep 17 00:00:00 2001 +From: Theodore Kokkoris +Date: Wed, 24 Dec 2014 23:53:14 +0200 +Subject: [PATCH 4/4] Change settings location on Haiku + +--- + .../bear-engine/core/src/engine/code/game_local_client.cpp | 14 ++++++++++++++ + .../src/engine/system/code/default_game_filesystem.cpp | 6 +++++- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/bear/bear-engine/core/src/engine/code/game_local_client.cpp b/bear/bear-engine/core/src/engine/code/game_local_client.cpp +index 51c055b..83ab880 100644 +--- a/bear/bear-engine/core/src/engine/code/game_local_client.cpp ++++ b/bear/bear-engine/core/src/engine/code/game_local_client.cpp +@@ -51,6 +51,11 @@ + #include + #include + ++#if defined(__HAIKU__) ++ #include ++ #include ++#endif ++ + /*----------------------------------------------------------------------------*/ + /** + * \brief Print the options of the program. +@@ -1107,6 +1112,15 @@ void bear::engine::game_local_client::init_game_filesystem() + m_game_filesystem = + freedesktop_game_filesystem( m_game_description.game_name() ); + ++#elif defined( __HAIKU__ ) ++ BPath path; ++ status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path); ++ if (status < B_OK) ++ // fall back to default ++ m_game_filesystem = default_game_filesystem( m_game_description.game_name() ); ++ else ++ m_game_filesystem = default_game_filesystem( m_game_description.game_name(), path.Path()); ++ + #else + + m_game_filesystem = default_game_filesystem( m_game_description.game_name() ); +diff --git a/bear/bear-engine/core/src/engine/system/code/default_game_filesystem.cpp b/bear/bear-engine/core/src/engine/system/code/default_game_filesystem.cpp +index 99ea2f8..0435b5a 100644 +--- a/bear/bear-engine/core/src/engine/system/code/default_game_filesystem.cpp ++++ b/bear/bear-engine/core/src/engine/system/code/default_game_filesystem.cpp +@@ -107,7 +107,11 @@ std::string bear::engine::default_game_filesystem::get_game_directory() const + boost::filesystem::path dir( m_root ); + + std::string result; +- std::string subdir = '.' + get_name_as_filename( m_game_name ); ++ #if defined(__HAIKU__) ++ std::string subdir = get_name_as_filename( m_game_name ); ++ #else ++ std::string subdir = '.' + get_name_as_filename( m_game_name ); ++ #endif + + dir /= boost::filesystem::path( subdir ); + +-- +1.8.3.4 + diff --git a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe index a14612159..a9f89c7ca 100644 --- a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe +++ b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe @@ -6,18 +6,21 @@ SRC_URI="http://www.stuff-o-matic.com/plee-the-bear/download/file.php?platform=s CHECKSUM_SHA256="41dfe864fe2d791d6f99ba7cd330e22c94fce19d82909054eeac594aa4f2924e" SRC_FILENAME="plee-the-bear-0.7.0.tgz" -REVISION="1" -ARCHITECTURES="?x86" +REVISION="2" +ARCHITECTURES="x86" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES !x86_gcc2" + ARCHITECTURES="x86_gcc2 $ARCHITECTURES" +else + ARCHITECTURES="!x86_gcc2 $ARCHITECTURES" fi -SECONDARY_ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" PROVIDES=" plee_the_bear = $portVersion cmd:plee_the_bear = $portVersion + lib:libplee_the_bear$secondaryArchSuffix lib:libbear_audio$secondaryArchSuffix lib:libbear_communication$secondaryArchSuffix lib:libbear_debug$secondaryArchSuffix @@ -65,7 +68,7 @@ BUILD_REQUIRES=" devel:libpng$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libintl$secondaryArchSuffix - boost_devel${secondaryArchSuffix} + boost${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel @@ -79,7 +82,7 @@ SOURCE_DIR="plee-the-bear-0.7.0-light" PATCHES="plee_the_bear-$portVersion.patchset" BUILD() { - cmake . -DBEAR_EDITORS_ENABLED=FALSE -DCMAKE_INSTALL_PREFIX=$prefix + cmake . -DBEAR_EDITORS_ENABLED=FALSE -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_CXX_FLAGS="-DNDEBUG" make $jobArgs } @@ -93,16 +96,14 @@ INSTALL() # ----- DESCRIPTION ----------------------------------------------------------- -DESCRIPTION=" -Plee the Bear is a platform game in which you play an angry bear whose son has -been kidnapped by god. Here is a guy hard to brave! Jump in this amazing journey -to find and rescue your son. Because you want to rescue him, don't you? Or to -slap him? Maybe both…. +DESCRIPTION="Plee the Bear is a platform game in which you play an angry bear whose son has \ +been kidnapped by god. Here is a guy hard to brave! Jump in this amazing journey \ +to find and rescue your son. Because you want to rescue him, don't you? Or to \ +slap him? Maybe both…. \ -With three levels of the storyline and four mini-games, Plee the Bear did -received very positive criticisms. The players loved the fun, the graphics and -the music; the community around the free software movement appreciated the -overall process and the quality of the resources, remarkable for a free game; -and the indie gaming community was pleasantly surprised by the technical skills -and the details of the game. -" +With three levels of the storyline and four mini-games, Plee the Bear \ +received very positive criticisms. The players loved the fun, the graphics and \ +the music; the community around the free software movement appreciated the \ +overall process and the quality of the resources, remarkable for a free game; \ +and the indie gaming community was pleasantly surprised by the technical skills \ +and the details of the game." From 1f30cb96ce8cac78f84b4768adb518e8784c97a1 Mon Sep 17 00:00:00 2001 From: begasus Date: Thu, 25 Dec 2014 14:54:58 +0100 Subject: [PATCH 31/75] heroes, new recipe --- games-action/heroes/heroes-0.21.recipe | 63 ++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 games-action/heroes/heroes-0.21.recipe diff --git a/games-action/heroes/heroes-0.21.recipe b/games-action/heroes/heroes-0.21.recipe new file mode 100644 index 000000000..c63805256 --- /dev/null +++ b/games-action/heroes/heroes-0.21.recipe @@ -0,0 +1,63 @@ +SUMMARY="An action game similar to Tron and Nibbles." +DESCRIPTION="Heroes is similar to the Tron and Nibbles games of yore, but \ +includes many graphical improvements and new game features. In it, you must \ +maneuver a small vehicle around a world and collect powerups while avoiding \ +obstacles, your opponents trails, and even your own trail." +HOMEPAGE="http://heroes.sourceforge.net/" +SRC_URI="http://prdownloads.sourceforge.net/heroes/heroes-0.21.tar.gz" +CHECKSUM_SHA256="1264981d37d0fa12905ca627e6329c22ae6db10a1abaf3ec9b9c7357d391b54f" +SRC_URI_2="http://prdownloads.sourceforge.net/heroes/heroes-data-1.5.tar.gz" +CHECKSUM_SHA256_2="af2af6b1fd83636db03d0d2aa77243d31dccd1cb14a20269ed765edb2bb4ff43" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2002 Alexandre Duret-Lutz, \ +Romual Genevois, \ +Alexandre Liverneaux, \ +Philippe Meisburger" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + heroes = portVersion + app:heroes = $portVersion + cmd:heroeslvl = $portVersion +" + +REQUIRES=" + haiku + lib:libintl + lib:libsdl + lib:libsdl_mixer +" + +BUILD_REQUIRES=" + haiku_devel + devel:libintl + devel:libsdl + devel:libsdl_mixer +" + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:libtoolize + cmd:make +" + +BUILD() +{ + libtoolize -fci + ./configure --prefix=$appsDir/Heroes + make $jobArgs + cd ../../sources-2/heroes-data-1.5 + libtoolize -fci + ./configure --prefix=$appsDir/Heroes + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir/Heroes + make install + cd ../../sources-2/heroes-data-1.5 + make install +} From 789ab408db4a3685c740d70e6a6867030b18b589 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Thu, 25 Dec 2014 22:05:01 +0100 Subject: [PATCH 32/75] Add recipe for ftp --- net-ftp/ftp/ftp-20121221.recipe | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 net-ftp/ftp/ftp-20121221.recipe diff --git a/net-ftp/ftp/ftp-20121221.recipe b/net-ftp/ftp/ftp-20121221.recipe new file mode 100644 index 000000000..adeb2c922 --- /dev/null +++ b/net-ftp/ftp/ftp-20121221.recipe @@ -0,0 +1,49 @@ +SUMMARY="Standard FTP client" +DESCRIPTION="ftp is a standard command line client for connecting to FTP \ +servers. The File Transfer protocol (defined in RFC 959) is used for \ +transferring files from one computer to another over a network." +HOMEPAGE="http://netbsd.org/" +SRC_URI="cvs://anoncvs@anoncvs.NetBSD.org:/cvsroot/src/usr.bin/ftp#2012-12-21" +REVISION="1" +LICENSE="BSD (3-clause)" +COPYRIGHT="1997-2012 The NetBSD Foundation, Inc." + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + ftp = $portVersion + cmd:ftp + " + +REQUIRES=" + haiku + lib:libedit + " + +BUILD_REQUIRES=" + haiku_devel + devel:libedit + " + +BUILD_PREREQUIRES=" + cmd:gcc + " + +PATCH() +{ + sed -i 's/#include //g' *.c +} + +BUILD() +{ + gcc -Dlint -DDIRENT_MISSING_D_NAMLEN -DINFTIM=-1 -DSECSPERHOUR=3600 -DSECSPERDAY=86400 \ + cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c \ + progressbar.c ruserpass.c util.c -o ftp \ + -lnetwork -ledit -lbsd +} + +INSTALL() +{ + mkdir -p $binDir + cp ftp $binDir +} From 00f9452bd6075b624e797f8886b38756408924a0 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 27 Dec 2014 22:05:17 +0000 Subject: [PATCH 33/75] harfbuzz: bump version. --- .../{harfbuzz-0.9.36.recipe => harfbuzz-0.9.37.recipe} | 6 +++--- .../{harfbuzz-0.9.36.patchset => harfbuzz-0.9.37.patchset} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename media-libs/harfbuzz/{harfbuzz-0.9.36.recipe => harfbuzz-0.9.37.recipe} (92%) rename media-libs/harfbuzz/patches/{harfbuzz-0.9.36.patchset => harfbuzz-0.9.37.patchset} (100%) diff --git a/media-libs/harfbuzz/harfbuzz-0.9.36.recipe b/media-libs/harfbuzz/harfbuzz-0.9.37.recipe similarity index 92% rename from media-libs/harfbuzz/harfbuzz-0.9.36.recipe rename to media-libs/harfbuzz/harfbuzz-0.9.37.recipe index f596c98b4..7ea78d210 100644 --- a/media-libs/harfbuzz/harfbuzz-0.9.36.recipe +++ b/media-libs/harfbuzz/harfbuzz-0.9.37.recipe @@ -19,7 +19,7 @@ COPYRIGHT=" 1998-2004 David Turner and Werner Lemberg " SRC_URI="http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$portVersion.tar.bz2" -CHECKSUM_SHA256="3bfbf7b016167ee6b2a2f83948fef75cc1253081873d6a91022161815956b9be" +CHECKSUM_SHA256="255f3b3842dead16863d1d0c216643d97b80bfa087aaa8fc5926da24ac120207" REVISION="1" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -33,7 +33,7 @@ PATCHES="harfbuzz-$portVersion.patchset" PROVIDES=" harfbuzz$secondaryArchSuffix = $portVersion compat >= 0.9 - lib:libharfbuzz$secondaryArchSuffix = 0.936.0 compat >= 0.936 + lib:libharfbuzz$secondaryArchSuffix = 0.937.0 compat >= 0.937 cmd:hb_ot_shape_closure$secondaryArchSuffix cmd:hb_shape$secondaryArchSuffix " @@ -98,7 +98,7 @@ INSTALL() PROVIDES_devel=" harfbuzz${secondaryArchSuffix}_devel = $portVersion compat >= 0.9 - devel:libharfbuzz$secondaryArchSuffix = 0.936.0 compat >= 0.936 + devel:libharfbuzz$secondaryArchSuffix = 0.937.0 compat >= 0.937 " REQUIRES_devel=" harfbuzz$secondaryArchSuffix == $portVersion base diff --git a/media-libs/harfbuzz/patches/harfbuzz-0.9.36.patchset b/media-libs/harfbuzz/patches/harfbuzz-0.9.37.patchset similarity index 100% rename from media-libs/harfbuzz/patches/harfbuzz-0.9.36.patchset rename to media-libs/harfbuzz/patches/harfbuzz-0.9.37.patchset From d7a1c1abbb882c36b8c3787be8bd8088f9a38b6f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 27 Dec 2014 22:24:11 +0000 Subject: [PATCH 34/75] xz_utils: bump version --- .../xz_utils/{xz_utils-5.0.7.recipe => xz_utils-5.0.8.recipe} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename app-arch/xz_utils/{xz_utils-5.0.7.recipe => xz_utils-5.0.8.recipe} (97%) diff --git a/app-arch/xz_utils/xz_utils-5.0.7.recipe b/app-arch/xz_utils/xz_utils-5.0.8.recipe similarity index 97% rename from app-arch/xz_utils/xz_utils-5.0.7.recipe rename to app-arch/xz_utils/xz_utils-5.0.8.recipe index ec402ecb7..d5bf16d25 100644 --- a/app-arch/xz_utils/xz_utils-5.0.7.recipe +++ b/app-arch/xz_utils/xz_utils-5.0.8.recipe @@ -4,7 +4,7 @@ a high compression ratio. They are the successors to LZMA Utils. " HOMEPAGE="http://tukaani.org/xz/" SRC_URI="http://tukaani.org/xz/xz-$portVersion.tar.bz2" -CHECKSUM_SHA256="e8851dc749df2340dac6c9297cb2653eff684e73c3dedf690930119502edd616" +CHECKSUM_SHA256="2286f9d90bb0a0de34cba990df1b10cfad0777f00cb2883def26b8ec1b326bda" SOURCE_DIR="xz-$portVersion" LICENSE="GNU LGPL v2.1 GNU GPL v2 From 2e134443c2677b491338aa337584855192faf91b Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 28 Dec 2014 04:21:28 +0000 Subject: [PATCH 35/75] Add Noto fonts for Southeast Asian languages --- .../noto_sans_khmer-1.00.recipe | 39 +++++++++++++++++ .../noto_sans_lao/noto_sans_lao-1.00.recipe | 39 +++++++++++++++++ .../noto_sans_myanmar-1.05.recipe | 42 +++++++++++++++++++ .../noto_sans_thai/noto_sans_thai-1.02.recipe | 39 +++++++++++++++++ .../noto_serif_khmer-1.00.recipe | 39 +++++++++++++++++ .../noto_serif_lao/noto_serif_lao-1.00.recipe | 39 +++++++++++++++++ .../noto_serif_thai-1.02.recipe | 39 +++++++++++++++++ 7 files changed, 276 insertions(+) create mode 100644 media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe create mode 100644 media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe create mode 100644 media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe create mode 100644 media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe create mode 100644 media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe create mode 100644 media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe create mode 100644 media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe diff --git a/media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe b/media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe new file mode 100644 index 000000000..ee0480345 --- /dev/null +++ b/media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe @@ -0,0 +1,39 @@ +LANG_EN="Khmer" +LANG_DL="${LANG_EN}" +LANG_LC="khmer" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="045bc145fe06b9fb6ccc12b5fe5eb38b1b6a425d54163b43c284f6503acb0844" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe b/media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe new file mode 100644 index 000000000..fd7880646 --- /dev/null +++ b/media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe @@ -0,0 +1,39 @@ +LANG_EN="Lao" +LANG_DL="${LANG_EN}" +LANG_LC="lao" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="d19fd542e8d246583dfdd4d3ed0915f41437b95142cabdbb0b4204e77542dad5" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe b/media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe new file mode 100644 index 000000000..674a82363 --- /dev/null +++ b/media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe @@ -0,0 +1,42 @@ +# At the time of writing this, the version for the bold face is 1.04, while +# for the regular it is 1.05. Using 1.05 as the package version for now. + +LANG_EN="Myanmar" +LANG_DL="${LANG_EN}" +LANG_LC="myanmar" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-unhinted.zip" +CHECKSUM_SHA256="5d4df9b779e0cde386adf8a10c87e8c27c21e50d2edcb64d064d2ff832cd9d70" +LICENSE="Apache v2" +COPYRIGHT="2013 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe b/media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe new file mode 100644 index 000000000..a095a9e2d --- /dev/null +++ b/media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe @@ -0,0 +1,39 @@ +LANG_EN="Thai" +LANG_DL="${LANG_EN}" +LANG_LC="thai" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="53d37597667ce7388a7b29a44ee843cfad4dba8d584de6c10b6bfa90fb522648" +LICENSE="Apache v2" +COPYRIGHT="2009, 2011 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe b/media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe new file mode 100644 index 000000000..587cd7a6e --- /dev/null +++ b/media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe @@ -0,0 +1,39 @@ +LANG_EN="Khmer" +LANG_DL="${LANG_EN}" +LANG_LC="khmer" + +SUMMARY="The Noto Serif font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Serif fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSerif${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="c9bd280737a77e3fc2bb62a29c1dca09d546b7c528279957e5c5ad4026f6f35f" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_serif_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe b/media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe new file mode 100644 index 000000000..fbd13e23a --- /dev/null +++ b/media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe @@ -0,0 +1,39 @@ +LANG_EN="Lao" +LANG_DL="${LANG_EN}" +LANG_LC="lao" + +SUMMARY="The Noto Serif font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Serif fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSerif${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="9eaddceb84c296197d88936d687a2178554d0b5f25b6b30b7d2b01a2e1729974" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_serif_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe b/media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe new file mode 100644 index 000000000..0a5dbd591 --- /dev/null +++ b/media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe @@ -0,0 +1,39 @@ +LANG_EN="Thai" +LANG_DL="${LANG_EN}" +LANG_LC="thai" + +SUMMARY="The Noto Serif font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Serif fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSerif${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="328795118275f01d03a74a95f327a5e0ad930e6e865f983408e67c0fa2eea1ee" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_serif_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} From 008725f5201f0e53406c24b862f3b2159ae30321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 28 Dec 2014 10:26:00 +0100 Subject: [PATCH 36/75] binutils: added recipe for 2.25 --- .../binutils/binutils-2.25_2014_12_27.recipe | 177 ++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 sys-devel/binutils/binutils-2.25_2014_12_27.recipe diff --git a/sys-devel/binutils/binutils-2.25_2014_12_27.recipe b/sys-devel/binutils/binutils-2.25_2014_12_27.recipe new file mode 100644 index 000000000..19e9ecb0e --- /dev/null +++ b/sys-devel/binutils/binutils-2.25_2014_12_27.recipe @@ -0,0 +1,177 @@ +SUMMARY="Assembler, linker and binary tools for target ${targetMachineTriple}" +HOMEPAGE="http://www.gnu.org/software/binutils" + +srcGitRev="a05bd9155a41ad87382134678e93d67ceb959cfc" +SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6" +SRC_FILENAME="binutils-$portVersion.tar.gz" +REVISION="1" +LICENSE=" + GNU GPL v3 + GNU LGPL v3 + " +COPYRIGHT="1988-2014 Free Software Foundation, Inc." + + +ARCHITECTURES="x86 x86_64 arm" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + binutils$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:addr2line$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ar$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:as$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:elfedit$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:gprof$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ld$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ld.bfd$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:nm$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:objcopy$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:objdump$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ranlib$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:readelf$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:size$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:strings$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:strip$secondaryArchSuffix = $portVersion compat >= 2.23 + lib:libbfd_2.25$secondaryArchSuffix = $portVersion compat >= 2.23 + lib:libopcodes_2.25$secondaryArchSuffix = $portVersion compat >= 2.23 + " + +REQUIRES=" + haiku$secondaryArchSuffix + " +BUILD_REQUIRES=" + cmd:find + cmd:xargs + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:autoconf + cmd:awk + cmd:find + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:sed + cmd:strip + cmd:tar + cmd:xargs + " + +SOURCE_DIR="buildtools-$srcGitRev/binutils" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +sourceDir=$(pwd) +relativeInstallDir="develop/tools$secondaryArchSubDir" +installDir="$prefix/$relativeInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj + +BUILD() +{ + rm -rf $objectsDir + + # Touch all *.info files, as newer texinfos don't like their format + (cd $sourceDir; find . -name \*.info | xargs touch) + + mkdir -p $objectsDir + cd $objectsDir + + CFLAGS=-O2 CXXFLAGS=-O2 runConfigure "$sourceDir/configure" \ + --exec-prefix=$installDir \ + --includedir=$includeDir/binutils \ + --docdir=$docDir \ + --disable-nls --enable-shared=yes \ + --with-sysroot=/ + # Note: The sysroot option is normally superfluous. We have to specify + # it, however, since these binutils may be used by the bootstrap-gcc, + # which passes --sysroot= to ld. + + make $jobArgs LEXLIB= +} + +INSTALL() +{ + cd $objectsDir + + make install + make install-html + + # Remove the development libraries and headers. Nobody uses those anyway. + rm $libDir/*.a $libDir/*.la $libDir/libbfd.so $libDir/libopcodes.so + rm -r $developDir/headers + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + cd $docDir + + # beautify HTML docs and remove stuff we don't need + mv as.html as + ln -sf as/index.html as.html + mv bfd.html bfd + ln -sf bfd/index.html bfd.html + mv binutils.html binutils + ln -sf binutils/index.html binutils.html + mv gprof.html gprof + ln -sf gprof/index.html gprof.html + mv ld.html ld + ln -sf ld/index.html ld.html + rm libiberty.html standards.html + + # no info documentation + rm -r $infoDir + + ### Strip ################################################# + + echo "Strip debug info" + + strip --strip-debug $binDir/* + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # There are copies of a subset of the commands below installDir. We + # overwrite those with symlinks to the ones in binDir. + for file in $installDir/$effectiveTargetMachineTriple/bin/*; do + symlinkRelative -sfn $binDir/$(basename $file) $file + done + + ### Cleanup ################################################# + + echo "Cleanup" + + # delete man pages for commands that we aren't including + cd $manDir + for cmd in dlltool nlmconv windmc windres; do + rm -f man1/$cmd.1 + done +} + +DESCRIPTION=" +The GNU Binutils are a collection of binary tools. The main ones are: +- ld - the GNU linker. +- as - the GNU assembler. +But they also include: +- addr2line - Converts addresses into filenames and line numbers. +- ar - A utility for creating, modifying and extracting from archives. +- c++filt - Filter to demangle encoded C++ symbols. +- nm - Lists symbols from object files. +- objcopy - Copys and translates object files. +- objdump - Displays information from object files. +- ranlib - Generates an index to the contents of an archive. +- readelf - Displays information from any ELF format object file. +- size - Lists the section sizes of an object or archive file. +- strings - Lists printable strings from files. +- strip - Discards symbols. +The tools of this package can be used for cross-builds to \ +$effectiveTargetMachineTriple. +" From 980e58537ba1de4f51e9fc3dd8d235c2fc375148 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 28 Dec 2014 09:52:51 +0000 Subject: [PATCH 37/75] binutils: fix checksum and install section. --- sys-devel/binutils/binutils-2.25_2014_12_27.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/binutils/binutils-2.25_2014_12_27.recipe b/sys-devel/binutils/binutils-2.25_2014_12_27.recipe index 19e9ecb0e..b04fde642 100644 --- a/sys-devel/binutils/binutils-2.25_2014_12_27.recipe +++ b/sys-devel/binutils/binutils-2.25_2014_12_27.recipe @@ -3,7 +3,7 @@ HOMEPAGE="http://www.gnu.org/software/binutils" srcGitRev="a05bd9155a41ad87382134678e93d67ceb959cfc" SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6" +CHECKSUM_SHA256="011e60e9ba3ce92af766adc222d55a6f7291991a85074e2b5b280b62317b201d" SRC_FILENAME="binutils-$portVersion.tar.gz" REVISION="1" LICENSE=" @@ -124,7 +124,7 @@ INSTALL() ln -sf gprof/index.html gprof.html mv ld.html ld ln -sf ld/index.html ld.html - rm libiberty.html standards.html + rm libiberty.html # no info documentation rm -r $infoDir From 663441f82df38249275271e8e855262ea73d7972 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 27 Dec 2014 10:50:33 +0100 Subject: [PATCH 38/75] sdl2_mixer: build fix. --- media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe index d9b1deb77..c30705f73 100644 --- a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe +++ b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe @@ -28,6 +28,8 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix # No clue, it wants it + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix lib:libSDL2_2.0$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libFLAC$secondaryArchSuffix @@ -39,8 +41,8 @@ REQUIRES=" " BUILD_REQUIRES=" - devel:libsdl$secondaryArchSuffix devel:libsdl2$secondaryArchSuffix + devel:libGL$secondaryArchSuffix # Needed by SDL2, not transitive... devel:libogg$secondaryArchSuffix devel:libflac$secondaryArchSuffix devel:libfluidsynth$secondaryArchSuffix From 4ac3c394ebccc20bb07cbf67f67a934b5e8ff058 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 28 Dec 2014 11:59:54 +0100 Subject: [PATCH 39/75] llvm: fix policy warnings * Move cmake files to data/llvm * Add missing cmd: entries. --- sys-devel/llvm/llvm-3.5.0.recipe | 3 + sys-devel/llvm/patches/llvm-3.5.0.patchset | 70 ++++++++++++++++++---- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/sys-devel/llvm/llvm-3.5.0.recipe b/sys-devel/llvm/llvm-3.5.0.recipe index 84e25e69c..b47d34e70 100644 --- a/sys-devel/llvm/llvm-3.5.0.recipe +++ b/sys-devel/llvm/llvm-3.5.0.recipe @@ -45,6 +45,9 @@ PROVIDES=" cmd:llvm_tblgen cmd:macho_dump cmd:opt + cmd:FileCheck + cmd:count + cmd:not lib:BugpointPasses$secondaryArchSuffix lib:LLVMHello$secondaryArchSuffix lib:libLTO$secondaryArchSuffix diff --git a/sys-devel/llvm/patches/llvm-3.5.0.patchset b/sys-devel/llvm/patches/llvm-3.5.0.patchset index b73c6ab55..1880876e5 100644 --- a/sys-devel/llvm/patches/llvm-3.5.0.patchset +++ b/sys-devel/llvm/patches/llvm-3.5.0.patchset @@ -1,11 +1,8 @@ -From ea9fabb4c279b2d94e54e6a416d8c1d971cc2383 Mon Sep 17 00:00:00 2001 +From 2ffaad9e30a03b5688307fa31ab1a43a23013325 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 22 Jan 2014 05:04:31 +0000 -Subject: [PATCH 1/2] haiku: fix Host.h for endian.h +Subject: haiku: fix Host.h for endian.h ---- - include/llvm/Support/Host.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h index 8f4bf3c..8114f9b 100644 @@ -23,17 +20,12 @@ index 8f4bf3c..8114f9b 100644 -- 1.8.3.4 -From 568aa3d732e8482db2797470235f363077ab2900 Mon Sep 17 00:00:00 2001 + +From 346e9d142e5d8d34bd05e6f51b75f562df1269e3 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 9 Dec 2014 01:20:26 +0000 -Subject: [PATCH 2/2] LLVM: Update autoconf for Haiku x86_64 support +Subject: LLVM: Update autoconf for Haiku x86_64 support ---- - autoconf/config.guess | 371 ++++++++++++++++++-------------------------------- - autoconf/config.sub | 165 +++++++++++++--------- - 2 files changed, 235 insertions(+), 301 deletions(-) - mode change 100755 => 100644 autoconf/config.guess - mode change 100755 => 100644 autoconf/config.sub diff --git a/autoconf/config.guess b/autoconf/config.guess old mode 100755 @@ -1038,3 +1030,55 @@ index a8d8528..7ffe373 -- 1.8.3.4 + +From cfbee5322c336f241ec9dfac456e77e4e71a0478 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 27 Dec 2014 15:47:00 +0100 +Subject: Fix datadir for Haiku. + +Hardcoded to share... + +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index c87193d..925c6e1 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -1,4 +1,4 @@ +-set(LLVM_INSTALL_PACKAGE_DIR share/llvm/cmake) ++set(LLVM_INSTALL_PACKAGE_DIR data/llvm/cmake) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + get_property(LLVM_EXPORTS GLOBAL PROPERTY LLVM_EXPORTS) +diff --git a/cmake/modules/Makefile b/cmake/modules/Makefile +index ba45f17..615a19a 100644 +--- a/cmake/modules/Makefile ++++ b/cmake/modules/Makefile +@@ -13,7 +13,7 @@ LINK_COMPONENTS := all + + include $(LEVEL)/Makefile.common + +-PROJ_cmake := $(DESTDIR)$(PROJ_prefix)/share/llvm/cmake ++PROJ_cmake := $(DESTDIR)$(PROJ_prefix)/data/llvm/cmake + + ifeq ($(DISABLE_ASSERTIONS),1) + LLVM_ENABLE_ASSERTIONS := 0 +diff --git a/configure b/configure +index c11c395..b83ff65 100755 +--- a/configure ++++ b/configure +@@ -18539,10 +18539,10 @@ if test "${prefix}" = "NONE" ; then + fi + eval LLVM_PREFIX="${prefix}"; + eval LLVM_BINDIR="${prefix}/bin"; +-eval LLVM_DATADIR="${prefix}/share/llvm"; +-eval LLVM_DOCSDIR="${prefix}/share/doc/llvm"; ++eval LLVM_DATADIR="${prefix}/data/llvm"; ++eval LLVM_DOCSDIR="${prefix}/data/doc/llvm"; + eval LLVM_ETCDIR="${prefix}/etc/llvm"; +-eval LLVM_INCLUDEDIR="${prefix}/include"; ++eval LLVM_INCLUDEDIR="${prefix}/devlop/headers"; + eval LLVM_INFODIR="${prefix}/info"; + eval LLVM_MANDIR="${prefix}/man"; + LLVM_CONFIGTIME=`date` +-- +1.8.3.4 + From 4a1cf034662a99c2cadb57bd9362b4e0eec822b8 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sun, 28 Dec 2014 16:13:53 +0300 Subject: [PATCH 40/75] findutils: add missing requires --- sys-apps/findutils/findutils-4.4.2.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys-apps/findutils/findutils-4.4.2.recipe b/sys-apps/findutils/findutils-4.4.2.recipe index b8c77f540..552bb1bac 100644 --- a/sys-apps/findutils/findutils-4.4.2.recipe +++ b/sys-apps/findutils/findutils-4.4.2.recipe @@ -14,7 +14,7 @@ COPYRIGHT="1994-2011 Free Software Foundation, Inc." LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz" CHECKSUM_SHA256="434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" PROVIDES=" @@ -26,6 +26,10 @@ PROVIDES=" " REQUIRES=" haiku + cmd:awk + cmd:sed + cmd:sort + cmd:tr " BUILD_PREREQUIRES=" haiku_devel From 875da08305ea68d9eeb366e3e6d193dcb5dc6523 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 29 Dec 2014 13:49:25 +0000 Subject: [PATCH 41/75] libsolv: patch is now applied on Haiku's libsolv repository. --- .../libsolv-0.3.0_haiku_2014_12_22.recipe | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 dev-libs/libsolv/libsolv-0.3.0_haiku_2014_12_22.recipe diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2014_12_22.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2014_12_22.recipe new file mode 100644 index 000000000..10f151ef1 --- /dev/null +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2014_12_22.recipe @@ -0,0 +1,86 @@ +SUMMARY="A library for solving packages and reading repositories" +DESCRIPTION="A Library for solving packages and reading repositories." +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." +HOMEPAGE="http://github.com/openSUSE/libsolv" +srcGitRev="da2650933f85f5a30d8146bfb22af53d2620d0c7" +SRC_URI="https://github.com/weinhold/libsolv/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="79aa7772bfe403f003e8063480ddc3d4f491b3f5d7b8cace610605fba3318150" +SRC_FILENAME="$portVersionedName.tar.gz" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64 ppc arm" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libsolv$secondaryArchSuffix = $portVersion + lib:libsolv$secondaryArchSuffix = $portVersion + lib:libsolvext$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libexpat$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:sed + " + +SOURCE_DIR="libsolv-$srcGitRev" + +PATCH() +{ + sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, \ + src/CMakeLists.txt ext/CMakeLists.txt +} + +BUILD() +{ + rm -rf build + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix -DLIB=$relativeLibDir .. + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + # set up the develop directory correctly + prepareInstalledDevelLibs libsolv libsolvext + + # move cmake files + mkdir -p $dataDir + mv $prefix/share/cmake $dataDir + rmdir $prefix/share + + # We don't want the executables. + rm -r $prefix/bin + + # devel package + packageEntries devel \ + $dataDir \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libsolv${secondaryArchSuffix}_devel = $portVersion + devel:libsolv${secondaryArchSuffix} = $portVersion + devel:libsolvext${secondaryArchSuffix} = $portVersion + " +REQUIRES_devel=" + libsolv${secondaryArchSuffix} == $portVersion base + " From f3a981550b001c9f115cd9e00333c622e4a66603 Mon Sep 17 00:00:00 2001 From: DarkmatterVale Date: Mon, 29 Dec 2014 18:09:32 +0000 Subject: [PATCH 42/75] Added SimplyVorbis --- haiku-apps/simplyvorbis/licenses/SimplyVorbis | 3 ++ .../simplyvorbis/simplyvorbis-0.1.recipe | 53 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 haiku-apps/simplyvorbis/licenses/SimplyVorbis create mode 100644 haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe diff --git a/haiku-apps/simplyvorbis/licenses/SimplyVorbis b/haiku-apps/simplyvorbis/licenses/SimplyVorbis new file mode 100644 index 000000000..17c0271ba --- /dev/null +++ b/haiku-apps/simplyvorbis/licenses/SimplyVorbis @@ -0,0 +1,3 @@ +Like most other software I have written, SimplyVorbis is released under a license where you can do just about anything you like with it +except say that you wrote the code in it, and I feel that anyone who wants to use SimplyVorbis as the basis for a commercial app should +not have to concern themselves with licensing issues. \ No newline at end of file diff --git a/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe b/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe new file mode 100644 index 000000000..8b5fe4b83 --- /dev/null +++ b/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe @@ -0,0 +1,53 @@ +SUMMARY="A program to rip CDs into digital music files" +DESCRIPTION="MP3 or Ogg Vorbis. Designed with ease-of-use as being priority one, \ +it is simple, effective, and lets you get on to bigger and better things, like \ +listening to your to music. SimplyVorbis is not for the audiophile and probably \ +not for the hardcore geek; it is for the rest of us, people who don't want to be \ +hassled with technical details, who just want to turn CDs into music files to \ +listen to while we work at the keyboard or take with us on an iPod and want to have \ +all the BeOS goodness of attributes without having to resort to something like \ +ArmyKnife (which does have its uses). Pop in a CD, select the songs you want, and \ +hit 'Go'. Period. It can even make playlists for you if you like. Your music isn't \ +limited by copy protection (DRM) either, so you can have all the flexibility of Fair Use." +HOMEPAGE="https://github.com/HaikuArchives/SimplyVorbis" +SRC_URI="git+https://github.com/HaikuArchives/SimplyVorbis.git#63290af1f2cda8e5e31393780ee96a16132b4dba" +CHECKSUM_SHA256="" +LICENSE="SimplyVorbis" +COPYRIGHT="2007 Darkwyrm" +REVISION="1" + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + app:SimplyVorbis = $portVersion + " + +REQUIRES=" + haiku + lib:libogg + lib:libvorbis + lib:libvorbisenc + " + +BUILD_REQUIRES=" + haiku_devel + makefile_engine + devel:libogg + devel:libvorbis + devel:libvorbisenc + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:g++ + " + +BUILD() +{ + make +} + +INSTALL() +{ + make install +} \ No newline at end of file From a776592824cec53fcfcb647614d7dbcfe31ceb70 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sat, 27 Dec 2014 12:51:28 -0800 Subject: [PATCH 43/75] speech_tools: Various improvements - Fix gcc_syslibs dep on secondary architectures - Remove -lstdc++ from linking commands - Fix provide of devel package - Make the devel package depend on devel:libncurses - Install headers to speech_tools directory inside $includeDir - Work around Festival's broken build system by symlinking configuration files and makefile rules - Remove unneeded dependency on makefile_engine --- .../patches/speech_tools-2.4.patchset | 38 +++++++++++++++++++ .../speech_tools/speech_tools-2.4.recipe | 30 ++++++++++++--- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset b/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset index ed06dd054..0f31a31a8 100644 --- a/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset +++ b/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset @@ -2975,3 +2975,41 @@ index 71b271c..b7ac4a1 100644 -- 1.8.3.4 +From d1dec5aa5d0de6e3f83fcf1ad07b2486a5f62e63 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:17:23 -0800 +Subject: Remove -lstdc++ from linking command + + +diff --git a/config/compilers/gcc32.mak b/config/compilers/gcc32.mak +index 9703a3e..43fea62 100644 +--- a/config/compilers/gcc32.mak ++++ b/config/compilers/gcc32.mak +@@ -56,7 +56,7 @@ STATIC_LINKFLAGS = -Dstatic + MAKE_DEPEND_C = $(CC) -MM $(INCLUDES) $(TEMPLATES) $(TEMPLATE_SPECIFIC) + MAKE_DEPEND_CXX = $(CC) -MM $(INCLUDES) $(WARN_CXXFLAGS) $(TEMPLATES) $(TEMPLATE_SPECIFIC) + +-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++ ++COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) + + + +diff --git a/config/compilers/gcc_defaults.mak b/config/compilers/gcc_defaults.mak +index befcd31..0be771d 100644 +--- a/config/compilers/gcc_defaults.mak ++++ b/config/compilers/gcc_defaults.mak +@@ -96,10 +96,7 @@ STATIC_LINKFLAGS = -static + TEMPLATE_SPECIFIC = -DINSTANTIATE_TEMPLATES + TEMPLATE_ARGS = + +-## The -lgcc here is redundant - gcc does this anyway - but it +-## helps java know what needs to be loaded. +- +-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++ ++COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) + + ## special ways of doing things, blank means default + +-- +1.8.3.4 + diff --git a/app-accessibility/speech_tools/speech_tools-2.4.recipe b/app-accessibility/speech_tools/speech_tools-2.4.recipe index 7c644a8f0..1998e6c26 100644 --- a/app-accessibility/speech_tools/speech_tools-2.4.recipe +++ b/app-accessibility/speech_tools/speech_tools-2.4.recipe @@ -10,7 +10,7 @@ HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/" SRC_URI="http://www.festvox.org/packed/festival/${portVersion}/speech_tools-${portVersion}-release.tar.gz" CHECKSUM_SHA256="fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010" SOURCE_DIR="speech_tools" -REVISION="1" +REVISION="2" # Although individually many files have different licenses, as a whole this # license covers all the files. @@ -45,7 +45,7 @@ PROVIDES=" lib:libeststring$secondaryArchSuffix = $portVersion compat >= 2 " PROVIDES_devel=" - flite${secondaryArchSuffix}_devel = $portVersion + speech_tools${secondaryArchSuffix}_devel = $portVersion devel:libestbase$secondaryArchSuffix = $portVersion compat >= 2 devel:libestools$secondaryArchSuffix = $portVersion compat >= 2 devel:libeststring$secondaryArchSuffix = $portVersion compat >= 2 @@ -63,7 +63,7 @@ SCRIPTS=" resynth " PROVIDES_tools=" - speech_tools_tools = $portVersion + speech_tools${secondaryArchSuffix}_tools = $portVersion cmd:simple_pitchmark = $portVersion " for p in $PROGS $SCRIPTS; do @@ -74,26 +74,28 @@ for p in $PROGS $SCRIPTS; do done REQUIRES=" haiku$secondaryArchSuffix - gcc${secondaryArchSuffix}_syslibs + lib:libgcc_s$secondaryArchSuffix lib:libncurses$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix " REQUIRES_devel=" haiku${secondaryArchSuffix}_devel speech_tools$secondaryArchSuffix == $portVersion base + devel:libncurses$secondaryArchSuffix " REQUIRES_tools=" haiku$secondaryArchSuffix - gcc${secondaryArchSuffix}_syslibs speech_tools$secondaryArchSuffix == $portVersion base cmd:perl + lib:libgcc_s$secondaryArchSuffix lib:libncurses$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix " BUILD_PREREQUIRES=" - makefile_engine cmd:awk cmd:find cmd:gcc$secondaryArchSuffix @@ -130,6 +132,7 @@ INSTALL() cp lib/*.a lib/*.so lib/*.so.* $libDir # Installs possibly internal headers as well, as debian installs them + includeDir=$includeDir/speech_tools mkdir -p $includeDir/ cp -a include/* $includeDir/ rm -rf $includeDir/Makefile \ @@ -139,10 +142,25 @@ INSTALL() mkdir -p $includeDir/base_class/ cp -a base_class/*.cc $includeDir/base_class/ + # Install configurations as festival need them. Yes it's ugly but it's + # the only way to do it. (Debian does this too.) + privDir=$developLibDir/$portName + mkdir -p $privDir/lib/siod + cp -a make.include config $privDir + cp -a lib/siod/*.scm $privDir/lib/siod + prepareInstalledDevelLibs \ libestbase \ libestools \ libeststring + + # Evil linking for Festival + for i in $developLibDir/libest*.a \ + $developLibDir/libest*.so; do + ln -s "$i" "$privDir/lib/`basename $i`" + done + ln -s "$includeDir" "$privDir/include" + packageEntries devel \ $developDir packageEntries tools \ From 26451775eeb4188ce80ef301cddd22d3defd1fe6 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sat, 27 Dec 2014 13:17:59 -0800 Subject: [PATCH 44/75] Add festival port --- .../festival/festival-2.4.recipe | 119 ++ app-accessibility/festival/licenses/Festival | 113 ++ .../festival/patches/festival-2.4.patchset | 1148 +++++++++++++++++ 3 files changed, 1380 insertions(+) create mode 100644 app-accessibility/festival/festival-2.4.recipe create mode 100644 app-accessibility/festival/licenses/Festival create mode 100644 app-accessibility/festival/patches/festival-2.4.patchset diff --git a/app-accessibility/festival/festival-2.4.recipe b/app-accessibility/festival/festival-2.4.recipe new file mode 100644 index 000000000..6b6a9b346 --- /dev/null +++ b/app-accessibility/festival/festival-2.4.recipe @@ -0,0 +1,119 @@ +SUMMARY="Text-to-speech engine" +DESCRIPTION="Festival is a text-to-speech engine co-developed by the \ +University of Edinburgh, UK, and Carnegie Mellon University. It is designed to \ +support multiple languages and to be easy to extend, both in terms of voices \ +and new languages." +HOMEPAGE="http://www.cstr.ed.ac.uk/projects/festival" +SRC_URI=" + http://festvox.org/packed/festival/$portVersion/festival-${portVersion}-release.tar.gz + " +CHECKSUM_SHA256="1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d84" +SOURCE_DIR="festival" +REVISION="1" + +# Only including the licenses that cover the files that are actually used +# and/or installed +LICENSE=" + Festival + " +COPYRIGHT=" + 1996 Alan W. Black + 1996-2004 University of Edinburgh, UK + 1997 Jacques H. de Villiers + 1997 Kevin A. Lenzo + 1997 Center for Spoken Language Understanding, Oregon Graduate \ + Institute of Science & Technology + 1999-2004 Language Technologies Institute, Carnegie Mellon University + 2001-2008 Tokyo Institute of Technology + 2001-2012 Nagoya Institute of Technology + 2012 The Department of Arts and Culture, The Government of the \ + Republic of South Africa + " + +ARCHITECTURES="x86_gcc2 x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 !x86_gcc2" + +PROVIDES=" + festival$secondaryArchSuffix = $portVersion + cmd:festival = $portVersion + cmd:festival_client = $portVersion + cmd:text2wave = $portVersion + " +PROVIDES_devel=" + festival${secondaryArchSuffix}_devel = $portVersion + devel:libFestival$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + speech_tools$secondaryArchSuffix >= 2.4 + lib:libgcc_s$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + festival$secondaryArchSuffix == $portVersion base + speech_tools${secondaryArchSuffix}_devel >= 2.4 + devel:libncurses$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + speech_tools${secondaryArchSuffix}_devel >= 2.4 + devel:libncurses$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:awk + cmd:find + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:mkdepend + " + +PATCHES="festival-${portVersion}.patchset" + +BUILD() +{ + binDir=$prefix/bin + export binDir \ + portPackageLinksDir \ + relativeDevelopLibDir \ + secondaryArchSuffix + for f in lib/festival.scm \ + lib/lexicons.scm \ + lib/voices.scm \ + src/arch/festival/festival.cc + do + sed -e "s,@DOCDIR@,$docDir,g" \ + -e "s,@DATADIR@,$dataDir/festival,g" \ + -e "s,@LIBDIR@,$libDir/festival,g" \ + ${f}.in > ${f} + done + + make +} + +INSTALL() +{ + mkdir -p \ + $developLibDir \ + $prefix/bin \ + $dataDir/festival \ + $manDir/man1 \ + $docDir/examples + cp -a src/lib/libFestival.a $developLibDir + cp -a src/main/festival $prefix/bin + cp -a src/main/festival_client $prefix/bin + cp -a examples/text2wave $prefix/bin + cp -a lib/* $dataDir/festival + cp -a doc/*.1 $manDir/man1 + cp -a examples/*intro.text $docDir/examples + packageEntries devel \ + $developDir +} diff --git a/app-accessibility/festival/licenses/Festival b/app-accessibility/festival/licenses/Festival new file mode 100644 index 000000000..ff734e38a --- /dev/null +++ b/app-accessibility/festival/licenses/Festival @@ -0,0 +1,113 @@ +The system as a whole and most of the files in it are distributed +under the following copyright and conditions + + The Festival Speech Synthesis System + Centre for Speech Technology Research + University of Edinburgh, UK + Copyright (c) 1996-2014 + All Rights Reserved. + + Permission is hereby granted, free of charge, to use and distribute + this software and its documentation without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of this work, and to + permit persons to whom this work is furnished to do so, subject to + the following conditions: + 1. The code must retain the above copyright notice, this list of + conditions and the following disclaimer. + 2. Any modifications must be clearly marked as such. + 3. Original authors' names are not deleted. + 4. The authors' names are not used to endorse or promote products + derived from this software without specific prior written + permission. + + THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK + DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT + SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF + THIS SOFTWARE. + +Some further comments: + +Every effort has been made to ensure that Festival does not contain +any violation of intellectual property rights through disclosure of +trade secrets, copyright or patent violation. Considerable time and +effort has been spent to ensure that this is the case. However, +especially with patent problems, it is not always within our control +to know what has or has not been restricted. If you do suspect that +some part of Festival cannot be legally distributed please inform us +so that an alternative may be sought. Festival is only useful if it +is truly free to distribute. + +As of 1.4.0 the core distribution (and speech tools) is free. Unlike +previous versions which had a commercial restriction. You are free to +incorporate Festival in commercial (and of course non-commercial +systems), without any further communication or licence from us. +However if you are seriously using Festival within a commercial +application we would like to know, both so we know we are contributing +and so we can keep you informed of future developments. Also if you +require maintenance, support or wish us to provide consultancy feel +free to contact us. + +The voices however aren't all free. At present the US voices, kal and +ked are free. Our British voices are free themselves but they use OALD +which is restricted for non-commercial use. Our Spanish voice is also +so restricted. + +Note other modules that festival supports e.g MBROLA and OGI +extensions, may have different licencing please take care when using +the system to understand what you are actually using. + +-------------------------------------------------- + +A number of individual files in the system fall under a different +copyright from the above. All however are termed "free software" +but most people. + +./src/arch/festival/tcl.c + * Copyright (C)1997 Jacques H. de Villiers + * Copyright (C)1997 Center for Spoken Language Understanding, + * Oregon Graduate Institute of Science & Technology + See conditions in file. This is the standard TCL licence and hence + shouldn't cause problems from most people. + +./examples/festival_client.pl +# Copyright (C) 1997 +# Kevin A. Lenzo (lenzo@cs.cmu.edu) 7/97 + See condition in file + +./src/modules/clunits/* +./lib/*clunits* + Joint copyright University of Edinburgh and Carnegie Mellon University + Conditions remain as free software like the rest of distribution + +./src/modules/clustergen/* + Copyright Carnegie Mellon University + Nagoya Insitute of Technology (derived code from HTS) + HTS_vocoder_me.c HTS_vocoder_me.h + contains additions from Aby Louw + Copyright (c) 2012 The Department of Arts and Culture, + The Government of the Republic of South Africa. + under a free software licence compatible with the other + free software copyrights in this work + +./src/modules/hts_engine/* +./lib/hts.scm + The HMM-based speech synthesis system (HTS) + hts_engine API version 1.07 (http://hts-engine.sourceforge.net/) + Copyright (C) 2001-2012 Nagoya Institute of Technology + 2001-2008 Tokyo Institute of Technology + All rights reserved. + distributed under the Modified BSD licence. + +./lib/festival.el +;;; Copyright (C) Alan W Black 1996 +copyright under FSF General Public Licence + +Please also read the COPYING section of speech_tools/README for the +conditions on those files. + diff --git a/app-accessibility/festival/patches/festival-2.4.patchset b/app-accessibility/festival/patches/festival-2.4.patchset new file mode 100644 index 000000000..9dd69ea32 --- /dev/null +++ b/app-accessibility/festival/patches/festival-2.4.patchset @@ -0,0 +1,1148 @@ +From 3c12f4ea6c71f2775b73aa83edce01563b788fa6 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:20:33 -0800 +Subject: Fix include of base_class files + + +diff --git a/src/modules/MultiSyn/inst_tmpl/hash_itemp_tcdatap_t.cc b/src/modules/MultiSyn/inst_tmpl/hash_itemp_tcdatap_t.cc +index 1c4d1e5..54d3b77 100644 +--- a/src/modules/MultiSyn/inst_tmpl/hash_itemp_tcdatap_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/hash_itemp_tcdatap_t.cc +@@ -50,7 +50,7 @@ template <> TCData* EST_THash< EST_Item*, TCData* >::Dummy_Value=0; + + #if defined(INSTANTIATE_TEMPLATES) + +-#include "../base_class/EST_THash.cc" ++#include "base_class/EST_THash.cc" + + Instantiate_THash_T(EST_Item*, TCData*, TCDataP) + +diff --git a/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc b/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc +index b2a443a..036806e 100644 +--- a/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc +@@ -51,7 +51,7 @@ template <> ItemList* EST_THash< EST_String, ItemList* >::Dummy_Value=0; + + #if defined(INSTANTIATE_TEMPLATES) + +-#include "../base_class/EST_THash.cc" ++#include "base_class/EST_THash.cc" + + Instantiate_TStringHash_T(ItemList *, ItemListP) + +diff --git a/src/modules/MultiSyn/inst_tmpl/list_itemp_t.cc b/src/modules/MultiSyn/inst_tmpl/list_itemp_t.cc +index 45f6f18..78c513d 100644 +--- a/src/modules/MultiSyn/inst_tmpl/list_itemp_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/list_itemp_t.cc +@@ -51,8 +51,8 @@ Declare_TList_T(EST_Item *, EST_ItemP) + + #if defined(INSTANTIATE_TEMPLATES) + +-#include "../base_class/EST_TList.cc" +-#include "../base_class/EST_TSortable.cc" ++#include "base_class/EST_TList.cc" ++#include "base_class/EST_TSortable.cc" + + Instantiate_TList_T(EST_Item *, EST_ItemP) + +diff --git a/src/modules/MultiSyn/inst_tmpl/list_scorepair_t.cc b/src/modules/MultiSyn/inst_tmpl/list_scorepair_t.cc +index b03fe22..1207bd4 100644 +--- a/src/modules/MultiSyn/inst_tmpl/list_scorepair_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/list_scorepair_t.cc +@@ -45,8 +45,8 @@ Declare_TList(ScorePair) + Declare_TSortable(ScorePair) + + #if defined(INSTANTIATE_TEMPLATES) +-#include "../base_class/EST_TList.cc" +-#include "../base_class/EST_TSortable.cc" ++#include "base_class/EST_TList.cc" ++#include "base_class/EST_TSortable.cc" + Instantiate_TList(ScorePair); + Instantiate_TSortable(ScorePair); + #endif +diff --git a/src/modules/MultiSyn/inst_tmpl/list_strlist_t.cc b/src/modules/MultiSyn/inst_tmpl/list_strlist_t.cc +index 5ccf452..0760b64 100644 +--- a/src/modules/MultiSyn/inst_tmpl/list_strlist_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/list_strlist_t.cc +@@ -46,6 +46,6 @@ + Declare_TList_T(EST_TList,STR_LIST) + + #if defined(INSTANTIATE_TEMPLATES) +-#include "../base_class/EST_TList.cc" ++#include "base_class/EST_TList.cc" + Instantiate_TList_T(EST_StrList,STR_LIST); + #endif +diff --git a/src/modules/MultiSyn/inst_tmpl/list_uttp_t.cc b/src/modules/MultiSyn/inst_tmpl/list_uttp_t.cc +index f0fbb8a..d1c0409 100644 +--- a/src/modules/MultiSyn/inst_tmpl/list_uttp_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/list_uttp_t.cc +@@ -51,8 +51,8 @@ Declare_TList_T(EST_Utterance *, EST_UtteranceP) + + #if defined(INSTANTIATE_TEMPLATES) + +-#include "../base_class/EST_TList.cc" +-#include "../base_class/EST_TSortable.cc" ++#include "base_class/EST_TList.cc" ++#include "base_class/EST_TSortable.cc" + + Instantiate_TList_T_MIN(EST_Utterance *, EST_UtteranceP) + +diff --git a/src/modules/MultiSyn/inst_tmpl/list_voicemodulep_t.cc b/src/modules/MultiSyn/inst_tmpl/list_voicemodulep_t.cc +index 6258004..4eca26b 100644 +--- a/src/modules/MultiSyn/inst_tmpl/list_voicemodulep_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/list_voicemodulep_t.cc +@@ -50,8 +50,8 @@ Declare_TList_T(DiphoneVoiceModule *, DiphoneVoiceModuleP) + + #if defined(INSTANTIATE_TEMPLATES) + +-#include "../base_class/EST_TList.cc" +-#include "../base_class/EST_TSortable.cc" ++#include "base_class/EST_TList.cc" ++#include "base_class/EST_TSortable.cc" + + Instantiate_TList_T_MIN(DiphoneVoiceModule *, DiphoneVoiceModuleP) + +diff --git a/src/modules/MultiSyn/inst_tmpl/vector_jccp_t.cc b/src/modules/MultiSyn/inst_tmpl/vector_jccp_t.cc +index b243b5b..0915ebc 100644 +--- a/src/modules/MultiSyn/inst_tmpl/vector_jccp_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/vector_jccp_t.cc +@@ -50,8 +50,8 @@ Declare_TSimpleVector_T(EST_JoinCostCache*,EST_JoinCostCacheP) + + #if defined(INSTANTIATE_TEMPLATES) + +-#include "../base_class/EST_TSimpleVector.cc" +-#include "../base_class/EST_TVector.cc" ++#include "base_class/EST_TSimpleVector.cc" ++#include "base_class/EST_TVector.cc" + + Instantiate_TVector_T_MIN(EST_JoinCostCache*,EST_JoinCostCacheP) + Instantiate_TSimpleVector(EST_JoinCostCache*) +-- +1.8.3.4 + + +From 2edebb55a8e24107e7cdbac69ed8b1212ea6f4be Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:22:17 -0800 +Subject: Adjust server access list for 127.0.0.1 + +Taken from Debian: 03-security-access_list.diff + +Signed-off-by: Timothy Gu + +diff --git a/lib/festival.scm b/lib/festival.scm +index 77b2292..928016d 100644 +--- a/lib/festival.scm ++++ b/lib/festival.scm +@@ -433,7 +433,7 @@ a newline before they can get a connection. It would be normal + to set this for the particular server task. + [see Server/client API]") + +-(defvar server_access_list '(localhost) ++(defvar server_access_list '("127.0.0.1" "localhost\.localdomain" "localhost") + "server_access_list + If non-nil this is the exhaustive list of machines and domains + from which clients may access the server. This is a list of REGEXs +-- +1.8.3.4 + + +From f91d1bbb19479c4f9c4488f245072a4840cbb72a Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:24:06 -0800 +Subject: Add ALAW support + +Backported from Debian: 04-codec-add-alaw.diff + +Signed-off-by: Timothy Gu + +diff --git a/examples/text2wave.sh b/examples/text2wave.sh +index 7f91200..ed0b1da 100755 +--- a/examples/text2wave.sh ++++ b/examples/text2wave.sh +@@ -50,7 +50,7 @@ + Options + -mode Explicit tts mode. + -o ofile File to save waveform (default is stdout). +- -otype Output waveform type: ulaw, snd, aiff, riff, nist etc. ++ -otype Output waveform type: alaw, ulaw, snd, aiff, riff, nist etc. + (default is riff) + -F Output frequency. + -scale Volume factor +diff --git a/src/modules/diphone/di_io.cc b/src/modules/diphone/di_io.cc +index 8b53ccd..5559a1f 100644 +--- a/src/modules/diphone/di_io.cc ++++ b/src/modules/diphone/di_io.cc +@@ -415,6 +415,16 @@ static void load_signal_file(DIPHONE_DATABASE *db, int i, int mode) + ulaw_to_short(ulaw,db->vox[i]->signal,db->vox[i]->nsamples); + wfree(ulaw); + } ++ else if (db->group_encoding == di_alaw) ++ { ++ unsigned char *alaw = ++ walloc(unsigned char,db->vox[i]->nsamples); ++ db->vox[i]->signal = walloc(short,db->vox[i]->nsamples); ++ fseek(db->gfd,db->gsignalbase+(db->offsets[i]),SEEK_SET); ++ fread(alaw,sizeof(unsigned char),db->vox[i]->nsamples,db->gfd); ++ alaw_to_short(alaw,db->vox[i]->signal,db->vox[i]->nsamples); ++ wfree(alaw); ++ } + else + { + cerr << "Diphone: unknown group type" << endl; +@@ -800,8 +810,13 @@ static void di_group_load_signal(DIPHONE_DATABASE *db) + } + else if (db->group_encoding == di_ulaw) + { +- db->allulawsignal = walloc(unsigned char,totsamples); +- fread(db->allulawsignal,sizeof(unsigned char),totsamples,db->gfd); ++ db->allualawsignal = walloc(unsigned char,totsamples); ++ fread(db->allualawsignal,sizeof(unsigned char),totsamples,db->gfd); ++ } ++ else if (db->group_encoding == di_alaw) ++ { ++ db->allualawsignal = walloc(unsigned char,totsamples); ++ fread(db->allualawsignal,sizeof(unsigned char),totsamples,db->gfd); + } + } + else +@@ -821,7 +836,13 @@ static void di_group_load_signal(DIPHONE_DATABASE *db) + else if (db->group_encoding == di_ulaw) + { + db->vox[i]->signal = walloc(short,samp_counts[i]); +- ulaw_to_short(&db->allulawsignal[sample_offset], ++ ulaw_to_short(&db->allualawsignal[sample_offset], ++ db->vox[i]->signal,samp_counts[i]); ++ } ++ else if (db->group_encoding == di_alaw) ++ { ++ db->vox[i]->signal = walloc(short,samp_counts[i]); ++ alaw_to_short(&db->allualawsignal[sample_offset], + db->vox[i]->signal,samp_counts[i]); + } + else +@@ -838,7 +859,7 @@ static void di_group_load_signal(DIPHONE_DATABASE *db) + sample_offset += samp_counts[i]; + } + if (db->sig_access_type != di_direct) +- if (db->group_encoding == di_ulaw) ++ if (db->group_encoding == di_ulaw || db->group_encoding == di_alaw) + fseek(db->gfd,(long)sample_offset,SEEK_CUR); + else + fseek(db->gfd,(long)sample_offset*sizeof(short),SEEK_CUR); +@@ -867,7 +888,7 @@ static void di_group_load_lpc_params(DIPHONE_DATABASE *db) + if (db->swap) + swap_bytes_float(db->allframes,totframes*db->lpc_order); + } +- else if (db->group_encoding == di_ulaw) // its as shorts ++ else if (db->group_encoding == di_ulaw || db->group_encoding == di_alaw) // its as shorts + { + db->allframesshort = walloc(short,totframes*db->lpc_order); + fread(db->allframesshort,sizeof(short), +@@ -885,7 +906,7 @@ static void di_group_load_lpc_params(DIPHONE_DATABASE *db) + for (j=0;jlpc[i]->nframes;j++) + db->lpc[i]->f[j] = + &db->allframes[(frame_offset+j)*db->lpc_order]; +- else if (db->group_encoding == di_ulaw) ++ else if (db->group_encoding == di_ulaw || db->group_encoding == di_alaw) + { + int fixedpoint = FALSE; + if (siod_get_lval("lpc_fixedpoint",NULL) != NIL) +@@ -1031,6 +1052,13 @@ void di_save_grouped_db(const EST_Pathname &filename, DIPHONE_DATABASE *db) + fwrite(ulaw,sizeof(unsigned char),db->vox[i]->nsamples,fd); + wfree(ulaw); + } ++ else if (db->group_encoding == di_alaw) ++ { ++ unsigned char *alaw = walloc(unsigned char,db->vox[i]->nsamples); ++ short_to_alaw(db->vox[i]->signal,alaw,db->vox[i]->nsamples); ++ fwrite(alaw,sizeof(unsigned char),db->vox[i]->nsamples,fd); ++ wfree(alaw); ++ } + else + { + cerr << "Diphone: unknown group type for dumping" << endl; +@@ -1058,7 +1086,7 @@ void di_save_grouped_db(const EST_Pathname &filename, DIPHONE_DATABASE *db) + for (j=0; jlpc[i]->nframes; j++) + fwrite(db->lpc[i]->f[j],sizeof(float),db->lpc_order,fd); + } +- else if (db->group_encoding == di_ulaw) // saved as shorts ++ else if (db->group_encoding == di_ulaw || db->group_encoding == di_alaw) // saved as shorts + { + short *sh = new short[db->lpc_order]; + +diff --git a/src/modules/diphone/diphone.cc b/src/modules/diphone/diphone.cc +index f6b6768..0a3ea33 100644 +--- a/src/modules/diphone/diphone.cc ++++ b/src/modules/diphone/diphone.cc +@@ -180,6 +180,8 @@ void di_fixed_parameters(DIPHONE_DATABASE *db,LISP params) + db->group_encoding = di_raw; + else if (streq(db->group_encoding_str,"ulaw")) + db->group_encoding = di_ulaw; ++ else if (streq(db->group_encoding_str,"alaw")) ++ db->group_encoding = di_alaw; + else + { + cerr << "Diphone: unknown group encoding" << endl; +@@ -218,7 +220,7 @@ static void delete_diphone_db(DIPHONE_DATABASE *db) + { + wfree(db->indx[0]->diph); // ptr to the whole diphname table + wfree(db->allsignal); +- wfree(db->allulawsignal); ++ wfree(db->allualawsignal); + wfree(db->allframes); + } + for (i=0; i < db->nindex; i++) +@@ -275,7 +277,7 @@ DIPHONE_DATABASE *make_diphone_db(void) + db->alternates_before = NIL; + db->alternates_after = NIL; + db->allsignal = 0; +- db->allulawsignal = 0; ++ db->allualawsignal = 0; + db->offsets = 0; + db->gfd = 0; + db->default_diphone = 0; +diff --git a/src/modules/diphone/diphone.h b/src/modules/diphone/diphone.h +index 737c9a9..723abdc 100644 +--- a/src/modules/diphone/diphone.h ++++ b/src/modules/diphone/diphone.h +@@ -41,7 +41,7 @@ + + enum di_sigaccess_t {di_direct, di_dynamic, di_ondemand}; + enum di_db_type_t {di_pcm, di_lpc}; +-enum di_group_encode_t {di_raw, di_ulaw }; ++enum di_group_encode_t {di_raw, di_ulaw, di_alaw }; + enum di_group_t {di_grouped, di_ungrouped}; + + typedef struct { +@@ -109,7 +109,7 @@ typedef struct DD_STRUCT { + int lpc_pitch_synch; /* True if lpc frames are pitch synchronous */ + + short *allsignal; /* used in group files */ +- unsigned char *allulawsignal; ++ unsigned char *allualawsignal; + float *allframes; + short *allframesshort; + +diff --git a/src/modules/donovan/t2s.h b/src/modules/donovan/t2s.h +index d870e87..19c5767 100644 +--- a/src/modules/donovan/t2s.h ++++ b/src/modules/donovan/t2s.h +@@ -261,10 +261,6 @@ void tags(CONFIG *config, BUFFER *buffer, LING_LIST *ling_list); + /* transcribe.c */ + void transcribe(CONFIG *config, LING_LIST *ling_list); + +-/* ulaw.c */ +-unsigned char linear2ulaw(int sample); +-int ulaw2linear(unsigned char ulawbyte); +- + /* utils.c */ + char **split(char *in); + void tidy_split(char **root); +-- +1.8.3.4 + + +From 166b48d3baf174d83a2b61f069b85aba2f453f4d Mon Sep 17 00:00:00 2001 +From: Sergio Oller +Date: Fri, 26 Dec 2014 23:25:07 -0800 +Subject: Save waves in parts + +Taken from Debian: 05-performance-combine-waves.diff + +Signed-off-by: Timothy Gu + +diff --git a/examples/text2wave.sh b/examples/text2wave.sh +index ed0b1da..d6af881 100755 +--- a/examples/text2wave.sh ++++ b/examples/text2wave.sh +@@ -63,6 +63,8 @@ + (gc-status nil) + + ;;; Default argument values ++(defvar fp nil) ++(defvar totalnumsamples 0) + (defvar outfile "-") + (defvar output_type 'riff) + (defvar frequency nil) ;; default is no frequency modification +@@ -70,6 +72,7 @@ + (defvar mode nil) + (defvar volume "1.0") + (defvar wavefiles nil) ++(defvar an_utt nil) + + ;;; Get options + (define (get_options) +@@ -127,39 +130,40 @@ + (format stderr "%s: %s\n" "text2wave" message) + (text2wave_help)) + +-(define (save_record_wave utt) ++ ++(define (save_record_wave_fp utt) + "Saves the waveform and records its so it can be joined into a + a single waveform at the end." +- (let ((fn (make_tmp_filename))) +- (utt.save.wave utt fn) +- (set! wavefiles (cons fn wavefiles)) +- utt)) +- +-(define (combine_waves) +- "Join all the waves together into the desired output file +-and delete the intermediate ones." +- (let ((wholeutt (utt.synth (Utterance Text "")))) +- (mapcar +- (lambda (d) +- (utt.import.wave wholeutt d t) +- (delete-file d)) +- (reverse wavefiles)) +- (if frequency +- (utt.wave.resample wholeutt (parse-number frequency))) +- (if (not (equal? volume "1.0")) +- (begin +- (utt.wave.rescale wholeutt (parse-number volume)))) +- (utt.save.wave wholeutt outfile output_type) +- )) ++ (if (eq? totalnumsamples 0) ++ (wave.save.header fp (utt.wave utt) output_type nil ++ (list (list "numsamples" 0))) ++ ) ++ (set! totalnumsamples (+ totalnumsamples ++ (get_param 'num_samples (wave.info (utt.wave utt)) 0) ++ ) ++ ) ++ (if frequency ++ (utt.wave.resample utt (parse-number frequency)) ++ ) ++ (if (not (equal? volume "1.0")) ++ (begin ++ (utt.wave.rescale utt (parse-number volume)) ++ ) ++ ) ++ (wave.save.data.fp (utt.wave utt) fp output_type nil) ++ (set! an_utt utt) ++) + + ;;; + ;;; Redefine what happens to utterances during text to speech + ;;; +-(set! tts_hooks (list utt.synth save_record_wave)) ++(set! tts_hooks (list utt.synth save_record_wave_fp)) + + (define (main) + (get_options) + ++ (set! fp (fopen outfile "wb")) ++ + ;; do the synthesis + (mapcar + (lambda (f) +@@ -168,8 +172,12 @@ and delete the intermediate ones." + (tts_file f (tts_find_text_mode f auto-text-mode-alist)))) + text_files) + +- ;; Now put the waveforms together at again +- (combine_waves) ++ ;; Now update the header ++ (fseek fp 0 0) ++ (wave.save.header fp (utt.wave an_utt) output_type nil ++ (list (list "numsamples" totalnumsamples)) ++ ) ++ (fclose fp) + ) + + ;;; Do the work +diff --git a/src/arch/festival/wave.cc b/src/arch/festival/wave.cc +index a44c5e7..aa46d1c 100644 +--- a/src/arch/festival/wave.cc ++++ b/src/arch/festival/wave.cc +@@ -42,6 +42,7 @@ + #include + #include "festival.h" + #include "festivalP.h" ++#include "EST_Wave.h" + + #ifdef WIN32 + #include "winsock2.h" +@@ -101,6 +102,141 @@ static LISP wave_save(LISP lwave,LISP fname,LISP ftype,LISP stype) + return truth; + } + ++static LISP wave_save_data_fp(LISP lwave, LISP lfp, LISP ftype, LISP stype) ++{ ++ EST_Wave *w = wave(lwave); ++ EST_String filetype,sampletype; ++ FILE * fp; ++ ++ fp = get_c_file(lfp, stdout); ++ ++ if (ftype == NIL) ++ { ++ if (ft_get_param("Wavefiletype")) ++ filetype = get_c_string(ft_get_param("Wavefiletype")); ++ else ++ filetype = "nist"; ++ } ++ else ++ filetype = get_c_string(ftype); ++ if (stype == NIL) ++ { ++ if (ft_get_param("Wavesampletype")) ++ sampletype = get_c_string(ft_get_param("Wavesampletype")); ++ else ++ sampletype = "short"; ++ } ++ else ++ sampletype = get_c_string(stype); ++ ++ if (w->save_file_data(fp,filetype,sampletype,EST_NATIVE_BO) != write_ok) ++ { ++ cerr << "utt.save.wave.fp: failed to write wave" << endl; ++ festival_error(); ++ } ++ ++ return truth; ++} ++ ++ ++ ++static LISP wave_save_fp(LISP lwave, LISP lfp, LISP ftype, LISP stype) ++{ ++ EST_Wave *w = wave(lwave); ++ EST_String filetype,sampletype; ++ FILE * fp; ++ ++ fp = get_c_file(lfp, stdout); ++ ++ if (ftype == NIL) ++ { ++ if (ft_get_param("Wavefiletype")) ++ filetype = get_c_string(ft_get_param("Wavefiletype")); ++ else ++ filetype = "nist"; ++ } ++ else ++ filetype = get_c_string(ftype); ++ if (stype == NIL) ++ { ++ if (ft_get_param("Wavesampletype")) ++ sampletype = get_c_string(ft_get_param("Wavesampletype")); ++ else ++ sampletype = "short"; ++ } ++ else ++ sampletype = get_c_string(stype); ++ ++ if (w->save_file(fp,filetype,sampletype,EST_NATIVE_BO) != write_ok) ++ { ++ cerr << "utt.save.wave.data.fp: failed to write wave" << endl; ++ festival_error(); ++ } ++ ++ return truth; ++} ++ ++ ++ ++static LISP wave_save_header_fp(LISP arglist) ++{ ++ LISP lfp = car(arglist); ++ arglist = cdr(arglist); ++ LISP lwave = car(arglist); ++ arglist = cdr(arglist); ++ LISP lftype = car(arglist); ++ arglist = cdr(arglist); ++ LISP lstype = car(arglist); ++ arglist = cdr(arglist); ++ LISP force_values = car(arglist); ++ arglist = cdr(arglist); ++ ++ FILE *fp; ++ fp = get_c_file(lfp, NULL); ++ EST_String ftype, stype; ++ EST_Wave *w = wave(lwave); ++ ++ int num_samples = w->num_samples(); ++ int num_channels = w->num_channels(); ++ int sample_rate = w->sample_rate(); ++ int bo = EST_NATIVE_BO; ++ ++ num_samples = (int) get_param_float("numsamples", force_values, (float) num_samples); ++ num_channels = (int) get_param_float("numchannels", force_values, (float) num_channels); ++ sample_rate = (int) get_param_float("samplerate", force_values, (float) sample_rate); ++ bo = (int) get_param_float("bo", force_values, (float) bo); ++ ++ if (lftype == NIL) ++ { ++ if (ft_get_param("Wavefiletype")) ++ ftype = get_c_string(ft_get_param("Wavefiletype")); ++ else ++ ftype = "nist"; ++ } ++ else ++ ftype = get_c_string(lftype); ++ ++ if (lstype == NIL) ++ { ++ if (ft_get_param("Wavesampletype")) ++ stype = get_c_string(ft_get_param("Wavesampletype")); ++ else ++ stype = "short"; ++ } ++ else ++ stype = get_c_string(lstype); ++ ++ ++ if (wave_io_save_header(fp, num_samples, num_channels, ++ sample_rate, stype, bo, ftype) != write_ok) ++ { ++ cerr << "utt.save.wave.header: failed" << endl; ++ festival_error(); ++ } ++ ++ return truth; ++} ++ + static LISP wave_load(LISP fname,LISP ftype,LISP stype,LISP srate) + { + EST_Wave *w = new EST_Wave; +@@ -594,7 +730,31 @@ static LISP send_sexpr_to_client(LISP l) + void festival_wave_init(void) + { + // declare utterance (wave) specific Lisp functions +- ++ init_lsubr("wave.save.header", wave_save_header_fp, ++ "(wave.save.header FILEPOINTER WAVE FILETYPE SAMPLETYPE OVERRIDEPARAMS)\n\ ++ Write a wave header of format FILETYPE to FILEPOINTER.\n\ ++ Header parameters are read first from WAVE and SAMPLETYPE,\n\ ++ and can be overridden with OVERRIDEPARAMS\n\ ++ OVERRIDEPARAMS = ( (\"numsamples\" 84000)\n\ ++ (\"numchannels\" 1)\n\ ++ (\"samplerate\" 16000)\n\ ++ (\"bo\" 10)\n\ ++ (\"numsamples\" 16000)\n\ ++ )"); ++ init_subr_4("wave.save.fp", wave_save_fp, ++ "(wave.save.fp WAVE FILEPOINTER FILETYPE SAMPLETYPE)\n\ ++ Write WAVE to FILEPOINTER, respecting FILETYPE and SAMPLETYPE if specified\n\ ++ if these last two arguments are unspecified the global parameters\n\ ++ Wavefiletype and Wavesampletype are used. Returns t is successful\n\ ++ and throws an error if not."); ++ init_subr_4("wave.save.data.fp", wave_save_data_fp, ++ "(wave.save.data.fp WAVE FILEPOINTER FILETYPE SAMPLETYPE)\n\ ++ Write WAVE to FILEPOINTER, respecting FILETYPE and SAMPLETYPE if specified\n\ ++ ignoring any file header.\n\ ++ if these last two arguments are unspecified the global parameters\n\ ++ Wavefiletype and Wavesampletype are used. Returns t is successful\n\ ++ and throws an error if not. It can be used with wave.save.header\n\ ++ in order to concatenate several waves."); + init_subr_4("wave.save",wave_save, + "(wave.save WAVE FILENAME FILETYPE SAMPLETYPE)\n\ + Save WAVE in FILENAME, respecting FILETYPE and SAMPLETYPE if specifed\n\ +-- +1.8.3.4 + + +From 3a9c107c997e6301f96cfc9e7060ced0583ded40 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:28:01 -0800 +Subject: Fix memory allocation + +Author: Peter Drysdale + +Backported from Debian: 10-fix-memory-allocations.diff + +Signed-off-by: Timothy Gu + +diff --git a/src/modules/hts_engine/HTS_pstream.c b/src/modules/hts_engine/HTS_pstream.c +index e8cc184..8a3e3b2 100644 +--- a/src/modules/hts_engine/HTS_pstream.c ++++ b/src/modules/hts_engine/HTS_pstream.c +@@ -324,7 +324,7 @@ HTS_Boolean HTS_PStreamSet_create(HTS_PStreamSet * pss, HTS_SStreamSet * sss, do + /* copy dynamic window */ + pst->win_l_width = (int *) HTS_calloc(pst->win_size, sizeof(int)); + pst->win_r_width = (int *) HTS_calloc(pst->win_size, sizeof(int)); +- pst->win_coefficient = (double **) HTS_calloc(pst->win_size, sizeof(double)); ++ pst->win_coefficient = (double **) HTS_calloc(pst->win_size, sizeof(double *)); + for (j = 0; j < pst->win_size; j++) { + pst->win_l_width[j] = HTS_SStreamSet_get_window_left_width(sss, i, j); + pst->win_r_width[j] = HTS_SStreamSet_get_window_right_width(sss, i, j); +diff --git a/src/modules/hts_engine/HTS_sstream.c b/src/modules/hts_engine/HTS_sstream.c +index 95b18ac..6d1f35e 100644 +--- a/src/modules/hts_engine/HTS_sstream.c ++++ b/src/modules/hts_engine/HTS_sstream.c +@@ -293,7 +293,7 @@ HTS_Boolean HTS_SStreamSet_create(HTS_SStreamSet * sss, HTS_ModelSet * ms, HTS_L + sst->win_max_width = HTS_ModelSet_get_window_max_width(ms, i); + sst->win_l_width = (int *) HTS_calloc(sst->win_size, sizeof(int)); + sst->win_r_width = (int *) HTS_calloc(sst->win_size, sizeof(int)); +- sst->win_coefficient = (double **) HTS_calloc(sst->win_size, sizeof(double)); ++ sst->win_coefficient = (double **) HTS_calloc(sst->win_size, sizeof(double *)); + for (j = 0; j < sst->win_size; j++) { + sst->win_l_width[j] = HTS_ModelSet_get_window_left_width(ms, i, j); + sst->win_r_width[j] = HTS_ModelSet_get_window_right_width(ms, i, j); +-- +1.8.3.4 + + +From b9a00a59bd1696379d77a93816ea4a9e0a59a4ab Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:29:34 -0800 +Subject: Replace multiple debug write calls by one + +Backported from Debian: 13-performance-single-cdebug-output.diff + +Signed-off-by: Timothy Gu + +diff --git a/src/modules/UniSyn_diphone/UniSyn_diphone.cc b/src/modules/UniSyn_diphone/UniSyn_diphone.cc +index eaf05ca..8689469 100644 +--- a/src/modules/UniSyn_diphone/UniSyn_diphone.cc ++++ b/src/modules/UniSyn_diphone/UniSyn_diphone.cc +@@ -123,10 +123,10 @@ LISP us_diphone_init(LISP args) + } + else + { +- *cdebug << ":" << get_param_str("grouped",args,"") << ":" << endl; +- *cdebug << "index grouped:" << d_index->grouped << endl; +- *cdebug << "true:" << true << endl; +- *cdebug << "false:" << false << endl; ++ *cdebug << ":" << get_param_str("grouped",args,"") << ":" << endl ++ << "index grouped:" << d_index->grouped << endl ++ << "true:" << true << endl ++ << "false:" << false << endl; + + d_index->coef_dir = get_param_str("coef_dir",args,""); + d_index->sig_dir = get_param_str("sig_dir",args,""); +-- +1.8.3.4 + + +From 9d99721191fac1ae64165b602af13c945c8e6771 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:12:45 -0800 +Subject: Add missing include + + +diff --git a/src/modules/clustergen/mlsa_resynthesis.cc b/src/modules/clustergen/mlsa_resynthesis.cc +index 5fc1baa..e4fba21 100644 +--- a/src/modules/clustergen/mlsa_resynthesis.cc ++++ b/src/modules/clustergen/mlsa_resynthesis.cc +@@ -41,6 +41,7 @@ + Written for HTS Engine API 1.07 (Jan 2013) + */ + ++#include + #include + + #include +-- +1.8.3.4 + + +From 521a9a67840df161b3bc90b82cc9ce802510c13e Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:20:09 -0800 +Subject: Fix use of fgetpos() + + +diff --git a/src/modules/hts_engine/HTS_misc.c b/src/modules/hts_engine/HTS_misc.c +index 97eeee7..7af3c25 100644 +--- a/src/modules/hts_engine/HTS_misc.c ++++ b/src/modules/hts_engine/HTS_misc.c +@@ -245,7 +245,7 @@ size_t HTS_ftell(HTS_File * fp) + } else if (fp->type == HTS_FILE) { + fpos_t pos; + fgetpos((FILE *) fp->pointer, &pos); +-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__HAIKU__) + return (size_t) pos; + #else + return (size_t) pos.__pos; +-- +1.8.3.4 + + +From 46f3fe1d2273b13f5a327a7d7d03ef8359488ab0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:09:50 -0800 +Subject: Add config/config + +Inspired by Debian patch 01-config_config.diff. + +Signed-off-by: Timothy Gu + +diff --git a/config/config b/config/config +new file mode 100644 +index 0000000..383b149 +--- /dev/null ++++ b/config/config +@@ -0,0 +1,74 @@ ++########################################################-*-mode:Makefile-*- ++## ## ++## Festival: local configuration file ## ++## ## ++########################################################################### ++## ++## Specific config file for local installation ++## ++ ++########################################################################### ++## Which speech tools to use ++ ++EST=$(portPackageLinksDir)/speech_tools$(secondaryArchSuffix)_devel/$(relativeDevelopLibDir)/speech_tools$(secondaryArchSuffix) ++ ++########################################################################### ++## Where the festival tree will be installed. ++## ++## The default is that festival will remain where it is compiled. ++## ++## You may need to set this explicitly if automounter or NFS ++## side effects cause problems ++ ++FESTIVAL_HOME := $(shell (cd $(TOP); pwd)) ++ ++########################################################################### ++## Feature selection. ++## ++## Select modules to include. ++ ++## Non Free PSOLA synthesis. This isn't distributed with festival because ++## of a patent, if you have src/modules/diphone/di_psolaTM.cc you can ++## include this feature. ++# INCLUDE_PSOLA_TM=1 ++ ++## Support for TCL. So that festival may eval TCL commands and TCL may eval ++## festival commands. This was added to support the CSLU toolkit but ++## others may want it too. ++# INCLUDE_TCL=1 ++ ++########################################################################### ++## Take most settings from speech tools. ++ ++include $(EST)/config/system.mak ++include $(EST)/config/config ++ ++########################################################################### ++## Add any extra modules you wish to include ++ ++## These sub modules are *optional* and unless you know what they are ++## you probabaly don't want them or need them. They are typically ++## new code that isn't yet stable yet and being used for research or ++## old code left in for compatibility for some users ++ ++## Experimental UniSyn, metrical tree, phonological structure matching ++## code ++# ALSO_INCLUDE += UniSyn_phonology UniSyn_selection ++## Cluster unit selection code as described in "Building Voices in ++## Festival", again experimental and suitable for research purposes only. ++ALSO_INCLUDE += clunits clustergen hts_engine MultiSyn ++ ++## Old diphone code that will be delete, left in only for some ++## compatibility ++# ALSO_INCLUDE += diphone ++ ++## Other (non-Edinburgh) modules may also be specified here (e.g. OGI code), ++ ++ALSO_INCLUDE += ++ ++########################################################################### ++## ++## Describe your local system below by redefining things defined ++## in config/configs/default.mak. ++ ++ +-- +1.8.3.4 + + +From de3485cabba208df2ad622e7a6bafa07e291c140 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:10:57 -0800 +Subject: config/make_system: Copy system.mak from speech_tools + + +diff --git a/config/make_system.mak b/config/make_system.mak +index 5acf40a..5f81464 100644 +--- a/config/make_system.mak ++++ b/config/make_system.mak +@@ -39,6 +39,5 @@ + ########################################################################### + + system.mak : config +- @echo Check system type >&2 +- @/bin/sh $(TOP)/config/system.sh $(TOP)/config/systems > system.mak ++ cp $(EST)/config/system.mak system.mak + +-- +1.8.3.4 + + +From b329b31eaa2c9532b0b8b08e732a94e3dbe3b5a2 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sat, 27 Dec 2014 11:58:23 -0800 +Subject: Include config in make_system + +Signed-off-by: Timothy Gu + +diff --git a/config/make_system.mak b/config/make_system.mak +index 5f81464..13dbdc4 100644 +--- a/config/make_system.mak ++++ b/config/make_system.mak +@@ -38,6 +38,7 @@ + ## ## + ########################################################################### + ++include $(TOP)/config/config + system.mak : config + cp $(EST)/config/system.mak system.mak + +-- +1.8.3.4 + + +From f0b692b108d3c676cb8c5c4b38b0a1b7fa5c51f0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sat, 27 Dec 2014 00:03:25 -0800 +Subject: Fix file system layout + +Inspired by Debian patch 20-debian-filesystem-standard.diff + +Signed-off-by: Timothy Gu + +diff --git a/examples/Makefile b/examples/Makefile +index b677cb9..170369f 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -54,8 +54,7 @@ include $(TOP)/config/common_make_rules + + $(ALL) : % : %.sh + rm -f $@ +- @echo "#!/bin/sh" >$@ +- @echo "\"true\" ; exec "$(FESTIVAL_HOME)/bin/festival --script '$$0 $$*' >>$@ ++ @echo "#!$(binDir)/festival --script" >$@ + cat $< >>$@ + chmod +x $@ + +diff --git a/examples/text2wave.sh b/examples/text2wave.sh +index d6af881..cf62ef7 100755 +--- a/examples/text2wave.sh ++++ b/examples/text2wave.sh +@@ -40,7 +40,7 @@ + + ;;; Because this is a --script type file I has to explicitly + ;;; load the initfiles: init.scm and user's .festivalrc +-(load (path-append libdir "init.scm")) ++(load (path-append datadir "init.scm")) + + ;;; Process command line arguments + (define (text2wave_help) +diff --git a/lib/festival.scm b/lib/festival.scm.in +similarity index 99% +rename from lib/festival.scm +rename to lib/festival.scm.in +index 928016d..69d2796 100644 +--- a/lib/festival.scm ++++ b/lib/festival.scm.in +@@ -552,13 +552,13 @@ Doing stuff + (define (intro) + "(intro) + Synthesize an introduction to the Festival Speech Synthesis System." +- (tts (path-append libdir "../examples/intro.text") nil)) ++ (tts (path-append datadir "@DOCDIR@/examples/intro.text") nil)) + + (define (intro-spanish) + "(intro-spanish) + Synthesize an introduction to the Festival Speech Synthesis System + in spanish. Spanish voice must already be selected for this." +- (tts (path-append libdir "../examples/spintro.text") nil)) ++ (tts (path-append datadir "@DOCDIR@/examples/spintro.text") nil)) + + (define (na_play FILENAME) + "(play_wave FILENAME) +diff --git a/lib/init.scm b/lib/init.scm +index 90bccb7..42b9b68 100644 +--- a/lib/init.scm ++++ b/lib/init.scm +@@ -36,7 +36,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + ;;; Basic siod library (need this before load_library or require works) +-(load (path-append libdir "siod.scm")) ++(load (path-append datadir "siod.scm")) + + (defvar home-directory (or (getenv "HOME") "/") + "home-directory +diff --git a/lib/lexicons.scm b/lib/lexicons.scm.in +similarity index 98% +rename from lib/lexicons.scm +rename to lib/lexicons.scm.in +index 574c8fa..66dba14 100644 +--- a/lib/lexicons.scm ++++ b/lib/lexicons.scm.in +@@ -42,10 +42,10 @@ + ;;; you should set lexdir in sitevars.scm + + (defvar lexdir +- (if (probe_file (path-append libdir "dicts")) +- (path-append libdir "dicts/") ++ (if (probe_file (path-append datadir "dicts")) ++ (path-append datadir "dicts/") + ;; else we'll guess we're in the CSTR filespace +- (path-as-directory "/projects/festival/lib/dicts/")) ++ (path-as-directory "@DATADIR@/dicts/")) + "lexdir + The directory where the lexicon(s) are, by default.") + +diff --git a/lib/phrase.scm b/lib/phrase.scm +index bbabba6..e0a82c3 100644 +--- a/lib/phrase.scm ++++ b/lib/phrase.scm +@@ -93,7 +93,7 @@ in Token return punc, otherwise 0." + + (require 'pos) ;; for part of speech map + +-(defvar pbreak_ngram_dir libdir ++(defvar pbreak_ngram_dir datadir + "pbreak_ngram_dir + The directory containing the ngram models for predicting phrase + breaks. By default this is the standard library directory.") +diff --git a/lib/soleml-mode.scm b/lib/soleml-mode.scm +index 9856fb2..27b7279 100644 +--- a/lib/soleml-mode.scm ++++ b/lib/soleml-mode.scm +@@ -330,7 +330,7 @@ Flatten alist arguments." + (list 'exit_func soleml_exit_func) + '(analysis_type xxml) + (list 'filter +- (format nil "%s -D %s " sgml_parse_progname libdir)))) ++ (format nil "%s -D %s " sgml_parse_progname datadir)))) + tts_text_modes)) + + (provide 'soleml-mode) +diff --git a/lib/voices.scm b/lib/voices.scm.in +similarity index 99% +rename from lib/voices.scm +rename to lib/voices.scm.in +index 168d842..df50b15 100644 +--- a/lib/voices.scm ++++ b/lib/voices.scm.in +@@ -42,7 +42,7 @@ + ;; The path to search for voices is created from the load-path with + ;; an extra list of directories appended. + +-(defvar system-voice-path '( ) ++(defvar system-voice-path '("@DATADIR@/voices") + "system-voice-path + Additional directory not near the load path where voices can be + found, this can be redefined in lib/sitevars.scm if desired.") +diff --git a/src/arch/festival/Makefile b/src/arch/festival/Makefile +index fe49726..1b5eafe 100644 +--- a/src/arch/festival/Makefile ++++ b/src/arch/festival/Makefile +@@ -62,6 +62,6 @@ LOCAL_DEFINES += $(FESTIVAL_DEFINES) + LOCAL_INCLUDES += $(FESTIVAL_INCLUDES) + + festival.o: festival.cc +- $(CXX_COMMAND_TEMPLATES) -DFTNAME='$(PROJECT_NAME)' -DFTLIBDIRC='$(FTLIBDIR)' -DFTVERSION='$(PROJECT_VERSION)' -DFTSTATE='$(PROJECT_STATE)' -DFTDATE='$(PROJECT_DATE)' -DFTOSTYPE=\"$(SYSTEM_TYPE)\" festival.cc ++ $(CXX_COMMAND_TEMPLATES) -DFTNAME='$(PROJECT_NAME)' -DFTVERSION='$(PROJECT_VERSION)' -DFTSTATE='$(PROJECT_STATE)' -DFTDATE='$(PROJECT_DATE)' -DFTOSTYPEC='$(SYSTEM_TYPE)' festival.cc + + +diff --git a/src/arch/festival/festival.cc b/src/arch/festival/festival.cc.in +similarity index 97% +rename from src/arch/festival/festival.cc +rename to src/arch/festival/festival.cc.in +index 59abcdd..bea032c 100644 +--- a/src/arch/festival/festival.cc ++++ b/src/arch/festival/festival.cc.in +@@ -60,6 +60,9 @@ void festival_load_default_files(void); + #define STRINGIZE(S) _S_S_S(S) + + const char *festival_version = STRINGIZE(FTVERSION) ":" STRINGIZE(FTSTATE) " " STRINGIZE(FTDATE); ++const char *festival_libdir = "@LIBDIR@"; ++const char *festival_datadir = "@DATADIR@"; ++const char *festival_sysconfdir = "/boot/home/config/settings"; + + // Allow the path to be passed in without quotes because Windoze command line + // is stupid +@@ -79,7 +82,6 @@ const char *festival_version = STRINGIZE(FTVERSION) ":" STRINGIZE(FTSTATE) " " + #define FTOSTYPE "" + #endif + +-const char *festival_libdir = FTLIBDIR; + ostream *cdebug; + static int festival_server_port = 1314; + static EST_StrList sub_copyrights; +@@ -307,7 +309,7 @@ void festival_load_default_files(void) + EST_String userinitfile, home_str, initfile; + + // Load library init first +- initfile = (EST_String)EST_Pathname(festival_libdir).as_directory() + ++ initfile = (EST_String)EST_Pathname(festival_datadir).as_directory() + + "init.scm"; + if (access((const char *)initfile,R_OK) == 0) + vload(initfile,FALSE); +@@ -323,6 +325,8 @@ void festival_lisp_vars(void) + int major,minor,subminor; + + siod_set_lval("libdir",strintern(festival_libdir)); ++ siod_set_lval("datadir",strintern(festival_datadir)); ++ siod_set_lval("sysconfdir",strintern(festival_sysconfdir)); + if (!streq(FTOSTYPE,"")) + siod_set_lval("*ostype*",cintern(FTOSTYPE)); + siod_set_lval("festival_version", +@@ -356,6 +360,7 @@ void festival_lisp_vars(void) + if (mplayer_supported) + proclaim_module("mplayeraudio"); + ++#if 0 /* /usr/lib/festival/etc/machine -- ??? */ + // Add etc-dir path and machine specific directory etc/$OSTYPE + char *etcdir = walloc(char,strlen(festival_libdir)+strlen("etc/")+ + strlen(FTOSTYPE)+3); +@@ -376,6 +381,7 @@ void festival_lisp_vars(void) + + wfree(etcdir); + wfree(etcdircommon); ++#endif + return; + } + +diff --git a/src/include/festival.h b/src/include/festival.h +index e03c432..c11d5b8 100644 +--- a/src/include/festival.h ++++ b/src/include/festival.h +@@ -138,6 +138,7 @@ const EST_String utt_type(EST_Utterance &utt); + void add_item_features(EST_Item *s,LISP features); + + extern const char *festival_libdir; ++extern const char *festival_datadir; + + // Module specific LISP/etc definitions + void festival_init_modules(void); +diff --git a/src/main/festival_main.cc b/src/main/festival_main.cc +index f1af602..d12e984 100644 +--- a/src/main/festival_main.cc ++++ b/src/main/festival_main.cc +@@ -88,6 +88,8 @@ static void festival_main(int argc, char **argv) + "In evaluation mode \"filenames\" starting with ( are evaluated inline\n"+ + "Festival Speech Synthesis System: "+ festival_version +"\n"+ + "-q Load no default setup files\n"+ ++ "--datadir \n"+ ++ " Set data directory pathname\n"+ + "--libdir \n"+ + " Set library directory pathname\n"+ + "-b Run in batch mode (no interaction)\n"+ +@@ -127,6 +129,12 @@ static void festival_main(int argc, char **argv) + festival_libdir = wstrdup(al.val("--libdir")); + else if (getenv("FESTLIBDIR") != 0) + festival_libdir = getenv("FESTLIBDIR"); ++ ++ if (al.present("--datadir")) ++ festival_datadir = wstrdup(al.val("--datadir")); ++ else if (getenv("FESTDATADIR") != 0) ++ festival_datadir = getenv("FESTDATADIR"); ++ + if (al.present("--heap")) + heap_size = al.ival("--heap"); + +-- +1.8.3.4 + From f5e2edd0b5055e27807346efa5c334a8361ac741 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 30 Dec 2014 05:44:57 +0000 Subject: [PATCH 45/75] Add Noto Sans fonts for Tai languages --- .../noto_sans_new_tai_lue-1.03.recipe | 39 +++++++++++++++++++ .../noto_sans_tai_le-1.01.recipe | 39 +++++++++++++++++++ .../noto_sans_tai_tham-1.01.recipe | 39 +++++++++++++++++++ .../noto_sans_tai_viet-1.01.recipe | 39 +++++++++++++++++++ 4 files changed, 156 insertions(+) create mode 100644 media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe create mode 100644 media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe create mode 100644 media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe create mode 100644 media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe diff --git a/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe b/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe new file mode 100644 index 000000000..a25c90500 --- /dev/null +++ b/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe @@ -0,0 +1,39 @@ +LANG_EN="New Tai Lü" +LANG_DL="NewTaiLue" +LANG_LC="new_tai_lue" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-unhinted.zip" +CHECKSUM_SHA256="660995d4cae6e4588a069f8d45ec52a96a624e501638a0c2ebd02683b623bced" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe b/media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe new file mode 100644 index 000000000..02576510e --- /dev/null +++ b/media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe @@ -0,0 +1,39 @@ +LANG_EN="Tai Le" +LANG_DL="TaiLe" +LANG_LC="tai_le" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-unhinted.zip" +CHECKSUM_SHA256="660995d4cae6e4588a069f8d45ec52a96a624e501638a0c2ebd02683b623bced" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe b/media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe new file mode 100644 index 000000000..c571b1c52 --- /dev/null +++ b/media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe @@ -0,0 +1,39 @@ +LANG_EN="Tai Tham" +LANG_DL="TaiTham" +LANG_LC="tai_tham" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-unhinted.zip" +CHECKSUM_SHA256="48baf29fb8dd8b4aad004dea67a91eadc449399317ac32439ccf4e6ab9e00975" +LICENSE="Apache v2" +COPYRIGHT="2013 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe b/media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe new file mode 100644 index 000000000..1134618ae --- /dev/null +++ b/media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe @@ -0,0 +1,39 @@ +LANG_EN="Tai Viet" +LANG_DL="TaiViet" +LANG_LC="tai_viet" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-unhinted.zip" +CHECKSUM_SHA256="573b069d4221f3cf294b3af15094606e22fc9c624c3dbac2b1e4656ca8f3f5c2" +LICENSE="Apache v2" +COPYRIGHT="2013 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} From 73f5993ec3a132100367bef941c1f6c2203e823b Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Mon, 29 Dec 2014 19:56:01 +0100 Subject: [PATCH 46/75] Add recipe for vwget --- haiku-apps/vwget/vwget-20141229.recipe | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 haiku-apps/vwget/vwget-20141229.recipe diff --git a/haiku-apps/vwget/vwget-20141229.recipe b/haiku-apps/vwget/vwget-20141229.recipe new file mode 100644 index 000000000..7c3016bbc --- /dev/null +++ b/haiku-apps/vwget/vwget-20141229.recipe @@ -0,0 +1,40 @@ +SUMMARY="A visual version for GNU's wget." +DESCRIPTION="VWGet is a visual frontend for GNU wget. You can both run it from \ +the command line, passing the same arguments you would pass to wget or launch \ +it as a normal app and select the URL and destination in the GUI." +HOMEPAGE="https://github.com/HaikuArchives/VWGet" +SRC_URI="git+https://github.com/HaikuArchives/VWGet.git#29ff74d068526c01edf7e1c0ef887a8f4fac252f" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="1999 Santiago Lema" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + vwget = $portVersion + app:VWGet = $portVersion + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a objects/VWGet $appsDir + addAppDeskbarSymlink $appsDir/VWGet +} From 8798d65569160bb56757c768e93b297228e69b71 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 28 Dec 2014 05:12:46 +0000 Subject: [PATCH 47/75] Add Lato fonts Initial work based on that of: alvin_ Signed-off-by: Timothy Gu --- .../lato_fonts/lato_fonts-2.010.recipe | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 media-fonts/lato_fonts/lato_fonts-2.010.recipe diff --git a/media-fonts/lato_fonts/lato_fonts-2.010.recipe b/media-fonts/lato_fonts/lato_fonts-2.010.recipe new file mode 100644 index 000000000..d675526ad --- /dev/null +++ b/media-fonts/lato_fonts/lato_fonts-2.010.recipe @@ -0,0 +1,38 @@ +SUMMARY="The Lato font family" +DESCRIPTION="Lato is a sans-serif typeface family designed in the Summer 2010 \ +by Warsaw-based designer Łukasz Dziedzic (“Lato” means “Summer” in Polish). \ +In December 2010 the Lato family was published under the open-source Open Font \ +License by his foundry tyPoland, with support from Google. Lato consists of \ +nine weights (plus corresponding italics), including a beautiful hairline \ +style." +HOMEPAGE="http://www.latofonts.com/lato-free-fonts/" +SRC_URI="http://www.latofonts.com/download/Lato2OFL.zip" +CHECKSUM_SHA256="367c730f64f4d1731e4d3ef7da2dd27635999e4a2f7cab24cfdcaf42488644a4" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2010-2014 Łukasz Dziedzic , with Reserved \ +Font Name Lato" +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + lato_fonts=$portVersion + " +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="Lato2OFL" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p $FONTDIR + + cd *.ttf $FONTDIR +} + From ca41cb21330974a4bb172f7f768c2ecbeada185a Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Sun, 28 Dec 2014 04:09:01 +0000 Subject: [PATCH 48/75] Add a recipe for burp --- app-backup/burp/burp-1.4.28.recipe | 85 +++ app-backup/burp/licenses/GNU AGPL v3 | 662 +++++++++++++++++++ app-backup/burp/patches/burp-1.4.28.patchset | 55 ++ 3 files changed, 802 insertions(+) create mode 100644 app-backup/burp/burp-1.4.28.recipe create mode 100644 app-backup/burp/licenses/GNU AGPL v3 create mode 100644 app-backup/burp/patches/burp-1.4.28.patchset diff --git a/app-backup/burp/burp-1.4.28.recipe b/app-backup/burp/burp-1.4.28.recipe new file mode 100644 index 000000000..34aa753fa --- /dev/null +++ b/app-backup/burp/burp-1.4.28.recipe @@ -0,0 +1,85 @@ +SUMMARY="A tool to make and restore backups over a network" +DESCRIPTION="Burp aims to be a better Bacula and is a network backup and \ +restore software. It relies on librsync for compression of network \ +communication and of the backups itself. Burp provides both a client and a \ +server and supports Windows's Volume Shadow Copy Services." + +HOMEPAGE="http://burp.grke.org" + +SRC_URI="http://sourceforge.net/projects/burp/files/burp-1.4.28/burp-1.4.28.tar.bz2" +CHECKSUM_SHA256="01c41c07805ebe8c882d7cb9f294e779b6decbe2eb2c81fd65d8fb2b174e18f0" +REVISION="1" +SOURCE_DIR="burp" + +ARCHITECTURES="x86_gcc2 ?x86 ?ppc" + +LICENSE="GNU AGPL v3" +COPYRIGHT=" + 2011-2014 Graham Keeling + 2005-2010 Troy D. Hanson + " + +REQUIRES=" + haiku + lib:libssl + lib:libz + lib:librsync + lib:libncurses + lib:libpopt + " + +BUILD_REQUIRES=" + haiku_devel + devel:libssl + devel:libz + devel:librsync + devel:libncurses + devel:libpopt + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc + cmd:gawk + cmd:sed + " + +PROVIDES=" + burp = $portVersion + cmd:burp_ca + cmd:burp + cmd:bedup + cmd:vss_strip + " + +PATCHES=" + burp-1.4.28.patchset + " + +GLOBAL_WRITABLE_FILES=" + settings/burp/CA.cnf auto-merge + settings/burp/autoupgrade/server/win32/script auto-merge + settings/burp/autoupgrade/server/win64/script auto-merge + settings/burp/burp-server.conf auto-merge + settings/burp/burp.conf auto-merge + settings/burp/clientconfdir/incexc/example auto-merge + settings/burp/clientconfdir/testclient auto-merge + settings/burp/notify_script auto-merge + settings/burp/ssl_extra_checks_script auto-merge + settings/burp/summary_script auto-merge + settings/burp/timer_script auto-merge + " + +BUILD() +{ + runConfigure --omit-dirs sysconfdir\ + ./configure --sysconfdir $settingsDir/burp + make $jobArgs +} + +escapedSharedStateDir=$(echo $sharedStateDir | sed -e 's/\//\\\//g') +INSTALL() +{ + sed -i "s/\$(DESTDIR)\/var\//$escapedSharedStateDir\//g" Makefile + make install +} diff --git a/app-backup/burp/licenses/GNU AGPL v3 b/app-backup/burp/licenses/GNU AGPL v3 new file mode 100644 index 000000000..ac8619dcb --- /dev/null +++ b/app-backup/burp/licenses/GNU AGPL v3 @@ -0,0 +1,662 @@ + + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/app-backup/burp/patches/burp-1.4.28.patchset b/app-backup/burp/patches/burp-1.4.28.patchset new file mode 100644 index 000000000..523285595 --- /dev/null +++ b/app-backup/burp/patches/burp-1.4.28.patchset @@ -0,0 +1,55 @@ +From f13db3e8ee38ea212dd1d7502d0604726021f44f Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Fri, 26 Dec 2014 00:07:56 +0000 +Subject: [PATCH] Update to the interface of librsync v.1.0.0 + +Librsync has moved away from MD4 for signatures, but to maintain +compatibility with non-Haiku versions, we hang on to it. +--- + src/backup_phase2_server.c | 2 +- + src/backup_phase4_server.c | 2 +- + src/rs_buf.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/backup_phase2_server.c b/src/backup_phase2_server.c +index 6e78515..747a369 100644 +--- a/src/backup_phase2_server.c ++++ b/src/backup_phase2_server.c +@@ -483,7 +483,7 @@ static int process_changed_file(struct sbuf *cb, struct sbuf *p1b, const char *c + free(curpath); + + blocklen=get_librsync_block_len(cb->endfile); +- if(!(p1b->sigjob=rs_sig_begin(blocklen, RS_DEFAULT_STRONG_LEN))) ++ if(!(p1b->sigjob=rs_sig_begin(blocklen, 8, RS_MD4_SIG_MAGIC))) + { + logp("could not start signature job.\n"); + return -1; +diff --git a/src/backup_phase4_server.c b/src/backup_phase4_server.c +index ead92b3..f1b5a84 100644 +--- a/src/backup_phase4_server.c ++++ b/src/backup_phase4_server.c +@@ -38,7 +38,7 @@ static int make_rev_sig(const char *dst, const char *sig, const char *endfile, i + } + result=rs_sig_gzfile(dstfp, dstzp, sigp, + get_librsync_block_len(endfile), +- RS_DEFAULT_STRONG_LEN, NULL, cntr); ++ 8, NULL, cntr); + gzclose_fp(&dstzp); + close_fp(&dstfp); + if(close_fp(&sigp)) +diff --git a/src/rs_buf.c b/src/rs_buf.c +index 78f65b2..0a3c33a 100644 +--- a/src/rs_buf.c ++++ b/src/rs_buf.c +@@ -497,7 +497,7 @@ rs_result rs_sig_gzfile(FILE *old_file, gzFile old_zfile, FILE *sig_file, size_t + rs_job_t *job; + rs_result r; + +- job = rs_sig_begin(new_block_len, strong_len); ++ job = rs_sig_begin(new_block_len, strong_len, RS_MD4_SIG_MAGIC); + r = rs_whole_gzrun(job, old_file, old_zfile, sig_file, NULL, cntr); + /* + if (stats) +-- +1.8.3.4 + From 6bc03df35725975c2cbbc80fd689b9ba9969051e Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Mon, 29 Dec 2014 01:31:01 +0000 Subject: [PATCH 49/75] Add x265 port --- media-libs/x265/patches/x265-1.4.patchset | 112 ++++++++++++++++++++++ media-libs/x265/x265-1.4.recipe | 83 ++++++++++++++++ 2 files changed, 195 insertions(+) create mode 100644 media-libs/x265/patches/x265-1.4.patchset create mode 100644 media-libs/x265/x265-1.4.recipe diff --git a/media-libs/x265/patches/x265-1.4.patchset b/media-libs/x265/patches/x265-1.4.patchset new file mode 100644 index 000000000..b73a74db7 --- /dev/null +++ b/media-libs/x265/patches/x265-1.4.patchset @@ -0,0 +1,112 @@ +From 8387d94e949e524f936c9c7ecb86b8663c603351 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 28 Dec 2014 07:11:55 +0000 +Subject: Check if threading library needs to be linked separately + + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index ba63f81..e43be21 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -56,7 +56,8 @@ else() + endif() + + if(UNIX) +- SET(PLATFORM_LIBS pthread) ++ find_package(Threads) ++ SET(PLATFORM_LIBS ${CMAKE_THREAD_LIBS_INIT}) + find_library(LIBRT rt) + if(LIBRT) + set(PLATFORM_LIBS ${PLATFORM_LIBS} rt) +-- +1.8.3.4 + + +From 592de1f1cd5666ae9cc64715833dfd16130a9c0b Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 28 Dec 2014 07:13:56 +0000 +Subject: Add an option to adjust headers installation path + + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index e43be21..b78d12b 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -166,6 +166,7 @@ endif() + # Build options + set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries") + set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables") ++set(INCLUDE_INSTALL_DIR include CACHE STRING "Install location of headers") + + if(X64) + # NOTE: We only officially support 16bit-per-pixel compiles of x265 +@@ -251,7 +252,8 @@ endif() + install(TARGETS x265-static + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) +-install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include) ++install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" ++ DESTINATION "${INCLUDE_INSTALL_DIR}") + + if(CMAKE_RC_COMPILER) + # The resource compiler does not need CFLAGS or macro defines. It +-- +1.8.3.4 + + +From ccb172d336c00fa95b1d99407da86be0b970b3bb Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 28 Dec 2014 07:14:34 +0000 +Subject: Add Haiku version of adjusting thread priority + + +diff --git a/source/common/threadpool.cpp b/source/common/threadpool.cpp +index 8a2ab9d..70b1289 100644 +--- a/source/common/threadpool.cpp ++++ b/source/common/threadpool.cpp +@@ -32,6 +32,8 @@ + #if MACOS + #include + #include ++#elif defined(__HAIKU__) ++#include + #endif + + namespace x265 { +@@ -141,6 +143,9 @@ void PoolThread::threadMain() + { + #if _WIN32 + SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL); ++#elif defined(__HAIKU__) ++ __attribute__((unused)) status_t ++ val = set_thread_priority(find_thread(NULL), B_LOW_PRIORITY); + #else + __attribute__((unused)) int val = nice(10); + #endif +-- +1.8.3.4 + + +From ae89f461c037e2981add0a1b161b81afd5104e30 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Mon, 29 Dec 2014 04:43:42 +0000 +Subject: checkasm-a: Explicitly use PLT relocation for libc symbols + +Fixes linking with PIC (default for all compilation) on Haiku. + +diff --git a/source/test/checkasm-a.asm b/source/test/checkasm-a.asm +index f7b9837..d0d622a 100644 +--- a/source/test/checkasm-a.asm ++++ b/source/test/checkasm-a.asm +@@ -153,7 +153,7 @@ cglobal checkasm_call, 2,15,16,max_args*8+8 + jz .ok + mov r9, rax + lea r0, [error_message] +- call puts ++ call puts wrt ..plt + mov r1, [rsp+max_args*8] + mov dword [r1], 0 + mov rax, r9 +-- +1.8.3.4 + diff --git a/media-libs/x265/x265-1.4.recipe b/media-libs/x265/x265-1.4.recipe new file mode 100644 index 000000000..ba56ec558 --- /dev/null +++ b/media-libs/x265/x265-1.4.recipe @@ -0,0 +1,83 @@ +SUMMARY="H.265/HEVC video encoder" +DESCRIPTION="x265 is a full-fledged video encoder for the HEVC video format \ +(also known as High Efficiency Video Coding, ISO/IEC 23008-2, MPEG-H Part 2, \ +and ITU-T H.265). HEVC is a direct successor to the earlier H.264/MPEG-4 AVC \ +video compression standard, aiming to achieve the same video quality at half \ +the bit rate. x265 is a free software project implementing that standard." + +HOMEPAGE="http://x265.org/" +LICENSE="GNU GPL v2" +COPYRIGHT="2013-2014 x265 Project" +SRC_URI="https://bitbucket.org/multicoreware/x265/get/$portVersion.tar.bz2" +CHECKSUM_SHA256="e818cacd6a963d49813dbe6c041888311a237da95896e604b4c91b2ddfac83a5" +REVISION="1" +ARCHITECTURES="x86 x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi + +# BitBucket sucks +SOURCE_DIR='multicoreware-x265-5e604833c5aa' + +PROVIDES=" + x265$secondaryArchSuffix = $portVersion + cmd:x265 = $portVersion + lib:libx265$secondaryArchSuffix = 35 + " + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:yasm + " + +PATCHES="x265-$portVersion.patchset" + +BUILD() +{ + # Can't put this in SOURCE_DIR as cmake uses a file in the root + # directory to find out the version of x265 + cd source + + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix \ + -DLIB_INSTALL_DIR:PATH=$relativeLibDir \ + -DBIN_INSTALL_DIR:PATH=bin \ + -DINCLUDE_INSTALL_DIR:PATH=$relativeIncludeDir + make $jobArgs VERBOSE=1 +} + +INSTALL() +{ + cd source + make install + + prepareInstalledDevelLibs libx265 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + x265${secondaryArchSuffix}_devel = $portVersion + devel:libx265$secondaryArchSuffix = 35 + " +REQUIRES_devel=" + x265$secondaryArchSuffix == $portVersion base + " From 7b382b007c83c1150a856e31fc16f07fc68f2422 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 31 Dec 2014 20:37:34 -0800 Subject: [PATCH 50/75] angband: Fix lint warning --- games-roguelike/angband/angband-3.5.0.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/games-roguelike/angband/angband-3.5.0.recipe b/games-roguelike/angband/angband-3.5.0.recipe index 284f26501..5d45af3ae 100644 --- a/games-roguelike/angband/angband-3.5.0.recipe +++ b/games-roguelike/angband/angband-3.5.0.recipe @@ -5,7 +5,7 @@ Angband is a free, single-player dungeon exploration game. You play an \ adventurer: seeking riches, fighting monsters, and preparing for a final \ battle with Morgoth, the Lord of Darkness. " -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2" LICENSE="GNU GPL v2" COPYRIGHT=" @@ -102,6 +102,7 @@ BUILD_PREREQUIRES=" cmd:make " +PATCHES="angband-${portVersion}.patchset" BUILD() { autoconf From a749101d30c42fa889afdfd96a5ed11f660c92d3 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 1 Jan 2015 00:42:35 -0800 Subject: [PATCH 51/75] Fix almp3 recipe --- media-libs/almp3/almp3-2.0.4.recipe | 78 +++++++-- media-libs/almp3/patches/almp3-2.0.4.patch | 50 ------ media-libs/almp3/patches/almp3-2.0.4.patchset | 165 ++++++++++++++++++ 3 files changed, 224 insertions(+), 69 deletions(-) delete mode 100644 media-libs/almp3/patches/almp3-2.0.4.patch create mode 100644 media-libs/almp3/patches/almp3-2.0.4.patchset diff --git a/media-libs/almp3/almp3-2.0.4.recipe b/media-libs/almp3/almp3-2.0.4.recipe index 7e5cfe81a..b3347967a 100644 --- a/media-libs/almp3/almp3-2.0.4.recipe +++ b/media-libs/almp3/almp3-2.0.4.recipe @@ -1,28 +1,68 @@ -DESCRIPTION="AllegroMP3 is an Allegro wrapper for the mpglib MP3 decoder part of mpg123" +SUMMARY="Allegro wrapper for the mpglib MP3 decoder" +DESCRIPTION='AllegroMP3 (or "almp3" for short) is a wrapper for the MP3 \ +decoder in mpg123 that allows using it in Allegro. It uses an internal copy of \ +mpg123 that is optimized for the x86 platform in SIMD assembly.' HOMEPAGE="http://icculus.org/~eviltypeguy/pkg/almp3/" -SRC_URI="http://icculus.org/~eviltypeguy/pkg/almp3/almp3-2.0.4.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/allegro >= 4.4" -CHECKSUM_MD5="8fe1517750acf23c07442b31447791a8" +SRC_URI="http://icculus.org/~eviltypeguy/pkg/almp3/almp3-$portVersion.tar.bz2" +CHECKSUM_SHA256='149af1a5ee06b5d7d5a52152db0e35ad6de8dfdd9d281fdac52728ef5d438d70' +LICENSE='GNU LGPL v2.1' +COPYRIGHT='2001-2005 Javier Gonzalez' + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +REVISION='2' + +PROVIDES=" + almp3$secondaryArchSuffix = $portVersion + lib:libalmp3$secondaryArchSuffix = $portVersion + " +PROVIDES_devel=" + almp3${secondaryArchSuffix}_devel = $portVersion + devel:libalmp3$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku${secondaryArchSuffix} + lib:liballeg${secondaryArchSuffix} >= 4.4 + " + +BUILD_PREREQUIRES=" + cmd:gcc${secondaryArchSuffix} + cmd:install + cmd:ld${secondaryArchSuffix} + cmd:make + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:liballeg${secondaryArchSuffix} >= 4.4 + " + +SOURCE_DIR='almp3' + +PATCHES="almp3-$portVersion.patchset" BUILD() { - cd almp3 - mkdir -p obj/haiku/dynamic - mkdir -p obj/haiku/static - mkdir -p lib/haiku - make TARGET=HAIKU_STATIC - make TARGET=HAIKU_SHARED + make $jobArgs TARGET=HAIKU_STATIC + make $jobArgs TARGET=HAIKU_DYNAMIC } INSTALL() { - cd almp3 - - make install prefix=/boot/common \ - INSTALL="install -c" \ - INSTALL_INFO="install-info" + make install TARGET=HAIKU_STATIC \ + includedir="$includeDir" \ + docdir="$docDir" \ + libdir="$libDir" \ + INSTALL="install -c" + make install TARGET=HAIKU_DYNAMIC \ + includedir="$includeDir" \ + docdir="$docDir" \ + libdir="$libDir" \ + INSTALL="install -c" + + prepareInstalledDevelLib libalmp3 + packageEntries devel \ + "$developDir" } -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2001-2003 Javier Gonzalez" diff --git a/media-libs/almp3/patches/almp3-2.0.4.patch b/media-libs/almp3/patches/almp3-2.0.4.patch deleted file mode 100644 index ee80c22cd..000000000 --- a/media-libs/almp3/patches/almp3-2.0.4.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -urN almp3/Makefile almp3-haiku/Makefile ---- almp3/Makefile 2005-07-26 02:36:11.066846720 +0000 -+++ almp3-haiku/Makefile 2010-06-08 08:16:15.839909376 +0000 -@@ -7,7 +7,7 @@ - #TARGET=MINGW32_STATIC - #TARGET=MINGW32_DLL - #TARGET=LINUX_STATIC --TARGET=SOLARIS_DYNAMIC -+#TARGET=SOLARIS_DYNAMIC - - prefix = /opt/BCallegro - exec_prefix = ${prefix} -@@ -60,6 +60,19 @@ - endif - - -+# HAIKU_STATIC -+ifeq ($(TARGET),HAIKU_STATIC) -+TARGETFLAGS=-Wall -O2 -march=pentium -fomit-frame-pointer -finline-functions -ffast-math -+OBJDIR=obj/haiku/static -+LIBDEST=lib/libalmp3.a -+endif -+ -+# HAIKU_SHARED -+ifeq ($(TARGET),HAIKU_SHARED) -+TARGETFLAGS=-Wall -O2 -march=pentium -fomit-frame-pointer -finline-functions -ffast-math -+OBJDIR=obj/haiku/dynamic -+LIBDEST=lib/libalmp3.so -+endif - - # LINUX_STATIC - ifeq ($(TARGET),LINUX_STATIC) -@@ -106,7 +119,6 @@ - endif - endif - -- - # compiling of the library - %.o: %.c - $(CC) -c $(CFLAGS) $< -o $(OBJDIR)/$@ -@@ -118,7 +130,8 @@ - $(INSTALL_DATA) -D docs/AUTHORS.txt $(DESTDIR)$(docdir)/almp3/AUTHORS.txt - $(INSTALL_DATA) -D docs/COPYING.txt $(DESTDIR)$(docdir)/almp3/COPYING.txt - $(INSTALL_DATA) -D include/almp3.h $(DESTDIR)$(includedir)/almp3.h -- $(INSTALL) -m 755 -D $(LIBDEST) $(DESTDIR)$(libdir)/libalmp3.so -+ $(INSTALL) -m 755 -D lib/libalmp3.so $(DESTDIR)$(libdir)/libalmp3.so -+ $(INSTALL) -m 755 -D lib/libalmp3.a $(DESTDIR)$(libdir)/libalmp3.a - - clean: - rm -f $(OBJECTS2) $(LIBDEST) $(LIBIMP) diff --git a/media-libs/almp3/patches/almp3-2.0.4.patchset b/media-libs/almp3/patches/almp3-2.0.4.patchset new file mode 100644 index 000000000..93d6cee07 --- /dev/null +++ b/media-libs/almp3/patches/almp3-2.0.4.patchset @@ -0,0 +1,165 @@ +From 4bceec3bc45e00d53904c01167a2703d2f5242ac Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 31 Dec 2014 23:17:09 -0800 +Subject: Fix lvalues + +Casts are not lvalues. + +diff --git a/src/almp3.c b/src/almp3.c +index 0757ca9..e10a693 100644 +--- a/src/almp3.c ++++ b/src/almp3.c +@@ -319,6 +319,7 @@ ALMP3_MP3 *almp3_create_mp3(void *data, int data_len) { + int ret; + char test_outbuf[8192]; + int test_size, framebytes; ++ char **data_ptr = (char **)&data; + + /* test for ID3v1 and if exists, skip it */ + if (memcmp((void *)&p[data_len - 128], "TAG", 3) == 0) { +@@ -330,7 +331,7 @@ ALMP3_MP3 *almp3_create_mp3(void *data, int data_len) { + + /* test for ID3v2 and if exists, skip it */ + data_start_skipped = almp3_get_id3v2_skip_bytes(p); +- (char *)data += data_start_skipped; ++ *data_ptr += data_start_skipped; + data_len -= data_start_skipped; + + /* test the next 16 * MAXFRAMESIZE bytes after ID3v2 until we find one valid frame */ +@@ -378,7 +379,7 @@ ALMP3_MP3 *almp3_create_mp3(void *data, int data_len) { + + data_start_skipped += skipbytes; + data_len -= skipbytes; +- (char *)data += skipbytes; ++ *data_ptr += skipbytes; + } + + /* must be layer III or II */ +-- +1.8.3.4 + + +From 500c50db231aa5bba5bfbd4029215d1a82f7a76f Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 31 Dec 2014 23:16:56 -0800 +Subject: Add makefile rules for Haiku and make obj and lib dir before building + + +diff --git a/Makefile b/Makefile +index 508570f..43f3654 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,7 +7,7 @@ + #TARGET=MINGW32_STATIC + #TARGET=MINGW32_DLL + #TARGET=LINUX_STATIC +-TARGET=SOLARIS_DYNAMIC ++#TARGET=SOLARIS_DYNAMIC + + prefix = /opt/BCallegro + exec_prefix = ${prefix} +@@ -60,6 +60,19 @@ ALMP3_DLL_EXPORTS=1 + endif + + ++# HAIKU_STATIC ++ifeq ($(TARGET),HAIKU_STATIC) ++TARGETFLAGS=-Wall -O2 -march=pentium -fomit-frame-pointer -finline-functions -ffast-math ++OBJDIR=obj/haiku/static ++LIBDEST=lib/haiku/libalmp3.a ++endif ++ ++# HAIKU_DYNAMIC ++ifeq ($(TARGET),HAIKU_DYNAMIC) ++TARGETFLAGS=-Wall -O2 -march=pentium -fomit-frame-pointer -finline-functions -ffast-math -shared ++OBJDIR=obj/haiku/dynamic ++LIBDEST=lib/haiku/libalmp3.so ++endif + + # LINUX_STATIC + ifeq ($(TARGET),LINUX_STATIC) +@@ -90,6 +103,11 @@ OBJECTS2=$(addprefix $(OBJDIR)/,$(OBJECTS)) + + # making of the library + ++$(LIBDEST): $(dir $(LIBDEST)) ++ ++$(dir $(LIBDEST)): ++ mkdir -p $@ ++ + # MINGW32_DLL + ifeq ($(TARGET),MINGW32_DLL) + $(LIBDEST): $(OBJECTS) +@@ -97,9 +115,9 @@ $(LIBDEST): $(OBJECTS) + + # others + else +-ifeq ($(TARGET),SOLARIS_DYNAMIC) ++ifeq ($(findstring _DYNAMIC,$(TARGET)),_DYNAMIC) + $(LIBDEST): $(OBJECTS) +- $(CC) -o $@ $(OBJECTS2) $(LFLAGS) $(CFLAGS) -lalleg-4.2.0 ++ $(CC) -o $@ $(OBJECTS2) $(LFLAGS) $(CFLAGS) -lalleg + else + $(LIBDEST): $(OBJECTS) + ar rs $(LIBDEST) $(OBJECTS2) +@@ -108,9 +126,12 @@ endif + + + # compiling of the library +-%.o: %.c ++%.o: %.c $(OBJDIR) + $(CC) -c $(CFLAGS) $< -o $(OBJDIR)/$@ + ++$(OBJDIR): ++ mkdir -p $@ ++ + install: + $(INSTALL_DATA) -D README.txt $(DESTDIR)$(docdir)/almp3/README.txt + $(INSTALL_DATA) -D CHANGES.txt $(DESTDIR)$(docdir)/almp3/CHANGES.txt +@@ -118,7 +139,11 @@ install: + $(INSTALL_DATA) -D docs/AUTHORS.txt $(DESTDIR)$(docdir)/almp3/AUTHORS.txt + $(INSTALL_DATA) -D docs/COPYING.txt $(DESTDIR)$(docdir)/almp3/COPYING.txt + $(INSTALL_DATA) -D include/almp3.h $(DESTDIR)$(includedir)/almp3.h +- $(INSTALL) -m 755 -D $(LIBDEST) $(DESTDIR)$(libdir)/libalmp3.so ++ifeq ($(findstring _DYNAMIC,$(TARGET)),_DYNAMIC) ++ $(INSTALL) -m 755 -D $(LIBDEST) $(DESTDIR)$(libdir)/$(notdir $(LIBDEST)) ++else ++ $(INSTALL) -m 644 -D $(LIBDEST) $(DESTDIR)$(libdir)/$(notdir $(LIBDEST)) ++endif + + clean: + rm -f $(OBJECTS2) $(LIBDEST) $(LIBIMP) +-- +1.8.3.4 + + +From 801ceeecb0770d2d6378fcf79339982474d15038 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 1 Jan 2015 00:38:16 -0800 +Subject: Assume docdir already covers the specific package name + + +diff --git a/Makefile b/Makefile +index 43f3654..32a43bd 100644 +--- a/Makefile ++++ b/Makefile +@@ -133,11 +133,11 @@ $(OBJDIR): + mkdir -p $@ + + install: +- $(INSTALL_DATA) -D README.txt $(DESTDIR)$(docdir)/almp3/README.txt +- $(INSTALL_DATA) -D CHANGES.txt $(DESTDIR)$(docdir)/almp3/CHANGES.txt +- $(INSTALL_DATA) -D docs/ALMP3.txt $(DESTDIR)$(docdir)/almp3/ALMP3.txt +- $(INSTALL_DATA) -D docs/AUTHORS.txt $(DESTDIR)$(docdir)/almp3/AUTHORS.txt +- $(INSTALL_DATA) -D docs/COPYING.txt $(DESTDIR)$(docdir)/almp3/COPYING.txt ++ $(INSTALL_DATA) -D README.txt $(DESTDIR)$(docdir)/README.txt ++ $(INSTALL_DATA) -D CHANGES.txt $(DESTDIR)$(docdir)/CHANGES.txt ++ $(INSTALL_DATA) -D docs/ALMP3.txt $(DESTDIR)$(docdir)/ALMP3.txt ++ $(INSTALL_DATA) -D docs/AUTHORS.txt $(DESTDIR)$(docdir)/AUTHORS.txt ++ $(INSTALL_DATA) -D docs/COPYING.txt $(DESTDIR)$(docdir)/COPYING.txt + $(INSTALL_DATA) -D include/almp3.h $(DESTDIR)$(includedir)/almp3.h + ifeq ($(findstring _DYNAMIC,$(TARGET)),_DYNAMIC) + $(INSTALL) -m 755 -D $(LIBDEST) $(DESTDIR)$(libdir)/$(notdir $(LIBDEST)) +-- +1.8.3.4 + From e1f5fcc5ce1b53723b04211cd2efb13cefeb0fc6 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 1 Jan 2015 00:48:59 -0800 Subject: [PATCH 52/75] Remove aplayer-4.0.1 - It's the old bep format - It fails lint - There is a new recipe available --- haiku-apps/aplayer/aplayer-4.0.1.recipe | 26 ------------------------- 1 file changed, 26 deletions(-) delete mode 100644 haiku-apps/aplayer/aplayer-4.0.1.recipe diff --git a/haiku-apps/aplayer/aplayer-4.0.1.recipe b/haiku-apps/aplayer/aplayer-4.0.1.recipe deleted file mode 100644 index 632910dbf..000000000 --- a/haiku-apps/aplayer/aplayer-4.0.1.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION=" -APlayer is a module player and can play a lot of different music file formats, \ -from Amiga and elsewhere. -" -HOMEPAGE="http://pulkomandy.tk/projects/APlayer" -SRC_URI="svn://pulkomandy.tk/APlayer/trunk/" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" - -BUILD() -{ - cd aplayer-4.0.1/Master - make -} - -INSTALL() -{ - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/APlayer - cp -a APlayer ${DESTDIR}/`finddir B_APPS_DIRECTORY`/APlayer -} - -LICENSE="Artistic Licence" -COPYRIGHT="1994-2002 Polycode - 2011-2012 Adrien Destugues - " From 3b728a2c419bc80860561f348c88ad5e56fde902 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 1 Jan 2015 00:50:35 -0800 Subject: [PATCH 53/75] Remove apache-2.2.* - It's the old bep format - It fails lint - There is a new recipe available --- www-servers/apache/apache-2.2.17.recipe | 35 -------------- www-servers/apache/apache-2.2.22.recipe | 35 -------------- .../apache/patches/apache-2.2.17.patch | 48 ------------------- .../apache/patches/apache-2.2.22.patch | 48 ------------------- 4 files changed, 166 deletions(-) delete mode 100644 www-servers/apache/apache-2.2.17.recipe delete mode 100644 www-servers/apache/apache-2.2.22.recipe delete mode 100644 www-servers/apache/patches/apache-2.2.17.patch delete mode 100644 www-servers/apache/patches/apache-2.2.22.patch diff --git a/www-servers/apache/apache-2.2.17.recipe b/www-servers/apache/apache-2.2.17.recipe deleted file mode 100644 index 03f0586e4..000000000 --- a/www-servers/apache/apache-2.2.17.recipe +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="The Apache Web Server." -HOMEPAGE="http://httpd.apache.org" -SRC_URI="http://apache.osuosl.org//httpd/httpd-2.2.17.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.4 2 - dev-libs/apr-utils >= 1.3.9" -CHECKSUM_MD5="66d8e107f85acc039fd5e624e85728a9" -BUILD() -{ - cd httpd-2.2.17 - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` - make -} - -INSTALL() -{ - cd httpd-2.2.17 - make install -} - -TEST() -{ - cd httpd-2.2.17 - make test -} - -LICENSE="Apache v2" -COPYRIGHT="2009 The Apache Software Foundation." diff --git a/www-servers/apache/apache-2.2.22.recipe b/www-servers/apache/apache-2.2.22.recipe deleted file mode 100644 index 24d867e0e..000000000 --- a/www-servers/apache/apache-2.2.22.recipe +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="The Apache Web Server." -HOMEPAGE="http://httpd.apache.org" -SRC_URI="http://apache.osuosl.org//httpd/httpd-2.2.22.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.4 2 - dev-libs/apr-utils >= 1.3.9" -CHECKSUM_MD5="d77fa5af23df96a8af68ea8114fa6ce1" -BUILD() -{ - cd httpd-2.2.22 - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` - make -} - -INSTALL() -{ - cd httpd-2.2.22 - make install -} - -TEST() -{ - cd httpd-2.2.22 - make test -} - -LICENSE="Apache v2" -COPYRIGHT="2012 The Apache Software Foundation." diff --git a/www-servers/apache/patches/apache-2.2.17.patch b/www-servers/apache/patches/apache-2.2.17.patch deleted file mode 100644 index 53697699a..000000000 --- a/www-servers/apache/patches/apache-2.2.17.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urN httpd-2.2.17/server/mpm_common.c httpd-2.2.17-haiku/server/mpm_common.c ---- httpd-2.2.17/server/mpm_common.c 2010-10-07 16:56:54.055836672 +0000 -+++ httpd-2.2.17-haiku/server/mpm_common.c 2011-02-05 10:58:12.295436288 +0000 -@@ -950,7 +950,7 @@ - - static const char *dash_k_arg; - --static int send_signal(pid_t pid, int sig) -+static int _send_signal(pid_t pid, int sig) - { - if (kill(pid, sig) < 0) { - ap_log_error(APLOG_MARK, APLOG_STARTUP, errno, NULL, -@@ -1007,7 +1007,7 @@ - printf("%s\n", status); - } - else { -- send_signal(otherpid, SIGTERM); -+ _send_signal(otherpid, SIGTERM); - } - return 1; - } -@@ -1017,7 +1017,7 @@ - printf("httpd not running, trying to start\n"); - } - else { -- *exit_status = send_signal(otherpid, SIGHUP); -+ *exit_status = _send_signal(otherpid, SIGHUP); - return 1; - } - } -@@ -1027,7 +1027,7 @@ - printf("httpd not running, trying to start\n"); - } - else { -- *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL); -+ *exit_status = _send_signal(otherpid, AP_SIG_GRACEFUL); - return 1; - } - } -@@ -1038,7 +1038,7 @@ - printf("%s\n", status); - } - else { -- *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL_STOP); -+ *exit_status = _send_signal(otherpid, AP_SIG_GRACEFUL_STOP); - } - #else - printf("httpd MPM \"" MPM_NAME "\" does not support graceful-stop\n"); diff --git a/www-servers/apache/patches/apache-2.2.22.patch b/www-servers/apache/patches/apache-2.2.22.patch deleted file mode 100644 index d615f7fc3..000000000 --- a/www-servers/apache/patches/apache-2.2.22.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urN httpd-2.2.22/server/mpm_common.c httpd-2.2.22-haiku/server/mpm_common.c ---- httpd-2.2.22/server/mpm_common.c 2010-10-07 16:56:54.055836672 +0000 -+++ httpd-2.2.22-haiku/server/mpm_common.c 2011-02-05 10:58:12.295436288 +0000 -@@ -950,7 +950,7 @@ - - static const char *dash_k_arg; - --static int send_signal(pid_t pid, int sig) -+static int _send_signal(pid_t pid, int sig) - { - if (kill(pid, sig) < 0) { - ap_log_error(APLOG_MARK, APLOG_STARTUP, errno, NULL, -@@ -1007,7 +1007,7 @@ - printf("%s\n", status); - } - else { -- send_signal(otherpid, SIGTERM); -+ _send_signal(otherpid, SIGTERM); - } - return 1; - } -@@ -1017,7 +1017,7 @@ - printf("httpd not running, trying to start\n"); - } - else { -- *exit_status = send_signal(otherpid, SIGHUP); -+ *exit_status = _send_signal(otherpid, SIGHUP); - return 1; - } - } -@@ -1027,7 +1027,7 @@ - printf("httpd not running, trying to start\n"); - } - else { -- *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL); -+ *exit_status = _send_signal(otherpid, AP_SIG_GRACEFUL); - return 1; - } - } -@@ -1038,7 +1038,7 @@ - printf("%s\n", status); - } - else { -- *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL_STOP); -+ *exit_status = _send_signal(otherpid, AP_SIG_GRACEFUL_STOP); - } - #else - printf("httpd MPM \"" MPM_NAME "\" does not support graceful-stop\n"); From c974e8040e660637ac904941b565333df85bb761 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 1 Jan 2015 01:25:12 -0800 Subject: [PATCH 54/75] Fix lint test for anthy --- app-i18n/anthy/anthy-9100.recipe | 33 ------------- app-i18n/anthy/anthy-9100h.recipe | 80 +++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 33 deletions(-) delete mode 100644 app-i18n/anthy/anthy-9100.recipe create mode 100644 app-i18n/anthy/anthy-9100h.recipe diff --git a/app-i18n/anthy/anthy-9100.recipe b/app-i18n/anthy/anthy-9100.recipe deleted file mode 100644 index 43ec7b3f1..000000000 --- a/app-i18n/anthy/anthy-9100.recipe +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY="Japanese input system" -DESCRIPTION=" -Anthy is a Japanese input method working on X11 and Emacs. \ -It converts hiragana text to mixed kana and kanji. It is implemented as \ -a library and stores private information securely in ~/.anthy/. Thus, \ -Anthy is simple and secure (information is protected from spoofing and snooping). -" -HOMEPAGE="http://anthy.sourceforge.jp/" -SRC_URI="http://sourceforge.jp/frs/redir.php?m=keihanna&f=%2Fanthy%2F37536%2Fanthy-9100h.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd anthy-9100h - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd anthy-9100h - make install -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2000-2007 TABATA Yusuke, UGAWA Tomoharu - 2004-2006 YOSHIDA Yuichi - 2000-2007 KMC(Kyoto University Micro Computer Club) - 2001-2002 TAKAI Kosuke, Nobuoka Takahiro" diff --git a/app-i18n/anthy/anthy-9100h.recipe b/app-i18n/anthy/anthy-9100h.recipe new file mode 100644 index 000000000..aff21e1ae --- /dev/null +++ b/app-i18n/anthy/anthy-9100h.recipe @@ -0,0 +1,80 @@ +SUMMARY="Japanese input system" +DESCRIPTION=" +Anthy is a Japanese input method working on X11 and Emacs. \ +It converts hiragana text to mixed kana and kanji. It is implemented as \ +a library and stores private information securely in ~/.anthy/. Thus, \ +Anthy is simple and secure (information is protected from spoofing and snooping). +" +HOMEPAGE="http://anthy.sourceforge.jp/" +SRC_URI="http://sourceforge.jp/frs/redir.php?f=%2Fanthy%2F37536%2Fanthy-9100h.tar.gz" +CHECKSUM_SHA256="d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:sed + " +REQUIRES=" + haiku + " +REQUIRES_devel=" + haiku_devel + anthy == $portVersion base + " +PROVIDES=" + anthy = $portVersion + cmd:anthy_agent = $portVersion + cmd:anthy_dic_tool = $portVersion + cmd:anthy_morphological_analyzer = $portVersion + lib:libanthy = 0.1.0 compat >= 0 + lib:libanthydic = 0.1.0 compat >= 0 + lib:libanthyinput = 0.0.0 compat >= 0 + " +PROVIDES_devel=" + anthy_devel = $portVersion + devel:libanthy = 0.1.0 compat >= 0 + devel:libanthydic = 0.1.0 compat >= 0 + devel:libanthyinput = 0.0.0 compat >= 0 + " +GLOBAL_WRITABLE_FILES=" + settings/anthy-conf auto-merge + " +PATCH() +{ + sed -i 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' configure.ac +} + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs \ + libanthy \ + libanthydic \ + libanthyinput + fixPkgconfig + packageEntries devel \ + $developDir +} +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2000-2007 TABATA Yusuke, UGAWA Tomoharu + 2004-2006 YOSHIDA Yuichi + 2000-2007 KMC(Kyoto University Micro Computer Club) + 2001-2002 TAKAI Kosuke, Nobuoka Takahiro" From b8a721d51b1bfa42306fc0cf1ce9bde9b660a480 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Fri, 2 Jan 2015 09:58:28 +0300 Subject: [PATCH 55/75] SimplyVorbis: fix install() --- haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe b/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe index 8b5fe4b83..2c36255c9 100644 --- a/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe +++ b/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe @@ -10,11 +10,11 @@ ArmyKnife (which does have its uses). Pop in a CD, select the songs you want, an hit 'Go'. Period. It can even make playlists for you if you like. Your music isn't \ limited by copy protection (DRM) either, so you can have all the flexibility of Fair Use." HOMEPAGE="https://github.com/HaikuArchives/SimplyVorbis" -SRC_URI="git+https://github.com/HaikuArchives/SimplyVorbis.git#63290af1f2cda8e5e31393780ee96a16132b4dba" +SRC_URI="git+https://github.com/HaikuArchives/SimplyVorbis.git#ecd4b2dd31f3ec578f16c9a1c3a95e281958a248" CHECKSUM_SHA256="" LICENSE="SimplyVorbis" COPYRIGHT="2007 Darkwyrm" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2" @@ -44,10 +44,13 @@ BUILD_PREREQUIRES=" BUILD() { - make + make $jobArgs OBJ_DIR=objects } INSTALL() { - make install -} \ No newline at end of file + mkdir -p $appsDir + cp objects/SimplyVorbis $appsDir + + addAppDeskbarSymlink $appsDir/SimplyVorbis +} From 27dd4c7e09ba18116d795b66660152ce4faa9841 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Fri, 2 Jan 2015 14:12:46 +0100 Subject: [PATCH 56/75] Updated to new QuickLaunch 0.9.8 release. --- .../quicklaunch/quicklaunch-0.9.8.recipe | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 haiku-apps/quicklaunch/quicklaunch-0.9.8.recipe diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.8.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.8.recipe new file mode 100644 index 000000000..118f873ba --- /dev/null +++ b/haiku-apps/quicklaunch/quicklaunch-0.9.8.recipe @@ -0,0 +1,57 @@ +SUMMARY="A tool to quickly start any installed application" +DESCRIPTION=" +QuickLaunch is a small launcher tool that helps you to quickly start any \ +installed application (as long as it has an app-signature). Simply start \ +to enter the name of an application and QuickLaunch will find all programs \ +matching these initial letters and show them in a list. +You choose an app from that list with the CursorUp/Down keys and launch it \ +by hitting RETURN. ESC quits QuickLaunch. + +It's recommended to set a key combo to start QuickLaunch with Haiku's \ +Shortcuts preferences. +" +HOMEPAGE="http://sourceforge.net/projects/quicklaunch-h/" +SRC_URI="git://git.code.sf.net/p/quicklaunch-h/code#b34dd3f1087111b3fc0645182b8719a29da8de22" +LICENSE="MIT" +COPYRIGHT="2014 Humdinger" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + quicklaunch = $portVersion + app:QuickLaunch = $portVersion + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:make + cmd:mkdepend + " + +USER_SETTINGS_FILES="settings/QuickLaunch_settings" + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + quicklaunchDir=$appsDir/QuickLaunch + mkdir -p $quicklaunchDir + + cp -af objects/QuickLaunch $quicklaunchDir + cp -af ReadMe.html $quicklaunchDir + cp -r images $quicklaunchDir + + chmod +x Add\ to\ Deskbar.sh + cp -af Add\ to\ Deskbar.sh $quicklaunchDir + + addAppDeskbarSymlink $quicklaunchDir/QuickLaunch +} From 3f734ffe5b2ca44c3962e55f6de92426e9279e40 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sat, 3 Jan 2015 23:07:53 +0100 Subject: [PATCH 57/75] Add app2png recipe --- dev-util/app2png/app2png-1.0.0.recipe | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 dev-util/app2png/app2png-1.0.0.recipe diff --git a/dev-util/app2png/app2png-1.0.0.recipe b/dev-util/app2png/app2png-1.0.0.recipe new file mode 100644 index 000000000..0000fc138 --- /dev/null +++ b/dev-util/app2png/app2png-1.0.0.recipe @@ -0,0 +1,41 @@ +SUMMARY="Turn legacy BeOS app icons into PNGs." +DESCRIPTION="\ +With app2png, you can extract attribute-based icons from BeOS apps and save \ +them into PNG files. These PNG icons can then be used to recreate the icon as \ +a vector, or for use on a site." + +HOMEPAGE="https://github.com/HaikuArchives/app2png" +SRC_URI="git+https://github.com/HaikuArchives/app2png#17c36271a80a822ac0dfec66527e61f21230a412" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2015 Puck Meerburg" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + app2png = $portVersion + app:app2png = $portVersion + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $binDir + cp -a objects/app2png $binDir +} From 914b935b4c74ee7a9747fd1683f4b7b8e1e13a01 Mon Sep 17 00:00:00 2001 From: Haoyuan Sun Date: Sat, 3 Jan 2015 23:57:06 +0000 Subject: [PATCH 58/75] Added luarocks-2.2.0 recipe file --- dev-lua/luarocks/luarocks-2.2.0.recipe | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 dev-lua/luarocks/luarocks-2.2.0.recipe diff --git a/dev-lua/luarocks/luarocks-2.2.0.recipe b/dev-lua/luarocks/luarocks-2.2.0.recipe new file mode 100644 index 000000000..c7ded971c --- /dev/null +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -0,0 +1,46 @@ +SUMMARY="a deployment and management system for Lua modules." +DESCRIPTION="LuaRocks allows you to install modules as self-contained packages called rocks, which also contain version dependency information." +HOMEPAGE="http://luarocks.org" +SRC_URI="http://luarocks.org/releases/luarocks-2.2.0.tar.gz" +SOURCE_DIR=$portVersionedName +REVISION="2" +CHECKSUM_SHA256="9b1a4ec7b103e2fb90a7ba8589d7e0c8523a3d6d54ac469b0bbc144292b9279c" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +PROVIDES=" + cmd:luarocks = $portVersion + " +REQUIRES=" + haiku + lua + lib:liblua + " +BUILD_REQUIRES=" + lua_devel + devel:liblua + " +BUILD_PREREQUIRES=" + haiku_devel + cmd:lua + cmd:luac + cmd:gcc + cmd:ld + cmd:make + cmd:sed + cmd:wget + cmd:md5sum + " + +BUILD() +{ + echo "PREFIX = $prefix" + ./configure --prefix=$prefix --with-lua=/bin --with-lua-include=/system/develop/headers --with-lua-lib=/system/develop/lib + make build +} +INSTALL() +{ + make install +} + +LICENSE="MIT" +COPYRIGHT="2007-2014 Kepler Project" From c6c8d6d9a8af6bd0513a4df8ab9ac48712f4b33b Mon Sep 17 00:00:00 2001 From: Haoyuan Sun Date: Sun, 4 Jan 2015 00:51:52 +0000 Subject: [PATCH 59/75] Removed redundant requires --- dev-lua/luarocks/luarocks-2.2.0.recipe | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dev-lua/luarocks/luarocks-2.2.0.recipe b/dev-lua/luarocks/luarocks-2.2.0.recipe index c7ded971c..41af7eff5 100644 --- a/dev-lua/luarocks/luarocks-2.2.0.recipe +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -9,20 +9,17 @@ CHECKSUM_SHA256="9b1a4ec7b103e2fb90a7ba8589d7e0c8523a3d6d54ac469b0bbc144292b9279 ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" cmd:luarocks = $portVersion + cmd:luarocks_admin = $portVersion " REQUIRES=" haiku lua - lib:liblua " BUILD_REQUIRES=" lua_devel - devel:liblua " BUILD_PREREQUIRES=" haiku_devel - cmd:lua - cmd:luac cmd:gcc cmd:ld cmd:make @@ -33,7 +30,6 @@ BUILD_PREREQUIRES=" BUILD() { - echo "PREFIX = $prefix" ./configure --prefix=$prefix --with-lua=/bin --with-lua-include=/system/develop/headers --with-lua-lib=/system/develop/lib make build } From ea7131bc81cc362c1344046b164740f733688eca Mon Sep 17 00:00:00 2001 From: Haoyuan Sun Date: Sun, 4 Jan 2015 04:17:50 +0000 Subject: [PATCH 60/75] Addition of env variables --- dev-lua/luarocks/luarocks-2.2.0.recipe | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dev-lua/luarocks/luarocks-2.2.0.recipe b/dev-lua/luarocks/luarocks-2.2.0.recipe index 41af7eff5..06f16e7ae 100644 --- a/dev-lua/luarocks/luarocks-2.2.0.recipe +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -1,5 +1,8 @@ SUMMARY="a deployment and management system for Lua modules." -DESCRIPTION="LuaRocks allows you to install modules as self-contained packages called rocks, which also contain version dependency information." +DESCRIPTION=" +LuaRocks allows you to install modules as self-contained packages \ +called rocks, which also contain version dependency information. +" HOMEPAGE="http://luarocks.org" SRC_URI="http://luarocks.org/releases/luarocks-2.2.0.tar.gz" SOURCE_DIR=$portVersionedName @@ -14,12 +17,16 @@ PROVIDES=" REQUIRES=" haiku lua + lib:liblua " BUILD_REQUIRES=" lua_devel + devel:liblua " BUILD_PREREQUIRES=" haiku_devel + cmd:lua + cmd:luac cmd:gcc cmd:ld cmd:make @@ -30,7 +37,7 @@ BUILD_PREREQUIRES=" BUILD() { - ./configure --prefix=$prefix --with-lua=/bin --with-lua-include=/system/develop/headers --with-lua-lib=/system/develop/lib + ./configure --prefix=$prefix --with-lua=$binDir --with-lua-include=$includeDir --with-lua-lib=$libDir make build } INSTALL() From 4c494f443714a26cc6abe20c1391ed708940c2d2 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sun, 4 Jan 2015 08:58:53 +0100 Subject: [PATCH 61/75] Fix policy error, small changes in SUMMARY and DESCRIPTION. --- dev-util/app2png/app2png-1.0.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-util/app2png/app2png-1.0.0.recipe b/dev-util/app2png/app2png-1.0.0.recipe index 0000fc138..a55fdbf09 100644 --- a/dev-util/app2png/app2png-1.0.0.recipe +++ b/dev-util/app2png/app2png-1.0.0.recipe @@ -1,8 +1,8 @@ -SUMMARY="Turn legacy BeOS app icons into PNGs." +SUMMARY="Turn legacy BeOS application icons into PNGs" DESCRIPTION="\ -With app2png, you can extract attribute-based icons from BeOS apps and save \ -them into PNG files. These PNG icons can then be used to recreate the icon as \ -a vector, or for use on a site." +With app2png, you can extract attribute-based bitmap icons from BeOS apps and \ +save them into PNG files. These PNG icons can then be used to recreate the \ +icon as a vector, or for use on a website." HOMEPAGE="https://github.com/HaikuArchives/app2png" SRC_URI="git+https://github.com/HaikuArchives/app2png#17c36271a80a822ac0dfec66527e61f21230a412" @@ -14,7 +14,7 @@ ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" app2png = $portVersion - app:app2png = $portVersion + cmd:app2png = $portVersion " REQUIRES=" haiku From df0dd25df8fc80870979b4d91cea4d1724c71ae4 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 4 Jan 2015 14:47:51 +0000 Subject: [PATCH 62/75] Add a new font, Clear Sans --- media-fonts/clear_sans/clear_sans-1.00.recipe | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 media-fonts/clear_sans/clear_sans-1.00.recipe diff --git a/media-fonts/clear_sans/clear_sans-1.00.recipe b/media-fonts/clear_sans/clear_sans-1.00.recipe new file mode 100644 index 000000000..8275af4b2 --- /dev/null +++ b/media-fonts/clear_sans/clear_sans-1.00.recipe @@ -0,0 +1,35 @@ +SUMMARY="The Clear Sans font" +DESCRIPTION="Clear Sans has been recognized as a versatile OpenType font for \ +screen, print, and Web. Clear Sans was designed with on-screen legibility \ +in mind. It strikes a balance between contemporary, professional, and stylish \ +expression and thoroughly functional purpose. It has a sophisticated and elegant \ +personality at all sizes, and its thoughtful design becomes even more evident at \ +the thin weight." +HOMEPAGE="https://01.org/clear-sans" +SRC_URI="https://01.org/sites/default/files/downloads/clear-sans/clearsans-1.00.zip" +CHECKSUM_SHA256="41809a296870dd7b4753d6532b4093821d61f9806281e6c053ccb11083ad1190" +LICENSE="Apache v2" +COPYRIGHT="2013 Intel" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="clear_sans = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + cp TTF/* ${FONTDIR} +} From 7e06c7fb756e470608f72834c06e74d89e54e4ac Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 4 Jan 2015 16:08:24 +0000 Subject: [PATCH 63/75] Add a new font, Noto Sans --- media-fonts/noto_sans/noto_sans-1.00.recipe | 35 +++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 media-fonts/noto_sans/noto_sans-1.00.recipe diff --git a/media-fonts/noto_sans/noto_sans-1.00.recipe b/media-fonts/noto_sans/noto_sans-1.00.recipe new file mode 100644 index 000000000..8524dbb6b --- /dev/null +++ b/media-fonts/noto_sans/noto_sans-1.00.recipe @@ -0,0 +1,35 @@ +SUMMARY="The Noto Sans font" +DESCRIPTION="Noto's goal is providing a beautiful reading experience for everyone \ +and for all languages. With visual harmony when multiple languages share a page. With \ +multiple styles and weights. Freely available to all. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans-hinted.zip" +CHECKSUM_SHA256="e954b37fb20e858a48bb1da513d120ae26afa1189b10922d46486ff06967d074" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} From 29f76b45133240b73426b80b14cbfbd4fec0bef6 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 4 Jan 2015 16:08:30 +0000 Subject: [PATCH 64/75] Add a new font, Noto Serif --- media-fonts/noto_serif/noto_serif-1.00.recipe | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 media-fonts/noto_serif/noto_serif-1.00.recipe diff --git a/media-fonts/noto_serif/noto_serif-1.00.recipe b/media-fonts/noto_serif/noto_serif-1.00.recipe new file mode 100644 index 000000000..4271f7a0c --- /dev/null +++ b/media-fonts/noto_serif/noto_serif-1.00.recipe @@ -0,0 +1,35 @@ +SUMMARY="The Noto Serif font" +DESCRIPTION="Noto's goal is providing a beautiful reading experience for everyone \ +and for all languages. With visual harmony when multiple languages share a page. With \ +multiple styles and weights. Freely available to all. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSerif-hinted.zip" +CHECKSUM_SHA256="3d23e8c04fdcfacfc9c2ea3abae0afbdd441cfbc3721b8b674e9d22fa92b97aa" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_serif=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} From bcee20e5014019b0b43af537e15c58813a12c66c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 4 Jan 2015 19:47:06 +0000 Subject: [PATCH 65/75] coreutils: apply gcc2 patchset only for gcc2. --- sys-apps/coreutils/coreutils-8.22.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys-apps/coreutils/coreutils-8.22.recipe b/sys-apps/coreutils/coreutils-8.22.recipe index ed3431192..171811315 100644 --- a/sys-apps/coreutils/coreutils-8.22.recipe +++ b/sys-apps/coreutils/coreutils-8.22.recipe @@ -26,8 +26,12 @@ ARCHITECTURES="x86_gcc2 x86 x86_64 arm" PATCHES=" coreutils-$portVersion.patchset - coreutils-$portVersion.gcc2.patchset " +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES+=" + coreutils-$portVersion.gcc2.patchset + " +fi PROVIDES=" coreutils = $portVersion compat >= 8 From c6c3199ac48cd297727b5c1f0b4ab8fb472944b8 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 4 Jan 2015 20:40:53 +0000 Subject: [PATCH 66/75] soxr: disable visibility hidden for gcc2. --- media-libs/soxr/soxr-0.1.1.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/media-libs/soxr/soxr-0.1.1.recipe b/media-libs/soxr/soxr-0.1.1.recipe index e211c4fff..db35739bd 100644 --- a/media-libs/soxr/soxr-0.1.1.recipe +++ b/media-libs/soxr/soxr-0.1.1.recipe @@ -41,13 +41,17 @@ PATCHES="soxr-${portVersion}.patchset" BUILD() { + if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + visibilityArgs="-DVISIBILITY_HIDDEN=OFF" + fi cmake . \ -DCMAKE_INSTALL_PREFIX=$prefix \ -DBUILD_TESTS=OFF \ -DBIN_INSTALL_DIR=$binDir \ -DLIB_INSTALL_DIR=$libDir \ -DINCLUDE_INSTALL_DIR=$includeDir \ - -DDOC_INSTALL_DIR=$docDir + -DDOC_INSTALL_DIR=$docDir \ + $visibilityArgs make $jobArgs } From 7231d5c134991859f12a3403ce3ea600621396df Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 4 Jan 2015 22:23:07 +0000 Subject: [PATCH 67/75] libebml & libmatroska: bump version. * switch to autotools. --- dev-libs/libebml/libebml-1.0.0.recipe | 25 ------- ...ebml-1.3.0.recipe => libebml-1.3.1.recipe} | 46 +++++++------ .../libebml/patches/libebml-0.7.8-haiku.diff | 21 ------ dev-libs/libebml/patches/libebml-1.0.0.patch | 67 ------------------- .../libebml/patches/libebml-1.3.1.patchset | 22 ++++++ .../libmatroska/libmatroska-1.0.0.recipe | 25 ------- ...-1.4.1.recipe => libmatroska-1.4.2.recipe} | 48 ++++++------- .../patches/libmatroska-1.0.0.patch | 47 ------------- .../patches/libmatroska-1.4.2.patchset | 22 ++++++ 9 files changed, 94 insertions(+), 229 deletions(-) delete mode 100644 dev-libs/libebml/libebml-1.0.0.recipe rename dev-libs/libebml/{libebml-1.3.0.recipe => libebml-1.3.1.recipe} (53%) delete mode 100644 dev-libs/libebml/patches/libebml-0.7.8-haiku.diff delete mode 100644 dev-libs/libebml/patches/libebml-1.0.0.patch create mode 100644 dev-libs/libebml/patches/libebml-1.3.1.patchset delete mode 100644 media-libs/libmatroska/libmatroska-1.0.0.recipe rename media-libs/libmatroska/{libmatroska-1.4.1.recipe => libmatroska-1.4.2.recipe} (55%) delete mode 100644 media-libs/libmatroska/patches/libmatroska-1.0.0.patch create mode 100644 media-libs/libmatroska/patches/libmatroska-1.4.2.patchset diff --git a/dev-libs/libebml/libebml-1.0.0.recipe b/dev-libs/libebml/libebml-1.0.0.recipe deleted file mode 100644 index 4c79fea0c..000000000 --- a/dev-libs/libebml/libebml-1.0.0.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)." -HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.0.0.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="6d438f03d8928d83a2d120ed02705f03" -BUILD() -{ - cd libebml-1.0.0/make/linux - make -} - -INSTALL() -{ - cd libebml-1.0.0/make/linux - if [ -n ${DESTDIR} ];then - make install DESTDIR="${DESTDIR}" - else - make install - fi -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2005-2009 CoreCodec, Inc." diff --git a/dev-libs/libebml/libebml-1.3.0.recipe b/dev-libs/libebml/libebml-1.3.1.recipe similarity index 53% rename from dev-libs/libebml/libebml-1.3.0.recipe rename to dev-libs/libebml/libebml-1.3.1.recipe index 3957bf4ce..7afdcadcf 100644 --- a/dev-libs/libebml/libebml-1.3.0.recipe +++ b/dev-libs/libebml/libebml-1.3.1.recipe @@ -1,64 +1,68 @@ SUMMARY="libebml is a C++ library to parse EBML content (read/write)." DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)." HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.0.tar.bz2" -CHECKSUM_SHA256="83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de" - +SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.1.tar.bz2" +CHECKSUM_SHA256="195894b31aaca55657c9bc157d744f23b0c25597606b97cfa5a9039c4b684295" REVISION="1" - LICENSE="GNU LGPL v2.1" COPYRIGHT="2005-2013 CoreCodec, Inc." -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" + PROVIDES=" libebml$secondaryArchSuffix = $portVersion - lib:libebml$secondaryArchSuffix = 4 + lib:libebml$secondaryArchSuffix = 4.0.0 compat >= 4 " REQUIRES=" haiku${secondaryArchSuffix} + lib:libstdc++${secondaryArchSuffix} " +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES=" + libebml-$portVersion.patchset + " +else + REQUIRES+=" + lib:libgcc_s${secondaryArchSuffix} + " +fi + BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel + cmd:aclocal + cmd:autoconf + cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:libtool cmd:make - cmd:sed " -PATCH() -{ - sed -i 's/^ifeq (BeOS/ifeq (Haiku/g' make/linux/Makefile - sed -i "s,/boot/home/config,$prefix,g" make/linux/Makefile - sed -i "s,^\(libdir\)=\(.*\)$,\1=$libDir,g" make/linux/Makefile - sed -i "s,^\(includedir\)=\(.*\)$,\1=$includeDir/ebml,g" make/linux/Makefile - sed -i 's/-Wextra//g' make/linux/Makefile - sed -i 's/\(#elif defined(__BEOS__)\)/\1 || defined(__HAIKU__)/g' \ - ebml/c/libebml_t.h -} - BUILD() { - cd make/linux + autoreconf -f -i + runConfigure ./configure make $jobArgs } INSTALL() { - cd make/linux make install prepareInstalledDevelLibs libebml + fixPkgconfig packageEntries devel $developDir } PROVIDES_devel=" libebml${secondaryArchSuffix}_devel = $portVersion - devel:libebml$secondaryArchSuffix = 4 + devel:libebml$secondaryArchSuffix = 4.0.0 compat >= 4 " REQUIRES_devel=" libebml$secondaryArchSuffix == $portVersion base diff --git a/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff b/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff deleted file mode 100644 index 8bccf378a..000000000 --- a/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN libebml-0.7.8/ebml/c/libebml_t.h libebml-0.7.8-haiku/ebml/c/libebml_t.h ---- libebml-0.7.8/ebml/c/libebml_t.h 2009-03-01 02:10:48.000000000 +0000 -+++ libebml-0.7.8-haiku/ebml/c/libebml_t.h 2009-03-01 02:06:42.000000000 +0000 -@@ -72,7 +72,7 @@ - typedef uint16_t uint16; - typedef uint8_t uint8; - # endif // __GNUC__ --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - #include - #elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */ - typedef signed long long int64; -@@ -98,7 +98,7 @@ - typedef uint32_t uint32; - typedef uint16_t uint16; - typedef uint8_t uint8; --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - # include - #else // anything else (Linux, BSD, ...) - # include diff --git a/dev-libs/libebml/patches/libebml-1.0.0.patch b/dev-libs/libebml/patches/libebml-1.0.0.patch deleted file mode 100644 index 034937173..000000000 --- a/dev-libs/libebml/patches/libebml-1.0.0.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -urN libebml-1.0.0/ebml/c/libebml_t.h libebml-1.0.0-haiku/ebml/c/libebml_t.h ---- libebml-1.0.0/ebml/c/libebml_t.h 2010-03-23 11:58:36.007077888 +0000 -+++ libebml-1.0.0-haiku/ebml/c/libebml_t.h 2010-06-30 15:54:51.796131328 +0000 -@@ -72,7 +72,7 @@ - typedef uint16_t uint16; - typedef uint8_t uint8; - # endif // __GNUC__ --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - #include - #elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */ - typedef signed long long int64; -@@ -98,7 +98,7 @@ - typedef uint32_t uint32; - typedef uint16_t uint16; - typedef uint8_t uint8; --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined (__HAIKU__) - # include - #else // anything else (Linux, BSD, ...) - # include -diff -urN libebml-1.0.0/make/linux/Makefile libebml-1.0.0-destdir/make/linux/Makefile ---- libebml-1.0.0/make/linux/Makefile 2010-06-04 08:44:54.060817408 +0000 -+++ libebml-1.0.0-destdir/make/linux/Makefile 2010-09-22 12:58:40.962854912 +0000 -@@ -13,6 +13,9 @@ - # BeOS wants the libs and headers in /boot/home/config - ifeq (BeOS,$(shell uname -s)) - prefix=/boot/home/config -+# Haiku wants the libs and headers in /boot/common -+else ifeq (Haiku,$(shell uname -s)) -+prefix=/boot/common - else - prefix=/usr/local - endif -@@ -122,23 +125,23 @@ - endif - - install_headers: -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) - for i in $(INCLUDE_DIR)/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ - done -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c - for i in $(INCLUDE_DIR)/c/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ - done - - install_staticlib: $(LIBRARY) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) - - install_sharedlib: $(LIBRARY_SO) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) -- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) -+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) - - - ifneq ($(wildcard .depend),) diff --git a/dev-libs/libebml/patches/libebml-1.3.1.patchset b/dev-libs/libebml/patches/libebml-1.3.1.patchset new file mode 100644 index 000000000..2297479ad --- /dev/null +++ b/dev-libs/libebml/patches/libebml-1.3.1.patchset @@ -0,0 +1,22 @@ +From dfad87a8cda696eba7c4a96ab898705978a0cec0 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 4 Jan 2015 21:37:55 +0000 +Subject: gcc2 fix + + +diff --git a/Makefile.am b/Makefile.am +index 9b10ee8..3e11510 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,7 @@ + ACLOCAL_AMFLAGS = -I m4 + + AM_CPPFLAGS = -I${top_srcdir} +-AM_CXXFLAGS = -Wall -Wextra -Wno-unknown-pragmas -Wshadow ++AM_CXXFLAGS = -Wall -Wno-unknown-pragmas -Wshadow + if ENABLE_DEBUG + AM_CPPFLAGS += -DDEBUG + AM_CXXFLAGS += -g +-- +1.8.3.4 + diff --git a/media-libs/libmatroska/libmatroska-1.0.0.recipe b/media-libs/libmatroska/libmatroska-1.0.0.recipe deleted file mode 100644 index 4db5ffdc4..000000000 --- a/media-libs/libmatroska/libmatroska-1.0.0.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libmatroska is a C++ libary to parse Matroska files." -HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.0.0.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libebml >= 1.0.0" -CHECKSUM_MD5="4efcf3945b17a6f0320cf1aaa326a4de" -BUILD() -{ - cd libmatroska-1.0.0/make/linux - make PREFIX=/boot/common -} - -INSTALL() -{ - cd libmatroska-1.0.0/make/linux - if [ -n ${DESTDIR} ];then - make install DESTDIR="${DESTDIR}" - else - make install - fi -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2005-2009 CoreCodec, Inc." diff --git a/media-libs/libmatroska/libmatroska-1.4.1.recipe b/media-libs/libmatroska/libmatroska-1.4.2.recipe similarity index 55% rename from media-libs/libmatroska/libmatroska-1.4.1.recipe rename to media-libs/libmatroska/libmatroska-1.4.2.recipe index ed79ef7aa..9e194de10 100644 --- a/media-libs/libmatroska/libmatroska-1.4.1.recipe +++ b/media-libs/libmatroska/libmatroska-1.4.2.recipe @@ -1,67 +1,69 @@ SUMMARY="libmatroska is a C++ libary to parse Matroska files." DESCRIPTION="libmatroska is a C++ libary to parse Matroska files." HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.4.1.tar.bz2" -CHECKSUM_SHA256="086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7" - +SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-$portVersion.tar.bz2" +CHECKSUM_SHA256="bea10320f1f1fd121bbd7db9ffc77b2518e8269f00903549c5425478bbf8393f" REVISION="1" - LICENSE="GNU LGPL v2.1" COPYRIGHT="2005-2013 CoreCodec, Inc." -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libmatroska$secondaryArchSuffix = $portVersion - lib:libmatroska$secondaryArchSuffix = 6 + lib:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6 " REQUIRES=" haiku${secondaryArchSuffix} lib:libebml$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix " +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES=" + libmatroska-$portVersion.patchset + " +else + REQUIRES+=" + lib:libgcc_s${secondaryArchSuffix} + " +fi BUILD_REQUIRES=" devel:libebml$secondaryArchSuffix " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel + cmd:aclocal + cmd:autoconf + cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:libtool cmd:make - cmd:sed " -PATCH() -{ - sed -i 's/^ifeq (BeOS/ifeq (Haiku/g' make/linux/Makefile - sed -i "s,/boot/home/config,$prefix,g" make/linux/Makefile - sed -i "s,^\(libdir\)=\(.*\)$,\1=$libDir,g" make/linux/Makefile - sed -i "s,^\(includedir\)=\(.*\)$,\1=$includeDir/matroska,g" \ - make/linux/Makefile - sed -i 's/-Wextra//g' make/linux/Makefile -} - BUILD() { - cd make/linux - make $jobArgs \ - LIBEBML_INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir \ - LIBEBML_LIB_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir + autoreconf -f -i + runConfigure ./configure + make $jobArgs + } INSTALL() { - cd make/linux make install prepareInstalledDevelLibs libmatroska + fixPkgconfig packageEntries devel $developDir } PROVIDES_devel=" libmatroska${secondaryArchSuffix}_devel = $portVersion - devel:libmatroska$secondaryArchSuffix = 6 + devel:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6 " REQUIRES_devel=" libmatroska$secondaryArchSuffix == $portVersion base diff --git a/media-libs/libmatroska/patches/libmatroska-1.0.0.patch b/media-libs/libmatroska/patches/libmatroska-1.0.0.patch deleted file mode 100644 index 65d5f2861..000000000 --- a/media-libs/libmatroska/patches/libmatroska-1.0.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -urN libmatroska-1.0.0/make/linux/Makefile libmatroska-1.0.0-haiku/make/linux/Makefile ---- libmatroska-1.0.0/make/linux/Makefile 2010-06-04 08:46:29.017825792 +0000 -+++ libmatroska-1.0.0-haiku/make/linux/Makefile 2010-09-27 01:57:28.436994048 +0000 -@@ -13,6 +13,10 @@ - # BeOS wants the libs and headers in /boot/home/config - ifeq (BeOS,$(shell uname -s)) - prefix=/boot/home/config -+endif -+# Haiku wants the libs and headers in /boot/common -+ifeq (Haiku,$(shell uname -s)) -+prefix:=$(shell finddir B_COMMON_DIRECTORY) - else - prefix=/usr/local - endif -@@ -153,23 +157,23 @@ - endif - - install_headers: -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) - for i in $(INCLUDE_DIR)/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ - done -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c - for i in $(INCLUDE_DIR)/c/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ - done - - install_staticlib: $(LIBRARY) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) - - install_sharedlib: $(LIBRARY_SO) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) -- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) -+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) - - ifneq ($(wildcard .depend),) - include .depend diff --git a/media-libs/libmatroska/patches/libmatroska-1.4.2.patchset b/media-libs/libmatroska/patches/libmatroska-1.4.2.patchset new file mode 100644 index 000000000..829b0f7a4 --- /dev/null +++ b/media-libs/libmatroska/patches/libmatroska-1.4.2.patchset @@ -0,0 +1,22 @@ +From caa315a5ba5ff2053d6e6c429c83017fdc13e567 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 4 Jan 2015 21:54:48 +0000 +Subject: gcc2 fix + + +diff --git a/Makefile.am b/Makefile.am +index f3b881d..063a480 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,7 @@ + ACLOCAL_AMFLAGS = -I m4 + + AM_CPPFLAGS = -I${top_srcdir} +-AM_CXXFLAGS = -Wall -Wextra -Wno-unknown-pragmas -Wshadow $(EBML_CFLAGS) ++AM_CXXFLAGS = -Wall -Wno-unknown-pragmas -Wshadow $(EBML_CFLAGS) + if ENABLE_DEBUG + AM_CPPFLAGS += -DDEBUG + AM_CXXFLAGS += -g +-- +1.8.3.4 + From 1c16ca85a089639d941e3dd05307d57336731f5b Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 4 Jan 2015 20:15:53 +0100 Subject: [PATCH 68/75] Add fceux recipe --- games-emulation/fceux/fceux-2.2.2.recipe | 62 ++++++++ .../fceux/patches/fceux-2.2.2.patch | 143 ++++++++++++++++++ 2 files changed, 205 insertions(+) create mode 100644 games-emulation/fceux/fceux-2.2.2.recipe create mode 100644 games-emulation/fceux/patches/fceux-2.2.2.patch diff --git a/games-emulation/fceux/fceux-2.2.2.recipe b/games-emulation/fceux/fceux-2.2.2.recipe new file mode 100644 index 000000000..d5dc7e893 --- /dev/null +++ b/games-emulation/fceux/fceux-2.2.2.recipe @@ -0,0 +1,62 @@ +SUMMARY="NES/Famicom emulator" +DESCRIPTION="FCEUX is an emulator for the NES and Famicom, based on FCE Ultra \ +which is based on FCE. It combines many different changes of FCE Ultra, like \ +support for a lot of the different hardware of NES Cartridges, rerecording \ +bult-in and a high level of portability." +HOMEPAGE="http://fceux.com/web/" +COPYRIGHT="1998-2014 tamentis & zamaz" +SRC_URI="http://sourceforge.net/projects/fceultra/files/Source%20Code/2.2.2%20src/fceux-2.2.2.src.tar.gz" +CHECKSUM_SHA256="804d11bdb4a195f3a580ce5d2d01be877582763378637e16186a22459f5fe5e1" +REVISION="1" +LICENSE="GNU GPL v2" + +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PATCHES="fceux-$portVersion.patch" + +PROVIDES=" + fceux$secondaryArchSuffix = $portVersion + cmd:fceux$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libgl$secondaryArchSuffix + glu$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libsdl$secondaryArchSuffix + devel:libgl${secondaryArchSuffix} + glu${secondaryArchSuffix}_devel + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:scons + cmd:g++$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + scons OPENGL=1 GTK=0 LUA=0 $jobArgs +} + +INSTALL() +{ + mkdir -p $binDir $manDir/man6 + cp bin/fceux $binDir + cp documentation/fceux.6 $manDir/man6 +} diff --git a/games-emulation/fceux/patches/fceux-2.2.2.patch b/games-emulation/fceux/patches/fceux-2.2.2.patch new file mode 100644 index 000000000..fb5c85109 --- /dev/null +++ b/games-emulation/fceux/patches/fceux-2.2.2.patch @@ -0,0 +1,143 @@ +From d960b6ab8ec3d9e25916d6c09c22febe55a716e9 Mon Sep 17 00:00:00 2001 +From: Puck Meerburg +Date: Sun, 4 Jan 2015 19:33:38 +0100 +Subject: Fix Haiku build + + +diff --git a/SConstruct b/SConstruct +index 4d5b446..a6fb618 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -33,7 +33,7 @@ opts.AddVariables( + AddOption('--prefix', dest='prefix', type='string', nargs=1, action='store', metavar='DIR', help='installation prefix') + + prefix = GetOption('prefix') +-env = Environment(options = opts) ++env = Environment(options = opts, ENV=os.environ) + + if env['RELEASE']: + env.Append(CPPDEFINES=["PUBLIC_RELEASE"]) +@@ -46,23 +46,6 @@ if platform.system == "ppc": + # Default compiler flags: + env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare']) + +-if os.environ.has_key('PLATFORM'): +- env.Replace(PLATFORM = os.environ['PLATFORM']) +-if os.environ.has_key('CC'): +- env.Replace(CC = os.environ['CC']) +-if os.environ.has_key('CXX'): +- env.Replace(CXX = os.environ['CXX']) +-if os.environ.has_key('WINDRES'): +- env.Replace(WINDRES = os.environ['WINDRES']) +-if os.environ.has_key('CFLAGS'): +- env.Append(CCFLAGS = os.environ['CFLAGS'].split()) +-if os.environ.has_key('CXXFLAGS'): +- env.Append(CXXFLAGS = os.environ['CXXFLAGS'].split()) +-if os.environ.has_key('CPPFLAGS'): +- env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split()) +-if os.environ.has_key('LDFLAGS'): +- env.Append(LINKFLAGS = os.environ['LDFLAGS'].split()) +- + print "platform: ", env['PLATFORM'] + + # compile with clang +@@ -187,7 +170,6 @@ else: + + Export('env') + fceux = SConscript('src/SConscript') +-env.Program(target="fceux-net-server", source=["fceux-server/server.cpp", "fceux-server/md5.cpp", "fceux-server/throttle.cpp"]) + + # Installation rules + if prefix == None: +@@ -200,9 +182,6 @@ if env['PLATFORM'] == 'win32': + fceux_src = 'src/fceux' + exe_suffix + fceux_dst = 'bin/fceux' + exe_suffix + +-fceux_net_server_src = 'fceux-net-server' + exe_suffix +-fceux_net_server_dst = 'bin/fceux-net-server' + exe_suffix +- + auxlib_src = 'src/auxlib.lua' + auxlib_dst = 'bin/auxlib.lua' + auxlib_inst_dst = prefix + '/share/fceux/auxlib.lua' +@@ -212,13 +191,10 @@ fceux_h_dst = 'bin/fceux.chm' + + env.Command(fceux_h_dst, fceux_h_src, [Copy(fceux_h_dst, fceux_h_src)]) + env.Command(fceux_dst, fceux_src, [Copy(fceux_dst, fceux_src)]) +-env.Command(fceux_net_server_dst, fceux_net_server_src, [Copy(fceux_net_server_dst, fceux_net_server_src)]) + env.Command(auxlib_dst, auxlib_src, [Copy(auxlib_dst, auxlib_src)]) + + man_src = 'documentation/fceux.6' +-man_net_src = 'documentation/fceux-net-server.6' + man_dst = prefix + '/share/man/man6/fceux.6' +-man_net_dst = prefix + '/share/man/man6/fceux-net-server.6' + + share_src = 'output/' + share_dst = prefix + '/share/fceux/' +@@ -230,12 +206,24 @@ desktop_src = 'fceux.desktop' + desktop_dst = prefix + '/share/applications/' + + env.Install(prefix + "/bin/", fceux) +-env.Install(prefix + "/bin/", "fceux-net-server") + # TODO: Where to put auxlib on "scons install?" + env.Alias('install', env.Command(auxlib_inst_dst, auxlib_src, [Copy(auxlib_inst_dst, auxlib_src)])) + env.Alias('install', env.Command(share_dst, share_src, [Copy(share_dst, share_src)])) + env.Alias('install', env.Command(man_dst, man_src, [Copy(man_dst, man_src)])) +-env.Alias('install', env.Command(man_net_dst, man_net_src, [Copy(man_net_dst, man_net_src)])) + env.Alias('install', env.Command(image_dst, image_src, [Copy(image_dst, image_src)])) + env.Alias('install', env.Command(desktop_dst, desktop_src, [Copy(desktop_dst, desktop_src)])) + env.Alias('install', (prefix + "/bin/")) ++ ++ ++if env['PLATFORM'] != 'haiku': ++ env.Program(target="fceux-net-server", source=["fceux-server/server.cpp", "fceux-server/md5.cpp", "fceux-server/throttle.cpp"]) ++ ++ fceux_net_server_src = 'fceux-net-server' + exe_suffix ++ fceux_net_server_dst = 'bin/fceux-net-server' + exe_suffix ++ env.Command(fceux_net_server_dst, fceux_net_server_src, [Copy(fceux_net_server_dst, fceux_net_server_src)]) ++ ++ env.Install(prefix + "/bin/", "fceux-net-server") ++ ++ man_net_src = 'documentation/fceux-net-server.6' ++ man_net_dst = prefix + '/share/man/man6/fceux-net-server.6' ++ env.Alias('install', env.Command(man_net_dst, man_net_src, [Copy(man_net_dst, man_net_src)])) +diff --git a/src/drivers/sdl/SConscript b/src/drivers/sdl/SConscript +index 7a53b07..8f62c40 100644 +--- a/src/drivers/sdl/SConscript ++++ b/src/drivers/sdl/SConscript +@@ -4,7 +4,10 @@ Import('env') + config_string = 'pkg-config --cflags --libs x11' + if env['PLATFORM'] == 'darwin': + config_string = 'PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig/ ' + config_string +-env.ParseConfig(config_string) ++ ++if env['PLATFORM'] != 'haiku': ++ env.ParseConfig(config_string) ++ + Export('env') + + source_list = Split( +@@ -26,5 +29,8 @@ if 'GL' in env['LIBS']: + if env['GTK'] or env['GTK3']: + source_list.append('gui.cpp') + ++if env['PLATFORM'] == 'haiku': ++ env.Append(LIBS = ['network']) ++ + source_list = ['drivers/sdl/' + source for source in source_list] + Return('source_list') +diff --git a/src/utils/ioapi.cpp b/src/utils/ioapi.cpp +index c2b536f..0363efd 100644 +--- a/src/utils/ioapi.cpp ++++ b/src/utils/ioapi.cpp +@@ -14,7 +14,7 @@ + #define _CRT_SECURE_NO_WARNINGS + #endif + +-#if defined(__APPLE__) || defined(IOAPI_NO_64) ++#if defined(__APPLE__) || defined(__HAIKU__) || defined(IOAPI_NO_64) + // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions + #define FOPEN_FUNC(filename, mode) fopen(filename, mode) + #define FTELLO_FUNC(stream) ftello(stream) +-- +1.8.3.4 + From 9640636c8d8dce829af8fe98e6aacd4c7d159072 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 4 Jan 2015 18:08:33 +0000 Subject: [PATCH 69/75] cabextract: Fix recipe and let it build on x86_gcc2 --- app-arch/cabextract/cabextract-1.4.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app-arch/cabextract/cabextract-1.4.recipe b/app-arch/cabextract/cabextract-1.4.recipe index 44e8aefec..915004c2d 100644 --- a/app-arch/cabextract/cabextract-1.4.recipe +++ b/app-arch/cabextract/cabextract-1.4.recipe @@ -11,7 +11,7 @@ COPYRIGHT="2000-2011 Stuart Caie" SRC_URI="http://www.cabextract.org.uk/cabextract-1.4.tar.gz" CHECKSUM_SHA256="f7ba8ba2c2d71912846eaaa2bed9200a7722ef0addeec32db7471c350a48e41e" REVISION="1" -ARCHITECTURES="x86 ?x86_gcc2 x86_64" +ARCHITECTURES="x86 x86_gcc2 x86_64" PROVIDES=" cabextract = $portVersion @@ -30,6 +30,8 @@ BUILD_PREREQUIRES=" cmd:make cmd:gcc cmd:awk + cmd:sed + cmd:grep " BUILD() From d52ce461a662886d335947e26b1cf4e241c48dc7 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 4 Jan 2015 18:08:38 +0000 Subject: [PATCH 70/75] Add a set of Microsoft fonts --- media-fonts/msttcorefonts/licenses/MSttfEULA | 94 +++++++++++++++++++ .../msttcorefonts/msttcorefonts-1.0.recipe | 75 +++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 media-fonts/msttcorefonts/licenses/MSttfEULA create mode 100644 media-fonts/msttcorefonts/msttcorefonts-1.0.recipe diff --git a/media-fonts/msttcorefonts/licenses/MSttfEULA b/media-fonts/msttcorefonts/licenses/MSttfEULA new file mode 100644 index 000000000..f836a0035 --- /dev/null +++ b/media-fonts/msttcorefonts/licenses/MSttfEULA @@ -0,0 +1,94 @@ +Microsoft TrueType Fonts +END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE +--------------------------------------------------- + +IMPORTANT - READ CAREFULLY: This Microsoft End-User License Agreement +("EULA") is a legal agreement between you (either an individual or a single +entity) and Microsoft Corporation for the Microsoft software accompanying +this EULA, which includes computer software and may include associated +media, printed materials, and "on-line" or electronic documentation +("SOFTWARE PRODUCT" or "SOFTWARE"). By exercising your rights to make and +use copies of the SOFTWARE PRODUCT, you agree to be bound by the terms of +this EULA. If you do not agree to the terms of this EULA, you may not use +the SOFTWARE PRODUCT. + +SOFTWARE PRODUCT LICENSE + +The SOFTWARE PRODUCT is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The SOFTWARE PRODUCT is licensed, not sold. + +1. GRANT OF LICENSE. This EULA grants you the following rights: + +· Installation and Use. You may install and use an unlimited number of +copies of the SOFTWARE PRODUCT. + +· Reproduction and Distribution. You may reproduce and distribute an +unlimited number of copies of the SOFTWARE PRODUCT; provided that each copy +shall be a true and complete copy, including all copyright and trademark +notices, and shall be accompanied by a copy of this EULA. Copies of the +SOFTWARE PRODUCT may not be distributed for profit either on a standalone +basis or included as part of your own product. + +2. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS. + +· Limitations on Reverse Engineering, Decompilation, and Disassembly. +You may not reverse engineer, decompile, or disassemble the SOFTWARE +PRODUCT, except and only to the extent that such activity is expressly +permitted by applicable law notwithstanding this limitation. + +· Restrictions on Alteration. You may not rename, edit or create any +derivative works from the SOFTWARE PRODUCT, other than subsetting when +embedding them in documents. + +· Software Transfer. You may permanently transfer all of your rights +under this EULA, provided the recipient agrees to the terms of this EULA. + +· Termination. Without prejudice to any other rights, Microsoft may +terminate this EULA if you fail to comply with the terms and conditions of +this EULA. In such event, you must destroy all copies of the SOFTWARE +PRODUCT and all of its component parts. + +3. COPYRIGHT. All title and copyrights in and to the SOFTWARE PRODUCT +(including but not limited to any images, text, and "applets" incorporated +into the SOFTWARE PRODUCT), the accompanying printed materials, and any +copies of the SOFTWARE PRODUCT are owned by Microsoft or its suppliers. The +SOFTWARE PRODUCT is protected by copyright laws and international treaty +provisions. Therefore, you must treat the SOFTWARE PRODUCT like any other +copyrighted material. + +4. U.S. GOVERNMENT RESTRICTED RIGHTS. The SOFTWARE PRODUCT and +documentation are provided with RESTRICTED RIGHTS. Use, duplication, or +disclosure by the Government is subject to restrictions as set forth in +subparagraph (c)(1)(ii) of the Rights in Technical Data and Computer +Software clause at DFARS 252.227-7013 or subparagraphs (c)(1) and (2) of the +Commercial Computer Software-Restricted Rights at 48 CFR 52.227-19, as +applicable. Manufacturer is Microsoft Corporation/One Microsoft Way/Redmond, +WA 98052-6399. + +LIMITED WARRANTY + +NO WARRANTIES. Microsoft expressly disclaims any warranty for the SOFTWARE +PRODUCT. The SOFTWARE PRODUCT and any related documentation is provided "as +is" without warranty of any kind, either express or implied, including, +without limitation, the implied warranties or merchantability, fitness for a +particular purpose, or noninfringement. The entire risk arising out of use +or performance of the SOFTWARE PRODUCT remains with you. + +NO LIABILITY FOR CONSEQUENTIAL DAMAGES. In no event shall Microsoft or its +suppliers be liable for any damages whatsoever (including, without +limitation, damages for loss of business profits, business interruption, +loss of business information, or any other pecuniary loss) arising out of +the use of or inability to use this Microsoft product, even if Microsoft has +been advised of the possibility of such damages. Because some +states/jurisdictions do not allow the exclusion or limitation of liability +for consequential or incidental damages, the above limitation may not apply +to you. + +MISCELLANEOUS If you acquired this product in the United States, this EULA +is governed by the laws of the State of Washington. If this product was +acquired outside the United States, then local laws may apply. Should you +have any questions concerning this EULA, or if you desire to contact +Microsoft for any reason, please contact the Microsoft subsidiary serving +your country, or write: Microsoft Sales Information Center/One Microsoft +Way/Redmond, WA 98052-6399. diff --git a/media-fonts/msttcorefonts/msttcorefonts-1.0.recipe b/media-fonts/msttcorefonts/msttcorefonts-1.0.recipe new file mode 100644 index 000000000..4b67952e5 --- /dev/null +++ b/media-fonts/msttcorefonts/msttcorefonts-1.0.recipe @@ -0,0 +1,75 @@ +SUMMARY="Microsoft's TrueType core fonts" +DESCRIPTION="A smart package of Microsoft's core fonts which were \ +once available from http://www.microsoft.com/typography/fontpack/. +It includes: +Andale Mono +Arial Black +Arial (Bold, Italic, Bold Italic) +Comic Sans MS (Bold) +Courier New (Bold, Italic, Bold Italic) +Georgia (Bold, Italic, Bold Italic) +Impact +Times New Roman (Bold, Italic, Bold Italic) +Trebuchet (Bold, Italic, Bold Italic) +Verdana (Bold, Italic, Bold Italic) +Webdings +" +HOMEPAGE="http://corefonts.sourceforge.net" +SRC_URI="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/andale32.exe#noarchive" +SRC_URI_2="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/arial32.exe#noarchive" +SRC_URI_3="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/arialb32.exe#noarchive" +SRC_URI_4="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/comic32.exe#noarchive" +SRC_URI_5="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/courie32.exe#noarchive" +SRC_URI_6="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/georgi32.exe#noarchive" +SRC_URI_7="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/impact32.exe#noarchive" +SRC_URI_8="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/times32.exe#noarchive" +SRC_URI_9="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/trebuc32.exe#noarchive" +SRC_URI_10="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/verdan32.exe#noarchive" +SRC_URI_11="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/wd97vwr32.exe#noarchive" +SRC_URI_12="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/webdin32.exe#noarchive" +CHECKSUM_SHA256="0524fe42951adc3a7eb870e32f0920313c71f170c859b5f770d82b4ee111e970" +CHECKSUM_SHA256_2="85297a4d146e9c87ac6f74822734bdee5f4b2a722d7eaa584b7f2cbf76f478f6" +CHECKSUM_SHA256_3="a425f0ffb6a1a5ede5b979ed6177f4f4f4fdef6ae7c302a7b7720ef332fec0a8" +CHECKSUM_SHA256_4="9c6df3feefde26d4e41d4a4fe5db2a89f9123a772594d7f59afd062625cd204e" +CHECKSUM_SHA256_5="bb511d861655dde879ae552eb86b134d6fae67cb58502e6ff73ec5d9151f3384" +CHECKSUM_SHA256_6="2c2c7dcda6606ea5cf08918fb7cd3f3359e9e84338dc690013f20cd42e930301" +CHECKSUM_SHA256_7="6061ef3b7401d9642f5dfdb5f2b376aa14663f6275e60a51207ad4facf2fccfb" +CHECKSUM_SHA256_8="db56595ec6ef5d3de5c24994f001f03b2a13e37cee27bc25c58f6f43e8f807ab" +CHECKSUM_SHA256_9="5a690d9bb8510be1b8b4fe49f1f2319651fe51bbe54775ddddd8ef0bd07fdac9" +CHECKSUM_SHA256_10="c1cb61255e363166794e47664e2f21af8e3a26cb6346eb8d2ae2fa85dd5aad96" +CHECKSUM_SHA256_11="f61126a6d17b2d126a7f31b142504dce4934f7989c55f1c13c6477b3fe80b3d2" +CHECKSUM_SHA256_12="64595b5abc1080fba8610c5c34fab5863408e806aafe84653ca8575bed17d75a" +LICENSE="MSttfEULA" +COPYRIGHT="Microsoft Corporation" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="msttcorefonts = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + coreutils + cmd:cabextract + cmd:find + " + +SOURCE_DIR="" + +BUILD() +{ + for i in `ls -d ../sources*`; do + pushd $i + mkdir -p cabcontents + cabextract --lowercase --directory=cabcontents *.exe + popd + done +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + cp `find ../sources* -type f -name \*.ttf` ${FONTDIR} +} From f95ee34651c3a299afa337d4a38db3d78818ef32 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Mon, 5 Jan 2015 17:22:34 +0000 Subject: [PATCH 71/75] croscorefonts: fix recipe * Remove checksums as these archives are generated on the fly, and add a comment stating the same. --- media-fonts/croscorefonts/croscorefonts-1.21.0.recipe | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe b/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe index 3282e1740..fe877a099 100644 --- a/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe +++ b/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe @@ -3,12 +3,11 @@ DESCRIPTION="Open licensed fonts metrically compatible with MS corefonts.\ Included fonts are Arimo, Cousine and Timo. \ They are also called Chrome OS core fonts." HOMEPAGE="http://en.wikipedia.org/wiki/Croscore_fonts" +# We don't list the checksums below intentionally as these archives are generated +# on the fly. SRC_URI_1="http://www.google.com/fonts/download?kit=32ci3aiii8TFh9L2O_kK1w" -CHECKSUM_SHA256_1="800bbc41f20dce6c7f61dcd54489a8d8db5d701d9918a3a412d430d044eca2bb", SRC_URI_2="http://www.google.com/fonts/download?kit=M2CeFoF86bDfqp_rSFi-T6CWcynf_cDxXwCLxiixG1c" -CHECKSUM_SHA256_2="bc0b9e33073e91d89abe6d780d0cff7a55d1cf05d9f792d5d221af426abb915f" SRC_URI_3="http://www.google.com/fonts/download?kit=2Cuw8DPRXKIbXwFmqbUecA" -CHECKSUM_SHA256_3="89619d3f06b55495e94458eb8fbd69ae7c654db5782b2cecfdaffa2c8b291c1b" SOURCE_DIR="" From 1e2ba88b11d8de96b9dd334ecb92de13c131c9d4 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Mon, 5 Jan 2015 17:54:55 +0000 Subject: [PATCH 72/75] scheherazade_font: update recipe --- .../scheherazade_font-1.005.recipe | 45 +++++++++++++++---- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe index 40681b41d..eac1d2568 100644 --- a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe +++ b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe @@ -1,24 +1,51 @@ +SUMMARY="Arabic script font." DESCRIPTION=" -Arabic script font. +Scheherazade, named after the heroine of the classic Arabian Nights tale, \ +is designed in a similar style to traditional typefaces such as Monotype Naskh, \ +extended to cover the full Unicode Arabic repertoire +The goal for this product was to provide a single Unicode-based font family \ +that would contain a comprehensive inventory of glyphs needed for almost any \ +Arabic-based writing system. This font makes use of state-of-the-art font \ +technologies to support complex typographic issues. +This font provides a simplified rendering of Arabic script, using basic \ +connecting glyphs but not including a wide variety of additional ligatures \ +or contextual alternates (only the required lam-alef ligatures). This \ +simplified style is often preferred for clarity, especially in non-Arabic \ +languages, but may be considered unattractive in more traditional and \ +literate communities. +One font from this typeface family is included in this release: + * Scheherazade Regular +This release supports virtually all of the Unicode 5.0 Arabic character \ +repertoire (excluding the Arabic Presentation Forms blocks, which are not \ +recommended for normal use). Font smarts are implemented using OpenType \ +technology. " HOMEPAGE="http://scripts.sil.org/ArabicFonts_Download" SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Scheherazade_OT_1_005&filename=ScherazadeRegOT-1.005.zip" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="3c7e7d7f93802162effe2b517af98be0" +CHECKSUM_SHA256="5d621578fb946473492c3bd1f1a59fe55080dd7949e3bf28af01fa4fe2859e8b" +REVISION="3" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2004-2011 SIL International" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="scheherazade_font = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" BUILD() { - echo "No building required." + true } INSTALL() { FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} - cp -r *.ttf ${FONTDIR} + cp *.ttf ${FONTDIR} } -LICENSE="SIL Open Font License v1.1" -COPYRIGHT="2004-2011 SIL International" From f4b507fd1a54db5a83d3841d542d27fd8e7ed633 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Mon, 5 Jan 2015 17:55:26 +0000 Subject: [PATCH 73/75] Add a new font family, Fira Adds fonts: * Fira Sans * Fira Mono --- .../fira_fonts/fira_fonts-3.111.recipe | 36 +++++++ .../licenses/SIL Open Font License v1.1 | 99 +++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 media-fonts/fira_fonts/fira_fonts-3.111.recipe create mode 100644 media-fonts/fira_fonts/licenses/SIL Open Font License v1.1 diff --git a/media-fonts/fira_fonts/fira_fonts-3.111.recipe b/media-fonts/fira_fonts/fira_fonts-3.111.recipe new file mode 100644 index 000000000..227ce6e37 --- /dev/null +++ b/media-fonts/fira_fonts/fira_fonts-3.111.recipe @@ -0,0 +1,36 @@ +SUMMARY="The Fira font" +DESCRIPTION=" +Designed to integrate with the character of Mozilla's Firefox OS, the \ +Fira Sans typeface also aims to cover the legibility needs for a large range of \ +handsets varying in screen quality and rendering. When working with Fira Sans \ +it is recommended that micro font sizes that fall below our guidelines are avoided. +This also includes the Fira Mono typeface. +" +HOMEPAGE="http://www.carrois.com/fira-3-1/" +SRC_URI="http://www.carrois.com/wordpress/downloads/fira_3_1/FiraFonts3111.zip" +CHECKSUM_SHA256="3ced3df236b0b0eec1b390885c53ac02f3e3f830e9449414230717334a0b2457" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2014, Mozilla Foundation, Telefonica S.A." +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="fira_fonts = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/otfonts + mkdir -p ${FONTDIR} + cp */*/OTF/*.otf ${FONTDIR} +} diff --git a/media-fonts/fira_fonts/licenses/SIL Open Font License v1.1 b/media-fonts/fira_fonts/licenses/SIL Open Font License v1.1 new file mode 100644 index 000000000..b4a39671e --- /dev/null +++ b/media-fonts/fira_fonts/licenses/SIL Open Font License v1.1 @@ -0,0 +1,99 @@ +Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ +with Reserved Font Name Fira Sans. + +Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ +with Reserved Font Name Fira Mono. + +Copyright (c) 2014, Telefonica S.A. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. From 471d29ccc92c55f60debb7b084420c1a28be20cf Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 6 Jan 2015 17:38:54 +0100 Subject: [PATCH 74/75] Add ColorCode recipe --- games-puzzle/colorcode/colorcode-0.7.2.recipe | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 games-puzzle/colorcode/colorcode-0.7.2.recipe diff --git a/games-puzzle/colorcode/colorcode-0.7.2.recipe b/games-puzzle/colorcode/colorcode-0.7.2.recipe new file mode 100644 index 000000000..ee898101d --- /dev/null +++ b/games-puzzle/colorcode/colorcode-0.7.2.recipe @@ -0,0 +1,61 @@ +SUMMARY="A free advanced MasterMind clone." +DESCRIPTION="ColorCode is a free advanced MasterMind clone with lots of \ +different game variants, from the very easy up to really challenging ones. \ +You can combine any color count from 2-10 with any column count from 2-5 and \ +allow or not pegs of the same color. Or you may select one of the 5 \ +predefined levels of difficulty. ColorCode has also a rather intelligent \ +built in MasterMind solver - so you can let the computer guess for you \ +(nope, he's not cheating - really)." +HOMEPAGE="http://colorcode.laebisch.com/" +SRC_URI="http://colorcode.laebisch.com/download/ColorCode-0.7.2.tar.gz" +CHECKSUM_SHA256="d1c5bf4d65c81de16c4159c2c69c096fc7ff47cca587d7233985e078d63c79aa" +SOURCE_DIR="ColorCode-0.7.2" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="2009-2011 Dirk Laebisch" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + colorcode = $portVersion + app:ColorCode = $portVersion +" + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libqtcore$secondaryArchSuffix < 5 + lib:libqtgui$secondaryArchSuffix < 5 +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libqtcore$secondaryArchSuffix < 5 + devel:libqtgui$secondaryArchSuffix < 5 +" + +BUILD_PREREQUIRES=" + cmd:qmake$secondaryArchSuffix + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix +" + +BUILD() +{ + qmake + make +} + +INSTALL() +{ + mkdir -p $appsDir + cp colorcode $appsDir/ColorCode + addAppDeskbarSymlink $appsDir/ColorCode ColorCode +} From b34ac53c977565c4cbfae30720d46cc9eaca972c Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 6 Jan 2015 18:05:35 +0100 Subject: [PATCH 75/75] ColorCode: Add icon --- .../colorcode/additional-files/colorcode.rdef | 25 +++++++++++++++++++ games-puzzle/colorcode/colorcode-0.7.2.recipe | 5 ++++ 2 files changed, 30 insertions(+) create mode 100644 games-puzzle/colorcode/additional-files/colorcode.rdef diff --git a/games-puzzle/colorcode/additional-files/colorcode.rdef b/games-puzzle/colorcode/additional-files/colorcode.rdef new file mode 100644 index 000000000..506aa6980 --- /dev/null +++ b/games-puzzle/colorcode/additional-files/colorcode.rdef @@ -0,0 +1,25 @@ +resource app_signature "application/x-vnd.colorcode"; + +resource vector_icon array { + $"6E6369660505C60201040200FF5959FFFF06060201140200DAFFEA0200040200" + $"F9FF6EFFFFF95902010402FF6DD0FF0044ADFF060204402262221E222240221E" + $"2262405E1E5E625E5E405E625E1E0204C52128C7A828C2992842BAC542B83D42" + $"BD4CC5213FC2993FC7A83F59BAC559BD4C59B83D0204BA5F27BCE627B7D72727" + $"BA5F27B7D727BCE6BA5F3EB7D73EBCE63E3EBA5F3EBCE63EB7D70204BA5F42BC" + $"E642B7D74227C52127C29927C7A8BA5F59B7D759BCE6593EC5213EC7A83EC299" + $"0204C52142C7A842C2994242C52142C29942C7A8C52159C29959C7A85959C521" + $"59C7A859C2990A042222225E5E5E5E22050A000100000A040102000A03010100" + $"0A010103000A02010400" +}; + +resource app_version { + major = 0, + middle = 7, + minor = 2, + + variety = B_APPV_FINAL, + internal = 0, + + short_info = "ColorCode", + long_info = "ColorCode ©2009-2011 Dirk Laebisch" +}; diff --git a/games-puzzle/colorcode/colorcode-0.7.2.recipe b/games-puzzle/colorcode/colorcode-0.7.2.recipe index ee898101d..ee96fb931 100644 --- a/games-puzzle/colorcode/colorcode-0.7.2.recipe +++ b/games-puzzle/colorcode/colorcode-0.7.2.recipe @@ -45,6 +45,7 @@ BUILD_PREREQUIRES=" cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:xres " BUILD() @@ -57,5 +58,9 @@ INSTALL() { mkdir -p $appsDir cp colorcode $appsDir/ColorCode + + addResourcesToBinaries $portDir/additional-files/colorcode.rdef \ + $appsDir/ColorCode + addAppDeskbarSymlink $appsDir/ColorCode ColorCode }