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 + 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 \ 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() 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 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 + 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" 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/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 + " 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..06f16e7ae --- /dev/null +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -0,0 +1,49 @@ +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 + 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 + cmd:sed + cmd:wget + cmd:md5sum + " + +BUILD() +{ + ./configure --prefix=$prefix --with-lua=$binDir --with-lua-include=$includeDir --with-lua-lib=$libDir + make build +} +INSTALL() +{ + make install +} + +LICENSE="MIT" +COPYRIGHT="2007-2014 Kepler Project" 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..a55fdbf09 --- /dev/null +++ b/dev-util/app2png/app2png-1.0.0.recipe @@ -0,0 +1,41 @@ +SUMMARY="Turn legacy BeOS application icons into PNGs" +DESCRIPTION="\ +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" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2015 Puck Meerburg" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + app2png = $portVersion + cmd: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 +} 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 + 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 new file mode 100644 index 000000000..ee96fb931 --- /dev/null +++ b/games-puzzle/colorcode/colorcode-0.7.2.recipe @@ -0,0 +1,66 @@ +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 + cmd:xres +" + +BUILD() +{ + qmake + make +} + +INSTALL() +{ + mkdir -p $appsDir + cp colorcode $appsDir/ColorCode + + addResourcesToBinaries $portDir/additional-files/colorcode.rdef \ + $appsDir/ColorCode + + addAppDeskbarSymlink $appsDir/ColorCode ColorCode +} 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 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 - " 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 +} 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..2c36255c9 --- /dev/null +++ b/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe @@ -0,0 +1,56 @@ +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#ecd4b2dd31f3ec578f16c9a1c3a95e281958a248" +CHECKSUM_SHA256="" +LICENSE="SimplyVorbis" +COPYRIGHT="2007 Darkwyrm" +REVISION="2" + +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 $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cp objects/SimplyVorbis $appsDir + + addAppDeskbarSymlink $appsDir/SimplyVorbis +} 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 +} 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} +} 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="" 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. 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 +} + 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} +} 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} +} 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_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} +} 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/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} +} 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} +} 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" 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 + 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 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 + 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 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 } 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 + " 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 +} 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 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 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..b04fde642 --- /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="011e60e9ba3ce92af766adc222d55a6f7291991a85074e2b5b280b62317b201d" +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 + + # 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. +" 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 + 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");