From e7de333bb512ac6af8081d7c70e84972fbe917ba Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Wed, 4 Dec 2013 21:02:07 +0100 Subject: [PATCH 001/206] Add MinimizeAll recipe --- .../minimizeall/minimizeall-1.0.0.recipe | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 haiku-apps/minimizeall/minimizeall-1.0.0.recipe diff --git a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe new file mode 100644 index 000000000..58bb1f9d8 --- /dev/null +++ b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe @@ -0,0 +1,71 @@ +SUMMARY="Minimize all your apps with the press of a button!" +DESCRIPTION=" + MinimizeAll is a small app that minimizes all your apps with + the press of a button on the Deskbar, or with a keypress. + The app contains two parts: A standalone app that minimizes the whole app, + and a replicant for your Deskbar. Both do the same: Minimize all your apps! + " + +HOMEPAGE="https://github.com/HaikuArchives/MinimizeAll/" +SRC_URI="git://github.com/HaikuArchives/MinimizeAll.git#12fefdf26131375f695693a680bf01edb35d57a9" + +REVISION="1" + +COPYRIGHT=" + 2001-2008 Werner Freytag + 2009 Haiku + " + +LICENSE="MIT" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + MinimizeAll = $portVersion + app:MinimizeAll = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:xres + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD() +{ + cd trunk + mkdir bin || true + + # Step 1 - Building the app + cd app + gcc -o ../bin/MinimizeAll -lbe main.cpp ../minimize.cpp + rc -o ../bin/MinimizeAll.rsrc Application.rdef + xres -o ../bin/MinimizeAll ../bin/MinimizeAll.rsrc + mimeset -f ../bin/MinimizeAll + cd .. + + # Step 2 - The DeskBar AddOn! + cd "deskbar add-on" + gcc -o ../bin/DeskbarAddOn -lbe DeskbarView.cpp ../minimize.cpp + rc -o ../bin/DeskbarAddOn.rsrc DeskbarAddOn.rdef + xres -o ../bin/DeskbarAddOn ../bin/DeskbarAddOn.rsrc + mimeset -f ../bin/DeskbarAddOn + cd .. + +} + +INSTALL() +{ + mkdir -p $appsDir/MinimizeAll + cp trunk/bin/MinimizeAll $appsDir/MinimizeAll/MinimizeAll + cp trunk/bin/DeskbarAddOn $appsDir/MinimizeAll/DeskbarAddOn + addAppDeskbarSymlink $appsDir/MinimizeAll/MinimizeAll + mkdir -p "$dataDir/deskbar/menu/Desktop applets" + ln -s $appsDir/MinimizeAll/DeskbarAddOn "$dataDir/deskbar/menu/Desktop applets/MinimizeAll" +} From 2e73f49b66f31b0bf891595f37b4e57a26a16408 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Fri, 6 Dec 2013 17:44:16 -0500 Subject: [PATCH 002/206] Create Randomizer recipe Work done by GCI student Luke --- .../patches/randomizer-1.0.0b1.patch | 145 ++++++++++++++++++ .../randomizer/randomizer-1.0.0b1.recipe | 54 +++++++ 2 files changed, 199 insertions(+) create mode 100644 haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch create mode 100644 haiku-apps/randomizer/randomizer-1.0.0b1.recipe diff --git a/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch b/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch new file mode 100644 index 000000000..5c939d24a --- /dev/null +++ b/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch @@ -0,0 +1,145 @@ +From f826308b984f415dce6680aad5e15e6a1795f7f3 Mon Sep 17 00:00:00 2001 +From: Luke +Date: Fri, 6 Dec 2013 00:19:26 +0000 +Subject: [PATCH] Add makefile + +--- + src/makefile | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 126 insertions(+) + create mode 100644 src/makefile + +diff --git a/src/makefile b/src/makefile +new file mode 100644 +index 0000000..18dfc48 +--- /dev/null ++++ b/src/makefile +@@ -0,0 +1,126 @@ ++## BeOS Generic Makefile v2.3 ## ++ ++## Fill in this file to specify the project being created, and the referenced ++## makefile-engine will do all of the hard work for you. This handles both ++## Intel and PowerPC builds of the BeOS and Haiku. ++ ++## Application Specific Settings --------------------------------------------- ++ ++# specify the name of the binary ++NAME=Randomizer ++ ++# specify the type of binary ++# APP: Application ++# SHARED: Shared library or add-on ++# STATIC: Static library archive ++# DRIVER: Kernel Driver ++TYPE=APP ++ ++# add support for new Pe and Eddie features ++# to fill in generic makefile ++ ++#%{ ++# @src->@ ++ ++# specify the source files to use ++# full paths or paths relative to the makefile can be included ++# all files, regardless of directory, will have their object ++# files created in the common object directory. ++# Note that this means this makefile will not work correctly ++# if two source files with the same name (source.c or source.cpp) ++# are included from different directories. Also note that spaces ++# in folder names do not work well with this makefile. ++SRCS=App.cpp AppView.cpp AppWindow.cpp Generator.cpp main.cpp \ ++RandoBox.cpp RandoMenuBar.cpp RandoTextView.cpp ++ ++# specify the resource definition files to use ++# full path or a relative path to the resource file can be used. ++RDEFS= ++ ++# specify the resource files to use. ++# full path or a relative path to the resource file can be used. ++# both RDEFS and RSRCS can be defined in the same makefile. ++RSRCS=Randomizer.rsrc ++ ++# @<-src@ ++#%} ++ ++# end support for Pe and Eddie ++ ++# specify additional libraries to link against ++# there are two acceptable forms of library specifications ++# - if your library follows the naming pattern of: ++# libXXX.so or libXXX.a you can simply specify XXX ++# library: libbe.so entry: be ++# ++# - if your library does not follow the standard library ++# naming scheme you need to specify the path to the library ++# and it's name ++# library: my_lib.a entry: my_lib.a or path/my_lib.a ++LIBS=be $(STDCPPLIBS) ++ ++# specify additional paths to directories following the standard ++# libXXX.so or libXXX.a naming scheme. You can specify full paths ++# or paths relative to the makefile. The paths included may not ++# be recursive, so include all of the paths where libraries can ++# be found. Directories where source files are found are ++# automatically included. ++LIBPATHS= ++ ++# additional paths to look for system headers ++# thes use the form: #include
++# source file directories are NOT auto-included here ++SYSTEM_INCLUDE_PATHS = ++ ++# additional paths to look for local headers ++# thes use the form: #include "header" ++# source file directories are automatically included ++LOCAL_INCLUDE_PATHS = ++ ++# specify the level of optimization that you desire ++# NONE, SOME, FULL ++OPTIMIZE= ++ ++# specify any preprocessor symbols to be defined. The symbols will not ++# have their values set automatically; you must supply the value (if any) ++# to use. For example, setting DEFINES to "DEBUG=1" will cause the ++# compiler option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" ++# would pass "-DDEBUG" on the compiler's command line. ++DEFINES= ++ ++# specify special warning levels ++# if unspecified default warnings will be used ++# NONE = supress all warnings ++# ALL = enable all warnings ++WARNINGS = ++ ++# specify whether image symbols will be created ++# so that stack crawls in the debugger are meaningful ++# if TRUE symbols will be created ++SYMBOLS = ++ ++# specify debug settings ++# if TRUE will allow application to be run from a source-level ++# debugger. Note that this will disable all optimzation. ++DEBUGGER = ++ ++# specify additional compiler flags for all files ++COMPILER_FLAGS = ++ ++# specify additional linker flags ++LINKER_FLAGS = ++ ++# specify the version of this particular item ++# (for example, -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL") ++# This may also be specified in a resource. ++APP_VERSION = ++ ++# (for TYPE == DRIVER only) Specify desired location of driver in the /dev ++# hierarchy. Used by the driverinstall rule. E.g., DRIVER_PATH = video/usb will ++# instruct the driverinstall rule to place a symlink to your driver's binary in ++# ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will appear at ++# /dev/video/usb when loaded. Default is "misc". ++DRIVER_PATH = ++ ++## include the makefile-engine ++include $(BUILDHOME)/etc/makefile-engine +-- +1.8.3.4 + diff --git a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe new file mode 100644 index 000000000..5a0e80f7e --- /dev/null +++ b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe @@ -0,0 +1,54 @@ +SUMMARY="A random symbol sequence generator" +DESCRIPTION=" + Randomizer is a random symbol sequence generator. You can create + sequences of any given length, and control what characters are used. + + This program can be used for many purposes, such as for generating + random passwords or random numbers. + " +HOMEPAGE="https://code.google.com/p/randomizer/" +SRC_URI="svn+http://randomizer.googlecode.com/svn/trunk/@r12" +LICENSE="MIT" +COPYRIGHT="2005-2009 Sergey S. Kazenyuk" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + randomizer = $portVersion + app:randomizer = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:gcc + makefile_engine + cmd:make + cmd:mkdepend + " + +PATCHES=" + randomizer-1.0.0b1.patch + " + +SRC_FILENAME="download" + +BUILD() +{ + cd src + make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + cd src + architecture=${buildArchitecture/_/-} + mkdir -p $appsDir + cp objects.$architecture-release/Randomizer $appsDir + addAppDeskbarSymlink $appsDir/Randomizer +} From 677d745877ae503bffceee8c090d52ffb41c0066 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sat, 7 Dec 2013 08:10:53 -0500 Subject: [PATCH 003/206] Build Randomizer in current directory --- .../randomizer/patches/randomizer-1.0.0b1.patch | 14 ++++++++------ haiku-apps/randomizer/randomizer-1.0.0b1.recipe | 4 +--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch b/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch index 5c939d24a..0951e990f 100644 --- a/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch +++ b/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch @@ -1,19 +1,19 @@ -From f826308b984f415dce6680aad5e15e6a1795f7f3 Mon Sep 17 00:00:00 2001 +From 24da7eed9c8cd793d4f873100584b70ea11d4458 Mon Sep 17 00:00:00 2001 From: Luke -Date: Fri, 6 Dec 2013 00:19:26 +0000 +Date: Sat, 7 Dec 2013 13:04:48 +0000 Subject: [PATCH] Add makefile --- - src/makefile | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 126 insertions(+) + src/makefile | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 128 insertions(+) create mode 100644 src/makefile diff --git a/src/makefile b/src/makefile new file mode 100644 -index 0000000..18dfc48 +index 0000000..c6df5ad --- /dev/null +++ b/src/makefile -@@ -0,0 +1,126 @@ +@@ -0,0 +1,128 @@ +## BeOS Generic Makefile v2.3 ## + +## Fill in this file to specify the project being created, and the referenced @@ -138,6 +138,8 @@ index 0000000..18dfc48 +# /dev/video/usb when loaded. Default is "misc". +DRIVER_PATH = + ++TARGET_DIR = . ++ +## include the makefile-engine +include $(BUILDHOME)/etc/makefile-engine -- diff --git a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe index 5a0e80f7e..544b91c46 100644 --- a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe +++ b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe @@ -46,9 +46,7 @@ BUILD() INSTALL() { - cd src - architecture=${buildArchitecture/_/-} mkdir -p $appsDir - cp objects.$architecture-release/Randomizer $appsDir + cp src/Randomizer $appsDir addAppDeskbarSymlink $appsDir/Randomizer } From d748abc58d886a904fc3df17ee9751f91fa03b99 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Wed, 11 Dec 2013 22:21:55 -0500 Subject: [PATCH 004/206] Update wget script to 1.14 wget-1.14-pod-fixes.patch is from the ArchLinux project. --- net-misc/wget/patches/wget-1.13.4.patch | 71 --- net-misc/wget/patches/wget-1.14-gcc2.patch | 506 ++++++++++++++++++ .../wget/patches/wget-1.14-pod-fixes.patch | 81 +++ .../{wget-1.12.patch => wget-1.14.patch} | 76 +-- net-misc/wget/wget-1.12.recipe | 26 - net-misc/wget/wget-1.13.4.recipe | 22 - net-misc/wget/wget-1.14.recipe | 66 +++ 7 files changed, 696 insertions(+), 152 deletions(-) delete mode 100644 net-misc/wget/patches/wget-1.13.4.patch create mode 100644 net-misc/wget/patches/wget-1.14-gcc2.patch create mode 100644 net-misc/wget/patches/wget-1.14-pod-fixes.patch rename net-misc/wget/patches/{wget-1.12.patch => wget-1.14.patch} (52%) delete mode 100644 net-misc/wget/wget-1.12.recipe delete mode 100644 net-misc/wget/wget-1.13.4.recipe create mode 100644 net-misc/wget/wget-1.14.recipe diff --git a/net-misc/wget/patches/wget-1.13.4.patch b/net-misc/wget/patches/wget-1.13.4.patch deleted file mode 100644 index 3145d84af..000000000 --- a/net-misc/wget/patches/wget-1.13.4.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -urN wget-1.13.4/src/http.c wget-1.13.4-haiku/src/http.c ---- wget-1.13.4/src/http.c 2011-09-07 03:58:01.006291456 -0700 -+++ wget-1.13.4-haiku/src/http.c 2012-03-17 12:20:29.000000000 -0700 -@@ -1046,6 +1046,7 @@ - char separator) - { - const char *p = *source; -+ int param_type; - - while (c_isspace (*p)) ++p; - if (!*p) -@@ -1101,7 +1102,7 @@ - } - *source = p; - -- int param_type = modify_param_name(name); -+ param_type = modify_param_name(name); - if (NOT_RFC2231 != param_type) - { - modify_param_value(value, param_type); -diff -urN wget-1.13.4/src/main.c wget-1.13.4-haiku/src/main.c ---- wget-1.13.4/src/main.c 2011-09-06 06:50:11.004456448 -0700 -+++ wget-1.13.4-haiku/src/main.c 2012-03-17 12:23:37.000000000 -0700 -@@ -913,14 +913,16 @@ - int i, ret, longindex; - int nurl; - bool append_to_log = false; -- -- total_downloaded_bytes = 0; -- -- program_name = argv[0]; -+ int retconf; -+ bool use_userconfig = false; - - struct ptimer *timer = ptimer_new (); - double start_time = ptimer_measure (timer); - -+ total_downloaded_bytes = 0; -+ -+ program_name = argv[0]; -+ - i18n_initialize (); - - /* Construct the name of the executable, without the directory part. */ -@@ -948,8 +950,6 @@ - /* This seperate getopt_long is needed to find the user config - and parse it before the other user options. */ - longindex = -1; -- int retconf; -- bool use_userconfig = false; - - while ((retconf = getopt_long (argc, argv, - short_options, long_options, &longindex)) != -1) -@@ -1432,11 +1432,14 @@ - && - total_downloaded_bytes != 0) - { -+ char *wall_time; -+ char *download_time; - double end_time = ptimer_measure (timer); - ptimer_destroy (timer); -- -- char *wall_time = xstrdup (secs_to_human_time (end_time - start_time)); -- char *download_time = xstrdup (secs_to_human_time (total_download_time)); -+ -+ wall_time = xstrdup (secs_to_human_time (end_time - start_time)); -+ download_time = xstrdup (secs_to_human_time (total_download_time)); -+ - logprintf (LOG_NOTQUIET, - _("FINISHED --%s--\nTotal wall clock time: %s\n" - "Downloaded: %d files, %s in %s (%s)\n"), diff --git a/net-misc/wget/patches/wget-1.14-gcc2.patch b/net-misc/wget/patches/wget-1.14-gcc2.patch new file mode 100644 index 000000000..057eff0bf --- /dev/null +++ b/net-misc/wget/patches/wget-1.14-gcc2.patch @@ -0,0 +1,506 @@ +From 1d23e4b72c66f22da3a87ba2b14bb1b6ffe78b16 Mon Sep 17 00:00:00 2001 +From: Luke +Date: Wed, 11 Dec 2013 03:03:50 +0000 +Subject: [PATCH] Make wget gcc2-friendly + +--- + lib/regcomp.c | 2 +- + src/http.c | 9 ++++-- + src/main.c | 25 +++++++++------ + src/retr.c | 3 +- + src/utils.c | 2 ++ + src/warc.c | 99 +++++++++++++++++++++++++++++++++++++---------------------- + 6 files changed, 89 insertions(+), 51 deletions(-) + +diff --git a/lib/regcomp.c b/lib/regcomp.c +index 1d7a522..76ed566 100644 +--- a/lib/regcomp.c ++++ b/lib/regcomp.c +@@ -952,10 +952,10 @@ static void + internal_function + init_word_char (re_dfa_t *dfa) + { +- dfa->word_ops_used = 1; + int i = 0; + int j; + int ch = 0; ++ dfa->word_ops_used = 1; + if (BE (dfa->map_notascii == 0, 1)) + { + bitset_word_t bits0 = 0x00000000; +diff --git a/src/http.c b/src/http.c +index fa2d5ed..8500a93 100644 +--- a/src/http.c ++++ b/src/http.c +@@ -1076,6 +1076,7 @@ extract_param (const char **source, param_token *name, param_token *value, + char separator) + { + const char *p = *source; ++ int param_type; + + while (c_isspace (*p)) ++p; + if (!*p) +@@ -1131,7 +1132,7 @@ extract_param (const char **source, param_token *name, param_token *value, + } + *source = p; + +- int param_type = modify_param_name(name); ++ param_type = modify_param_name(name); + if (NOT_RFC2231 != param_type) + { + modify_param_value(value, param_type); +@@ -1521,6 +1522,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen, + int warc_payload_offset = 0; + FILE *warc_tmp = NULL; + int warcerr = 0; ++ int flags; + + if (opt.warc_filename != NULL) + { +@@ -1557,7 +1559,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen, + } + + /* Read the response body. */ +- int flags = 0; ++ flags = 0; + if (contlen != -1) + /* If content-length is present, read that much; otherwise, read + until EOF. The HTTP spec doesn't require the server to +@@ -1668,6 +1670,7 @@ static uerr_t + gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, + struct iri *iri, int count) + { ++ int warc_tmp_written; + struct request *req; + + char *type; +@@ -2136,7 +2139,7 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, + warc_payload_offset = ftello (warc_tmp); + + /* Write a copy of the data to the WARC record. */ +- int warc_tmp_written = fwrite (opt.post_data, 1, post_data_size, warc_tmp); ++ warc_tmp_written = fwrite (opt.post_data, 1, post_data_size, warc_tmp); + if (warc_tmp_written != post_data_size) + write_error = -2; + } +diff --git a/src/main.c b/src/main.c +index b8b2869..cff4fa3 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -971,13 +971,20 @@ main (int argc, char **argv) + int i, ret, longindex; + int nurl; + bool append_to_log = false; ++ struct ptimer *timer; ++ double start_time; ++ int arglen; ++ int argstring_length; ++ int retconf; ++ bool use_userconfig = false; ++ char *p; + + total_downloaded_bytes = 0; + + program_name = argv[0]; + +- struct ptimer *timer = ptimer_new (); +- double start_time = ptimer_measure (timer); ++ timer = ptimer_new (); ++ start_time = ptimer_measure (timer); + + i18n_initialize (); + +@@ -999,10 +1006,10 @@ main (int argc, char **argv) + #endif + + /* Construct the arguments string. */ +- int argstring_length = 1; ++ argstring_length = 1; + for (i = 1; i < argc; i++) + argstring_length += strlen (argv[i]) + 2 + 1; +- char *p = program_argstring = malloc (argstring_length * sizeof (char)); ++ p = program_argstring = malloc (argstring_length * sizeof (char)); + if (p == NULL) + { + fprintf (stderr, _("Memory allocation problem\n")); +@@ -1011,7 +1018,7 @@ main (int argc, char **argv) + for (i = 1; i < argc; i++) + { + *p++ = '"'; +- int arglen = strlen (argv[i]); ++ arglen = strlen (argv[i]); + memcpy (p, argv[i], arglen); + p += arglen; + *p++ = '"'; +@@ -1027,8 +1034,6 @@ main (int argc, char **argv) + /* This separate getopt_long is needed to find the user config file + option ("--config") and parse it before the other user options. */ + longindex = -1; +- int retconf; +- bool use_userconfig = false; + + while ((retconf = getopt_long (argc, argv, + short_options, long_options, &longindex)) != -1) +@@ -1597,10 +1602,12 @@ outputting to a regular file.\n")); + total_downloaded_bytes != 0) + { + double end_time = ptimer_measure (timer); ++ char *wall_time; ++ char *download_time; + ptimer_destroy (timer); + +- char *wall_time = xstrdup (secs_to_human_time (end_time - start_time)); +- char *download_time = xstrdup (secs_to_human_time (total_download_time)); ++ wall_time = xstrdup (secs_to_human_time (end_time - start_time)); ++ download_time = xstrdup (secs_to_human_time (total_download_time)); + logprintf (LOG_NOTQUIET, + _("FINISHED --%s--\nTotal wall clock time: %s\n" + "Downloaded: %d files, %s in %s (%s)\n"), +diff --git a/src/retr.c b/src/retr.c +index 6204839..7947a73 100644 +--- a/src/retr.c ++++ b/src/retr.c +@@ -374,8 +374,9 @@ fd_read_body (int fd, FILE *out, wgint toread, wgint startpos, + + if (ret > 0) + { ++ int write_res; + sum_read += ret; +- int write_res = write_data (out, out2, dlbuf, ret, &skip, &sum_written); ++ write_res = write_data (out, out2, dlbuf, ret, &skip, &sum_written); + if (write_res != 0) + { + ret = (write_res == -3) ? -3 : -2; +diff --git a/src/utils.c b/src/utils.c +index 567dc35..736f6e2 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -64,7 +64,9 @@ as that of the covered work. */ + #include + + /* For TIOCGWINSZ and friends: */ ++#ifndef __HAIKU__ + #include ++#endif + #ifdef HAVE_TERMIOS_H + # include + #endif +diff --git a/src/warc.c b/src/warc.c +index 69f80be..0cf9e53 100644 +--- a/src/warc.c ++++ b/src/warc.c +@@ -154,10 +154,11 @@ warc_write_buffer (const char *buffer, size_t size) + static bool + warc_write_string (const char *str) + { ++ size_t n; + if (!warc_write_ok) + return false; + +- size_t n = strlen (str); ++ n = strlen (str); + if (n != warc_write_buffer (str, n)) + warc_write_ok = false; + +@@ -246,6 +247,9 @@ warc_write_block_from_file (FILE *data_in) + { + /* Add the Content-Length header. */ + char *content_length; ++ char buffer[BUFSIZ]; ++ size_t s; ++ + fseeko (data_in, 0L, SEEK_END); + if (! asprintf (&content_length, "%ld", ftello (data_in))) + { +@@ -262,8 +266,6 @@ warc_write_block_from_file (FILE *data_in) + warc_write_ok = false; + + /* Copy the data in the file to the WARC record. */ +- char buffer[BUFSIZ]; +- size_t s; + while (warc_write_ok && (s = fread (buffer, 1, BUFSIZ, data_in)) > 0) + { + if (warc_write_buffer (buffer, s) < s) +@@ -288,6 +290,12 @@ warc_write_end_record (void) + /* We start a new gzip stream for each record. */ + if (warc_write_ok && warc_current_gzfile) + { ++ size_t result; ++ char static_header[GZIP_STATIC_HEADER_SIZE]; ++ off_t current_offset; ++ off_t uncompressed_size; ++ off_t compressed_size; ++ char extra_header[EXTRA_GZIP_HEADER_SIZE]; + if (gzclose (warc_current_gzfile) != Z_OK) + { + warc_write_ok = false; +@@ -313,17 +321,16 @@ warc_write_end_record (void) + */ + + /* Calculate the uncompressed and compressed sizes. */ +- off_t current_offset = ftello (warc_current_file); +- off_t uncompressed_size = current_offset - warc_current_gzfile_offset; +- off_t compressed_size = warc_current_gzfile_uncompressed_size; ++ current_offset = ftello (warc_current_file); ++ uncompressed_size = current_offset - warc_current_gzfile_offset; ++ compressed_size = warc_current_gzfile_uncompressed_size; + + /* Go back to the static GZIP header. */ + fseeko (warc_current_file, warc_current_gzfile_offset + + EXTRA_GZIP_HEADER_SIZE, SEEK_SET); + + /* Read the header. */ +- char static_header[GZIP_STATIC_HEADER_SIZE]; +- size_t result = fread (static_header, 1, GZIP_STATIC_HEADER_SIZE, ++ result = fread (static_header, 1, GZIP_STATIC_HEADER_SIZE, + warc_current_file); + if (result != GZIP_STATIC_HEADER_SIZE) + { +@@ -340,7 +347,6 @@ warc_write_end_record (void) + fwrite (static_header, 1, GZIP_STATIC_HEADER_SIZE, warc_current_file); + + /* Prepare the extra GZIP header. */ +- char extra_header[EXTRA_GZIP_HEADER_SIZE]; + /* XLEN, the length of the extra header fields. */ + extra_header[0] = ((EXTRA_GZIP_HEADER_SIZE - 2) & 255); + extra_header[1] = ((EXTRA_GZIP_HEADER_SIZE - 2) >> 8) & 255; +@@ -649,13 +655,15 @@ warc_write_warcinfo_record (char *filename) + /* Write warc-info record as the first record of the file. */ + /* We add the record id of this info record to the other records in the + file. */ ++ char timestamp[22]; ++ char *filename_copy, *filename_basename; ++ FILE *warc_tmp; ++ + warc_current_warcinfo_uuid_str = (char *) malloc (48); + warc_uuid_str (warc_current_warcinfo_uuid_str); + +- char timestamp[22]; + warc_timestamp (timestamp); + +- char *filename_copy, *filename_basename; + filename_copy = strdup (filename); + filename_basename = strdup (basename (filename_copy)); + +@@ -667,7 +675,7 @@ warc_write_warcinfo_record (char *filename) + warc_write_header ("WARC-Filename", filename_basename); + + /* Create content. */ +- FILE *warc_tmp = warc_tempfile (); ++ warc_tmp = warc_tempfile (); + if (warc_tmp == NULL) + { + free (filename_copy); +@@ -717,6 +725,10 @@ warc_write_warcinfo_record (char *filename) + static bool + warc_start_new_file (bool meta) + { ++ int base_filename_length; ++ char *new_filename; ++ const char *extension; ++ + if (opt.warc_filename == NULL) + return false; + +@@ -729,15 +741,15 @@ warc_start_new_file (bool meta) + + warc_current_file_number++; + +- int base_filename_length = strlen (opt.warc_filename); ++ base_filename_length = strlen (opt.warc_filename); + /* filename format: base + "-" + 5 digit serial number + ".warc.gz" */ +- char *new_filename = malloc (base_filename_length + 1 + 5 + 8 + 1); ++ new_filename = malloc (base_filename_length + 1 + 5 + 8 + 1); + warc_current_filename = new_filename; + + #ifdef HAVE_LIBZ +- const char *extension = (opt.warc_compression_enabled ? "warc.gz" : "warc"); ++ extension = (opt.warc_compression_enabled ? "warc.gz" : "warc"); + #else +- const char *extension = "warc"; ++ extension = "warc"; + #endif + + /* If max size is enabled, we add a serial number to the file names. */ +@@ -811,9 +823,9 @@ static bool + warc_parse_cdx_header (char *lineptr, int *field_num_original_url, + int *field_num_checksum, int *field_num_record_id) + { +- *field_num_original_url = -1; +- *field_num_checksum = -1; +- *field_num_record_id = -1; ++ off_t *field_num_original_url = -1; ++ off_t *field_num_checksum = -1; ++ off_t *field_num_record_id = -1; + + char *token; + char *save_ptr; +@@ -860,10 +872,12 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, + + char *token; + char *save_ptr; ++ int field_num; ++ + token = strtok_r (lineptr, CDX_FIELDSEP, &save_ptr); + + /* Read this line to get the fields we need. */ +- int field_num = 0; ++ field_num = 0; + while (token != NULL) + { + char **val; +@@ -926,10 +940,7 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, + static bool + warc_load_cdx_dedup_file (void) + { +- FILE *f = fopen (opt.warc_cdx_dedup_filename, "r"); +- if (f == NULL) +- return false; +- ++ FILE *f; + int field_num_original_url = -1; + int field_num_checksum = -1; + int field_num_record_id = -1; +@@ -938,6 +949,10 @@ warc_load_cdx_dedup_file (void) + size_t n = 0; + ssize_t line_length; + ++ f = fopen (opt.warc_cdx_dedup_filename, "r"); ++ if (f == NULL) ++ return false; ++ + /* The first line should contain the CDX header. + Format: " CDX x x x x x" + where x are field type indicators. For our purposes, we only +@@ -965,6 +980,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); + } + else + { ++ int nrecords; + /* Initialize the table. */ + warc_cdx_dedup_table = hash_table_new (1000, warc_hash_sha1_digest, + warc_cmp_sha1_digest); +@@ -982,7 +998,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); + while (line_length != -1); + + /* Print results. */ +- int nrecords = hash_table_count (warc_cdx_dedup_table); ++ nrecords = hash_table_count (warc_cdx_dedup_table); + logprintf (LOG_VERBOSE, ngettext ("Loaded %d record from CDX.\n\n", + "Loaded %d records from CDX.\n\n", + nrecords), +@@ -1002,12 +1018,14 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); + static struct warc_cdx_record * + warc_find_duplicate_cdx_record (char *url, char *sha1_digest_payload) + { ++ char *key; ++ struct warc_cdx_record *rec_existing; ++ int found; ++ + if (warc_cdx_dedup_table == NULL) + return NULL; + +- char *key; +- struct warc_cdx_record *rec_existing; +- int found = hash_table_get_pair (warc_cdx_dedup_table, sha1_digest_payload, ++ found = hash_table_get_pair (warc_cdx_dedup_table, sha1_digest_payload, + &key, &rec_existing); + + if (found && strcmp (rec_existing->url, url) == 0) +@@ -1079,11 +1097,13 @@ warc_init (void) + static void + warc_write_metadata (void) + { ++ char manifest_uuid [48]; ++ FILE * warc_tmp_fp; ++ + /* If there are multiple WARC files, the metadata should be written to a separate file. */ + if (opt.warc_maxsize > 0) + warc_start_new_file (true); + +- char manifest_uuid [48]; + warc_uuid_str (manifest_uuid); + + fflush (warc_manifest_fp); +@@ -1093,7 +1113,7 @@ warc_write_metadata (void) + warc_manifest_fp, -1); + /* warc_write_resource_record has closed warc_manifest_fp. */ + +- FILE * warc_tmp_fp = warc_tempfile (); ++ warc_tmp_fp = warc_tempfile (); + if (warc_tmp_fp == NULL) + { + logprintf (LOG_NOTQUIET, _("Could not open temporary WARC file.\n")); +@@ -1148,10 +1168,11 @@ FILE * + warc_tempfile (void) + { + char filename[100]; ++ int fd; + if (path_search (filename, 100, opt.warc_tempdir, "wget", true) == -1) + return NULL; + +- int fd = mkstemp (filename); ++ fd = mkstemp (filename); + if (fd < 0) + return NULL; + +@@ -1210,8 +1231,10 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, + off_t offset, const char *warc_filename, + const char *response_uuid) + { +- /* Transform the timestamp. */ + char timestamp_str_cdx [15]; ++ const char *checksum; ++ ++ /* Transform the timestamp. */ + memcpy (timestamp_str_cdx , timestamp_str , 4); /* "YYYY" "-" */ + memcpy (timestamp_str_cdx + 4, timestamp_str + 5, 2); /* "mm" "-" */ + memcpy (timestamp_str_cdx + 6, timestamp_str + 8, 2); /* "dd" "T" */ +@@ -1221,7 +1244,6 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, + timestamp_str_cdx[14] = '\0'; + + /* Rewrite the checksum. */ +- const char *checksum; + if (payload_digest != NULL) + checksum = payload_digest + 5; /* Skip the "sha1:" */ + else +@@ -1260,10 +1282,11 @@ warc_write_revisit_record (char *url, char *timestamp_str, + char *refers_to, ip_address *ip, FILE *body) + { + char revisit_uuid [48]; +- warc_uuid_str (revisit_uuid); +- + char *block_digest = NULL; + char sha1_res_block[SHA1_DIGEST_SIZE]; ++ ++ warc_uuid_str (revisit_uuid); ++ + sha1_stream (body, sha1_res_block); + block_digest = warc_base32_sha1_digest (sha1_res_block); + +@@ -1314,6 +1337,9 @@ warc_write_response_record (char *url, char *timestamp_str, + char sha1_res_block[SHA1_DIGEST_SIZE]; + char sha1_res_payload[SHA1_DIGEST_SIZE]; + ++ char response_uuid [48]; ++ off_t offset; ++ + if (opt.warc_digests_enabled) + { + /* Calculate the block and payload digests. */ +@@ -1357,11 +1383,10 @@ warc_write_response_record (char *url, char *timestamp_str, + + /* Not a revisit, just store the record. */ + +- char response_uuid [48]; + warc_uuid_str (response_uuid); + + fseeko (warc_current_file, 0L, SEEK_END); +- off_t offset = ftello (warc_current_file); ++ offset = ftello (warc_current_file); + + warc_write_start_record (); + warc_write_header ("WARC-Type", "response"); +-- +1.8.3.4 + diff --git a/net-misc/wget/patches/wget-1.14-pod-fixes.patch b/net-misc/wget/patches/wget-1.14-pod-fixes.patch new file mode 100644 index 000000000..54e985624 --- /dev/null +++ b/net-misc/wget/patches/wget-1.14-pod-fixes.patch @@ -0,0 +1,81 @@ +diff -Naur wget-1.14.orig/doc/wget.texi wget-1.14.new/doc/wget.texi +--- wget-1.14.orig/doc/wget.texi 2012-08-04 02:41:52.000000000 -0600 ++++ wget-1.14.new/doc/wget.texi 2013-05-26 11:18:52.986107183 -0600 +@@ -876,7 +876,7 @@ + actions of one. + + @cindex proxy +-@itemx --no-proxy ++@item --no-proxy + Don't use proxies, even if the appropriate @code{*_proxy} environment + variable is defined. + +@@ -977,7 +977,7 @@ + whose encoding does not match the one used locally. + + @cindex IPv6 +-@itemx -4 ++@item -4 + @itemx --inet4-only + @itemx -6 + @itemx --inet6-only +@@ -2106,32 +2106,32 @@ + + + @table @asis +-@item 0 ++@item C<0> + No problems occurred. + +-@item 1 ++@item C<1> + Generic error code. + +-@item 2 ++@item C<2> + Parse error---for instance, when parsing command-line options, the + @samp{.wgetrc} or @samp{.netrc}... + +-@item 3 ++@item C<3> + File I/O error. + +-@item 4 ++@item C<4> + Network failure. + +-@item 5 ++@item C<5> + SSL verification failure. + +-@item 6 ++@item C<6> + Username/password authentication failure. + +-@item 7 ++@item C<7> + Protocol errors. + +-@item 8 ++@item C<8> + Server issued an error response. + @end table + +@@ -3094,7 +3094,7 @@ + Change setting of passive @sc{ftp}, equivalent to the + @samp{--passive-ftp} option. + +-@itemx password = @var{string} ++@item password = @var{string} + Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. + This command can be overridden using the @samp{ftp_password} and + @samp{http_password} command for @sc{ftp} and @sc{http} respectively. +@@ -3605,7 +3605,7 @@ + may be specified from within Wget itself. + + @table @samp +-@itemx --no-proxy ++@item --no-proxy + @itemx proxy = on/off + This option and the corresponding command may be used to suppress the + use of proxy, even if the appropriate environment variables are set. diff --git a/net-misc/wget/patches/wget-1.12.patch b/net-misc/wget/patches/wget-1.14.patch similarity index 52% rename from net-misc/wget/patches/wget-1.12.patch rename to net-misc/wget/patches/wget-1.14.patch index a97ad38de..73f74920d 100644 --- a/net-misc/wget/patches/wget-1.12.patch +++ b/net-misc/wget/patches/wget-1.14.patch @@ -1,7 +1,8 @@ -diff -urN wget-1.12/configure.ac wget-1.12-haiku/configure.ac ---- wget-1.12/configure.ac 2009-09-22 09:39:49.038010880 -0700 -+++ wget-1.12-haiku/configure.ac 2010-10-22 13:23:29.351797248 -0700 -@@ -163,6 +163,7 @@ +diff --git a/configure.ac b/configure.ac +index 873c3c9..45d6602 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -161,6 +161,7 @@ AC_HEADER_STDBOOL AC_CHECK_HEADERS(unistd.h sys/time.h) AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h) AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h) @@ -9,10 +10,11 @@ diff -urN wget-1.12/configure.ac wget-1.12-haiku/configure.ac AC_CHECK_DECLS(h_errno,,,[#include ]) -diff -urN wget-1.12/m4/wget.m4 wget-1.12-haiku/m4/wget.m4 ---- wget-1.12/m4/wget.m4 2009-09-21 20:18:44.034340864 -0700 -+++ wget-1.12-haiku/m4/wget.m4 2010-10-22 13:22:01.071041024 -0700 -@@ -117,6 +117,8 @@ +diff --git a/m4/wget.m4 b/m4/wget.m4 +index 02d0cf9..8adc932 100644 +--- a/m4/wget.m4 ++++ b/m4/wget.m4 +@@ -88,6 +88,8 @@ AC_DEFUN([WGET_POSIX_CLOCK], [ dnl Check whether we need to link with -lnsl and -lsocket, as is the dnl case on e.g. Solaris. @@ -21,7 +23,7 @@ diff -urN wget-1.12/m4/wget.m4 wget-1.12-haiku/m4/wget.m4 AC_DEFUN([WGET_NSL_SOCKET], [ dnl On Solaris, -lnsl is needed to use gethostbyname. But checking -@@ -136,6 +138,9 @@ +@@ -107,6 +109,9 @@ AC_DEFUN([WGET_NSL_SOCKET], [ AC_CHECK_LIB(nsl, $wget_check_in_nsl) fi AC_CHECK_LIB(socket, socket) @@ -31,22 +33,23 @@ diff -urN wget-1.12/m4/wget.m4 wget-1.12-haiku/m4/wget.m4 ]) -diff -urN wget-1.12/src/config.h.in wget-1.12-haiku/src/config.h.in ---- wget-1.12/src/config.h.in 2009-09-22 09:40:33.008126464 -0700 -+++ wget-1.12-haiku/src/config.h.in 2010-10-22 13:14:25.000000000 -0700 -@@ -66,6 +66,9 @@ +diff --git a/src/config.h.in b/src/config.h.in +index 123560b..b4ffe16 100644 +--- a/src/config.h.in ++++ b/src/config.h.in +@@ -343,6 +343,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_BP_SYM_H +/* Define to 1 if you have the header file. */ +#undef HAVE_ARPA_INET_H + - /* Define when using built-in MD5. */ - #undef HAVE_BUILTIN_MD5 + /* Define to 1 if you have the `btowc' function. */ + #undef HAVE_BTOWC -@@ -212,12 +215,18 @@ - /* Define if you have and nl_langinfo(CODESET). */ - #undef HAVE_LANGINFO_CODESET +@@ -656,6 +659,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_LANGINFO_H +/* Define to 1 if you have the `bind' library (-lbind). */ +#undef HAVE_LIBBIND @@ -54,19 +57,21 @@ diff -urN wget-1.12/src/config.h.in wget-1.12-haiku/src/config.h.in /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL - /* Define if you have the gnutls library. */ +@@ -668,6 +674,9 @@ + /* Define if you have the libgnutls library. */ #undef HAVE_LIBGNUTLS +/* Define to 1 if you have the `network' library (-lnetwork). */ +#undef HAVE_LIBNETWORK + - /* Define to 1 if you have the `nsl' library (-lnsl). */ - #undef HAVE_LIBNSL + /* Define to 1 if you have the `gpg-error' library (-lgpg-error). */ + #undef HAVE_LIBGPG_ERROR -diff -urN wget-1.12/src/connect.c wget-1.12-haiku/src/connect.c ---- wget-1.12/src/connect.c 2009-09-21 19:55:56.006815744 -0700 -+++ wget-1.12-haiku/src/connect.c 2010-10-22 13:14:25.000000000 -0700 -@@ -45,7 +45,7 @@ +diff --git a/src/connect.c b/src/connect.c +index 119ccb7..7237484 100644 +--- a/src/connect.c ++++ b/src/connect.c +@@ -46,7 +46,7 @@ as that of the covered work. */ # include # endif /* def __VMS [else] */ # include @@ -75,10 +80,11 @@ diff -urN wget-1.12/src/connect.c wget-1.12-haiku/src/connect.c # include # endif #endif /* not WINDOWS */ -diff -urN wget-1.12/src/host.c wget-1.12-haiku/src/host.c ---- wget-1.12/src/host.c 2009-09-21 20:00:05.002883584 -0700 -+++ wget-1.12-haiku/src/host.c 2010-10-22 13:14:25.000000000 -0700 -@@ -39,7 +39,7 @@ +diff --git a/src/host.c b/src/host.c +index 86bf83b..1805227 100644 +--- a/src/host.c ++++ b/src/host.c +@@ -40,7 +40,7 @@ as that of the covered work. */ # include # include # include @@ -87,10 +93,11 @@ diff -urN wget-1.12/src/host.c wget-1.12-haiku/src/host.c # include # endif # ifdef __VMS -diff -urN wget-1.12/src/host.h wget-1.12-haiku/src/host.h ---- wget-1.12/src/host.h 2009-09-04 09:31:54.006553600 -0700 -+++ wget-1.12-haiku/src/host.h 2010-10-22 13:14:25.000000000 -0700 -@@ -41,9 +41,9 @@ +diff --git a/src/host.h b/src/host.h +index 3f27ea0..3cd3ed9 100644 +--- a/src/host.h ++++ b/src/host.h +@@ -42,9 +42,9 @@ as that of the covered work. */ # endif /* def __VMS [else] */ # include # include @@ -103,3 +110,6 @@ diff -urN wget-1.12/src/host.h wget-1.12-haiku/src/host.h #endif struct url; +-- +1.8.3.4 + diff --git a/net-misc/wget/wget-1.12.recipe b/net-misc/wget/wget-1.12.recipe deleted file mode 100644 index 88030be1d..000000000 --- a/net-misc/wget/wget-1.12.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="wget" -HOMEPAGE="http://www.gnu.org/software/wget" -SRC_URI="http://ftp.gnu.org/gnu/wget/wget-1.12.tar.gz" -CHECKSUM_MD5="141461b9c04e454dc8933c9d1f2abf83" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD() -{ - cd wget-1.12 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-nls --disable-ipv6 - make -} - -INSTALL() -{ - cd wget-1.12 - make install -} - -LICENSE="GNU GPL v3" -COPYRIGHT="2009 Free Software Foundation" diff --git a/net-misc/wget/wget-1.13.4.recipe b/net-misc/wget/wget-1.13.4.recipe deleted file mode 100644 index 8b3a0e2f3..000000000 --- a/net-misc/wget/wget-1.13.4.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="wget" -HOMEPAGE="http://www.gnu.org/software/wget" -SRC_URI="http://ftp.gnu.org/gnu/wget/wget-1.13.4.tar.gz" -CHECKSUM_MD5="1df489976a118b9cbe1b03502adbfc27" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD() -{ - cd wget-1.13.4 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl=openssl - make -} - -INSTALL() -{ - cd wget-1.13.4 - make install -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1996-2011 Free Software Foundation" diff --git a/net-misc/wget/wget-1.14.recipe b/net-misc/wget/wget-1.14.recipe new file mode 100644 index 000000000..9b172237e --- /dev/null +++ b/net-misc/wget/wget-1.14.recipe @@ -0,0 +1,66 @@ +SUMMARY="wget is a tool for downloading files from the internet" +DESCRIPTION=" + wget is a tool that can download files from the internet through + protocols such as HTTP, HTTPS and FTP. wget is non-interactive, + so it can be called from scripts. + " +HOMEPAGE="http://www.gnu.org/software/wget" +SRC_URI="http://ftp.gnu.org/gnu/wget/wget-1.14.tar.gz" +CHECKSUM_MD5="12edc291dba8127f2e9696e69f36299e" +LICENSE="GNU GPL v3" +COPYRIGHT="1996-2012 Free Software Foundation" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + wget$secondaryArchSuffix = $portVersion + cmd:wget$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libcrypto$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libcrypto$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix >= 1.2.3 + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:aclocal + cmd:autoconf + cmd:libtoolize + cmd:make + cmd:makeinfo + cmd:pod2man + " + +PATCHES=" + wget-1.14.patch + wget-1.14-gcc2.patch + wget-1.14-pod-fixes.patch + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal -I m4 + autoconf + runConfigure ./configure --with-ssl=openssl + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check +} From 8cbb56d2095b65665cd0f3d17af17c82a33f671e Mon Sep 17 00:00:00 2001 From: noryb009 Date: Fri, 13 Dec 2013 19:37:04 -0500 Subject: [PATCH 005/206] Update wget to build using gcc4 --- ...gcc2.patch => wget-1.14-build-fixes.patch} | 85 +++++++++++-------- net-misc/wget/wget-1.14.recipe | 3 +- 2 files changed, 52 insertions(+), 36 deletions(-) rename net-misc/wget/patches/{wget-1.14-gcc2.patch => wget-1.14-build-fixes.patch} (87%) diff --git a/net-misc/wget/patches/wget-1.14-gcc2.patch b/net-misc/wget/patches/wget-1.14-build-fixes.patch similarity index 87% rename from net-misc/wget/patches/wget-1.14-gcc2.patch rename to net-misc/wget/patches/wget-1.14-build-fixes.patch index 057eff0bf..4737e4a37 100644 --- a/net-misc/wget/patches/wget-1.14-gcc2.patch +++ b/net-misc/wget/patches/wget-1.14-build-fixes.patch @@ -1,16 +1,16 @@ -From 1d23e4b72c66f22da3a87ba2b14bb1b6ffe78b16 Mon Sep 17 00:00:00 2001 +From 106dffb05519f44684f5f9dc09b0970b8c68a2d9 Mon Sep 17 00:00:00 2001 From: Luke Date: Wed, 11 Dec 2013 03:03:50 +0000 -Subject: [PATCH] Make wget gcc2-friendly +Subject: [PATCH] Fix build errors --- - lib/regcomp.c | 2 +- - src/http.c | 9 ++++-- - src/main.c | 25 +++++++++------ - src/retr.c | 3 +- - src/utils.c | 2 ++ - src/warc.c | 99 +++++++++++++++++++++++++++++++++++++---------------------- - 6 files changed, 89 insertions(+), 51 deletions(-) + lib/regcomp.c | 2 +- + src/http.c | 9 ++++-- + src/main.c | 25 ++++++++------ + src/retr.c | 3 +- + src/utils.c | 2 ++ + src/warc.c | 102 ++++++++++++++++++++++++++++++++++++---------------------- + 6 files changed, 91 insertions(+), 52 deletions(-) diff --git a/lib/regcomp.c b/lib/regcomp.c index 1d7a522..76ed566 100644 @@ -186,7 +186,7 @@ index 567dc35..736f6e2 100644 # include #endif diff --git a/src/warc.c b/src/warc.c -index 69f80be..0cf9e53 100644 +index 69f80be..17a48aa 100644 --- a/src/warc.c +++ b/src/warc.c @@ -154,10 +154,11 @@ warc_write_buffer (const char *buffer, size_t size) @@ -202,7 +202,7 @@ index 69f80be..0cf9e53 100644 if (n != warc_write_buffer (str, n)) warc_write_ok = false; -@@ -246,6 +247,9 @@ warc_write_block_from_file (FILE *data_in) +@@ -246,8 +247,11 @@ warc_write_block_from_file (FILE *data_in) { /* Add the Content-Length header. */ char *content_length; @@ -210,8 +210,11 @@ index 69f80be..0cf9e53 100644 + size_t s; + fseeko (data_in, 0L, SEEK_END); - if (! asprintf (&content_length, "%ld", ftello (data_in))) +- if (! asprintf (&content_length, "%ld", ftello (data_in))) ++ if (! asprintf (&content_length, "%ld", (long int)ftello (data_in))) { + warc_write_ok = false; + return false; @@ -262,8 +266,6 @@ warc_write_block_from_file (FILE *data_in) warc_write_ok = false; @@ -322,20 +325,23 @@ index 69f80be..0cf9e53 100644 #endif /* If max size is enabled, we add a serial number to the file names. */ -@@ -811,9 +823,9 @@ static bool +@@ -811,12 +823,13 @@ static bool warc_parse_cdx_header (char *lineptr, int *field_num_original_url, int *field_num_checksum, int *field_num_record_id) { -- *field_num_original_url = -1; -- *field_num_checksum = -1; -- *field_num_record_id = -1; -+ off_t *field_num_original_url = -1; -+ off_t *field_num_checksum = -1; -+ off_t *field_num_record_id = -1; ++ char *token; ++ char *save_ptr; ++ + *field_num_original_url = -1; + *field_num_checksum = -1; + *field_num_record_id = -1; - char *token; - char *save_ptr; -@@ -860,10 +872,12 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, +- char *token; +- char *save_ptr; + token = strtok_r (lineptr, CDX_FIELDSEP, &save_ptr); + + if (token != NULL && strcmp (token, "CDX") == 0) +@@ -860,10 +873,12 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, char *token; char *save_ptr; @@ -349,7 +355,7 @@ index 69f80be..0cf9e53 100644 while (token != NULL) { char **val; -@@ -926,10 +940,7 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, +@@ -926,10 +941,7 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, static bool warc_load_cdx_dedup_file (void) { @@ -361,7 +367,7 @@ index 69f80be..0cf9e53 100644 int field_num_original_url = -1; int field_num_checksum = -1; int field_num_record_id = -1; -@@ -938,6 +949,10 @@ warc_load_cdx_dedup_file (void) +@@ -938,6 +950,10 @@ warc_load_cdx_dedup_file (void) size_t n = 0; ssize_t line_length; @@ -372,7 +378,7 @@ index 69f80be..0cf9e53 100644 /* The first line should contain the CDX header. Format: " CDX x x x x x" where x are field type indicators. For our purposes, we only -@@ -965,6 +980,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); +@@ -965,6 +981,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); } else { @@ -380,7 +386,7 @@ index 69f80be..0cf9e53 100644 /* Initialize the table. */ warc_cdx_dedup_table = hash_table_new (1000, warc_hash_sha1_digest, warc_cmp_sha1_digest); -@@ -982,7 +998,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); +@@ -982,7 +999,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); while (line_length != -1); /* Print results. */ @@ -389,7 +395,7 @@ index 69f80be..0cf9e53 100644 logprintf (LOG_VERBOSE, ngettext ("Loaded %d record from CDX.\n\n", "Loaded %d records from CDX.\n\n", nrecords), -@@ -1002,12 +1018,14 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); +@@ -1002,12 +1019,14 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); static struct warc_cdx_record * warc_find_duplicate_cdx_record (char *url, char *sha1_digest_payload) { @@ -407,7 +413,7 @@ index 69f80be..0cf9e53 100644 &key, &rec_existing); if (found && strcmp (rec_existing->url, url) == 0) -@@ -1079,11 +1097,13 @@ warc_init (void) +@@ -1079,11 +1098,13 @@ warc_init (void) static void warc_write_metadata (void) { @@ -422,7 +428,7 @@ index 69f80be..0cf9e53 100644 warc_uuid_str (manifest_uuid); fflush (warc_manifest_fp); -@@ -1093,7 +1113,7 @@ warc_write_metadata (void) +@@ -1093,7 +1114,7 @@ warc_write_metadata (void) warc_manifest_fp, -1); /* warc_write_resource_record has closed warc_manifest_fp. */ @@ -431,7 +437,7 @@ index 69f80be..0cf9e53 100644 if (warc_tmp_fp == NULL) { logprintf (LOG_NOTQUIET, _("Could not open temporary WARC file.\n")); -@@ -1148,10 +1168,11 @@ FILE * +@@ -1148,10 +1169,11 @@ FILE * warc_tempfile (void) { char filename[100]; @@ -444,7 +450,7 @@ index 69f80be..0cf9e53 100644 if (fd < 0) return NULL; -@@ -1210,8 +1231,10 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, +@@ -1210,8 +1232,10 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, off_t offset, const char *warc_filename, const char *response_uuid) { @@ -456,7 +462,7 @@ index 69f80be..0cf9e53 100644 memcpy (timestamp_str_cdx , timestamp_str , 4); /* "YYYY" "-" */ memcpy (timestamp_str_cdx + 4, timestamp_str + 5, 2); /* "mm" "-" */ memcpy (timestamp_str_cdx + 6, timestamp_str + 8, 2); /* "dd" "T" */ -@@ -1221,7 +1244,6 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, +@@ -1221,7 +1245,6 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, timestamp_str_cdx[14] = '\0'; /* Rewrite the checksum. */ @@ -464,7 +470,16 @@ index 69f80be..0cf9e53 100644 if (payload_digest != NULL) checksum = payload_digest + 5; /* Skip the "sha1:" */ else -@@ -1260,10 +1282,11 @@ warc_write_revisit_record (char *url, char *timestamp_str, +@@ -1235,7 +1258,7 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, + /* Print the CDX line. */ + fprintf (warc_current_cdx_file, "%s %s %s %s %d %s %s - %ld %s %s\n", url, + timestamp_str_cdx, url, mime_type, response_code, checksum, +- redirect_location, offset, warc_current_filename, response_uuid); ++ redirect_location, (long int)offset, warc_current_filename, response_uuid); + fflush (warc_current_cdx_file); + + return true; +@@ -1260,10 +1283,11 @@ warc_write_revisit_record (char *url, char *timestamp_str, char *refers_to, ip_address *ip, FILE *body) { char revisit_uuid [48]; @@ -478,7 +493,7 @@ index 69f80be..0cf9e53 100644 sha1_stream (body, sha1_res_block); block_digest = warc_base32_sha1_digest (sha1_res_block); -@@ -1314,6 +1337,9 @@ warc_write_response_record (char *url, char *timestamp_str, +@@ -1314,6 +1338,9 @@ warc_write_response_record (char *url, char *timestamp_str, char sha1_res_block[SHA1_DIGEST_SIZE]; char sha1_res_payload[SHA1_DIGEST_SIZE]; @@ -488,7 +503,7 @@ index 69f80be..0cf9e53 100644 if (opt.warc_digests_enabled) { /* Calculate the block and payload digests. */ -@@ -1357,11 +1383,10 @@ warc_write_response_record (char *url, char *timestamp_str, +@@ -1357,11 +1384,10 @@ warc_write_response_record (char *url, char *timestamp_str, /* Not a revisit, just store the record. */ diff --git a/net-misc/wget/wget-1.14.recipe b/net-misc/wget/wget-1.14.recipe index 9b172237e..5a1f51073 100644 --- a/net-misc/wget/wget-1.14.recipe +++ b/net-misc/wget/wget-1.14.recipe @@ -11,6 +11,7 @@ LICENSE="GNU GPL v3" COPYRIGHT="1996-2012 Free Software Foundation" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" wget$secondaryArchSuffix = $portVersion @@ -42,7 +43,7 @@ BUILD_PREREQUIRES=" PATCHES=" wget-1.14.patch - wget-1.14-gcc2.patch + wget-1.14-build-fixes.patch wget-1.14-pod-fixes.patch " From b7b41c7c00f81da5bec062be5479ff74d41db382 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sat, 14 Dec 2013 12:16:20 +0000 Subject: [PATCH 006/206] MinimizeAll: ln -> symlinkRelative, removed error about dir existing --- haiku-apps/minimizeall/minimizeall-1.0.0.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe index 58bb1f9d8..9d7ddc1bd 100644 --- a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe +++ b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe @@ -40,7 +40,7 @@ BUILD_REQUIRES=" BUILD() { cd trunk - mkdir bin || true + mkdir -p bin # Step 1 - Building the app cd app @@ -67,5 +67,6 @@ INSTALL() cp trunk/bin/DeskbarAddOn $appsDir/MinimizeAll/DeskbarAddOn addAppDeskbarSymlink $appsDir/MinimizeAll/MinimizeAll mkdir -p "$dataDir/deskbar/menu/Desktop applets" - ln -s $appsDir/MinimizeAll/DeskbarAddOn "$dataDir/deskbar/menu/Desktop applets/MinimizeAll" + symlinkRelative -s "$appsDir/MinimizeAll/DeskbarAddOn" \ + "$dataDir/deskbar/menu/Desktop applets/MinimizeAll" } From 1a1d2585ccad477bb70975ae3d6b1544e5733870 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sat, 14 Dec 2013 13:15:04 +0000 Subject: [PATCH 007/206] Add new version of Dos2Unix --- app-text/dos2unix/dos2unix-1.0.1.recipe | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 app-text/dos2unix/dos2unix-1.0.1.recipe diff --git a/app-text/dos2unix/dos2unix-1.0.1.recipe b/app-text/dos2unix/dos2unix-1.0.1.recipe new file mode 100644 index 000000000..d54c2c788 --- /dev/null +++ b/app-text/dos2unix/dos2unix-1.0.1.recipe @@ -0,0 +1,38 @@ +SUMMARY="dos2unix and unix2dos end of line file convertors." +DESCRIPTION="DOS/Windows like to put CR/LF at the end of lines whereas UNIX like to have just LF. Dos2unix and unix2dos are simple parser/converter command line programs to convert between the two formats." +HOMEPAGE="http://github.com/puckipedia/dos2unix" +SRC_URI="git://github.com/puckipedia/dos2unix.git#553720356be18ca60cae3d970a575520aef5a4f4" +REVISION="1" +COPYRIGHT="Public Domain" +LICENSE="Public Domain" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +PROVIDES=" + dos2unix = 1.0.1 compat >= 1 + cmd:dos2unix + cmd:unix2dos + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:g++ + " + +BUILD() +{ + cd src + g++ -O -o ../dos2unix dos2unix.c + g++ -O -o ../unix2dos unix2dos.c +} + +INSTALL() +{ + mkdir -p $binDir + cp dos2unix $binDir/dos2unix + cp unix2dos $binDir/unix2dos +} From a38bf1c00b7c05901f0fc1957794220c18945f13 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sat, 14 Dec 2013 09:23:05 -0500 Subject: [PATCH 008/206] Clean up wget recipe --- net-misc/wget/patches/wget-1.14.patch | 37 +++++---------------------- net-misc/wget/wget-1.14.recipe | 8 +++++- 2 files changed, 13 insertions(+), 32 deletions(-) diff --git a/net-misc/wget/patches/wget-1.14.patch b/net-misc/wget/patches/wget-1.14.patch index 73f74920d..2ec0a3aef 100644 --- a/net-misc/wget/patches/wget-1.14.patch +++ b/net-misc/wget/patches/wget-1.14.patch @@ -11,43 +11,31 @@ index 873c3c9..45d6602 100644 AC_CHECK_DECLS(h_errno,,,[#include ]) diff --git a/m4/wget.m4 b/m4/wget.m4 -index 02d0cf9..8adc932 100644 +index 02d0cf9..33825e2 100644 --- a/m4/wget.m4 +++ b/m4/wget.m4 -@@ -88,6 +88,8 @@ AC_DEFUN([WGET_POSIX_CLOCK], [ +@@ -88,6 +88,7 @@ AC_DEFUN([WGET_POSIX_CLOCK], [ dnl Check whether we need to link with -lnsl and -lsocket, as is the dnl case on e.g. Solaris. -+dnl BeOS (BONE) needs libbind as well +dnl Haiku needs libnetwork AC_DEFUN([WGET_NSL_SOCKET], [ dnl On Solaris, -lnsl is needed to use gethostbyname. But checking -@@ -107,6 +109,9 @@ AC_DEFUN([WGET_NSL_SOCKET], [ +@@ -107,6 +108,8 @@ AC_DEFUN([WGET_NSL_SOCKET], [ AC_CHECK_LIB(nsl, $wget_check_in_nsl) fi AC_CHECK_LIB(socket, socket) -+ AC_CHECK_LIB(bind, gethostbyname) + AC_CHECK_LIB(network, gethostbyname) + AC_CHECK_LIB(network, socket) ]) diff --git a/src/config.h.in b/src/config.h.in -index 123560b..b4ffe16 100644 +index 123560b..30a98f9 100644 --- a/src/config.h.in +++ b/src/config.h.in -@@ -343,6 +343,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_BP_SYM_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_ARPA_INET_H -+ - /* Define to 1 if you have the `btowc' function. */ - #undef HAVE_BTOWC - -@@ -656,6 +659,9 @@ +@@ -656,6 +656,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LANGINFO_H @@ -57,7 +45,7 @@ index 123560b..b4ffe16 100644 /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL -@@ -668,6 +674,9 @@ +@@ -668,6 +671,9 @@ /* Define if you have the libgnutls library. */ #undef HAVE_LIBGNUTLS @@ -80,19 +68,6 @@ index 119ccb7..7237484 100644 # include # endif #endif /* not WINDOWS */ -diff --git a/src/host.c b/src/host.c -index 86bf83b..1805227 100644 ---- a/src/host.c -+++ b/src/host.c -@@ -40,7 +40,7 @@ as that of the covered work. */ - # include - # include - # include --# ifndef __BEOS__ -+# ifdef HAVE_ARPA_INET_H - # include - # endif - # ifdef __VMS diff --git a/src/host.h b/src/host.h index 3f27ea0..3cd3ed9 100644 --- a/src/host.h diff --git a/net-misc/wget/wget-1.14.recipe b/net-misc/wget/wget-1.14.recipe index 5a1f51073..473a1f779 100644 --- a/net-misc/wget/wget-1.14.recipe +++ b/net-misc/wget/wget-1.14.recipe @@ -41,6 +41,10 @@ BUILD_PREREQUIRES=" cmd:pod2man " +USER_SETTINGS_FILES=" + settings/wgetrc + " + PATCHES=" wget-1.14.patch wget-1.14-build-fixes.patch @@ -63,5 +67,7 @@ INSTALL() TEST() { - make check + [ -d .git ] && mv .git .git-temp + make check || true + [ -d .git-temp ] && mv .git-temp .git } From d99327a4b4d13f350599099c18f6a56dfd02265f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 15 Dec 2013 00:21:16 +0000 Subject: [PATCH 009/206] Remove old BeAE recipes --- haiku-apps/beae/beae-20.recipe | 29 ----------------------------- haiku-apps/beae/beae-22.recipe | 29 ----------------------------- haiku-apps/beae/beae-25.recipe | 29 ----------------------------- 3 files changed, 87 deletions(-) delete mode 100644 haiku-apps/beae/beae-20.recipe delete mode 100644 haiku-apps/beae/beae-22.recipe delete mode 100644 haiku-apps/beae/beae-25.recipe diff --git a/haiku-apps/beae/beae-20.recipe b/haiku-apps/beae/beae-20.recipe deleted file mode 100644 index e8e81f9f3..000000000 --- a/haiku-apps/beae/beae-20.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="BeAE - Audio Editor" -HOMEPAGE="http://beae.berlios.de/" -SRC_URI="svn+http://svn.berlios.de/svnroot/repos/beae/trunk#20" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.8.0" -#CHECKSUM_MD5="" -BUILD() -{ - cd beae-20 - cmake . - make -} - -INSTALL() -{ - cd beae-20 - mkdir -p ${DESTDIR}/boot/apps - cp -a BeAE ${DESTDIR}/boot/apps - cp -a build/BeAE ${DESTDIR}/boot/apps/BeAE - mkdir -p ${DESTDIR}/boot/common/data/licenses - cp -a license.txt ${DESTDIR}/boot/common/data/licenses/BeAE - rm -f ${DESTDIR}/boot/apps/BeAE/.OptionalPackageDescription - if [ -z ${DESTDIR} ];then - find /boot/apps/BeAE -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="BeAE" -COPYRIGHT="2003 Xentronix" diff --git a/haiku-apps/beae/beae-22.recipe b/haiku-apps/beae/beae-22.recipe deleted file mode 100644 index 925c91399..000000000 --- a/haiku-apps/beae/beae-22.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="BeAE - Audio Editor" -HOMEPAGE="http://beae.berlios.de/" -SRC_URI="svn+http://svn.berlios.de/svnroot/repos/beae/trunk#22" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.8.0" -#CHECKSUM_MD5="" -BUILD() -{ - cd beae-22 - cmake . - make -} - -INSTALL() -{ - cd beae-22 - mkdir -p ${DESTDIR}/boot/apps - cp -a BeAE ${DESTDIR}/boot/apps - cp -a build/BeAE ${DESTDIR}/boot/apps/BeAE - mkdir -p ${DESTDIR}/boot/common/data/licenses - cp -a license.txt ${DESTDIR}/boot/common/data/licenses/BeAE - rm -f ${DESTDIR}/boot/apps/BeAE/.OptionalPackageDescription - if [ -z ${DESTDIR} ];then - find /boot/apps/BeAE -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="BSD (3-clause)" -COPYRIGHT="2003 Xentronix" diff --git a/haiku-apps/beae/beae-25.recipe b/haiku-apps/beae/beae-25.recipe deleted file mode 100644 index 6eed421f7..000000000 --- a/haiku-apps/beae/beae-25.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="BeAE - Audio Editor" -HOMEPAGE="http://dev.osdrawer.net/projects/beae/" -SRC_URI="svn+http://svn.osdrawer.net/beae/trunk#25" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.8.0" -#CHECKSUM_MD5="" -BUILD() -{ - cd beae-25 - cmake . - make -} - -INSTALL() -{ - cd beae-25 - mkdir -p ${DESTDIR}/boot/apps - cp -a BeAE ${DESTDIR}/boot/apps - cp -a build/BeAE ${DESTDIR}/boot/apps/BeAE - mkdir -p ${DESTDIR}/boot/common/data/licenses - cp -a license.txt ${DESTDIR}/boot/common/data/licenses/BeAE - rm -f ${DESTDIR}/boot/apps/BeAE/.OptionalPackageDescription - if [ -z ${DESTDIR} ];then - find /boot/apps/BeAE -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="BSD (3-clause)" -COPYRIGHT="2003 Xentronix" From 172ab570e9bb2f7baa7af66f2fe1718c38140cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Sun, 15 Dec 2013 02:06:13 +0000 Subject: [PATCH 010/206] VisualBoyAdvance 1.8 --- .../patches/Makefile.am.patch | 91 +++++++++++++++++++ .../visualboyadvance/patches/Util.patch | 26 ++++++ .../patches/configure.in.patch | 12 +++ .../patches/visualboyadvance-1.7.2.patch | 11 --- .../visualboyadvance-1.7.2.recipe | 33 ------- .../visualboyadvance-1.8.recipe | 70 ++++++++++++++ 6 files changed, 199 insertions(+), 44 deletions(-) create mode 100644 games-emulation/visualboyadvance/patches/Makefile.am.patch create mode 100644 games-emulation/visualboyadvance/patches/Util.patch create mode 100644 games-emulation/visualboyadvance/patches/configure.in.patch delete mode 100644 games-emulation/visualboyadvance/patches/visualboyadvance-1.7.2.patch delete mode 100644 games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe create mode 100644 games-emulation/visualboyadvance/visualboyadvance-1.8.recipe diff --git a/games-emulation/visualboyadvance/patches/Makefile.am.patch b/games-emulation/visualboyadvance/patches/Makefile.am.patch new file mode 100644 index 000000000..9aef1e939 --- /dev/null +++ b/games-emulation/visualboyadvance/patches/Makefile.am.patch @@ -0,0 +1,91 @@ +diff --git a/src/sdl/Makefile.am b/src/sdl/Makefile.am +index bcc9f92..ba6db7a 100644 +--- a/src/sdl/Makefile.am ++++ b/src/sdl/Makefile.am +@@ -1,7 +1,5 @@ + bin_PROGRAMS = VisualBoyAdvance + +-noinst_PROGRAMS = TestEmu +- + VisualBoyAdvance_SOURCES = \ + SDL.cpp \ + debugger.cpp \ +@@ -79,78 +77,6 @@ VisualBoyAdvance_LDADD = @VBA_LIBS@ @SDL_LIBS@ + + VisualBoyAdvance_DEPENDENCIES = @VBA_LIBS@ + +-TestEmu_SOURCES = \ +- TestEmu.cpp \ +- debugger.cpp \ +- debugger.h \ +- ../2xSaI.cpp \ +- ../AutoBuild.h \ +- ../Cheats.cpp \ +- ../Cheats.h \ +- ../EEprom.cpp \ +- ../EEprom.h \ +- ../Flash.cpp \ +- ../Flash.h \ +- ../GBA.cpp \ +- ../GBA.h \ +- ../GBAinline.h \ +- ../Gfx.cpp \ +- ../Gfx.h \ +- ../Globals.cpp \ +- ../Globals.h \ +- ../Mode0.cpp \ +- ../Mode1.cpp \ +- ../Mode2.cpp \ +- ../Mode3.cpp \ +- ../Mode4.cpp \ +- ../Mode5.cpp \ +- ../NLS.h \ +- ../Port.h \ +- ../RTC.cpp \ +- ../RTC.h \ +- ../Sound.cpp \ +- ../Sound.h \ +- ../Sram.cpp \ +- ../Sram.h \ +- ../System.h \ +- ../Text.cpp \ +- ../Text.h \ +- ../Util.cpp \ +- ../Util.h \ +- ../admame.cpp \ +- ../agbprint.cpp \ +- ../agbprint.h \ +- ../arm-new.h \ +- ../armdis.cpp \ +- ../armdis.h \ +- ../bios.cpp \ +- ../bios.h \ +- ../elf.cpp \ +- ../elf.h \ +- ../expr-lex.cpp \ +- ../expr.cpp \ +- ../expr.cpp.h \ +- ../exprNode.cpp \ +- ../exprNode.h \ +- ../hq2x.cpp \ +- ../hq2x.h \ +- ../interp.h \ +- ../lq2x.h \ +- ../memgzio.c \ +- ../memgzio.h \ +- ../motionblur.cpp \ +- ../pixel.cpp \ +- ../remote.cpp \ +- ../scanline.cpp \ +- ../simple2x.cpp \ +- ../thumb.h \ +- ../unzip.cpp \ +- ../unzip.h +- +-TestEmu_LDADD = @VBA_LIBS@ @SDL_LIBS@ +- +-TestEmu_DEPENDENCIES = @VBA_LIBS@ +- + AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -DSDL \ diff --git a/games-emulation/visualboyadvance/patches/Util.patch b/games-emulation/visualboyadvance/patches/Util.patch new file mode 100644 index 000000000..891ac1d84 --- /dev/null +++ b/games-emulation/visualboyadvance/patches/Util.patch @@ -0,0 +1,26 @@ +diff --git a/src/Util.cpp b/src/Util.cpp +index 9e3b7d9..6ab1614 100644 +--- a/src/Util.cpp ++++ b/src/Util.cpp +@@ -86,8 +86,12 @@ bool utilWritePNGFile(const char *fileName, int w, int h, u8 *pix) + fclose(fp); + return false; + } ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 + ++#else + if(setjmp(png_ptr->jmpbuf)) { ++#endif ++ if(setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr,NULL); + fclose(fp); + return false; +@@ -992,7 +996,7 @@ void utilWriteData(gzFile gzFile, variable_desc *data) + + gzFile utilGzOpen(const char *file, const char *mode) + { +- utilGzWriteFunc = (int (ZEXPORT *)(void *,void * const, unsigned int))gzwrite; ++ utilGzWriteFunc = (int (ZEXPORT *)(gzFile,const voidp, unsigned int))gzwrite; + utilGzReadFunc = gzread; + utilGzCloseFunc = gzclose; + diff --git a/games-emulation/visualboyadvance/patches/configure.in.patch b/games-emulation/visualboyadvance/patches/configure.in.patch new file mode 100644 index 000000000..0ff81324a --- /dev/null +++ b/games-emulation/visualboyadvance/patches/configure.in.patch @@ -0,0 +1,12 @@ +diff --git a/configure.in b/configure.in +index 159bf87..1ad2fac 100644 +--- a/configure.in ++++ b/configure.in +@@ -64,6 +64,7 @@ dnl Checks for libraries. + AC_CHECK_LIB(z, gzopen, + , AC_MSG_ERROR([*** Cannot compile without zlib.])) + AC_CHECK_LIB(pthread, pthread_yield) ++AC_CHECK_LIB(network, socket) + + PKG_CHECK_MODULES(LIBPNG, libpng) + CPPFLAGS="$CPPFLAGS $LIBPNG_CFLAGS" diff --git a/games-emulation/visualboyadvance/patches/visualboyadvance-1.7.2.patch b/games-emulation/visualboyadvance/patches/visualboyadvance-1.7.2.patch deleted file mode 100644 index 1f45d7d7b..000000000 --- a/games-emulation/visualboyadvance/patches/visualboyadvance-1.7.2.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur VisualBoyAdvance-1.7.2/configure.in VisualBoyAdvance-1.7.2-haiku/configure.in ---- VisualBoyAdvance-1.7.2/configure.in 2004-05-13 21:38:35.039583744 +0000 -+++ VisualBoyAdvance-1.7.2-haiku/configure.in 2010-05-01 03:37:15.941621248 +0000 -@@ -66,6 +66,7 @@ - AC_CHECK_LIB(png, png_create_write_struct, - , AC_MSG_ERROR([*** Cannot compile without libpng.]), [-lz]) - AC_CHECK_LIB(pthread, pthread_yield) -+AC_CHECK_LIB(network, socket) - - dnl Checks for header files. - AC_PATH_X diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe b/games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe deleted file mode 100644 index 2cfddb434..000000000 --- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="VisualBoyAdvance" -HOMEPAGE="http://vba.ngemu.com" -SRC_URI="http://sourceforge.net/projects/vba/files/VisualBoyAdvance/1.7.2/VisualBoyAdvance-src-1.7.2.tar.gz" -CHECKSUM_MD5="cc02339e3fd8efd9f23121b0a2f81fd8" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-lang/nasm >= 2.03.01 - media-libs/libsdl >= 1.2.14 - media-libs/sdl-mixer >= 1.2.11" - -BUILD() -{ - cd VisualBoyAdvance-1.7.2 - libtoolize --force --copy --install - autoreconf -i - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-c-core --disable-profiling --without-mmx - make -} - -INSTALL() -{ - cd VisualBoyAdvance-1.7.2/src - GAMEDIR=`finddir B_APPS_DIRECTORY`/Visualboyadvance - mkdir -p ${DESTDIR}/${GAMEDIR} - cp -af VisualBoyAdvance.cfg ${DESTDIR}/${GAMEDIR} - cd sdl - cp -af TestEmu ${DESTDIR}/${GAMEDIR} - cp -af VisualBoyAdvance ${DESTDIR}/${GAMEDIR} -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2002 Forgotten" diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe new file mode 100644 index 000000000..65440f416 --- /dev/null +++ b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe @@ -0,0 +1,70 @@ +SUMMARY="VisualBoyAdvance, a GBA Emulator" +DESCRIPTION="VisualBoyAdvance is a Game Boy Advance emulator which runs your prefered ROMS" +HOMEPAGE="http://vba.ngemu.com" +SRC_URI="git://git.debian.org/git/pkg-games/visualboyadvance" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2004 Forgotten" + +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 ?x86_64" + +PROVIDES=" + visualboyadvance$secondaryArchSuffix = $portVersion + app:visualboyadvance$secondaryArchSuffix = $portVersion +" + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix + lib:libsdl_mixer$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libpng$secondaryArchSuffix +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libsdl$secondaryArchSuffix + devel:libsdl_mixer$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libpng$secondaryArchSuffix +" +BUILD_PREREQUIRES=" + cmd:nasm$secondaryArchSuffix + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:autoconf + cmd:aclocal + cmd:pkg_config +" + +SOURCE_DIR="VisualBoyAdvance-1.8" + +PATCHES=" + Util.patch + Makefile.am.patch + configure.in.patch +" + +BUILD() +{ + libtoolize --force --copy --install + autoreconf -i + runConfigure ./configure --enable-c-core --disable-profilling --without-mmx + make +} + +INSTALL() +{ + cd src + GAMEDIR=$appsDir/Visualboyadvance + mkdir -p ${GAMEDIR} + cp VisualBoyAdvance.cfg ${GAMEDIR} + cp sdl/VisualBoyAdvance ${GAMEDIR} + + addAppDeskbarSymlink ${GAMEDIR}/VisualBoyAdvance +} From be7d9f35d77916f77b7187bd6c427e51c7901bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 15 Dec 2013 20:12:13 +0100 Subject: [PATCH 011/206] qemacs: Update recipe Somehow it doesn't detect libpng correctly yet though. --- app-editors/qemacs/qemacs-0.3.3.recipe | 47 ++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/app-editors/qemacs/qemacs-0.3.3.recipe b/app-editors/qemacs/qemacs-0.3.3.recipe index 250da5505..c6b989af0 100644 --- a/app-editors/qemacs/qemacs-0.3.3.recipe +++ b/app-editors/qemacs/qemacs-0.3.3.recipe @@ -1,22 +1,57 @@ +SUMMARY="QEmacs editor" DESCRIPTION="QEmacs (for Quick Emacs), a very small but powerful UNIX editor" HOMEPAGE="http://bellard.org/qemacs/" SRC_URI="http://bellard.org/qemacs/qemacs-0.3.3.tar.gz" CHECKSUM_MD5="42fe8cc431bb9cbbeb898a2c18335990" REVISION="1" -STATUS_HAIKU="broken" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2000-2003 Fabrice Bellard" + DEPEND="app-text/texi2html >= 1.82" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + qemacs$secondaryArchSuffix = $portVersion + app:qemacs$secondaryArchSuffix = $portVersion + cmd:qemacs$secondaryArchSuffix = $portVersion + cmd:qe$secondaryArchSuffix = $portVersion + cmd:html2png$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libpng$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix +# lib:libavcodec$secondaryArchSuffix +# lib:libavformat$secondaryArchSuffix + " + +BUILD_REQUIRES=" + devel:libpng$secondaryArchSuffix +# devel:libavcodec$secondaryArchSuffix +# devel:libavformat$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:texi2html + " + +PATCHES="qemacs-0.3.3.patch" + BUILD() { - cd qemacs-0.3.3 - ./configure + runConfigure ./configure make } INSTALL() { - cd qemacs-0.3.3 make install + addAppDeskbarSymlink $binDir/qe QEmacs } -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2000-2003 Fabrice Bellard" From 879e3c3d358ca4e865cbb4899f9dfb56ab025943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 15 Dec 2013 20:14:09 +0100 Subject: [PATCH 012/206] libxcb: Update recipe Not working yet, as it doesn't find xcb_proto python files... --- x11-libs/libxcb/libxcb-1.6.recipe | 54 +++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/x11-libs/libxcb/libxcb-1.6.recipe b/x11-libs/libxcb/libxcb-1.6.recipe index 8d316acf2..6fc9d23b5 100644 --- a/x11-libs/libxcb/libxcb-1.6.recipe +++ b/x11-libs/libxcb/libxcb-1.6.recipe @@ -1,25 +1,61 @@ +SUMMARY="libxcb" DESCRIPTION="libxcb" HOMEPAGE="http://xcb.freedesktop.org/" SRC_URI="http://xcb.freedesktop.org/dist/libxcb-1.6.tar.gz" CHECKSUM_MD5="f824cc4cb4b43f5bbc84c0e17fbd80d0" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.23 - x11-misc/util-macros >= 1.7.0 - dev-libs/libxslt >= 1.1.26 - x11-proto/xcb-proto >= 1.6 - x11-libs/libXau >= 1.0.5" +COPYRIGHT="2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett. +All Rights Reserved." +LICENSE="MIT (no promotion)" + +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + libxcb$secondaryArchSuffix = $portVersion + lib:libxcb$secondaryArchSuffix = $portVersion + devel:libxcb$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libxslt >= 1.1.26 + " + +BUILD_REQUIRES=" + devel:libxslt >= 1.1.26 + devel:xcb_proto >= 1.6 + devel:libpthread_stubs$secondaryArchSuffix >= 0.3 + devel:libxau$secondaryArchSuffix >= 1.0.5 + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:util_macros$secondaryArchSuffix + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:python + " + + +#DEPEND="pkgconfig >= 0.23 +# x11-misc/util-macros >= 1.7.0 +# dev-libs/libxslt >= 1.1.26 +# x11-proto/xcb-proto >= 1.6 +# x11-libs/libXau >= 1.0.5" BUILD() { - cd libxcb-1.6 libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` + runConfigure ./configure } INSTALL() { - cd libxcb-1.6 make install } From 209bd39b61c68e9cb18556909f9b22ea8f0e34eb Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 15 Dec 2013 19:42:12 -0800 Subject: [PATCH 013/206] Remove sdl_mixer patch as it's no longer needed --- .../sdl_mixer/patches/sdl_mixer-1.2.12.patch | 50 ------------------- 1 file changed, 50 deletions(-) delete mode 100644 media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch diff --git a/media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch b/media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch deleted file mode 100644 index 0640f3a47..000000000 --- a/media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 1468e92..367fd69 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -39,7 +39,7 @@ VERSION_OBJECTS = @VERSION_OBJECTS@ - PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@ - PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@ - --DIST = Android.mk CHANGES COPYING CWProjects.sea.bin MPWmake.sea.bin Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC Watcom-OS2.zip Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi playmus.c timidity wavestream.c wavestream.h version.rc -+DIST = Android.mk CHANGES COPYING CWProjects.sea.bin MPWmake.sea.bin Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC Watcom-OS2.zip Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi timidity wavestream.c wavestream.h version.rc - - LT_AGE = @LT_AGE@ - LT_CURRENT = @LT_CURRENT@ -@@ -47,7 +47,7 @@ LT_RELEASE = @LT_RELEASE@ - LT_REVISION = @LT_REVISION@ - LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - --all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playmus$(EXE) -+all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) - - $(srcdir)/configure: $(srcdir)/configure.in - @echo "Warning, configure.in is out of date" -@@ -65,9 +65,6 @@ $(objects): - $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) - $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) - --$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) -- - install: all install-hdrs install-lib #install-bin - install-hdrs: - $(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL -@@ -82,7 +79,6 @@ install-lib: $(objects) $(objects)/$(TARGET) - $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET) - install-bin: - $(SHELL) $(auxdir)/mkinstalldirs $(bindir) -- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE) - - uninstall: uninstall-hdrs uninstall-lib uninstall-bin - uninstall-hdrs: -@@ -96,7 +92,8 @@ uninstall-hdrs: - uninstall-lib: - $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET) - uninstall-bin: -- rm -f $(bindir)/playmus$(EXE) -+ touch playmus -+ rm -f playmus - - clean: - rm -rf $(objects) From a5bf08c3b017de42477ec2ed300ca64844ce3fe5 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 15 Dec 2013 19:43:28 -0800 Subject: [PATCH 014/206] Remove sdl_mixer patch as it's no longer needed --- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 2 -- 1 file changed, 2 deletions(-) diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe index e91763b9c..61f6fb7b3 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -57,8 +57,6 @@ BUILD_PREREQUIRES=" SOURCE_DIR="SDL_mixer-$portVersion" -PATCHES="sdl_mixer-1.2.12.patch" - BUILD() { libtoolize --force --copy --install From 42b84ff5399cea3178005ea1cff13aa75e5c2daa Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 15 Dec 2013 21:23:45 -0800 Subject: [PATCH 015/206] Fixed source location for BeAE. --- haiku-apps/beae/beae-1.2.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/beae/beae-1.2.recipe b/haiku-apps/beae/beae-1.2.recipe index 044ff2426..b96c1d93c 100644 --- a/haiku-apps/beae/beae-1.2.recipe +++ b/haiku-apps/beae/beae-1.2.recipe @@ -1,7 +1,7 @@ DESCRIPTION="BeAE is an audio editor for Haiku, with features like silencing, fading in/out, analyzing etc." SUMMARY="Well featured audio editor for Haiku" HOMEPAGE="http://developer.berlios.de/projects/beae" -SRC_URI="svn://svn.berlios.de/beae/trunk#25" +SRC_URI="git+https://github.com/HaikuArchives/BeAE.git#b4e8a39e0d" REVISION="1" COPYRIGHT="2003 Xentronix" LICENSE="BSD (3-clause)" From 5d2152bbb48aa72881ab879ab95c80e5c19f525d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 16 Dec 2013 09:02:15 +0100 Subject: [PATCH 016/206] oricutron: do add the deskbar symlink --- app-emulation/oricutron/oricutron-1.1_svn.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emulation/oricutron/oricutron-1.1_svn.recipe b/app-emulation/oricutron/oricutron-1.1_svn.recipe index b029ea0d5..15d219af1 100644 --- a/app-emulation/oricutron/oricutron-1.1_svn.recipe +++ b/app-emulation/oricutron/oricutron-1.1_svn.recipe @@ -43,6 +43,6 @@ INSTALL() { make install INSTALLDIR=$prefix/apps/Oricutron mimeset $prefix/apps/Oricutron/oricutron - #addAppDeskbarSymlink $prefix/apps/Oricutron/oricutron Oricutron + addAppDeskbarSymlink $prefix/apps/Oricutron/oricutron Oricutron } From b5981a79ab6e5fe4056a23c455de43d65655246e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 16 Dec 2013 15:05:50 +0100 Subject: [PATCH 017/206] parted: Add recipe For now it's broken, it needs libuuid. --- sys-block/parted/parted-3.1.53_git.recipe | 51 +++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 sys-block/parted/parted-3.1.53_git.recipe diff --git a/sys-block/parted/parted-3.1.53_git.recipe b/sys-block/parted/parted-3.1.53_git.recipe new file mode 100644 index 000000000..1b699ef66 --- /dev/null +++ b/sys-block/parted/parted-3.1.53_git.recipe @@ -0,0 +1,51 @@ +SUMMARY="parted" +DESCRIPTION="parted partition editor" +HOMEPAGE="http://www.gnu.org/software/parted" +SRC_URI="git://git.debian.org/git/parted/parted.git" +#CHECKSUM_MD5="" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="" + +ARCHITECTURES="!x86_gcc2 !x86 !x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" + +PROVIDES=" + parted$secondaryArchSuffix = $portVersion + cmd:parted$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:git + cmd:autoconf + cmd:libtool + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:gperf + cmd:rsync + cmd:gettext + " + +#PATCHES="parted.patch" + +# TODO: Fix libdl test in configure.ac +BUILD() +{ + ./bootstrap + runConfigure ./configure --disable-dynamic-loading + make +} + +INSTALL() +{ + make install +} + From 1ebc3cfd441748d551f68a8220790a367b6a33cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 16 Dec 2013 15:07:42 +0100 Subject: [PATCH 018/206] qemacs: cleanup --- app-editors/qemacs/qemacs-0.3.3.recipe | 2 -- 1 file changed, 2 deletions(-) diff --git a/app-editors/qemacs/qemacs-0.3.3.recipe b/app-editors/qemacs/qemacs-0.3.3.recipe index c6b989af0..ac6a932f6 100644 --- a/app-editors/qemacs/qemacs-0.3.3.recipe +++ b/app-editors/qemacs/qemacs-0.3.3.recipe @@ -7,8 +7,6 @@ REVISION="1" LICENSE="GNU LGPL v2.1" COPYRIGHT="2000-2003 Fabrice Bellard" -DEPEND="app-text/texi2html >= 1.82" - ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" From b8308ce3d1dda065d37b3378690bc662b2e9f1a5 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 18:22:11 +0000 Subject: [PATCH 019/206] Fixed ODE 0.12 recipe and patch --- dev-games/ode/ode-0.12.recipe | 61 ++++++++++++++++++++++++---- dev-games/ode/patches/ode-0.12.patch | 30 +++++++------- 2 files changed, 68 insertions(+), 23 deletions(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index 06df78601..d23c264ac 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -1,19 +1,64 @@ -DESCRIPTION="ODE is an open source, high performance library for simulating rigid body dynamics." +DESCRIPTION="ODE is an open source, high performance library for simulating rigid body dynamics. It is fully featured, stable, mature and platform independent with an easy to use C/C++ API. It has advanced joint types and integrated collision detection with friction. ODE is useful for simulating vehicles, objects in virtual reality environments and virtual creatures." +SUMMARY="Library for simulating rigid body dynamics" HOMEPAGE="http://www.ode.org/" SRC_URI="http://downloads.sourceforge.net/project/opende/ODE/0.12/ode-0.12.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fopende%2Ffiles%2F&ts=1356377654&use_mirror=freefr" +CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599" REVISION="1" COPYRIGHT="2001-2004 Russell L. Smith" -LICENSE="GNU LGPL v3 - BSD (3-clause)" -CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599" +LICENSE=" + GNU LGPL v3 + BSD (3-clause) + " +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + ode$secondaryArchSuffix = $portVersion + cmd:ode_config = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:mkdepend + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +SOURCE_DIR="$portVersionedName" + +PATCHES="ode-0.12.patch" + BUILD() { - cd ode-0.12 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + runConfigure ./configure --prefix=$prefix + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { - cd ode-0.12 make install + + prepareInstalledDevelLib libode + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } + +PROVIDES_devel=" + ode${secondaryArchSuffix}_devel = $portVersion + devel:ode$secondaryArchSuffix = $portVersion + devel:libode$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + ode$secondaryArchSuffix == $portVersion base + " diff --git a/dev-games/ode/patches/ode-0.12.patch b/dev-games/ode/patches/ode-0.12.patch index 131dddd87..1e00efd8e 100644 --- a/dev-games/ode/patches/ode-0.12.patch +++ b/dev-games/ode/patches/ode-0.12.patch @@ -1,18 +1,6 @@ -diff -u ode-0.12/ode/src/joints/Makefile.in ode-0.12-haiku/ode/src/joints/Makefile.in ---- ode-0.12/ode/src/joints/Makefile.in 2012-05-28 23:26:01.017825792 +0000 -+++ ode-0.12-haiku/ode/src/joints/Makefile.in 2012-12-27 19:39:57.854327296 +0000 -@@ -53,7 +53,7 @@ - contact.lo universal.lo hinge2.lo fixed.lo null.lo amotor.lo \ - lmotor.lo plane2d.lo pu.lo pr.lo piston.lo - libjoints_la_OBJECTS = $(am_libjoints_la_OBJECTS) --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ode/src -+DEFAULT_INCLUDES = -I.@am__isrc@ -I- -I$(top_builddir)/ode/src - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f -diff -u ode-0.12/include/ode/collision.h ode-0.12-haiku/include/ode/collision.h ---- ode-0.12/include/ode/collision.h 2012-12-27 19:39:13.484704256 +0000 -+++ ode-0.12-haiku/include/ode/collision.h 2012-12-27 19:39:01.685244416 +0000 +diff -ur ode-0.12/include/ode/collision.h ode-0.12-patch/include/ode/collision.h +--- ode-0.12/include/ode/collision.h 2010-11-08 12:00:18.044564480 +0000 ++++ ode-0.12-patch/include/ode/collision.h 2013-12-16 16:47:37.561774592 +0000 @@ -1081,7 +1081,7 @@ ODE_API void dGeomRaySetClosestHit (dGeomID g, int closestHit); ODE_API int dGeomRayGetClosestHit (dGeomID g); @@ -22,3 +10,15 @@ diff -u ode-0.12/include/ode/collision.h ode-0.12-haiku/include/ode/collision.h ODE_API dGeomID dCreateGeomTransform (dSpaceID space); ODE_API void dGeomTransformSetGeom (dGeomID g, dGeomID obj); +diff -ur ode-0.12/ode/src/joints/Makefile.in ode-0.12-patch/ode/src/joints/Makefile.in +--- ode-0.12/ode/src/joints/Makefile.in 2012-05-28 23:26:01.004980736 +0000 ++++ ode-0.12-patch/ode/src/joints/Makefile.in 2013-12-16 16:35:09.259784704 +0000 +@@ -53,7 +53,7 @@ + contact.lo universal.lo hinge2.lo fixed.lo null.lo amotor.lo \ + lmotor.lo plane2d.lo pu.lo pr.lo piston.lo + libjoints_la_OBJECTS = $(am_libjoints_la_OBJECTS) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ode/src ++DEFAULT_INCLUDES = -I.@am__isrc@ -I- -I$(top_builddir)/ode/src + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f From f1ec4b3e8c6c6587122878ab314fc3c9d9019914 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 30 Nov 2013 11:23:48 +0100 Subject: [PATCH 020/206] Allegro: fix for new CMake, and remove old non-recipes and patches. --- media-libs/allegro/allegro-4.4.0.recipe | 21 --- media-libs/allegro/allegro-4.4.1.1.recipe | 27 ++- media-libs/allegro/allegro-4.4.x_svn.recipe | 27 --- .../allegro/patches/allegro-4.4.0.patch | 67 -------- .../allegro/patches/allegro-4.4.1.1.patch | 62 ------- .../allegro/patches/allegro-4.4.1.1.patchset | 156 ++++++++++++++++++ .../allegro/patches/allegro-4.4.x-svn.patch | 51 ------ .../allegro/patches/allegro-4.4.x_svn.patch | 51 ------ 8 files changed, 179 insertions(+), 283 deletions(-) delete mode 100644 media-libs/allegro/allegro-4.4.0.recipe delete mode 100644 media-libs/allegro/allegro-4.4.x_svn.recipe delete mode 100644 media-libs/allegro/patches/allegro-4.4.0.patch delete mode 100644 media-libs/allegro/patches/allegro-4.4.1.1.patch create mode 100644 media-libs/allegro/patches/allegro-4.4.1.1.patchset delete mode 100644 media-libs/allegro/patches/allegro-4.4.x-svn.patch delete mode 100644 media-libs/allegro/patches/allegro-4.4.x_svn.patch diff --git a/media-libs/allegro/allegro-4.4.0.recipe b/media-libs/allegro/allegro-4.4.0.recipe deleted file mode 100644 index 7a3ff42b1..000000000 --- a/media-libs/allegro/allegro-4.4.0.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Allegro game programming library" -HOMEPAGE="http://alleg.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/alleg/allegro/4.4.0/allegro-4.4.0.tar.gz" -CHECKSUM_MD5="8a0bd73f5225ba8961211a5c440ff45d" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libvorbis >= 1.2.3" -BUILD() -{ - cd allegro-4.4.0 - cmake . - make -} - -INSTALL() -{ - cd allegro-4.4.0 - make install -} -LICENSE="Allegro" -COPYRIGHT="1998-2010 Shawn Hargreaves et al." diff --git a/media-libs/allegro/allegro-4.4.1.1.recipe b/media-libs/allegro/allegro-4.4.1.1.recipe index 24868e816..ed1972baf 100644 --- a/media-libs/allegro/allegro-4.4.1.1.recipe +++ b/media-libs/allegro/allegro-4.4.1.1.recipe @@ -13,7 +13,7 @@ SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PROVIDES=" allegro$secondaryArchSuffix = $portVersion - lib:allegro$secondaryArchSuffix = $portVersion + lib:liballeg$secondaryArchSuffix = $portVersion " REQUIRES=" @@ -40,25 +40,44 @@ BUILD_PREREQUIRES=" cmd:pkg_config " -PATCHES="allegro-4.4.1.1.patch" +PATCHES="allegro-4.4.1.1.patchset" BUILD() { - cmake . + cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DDOCDIR=$docDir -DMANDIR=$manDir make $jobArgs } INSTALL() { make install + + prepareInstalledDevelLibs liballeg libjpgalleg libloadpng liblogg + + packageEntries devel $developDir $binDir } PROVIDES_devel=" allegro${secondaryArchSuffix}_devel = $portVersion compat >= 4.4 - devel:allegro$secondaryArchSuffix = $portVersion compat >= 4.4 + devel:liballeg$secondaryArchSuffix = $portVersion compat >= 4.4 + cmd:allegro_config = $portVersion compat >= 4.4 + cmd:colormap = $portVersion compat >= 4.4 + cmd:dat = $portVersion compat >= 4.4 + cmd:dat2c = $portVersion compat >= 4.4 + cmd:dat2s = $portVersion compat >= 4.4 + cmd:exedat = $portVersion compat >= 4.4 + cmd:grabber = $portVersion compat >= 4.4 + cmd:pack = $portVersion compat >= 4.4 + cmd:pat2dat = $portVersion compat >= 4.4 + cmd:rgbmap = $portVersion compat >= 4.4 + cmd:textconv = $portVersion compat >= 4.4 + devel:libjpgalleg = $portVersion compat >= 4.4 + devel:liblogg = $portVersion compat >= 4.4 + devel:libloadpng = $portVersion compat >= 4.4 " REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion allegro$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/allegro/allegro-4.4.x_svn.recipe b/media-libs/allegro/allegro-4.4.x_svn.recipe deleted file mode 100644 index e114b9ab5..000000000 --- a/media-libs/allegro/allegro-4.4.x_svn.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="Allegro game programming library" -HOMEPAGE="http://alleg.sourceforge.net/" -SRC_URI="svn+https://alleg.svn.sourceforge.net/svnroot/alleg/allegro/branches/4.4" -#CHECKSUM_MD5="0f1cfff8f2cf88e5c91a667d9fd386ec" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.6.0 - media-libs/libvorbis >= 1.2.3 - media-libs/libogg >= 1.1.4" -BUILD() -{ - cd allegro-4.4.x-svn - mkdir -p `finddir B_COMMON_DIRECTORY`/share/info - mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - cmake . -DINFODIR:=`finddir B_COMMON_DIRECTORY`/share/info \ - -DMANDIR:=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd allegro-4.4.x-svn - make install -} - -LICENSE="Allegro" -COPYRIGHT="1998-2011 Shawn Hargreaves et al." diff --git a/media-libs/allegro/patches/allegro-4.4.0.patch b/media-libs/allegro/patches/allegro-4.4.0.patch deleted file mode 100644 index 16ce69664..000000000 --- a/media-libs/allegro/patches/allegro-4.4.0.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -ur allegro-4.4.0/CMakeLists.txt allegro-4.4.0-haiku/CMakeLists.txt ---- allegro-4.4.0/CMakeLists.txt 2009-12-20 15:47:59.000000000 -0700 -+++ allegro-4.4.0-haiku/CMakeLists.txt 2009-12-21 20:43:57.000000000 -0700 -@@ -270,7 +270,17 @@ - endif(COMPILER_GCC) - endif(APPLE) - --if(UNIX AND NOT APPLE) -+if(BEOS) -+ if(CMAKE_SYSTEM_NAME STREQUAL Haiku) -+ set(ALLEGRO_HAIKU 1) -+ else(CMAKE_SYSTEM_NAME STREQUAL Haiku) -+ set(ALLEGRO_BEOS 1) -+ endif(CMAKE_SYSTEM_NAME STREQUAL Haiku) -+ set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar -Wno-ctor-dtor-privacy") -+ set(WFLAGS_C_ONLY "") -+endif(BEOS) -+ -+if(UNIX AND NOT APPLE AND NOT BEOS) - set(ALLEGRO_UNIX 1) - endif() - -@@ -560,6 +570,13 @@ - ) - endif(WIN32) - -+# -- Haiku/BeOS -- -+ -+if(BEOS) -+ list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) -+ list(APPEND PLATFORM_LIBS game midi device) -+endif(BEOS) -+ - # -- Mac OS X -- - - if(ALLEGRO_MACOSX) -@@ -644,6 +661,9 @@ - if(ALLEGRO_WITH_XWINDOWS) - add_headers("" include/xalleg.h) - endif(ALLEGRO_WITH_XWINDOWS) -+if(BEOS) -+ add_headers("" include/bealleg.h) -+endif(BEOS) - - #-----------------------------------------------------------------------------# - # -diff -ur allegro-4.4.0/cmake/FileList.cmake allegro-4.4.0-haiku/cmake/FileList.cmake ---- allegro-4.4.0/cmake/FileList.cmake 2009-11-08 19:24:05.000000000 -0700 -+++ allegro-4.4.0-haiku/cmake/FileList.cmake 2009-12-21 20:43:06.000000000 -0700 -@@ -207,7 +207,7 @@ - src/beos/bmousapi.cpp - src/beos/bmousdrv.c - src/beos/bmouse.c -- src/beos/boverlay.c -+ src/beos/boverlay.cpp - src/beos/bsnd.c - src/beos/bsndapi.cpp - src/beos/bsnddrv.c -@@ -218,7 +218,7 @@ - src/beos/btimeapi.cpp - src/beos/btimedrv.c - src/beos/btimer.c -- src/beos/bwindow.c -+ src/beos/bwindow.cpp - src/beos/bwscreen.cpp - src/unix/ufile.c - src/misc/colconv.c diff --git a/media-libs/allegro/patches/allegro-4.4.1.1.patch b/media-libs/allegro/patches/allegro-4.4.1.1.patch deleted file mode 100644 index cd809ec5b..000000000 --- a/media-libs/allegro/patches/allegro-4.4.1.1.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -urN allegro-4.4.1.1/src/beos/bdwindow.cpp allegro-4.4.1.1-haiku/src/beos/bdwindow.cpp ---- allegro-4.4.1.1/src/beos/bdwindow.cpp 2008-10-21 01:03:43.061865984 +0000 -+++ allegro-4.4.1.1-haiku/src/beos/bdwindow.cpp 2010-10-30 22:40:51.000000000 +0000 -@@ -413,9 +413,9 @@ - } - - #ifdef ALLEGRO_NO_ASM -- bmp->read_bank = _be_gfx_bwindow_read_write_bank; -- bmp->write_bank = _be_gfx_bwindow_read_write_bank; -- _screen_vtable.unwrite_bank = _be_gfx_bwindow_unwrite_bank; -+ bmp->read_bank = (void *)_be_gfx_bwindow_read_write_bank; -+ bmp->write_bank = (void *)_be_gfx_bwindow_read_write_bank; -+ _screen_vtable.unwrite_bank = (void *)_be_gfx_bwindow_unwrite_bank; - #else - bmp->read_bank = _be_gfx_bwindow_read_write_bank_asm; - bmp->write_bank = _be_gfx_bwindow_read_write_bank_asm; -diff -urN allegro-4.4.1.1/src/beos/bwindow.cpp allegro-4.4.1.1-haiku/src/beos/bwindow.cpp ---- allegro-4.4.1.1/src/beos/bwindow.cpp 2008-10-20 08:27:27.061603840 +0000 -+++ allegro-4.4.1.1-haiku/src/beos/bwindow.cpp 2010-10-30 22:40:51.000000000 +0000 -@@ -347,9 +347,9 @@ - } - - #ifdef ALLEGRO_NO_ASM -- bmp->read_bank = _be_gfx_bwindow_read_write_bank; -- bmp->write_bank = _be_gfx_bwindow_read_write_bank; -- _screen_vtable.unwrite_bank = _be_gfx_bwindow_unwrite_bank; -+ bmp->read_bank = (void *)_be_gfx_bwindow_read_write_bank; -+ bmp->write_bank = (void *)_be_gfx_bwindow_read_write_bank; -+ _screen_vtable.unwrite_bank = (void *)_be_gfx_bwindow_unwrite_bank; - #else - bmp->read_bank = _be_gfx_bwindow_read_write_bank_asm; - bmp->write_bank = _be_gfx_bwindow_read_write_bank_asm; -diff -urN allegro-4.4.1.1/src/beos/bwscreen.cpp allegro-4.4.1.1-haiku/src/beos/bwscreen.cpp ---- allegro-4.4.1.1/src/beos/bwscreen.cpp 2008-10-20 08:27:27.061865984 +0000 -+++ allegro-4.4.1.1-haiku/src/beos/bwscreen.cpp 2010-10-30 22:40:51.000000000 +0000 -@@ -363,9 +363,9 @@ - - #ifdef ALLEGRO_NO_ASM - if (gfx_capabilities) { -- bmp->write_bank = be_gfx_bwindowscreen_read_write_bank; -- bmp->read_bank = be_gfx_bwindowscreen_read_write_bank; -- _screen_vtable.unwrite_bank = be_gfx_bwindowscreen_unwrite_bank; -+ bmp->write_bank = (void *)be_gfx_bwindowscreen_read_write_bank; -+ bmp->read_bank = (void *)be_gfx_bwindowscreen_read_write_bank; -+ _screen_vtable.unwrite_bank = (void *)be_gfx_bwindowscreen_unwrite_bank; - } - #else - if (gfx_capabilities) { -diff -urN allegro-4.4.1.1/src/file.c allegro-4.4.1.1-haiku/src/file.c ---- allegro-4.4.1.1/src/file.c 2008-10-23 13:38:21.006815744 +0000 -+++ allegro-4.4.1.1-haiku/src/file.c 2010-10-30 22:46:02.595853312 +0000 -@@ -31,6 +31,10 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - -+#ifdef ALLEGRO_HAIKU -+ #define O_BINARY 0 -+#endif -+ - #ifndef ALLEGRO_MPW - #include - #endif diff --git a/media-libs/allegro/patches/allegro-4.4.1.1.patchset b/media-libs/allegro/patches/allegro-4.4.1.1.patchset new file mode 100644 index 000000000..a1169f083 --- /dev/null +++ b/media-libs/allegro/patches/allegro-4.4.1.1.patchset @@ -0,0 +1,156 @@ +From cbe10814911be2ea285d73d455065e430bf6c92a Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Fri, 29 Nov 2013 21:27:01 +0100 +Subject: applying patch allegro-4.4.1.1.patch + + +diff --git a/src/beos/bdwindow.cpp b/src/beos/bdwindow.cpp +index 2ef8460..28c9678 100644 +--- a/src/beos/bdwindow.cpp ++++ b/src/beos/bdwindow.cpp +@@ -413,9 +413,9 @@ static struct BITMAP *_be_gfx_bdirectwindow_init(GFX_DRIVER *drv, int w, int h, + } + + #ifdef ALLEGRO_NO_ASM +- bmp->read_bank = _be_gfx_bwindow_read_write_bank; +- bmp->write_bank = _be_gfx_bwindow_read_write_bank; +- _screen_vtable.unwrite_bank = _be_gfx_bwindow_unwrite_bank; ++ bmp->read_bank = (void *)_be_gfx_bwindow_read_write_bank; ++ bmp->write_bank = (void *)_be_gfx_bwindow_read_write_bank; ++ _screen_vtable.unwrite_bank = (void *)_be_gfx_bwindow_unwrite_bank; + #else + bmp->read_bank = _be_gfx_bwindow_read_write_bank_asm; + bmp->write_bank = _be_gfx_bwindow_read_write_bank_asm; +diff --git a/src/beos/bwindow.cpp b/src/beos/bwindow.cpp +index d89e1d4..61a1885 100644 +--- a/src/beos/bwindow.cpp ++++ b/src/beos/bwindow.cpp +@@ -347,9 +347,9 @@ extern "C" struct BITMAP *be_gfx_bwindow_init(int w, int h, int v_w, int v_h, in + } + + #ifdef ALLEGRO_NO_ASM +- bmp->read_bank = _be_gfx_bwindow_read_write_bank; +- bmp->write_bank = _be_gfx_bwindow_read_write_bank; +- _screen_vtable.unwrite_bank = _be_gfx_bwindow_unwrite_bank; ++ bmp->read_bank = (void *)_be_gfx_bwindow_read_write_bank; ++ bmp->write_bank = (void *)_be_gfx_bwindow_read_write_bank; ++ _screen_vtable.unwrite_bank = (void *)_be_gfx_bwindow_unwrite_bank; + #else + bmp->read_bank = _be_gfx_bwindow_read_write_bank_asm; + bmp->write_bank = _be_gfx_bwindow_read_write_bank_asm; +diff --git a/src/beos/bwscreen.cpp b/src/beos/bwscreen.cpp +index af22981..4aeda05 100644 +--- a/src/beos/bwscreen.cpp ++++ b/src/beos/bwscreen.cpp +@@ -363,9 +363,9 @@ static struct BITMAP *_be_gfx_bwindowscreen_init(GFX_DRIVER *drv, int w, int h, + + #ifdef ALLEGRO_NO_ASM + if (gfx_capabilities) { +- bmp->write_bank = be_gfx_bwindowscreen_read_write_bank; +- bmp->read_bank = be_gfx_bwindowscreen_read_write_bank; +- _screen_vtable.unwrite_bank = be_gfx_bwindowscreen_unwrite_bank; ++ bmp->write_bank = (void *)be_gfx_bwindowscreen_read_write_bank; ++ bmp->read_bank = (void *)be_gfx_bwindowscreen_read_write_bank; ++ _screen_vtable.unwrite_bank = (void *)be_gfx_bwindowscreen_unwrite_bank; + } + #else + if (gfx_capabilities) { +diff --git a/src/file.c b/src/file.c +index 654e632..7d56d8f 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -31,6 +31,10 @@ + #include "allegro.h" + #include "allegro/internal/aintern.h" + ++#ifdef ALLEGRO_HAIKU ++ #define O_BINARY 0 ++#endif ++ + #ifndef ALLEGRO_MPW + #include + #endif +-- +1.8.3.4 + + +From e3cc30c9d162fff9e1b74985da390969eea932e8 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 30 Nov 2013 11:16:32 +0100 +Subject: Allegro: fix recipe following CMake changes + +* Our CMake doesn't define BEOS anymore, so have Allegro build accept +HAIKU as well. +* Fix some hardcoded installation paths. +* Add a missing zlib include, I guess because of a newer libpng. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 103d012..7e83070 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,7 +280,7 @@ if(APPLE) + endif(COMPILER_GCC) + endif(APPLE) + +-if(BEOS) ++if(BEOS OR HAIKU) + if(CMAKE_SYSTEM_NAME STREQUAL Haiku) + set(ALLEGRO_HAIKU 1) + else(CMAKE_SYSTEM_NAME STREQUAL Haiku) +@@ -288,9 +288,9 @@ if(BEOS) + endif(CMAKE_SYSTEM_NAME STREQUAL Haiku) + set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar -Wno-ctor-dtor-privacy") + set(WFLAGS_C_ONLY "") +-endif(BEOS) ++endif() + +-if(UNIX AND NOT APPLE AND NOT BEOS) ++if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + set(ALLEGRO_UNIX 1) + endif() + +@@ -582,10 +582,10 @@ endif(WIN32) + + # -- Haiku/BeOS -- + +-if(BEOS) ++if(BEOS OR HAIKU) + list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) + list(APPEND PLATFORM_LIBS game midi device) +-endif(BEOS) ++endif() + + # -- Mac OS X -- + +diff --git a/addons/loadpng/loadpng.c b/addons/loadpng/loadpng.c +index 33f5527..9253260 100644 +--- a/addons/loadpng/loadpng.c ++++ b/addons/loadpng/loadpng.c +@@ -9,6 +9,7 @@ + #include + #include + #include "loadpng.h" ++#include + + /* We need internals _color_load_depth and _fixup_loaded_bitmap. The + * first can be replaced by the new get_color_depth() function which +diff --git a/cmake/Common.cmake b/cmake/Common.cmake +index 654c01c..2a9b171 100644 +--- a/cmake/Common.cmake ++++ b/cmake/Common.cmake +@@ -43,7 +43,11 @@ endfunction(install_our_library) + function(install_our_headers) + foreach(hdr ${ARGN}) + get_source_file_property(LOC ${hdr} MACOSX_PACKAGE_LOCATION) +- string(REGEX REPLACE "^Headers" "include" LOC ${LOC}) ++ if(HAIKU) ++ string(REGEX REPLACE "^Headers" "develop/headers" LOC ${LOC}) ++ else() ++ string(REGEX REPLACE "^Headers" "include" LOC ${LOC}) ++ endif() + install(FILES ${hdr} DESTINATION ${LOC}) + endforeach() + endfunction(install_our_headers) +-- +1.8.3.4 + diff --git a/media-libs/allegro/patches/allegro-4.4.x-svn.patch b/media-libs/allegro/patches/allegro-4.4.x-svn.patch deleted file mode 100644 index 2e81e77f1..000000000 --- a/media-libs/allegro/patches/allegro-4.4.x-svn.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -urN allegro-4.4.x-svn/CMakeLists.txt allegro-4.4.x-svn-haiku/CMakeLists.txt ---- allegro-4.4.x-svn/CMakeLists.txt 2012-11-18 01:16:37.000000000 -0800 -+++ allegro-4.4.x-svn-haiku/CMakeLists.txt 2012-11-18 01:06:24.541065216 -0800 -@@ -291,18 +291,18 @@ - endif(COMPILER_GCC) - endif(APPLE) - --if(BEOS) -+if(HAIKU) - if(CMAKE_SYSTEM_NAME STREQUAL Haiku) - set(ALLEGRO_HAIKU 1) -- else(CMAKE_SYSTEM_NAME STREQUAL Haiku) -+ else(CMAKE_SYSTEM_NAME STREQUAL BeOS) - set(ALLEGRO_BEOS 1) - endif(CMAKE_SYSTEM_NAME STREQUAL Haiku) - set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar") - set(WFLAGS_C_ONLY "") - set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy") --endif(BEOS) -+endif(HAIKU) - --if(UNIX AND NOT APPLE AND NOT BEOS) -+if(UNIX AND NOT APPLE AND NOT HAIKU) - set(ALLEGRO_UNIX 1) - endif() - -@@ -628,10 +628,10 @@ - - # -- Haiku/BeOS -- - --if(BEOS) -+if(HAIKU) - list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) - list(APPEND PLATFORM_LIBS game midi device) --endif(BEOS) -+endif(HAIKU) - - # -- Mac OS X -- - -@@ -727,9 +727,9 @@ - if(ALLEGRO_WITH_XWINDOWS) - add_headers("" include/xalleg.h) - endif(ALLEGRO_WITH_XWINDOWS) --if(BEOS) -+if(HAIKU) - add_headers("" include/bealleg.h) --endif(BEOS) -+endif(HAIKU) - - #-----------------------------------------------------------------------------# - # diff --git a/media-libs/allegro/patches/allegro-4.4.x_svn.patch b/media-libs/allegro/patches/allegro-4.4.x_svn.patch deleted file mode 100644 index 2e81e77f1..000000000 --- a/media-libs/allegro/patches/allegro-4.4.x_svn.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -urN allegro-4.4.x-svn/CMakeLists.txt allegro-4.4.x-svn-haiku/CMakeLists.txt ---- allegro-4.4.x-svn/CMakeLists.txt 2012-11-18 01:16:37.000000000 -0800 -+++ allegro-4.4.x-svn-haiku/CMakeLists.txt 2012-11-18 01:06:24.541065216 -0800 -@@ -291,18 +291,18 @@ - endif(COMPILER_GCC) - endif(APPLE) - --if(BEOS) -+if(HAIKU) - if(CMAKE_SYSTEM_NAME STREQUAL Haiku) - set(ALLEGRO_HAIKU 1) -- else(CMAKE_SYSTEM_NAME STREQUAL Haiku) -+ else(CMAKE_SYSTEM_NAME STREQUAL BeOS) - set(ALLEGRO_BEOS 1) - endif(CMAKE_SYSTEM_NAME STREQUAL Haiku) - set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar") - set(WFLAGS_C_ONLY "") - set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy") --endif(BEOS) -+endif(HAIKU) - --if(UNIX AND NOT APPLE AND NOT BEOS) -+if(UNIX AND NOT APPLE AND NOT HAIKU) - set(ALLEGRO_UNIX 1) - endif() - -@@ -628,10 +628,10 @@ - - # -- Haiku/BeOS -- - --if(BEOS) -+if(HAIKU) - list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) - list(APPEND PLATFORM_LIBS game midi device) --endif(BEOS) -+endif(HAIKU) - - # -- Mac OS X -- - -@@ -727,9 +727,9 @@ - if(ALLEGRO_WITH_XWINDOWS) - add_headers("" include/xalleg.h) - endif(ALLEGRO_WITH_XWINDOWS) --if(BEOS) -+if(HAIKU) - add_headers("" include/bealleg.h) --endif(BEOS) -+endif(HAIKU) - - #-----------------------------------------------------------------------------# - # From 32bfd01d12904a16181a6e1b3a66489029ab67ae Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 30 Nov 2013 12:15:56 +0100 Subject: [PATCH 021/206] Recipe for Allegro 4.4.2. --- media-libs/allegro/allegro-4.4.2.recipe | 96 +++++++++++++++++++ .../allegro/patches/allegro-4.4.2.patchset | 77 +++++++++++++++ 2 files changed, 173 insertions(+) create mode 100644 media-libs/allegro/allegro-4.4.2.recipe create mode 100644 media-libs/allegro/patches/allegro-4.4.2.patchset diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe new file mode 100644 index 000000000..246807cef --- /dev/null +++ b/media-libs/allegro/allegro-4.4.2.recipe @@ -0,0 +1,96 @@ +SUMMARY="Allegro game programming library" +DESCRIPTION=" +Allegro 4 and Allegro 5 are cross-platform, libraries mainly aimed at video +game and multimedia programming. They handle common, low-level tasks such as +creating windows, accepting user input, loading data, drawing images, playing +sounds, etc. and generally abstracting away the underlying platform. However, +Allegro is not a game engine: you are free to design and structure your program +as you like. + +According to the Oxford Companion to Music, Allegro is the Italian for «quick, +lively, bright». It is also a recursive acronym which stands for «Allegro Low +LEvel Game ROutines». Allegro was started by Shawn Hargreaves in the mid-90's +but has since received contributions from hundreds of people over the net. +" + +HOMEPAGE="http://alleg.sourceforge.net/" +SRC_URI="http://sourceforge.net/projects/alleg/files/allegro/4.4.2/allegro-4.4.2.tar.gz/download" +CHECKSUM_MD5="4db71b0460fc99926ae91d223199c2e6" +LICENSE="Allegro" +COPYRIGHT="1998-2010 Shawn Hargreaves et al." + +REVISION="1" + +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + allegro$secondaryArchSuffix = $portVersion + lib:liballeg$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libpng + lib:libz + lib:libogg + lib:libvorbis + " + +BUILD_REQUIRES=" + devel:libpng$secondaryArchSuffix + devel:libz + devel:libogg + devel:libvorbis + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:cmake + cmd:make + cmd:pkg_config + " + +#PATCHES="allegro-4.4.1.1.patchset" + +BUILD() +{ + cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DDOCDIR=$docDir -DMANDIR=$manDir + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs liballeg libjpgalleg libloadpng liblogg + + packageEntries devel $developDir $binDir +} + +PROVIDES_devel=" + allegro${secondaryArchSuffix}_devel = $portVersion compat >= 4.4 + devel:liballeg$secondaryArchSuffix = $portVersion compat >= 4.4 + cmd:allegro_config = $portVersion compat >= 4.4 + cmd:colormap = $portVersion compat >= 4.4 + cmd:dat = $portVersion compat >= 4.4 + cmd:dat2c = $portVersion compat >= 4.4 + cmd:dat2s = $portVersion compat >= 4.4 + cmd:exedat = $portVersion compat >= 4.4 + cmd:grabber = $portVersion compat >= 4.4 + cmd:pack = $portVersion compat >= 4.4 + cmd:pat2dat = $portVersion compat >= 4.4 + cmd:rgbmap = $portVersion compat >= 4.4 + cmd:textconv = $portVersion compat >= 4.4 + devel:libjpgalleg = $portVersion compat >= 4.4 + devel:liblogg = $portVersion compat >= 4.4 + devel:libloadpng = $portVersion compat >= 4.4 + " + +REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion + allegro$secondaryArchSuffix == $portVersion base + " + diff --git a/media-libs/allegro/patches/allegro-4.4.2.patchset b/media-libs/allegro/patches/allegro-4.4.2.patchset new file mode 100644 index 000000000..80780b740 --- /dev/null +++ b/media-libs/allegro/patches/allegro-4.4.2.patchset @@ -0,0 +1,77 @@ +From 3f9d50e146abb2e937adf2d6e0fc7dad9634b20e Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 30 Nov 2013 12:14:54 +0100 +Subject: Import Allegro 4.4.1.1 fixes that were not upstreamed. + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 245be10..08a2a32 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -291,7 +291,7 @@ if(APPLE) + endif(COMPILER_GCC) + endif(APPLE) + +-if(BEOS) ++if(BEOS OR HAIKU) + if(CMAKE_SYSTEM_NAME STREQUAL Haiku) + set(ALLEGRO_HAIKU 1) + else(CMAKE_SYSTEM_NAME STREQUAL Haiku) +@@ -300,9 +300,9 @@ if(BEOS) + set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar") + set(WFLAGS_C_ONLY "") + set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy") +-endif(BEOS) ++endif() + +-if(UNIX AND NOT APPLE AND NOT BEOS) ++if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + set(ALLEGRO_UNIX 1) + endif() + +@@ -628,10 +628,10 @@ endif(WIN32) + + # -- Haiku/BeOS -- + +-if(BEOS) ++if(BEOS OR HAIKU) + list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) + list(APPEND PLATFORM_LIBS game midi device) +-endif(BEOS) ++endif() + + # -- Mac OS X -- + +diff --git a/cmake/Common.cmake b/cmake/Common.cmake +index 41822dd..1b56e1b 100644 +--- a/cmake/Common.cmake ++++ b/cmake/Common.cmake +@@ -43,7 +43,11 @@ endfunction(install_our_library) + function(install_our_headers) + foreach(hdr ${ARGN}) + get_source_file_property(LOC ${hdr} MACOSX_PACKAGE_LOCATION) +- string(REGEX REPLACE "^Headers" "include" LOC ${LOC}) ++ if(HAIKU) ++ string(REGEX REPLACE "^Headers" "develop/headers" LOC ${LOC}) ++ else() ++ string(REGEX REPLACE "^Headers" "include" LOC ${LOC}) ++ endif() + install(FILES ${hdr} DESTINATION ${LOC}) + endforeach() + endfunction(install_our_headers) +diff --git a/src/beos/bsysapi.cpp b/src/beos/bsysapi.cpp +index c6e4dad..a7c9d46 100644 +--- a/src/beos/bsysapi.cpp ++++ b/src/beos/bsysapi.cpp +@@ -128,7 +128,7 @@ static int32 system_thread(void *data) + using_custom_allegro_app = false; + + term = getenv("TERM"); +- if (!strcmp(term, "dumb")) { ++ if (!term || !strcmp(term, "dumb")) { + /* The TERM environmental variable is set to "dumb" if the app was + * not started from a terminal. + */ +-- +1.8.3.4 + From aefa19123da4b2212b955cfdff0f75e7eb0f9f47 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 16 Dec 2013 19:31:23 +0100 Subject: [PATCH 022/206] Forgot to commit the recipe for HaikuWebkit 1.2.1. --- .../haikuwebkit/haikuwebkit-1.2.1.recipe | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe new file mode 100644 index 000000000..33e4d9979 --- /dev/null +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe @@ -0,0 +1,95 @@ +SUMMARY="Open source web browser engine" +DESCRIPTION="WebKit is an open source web browser engine. WebKit is also the name of the Mac OS X system framework version of the engine that's used by Safari, Dashboard, Mail, and many other OS X applications. WebKit's HTML and JavaScript code began as a branch of the KHTML and KJS libraries from KDE." +HOMEPAGE="http://www.webkit.org/" +COPYRIGHT="1998-2012 Apple Inc., Google Inc., et al" +LICENSE=" + GNU LGPL v2 + GNU LGPL v2.1 + MIT + " +SRC_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.1-Source.tar.bz2" +CHECKSUM_MD5="9b5624345b633693ec90a95a1e9e52bf" +REVISION="1" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + haikuwebkit$secondaryArchSuffix = $portVersion + lib:libWebKit$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + icu$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libsqlite3$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libxslt$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel >= $haikuVersion + icu${secondaryArchSuffix}_devel + cmd:pkg_config + devel:libruby$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libsqlite3$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libxslt$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:flex + cmd:bison + cmd:gcc$secondaryArchSuffix + cmd:gperf + cmd:ld$secondaryArchSuffix + cmd:m4 + cmd:make + cmd:perl + cmd:python + cmd:cmake + cmd:ruby + " + +SOURCE_DIR="haikuwebkit_x86-$portVersion-Source" + +BUILD() +{ + Tools/Scripts/build-webkit --haiku --no-webkit2 \ + --cmakearg="-DCMAKE_LIBRARY_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib -DCMAKE_INSTALL_PREFIX=$prefix" +} + +INSTALL() +{ + cd WebKitBuild/Release + make install + + rm $developLibDir/* + prepareInstalledDevelLibs libWebKit + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + haikuwebkit${secondaryArchSuffix}_devel = $portVersion + devel:libjavascriptcore$secondaryArchSuffix = $portVersion + devel:libwebcore$secondaryArchSuffix = $portVersion + devel:libWebKit$secondaryArchSuffix = $portVersion + devel:libwtf$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + haikuwebkit$secondaryArchSuffix == $portVersion base + " From dd988ba92a95c18ec6f6174832608693794f83da Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 18:37:48 +0000 Subject: [PATCH 023/206] Modifications on the ODE recipe --- dev-games/ode/ode-0.12.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index d23c264ac..6bec79857 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -14,7 +14,6 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" ode$secondaryArchSuffix = $portVersion - cmd:ode_config = $portVersion " REQUIRES=" @@ -38,8 +37,8 @@ PATCHES="ode-0.12.patch" BUILD() { - runConfigure ./configure --prefix=$prefix - make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + runConfigure ./configure + make $jobArgs } INSTALL() { @@ -50,13 +49,14 @@ INSTALL() # devel package packageEntries devel \ - $developDir + $developDir \ + $binDir # ode_config binary here } PROVIDES_devel=" ode${secondaryArchSuffix}_devel = $portVersion - devel:ode$secondaryArchSuffix = $portVersion devel:libode$secondaryArchSuffix = $portVersion + cmd:ode_config = $portVersion " REQUIRES_devel=" From 08cd2aa270ce66ce963c5fd79a50324b242e3200 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 19:18:12 +0000 Subject: [PATCH 024/206] Removed SOURCE_DIR --- dev-games/ode/ode-0.12.recipe | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index 6bec79857..bce78da7c 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -31,8 +31,6 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix " -SOURCE_DIR="$portVersionedName" - PATCHES="ode-0.12.patch" BUILD() From 86cb7ed16cf3629d7df5969ce9e8a1b63a006789 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 20:03:51 +0000 Subject: [PATCH 025/206] Enable shared building for ODE --- dev-games/ode/ode-0.12.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index bce78da7c..d59e033d3 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -35,7 +35,7 @@ PATCHES="ode-0.12.patch" BUILD() { - runConfigure ./configure + runConfigure ./configure --enable-shared make $jobArgs } INSTALL() From 4ab43be501b19035537f7166174cb18da212a153 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 16 Dec 2013 21:18:42 +0000 Subject: [PATCH 026/206] New PROVIDEs, fixed references for ode-config, require haiku for devel package --- dev-games/ode/ode-0.12.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index d59e033d3..2c32a8fac 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -14,6 +14,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" ode$secondaryArchSuffix = $portVersion + lib:libode$secondaryArchSuffix = $portVersion " REQUIRES=" @@ -40,6 +41,8 @@ BUILD() } INSTALL() { + fixDevelopLibDirReferences ode-config + make install prepareInstalledDevelLib libode @@ -54,9 +57,10 @@ INSTALL() PROVIDES_devel=" ode${secondaryArchSuffix}_devel = $portVersion devel:libode$secondaryArchSuffix = $portVersion - cmd:ode_config = $portVersion + cmd:ode_config$secondaryArchSuffix = $portVersion " REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion ode$secondaryArchSuffix == $portVersion base " From 8e44fea6e1813cb1c2af1245689f9d874502d258 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 17 Dec 2013 09:24:40 +0100 Subject: [PATCH 027/206] Fix ruby dependency * We don't need the lib, only the executable. * Helps with building on gcc2 since the ruby package isn't hybrid aware. --- haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe index 33e4d9979..18d25876d 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe @@ -37,8 +37,6 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion haiku_devel >= $haikuVersion icu${secondaryArchSuffix}_devel - cmd:pkg_config - devel:libruby$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix @@ -47,6 +45,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:pkg_config cmd:flex cmd:bison cmd:gcc$secondaryArchSuffix From f6e9b0c672decf2d6bf1059496de951b9263f7fd Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 17 Dec 2013 22:00:28 +0000 Subject: [PATCH 028/206] Add BlogPositive recipe --- .../blogpositive/blogpositive-0.1.0.recipe | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 haiku-apps/blogpositive/blogpositive-0.1.0.recipe diff --git a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe new file mode 100644 index 000000000..65b4d9515 --- /dev/null +++ b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe @@ -0,0 +1,52 @@ +SUMMARY="The one blog app to rule them all!" +DESCRIPTION=" + Want to blog, but WebPositive isn't quick enough + Now you can use the new blog app: BlogPositive + It can only connect to your Wordpress blogs for now + " +HOMEPAGE="http://blogpositive.puckipedia.com" +SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.1.0" +REVISION="1" + +LICENSE="MIT" +COPYRIGHT="2013 :Puck Meerburg" + +ARCHITECTURES="!x86 x86_gcc2" + +PROVIDES=" + blogpositive = $portVersion + app:blogpositive = $portVersion + " + +REQUIRES=" + lib:libcurl + lib:libz + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:g++ + cmd:xres + cmd:mkdepend + " +BUILD_REQUIRES=" + devel:libcurl + devel:libz + haiku_devel >= $haikuVersion + " + +USER_SETTINGS_FILES=" + settings/BlogPositive directory + " + +BUILD() +{ + make + make bindcatalogs +} + +INSTALL() +{ + make install INSTALL_DIR=$appsDir + addAppDeskbarSymlink $appsDir/BlogPositive +} From 6dd883fffb54db4beb7280e07d27380e870209dd Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 17 Dec 2013 22:53:10 +0000 Subject: [PATCH 029/206] Fix recipe for x86 and x86_64 --- haiku-apps/blogpositive/blogpositive-0.1.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe index 65b4d9515..e5a35c0d8 100644 --- a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe @@ -11,7 +11,7 @@ REVISION="1" LICENSE="MIT" COPYRIGHT="2013 :Puck Meerburg" -ARCHITECTURES="!x86 x86_gcc2" +ARCHITECTURES="x86 x86_gcc2 ?x86_64" PROVIDES=" blogpositive = $portVersion From 51384b8280b60054f5d6ce980d3c1fe81568a0b8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 01:25:44 +0000 Subject: [PATCH 030/206] Changed BEOS cases in CMakeLists.txt to HAIKU, this fixes the Allegro build --- media-libs/allegro/allegro-4.4.2.recipe | 6 +-- media-libs/allegro/patches/Haiku.patch | 50 +++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 media-libs/allegro/patches/Haiku.patch diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe index 246807cef..84360f83b 100644 --- a/media-libs/allegro/allegro-4.4.2.recipe +++ b/media-libs/allegro/allegro-4.4.2.recipe @@ -21,8 +21,8 @@ COPYRIGHT="1998-2010 Shawn Hargreaves et al." REVISION="1" -ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" allegro$secondaryArchSuffix = $portVersion @@ -53,7 +53,7 @@ BUILD_PREREQUIRES=" cmd:pkg_config " -#PATCHES="allegro-4.4.1.1.patchset" +PATCHES="Haiku.patch" BUILD() { diff --git a/media-libs/allegro/patches/Haiku.patch b/media-libs/allegro/patches/Haiku.patch new file mode 100644 index 000000000..bb6633253 --- /dev/null +++ b/media-libs/allegro/patches/Haiku.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 245be10..6ab68c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -291,7 +291,7 @@ if(APPLE) + endif(COMPILER_GCC) + endif(APPLE) + +-if(BEOS) ++if(HAIKU) + if(CMAKE_SYSTEM_NAME STREQUAL Haiku) + set(ALLEGRO_HAIKU 1) + else(CMAKE_SYSTEM_NAME STREQUAL Haiku) +@@ -300,9 +300,9 @@ if(BEOS) + set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar") + set(WFLAGS_C_ONLY "") + set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy") +-endif(BEOS) ++endif(HAIKU) + +-if(UNIX AND NOT APPLE AND NOT BEOS) ++if(UNIX AND NOT APPLE AND NOT HAIKU) + set(ALLEGRO_UNIX 1) + endif() + +@@ -628,10 +628,10 @@ endif(WIN32) + + # -- Haiku/BeOS -- + +-if(BEOS) ++if(HAIKU) + list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) + list(APPEND PLATFORM_LIBS game midi device) +-endif(BEOS) ++endif(HAIKU) + + # -- Mac OS X -- + +@@ -727,9 +727,9 @@ endif(WIN32) + if(ALLEGRO_WITH_XWINDOWS) + add_headers("" include/xalleg.h) + endif(ALLEGRO_WITH_XWINDOWS) +-if(BEOS) ++if(HAIKU) + add_headers("" include/bealleg.h) +-endif(BEOS) ++endif(HAIKU) + + #-----------------------------------------------------------------------------# + # From 3bad1b61f38c9d2437144fdc8da078945c23dbc9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 17 Dec 2013 18:16:03 -0800 Subject: [PATCH 031/206] Fixed giflib secondaryArchSuffix support. --- media-libs/giflib/giflib-5.0.5.recipe | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/media-libs/giflib/giflib-5.0.5.recipe b/media-libs/giflib/giflib-5.0.5.recipe index f25521594..30752e828 100644 --- a/media-libs/giflib/giflib-5.0.5.recipe +++ b/media-libs/giflib/giflib-5.0.5.recipe @@ -5,23 +5,23 @@ SRC_URI="http://sourceforge.net/projects/giflib/files/giflib-5.x/giflib-5.0.5.ta CHECKSUM_MD5="c3262ba0a3dad31ba876fb5ba1d71a02" LICENSE="MIT" COPYRIGHT="1997-2007 Eric S. Raymond and Toshio Kuratomi" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" giflib$secondaryArchSuffix = $portVersion - lib:libgif = 6.0.1 compat >= 5 - cmd:gif2raw - cmd:gif2rgb - cmd:gifbuild - cmd:gifclrmp - cmd:gifecho - cmd:giffix - cmd:gifinto - cmd:giftext - cmd:giftool + lib:libgif$secondaryArchSuffix = 6.0.1 compat >= 6 + cmd:gif2raw$secondaryArchSuffix + cmd:gif2rgb$secondaryArchSuffix + cmd:gifbuild$secondaryArchSuffix + cmd:gifclrmp$secondaryArchSuffix + cmd:gifecho$secondaryArchSuffix + cmd:giffix$secondaryArchSuffix + cmd:gifinto$secondaryArchSuffix + cmd:giftext$secondaryArchSuffix + cmd:giftool$secondaryArchSuffix " REQUIRES=" @@ -29,10 +29,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtool From 3b79bda65729a77d4778d06a3a6af331a470c8d8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 17 Dec 2013 18:35:29 -0800 Subject: [PATCH 032/206] ReAdd earlier better Allegro-4.4.2 patch. --- media-libs/allegro/allegro-4.4.2.recipe | 2 +- media-libs/allegro/patches/Haiku.patch | 50 ------------------------- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 media-libs/allegro/patches/Haiku.patch diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe index 84360f83b..535f5b0e1 100644 --- a/media-libs/allegro/allegro-4.4.2.recipe +++ b/media-libs/allegro/allegro-4.4.2.recipe @@ -53,7 +53,7 @@ BUILD_PREREQUIRES=" cmd:pkg_config " -PATCHES="Haiku.patch" +PATCHES="allegro-4.4.2.patchset" BUILD() { diff --git a/media-libs/allegro/patches/Haiku.patch b/media-libs/allegro/patches/Haiku.patch deleted file mode 100644 index bb6633253..000000000 --- a/media-libs/allegro/patches/Haiku.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 245be10..6ab68c8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -291,7 +291,7 @@ if(APPLE) - endif(COMPILER_GCC) - endif(APPLE) - --if(BEOS) -+if(HAIKU) - if(CMAKE_SYSTEM_NAME STREQUAL Haiku) - set(ALLEGRO_HAIKU 1) - else(CMAKE_SYSTEM_NAME STREQUAL Haiku) -@@ -300,9 +300,9 @@ if(BEOS) - set(WFLAGS "-W -Wall -Wno-unused -Wno-multichar") - set(WFLAGS_C_ONLY "") - set(WFLAGS_CXX_ONLY "-Wno-ctor-dtor-privacy") --endif(BEOS) -+endif(HAIKU) - --if(UNIX AND NOT APPLE AND NOT BEOS) -+if(UNIX AND NOT APPLE AND NOT HAIKU) - set(ALLEGRO_UNIX 1) - endif() - -@@ -628,10 +628,10 @@ endif(WIN32) - - # -- Haiku/BeOS -- - --if(BEOS) -+if(HAIKU) - list(APPEND PLATFORM_SOURCES ${ALLEGRO_SRC_BEOS_FILES}) - list(APPEND PLATFORM_LIBS game midi device) --endif(BEOS) -+endif(HAIKU) - - # -- Mac OS X -- - -@@ -727,9 +727,9 @@ endif(WIN32) - if(ALLEGRO_WITH_XWINDOWS) - add_headers("" include/xalleg.h) - endif(ALLEGRO_WITH_XWINDOWS) --if(BEOS) -+if(HAIKU) - add_headers("" include/bealleg.h) --endif(BEOS) -+endif(HAIKU) - - #-----------------------------------------------------------------------------# - # From 9776c3e80c76e596485927b4080f6e46a859a25e Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 17 Dec 2013 22:12:26 -0600 Subject: [PATCH 033/206] mesa: Add Mesa 7.9.2 recipe * This will make up the Haiku gcc2 OpenGL kit * Untested! May need some tweaking still. --- sys-libs/mesa/mesa-7.9.2.recipe | 116 ++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 sys-libs/mesa/mesa-7.9.2.recipe diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe new file mode 100644 index 000000000..6ab75cdb1 --- /dev/null +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -0,0 +1,116 @@ +SUMMARY="Multi-platform GL implementation" +DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification. + The OpenGL specification documents a system for rendering interactive 3D graphics. + + Mesa fills the role of the Haiku OpenGL kit providing 3D rendering to Haiku applications. + " +HOMEPAGE="http://www.mesa3d.org/" +COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." +LICENSE="MIT" +# remember to update SOURCE_DIR as well for the -X revision +SRC_URI="https://github.com/kallisti5/mesa/archive/7.9.2-3.tar.gz" +CHECKSUM_MD5="1f7d846ea2982ffa175c906443aaabd3" +REVISION="1" +ARCHITECTURES="?x86_gcc2" +if [ $effectiveTargetArchitecture != x86 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="?x86_gcc2" + +PROVIDES=" + mesa$secondaryArchSuffix = $portVersion compat >= 7.9 + lib:libGL$secondaryArchSuffix = $portVersion compat >= 1.0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:bison + cmd:find + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:python + cmd:make + cmd:sed + " + +SOURCE_DIR="mesa-7.9.2-3" + +BUILD() +{ + if [ -n "$secondaryArchSuffix" ]; then + export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture" + fi + #make DEBUG=1 haiku $jobArgs + make haiku $jobArgs +} + +INSTALL() +{ + # libGL.so makes up the core of our OpenGL kit + mkdir -p $libDir + cp $(find ./lib/ -name 'libGL.so') $libDir + + # Our rendering add-on + mkdir -p $addOnsDir/opengl + cp $(find ./lib/ -name 'libswrast.so') \ + "$addOnsDir/opengl/Legacy Software Rasterizer" + + # OpenGL Kit + mkdir -p $includeDir/os/opengl/GL + cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ + cp ./include/HaikuGL/BGLView.h $includeDir/os/opengl/ + cp ./include/HaikuGL/BGLRenderer.h $includeDir/os/opengl/ + + # Standard GL headers + cp ./include/GL/gl.h $includeDir/os/opengl/GL/ + cp ./include/GL/gl_mangle.h $includeDir/os/opengl/GL/ + cp ./include/GL/glext.h $includeDir/os/opengl/GL/ + + # Symlink GL in kit to system GL directory + cd $includeDir + ln -snf os/opengl/GL GL + + # devel package + packageEntries devel \ + $developDir + + # swrast renderer package + packageEntries swrast \ + "$addOnsDir/opengl/Legacy Software Rasterizer" +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + mesa${secondaryArchSuffix}_devel = $portVersion + devel:libGL${secondaryArchSuffix} = $portVersion + " + +REQUIRES_devel=" + mesa${secondaryArchSuffix} == $portVersion base + " + +# ===== Mesa OpenGL Add-ons ================================================== +# ----- swrast package ------------------------------------------------------- + +SUMMARY_swrast="Mesa legacy software rasterization renderer" +DESCRIPTION_swrast="This 3D BGLRenderer add-on provides Mesa software + rasterization on Haiku systems. Software rasterization performs all + 3D rendering on the systems CPU and doesn't require any specialized + hardware. Software rasterization is generally considered a fallback + 3D rendering method as performance is limited. + " +PROVIDES_swrast=" + mesa${secondaryArchSuffix}_swrast = $portVersion + " +REQUIRED_swrast=" + mesa$secondaryArchSuffix == $portVersion base + " From fe77860961ca9c2bda07f4357405971183b09a9f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Dec 2013 10:02:42 +0100 Subject: [PATCH 034/206] Fix haikuwebkit recipe not finding sqlite and ICU ... on gcc2hybrid only. --- haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe index 18d25876d..dad4f7182 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe @@ -24,7 +24,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - icu$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libsqlite3$secondaryArchSuffix @@ -36,7 +36,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion haiku_devel >= $haikuVersion - icu${secondaryArchSuffix}_devel + devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix @@ -63,8 +63,9 @@ SOURCE_DIR="haikuwebkit_x86-$portVersion-Source" BUILD() { + export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig" Tools/Scripts/build-webkit --haiku --no-webkit2 \ - --cmakearg="-DCMAKE_LIBRARY_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib -DCMAKE_INSTALL_PREFIX=$prefix" + --cmakearg="-DCMAKE_LIBRARY_PATH=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir -DCMAKE_INCLUDE_PATH=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir -DCMAKE_INSTALL_PREFIX=$prefix" } INSTALL() From 5e8ae232a86078e21c8e799969cda14437f2f614 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 00:00:21 -0800 Subject: [PATCH 035/206] Fixed libpaper secondaryArchSuffix support. --- app-text/libpaper/libpaper-1.1.24.recipe | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app-text/libpaper/libpaper-1.1.24.recipe b/app-text/libpaper/libpaper-1.1.24.recipe index 6cf45a760..77b2fe758 100644 --- a/app-text/libpaper/libpaper-1.1.24.recipe +++ b/app-text/libpaper/libpaper-1.1.24.recipe @@ -14,20 +14,21 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libpaper$secondaryArchSuffix = $portVersion - cmd:paperconf - cmd:paperconfig lib:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1 + cmd:paper_config$secondaryArchSuffix + cmd:paperconf$secondaryArchSuffix + cmd:paperconfig$secondaryArchSuffix " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtool @@ -72,5 +73,6 @@ PROVIDES_devel=" " REQUIRES_devel=" +# haiku${secondaryArchSuffix}_devel >= $haikuVersion libpaper$secondaryArchSuffix == $portVersion base " From 999a56597c800c20ad44c1b5a2537bb4af8c32a5 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 01:46:06 -0800 Subject: [PATCH 036/206] WIP sdl_sound getting all the REQUIRES in place --- media-libs/sdl_sound/sdl_sound-1.0.3.recipe | 24 +++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe index 8b5b670e6..d64404ae9 100644 --- a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe +++ b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe @@ -11,24 +11,40 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" sdl_sound$secondaryArchSuffix = $portVersion - cmd:playsound = $portVersion compat >= 2 - cmd:playsound_simple = $portVersion compat >= 2 + cmd:playsound$secondaryArchSuffix = $portVersion compat >= 2 + cmd:playsound_simple$secondaryArchSuffix = $portVersion compat >= 2 lib:libSDL_sound$secondaryArchSuffix = 1.0_0.8.0 compat >= 1.0_0 lib:libSDL_sound_1.0$secondaryArchSuffix = 0.8.0 compat >= 1.0 " REQUIRES=" haiku$secondaryArchSuffix - libsdl$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libspeex$secondaryArchSuffix + +# lib:libFlac$secondaryArchSuffix + lib:libmikmod$secondaryArchSuffix + lib:libmodplug$secondaryArchSuffix +# lib:smpeg$secondaryArchSuffix + lib:physfs$secondaryArchSuffix " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libsdl$secondaryArchSuffix devel:libogg$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libspeex$secondaryArchSuffix +# devel:libFlac$secondaryArchSuffix + devel:libmikmod$secondaryArchSuffix + devel:libmodplug$secondaryArchSuffix +# devel:smpeg$secondaryArchSuffix + devel:physfs$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc$secondaryArchSuffix From 6d2e09ad9fe5be0ebb073454c62897385e0e71f3 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 01:47:13 -0800 Subject: [PATCH 037/206] Fixed physfs, now builds with gcc2 and gcc4. --- dev-games/physfs/physfs-2.0.3.recipe | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-2.0.3.recipe index 9cd871976..9168ccd53 100644 --- a/dev-games/physfs/physfs-2.0.3.recipe +++ b/dev-games/physfs/physfs-2.0.3.recipe @@ -6,14 +6,15 @@ CHECKSUM_MD5="c2c727a8a8deb623b521b52d0080f613" LICENSE="PHYSFS" COPYRIGHT="2001-2012 Ryan C. Gordon" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" REVISION="1" PROVIDES=" physfs$secondaryArchSuffix = $portVersion lib:libphysfs$secondaryArchSuffix = $portVersion + cmd:test_physfs " REQUIRES=" @@ -22,11 +23,11 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libz$secondaryArchSuffix >= 1.0.4 " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake cmd:make cmd:gcc$secondaryArchSuffix @@ -34,7 +35,7 @@ BUILD_PREREQUIRES=" BUILD() { - cmake . -DLIBRARY_OUTPUT_PATH:=$libDir + cmake . -DCMAKE_INSTALL_PREFIX=$prefix make $jobArgs } @@ -45,6 +46,10 @@ INSTALL() prepareInstalledDevelLib libphysfs fixPkgconfig + mkdir -p $includeDir + mv $prefix/include/*.h $includeDir + rm -rf $prefix/include + # devel package packageEntries devel \ $developDir From 0db07437abf088611265585f150b00bd20f0862e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 08:18:29 -0800 Subject: [PATCH 038/206] Mark ode as working on x86 --- dev-games/ode/ode-0.12.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index 2c32a8fac..6486eb00b 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -9,8 +9,8 @@ LICENSE=" GNU LGPL v3 BSD (3-clause) " -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" ode$secondaryArchSuffix = $portVersion From 8e981e2166b4131224c0cf198d6f92f10a12907d Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 08:55:01 -0800 Subject: [PATCH 039/206] Commented out physfs in sdl_sound so that sdl_sound builds now --- media-libs/sdl_sound/sdl_sound-1.0.3.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe index d64404ae9..49f8bd882 100644 --- a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe +++ b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe @@ -25,10 +25,10 @@ REQUIRES=" lib:libspeex$secondaryArchSuffix # lib:libFlac$secondaryArchSuffix - lib:libmikmod$secondaryArchSuffix +# lib:libmikmod$secondaryArchSuffix lib:libmodplug$secondaryArchSuffix # lib:smpeg$secondaryArchSuffix - lib:physfs$secondaryArchSuffix +# lib:physfs$secondaryArchSuffix " BUILD_REQUIRES=" @@ -38,10 +38,10 @@ BUILD_REQUIRES=" devel:libvorbis$secondaryArchSuffix devel:libspeex$secondaryArchSuffix # devel:libFlac$secondaryArchSuffix - devel:libmikmod$secondaryArchSuffix +# devel:libmikmod$secondaryArchSuffix devel:libmodplug$secondaryArchSuffix # devel:smpeg$secondaryArchSuffix - devel:physfs$secondaryArchSuffix +# devel:physfs$secondaryArchSuffix " BUILD_PREREQUIRES=" From 8cd0e1d77a65b2ba724e32775bc3c46cd70eec5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 18 Dec 2013 22:43:38 +0000 Subject: [PATCH 040/206] Boost 1.55 First recipe --- dev-libs/boost/boost-1.55.0.recipe | 185 ++++++++++++++++++++++++++--- 1 file changed, 167 insertions(+), 18 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 3269e6f00..03723af63 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -16,6 +16,7 @@ ARCHITECTURES="?x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" SOURCE_DIR="boost_1_55_0" PATCHES="boost-1.55.0.patch" +DISABLE_SOURCE_PACKAGE=yes PROVIDES=" lib:boost = 1.55.0 @@ -33,38 +34,43 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libiconv + devel:libbz2 + devel:libz " REQUIRES=" lib:libiconv + lib:libbz2 + lib:libz " BUILD() { ./bootstrap.sh \ --without-icu \ - --prefix=`finddir B_SYSTEM_DIRECTORY` \ - --exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \ - --libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \ - #--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` + --prefix=$prefix \ + --exec-prefix=$binDir \ + --libdir=$libDir \ + --includedir=$includeDir ./bjam \ - -sICU_PATH=`finddir B_SYSTEM_DIRECTORY` \ - -sICONV_PATH=`finddir B_SYSTEM_DIRECTORY` \ + -sICU_PATH=$prefix \ + -sICONV_PATH=$prefix \ -d2 \ --without-mpi \ - --prefix=`finddir B_SYSTEM_DIRECTORY` \ - --exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \ - --libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \ - #--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` \ + --prefix=$prefix \ + --exec-prefix=$binDir \ + --libdir=$libDir \ + --includedir=$includeDir \ --enable-threads=posix \ --enable-thread-local-alloc \ - --enable-parallel-mark \ + --enable-parallel-mark \ inlining=on \ - linkflags=-L`finddir B_SYSTEM_LIB_DIRECTORY` \ + linkflags=-L$libDir \ threading=multi \ variant=release \ link=shared \ runtime-link=shared + --without-python } INSTALL() @@ -72,17 +78,160 @@ INSTALL() ./bjam install \ -d2 \ --prefix=$prefix \ - #--exec-prefix=${DESTDIR}/`finddir B_SYSTEM_BIN_DIRECTORY` \ - #--libdir=${DESTDIR}/`finddir B_SYSTEM_LIB_DIRECTORY` \ - #--includedir=${DESTDIR}/`finddir B_SYSTEM_HEADERS_DIRECTORY` \ + --exec-prefix=$binDir \ + --libdir=$libDir \ + --includedir=$includeDir \ inlining=on \ - --without-mpi + --without-mpi \ + --without-python + + packageEntries devel $includeDir + packageEntries atomic $libDir/*atomic* + packageEntries chrono $libDir/*chrono* + packageEntries date_time $libDir/*date_time* + packageEntries exception $libDir/*exception* + packageEntries filesystem $libDir/*filesystem* + packageEntries graph $libDir/*graph* + packageEntries iostreams $libDir/*iostreams* + packageEntries locale $libDir/*locale* + packageEntries log $libDir/*log* + packageEntries math $libDir/*math* + packageEntries program_options $libDir/*program_options* + packageEntries random $libDir/*random* + packageEntries regex $libDir/*regex* + packageEntries serialization $libDir/*serialization* + packageEntries signals $libDir/*signals* + packageEntries system $libDir/*system* + packageEntries test $libDir/*test* + packageEntries thread $libDir/*thread* + packageEntries timer $libDir/*timer* + packageEntries wave $libDir/*wave* } PROVIDES_devel=" - boost${secondaryArchSuffix} = $portVersion + boost_devel$secondaryArchSuffix = $portVersion " REQUIRES_devel=" - boost${secondaryArchSuffix} == $portVersion base + haiku$secondaryArchSuffix >= $haikuVersion " +PROVIDES_atomic=" + boost_atomic$secondaryArchSuffix = $portVersion +" +REQUIRES_atomic=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_chrono=" + boost_chrono$secondaryArchSuffix = $portVersion +" +REQUIRES_chrono=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_date_time=" + boost_date_time$secondaryArchSuffix = $portVersion +" +REQUIRES_date_time=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_exception=" + boost_exception$secondaryArchSuffix = $portVersion +" +REQUIRES_exception=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_filesystem=" + boost_filesystem$secondaryArchSuffix = $portVersion +" +REQUIRES_filesystem=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_graph=" + boost_graph$secondaryArchSuffix = $portVersion +" +REQUIRES_graph=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_iostreams=" + boost_iostreams$secondaryArchSuffix = $portVersion +" +REQUIRES_iostreams=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_locale=" + boost_locale$secondaryArchSuffix = $portVersion +" +REQUIRES_locale=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_log=" + boost_log$secondaryArchSuffix = $portVersion +" +REQUIRES_log=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_math=" + boost_math$secondaryArchSuffix = $portVersion +" +REQUIRES_math=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_program_options=" + boost_program_options$secondaryArchSuffix = $portVersion +" +REQUIRES_program_options=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_random=" + boost_random$secondaryArchSuffix = $portVersion +" +REQUIRES_random=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_regex=" + boost_regex$secondaryArchSuffix = $portVersion +" +REQUIRES_regex=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_serialization=" + boost_serialization$secondaryArchSuffix = $portVersion +" +REQUIRES_serialization=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_signals=" + boost_signals$secondaryArchSuffix = $portVersion +" +REQUIRES_signals=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_system=" + boost_system$secondaryArchSuffix = $portVersion +" +REQUIRES_system=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_test=" + boost_test$secondaryArchSuffix = $portVersion +" +REQUIRES_test=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_thread=" + boost_thread$secondaryArchSuffix = $portVersion +" +REQUIRES_thread=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_timer=" + boost_timer$secondaryArchSuffix = $portVersion +" +REQUIRES_timer=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_wave=" + boost_wave$secondaryArchSuffix = $portVersion +" +REQUIRES_wave=" + haiku$secondaryArchSuffix >= $haikuVersion +" From 75b9915aa3dab2bbc6f5696256ee601ac10124bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 18 Dec 2013 23:08:38 +0000 Subject: [PATCH 041/206] Fixed dependencies --- dev-libs/boost/boost-1.55.0.recipe | 172 ++++++++++++++++++----------- 1 file changed, 106 insertions(+), 66 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 03723af63..a60c44c22 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -69,8 +69,9 @@ BUILD() threading=multi \ variant=release \ link=shared \ - runtime-link=shared - --without-python + runtime-link=shared \ + --without-python \ + --disable-icu } INSTALL() @@ -111,127 +112,166 @@ INSTALL() PROVIDES_devel=" boost_devel$secondaryArchSuffix = $portVersion " - -REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion - " PROVIDES_atomic=" boost_atomic$secondaryArchSuffix = $portVersion " -REQUIRES_atomic=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion " -REQUIRES_chrono=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_date_time=" boost_date_time$secondaryArchSuffix = $portVersion " -REQUIRES_date_time=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_exception=" boost_exception$secondaryArchSuffix = $portVersion " -REQUIRES_exception=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_filesystem=" boost_filesystem$secondaryArchSuffix = $portVersion " -REQUIRES_filesystem=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_graph=" boost_graph$secondaryArchSuffix = $portVersion " -REQUIRES_graph=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_iostreams=" boost_iostreams$secondaryArchSuffix = $portVersion " -REQUIRES_iostreams=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_locale=" boost_locale$secondaryArchSuffix = $portVersion " -REQUIRES_locale=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_log=" boost_log$secondaryArchSuffix = $portVersion " -REQUIRES_log=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_math=" boost_math$secondaryArchSuffix = $portVersion " -REQUIRES_math=" - haiku$secondaryArchSuffix >= $haikuVersion +PROVIDES_random=" + boost_random$secondaryArchSuffix = $portVersion " PROVIDES_program_options=" boost_program_options$secondaryArchSuffix = $portVersion " -REQUIRES_program_options=" - haiku$secondaryArchSuffix >= $haikuVersion -" -PROVIDES_random=" - boost_random$secondaryArchSuffix = $portVersion -" -REQUIRES_random=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_regex=" boost_regex$secondaryArchSuffix = $portVersion " -REQUIRES_regex=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_serialization=" boost_serialization$secondaryArchSuffix = $portVersion " -REQUIRES_serialization=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_signals=" boost_signals$secondaryArchSuffix = $portVersion " -REQUIRES_signals=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_system=" boost_system$secondaryArchSuffix = $portVersion " -REQUIRES_system=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_test=" boost_test$secondaryArchSuffix = $portVersion " -REQUIRES_test=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_thread=" boost_thread$secondaryArchSuffix = $portVersion " -REQUIRES_thread=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_timer=" boost_timer$secondaryArchSuffix = $portVersion " -REQUIRES_timer=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_wave=" boost_wave$secondaryArchSuffix = $portVersion " -REQUIRES_wave=" + +REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +REQUIRES_atomic=" haiku$secondaryArchSuffix >= $haikuVersion " + +REQUIRES_chrono=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_system$secondaryArchSuffix = $portVersion +" + +REQUIRES_date_time=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_exception=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_filesystem=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_system$secondaryArchSuffix = $portVersion +" + +REQUIRES_graph=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_regex$secondaryArchSuffix = $portVersion +" + +REQUIRES_iostreams=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_locale=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_chrono$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix = $portVersion + boost_thread$secondaryArchSuffix = $portVersion +" + +REQUIRES_log=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_chrono$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix = $portVersion + boost_date_time$secondaryArchSuffix = $portVersion + boost_thread$secondaryArchSuffix = $portVersion +" + +REQUIRES_math=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_program_options=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_random=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_regex=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_serialization=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_signals=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_system=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_test=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_thread=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_system$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix = $portVersion +" + +REQUIRES_timer=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_chrono$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix = $portVersion +" + +REQUIRES_wave=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_chrono$secondaryArchSuffix = $portVersion + boost_date_time$secondaryArchSuffix = $portVersion + boost_filesystem$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix = $portVersion + boost_thread$secondaryArchSuffix = $portVersion +" From 4a486704d8337bf59ddbaf424724a30018ddad1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 00:07:34 +0000 Subject: [PATCH 042/206] Fixed dependecies equals --- dev-libs/boost/boost-1.55.0.recipe | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index a60c44c22..0537980f5 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -183,7 +183,7 @@ REQUIRES_atomic=" REQUIRES_chrono=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix == $portVersion " REQUIRES_date_time=" @@ -196,12 +196,12 @@ REQUIRES_exception=" REQUIRES_filesystem=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix == $portVersion " REQUIRES_graph=" haiku$secondaryArchSuffix >= $haikuVersion - boost_regex$secondaryArchSuffix = $portVersion + boost_regex$secondaryArchSuffix == $portVersion " REQUIRES_iostreams=" @@ -210,17 +210,17 @@ REQUIRES_iostreams=" REQUIRES_locale=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix = $portVersion - boost_system$secondaryArchSuffix = $portVersion - boost_thread$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion " REQUIRES_log=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix = $portVersion - boost_system$secondaryArchSuffix = $portVersion - boost_date_time$secondaryArchSuffix = $portVersion - boost_thread$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_date_time$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion " REQUIRES_math=" @@ -257,21 +257,21 @@ REQUIRES_test=" REQUIRES_thread=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix = $portVersion - boost_chrono$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_chrono$secondaryArchSuffix == $portVersion " REQUIRES_timer=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix = $portVersion - boost_system$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion " REQUIRES_wave=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix = $portVersion - boost_date_time$secondaryArchSuffix = $portVersion - boost_filesystem$secondaryArchSuffix = $portVersion - boost_system$secondaryArchSuffix = $portVersion - boost_thread$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_date_time$secondaryArchSuffix == $portVersion + boost_filesystem$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion " From 1cc9bfe6f60692ecfad837a495cde021b132f56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 01:10:38 +0000 Subject: [PATCH 043/206] TypeTraits patch --- dev-libs/boost/boost-1.55.0.recipe | 5 ++++- dev-libs/boost/patches/type_traits.patch | 26 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 dev-libs/boost/patches/type_traits.patch diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 0537980f5..d03754488 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -15,7 +15,10 @@ COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al." ARCHITECTURES="?x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" SOURCE_DIR="boost_1_55_0" -PATCHES="boost-1.55.0.patch" +PATCHES=" + boost-1.55.0.patch + type_traits.patch +" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch new file mode 100644 index 000000000..a2c26785d --- /dev/null +++ b/dev-libs/boost/patches/type_traits.patch @@ -0,0 +1,26 @@ +diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp +index 1b15c7e..e953f00 100644 +--- a/boost/config/platform/haiku.hpp ++++ b/boost/config/platform/haiku.hpp +@@ -10,13 +10,21 @@ + #define BOOST_PLATFORM "Haiku" + + #define BOOST_NO_INTRINSIC_WCHAR_T ++#define BOOST_NO_STD_WSTRING + #define BOOST_HAS_UNISTD_H ++#define BOOST_EXCEPTION_DISABLE ++#define BOOST_NO_EXCEPTIONS ++#define BOOST_NO_AUTO_PTR ++#define GLIBC_HAVE_LONG_LONG + + #define BOOST_HAS_BETHREADS + + #ifndef BOOST_DISABLE_THREADS + # define BOOST_HAS_THREADS + #endif ++#define BOOST_NO_CXX11_HDR_TYPE_TRAITS ++#define BOOST_NO_CXX11_ATOMIC_SMART_PTR ++ + + // + // thread API's not auto detected: From 7040721b486f2448311fbea9a6520c595228d6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 01:24:34 +0000 Subject: [PATCH 044/206] Context package --- dev-libs/boost/boost-1.55.0.recipe | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index d03754488..d132ceaaf 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -92,6 +92,7 @@ INSTALL() packageEntries devel $includeDir packageEntries atomic $libDir/*atomic* packageEntries chrono $libDir/*chrono* + packageEntries context $libDir/*context* packageEntries date_time $libDir/*date_time* packageEntries exception $libDir/*exception* packageEntries filesystem $libDir/*filesystem* @@ -121,6 +122,9 @@ PROVIDES_atomic=" PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion " +PROVIDES_context=" + boost_context$secondaryArchSuffix = $portVersion +" PROVIDES_date_time=" boost_date_time$secondaryArchSuffix = $portVersion " @@ -189,6 +193,10 @@ REQUIRES_chrono=" boost_system$secondaryArchSuffix == $portVersion " +REQUIRES_context=" + haiku$secondaryArchSuffix >= $haikuVersion +" + REQUIRES_date_time=" haiku$secondaryArchSuffix >= $haikuVersion " From ad64fd97bcb9f9d8ad6b0727a7a413320b098a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 01:39:49 +0000 Subject: [PATCH 045/206] Pacthes modified --- dev-libs/boost/patches/type_traits.patch | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch index a2c26785d..e1c12c434 100644 --- a/dev-libs/boost/patches/type_traits.patch +++ b/dev-libs/boost/patches/type_traits.patch @@ -1,17 +1,14 @@ diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp -index 1b15c7e..e953f00 100644 +index 1b15c7e..c1b8e74 100644 --- a/boost/config/platform/haiku.hpp +++ b/boost/config/platform/haiku.hpp -@@ -10,13 +10,21 @@ - #define BOOST_PLATFORM "Haiku" +@@ -11,12 +11,18 @@ #define BOOST_NO_INTRINSIC_WCHAR_T -+#define BOOST_NO_STD_WSTRING #define BOOST_HAS_UNISTD_H -+#define BOOST_EXCEPTION_DISABLE -+#define BOOST_NO_EXCEPTIONS +#define BOOST_NO_AUTO_PTR +#define GLIBC_HAVE_LONG_LONG ++#define BOOST_HAS_STDINT_H #define BOOST_HAS_BETHREADS From 119fc87aec8b083ca29fd76b0f68006e81120871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 01:51:47 +0000 Subject: [PATCH 046/206] Try to fix boost::thread --- dev-libs/boost/patches/type_traits.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch index e1c12c434..0da167cce 100644 --- a/dev-libs/boost/patches/type_traits.patch +++ b/dev-libs/boost/patches/type_traits.patch @@ -1,14 +1,15 @@ diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp -index 1b15c7e..c1b8e74 100644 +index 1b15c7e..a0bfb8c 100644 --- a/boost/config/platform/haiku.hpp +++ b/boost/config/platform/haiku.hpp -@@ -11,12 +11,18 @@ +@@ -11,12 +11,19 @@ #define BOOST_NO_INTRINSIC_WCHAR_T #define BOOST_HAS_UNISTD_H +#define BOOST_NO_AUTO_PTR +#define GLIBC_HAVE_LONG_LONG +#define BOOST_HAS_STDINT_H ++#define BOOST_NOT_STD_WSTRING #define BOOST_HAS_BETHREADS From 03bcd41e3d02d5000de72e4243137c5f63e49474 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Wed, 18 Dec 2013 20:56:13 -0500 Subject: [PATCH 047/206] Fix Vision recipe for x86_64. --- haiku-apps/vision/vision-0.9.7.r947.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/vision/vision-0.9.7.r947.recipe b/haiku-apps/vision/vision-0.9.7.r947.recipe index d9b00a677..4a899e921 100644 --- a/haiku-apps/vision/vision-0.9.7.r947.recipe +++ b/haiku-apps/vision/vision-0.9.7.r947.recipe @@ -4,10 +4,10 @@ HOMEPAGE="http://vision.sourceforge.net/" SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#947" LICENSE="MPL v1.1" COPYRIGHT="1999-2010 The Vision Team" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" -if [ $targetArchitecture == x86 ]; then +if [ $targetArchitecture != x86_gcc2 ]; then PATCHES="vision-0.9.7-gcc4.patch" fi From 4de90a85c748c14549a807a18d86d1682d6d427f Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Wed, 18 Dec 2013 21:07:23 -0500 Subject: [PATCH 048/206] libxslt: Add x86_64 as working target architecture. --- dev-libs/libxslt/libxslt-1.1.28.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libxslt/libxslt-1.1.28.recipe b/dev-libs/libxslt/libxslt-1.1.28.recipe index 3af348ce2..43a54f230 100644 --- a/dev-libs/libxslt/libxslt-1.1.28.recipe +++ b/dev-libs/libxslt/libxslt-1.1.28.recipe @@ -5,8 +5,8 @@ COPYRIGHT="2001-2002 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxslt-1.1.28.tar.gz" CHECKSUM_MD5="9667bf6f9310b957254fdcf6596600b7" REVISION="2" -ARCHITECTURES="x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" libxslt$secondaryArchSuffix = $portVersion From bc706f4dcf7c11e5ae9035a4d2bab68a1e830df6 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Wed, 18 Dec 2013 21:58:16 -0500 Subject: [PATCH 049/206] Get Ruby building on x86-64. --- dev-lang/ruby/patches/ruby-1.9.1.patchset | 29 ++++++++++++++++++++--- dev-lang/ruby/ruby-1.9.1.recipe | 2 +- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dev-lang/ruby/patches/ruby-1.9.1.patchset b/dev-lang/ruby/patches/ruby-1.9.1.patchset index 9ae38e313..d382648d4 100644 --- a/dev-lang/ruby/patches/ruby-1.9.1.patchset +++ b/dev-lang/ruby/patches/ruby-1.9.1.patchset @@ -1,4 +1,4 @@ -From 8905e56a8092d502b54c26a753bb7920eae149ba Mon Sep 17 00:00:00 2001 +From 7bab20a22b69de3239de475cbc72a5c39864f43c Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 11 Nov 2013 19:00:01 -0700 Subject: applying patch ruby-1.9.1.patch @@ -470,7 +470,7 @@ index 5da1769..74072d2 100644 1.8.3.4 -From 623782bf181c3f15a276316c69839bf774fe8658 Mon Sep 17 00:00:00 2001 +From b5cf064c70f3212fb0a44dd4eaa4298e881b333f Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 11 Nov 2013 20:00:13 -0700 Subject: Use gcc for linking modules @@ -496,7 +496,7 @@ index 113d4e5..9bfbfb3 100644 1.8.3.4 -From cc3d90149f715a93b962b4eab1b186acae22c23c Mon Sep 17 00:00:00 2001 +From c43e8e49d47f7778314d9a723f9430fa4686f7ba Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 11 Nov 2013 23:13:59 -0700 Subject: Add soname flags for libruby.so @@ -520,3 +520,26 @@ index 9bfbfb3..611b586 100644 -- 1.8.3.4 + +From c6983e184282d3ffbb88c095ff13d1913c18a3f8 Mon Sep 17 00:00:00 2001 +From: Rene Gollent +Date: Wed, 18 Dec 2013 21:52:24 -0500 +Subject: Add case for x86_64. + + +diff --git a/configure.in b/configure.in +index 611b586..01f0bb0 100644 +--- a/configure.in ++++ b/configure.in +@@ -1464,7 +1464,7 @@ if test "$with_dln_a_out" != yes; then + : ${LDSHARED="ld -xms"} + DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' + ;; +- i586*) ++ i586*|x86_64*) + : ${LDSHARED="${CC} -shared"} + if test "$rb_cv_binary_elf" = yes; then + LDFLAGS="$LDFLAGS -Wl,-export-dynamic" +-- +1.8.3.4 + diff --git a/dev-lang/ruby/ruby-1.9.1.recipe b/dev-lang/ruby/ruby-1.9.1.recipe index aecdaede9..c2e2be6dd 100644 --- a/dev-lang/ruby/ruby-1.9.1.recipe +++ b/dev-lang/ruby/ruby-1.9.1.recipe @@ -22,7 +22,7 @@ COPYRIGHT="1993-2009 Yukihiro Matsumoto" REVISION="2" -ARCHITECTURES="?x86_gcc2 ?x86 !x86_64" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PROVIDES=" ruby = $portVersion compat >= 1.9 From 9f9cdb2f832ec382c01cd66e839650951549cd87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 19 Dec 2013 10:31:02 +0100 Subject: [PATCH 050/206] libpcre: Change download uri for 8.21 to SF.net mirror The original file is gone... --- dev-libs/libpcre/libpcre-8.21.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index 6d1a52f71..dd3e76d4e 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -13,7 +13,7 @@ COPYRIGHT=" 1997-2011 University of Cambridge 2007-2011, Google Inc. All rights reserved. " -SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2" +SRC_URI="http://sourceforge.net/projects/pcre/files/pcre/8.21/pcre-8.21.tar.bz2/download" CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" REVISION="5" ARCHITECTURES="x86_gcc2 x86 x86_64" From 7451a3cdb204784c074c9e36f38eb82f4f07a704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 19 Dec 2013 11:10:26 +0100 Subject: [PATCH 051/206] libpcre: Better download link --- dev-libs/libpcre/libpcre-8.21.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index dd3e76d4e..c062f62a0 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -13,7 +13,7 @@ COPYRIGHT=" 1997-2011 University of Cambridge 2007-2011, Google Inc. All rights reserved. " -SRC_URI="http://sourceforge.net/projects/pcre/files/pcre/8.21/pcre-8.21.tar.bz2/download" +SRC_URI="http://sourceforge.net/projects/pcre/files/pcre/8.21/pcre-8.21.tar.bz2" CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" REVISION="5" ARCHITECTURES="x86_gcc2 x86 x86_64" From d927e138fd45647b1b20c0ec59d8560a7550dc7a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 00:36:04 -0800 Subject: [PATCH 052/206] Fixed secondaryArchSuffix errors in smpeg --- media-libs/smpeg/smpeg-0.4.5.recipe | 39 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 918b4c4e5..9229a4fb0 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -10,36 +10,36 @@ ARCHITECTURES="x86 x86_gcc2" SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" - smpeg$secondaryArchSupport = 0.4.5 compat >= 0 + smpeg$secondaryArchSuffix = 0.4.5 compat >= 0 cmd:smpeg = 0.4.5 compat >= 0 - cmd:plaympeg = 0.4.5 compat >= 0 - cmd:glmovie = 0.4.5 compat >= 0 - lib:libsmpeg$secondaryArchSupport = 0.4_0.1.4 compat >= 0.4_0 - lib:libsmpeg_0.4$secondaryArchSupport = 0.1.4 compat >= 0 + cmd:plaympeg$secondaryArchSuffix = 0.4.5 compat >= 0 + cmd:glmovie$secondaryArchSuffix = 0.4.5 compat >= 0 + lib:libsmpeg$secondaryArchSuffix = 0.4_0.1.4 compat >= 0.4_0 + lib:libsmpeg_0.4$secondaryArchSuffix = 0.1.4 compat >= 0 " REQUIRES=" - haiku$secondaryArchSupport - lib:libglu$secondaryArchSupport - lib:libsdl$secondaryArchSupport + haiku$secondaryArchSuffix + lib:libglu$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libsdl$secondaryArchSupport - devel:libglu$secondaryArchSupport + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + devel:libglu$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSupport}_devel >= $haikuVersion - cmd:gcc$secondaryArchSupport + cmd:gcc$secondaryArchSuffix cmd:libtoolize cmd:aclocal cmd:autoconf cmd:automake - cmd:ld$secondaryArchSupport + cmd:ld$secondaryArchSuffix cmd:make cmd:pkg_config - lib:libsdl$secondaryArchSupport + lib:libsdl$secondaryArchSuffix " BUILD() @@ -61,6 +61,7 @@ INSTALL() make install prepareInstalledDevelLibs libsmpeg + fixDevelopLibDirReferences $binDir/smpeg-config fixPkgconfig # devel package @@ -73,12 +74,12 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - smpeg${secondaryArchSupport}_devel = $portVersion - cmd:smpeg_config - devel:libsmpeg$secondaryArchSupport = 0.4_0.1.4 compat >= 0.4_0 - devel:libsmpeg_0.4$secondaryArchSupport = 0.4.5 compat >= 0 + smpeg${secondaryArchSuffix}_devel = $portVersion + cmd:smpeg_config$secondaryArchSuffix + devel:libsmpeg$secondaryArchSuffix = 0.4_0.1.4 compat >= 0.4_0 + devel:libsmpeg_0.4$secondaryArchSuffix = 0.4.5 compat >= 0 " REQUIRES_devel=" - smpeg$secondaryArchSupport == $portVersion base + smpeg$secondaryArchSuffix == $portVersion base " From 8575152ed8e2d7a643076586e3fc0f104089d92c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 02:15:08 -0800 Subject: [PATCH 053/206] Cleaned up sdl_ttf recipe, but still not building on x86 --- media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe index 8117e605b..b7af958b3 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -26,20 +26,25 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - libsdl >= 1.2 + lib:libsdl$secondaryArchSuffix lib:libfreetype - lib:libz + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:libtoolize cmd:aclocal cmd:automake cmd:autoconf cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:sdl_config + cmd:sdl_config$secondaryArchSuffix cmd:make cmd:freetype_config devel:libz @@ -52,7 +57,7 @@ BUILD() libtoolize --copy --force --install aclocal --install -I acinclude autoconf - runConfigure ./configure + runConfigure ./configure --with-x=no make } From 5b4f986501d135df9e4e9ea83709cf37c85a9823 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 02:17:17 -0800 Subject: [PATCH 054/206] Fixed secondaryArchSuffix suport for smjpeg --- media-libs/smjpeg/smjpeg-0.2.1.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media-libs/smjpeg/smjpeg-0.2.1.recipe b/media-libs/smjpeg/smjpeg-0.2.1.recipe index 9952d7d1a..09aa66b8e 100644 --- a/media-libs/smjpeg/smjpeg-0.2.1.recipe +++ b/media-libs/smjpeg/smjpeg-0.2.1.recipe @@ -14,8 +14,8 @@ PROVIDES=" smjpeg$secondaryArchSuffix = $portVersion compat >= 0 lib:libsmjpeg$secondaryArchSuffix = 0.2_0.0.2 compat >= 0.2_0 lib:libsmjpeg_0.2$secondaryArchSuffix = 0.0.2 compat >= 0 - cmd:smjpeg_encode = $portVersion compat >= 0 - cmd:smjpeg_decode = $portVersion compat >= 0 + cmd:smjpeg_encode$secondaryArchSuffix = $portVersion compat >= 0 + cmd:smjpeg_decode$secondaryArchSuffix = $portVersion compat >= 0 " REQUIRES=" @@ -24,11 +24,11 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:libtoolize cmd:aclocal From 56144e693249f6668c2ac943e845334377bad348 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 02:34:35 -0800 Subject: [PATCH 055/206] Fixed libmikmod build on x86 --- media-libs/libmikmod/libmikmod-3.3.3.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/media-libs/libmikmod/libmikmod-3.3.3.recipe b/media-libs/libmikmod/libmikmod-3.3.3.recipe index dc089be98..86867168d 100644 --- a/media-libs/libmikmod/libmikmod-3.3.3.recipe +++ b/media-libs/libmikmod/libmikmod-3.3.3.recipe @@ -17,11 +17,11 @@ PROVIDES=" REQUIRES=" haiku${secondaryArchSuffix} - lib:libsdl + lib:libsdl$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libsdl + devel:libsdl$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -52,6 +52,7 @@ INSTALL() prepareInstalledDevelLibs libmikmod fixPkgconfig + fixDevelopLibDirReferences $binDir/libmikmod-config # devel package packageEntries devel \ @@ -63,7 +64,7 @@ INSTALL() PROVIDES_devel=" libmikmod${secondaryArchSuffix}_devel = $portVersion - cmd:libmikmod_config + cmd:libmikmod_config$secondaryArchSuffix devel:libmikmod$secondaryArchSuffix = 3.2.0 compat >= 3 " From a096d2d6507182a16983eccce0a3420231ec8ad8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 02:49:04 -0800 Subject: [PATCH 056/206] Added secondaryArchSuffix to freetype in sdl_ttf and it now works. Thanks Adrien. --- media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe index b7af958b3..ac128bf4e 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -27,13 +27,14 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libsdl$secondaryArchSuffix - lib:libfreetype + lib:libfreetype$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libsdl$secondaryArchSuffix + devel:libfreetype$secondaryArchSuffix devel:libz$secondaryArchSuffix " @@ -46,7 +47,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:sdl_config$secondaryArchSuffix cmd:make - cmd:freetype_config + cmd:freetype_config$secondaryArchSuffix devel:libz " From 64797684df210eb3cfbc2f5c375a22ffbb126dbc Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 03:25:40 -0800 Subject: [PATCH 057/206] Added secondaryArchSuffix support to vorbis-tools --- .../vorbis_tools/vorbis_tools-1.4.0.recipe | 63 ++++++++++--------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe index 1f289b92a..cb78c7dc7 100644 --- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe +++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe @@ -7,59 +7,62 @@ REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2000-2005 Michael Smith, Stan Seibert and other contributers" -ARCHITECTURES="x86 x86_gcc2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - vorbis_tools = 1.4.0 compat >= 1 - cmd:oggenc - cmd:oggdec - cmd:ogginfo - cmd:vcut - cmd:vorbiscomment + vorbis_tools = $portVersion compat >= 1 + cmd:oggenc$secondaryArchSuffix + cmd:oggdec$secondaryArchSuffix + cmd:ogginfo$secondaryArchSuffix + cmd:vcut$secondaryArchSuffix + cmd:vorbiscomment$secondaryArchSuffix " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion - lib:libvorbis - lib:libflac - lib:speex - lib:libao - lib:libogg - lib:libvorbis - lib:libcurl - lib:libvorbisfile - lib:libvorbisenc - lib:libFLAC + haiku$secondaryArchSuffix >= $haikuVersion + lib:libvorbis$secondaryArchSuffix + lib:libflac$secondaryArchSuffix + lib:libspeex$secondaryArchSuffix + lib:libao$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libvorbisfile$secondaryArchSuffix + lib:libvorbisenc$secondaryArchSuffix " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libvorbis$secondaryArchSuffix +# devel:libflac$secondaryArchSuffix + devel:libspeex$secondaryArchSuffix +# devel:libao$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libvorbisfile$secondaryArchSuffix + devel:libvorbisenc$secondaryArchSuffix " -SOURCE_DIR="vorbis-tools-$portVersion" - BUILD_PREREQUIRES=" - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:aclocal cmd:autoconf cmd:automake cmd:make cmd:pkg_config - devel:libogg - devel:libvorbis - devel:libflac " -PATCH="vorbis_tools-1.4.0.patch" +PATCHES="vorbis_tools-1.4.0.patch" -PATCH() -{ - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac -} +SOURCE_DIR="vorbis-tools-$portVersion" BUILD() { + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac libtoolize --force --copy --install aclocal -I m4 automake From d7fdcb0292fd93fe9b88cf472b4959b581591c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 19 Dec 2013 12:51:30 +0100 Subject: [PATCH 058/206] cyassl: Add updated recipe for 2.8.0 Not working yet (redefines _POSIX_THREADS + Werror). --- dev-libs/cyassl/cyassl-2.8.0.recipe | 62 +++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 dev-libs/cyassl/cyassl-2.8.0.recipe diff --git a/dev-libs/cyassl/cyassl-2.8.0.recipe b/dev-libs/cyassl/cyassl-2.8.0.recipe new file mode 100644 index 000000000..d192dea27 --- /dev/null +++ b/dev-libs/cyassl/cyassl-2.8.0.recipe @@ -0,0 +1,62 @@ +SUMMARY="CyaSSL embedded SSL implementation" +DESCRIPTION="lightweight yet fully functional embedded SSL implementation" +HOMEPAGE="http://yassl.com" +SRC_URI="http://yassl.com/cyassl-2.8.0.zip" +REVISION="1" +CHECKSUM_MD5="7465d4815af90eff01095fa1b031ce09" +LICENSE="GNU GPL v2" +COPYRIGHT="2006-2013 Sawtooth Consulting Ltd." + +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + cyassl$secondaryArchSuffix = $portVersion + lib:libcyassl$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:dos2unix + " + + +DEPEND="app-text/dos2unix >= 1.0" +BUILD() +{ + dos2unix * + dos2unix include/* + dos2unix ctaocrypt/include/* + dos2unix ctaocrypt/src/* + libtoolize --force --copy --install + aclocal -I m4 + autoconf + chmod 755 configure + automake + runConfigure ./configure --enable-shared + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check + cd testsuite + testsuite +} From baae74d49c40a5e05d6fa03551cc58212d6cfc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 19 Dec 2013 15:53:26 +0100 Subject: [PATCH 059/206] xml_parser: rename to lowercase --- .../XML_Parser-2.36.recipe => xml_parser/xml_parser-2.36.recipe} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev-perl/{XML_Parser/XML_Parser-2.36.recipe => xml_parser/xml_parser-2.36.recipe} (100%) diff --git a/dev-perl/XML_Parser/XML_Parser-2.36.recipe b/dev-perl/xml_parser/xml_parser-2.36.recipe similarity index 100% rename from dev-perl/XML_Parser/XML_Parser-2.36.recipe rename to dev-perl/xml_parser/xml_parser-2.36.recipe From 0db915b9f21ea4534e88283a9d5eecd93e7a5896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 19 Dec 2013 16:01:10 +0100 Subject: [PATCH 060/206] xml_parser: Update recipe --- dev-perl/xml_parser/xml_parser-2.36.recipe | 31 +++++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/dev-perl/xml_parser/xml_parser-2.36.recipe b/dev-perl/xml_parser/xml_parser-2.36.recipe index 4bb691719..9c02605e4 100644 --- a/dev-perl/xml_parser/xml_parser-2.36.recipe +++ b/dev-perl/xml_parser/xml_parser-2.36.recipe @@ -1,25 +1,42 @@ -#dev-perl/XML-Parser +SUMMARY="XML-Parser - A perl module for parsing XML documents" DESCRIPTION="XML-Parser - A perl module for parsing XML documents" HOMEPAGE="http://search.cpan.org/~msergeant/XML-Parser-2.36/" SRC_URI="http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz" REVISION="1" -# only tested on gcc4 -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="1b868962b658bd87e1563ecd56498ded" +COPYRIGHT="1998-2000 Larry Wall and Clark Cooper. All rights reserved." +LICENSE="Artistic (Perl)" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + xml_parser = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + lib:libexpat + perl + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libexpat + cmd:gcc + cmd:make + cmd:perl" + +SOURCE_DIR="XML-Parser-2.36" # TODO: Remove hardcoded paths. The following shows how to get the the file path: #find /boot/common/lib/perl5 -type f -name unixish.h | grep -FzZ BePC-haiku/CORE/unixish.h BUILD() { - cd XML-Parser-2.36 - perl Makefile.PL + perl Makefile.PL PREFIX=$prefix make } INSTALL() { - cd XML-Parser-2.36 make install DESTDIR="${DESTDIR}" } From bac17fb92383f4598247bb4fa27aa0f98a7ec421 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 08:21:27 -0800 Subject: [PATCH 061/206] Added better DESCRIPTION entires for smpeg, smjpeg and libsdl --- media-libs/libsdl/libsdl-1.2.15.recipe | 4 ++-- media-libs/smjpeg/smjpeg-0.2.1.recipe | 4 ++-- media-libs/smpeg/smpeg-0.4.5.recipe | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index dc4a603f6..dee7ebf21 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -1,5 +1,5 @@ -SUMMARY="Simple Direct Media Layer" -DESCRIPTION="Simple Direct Media Layer" +SUMMARY="Simple Direct Media Layer is a cross-platform media development library" +DESCRIPTION="Simple Direct Media Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics via OpenGL." HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz" CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85" diff --git a/media-libs/smjpeg/smjpeg-0.2.1.recipe b/media-libs/smjpeg/smjpeg-0.2.1.recipe index 09aa66b8e..d9c671645 100644 --- a/media-libs/smjpeg/smjpeg-0.2.1.recipe +++ b/media-libs/smjpeg/smjpeg-0.2.1.recipe @@ -1,5 +1,5 @@ -SUMMARY="smjpeg" -DESCRIPTION="smjpeg" +SUMMARY="smjpeg is an implementation of the smjpeg decoding library." +DESCRIPTION="smjpeg is an implementation of the smjpeg decoding library, which runs on just about any platform. It comes with one sample deoder, smjpeg_decode (console, no UI)." HOMEPAGE="http://www.icculus.org/smjpeg" SRC_URI="svn://svn.icculus.org/smjpeg/trunk/" LICENSE="GNU LGPL v2" diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 9229a4fb0..8c758a6eb 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -1,5 +1,5 @@ SUMMARY="smpeg is an mpeg decoing library." -DESCRIPTION="smpeg is an mpeg decoding library, which runs on just about any platform. It comes with a sample decoder, plaympeg." +DESCRIPTION="SMPEG is short for the SDL MPEG library originally developed by Loki Software. SMPEG uses MPEG-1 standard as a video display library, rather than MPEG-2, since only the MPEG-1 standard is unencumbered with software patents in the United States." HOMEPAGE="http://www.icculus.org/smpeg" SRC_URI="svn://svn.icculus.org/smpeg/tags/release_0_4_5" LICENSE="GNU LGPL v2" @@ -68,7 +68,6 @@ INSTALL() packageEntries devel \ $developDir $binDir/smpeg-config \ $dataDir - } # ----- devel package ------------------------------------------------------- From f2382511c4994741b067a0700b771dcb848174b9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 08:32:11 -0800 Subject: [PATCH 062/206] Fixed typo in smpeg summary. --- media-libs/smpeg/smpeg-0.4.5.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 8c758a6eb..68b6628c2 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -1,4 +1,4 @@ -SUMMARY="smpeg is an mpeg decoing library." +SUMMARY="smpeg is an mpeg decoding library." DESCRIPTION="SMPEG is short for the SDL MPEG library originally developed by Loki Software. SMPEG uses MPEG-1 standard as a video display library, rather than MPEG-2, since only the MPEG-1 standard is unencumbered with software patents in the United States." HOMEPAGE="http://www.icculus.org/smpeg" SRC_URI="svn://svn.icculus.org/smpeg/tags/release_0_4_5" From 7265709bcfcbfdfc6d1f67e5e80c2cae183dca39 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 08:42:05 -0800 Subject: [PATCH 063/206] Fix x86 build of libao --- media-libs/libao/libao-1.0.0.recipe | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/media-libs/libao/libao-1.0.0.recipe b/media-libs/libao/libao-1.0.0.recipe index 2ee94f010..0606c79d4 100644 --- a/media-libs/libao/libao-1.0.0.recipe +++ b/media-libs/libao/libao-1.0.0.recipe @@ -29,9 +29,9 @@ REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -39,11 +39,9 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make + cmd:pkg_config$secondaryArchSuffix " - - - BUILD() { # sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* @@ -74,11 +72,9 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - libao_devel = $portVersion - devel:libao = 0.0.0 compat >= 0 + libao${secondaryArchSuffix}_devel = $portVersion + devel:libao$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES_devel=" - libao == $portVersion base + libao$secondaryArchSuffix == $portVersion base " - - From 4b58fd2a0387d23f54c1a20abba1495629e58ba9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 08:51:16 -0800 Subject: [PATCH 064/206] Enable libao in vorbis-tools --- media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe index cb78c7dc7..edb1192ab 100644 --- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe +++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe @@ -37,7 +37,7 @@ BUILD_REQUIRES=" devel:libvorbis$secondaryArchSuffix # devel:libflac$secondaryArchSuffix devel:libspeex$secondaryArchSuffix -# devel:libao$secondaryArchSuffix + devel:libao$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libcurl$secondaryArchSuffix From 931636f0267ed109eef2e80b895f5922c1d4e474 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 17:58:37 -0800 Subject: [PATCH 065/206] Removed stray devel:libz from sdl_ttf recipe --- media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe | 1 - 1 file changed, 1 deletion(-) diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe index ac128bf4e..13c77e3ab 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -48,7 +48,6 @@ BUILD_PREREQUIRES=" cmd:sdl_config$secondaryArchSuffix cmd:make cmd:freetype_config$secondaryArchSuffix - devel:libz " SOURCE_DIR="SDL_ttf-$portVersion" From a225f624a0b8ae4f11b8a594bae0f0dd43019aa3 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 17:59:26 -0800 Subject: [PATCH 066/206] Add secondaryArchSupport for pkg_config in vorbis_tools recipe --- media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe index edb1192ab..997414636 100644 --- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe +++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe @@ -53,7 +53,7 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:automake cmd:make - cmd:pkg_config + cmd:pkg_config$secondaryArchSuffix " PATCHES="vorbis_tools-1.4.0.patch" From 4410b9b2e262ce3e9cbbe192790c75879df9e56f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 18:39:31 -0800 Subject: [PATCH 067/206] fixed libflac and probably sdl_mixer on x86. --- media-libs/flac/flac-1.3.0.recipe | 12 ++++++------ media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe index d2d100a5e..310ba93dc 100644 --- a/media-libs/flac/flac-1.3.0.recipe +++ b/media-libs/flac/flac-1.3.0.recipe @@ -12,13 +12,14 @@ LICENSE="GNU LGPL v2.1 COPYRIGHT="2000-2007 Josh Coalson" -ARCHITECTURES="x86 x86_gcc2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" flac$secondaryArchSuffix = $portVersion compat >= 1 libFLAC$secondaryArchSuffix = 1.3.0 compat >= 1 - cmd:flac - cmd:metaflac + cmd:flac$secondaryArchSuffix + cmd:metaflac$secondaryArchSuffix lib:libFLAC++$secondaryArchSuffix lib:libFLAC$secondaryArchSuffix " @@ -30,10 +31,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " - + BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel cmd:nasm cmd:gcc$secondaryArchSuffix cmd:libtoolize @@ -67,7 +68,6 @@ INSTALL() # devel package packageEntries devel \ $developDir - } TEST() diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe index 61f6fb7b3..af302a881 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -49,10 +49,10 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtool cmd:make - cmd:pkg_config - cmd:sdl_config - cmd:smpeg_config - cmd:libmikmod_config + cmd:pkg_config$secondaryArchSuffix + cmd:sdl_config$secondaryArchSuffix + cmd:smpeg_config$secondaryArchSuffix + cmd:libmikmod_config$secondaryArchSuffix " SOURCE_DIR="SDL_mixer-$portVersion" From bcac4571ee281464802031963f635693c0bf3132 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 19 Dec 2013 16:27:14 -0600 Subject: [PATCH 068/206] mesa: Fix 7.9.2 recipe * libGL compat version is the latest version of OpenGL that version of Mesa supports. * Add missing libxml2_python requirement * Not raising revision as this recipe never built until now. * Thanks Urias for being the guinea pig! --- sys-libs/mesa/mesa-7.9.2.recipe | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index 6ab75cdb1..f3e4f08e7 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -11,7 +11,7 @@ LICENSE="MIT" SRC_URI="https://github.com/kallisti5/mesa/archive/7.9.2-3.tar.gz" CHECKSUM_MD5="1f7d846ea2982ffa175c906443aaabd3" REVISION="1" -ARCHITECTURES="?x86_gcc2" +ARCHITECTURES="x86_gcc2" if [ $effectiveTargetArchitecture != x86 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. @@ -21,7 +21,7 @@ SECONDARY_ARCHITECTURES="?x86_gcc2" PROVIDES=" mesa$secondaryArchSuffix = $portVersion compat >= 7.9 - lib:libGL$secondaryArchSuffix = $portVersion compat >= 1.0 + lib:libGL$secondaryArchSuffix = $portVersion compat <= 2.1 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion @@ -31,6 +31,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion + libxml2_python cmd:bison cmd:find cmd:flex @@ -66,8 +67,8 @@ INSTALL() # OpenGL Kit mkdir -p $includeDir/os/opengl/GL cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ - cp ./include/HaikuGL/BGLView.h $includeDir/os/opengl/ - cp ./include/HaikuGL/BGLRenderer.h $includeDir/os/opengl/ + cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/ + cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/ # Standard GL headers cp ./include/GL/gl.h $includeDir/os/opengl/GL/ From 11303ceac74dc3f28258f4395f7a88f1bf0eefe8 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 19 Dec 2013 16:34:40 -0600 Subject: [PATCH 069/206] mesa: Add libGL compat version matching latest OpenGL ver * This pacakage will likely be replaced by 10.0.1 at some point + a patch to introduce include/HaikuGL --- sys-libs/mesa/mesa-10.0.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-libs/mesa/mesa-10.0.0.recipe b/sys-libs/mesa/mesa-10.0.0.recipe index cf62a9dc2..27a7a03ef 100644 --- a/sys-libs/mesa/mesa-10.0.0.recipe +++ b/sys-libs/mesa/mesa-10.0.0.recipe @@ -9,7 +9,7 @@ COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." LICENSE="MIT" SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0/MesaLib-10.0.0.tar.bz2" CHECKSUM_MD5="f3fe55d9735bea158bbe97ed9a0da819" -REVISION="1" +REVISION="2" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -20,7 +20,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" mesa$secondaryArchSuffix = $portVersion compat >= 10.0 - lib:libGL$secondaryArchSuffix = $portVersion compat >= 10.0 + lib:libGL$secondaryArchSuffix = $portVersion compat <= 3.3 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion From 431d0c94e1f8a46707022c45d811019b37aaa65e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 19:51:08 -0800 Subject: [PATCH 070/206] added secondaryArchSuffix to pkg_config in smpeg recipe, should fix building on x86. --- media-libs/smpeg/smpeg-0.4.5.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 68b6628c2..931784c7b 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -38,7 +38,7 @@ BUILD_PREREQUIRES=" cmd:automake cmd:ld$secondaryArchSuffix cmd:make - cmd:pkg_config + cmd:pkg_config$secondaryArchSuffix lib:libsdl$secondaryArchSuffix " From 8c6f1734a47256cf23e4de84fd56be031c97c5b8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 19:59:21 -0800 Subject: [PATCH 071/206] Removed for libGL provides, this should be the library version not the --- sys-libs/mesa/mesa-10.0.0.recipe | 4 ++-- sys-libs/mesa/mesa-7.9.2.recipe | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys-libs/mesa/mesa-10.0.0.recipe b/sys-libs/mesa/mesa-10.0.0.recipe index 27a7a03ef..493995545 100644 --- a/sys-libs/mesa/mesa-10.0.0.recipe +++ b/sys-libs/mesa/mesa-10.0.0.recipe @@ -20,12 +20,13 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" mesa$secondaryArchSuffix = $portVersion compat >= 10.0 - lib:libGL$secondaryArchSuffix = $portVersion compat <= 3.3 + lib:libGL$secondaryArchSuffix " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " # We're locked to LLVM 3.2 as 3.3 is broken at the moment on Haiku. @@ -33,7 +34,6 @@ BUILD_REQUIRES=" # As LLVM is only linked into the swpipe renderer (and not libGL) # changing LLVM versions shouldn't introduce any abi issues. BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion libxml2_python llvm == 3.2 cmd:bison diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index f3e4f08e7..ae5a26b99 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -21,16 +21,17 @@ SECONDARY_ARCHITECTURES="?x86_gcc2" PROVIDES=" mesa$secondaryArchSuffix = $portVersion compat >= 7.9 - lib:libGL$secondaryArchSuffix = $portVersion compat <= 2.1 + lib:libGL$secondaryArchSuffix " + REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion libxml2_python cmd:bison cmd:find From 93aa86c4d351fff52a68f63a6232e93a69534bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 06:12:30 +0000 Subject: [PATCH 072/206] Pacthed finished --- dev-libs/boost/patches/type_traits.patch | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch index 0da167cce..02b4a07cb 100644 --- a/dev-libs/boost/patches/type_traits.patch +++ b/dev-libs/boost/patches/type_traits.patch @@ -1,15 +1,19 @@ diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp -index 1b15c7e..a0bfb8c 100644 +index 1b15c7e..9a3becd 100644 --- a/boost/config/platform/haiku.hpp +++ b/boost/config/platform/haiku.hpp -@@ -11,12 +11,19 @@ +@@ -9,18 +9,29 @@ - #define BOOST_NO_INTRINSIC_WCHAR_T + #define BOOST_PLATFORM "Haiku" + +-#define BOOST_NO_INTRINSIC_WCHAR_T ++//#define BOOST_NO_INTRINSIC_WCHAR_T #define BOOST_HAS_UNISTD_H +#define BOOST_NO_AUTO_PTR +#define GLIBC_HAVE_LONG_LONG +#define BOOST_HAS_STDINT_H -+#define BOOST_NOT_STD_WSTRING ++//#define BOOST_NOT_STD_WSTRING ++#define BOOST_HASH_NO_EXTENSIONS #define BOOST_HAS_BETHREADS @@ -18,7 +22,14 @@ index 1b15c7e..a0bfb8c 100644 #endif +#define BOOST_NO_CXX11_HDR_TYPE_TRAITS +#define BOOST_NO_CXX11_ATOMIC_SMART_PTR -+ ++#define BOOST_NO_CXX11_STATIC_ASSERT ++#define BOOST_NO_CXX11_VARIADIC_MACROS // // thread API's not auto detected: + // ++#define BOOST_HAS_SCHED_YIELD ++#define BOOST_HAS_PTHREAD_YIELD + #define BOOST_HAS_GETTIMEOFDAY + + // boilerplate code: From 6374b32d8efab0280a5dbbf9384d383d30d1dd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 06:19:24 +0000 Subject: [PATCH 073/206] Coroutine library --- dev-libs/boost/boost-1.55.0.recipe | 157 +++++++++++++---------------- 1 file changed, 72 insertions(+), 85 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index d132ceaaf..a9663b525 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -93,6 +93,7 @@ INSTALL() packageEntries atomic $libDir/*atomic* packageEntries chrono $libDir/*chrono* packageEntries context $libDir/*context* + packageEntries coroutine $libDir/*coroutine* packageEntries date_time $libDir/*date_time* packageEntries exception $libDir/*exception* packageEntries filesystem $libDir/*filesystem* @@ -116,116 +117,80 @@ INSTALL() PROVIDES_devel=" boost_devel$secondaryArchSuffix = $portVersion " +REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion +" PROVIDES_atomic=" boost_atomic$secondaryArchSuffix = $portVersion " +REQUIRES_atomic=" + haiku$secondaryArchSuffix >= $haikuVersion +" PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion " -PROVIDES_context=" - boost_context$secondaryArchSuffix = $portVersion -" -PROVIDES_date_time=" - boost_date_time$secondaryArchSuffix = $portVersion -" -PROVIDES_exception=" - boost_exception$secondaryArchSuffix = $portVersion -" -PROVIDES_filesystem=" - boost_filesystem$secondaryArchSuffix = $portVersion -" -PROVIDES_graph=" - boost_graph$secondaryArchSuffix = $portVersion -" -PROVIDES_iostreams=" - boost_iostreams$secondaryArchSuffix = $portVersion -" -PROVIDES_locale=" - boost_locale$secondaryArchSuffix = $portVersion -" -PROVIDES_log=" - boost_log$secondaryArchSuffix = $portVersion -" -PROVIDES_math=" - boost_math$secondaryArchSuffix = $portVersion -" -PROVIDES_random=" - boost_random$secondaryArchSuffix = $portVersion -" -PROVIDES_program_options=" - boost_program_options$secondaryArchSuffix = $portVersion -" -PROVIDES_regex=" - boost_regex$secondaryArchSuffix = $portVersion -" -PROVIDES_serialization=" - boost_serialization$secondaryArchSuffix = $portVersion -" -PROVIDES_signals=" - boost_signals$secondaryArchSuffix = $portVersion -" -PROVIDES_system=" - boost_system$secondaryArchSuffix = $portVersion -" -PROVIDES_test=" - boost_test$secondaryArchSuffix = $portVersion -" -PROVIDES_thread=" - boost_thread$secondaryArchSuffix = $portVersion -" -PROVIDES_timer=" - boost_timer$secondaryArchSuffix = $portVersion -" -PROVIDES_wave=" - boost_wave$secondaryArchSuffix = $portVersion -" - -REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion - " - -REQUIRES_atomic=" - haiku$secondaryArchSuffix >= $haikuVersion -" - REQUIRES_chrono=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion " - +PROVIDES_context=" + boost_context$secondaryArchSuffix = $portVersion +" REQUIRES_context=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_coroutine=" + boost_coroutine$secondaryArchSuffix = $portVersion +" +REQUIRES_coroutine=" + boost_context$secondaryArchSuffix == $portVersion +" +PROVIDES_date_time=" + boost_date_time$secondaryArchSuffix = $portVersion +" REQUIRES_date_time=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_exception=" + boost_exception$secondaryArchSuffix = $portVersion +" REQUIRES_exception=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_filesystem=" + boost_filesystem$secondaryArchSuffix = $portVersion +" REQUIRES_filesystem=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion + lib:libz$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix +" +PROVIDES_graph=" + boost_graph$secondaryArchSuffix = $portVersion " - REQUIRES_graph=" haiku$secondaryArchSuffix >= $haikuVersion boost_regex$secondaryArchSuffix == $portVersion " - +PROVIDES_iostreams=" + boost_iostreams$secondaryArchSuffix = $portVersion +" REQUIRES_iostreams=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_locale=" + boost_locale$secondaryArchSuffix = $portVersion +" REQUIRES_locale=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion boost_thread$secondaryArchSuffix == $portVersion " - +PROVIDES_log=" + boost_log$secondaryArchSuffix = $portVersion +" REQUIRES_log=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion @@ -233,51 +198,73 @@ REQUIRES_log=" boost_date_time$secondaryArchSuffix == $portVersion boost_thread$secondaryArchSuffix == $portVersion " - +PROVIDES_math=" + boost_math$secondaryArchSuffix = $portVersion +" REQUIRES_math=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_program_options=" + boost_program_options$secondaryArchSuffix = $portVersion +" REQUIRES_program_options=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_random=" + boost_random$secondaryArchSuffix = $portVersion +" REQUIRES_random=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_regex=" + boost_regex$secondaryArchSuffix = $portVersion +" REQUIRES_regex=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_serialization=" + boost_serialization$secondaryArchSuffix = $portVersion +" REQUIRES_serialization=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_signals=" + boost_signals$secondaryArchSuffix = $portVersion +" REQUIRES_signals=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_system=" + boost_system$secondaryArchSuffix = $portVersion +" REQUIRES_system=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_test=" + boost_test$secondaryArchSuffix = $portVersion +" REQUIRES_test=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_thread=" + boost_thread$secondaryArchSuffix = $portVersion +" REQUIRES_thread=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion boost_chrono$secondaryArchSuffix == $portVersion " - +PROVIDES_timer=" + boost_timer$secondaryArchSuffix = $portVersion +" REQUIRES_timer=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion " - +PROVIDES_wave=" + boost_wave$secondaryArchSuffix = $portVersion +" REQUIRES_wave=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion From 62cbcc8576cefa1b35f0ba4acd736477133fec4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 06:49:26 +0000 Subject: [PATCH 074/206] Boost installation --- dev-libs/boost/boost-1.55.0.recipe | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index a9663b525..db56d6e75 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -33,6 +33,8 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:jam cmd:iconv + cmd:make + binutils " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion @@ -79,15 +81,21 @@ BUILD() INSTALL() { - ./bjam install \ - -d2 \ - --prefix=$prefix \ - --exec-prefix=$binDir \ - --libdir=$libDir \ - --includedir=$includeDir \ - inlining=on \ - --without-mpi \ - --without-python + #./bjam install \ + # -d2 \ + # --prefix=$prefix \ + # --exec-prefix=$binDir \ + # --libdir=$libDir \ + # --includedir=$includeDir \ + # inlining=on \ + # --without-mpi \ + # --without-python \ + # --disable-icu + mkdir -p $includeDir + mkdir -p $libDir + + cp -rf boost $includeDir + cp stage/lib/* $libDir packageEntries devel $includeDir packageEntries atomic $libDir/*atomic* From a5c1e1aa59220e637016c1b097d223100a05faed Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Thu, 19 Dec 2013 20:18:31 +0000 Subject: [PATCH 075/206] Added Muscle 6.00 recipe (currently builds only on GCC4) --- net-misc/muscle/muscle-6.00.recipe | 51 ++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 net-misc/muscle/muscle-6.00.recipe diff --git a/net-misc/muscle/muscle-6.00.recipe b/net-misc/muscle/muscle-6.00.recipe new file mode 100644 index 000000000..5edc6bb1a --- /dev/null +++ b/net-misc/muscle/muscle-6.00.recipe @@ -0,0 +1,51 @@ +DESCRIPTION="The MUSCLE system is a robust, somewhat scalable, cross-platform client-server solution for dynamic distributed applications for Haiku and other operating systems. + It allows (n) client programs (each of which may be running on a separate computer and/or under a different OS) to communicate with each other in a many-to-many message-passing style. + It employs a central server to which client programs may connect or disconnect at any time (this design is similar to other client-server systems such as Quake servers, IRC servers, and Napster servers, but more general in application). + In addition to the client-server system, MUSCLE contains classes to support peer-to-peer message streaming connections, as well as some handy miscellaneous utility classes." +SUMMARY="Robust, somewhat scalable, cross-platform client-server solution" +COPYRIGHT="2000-2009 Meyer Sound Laboratories Inc." +LICENSE="BSD (3-clause)" +HOMEPAGE="https://public.msli.com/lcs/muscle/index.html" +SRC_URI="https://public.msli.com/lcs/muscle/muscle6.00.zip" +CHECKSUM_MD5="06eda494fc9bd2fcf847939160be0e61" +REVISION="1" + +ARCHITECTURES="!x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" + +PROVIDES=" + muscle = $portVersion + cmd:muscled$secondaryArchSuffix = $portVersion + cmd:admin$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libz$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +SOURCE_DIR="muscle" + +BUILD() +{ + cd server + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + mkdir -p $binDir + + cd server + cp admin muscled $binDir +} From f37a1491f9a2955a51c5e1c444d65e1914ee7b85 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 19 Dec 2013 21:35:46 -0700 Subject: [PATCH 076/206] Quick fixes for physfs on primary and secondary --- dev-games/physfs/physfs-2.0.3.recipe | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-2.0.3.recipe index 9168ccd53..c6908c94e 100644 --- a/dev-games/physfs/physfs-2.0.3.recipe +++ b/dev-games/physfs/physfs-2.0.3.recipe @@ -12,19 +12,17 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" REVISION="1" PROVIDES=" - physfs$secondaryArchSuffix = $portVersion - lib:libphysfs$secondaryArchSuffix = $portVersion - cmd:test_physfs + physfs$secondaryArchSuffix = $portVersion compat >= 2.0 + lib:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0 + cmd:test_physfs$secondaryArchSuffix = $portVersion compat >= 2.0 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion - devel:libz$secondaryArchSuffix >= 1.0.4 " BUILD_PREREQUIRES=" @@ -33,9 +31,16 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix " +PATCH() +{ + sed -i "s,DESTINATION include,DESTINATION $relativeIncludeDir," CMakeLists.txt + sed -i "s,DESTINATION bin,DESTINATION $relativeBinDir," CMakeLists.txt +} + BUILD() { - cmake . -DCMAKE_INSTALL_PREFIX=$prefix + cmake . -DCMAKE_INSTALL_PREFIX=$prefix \ + -DLIB_SUFFIX="/${secondaryArchSuffix/_/}" make $jobArgs } @@ -46,10 +51,6 @@ INSTALL() prepareInstalledDevelLib libphysfs fixPkgconfig - mkdir -p $includeDir - mv $prefix/include/*.h $includeDir - rm -rf $prefix/include - # devel package packageEntries devel \ $developDir @@ -57,8 +58,7 @@ INSTALL() PROVIDES_devel=" physfs$secondaryArchSuffix_devel = $portVersion compat >= 2.0 - devel:physfs$secondaryArchSuffix = $portVersion compat >= 2.0 - devel:libphysfs$secondaryArchSuffix = 2.0.3 compat >= 2.0 + devel:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0 " REQUIRES_devel=" From ca74900cc11aa0855fe9501b2642cb102102db4e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 Dec 2013 00:44:49 -0800 Subject: [PATCH 077/206] Fixed sge build on x86 --- media-libs/sge/sge-030809.recipe | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/media-libs/sge/sge-030809.recipe b/media-libs/sge/sge-030809.recipe index ccd270f4f..b74e3d520 100644 --- a/media-libs/sge/sge-030809.recipe +++ b/media-libs/sge/sge-030809.recipe @@ -36,7 +36,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make - cmd:sdl_config + cmd:sdl_config$secondaryArchSuffix " SOURCE_DIR="sge030809" @@ -50,10 +50,8 @@ BUILD() INSTALL() { - make install PREFIX_H=$relativeIncludeDir PREFIX=$prefix - + make install PREFIX_H=$includeDir PREFIX=$prefix LIBDIR=$libDir prepareInstalledDevelLibs libSGE - #devel package packageEntries devel \ $developDir From 5b1695873bc253350485ca2394604c28e4f4f292 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 Dec 2013 02:52:45 -0800 Subject: [PATCH 078/206] Fixed openal build on x86 --- media-libs/openal/openal-1.13.0.recipe | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/media-libs/openal/openal-1.13.0.recipe b/media-libs/openal/openal-1.13.0.recipe index e6549ee6b..22422c081 100644 --- a/media-libs/openal/openal-1.13.0.recipe +++ b/media-libs/openal/openal-1.13.0.recipe @@ -21,10 +21,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -35,8 +35,10 @@ SOURCE_DIR="openal-soft-1.13" BUILD() { - cmake . - make + sed -i "s,RUNTIME DESTINATION bin,RUNTIME DESTINATION $relativeBinDir," CMakeLists.txt + cmake . -DCMAKE_INSTALL_PREFIX=$prefix \ + -DLIB_SUFFIX="/${secondaryArchSuffix/_/}" + make $jobArgs } INSTALL() @@ -45,9 +47,7 @@ INSTALL() mkdir -p $developDir/headers mkdir -p $binDir - mv /boot/common/lib $libDir - mv /boot/common/include/AL $developDir/headers - mv /boot/common/bin/openal-info $binDir + mv $prefix/include $developDir/headers prepareInstalledDevelLibs libopenal fixPkgconfig @@ -61,11 +61,10 @@ INSTALL() PROVIDES_devel=" openal${secondaryArchSuffix}_devel = $portVersion compat >= 1 devel:libopenal$secondaryArchSuffix = 1.13.0 compat >= 0 - cmd:openal_info + cmd:openal_info$secondaryArchSuffix " REQUIRES_devel=" haiku$secondaryArchSuffix >= $haikuVersion lib:libopenal$secondaryArchSuffix == $portVersion base " - From 5b8ac1a0f3135a46080aab66a41aa13760b9d7fc Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sat, 14 Dec 2013 21:44:20 -0500 Subject: [PATCH 079/206] Fix aalib recipe The non-devel package provided "aalib", while the devel package needed "libaa" --- media-libs/aalib/aalib-1.4rc4.recipe | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index aade064cd..bcbcc4185 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -36,11 +36,11 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:automake cmd:makeinfo -" + " PATCHES=" aalib-1.4rc4.patch -" + " BUILD() { @@ -68,7 +68,7 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - libaa${secondaryArchSuffix}_devel = $portVersion compat >= 1 + aalib${secondaryArchSuffix}_devel = $portVersion compat >= 1 cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1 cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1 cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1 @@ -78,8 +78,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - libaa$secondaryArchSuffix == $portVersion base + aalib$secondaryArchSuffix == $portVersion base lib:libaa$secondaryArchSuffix >= 1.0.4 compat >= 1 - lib:libroot$secondaryArchSuffix >= $haikuVersion " From 9fca4531c594c8ce1ca6ba300b097f849c8191c2 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 Dec 2013 08:43:22 -0800 Subject: [PATCH 080/206] Fixed flac on x86 --- media-libs/flac/flac-1.3.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe index 310ba93dc..2248eaf26 100644 --- a/media-libs/flac/flac-1.3.0.recipe +++ b/media-libs/flac/flac-1.3.0.recipe @@ -25,13 +25,15 @@ PROVIDES=" " REQUIRES=" - haiku - lib:libiconv - lib:libogg + haiku$secondaryArchSuffix >= $haikuVersion + lib:libiconv$secondaryArchSuffix + lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libiconv$secondaryArchSuffix + devel:libogg$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -45,8 +47,6 @@ BUILD_PREREQUIRES=" cmd:make cmd:gawk cmd:perl - devel:libiconv - devel:libogg " BUILD() From e8eda364fb39857a96f72a9ed4b0f025e983e879 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 Dec 2013 08:43:52 -0800 Subject: [PATCH 081/206] Cleanup allegro recipe, still broken on x86 --- media-libs/allegro/allegro-4.4.2.recipe | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe index 535f5b0e1..3394bc282 100644 --- a/media-libs/allegro/allegro-4.4.2.recipe +++ b/media-libs/allegro/allegro-4.4.2.recipe @@ -31,26 +31,26 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libpng - lib:libz - lib:libogg - lib:libvorbis + lib:libpng$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libpng$secondaryArchSuffix - devel:libz - devel:libogg - devel:libvorbis + devel:libz$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:cmake cmd:make - cmd:pkg_config + cmd:pkg_config$secondaryArchSuffix " PATCHES="allegro-4.4.2.patchset" @@ -93,4 +93,3 @@ REQUIRES_devel=" haiku$secondaryArchSuffix >= $haikuVersion allegro$secondaryArchSuffix == $portVersion base " - From 18af4133c71d1cf1d088569b7da216c6bf83510f Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 20 Dec 2013 18:02:58 +0000 Subject: [PATCH 082/206] Add PPViewer recipe --- haiku-apps/ppviewer/ppviewer-1.0.0.recipe | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 haiku-apps/ppviewer/ppviewer-1.0.0.recipe diff --git a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe new file mode 100644 index 000000000..22fb0b6a4 --- /dev/null +++ b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe @@ -0,0 +1,37 @@ +SUMMARY="Decrypts your PowerPacker encrypted files" +DESCRIPTION=" + Decrypts PowerPacker encrypted files using Stuart Caie\'s + ppcrack 0.1 decrypting routines. + " +HOMEPAGE="https://github.com/HaikuArchives/PPViewer" +SRC_URI="git+https://github.com/puckipedia/PPViewer#ce572506ca6e69c888898abf5b958701e068122b" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2002 Maurice Michalski" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + ppviewer = $portVersion + app:ppviewer = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:g++ + " + +BUILD() +{ + g++ -lbe -ltracker -o PPViewer *.cpp +} + +INSTALL() +{ + mkdir -p $appsDir + cp PPViewer $appsDir + addAppDeskbarSymlink $appsDir/PPViewer +} From 15f12ab3425f6ddc0dcc99068298f0527bb40531 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 20 Dec 2013 18:06:51 +0000 Subject: [PATCH 083/206] Remove superfluous ' --- haiku-apps/ppviewer/ppviewer-1.0.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe index 22fb0b6a4..17ca8bbc0 100644 --- a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe +++ b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe @@ -1,6 +1,6 @@ SUMMARY="Decrypts your PowerPacker encrypted files" DESCRIPTION=" - Decrypts PowerPacker encrypted files using Stuart Caie\'s + Decrypts PowerPacker encrypted files using Stuart Caie's ppcrack 0.1 decrypting routines. " HOMEPAGE="https://github.com/HaikuArchives/PPViewer" From 37d9c3d42ea34f505c82f1e2131baadea2e97110 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 20 Dec 2013 18:47:00 +0000 Subject: [PATCH 084/206] Move repo to HaikuArchives --- haiku-apps/ppviewer/ppviewer-1.0.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe index 17ca8bbc0..73d33f369 100644 --- a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe +++ b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe @@ -4,7 +4,7 @@ DESCRIPTION=" ppcrack 0.1 decrypting routines. " HOMEPAGE="https://github.com/HaikuArchives/PPViewer" -SRC_URI="git+https://github.com/puckipedia/PPViewer#ce572506ca6e69c888898abf5b958701e068122b" +SRC_URI="git+https://github.com/HaikuArchives/PPViewer#ce572506ca6e69c888898abf5b958701e068122b" REVISION="1" LICENSE="MIT" COPYRIGHT="2002 Maurice Michalski" From 67d6b061f151855f96c7b5e8ae1933466c47b403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 20 Dec 2013 18:38:59 +0000 Subject: [PATCH 085/206] Removed comments --- dev-libs/boost/boost-1.55.0.recipe | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index db56d6e75..74d270f35 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -19,7 +19,6 @@ PATCHES=" boost-1.55.0.patch type_traits.patch " -DISABLE_SOURCE_PACKAGE=yes PROVIDES=" lib:boost = 1.55.0 @@ -81,16 +80,6 @@ BUILD() INSTALL() { - #./bjam install \ - # -d2 \ - # --prefix=$prefix \ - # --exec-prefix=$binDir \ - # --libdir=$libDir \ - # --includedir=$includeDir \ - # inlining=on \ - # --without-mpi \ - # --without-python \ - # --disable-icu mkdir -p $includeDir mkdir -p $libDir From ba7b6295bddfe671568675f0caebeaaa6ef2a637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 20 Dec 2013 21:07:30 +0000 Subject: [PATCH 086/206] Changed architectures --- dev-libs/boost/boost-1.55.0.recipe | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 74d270f35..b1a2daff6 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -12,8 +12,11 @@ CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354" REVISION="1" LICENSE="Boost v1.0" COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al." -ARCHITECTURES="?x86_gcc2 ?x86" -SECONDARY_ARCHITECTURES="x86" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 ?x86_64" SOURCE_DIR="boost_1_55_0" PATCHES=" boost-1.55.0.patch From 8e43a176778b7efe55dfd30e031290206269ef7c Mon Sep 17 00:00:00 2001 From: noryb009 Date: Fri, 20 Dec 2013 18:32:10 -0500 Subject: [PATCH 087/206] Clean up aalib recipe --- media-libs/aalib/aalib-1.4rc4.recipe | 39 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index bcbcc4185..74bf61761 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -1,14 +1,14 @@ SUMMARY="aalib is an ASCII rendering 2D library" DESCRIPTION="aalib is a software library which allows applications to automatically convert still and moving images into ASCII art. -" + " HOMEPAGE="http://aa-project.sourceforge.net/aalib/" SRC_URI="http://prdownloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz" SOURCE_DIR="aalib-1.4.0" CHECKSUM_MD5="d5aa8e9eae07b7441298b5c30490f6a6" REVISION="2" LICENSE="Public Domain" -COPYRIGHT="1997 by Jam Hubicka" +COPYRIGHT="1997 Jam Hubicka" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -16,26 +16,26 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" aalib$secondaryArchSuffix = $portVersion compat >= 1 lib:libaa$secondaryArchSuffix = 1.0.4 compat >= 1 -" - + " REQUIRES=" haiku >= $haikuVersion -" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion -" + " BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:libtoolize cmd:aclocal cmd:autoconf cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make cmd:makeinfo + cmd:ranlib " PATCHES=" @@ -61,24 +61,25 @@ INSTALL() # devel package packageEntries devel \ $binDir \ + $dataDir \ $developDir \ - $manDir/man3 + $documentationDir } # ----- devel package ------------------------------------------------------- PROVIDES_devel=" aalib${secondaryArchSuffix}_devel = $portVersion compat >= 1 - cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1 - cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1 - cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1 - cmd:aasavefont${secondaryArchSuffix} = $portVersion compat >= 1 - cmd:aatest${secondaryArchSuffix} = $portVersion compat >= 1 + devel:aalib$secondaryArchSuffix = $portVersion compat >= 1 devel:libaa$secondaryArchSuffix = $portVersion compat >= 1 -" + cmd:aafire$secondaryArchSuffix = $portVersion compat >= 1 + cmd:aainfo$secondaryArchSuffix = $portVersion compat >= 1 + cmd:aalib_config$secondaryArchSuffix = $portVersion compat >= 1 + cmd:aasavefont$secondaryArchSuffix = $portVersion compat >= 1 + cmd:aatest$secondaryArchSuffix = $portVersion compat >= 1 + " REQUIRES_devel=" aalib$secondaryArchSuffix == $portVersion base - lib:libaa$secondaryArchSuffix >= 1.0.4 compat >= 1 -" + " From fb0ccdb1d99c458f152ea13deb7d0ded1d03bebf Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sat, 21 Dec 2013 11:11:30 +0100 Subject: [PATCH 088/206] Add recipe for youtube-dl. --- .../youtube_dl/youtube_dl-2013.12.20.recipe | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 net-misc/youtube_dl/youtube_dl-2013.12.20.recipe diff --git a/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe b/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe new file mode 100644 index 000000000..b9d5d7361 --- /dev/null +++ b/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe @@ -0,0 +1,56 @@ +SUMMARY="A command-line program to download videos from various sites." +DESCRIPTION=" + The program is usually invoked as youtube-dl followed by options + and the video URL. + Run 'youtube-dl --help' and get a summary of all options. + + Some YouTube videos are served using Adobe's proprietary RTMP + protocol, which imposes DRM restrictions and encrypts the + connection. youtube-dl is not able to download these videos by + itself. + " +HOMEPAGE="http://rg3.github.io/youtube-dl/index.html" +SRC_URI="https://yt-dl.org/downloads/2013.12.20/youtube-dl-2013.12.20.tar.gz" +CHECKSUM_MD5="be0cf52206f9ba3f5f841deec3ce3bde" +REVISION="1" +LICENSE="Public Domain" +COPYRIGHT="2006-2013 Ricardo Garcia Gonzalez" + +ARCHITECTURES="any" + +PROVIDES=" + youtube_dl = $portVersion + cmd:youtube_dl = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + cmd:python + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:make + cmd:zip + " + +SOURCE_DIR="youtube-dl" + +BUILD() +{ + true +} + +INSTALL() +{ + zip -q youtube-dl youtube_dl/*.py youtube_dl/*/*.py + zip -q -j youtube-dl youtube_dl/__main__.py + echo '#!/bin/python' > youtube-dl + cat youtube-dl.zip >> youtube-dl + rm youtube-dl.zip + chmod a+x youtube-dl + + mkdir -p $binDir $manDir/man1 + cp -a youtube-dl $binDir + cp -a youtube-dl.1 $manDir/man1 +} From 54d1cf8641a3ea0bce857046692b8b53aa9f38d1 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 02:37:13 -0800 Subject: [PATCH 089/206] Fixed lcms on x86 --- media-libs/lcms/lcms-2.5.recipe | 45 ++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/media-libs/lcms/lcms-2.5.recipe b/media-libs/lcms/lcms-2.5.recipe index f8874d21a..6bde06ecd 100644 --- a/media-libs/lcms/lcms-2.5.recipe +++ b/media-libs/lcms/lcms-2.5.recipe @@ -8,32 +8,35 @@ LICENSE="MIT" COPYRIGHT="2007 Marti Maria" ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - lcms = 2.5 compat >= 2 - lib:liblcms2 - cmd:jpgicc - cmd:linkicc - cmd:psicc - cmd:tificc - cmd:transicc + lcms$secondaryArchSuffix = 2.5 compat >= 2 + lib:liblcms2$secondaryArchSuffix + cmd:jpgicc$secondaryArchSuffix + cmd:linkicc$secondaryArchSuffix + cmd:psicc$secondaryArchSuffix + cmd:tificc$secondaryArchSuffix + cmd:transicc$secondaryArchSuffix " REQUIRES=" - haiku - lib:libjpeg - lib:libpng - lib:libtiff - lib:libz" + haiku >= $haikuVersion + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " BUILD_REQUIRES=" - devel:libjpeg - devel:libpng - devel:libtiff - devel:libz" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " BUILD_PREREQUIRES=" - haiku_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:libtoolize @@ -71,10 +74,10 @@ INSTALL() # ----- devel package --------------------------------------- PROVIDES_devel=" - lcms_devel = $portVersion - devel:lcms = 2.5 compat >= 2 - devel:liblcms2 = 2.0.1 compat >= 2 + lcms${secondaryArchSuffix}_devel = $portVersion + devel:lcms$secondaryArchSuffix = 2.5 compat >= 2 + devel:liblcms2$secondaryArchSuffix = 2.0.1 compat >= 2 " REQUIRES_devel=" - lcms == $portVersion base + lcms$secondaryArchSuffix == $portVersion base " From c53a8bdace6a483fcccf0d900690301668dc63aa Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 02:40:53 -0800 Subject: [PATCH 090/206] Moved haiku_devel to BUILD_REQUIRES in fluidsynth recipe. Runs into PTHREAD not found when running cmake. --- media-sound/fluidsynth/fluidsynth-1.1.6.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe index a48739939..de09af679 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe +++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe @@ -23,10 +23,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake cmd:make cmd:gcc$secondaryArchSuffix From e760dedf497e33471161ceff9139fa1555e79576 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 02:43:17 -0800 Subject: [PATCH 091/206] Moved haiku_devel to BUILD_REQUIRES in fluidsynth recipe. Runs into PTHREAD not found when running cmake. --- media-sound/fluidsynth/fluidsynth-1.1.6.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe index de09af679..9ee32b4fa 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe +++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe @@ -7,8 +7,8 @@ LICENSE="GNU LGPL v2.1" COPYRIGHT="2007-2012 Josh Green, Pedro Lopez-Cabanillas, David Henningsson" REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES=" fluidsynth$secondaryArchSuffix = $portVersion From 06ffcf777c45a8c13fbd4e4f67153d00e9c7a98c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 02:57:58 -0800 Subject: [PATCH 092/206] Updated libart recipe for secondaryArchSuffix support --- .../libart_lgpl/libart_lgpl-2.3.21.recipe | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe index 40dfb8b7c..6f7fd5535 100644 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe @@ -7,20 +7,23 @@ REVISION="1" LICENSE="GNU LGPL v2.1" COPYRIGHT="2001-2010 Mathieu Lacage and Raph Levien" -ARCHITECTURES="x86 x86_gcc2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - libart_lgpl= $portVersion - cmd:libart2_config = $portVersion compat >= 2 - lib:libart_lgpl_2 = 2.3.21 compat >= 2 - " + libart_lgpl$secondaryArchSuffix = $portVersion + lib:libart_lgpl_2$secondaryArchSuffix = 2.3.21 compat >= 2 + " + REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " + BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " + BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion cmd:aclocal cmd:autoreconf cmd:libtool @@ -28,6 +31,7 @@ BUILD_PREREQUIRES=" cmd:ld${secondaryArchSuffix} cmd:gcc${secondaryArchSuffix} " + BUILD() { libtoolize --force --copy --install @@ -45,15 +49,18 @@ INSTALL() # devel package packageEntries devel \ - $developDir + $developDir \ + $binDir } # ----- devel package PROVIDES_devel=" - libart_lgpl_2 = $portVersion - devel:libart_lgpl_2 = 2.3.21 compat >= 2 + libart_lgpl_2$secondaryArchSuffix = $portVersion + devel:libart_lgpl_2$secondaryArchSuffix = 2.3.21 compat >= 2 + cmd:libart2_config$secondaryArchSuffix = $portVersion compat >= 2 " + REQUIRES_devel=" - libart_lgpl_2 == $portVersion base + libart_lgpl_2$secondaryArchSuffix == $portVersion base " From 85dd49df72907c58c8c593459a4d685158dfa439 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sat, 21 Dec 2013 12:24:16 +0100 Subject: [PATCH 093/206] New recipe for newest UberTuber 0.9.8. Updated SRC_URI with newest UberTuber version. Patch not needed any more. Added youtube_dl to REQUIRES; no longer part of UberTuber. Removed unneeded commands from BUILD_PREREQUIRES. Slightly more elegant INSTALL(). --- haiku-apps/ubertuber/ubertuber-0.9.8.recipe | 63 +++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 haiku-apps/ubertuber/ubertuber-0.9.8.recipe diff --git a/haiku-apps/ubertuber/ubertuber-0.9.8.recipe b/haiku-apps/ubertuber/ubertuber-0.9.8.recipe new file mode 100644 index 000000000..09696f18b --- /dev/null +++ b/haiku-apps/ubertuber/ubertuber-0.9.8.recipe @@ -0,0 +1,63 @@ +SUMMARY="A tool to play back online videos in MediaPlayer" +DESCRIPTION=" + UberTuber grabs clips from various sites and opens them in your media + player while they're being downloaded. The Python script youtube-dl + downloads the video file to the temporary folder. + From there it is either played back while it gets downloaded or moved to + another location determined in a file dialog. + + UberTuber monitors the system clipboard for URLs pointing to the supported + websites and automatically inserts them into its URL text field. + + At this moment there is support for clips from: + + YouTube, Google video, MetaCafe, DailyMotion, Yahoo video, + Photobucket, DepositFiles, Vimeo.com, blip.tv, Facebook video + and Escapist magazine. + + It may also work on videos from other sites... + " +HOMEPAGE="http://sourceforge.net/projects/ubertuber/" +SRC_URI="git://git.code.sf.net/p/ubertuber/code#9d33e8525806a581ed5229b213e81be9ecd29252" +LICENSE="MIT" +COPYRIGHT="2013 Humdinger" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + ubertuber = $portVersion + app:ubertuber = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + cmd:youtube_dl + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + makefile_engine + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + " + +USER_SETTINGS_FILES="settings/UberTuber_settings" + +BUILD() +{ + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + ARCH=$(echo $buildArchitecture | sed 's/_/-/g') + + ubertuberDir=$appsDir/UberTuber + mkdir -p $ubertuberDir + + cp -af objects.$ARCH-release/UberTuber $ubertuberDir + cp -af ReadMe.html $ubertuberDir + cp -r images $ubertuberDir + + addAppDeskbarSymlink $ubertuberDir/UberTuber +} \ No newline at end of file From c50f9398ee338d7db1120383911f5a21fe77601a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 03:25:01 -0800 Subject: [PATCH 094/206] Update jasper for proper secondaryArchSuffix support --- media-libs/jasper/jasper-1.900.1.recipe | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe index 9d521657a..780d42167 100644 --- a/media-libs/jasper/jasper-1.900.1.recipe +++ b/media-libs/jasper/jasper-1.900.1.recipe @@ -8,8 +8,8 @@ CHECKSUM_MD5="a342b2b4495b3e1394e161eb5d85d754" LICENSE="JasPer v2" COPYRIGHT="1999-2007 Michael D. Adams" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" jasper$secondaryArchSuffix = $portVersion compat >= 1.0.0 @@ -89,14 +89,13 @@ REQUIRES_devel=" if [ -z "$secondaryArchSuffix" ]; then SUMMARY_tools="The jasper tools" PROVIDES_tools=" - jasper_tools = $portVersion - cmd:imgcmp = $portVersion - cmd:imginfo = $portVersion - cmd:jasper = $portVersion - cmd:tmrdemo = $portVersion + jasper_tools$secondaryArchSuffix = $portVersion + cmd:imgcmp$secondaryArchSuffix = $portVersion + cmd:imginfo$secondaryArchSuffix = $portVersion + cmd:jasper$secondaryArchSuffix = $portVersion + cmd:tmrdemo$secondaryArchSuffix = $portVersion " REQUIRES_tools=" - haiku >= $haikuVersion - jasper == $portVersion base + jasper$secondaryArchSuffix == $portVersion base " -fi \ No newline at end of file +fi From 1b493dad3e42fb6a13749e2b6cc9f776ca0c6f7b Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 04:00:44 -0800 Subject: [PATCH 095/206] Added foldershaper, recipe by 2013 GCI student NumberNoid --- .../foldershaper/foldershaper-1.0.recipe | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 haiku-apps/foldershaper/foldershaper-1.0.recipe diff --git a/haiku-apps/foldershaper/foldershaper-1.0.recipe b/haiku-apps/foldershaper/foldershaper-1.0.recipe new file mode 100644 index 000000000..164d110b9 --- /dev/null +++ b/haiku-apps/foldershaper/foldershaper-1.0.recipe @@ -0,0 +1,47 @@ +SUMMARY="A tool to retro-fit looks and layout of existing folders" +DESCRIPTION="If you want your folders to have a certain icon, set of columns, backgrounds, pergaps even some default content, +FolderShaper lets you chnage all that in a snap. Create a perfect folder, add it as a foldershaper template, then drop your +folders on FolderShaper and select the template from the pop-up menu." +HOMEPAGE="https://github.com/HaikuArchives/FolderShaper" +SRC_URI="git://github.com/HaikuArchives/FolderShaper.git" +REVISION="1" +LICENSE="Public Domain" +COPYRIGHT="2005 Jonas Sundström" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + foldershaper = $portVersion + app:foldershaper = $portVersion + addon:foldershaper = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:make + cmd:mkdepend + " + +BUILD() +{ + cd Source + make +} + +INSTALL() +{ + cd Source + make install INSTALL_DIR=$appsDir/FolderShaper + mkdir -p $addOnsDir/Tracker + ln -s $appsDir/FolderShaper/FolderShaper $addOnsDir/Tracker + addAppDeskbarSymlink $appsDir/FolderShaper/FolderShaper "FolderShaper" + cp ../README $appsDir/FolderShaper/README +} From 102e3d98dc0e9bd663cfa3ec669c625b7d50e27f Mon Sep 17 00:00:00 2001 From: Mrowqa Date: Sat, 21 Dec 2013 14:51:02 +0100 Subject: [PATCH 096/206] Added recipe file for gloox library --- net-libs/gloox/gloox-1.0.9.recipe | 84 ++++++++++++++++++++++ net-libs/gloox/patches/gloox-1.0.9.patch | 90 ++++++++++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 net-libs/gloox/gloox-1.0.9.recipe create mode 100644 net-libs/gloox/patches/gloox-1.0.9.patch diff --git a/net-libs/gloox/gloox-1.0.9.recipe b/net-libs/gloox/gloox-1.0.9.recipe new file mode 100644 index 000000000..97a93298b --- /dev/null +++ b/net-libs/gloox/gloox-1.0.9.recipe @@ -0,0 +1,84 @@ +DESCRIPTION=" + Rock-solid, full-featured Jabber/XMPP client library, written in clean + ANSI C++ + " +SUMMARY="Full-featured Jabber/XMPP client library, written in clean ANSI C++" +HOMEPAGE="http://camaya.net/gloox/" +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2012 Jakob Schröter" +SRC_URI="http://camaya.net/download/gloox-1.0.9.tar.bz2" +CHECKSUM_MD5="48fc9aa5210c2a1ce253751a4d38e19c" +REVISION="1" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" +PATCHES="gloox-1.0.9.patch" + +PROVIDES=" + gloox$secondaryArchSuffix = $portVersion + lib:libgloox$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libssl$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + openssl$secondaryArchSuffix + openssl${secondaryArchSuffix}_devel + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + " +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + runConfigure ./configure + make +} + +INSTALL() +{ + make install + + # prepare development lib links + prepareInstalledDevelLib libgloox + + # devel package + packageEntries devel $developDir +} + +TEST() +{ + make check +} + + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + gloox${secondaryArchSuffix}_devel = $portVersion + devel:gloox$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + gloox$secondaryArchSuffix == $portVersion base + " diff --git a/net-libs/gloox/patches/gloox-1.0.9.patch b/net-libs/gloox/patches/gloox-1.0.9.patch new file mode 100644 index 000000000..efa188d33 --- /dev/null +++ b/net-libs/gloox/patches/gloox-1.0.9.patch @@ -0,0 +1,90 @@ +diff --git a/configure.ac b/configure.ac +index 402c399..20555ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR(src/gloox.cpp) + AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + + dnl create a config.h file (Automake will add -DHAVE_CONFIG_H) +-AM_CONFIG_HEADER(config.h.unix) ++AC_CONFIG_HEADER(config.h.unix) + + AC_SUBST(VERSION) + +@@ -326,8 +326,8 @@ AC_MSG_RESULT($getaddrinfo) + + dnl Checks for header files. + AC_HEADER_STDC +-AC_CHECK_HEADERS(unistd.h strings.h errno.h arpa/nameser.h) +-AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)]) ++AC_CHECK_HEADERS(unistd.h wchar.h string.h cstring.h strings.h errno.h arpa/nameser.h) ++AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(network,setsockopt)]) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST +diff --git a/src/connectiontcpbase.cpp b/src/connectiontcpbase.cpp +index 2da70c0..b28f8e8 100644 +--- a/src/connectiontcpbase.cpp ++++ b/src/connectiontcpbase.cpp +@@ -10,7 +10,17 @@ + This software is distributed without any warranty. + */ + ++#if defined HAVE_STRING_H ++#include ++#endif ++ ++#if defined HAVE_WCHAR_H ++#include ++#endif + ++#if __GNUC__ > 3 ++#include ++#endif + + #include "gloox.h" + +diff --git a/src/connectiontcpserver.cpp b/src/connectiontcpserver.cpp +index 68c8f7b..236ce8e 100644 +--- a/src/connectiontcpserver.cpp ++++ b/src/connectiontcpserver.cpp +@@ -10,7 +10,17 @@ + This software is distributed without any warranty. + */ + ++#if defined HAVE_STRING_H ++#include ++#endif ++ ++#if defined HAVE_WCHAR_H ++#include ++#endif + ++#if __GNUC__ > 3 ++#include ++#endif + + #include "gloox.h" + +diff --git a/src/dns.cpp b/src/dns.cpp +index fd72c57..e03d99a 100644 +--- a/src/dns.cpp ++++ b/src/dns.cpp +@@ -10,6 +10,17 @@ + This software is distributed without any warranty. + */ + ++#if defined HAVE_STRING_H ++#include ++#endif ++ ++#if defined HAVE_WCHAR_H ++#include ++#endif ++ ++#if __GNUC__ > 3 ++#include ++#endif + + #include "config.h" + From 29397b17f3b1e9dab31903923552cabdc93c7703 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 21 Dec 2013 18:37:04 +0100 Subject: [PATCH 097/206] Add recipe for minicom. --- net-dialup/minicom/minicom-2.6.2.recipe | 61 +++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 net-dialup/minicom/minicom-2.6.2.recipe diff --git a/net-dialup/minicom/minicom-2.6.2.recipe b/net-dialup/minicom/minicom-2.6.2.recipe new file mode 100644 index 000000000..432353088 --- /dev/null +++ b/net-dialup/minicom/minicom-2.6.2.recipe @@ -0,0 +1,61 @@ +SUMMARY="Minicom is a menu driven communications program." +DESCRIPTION=" +Minicom is a menu driven communications program. +It emulates ANSI and VT102 terminals. +It has a dialing directory and auto zmodem download. +" +HOMEPAGE="https://alioth.debian.org/projects/minicom/" +SRC_URI="https://alioth.debian.org/frs/download.php/file/3869/minicom-2.6.2.tar.gz" +CHECKSUM_MD5="203c56c4b447f45e2301b0cc4e83da3c" +COPYRIGHT=" + 1991,1992,1993,1994,1995,1996 Miquel van Smoorenburg." +LICENSE="GNU GPL v2" +REVISION="1" +ARCHITECTURES="x86 x86_64" +SECONDARY_ARCHITECTURES="x86" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi + +PROVIDES=" + minicom$secondaryArchSuffix = $portVersion + cmd:minicom$secondaryArchSuffix = $portVersion + cmd:xminicom$secondaryArchSuffix = $portVersion + cmd:ascii_xfr$secondaryArchSuffix = $portVersion + cmd:runscript$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libiconv$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + " + +BUILD_REQUIRES=" + devel:libiconv$secondaryArchSuffix + devel:libncurses$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + LOCKDIR=`finddir B_USER_SETTINGS_DIRECTORY`/serial + mkdir -p $LOCKDIR + CFLAGS="-DTIOCM_CAR=TIOCM_CD -lnetwork" runConfigure ./configure \ + --enable-lock-dir=$LOCKDIR + make $jobArgs +} + +INSTALL() +{ + make install +} From 0912e5c3271e88d035e3df1e6849eb7569ee9df9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 13:54:31 -0800 Subject: [PATCH 098/206] Disabled smpeg in sdl_mixer until proper fix is found --- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe index af302a881..0102b2323 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -25,7 +25,7 @@ REQUIRES=" lib:libvorbis$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libmikmod$secondaryArchSuffix - lib:libsmpeg$secondaryArchSuffix +# lib:libsmpeg$secondaryArchSuffix " BUILD_REQUIRES=" @@ -37,7 +37,7 @@ BUILD_REQUIRES=" devel:libvorbis$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libmikmod$secondaryArchSuffix - devel:libsmpeg$secondaryArchSuffix +# devel:libsmpeg$secondaryArchSuffix " BUILD_PREREQUIRES=" From f32286b373d123109560b012ebbea8e5c2c52e36 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 15:52:44 -0800 Subject: [PATCH 099/206] Fixed fribidi on x86 --- dev-libs/fribidi/fribidi-0.19.5.recipe | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dev-libs/fribidi/fribidi-0.19.5.recipe b/dev-libs/fribidi/fribidi-0.19.5.recipe index 2e66680e7..350489585 100644 --- a/dev-libs/fribidi/fribidi-0.19.5.recipe +++ b/dev-libs/fribidi/fribidi-0.19.5.recipe @@ -11,19 +11,23 @@ COPYRIGHT="2004 Sharif FarsiWeb, Inc 1999,2000 Dov Grobgeld" ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - fribidi = $portVersion - cmd:fribidi = 0.19.5 compat >= 0.19 - lib:libfribidi = 0.3.4 compat >= 0 + fribidi$secondaryArchSuffix = $portVersion + cmd:fribidi$secondaryArchSuffix = 0.19.5 compat >= 0.19 + lib:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0 " + REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion " + BUILD_REQUIRES=" - " -BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf cmd:automake @@ -32,13 +36,14 @@ BUILD_PREREQUIRES=" cmd:libtoolize cmd:make " + PATCH() { sed -i 's/PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION/#/' configure.ac sed -i 's/FRIBIDI_USE_GLIB=1/FRIBIDI_USE_GLIB=0/' configure.ac sed -i 's/FRIBIDI_USE_GLIB=0)/#/' configure.ac - } + BUILD() { libtoolize --force --copy --install @@ -70,10 +75,11 @@ TEST() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - fribidi_devel = $portVersion - devel:libfribidi = 0.3.4 compat >= 0 - devel:fribidi = 0.19.5 compat >= 0.19 + fribidi${secondaryArchSuffix}_devel = $portVersion + devel:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0 + devel:fribidi$secondaryArchSuffix = 0.19.5 compat >= 0.19 " + REQUIRES_devel=" - fribidi == $portVersion base + fribidi$secondaryArchSuffix == $portVersion base " From b7c8cd4620d97a3dea4b615ca096d21a9a6b3955 Mon Sep 17 00:00:00 2001 From: Mrowqa Date: Sun, 22 Dec 2013 01:01:18 +0100 Subject: [PATCH 100/206] Recipe for gloox: corrected some details. --- net-libs/gloox/gloox-1.0.9.recipe | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net-libs/gloox/gloox-1.0.9.recipe b/net-libs/gloox/gloox-1.0.9.recipe index 97a93298b..9b124a8e1 100644 --- a/net-libs/gloox/gloox-1.0.9.recipe +++ b/net-libs/gloox/gloox-1.0.9.recipe @@ -36,9 +36,6 @@ BUILD_REQUIRES=" devel:libcrypto$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - openssl$secondaryArchSuffix - openssl${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:make cmd:libtoolize @@ -77,7 +74,7 @@ TEST() PROVIDES_devel=" gloox${secondaryArchSuffix}_devel = $portVersion - devel:gloox$secondaryArchSuffix = $portVersion + devel:libgloox$secondaryArchSuffix = $portVersion " REQUIRES_devel=" gloox$secondaryArchSuffix == $portVersion base From 0929d0b5f41410bf9d9ca4558a45c5088b34e5c8 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sat, 21 Dec 2013 19:38:37 -0500 Subject: [PATCH 101/206] Add aalibtranslator recipe --- .../aalibtranslator-0.0.1.recipe | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe diff --git a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe new file mode 100644 index 000000000..d9d540f8a --- /dev/null +++ b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe @@ -0,0 +1,45 @@ +SUMMARY="Save image files as ASCII text art" +DESCRIPTION=" + The AalibTranslator for Haiku allows you to save image files as + ASCII text art. + " +HOMEPAGE="https://github.com/noryb009/AalibTranslator/" +SRC_URI="git://github.com/noryb009/AalibTranslator.git#e69df6765106af986454611fa2c960e0ecdb1562" +LICENSE="MIT" +COPYRIGHT="2013 Luke (noryb009)" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + aalibtranslator = $portVersion + app:aalibtranslator = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libaa + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libaa + " +BUILD_PREREQUIRES=" + cmd:gcc + makefile_engine + cmd:make + cmd:mkdepend + " + +BUILD() +{ + make \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` \ + TARGET_DIR=. +} + +INSTALL() +{ + mkdir -p $addOnsDir/Translators + cp AALIBTranslator $addOnsDir/Translators +} From fa7769ee34516b87faa9379b689dda96779d958f Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sat, 21 Dec 2013 19:58:10 -0500 Subject: [PATCH 102/206] Add OptiPNG recipe --- media-gfx/optipng/optipng-0.7.4.recipe | 54 +++++++++++++++++++ media-gfx/optipng/patches/optipng-0.7.4.patch | 25 +++++++++ 2 files changed, 79 insertions(+) create mode 100644 media-gfx/optipng/optipng-0.7.4.recipe create mode 100644 media-gfx/optipng/patches/optipng-0.7.4.patch diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe new file mode 100644 index 000000000..8f1d55968 --- /dev/null +++ b/media-gfx/optipng/optipng-0.7.4.recipe @@ -0,0 +1,54 @@ +SUMMARY="A PNG optimizer, making PNG files smaller" +DESCRIPTION=" + OptiPNG is a PNG optimizer, recompressing PNG files so they + become smaller, without losing any information. Additionally, + OptiPNG can convert other image formats, such as BMP, + GIF, PNM and TIFF, to PNG files. + " +HOMEPAGE="http://optipng.sourceforge.net/" +SRC_URI="http://prdownloads.sourceforge.net/optipng/optipng-0.7.4.tar.gz?download" +CHECKSUM_MD5="8853d89aaf859065e95dcdf98b6bed73" +LICENSE="Zlib" +COPYRIGHT="2001-2012 Cosmin Truta" +REVISION="1" +ARCHITECTURES="?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi + +PROVIDES=" + optipng$secondaryArchSuffix = $portVersion + cmd:optipng$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:ar + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:ranlib + " + +PATCHES=" + optipng-0.7.4.patch + " + +BUILD() +{ + ./configure -bindir=$binDir -mandir=$manDir + make +} + +INSTALL() +{ + make install +} diff --git a/media-gfx/optipng/patches/optipng-0.7.4.patch b/media-gfx/optipng/patches/optipng-0.7.4.patch new file mode 100644 index 000000000..8f27d354f --- /dev/null +++ b/media-gfx/optipng/patches/optipng-0.7.4.patch @@ -0,0 +1,25 @@ +From 8fc175d03be69e84940012866ffdfa0b7b6c865b Mon Sep 17 00:00:00 2001 +From: Luke +Date: Fri, 20 Dec 2013 17:11:40 +0000 +Subject: [PATCH] Remove reference to libm + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 5437b74..f7087fe 100755 +--- a/configure ++++ b/configure +@@ -305,7 +305,7 @@ sed_config=" + s#@ARFLAGS@#${ARFLAGS-cru}#g + s#@RANLIB@#${RANLIB-ranlib}#g + s#@LIBS@#${LIBS-}#g +- s#@LIBM@#${LIBM--lm}#g ++ s#@LIBM@#${LIBM-}#g + s#@LIBZ@#${LIBZ--lz}#g + s#@LIBPNG@#${LIBPNG--lpng}#g + s#@DIFF@#${DIFF-diff -b -u}#g +-- +1.8.3.4 + From 4ddaf46945e6e888a026bd7ae5f5318621a8709b Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 22 Dec 2013 03:43:18 -0800 Subject: [PATCH 103/206] Fixed smpeg on x86, at least it's symlinking to the right files now. --- media-libs/smpeg/smpeg-0.4.5.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 931784c7b..6509fb52a 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -60,7 +60,8 @@ INSTALL() { make install - prepareInstalledDevelLibs libsmpeg + prepareInstalledDevelLibs libsmpeg \ + libsmpeg-0.4 fixDevelopLibDirReferences $binDir/smpeg-config fixPkgconfig From 6293b2e658bbae371d3c53c015fb05185ff698f0 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 22 Dec 2013 03:47:31 -0800 Subject: [PATCH 104/206] WIP dix for sdl_mixer, but now back to undefined references trying to build playwave and platmus --- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe index 0102b2323..8d565361d 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -13,7 +13,9 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" sdl_mixer$secondaryArchSuffix = $portVersion compat >= 1.2 lib:libSDL_mixer$secondaryArchSuffix = 1.2_0.12.0 compat >= 1.2_0 - lib:libSDL_mixer_1.2$secondaryArchSuffix = 0.12.0 compat >= 0 + lib:libSDL_mixer_1.2$secondaryArchSuffix = 0.12.0 compat >= 0 + cmd:playwave$secondaryArchSuffix + cmd:playmus$secondaryArchSuffix " REQUIRES=" @@ -25,7 +27,7 @@ REQUIRES=" lib:libvorbis$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libmikmod$secondaryArchSuffix -# lib:libsmpeg$secondaryArchSuffix + lib:libsmpeg$secondaryArchSuffix " BUILD_REQUIRES=" @@ -37,7 +39,7 @@ BUILD_REQUIRES=" devel:libvorbis$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libmikmod$secondaryArchSuffix -# devel:libsmpeg$secondaryArchSuffix + devel:libsmpeg$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -62,8 +64,9 @@ BUILD() libtoolize --force --copy --install aclocal --force --install -I acinclude autoconf - runConfigure ./configure - make + runConfigure ./configure \ + SMPEG_CONFIG=smpeg_config$secondaryArchSuffix + make $jobArgs } INSTALL() From b5003e601695f1e1290cafb9795a65be7a531680 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 22 Dec 2013 16:00:19 +0000 Subject: [PATCH 105/206] Add BlogPositive v0.2.0 recipe --- .../blogpositive/blogpositive-0.1.0.recipe | 4 +- .../blogpositive/blogpositive-0.2.0.recipe | 52 +++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 haiku-apps/blogpositive/blogpositive-0.2.0.recipe diff --git a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe index e5a35c0d8..d923b261d 100644 --- a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe @@ -6,12 +6,12 @@ DESCRIPTION=" " HOMEPAGE="http://blogpositive.puckipedia.com" SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.1.0" -REVISION="1" +REVISION="2" LICENSE="MIT" COPYRIGHT="2013 :Puck Meerburg" -ARCHITECTURES="x86 x86_gcc2 ?x86_64" +ARCHITECTURES="x86 x86_gcc2 x86_64" PROVIDES=" blogpositive = $portVersion diff --git a/haiku-apps/blogpositive/blogpositive-0.2.0.recipe b/haiku-apps/blogpositive/blogpositive-0.2.0.recipe new file mode 100644 index 000000000..27407e6ca --- /dev/null +++ b/haiku-apps/blogpositive/blogpositive-0.2.0.recipe @@ -0,0 +1,52 @@ +SUMMARY="The one blog app to rule them all!" +DESCRIPTION=" + Want to blog, but WebPositive isn't quick enough? + Now you can use the new blog app: BlogPositive! + It can connect to Wordpress and LiveJournal blogs for now. + " +HOMEPAGE="http://blogpositive.puckipedia.com" +SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.2.0" +REVISION="1" + +LICENSE="MIT" +COPYRIGHT="2013 :Puck Meerburg" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +PROVIDES=" + blogpositive = $portVersion + app:blogpositive = $portVersion + " + +REQUIRES=" + lib:libcurl + lib:libz + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:g++ + cmd:xres + cmd:mkdepend + " +BUILD_REQUIRES=" + devel:libcurl + devel:libz + haiku_devel >= $haikuVersion + " + +USER_SETTINGS_FILES=" + settings/BlogPositive directory + " + +BUILD() +{ + make + make bindcatalogs +} + +INSTALL() +{ + make install INSTALL_DIR=$appsDir + addAppDeskbarSymlink $appsDir/BlogPositive +} From ae98463e1b73919892462e8cfa9090380018b356 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 22 Dec 2013 09:31:41 -0800 Subject: [PATCH 106/206] Remove old boost recipes and patches --- dev-libs/boost/boost-1.42.0.recipe | 26 -- dev-libs/boost/boost-1.50.0.recipe | 52 ---- dev-libs/boost/boost-1.53.0.recipe | 52 ---- dev-libs/boost/patches/boost-1.42.0.patch | 225 --------------- dev-libs/boost/patches/boost-1.50.0.patch | 337 ---------------------- dev-libs/boost/patches/boost-1.53.0.patch | 337 ---------------------- 6 files changed, 1029 deletions(-) delete mode 100644 dev-libs/boost/boost-1.42.0.recipe delete mode 100644 dev-libs/boost/boost-1.50.0.recipe delete mode 100644 dev-libs/boost/boost-1.53.0.recipe delete mode 100644 dev-libs/boost/patches/boost-1.42.0.patch delete mode 100644 dev-libs/boost/patches/boost-1.50.0.patch delete mode 100644 dev-libs/boost/patches/boost-1.53.0.patch diff --git a/dev-libs/boost/boost-1.42.0.recipe b/dev-libs/boost/boost-1.42.0.recipe deleted file mode 100644 index f7789a6c3..000000000 --- a/dev-libs/boost/boost-1.42.0.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="boost" -HOMEPAGE="http://www.boost.org/" -SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.42.0/boost_1_42_0.tar.bz2/download" -CHECKSUM_MD5="7bf3b4eb841b62ffb0ade2b82218ebe6" -REVISION="1" -STATUS_HAIKU="broken" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -DEPEND="" -BUILD() -{ - cd boost_1_42_0 - ./bootstrap.sh --prefix=`finddir B_COMMON_DIRECTORY` - ./bjam --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=/boot/common/lib \ - --includedir=/boot/common/include \ - variant=release \ - link=shared \ - threading=single \ - runtime-link=shared -} - -INSTALL() -{ - cd boost_1_42_0 - ./bjam install -} diff --git a/dev-libs/boost/boost-1.50.0.recipe b/dev-libs/boost/boost-1.50.0.recipe deleted file mode 100644 index 590e1969e..000000000 --- a/dev-libs/boost/boost-1.50.0.recipe +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION="boost" -HOMEPAGE="http://www.boost.org/" -SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.bz2/download" -CHECKSUM_MD5="52dd00be775e689f55a987baebccc462" -REVISION="1" -STATUS_HAIKU="stable" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -DEPEND="boehm-gc" -BUILD() -{ - cd boost_1_50_0 - ./bootstrap.sh \ - --without-icu \ - --prefix=`finddir B_COMMON_DIRECTORY` \ - --exec-prefix=`finddir B_COMMON_BIN_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_HEADERS_DIRECTORY` - ./bjam \ - -sICU_PATH=`finddir B_COMMON_DIRECTORY` \ - -sICONV_PATH=`finddir B_COMMON_DIRECTORY` \ - -d2 \ - --without-mpi \ - --prefix=`finddir B_COMMON_DIRECTORY` \ - --exec-prefix=`finddir B_COMMON_BIN_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_HEADERS_DIRECTORY` \ - --enable-threads=posix \ - --enable-thread-local-alloc \ - --enable-parallel-mark \ - inlining=on \ - linkflags=-L`finddir B_COMMON_LIB_DIRECTORY` \ - threading=multi \ - variant=release \ - link=shared \ - runtime-link=shared -} - -INSTALL() -{ - cd boost_1_50_0 - ./bjam install \ - -d2 \ - --prefix=${DESTDIR}/`finddir B_COMMON_DIRECTORY` \ - #--exec-prefix=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` \ - #--libdir=${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` \ - #--includedir=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \ - inlining=on \ - --without-mpi -} - -LICENSE="Boost v1.0" -COPYRIGHT="1998-2011 Beman Dawes, David Abrahams, Rene Rivera, et al." diff --git a/dev-libs/boost/boost-1.53.0.recipe b/dev-libs/boost/boost-1.53.0.recipe deleted file mode 100644 index 4b4a6adbe..000000000 --- a/dev-libs/boost/boost-1.53.0.recipe +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION="boost" -HOMEPAGE="http://www.boost.org/" -SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.53.0/boost_1_53_0.tar.bz2/download" -CHECKSUM_MD5="a00d22605d5dbcfb4c9936a9b35bc4c2" -REVISION="1" -STATUS_HAIKU="broken" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -DEPEND="boehm-gc" -BUILD() -{ - cd boost_1_53_0 - ./bootstrap.sh \ - --without-icu \ - --prefix=`finddir B_COMMON_DIRECTORY` \ - --exec-prefix=`finddir B_COMMON_BIN_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_HEADERS_DIRECTORY` - ./bjam \ - -sICU_PATH=`finddir B_COMMON_DIRECTORY` \ - -sICONV_PATH=`finddir B_COMMON_DIRECTORY` \ - -d2 \ - --without-mpi \ - --prefix=`finddir B_COMMON_DIRECTORY` \ - --exec-prefix=`finddir B_COMMON_BIN_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_HEADERS_DIRECTORY` \ - --enable-threads=posix \ - --enable-thread-local-alloc \ - --enable-parallel-mark \ - inlining=on \ - linkflags=-L`finddir B_COMMON_LIB_DIRECTORY` \ - threading=multi \ - variant=release \ - link=shared \ - runtime-link=shared -} - -INSTALL() -{ - cd boost_1_53_0 - ./bjam install \ - -d2 \ - --prefix=${DESTDIR}/`finddir B_COMMON_DIRECTORY` \ - #--exec-prefix=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` \ - #--libdir=${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` \ - #--includedir=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \ - inlining=on \ - --without-mpi -} - -LICENSE="Boost v1.0" -COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al." diff --git a/dev-libs/boost/patches/boost-1.42.0.patch b/dev-libs/boost/patches/boost-1.42.0.patch deleted file mode 100644 index 8066356b5..000000000 --- a/dev-libs/boost/patches/boost-1.42.0.patch +++ /dev/null @@ -1,225 +0,0 @@ -diff -Naur boost_1_42_0/boost/config/platform/haiku.hpp boost_1_42_0-haiku/boost/config/platform/haiku.hpp ---- boost_1_42_0/boost/config/platform/haiku.hpp 1970-01-01 00:00:00.000000000 +0000 -+++ boost_1_42_0-haiku/boost/config/platform/haiku.hpp 2010-04-23 02:22:35.100925440 +0000 -@@ -0,0 +1,27 @@ -+//  (C) Copyright John Maddock 2001. -+//  Use, modification and distribution are subject to the -+//  Boost Software License, Version 1.0. (See accompanying file -+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -+ -+//  See http://www.boost.org for most recent version. -+ -+//  Haiku specific config options: -+ -+#define BOOST_PLATFORM "Haiku" -+ -+#define BOOST_NO_INTRINSIC_WCHAR_T -+#define BOOST_HAS_UNISTD_H -+ -+#define BOOST_HAS_BETHREADS -+ -+#ifndef BOOST_DISABLE_THREADS -+# define BOOST_HAS_THREADS -+#endif -+ -+// -+// thread API's not auto detected: -+// -+#define BOOST_HAS_GETTIMEOFDAY -+ -+// boilerplate code: -+#include -diff -Naur boost_1_42_0/boost/config/select_platform_config.hpp boost_1_42_0-haiku/boost/config/select_platform_config.hpp ---- boost_1_42_0/boost/config/select_platform_config.hpp 2009-05-30 11:16:25.057409536 +0000 -+++ boost_1_42_0-haiku/boost/config/select_platform_config.hpp 2010-04-23 02:22:24.092798976 +0000 -@@ -41,6 +41,10 @@ - // win32: - # define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp" - -+#elif defined(__HAIKU__) -+// Haiku -+# define BOOST_PLATFORM_CONFIG "boost/config/platform/haiku.hpp"  -+ - #elif defined(__BEOS__) - // BeOS - # define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp" -diff -Naur boost_1_42_0/boost/config/stdlib/libstdcpp3.hpp boost_1_42_0-haiku/boost/config/stdlib/libstdcpp3.hpp ---- boost_1_42_0/boost/config/stdlib/libstdcpp3.hpp 2009-05-30 11:16:25.057671680 +0000 -+++ boost_1_42_0-haiku/boost/config/stdlib/libstdcpp3.hpp 2010-04-23 02:23:34.217841664 +0000 -@@ -31,7 +31,7 @@ - - #ifdef __GLIBCXX__ // gcc 3.4 and greater: - # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ -- || defined(_GLIBCXX__PTHREADS) -+ || defined(_GLIBCXX__PTHREADS) || defined(__HAIKU__) - // - // If the std lib has thread support turned on, then turn it on in Boost - // as well. We do this because some gcc-3.4 std lib headers define _REENTANT -diff -Naur boost_1_42_0/boost/thread/thread_time.hpp boost_1_42_0-haiku/boost/thread/thread_time.hpp ---- boost_1_42_0/boost/thread/thread_time.hpp 2008-06-18 13:01:08.030408704 +0000 -+++ boost_1_42_0-haiku/boost/thread/thread_time.hpp 2010-04-23 02:24:59.809500672 +0000 -@@ -17,6 +17,9 @@ - - inline system_time get_system_time() - { -+#ifndef BOOST_DATE_TIME_HAS_HIGH_PRECISION_CLOCK -+# error "High precision clock not supported on this platform" -+#endif - return boost::date_time::microsec_clock::universal_time(); - } - -diff -Naur boost_1_42_0/tools/build/v2/tools/builtin.jam boost_1_42_0-haiku/tools/build/v2/tools/builtin.jam ---- boost_1_42_0/tools/build/v2/tools/builtin.jam 2009-10-28 07:47:51.000786432 +0000 -+++ boost_1_42_0-haiku/tools/build/v2/tools/builtin.jam 2010-04-23 02:26:20.131596288 +0000 -@@ -39,7 +39,7 @@ - - - .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd -- openbsd osf qnx qnxnto sgi solaris unix unixware windows -+ openbsd osf qnx qnxnto sgi solaris unix unixware windows haiku - elf # Not actually an OS -- used for targeting bare metal where - # object format is ELF. This catches both -elf and -eabi gcc - # targets and well as other compilers targeting ELF. It is not -@@ -77,6 +77,7 @@ - case MACOSX : host-os = darwin ; - case KFREEBSD : host-os = freebsd ; - case LINUX : host-os = linux ; -+ case HAIKU : host-os = haiku ; - case SUNOS : - ECHO "SunOS is not a supported operating system." ; - ECHO "We believe last version of SunOS was released in 1992, " ; -diff -Naur boost_1_42_0/tools/build/v2/tools/gcc.jam boost_1_42_0-haiku/tools/build/v2/tools/gcc.jam ---- boost_1_42_0/tools/build/v2/tools/gcc.jam 2009-10-28 07:47:51.003145728 +0000 -+++ boost_1_42_0-haiku/tools/build/v2/tools/gcc.jam 2010-04-23 02:28:40.680001536 +0000 -@@ -858,7 +858,7 @@ - # Differs from 'link' above only by -shared. - actions link.dll bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) -+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -nostart -Wl,-shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } - - rule setup-threading ( targets * : sources * : properties * ) -@@ -889,6 +889,10 @@ - { - # BeOS has no threading options, so do not set anything here. - } -+ case haiku : -+ { -+ # pthread. -+ } - case *bsd : - { - option = -pthread ; -diff -Naur boost_1_42_0/tools/jam/src/Jambase boost_1_42_0-haiku/tools/jam/src/Jambase ---- boost_1_42_0/tools/jam/src/Jambase 2009-01-10 19:42:28.047185920 +0000 -+++ boost_1_42_0-haiku/tools/jam/src/Jambase 2010-04-23 02:31:10.925106176 +0000 -@@ -849,6 +849,18 @@ - NOARSCAN ?= true ; - STDHDRS ?= /boot/develop/headers/posix ; - } -+else if $(OS) = HAIKU -+{ -+ BINDIR ?= /boot/common/bin ; -+ CC ?= gcc ; -+ C++ ?= $(CC) ; -+ FORTRAN ?= "" ; -+ LIBDIR ?= /boot/common/lib ; -+ LINK ?= gcc ; -+ LINKLIBS ?= -lnetwork ; -+ NOARSCAN ?= true ; -+ STDHDRS ?= /boot/develop/headers/posix ; -+} - else if $(UNIX) - { - switch $(OS) -diff -Naur boost_1_42_0/tools/jam/src/boehm_gc/config.guess boost_1_42_0-haiku/tools/jam/src/boehm_gc/config.guess ---- boost_1_42_0/tools/jam/src/boehm_gc/config.guess 2007-08-11 05:53:37.019922944 +0000 -+++ boost_1_42_0-haiku/tools/jam/src/boehm_gc/config.guess 2010-04-23 02:33:06.863502336 +0000 -@@ -1199,6 +1199,9 @@ - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -diff -Naur boost_1_42_0/tools/jam/src/boehm_gc/include/private/gcconfig.h boost_1_42_0-haiku/tools/jam/src/boehm_gc/include/private/gcconfig.h ---- boost_1_42_0/tools/jam/src/boehm_gc/include/private/gcconfig.h 2007-08-11 05:53:37.032243712 +0000 -+++ boost_1_42_0-haiku/tools/jam/src/boehm_gc/include/private/gcconfig.h 2010-04-23 02:34:09.906231808 +0000 -@@ -215,6 +215,11 @@ - # define BEOS - # define mach_type_known - # endif -+# if defined(__HAIKU__) && defined(_X86_) -+# define I386 -+# define HAIKU -+# define mach_type_known -+# endif - # if defined(LINUX) && (defined(i386) || defined(__i386__)) - # define I386 - # define mach_type_known -@@ -1014,6 +1019,13 @@ - extern int etext[]; - # define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) - # endif -+# ifdef HAIKU -+# define OS_TYPE "HAIKU" -+# include -+# define GETPAGESIZE() B_PAGE_SIZE -+ extern int etext[]; -+# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) -+# endif - # ifdef SOLARIS - # define OS_TYPE "SOLARIS" - extern int _etext[], _end[]; -diff -Naur boost_1_42_0/tools/jam/src/fileunix.c boost_1_42_0-haiku/tools/jam/src/fileunix.c ---- boost_1_42_0/tools/jam/src/fileunix.c 2009-01-10 19:42:28.045613056 +0000 -+++ boost_1_42_0-haiku/tools/jam/src/fileunix.c 2010-04-23 02:34:44.754712576 +0000 -@@ -80,6 +80,7 @@ - - # if defined( OS_QNX ) || \ - defined( OS_BEOS ) || \ -+ defined( OS_HAIKU ) || \ - defined( OS_MPEIX ) - # define NO_AR - # define HAVE_AR -diff -Naur boost_1_42_0/tools/jam/src/jam.h boost_1_42_0-haiku/tools/jam/src/jam.h ---- boost_1_42_0/tools/jam/src/jam.h 2009-01-10 19:42:28.046923776 +0000 -+++ boost_1_42_0-haiku/tools/jam/src/jam.h 2010-04-23 02:35:27.411828224 +0000 -@@ -234,6 +234,11 @@ - #define OS_BEOS - #define NO_VFORK - #endif -+#ifdef __HAIKU__ -+ #define unix -+ #define OSMINOR "OS=HAIKU" -+ #define OS_HAIKU -+#endif - #ifdef __bsdi__ - #define OSMINOR "OS=BSDI" - #define OS_BSDI -diff -Naur boost_1_42_0/tools/jam/src/jambase.c boost_1_42_0-haiku/tools/jam/src/jambase.c ---- boost_1_42_0/tools/jam/src/jambase.c 2009-01-10 19:42:28.047448064 +0000 -+++ boost_1_42_0-haiku/tools/jam/src/jambase.c 2010-04-23 02:36:46.935329792 +0000 -@@ -554,6 +554,18 @@ - "NOARSCAN ?= true ;\n", - "STDHDRS ?= /boot/develop/headers/posix ;\n", - "}\n", -+"else if $(OS) = HAIKU\n", -+"{\n", -+"BINDIR ?= /boot/common/bin ;\n", -+"CC ?= gcc ;\n", -+"C++ ?= $(CC) ;\n", -+"FORTRAN ?= \"\" ;\n", -+"LIBDIR ?= /boot/common/lib ;\n", -+"LINK ?= gcc ;\n", -+"LINKLIBS ?= -lnetwork ;\n", -+"NOARSCAN ?= true ;\n", -+"STDHDRS ?= /boot/develop/headers/posix ;\n", -+"}\n", - "else if $(UNIX)\n", - "{\n", - "switch $(OS)\n", diff --git a/dev-libs/boost/patches/boost-1.50.0.patch b/dev-libs/boost/patches/boost-1.50.0.patch deleted file mode 100644 index 5a25a3870..000000000 --- a/dev-libs/boost/patches/boost-1.50.0.patch +++ /dev/null @@ -1,337 +0,0 @@ -diff -Naur boost_1_50_0/boost/config/platform/haiku.hpp boost_1_50_0-haiku/boost/config/platform/haiku.hpp ---- boost_1_50_0/boost/config/platform/haiku.hpp 1970-01-01 01:00:00.000000000 +0100 -+++ boost_1_50_0-haiku/boost/config/platform/haiku.hpp 2012-08-16 01:16:44.000000000 +0200 -@@ -0,0 +1,27 @@ -+//  (C) Copyright John Maddock 2001. -+//  Use, modification and distribution are subject to the -+//  Boost Software License, Version 1.0. (See accompanying file -+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -+ -+//  See http://www.boost.org for most recent version. -+ -+//  Haiku specific config options: -+ -+#define BOOST_PLATFORM "Haiku" -+ -+#define BOOST_NO_INTRINSIC_WCHAR_T -+#define BOOST_HAS_UNISTD_H -+ -+#define BOOST_HAS_BETHREADS -+ -+#ifndef BOOST_DISABLE_THREADS -+# define BOOST_HAS_THREADS -+#endif -+ -+// -+// thread API's not auto detected: -+// -+#define BOOST_HAS_GETTIMEOFDAY -+ -+// boilerplate code: -+#include -diff -Naur boost_1_50_0/boost/config/select_platform_config.hpp boost_1_50_0-haiku/boost/config/select_platform_config.hpp ---- boost_1_50_0/boost/config/select_platform_config.hpp 2011-10-10 13:50:55.047185920 +0200 -+++ boost_1_50_0-haiku/boost/config/select_platform_config.hpp 2012-08-16 13:32:04.000000000 +0200 -@@ -41,6 +41,10 @@ - // win32: - # define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp" - -+#elif defined(__HAIKU__) -+// Haiku -+# define BOOST_PLATFORM_CONFIG "boost/config/platform/haiku.hpp" -+ - #elif defined(__BEOS__) - // BeOS - # define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp" -diff -Naur boost_1_50_0/boost/config/stdlib/libstdcpp3.hpp boost_1_50_0-haiku/boost/config/stdlib/libstdcpp3.hpp ---- boost_1_50_0/boost/config/stdlib/libstdcpp3.hpp 2012-05-15 13:57:21.047972352 +0200 -+++ boost_1_50_0-haiku/boost/config/stdlib/libstdcpp3.hpp 2012-08-16 15:22:26.000000000 +0200 -@@ -35,7 +35,8 @@ - # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ - || defined(_GLIBCXX__PTHREADS) \ - || defined(_GLIBCXX_HAS_GTHREADS) \ -- || defined(_WIN32) -+ || defined(_WIN32) \ -+ || defined(__HAIKU__) - // - // If the std lib has thread support turned on, then turn it on in Boost - // as well. We do this because some gcc-3.4 std lib headers define _REENTANT -diff -Naur boost_1_50_0/boost/thread/detail/platform.hpp boost_1_50_0-haiku/boost/thread/detail/platform.hpp ---- boost_1_50_0/boost/thread/detail/platform.hpp 2012-05-22 19:03:15.043253760 +0200 -+++ boost_1_50_0-haiku/boost/thread/detail/platform.hpp 2012-08-16 23:24:30.135266304 +0200 -@@ -34,6 +34,8 @@ - # define BOOST_THREAD_WIN32 - #elif defined(__BEOS__) - # define BOOST_THREAD_BEOS -+#elif defined(__HAIKU__) -+# define BOOST_THREAD_BEOS - #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) - # define BOOST_THREAD_MACOS - # define BOOST_THREAD_WAIT_BUG boost::posix_time::microseconds(1000) -diff -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/dyn_load.c boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/dyn_load.c ---- boost_1_50_0/tools/build/v2/engine/boehm_gc/dyn_load.c 2011-06-06 22:36:21.020185088 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/dyn_load.c 2012-08-16 13:10:40.000000000 +0200 -@@ -64,7 +64,7 @@ - !defined(AIX) && !defined(SCO_ELF) && !defined(DGUX) && \ - !(defined(FREEBSD) && defined(__ELF__)) && \ - !(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \ -- !defined(DARWIN) && !defined(CYGWIN32) -+ !defined(DARWIN) && !defined(CYGWIN32) !(defined(HAIKU) - --> We only know how to find data segments of dynamic libraries for the - --> above. Additional SVR4 variants might not be too - --> hard to add. -@@ -82,6 +82,10 @@ - # define ELFSIZE ARCH_ELFSIZE - #endif - -+#if defined(HAIKU) -+ -+#endif -+ - #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \ - (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \ - (defined(NETBSD) && defined(__ELF__)) || defined(HURD) -@@ -216,7 +220,8 @@ - - #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \ - (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \ -- (defined(NETBSD) && defined(__ELF__)) || defined(HURD) -+ (defined(NETBSD) && defined(__ELF__)) || defined(HURD) || \ -+ defined(HAIKU) - - - #ifdef USE_PROC_FOR_LIBRARIES -diff -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h ---- boost_1_50_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h 2011-06-06 22:36:21.022282240 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h 2012-08-16 13:17:27.000000000 +0200 -@@ -45,7 +45,8 @@ - || defined(GC_AIX_THREADS) \ - || defined(GC_LINUX_THREADS) \ - || defined(GC_NETBSD_THREADS) \ -- || defined(GC_GNU_THREADS)) -+ || defined(GC_GNU_THREADS)) \ -+ || defined(GC_HAIKU_THREADS) - # define _REENTRANT - /* Better late than never. This fails if system headers that */ - /* depend on this were previously included. */ -@@ -62,6 +63,7 @@ - # if defined(GC_SOLARIS_THREADS) || defined(GC_FREEBSD_THREADS) || \ - defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) || \ - defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \ -+ defined(GC_HAIKU_THREADS) || \ - defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \ - defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \ - (defined(GC_WIN32_THREADS) && defined(__CYGWIN32__)) || \ -diff -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/include/gc.h boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/gc.h ---- boost_1_50_0/tools/build/v2/engine/boehm_gc/include/gc.h 2011-06-06 22:36:21.022020096 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/gc.h 2012-08-16 13:12:51.000000000 +0200 -@@ -494,7 +494,7 @@ - /* of compilers. */ - /* This may also be desirable if it is possible but expensive to */ - /* retrieve the call chain. */ --#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) \ -+#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) \ - || defined(__FreeBSD__) || defined(__DragonFly__)) & !defined(GC_CAN_SAVE_CALL_STACKS) - # define GC_ADD_CALLER - # if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -diff -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h ---- boost_1_50_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h 2011-06-06 22:36:21.024117248 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h 2012-08-16 13:49:16.000000000 +0200 -@@ -215,6 +215,11 @@ - # define BEOS - # define mach_type_known - # endif -+# if defined(__HAIKU__) && defined(_X86_) -+# define I386 -+# define HAIKU -+# define mach_type_known -+# endif - # if defined(LINUX) && (defined(i386) || defined(__i386__)) - # define I386 - # define mach_type_known -@@ -1014,6 +1019,13 @@ - extern int etext[]; - # define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) - # endif -+# ifdef HAIKU -+# define OS_TYPE "HAIKU" -+# include -+# define GETPAGESIZE() B_PAGE_SIZE -+ extern int etext[]; -+# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) -+# endif - # ifdef SOLARIS - # define OS_TYPE "SOLARIS" - extern int _etext[], _end[]; -diff -Naur boost_1_50_0/tools/build/v2/engine/boehm_gc/os_dep.c boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/os_dep.c ---- boost_1_50_0/tools/build/v2/engine/boehm_gc/os_dep.c 2011-06-06 22:36:21.030408704 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/boehm_gc/os_dep.c 2012-08-16 13:52:23.000000000 +0200 -@@ -777,6 +777,16 @@ - # endif /* BEOS */ - - -+# ifdef HAIKU -+# include -+ptr_t GC_get_main_stack_base(void){ -+ thread_info th; -+ get_thread_info(find_thread(NULL),&th); -+ return th.stack_end; -+} -+# endif /* HAIKU */ -+ -+ - # ifdef OS2 - - ptr_t GC_get_main_stack_base(void) -@@ -1095,7 +1105,7 @@ - - #endif /* FREEBSD_STACKBOTTOM */ - --#if !defined(BEOS) && !defined(AMIGA) && !defined(MSWIN32) \ -+#if !defined(BEOS) && !defined(HAIKU) && !defined(AMIGA) && !defined(MSWIN32) \ - && !defined(MSWINCE) && !defined(OS2) && !defined(NOSYS) && !defined(ECOS) \ - && !defined(CYGWIN32) - -@@ -1154,7 +1164,7 @@ - # endif /* STACKBOTTOM */ - } - --# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !NOSYS, !ECOS */ -+# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !HAIKU, !NOSYS, !ECOS */ - - #if defined(GC_LINUX_THREADS) && !defined(HAVE_GET_STACK_BASE) - -diff -Naur boost_1_50_0/tools/build/v2/engine/fileunix.c boost_1_50_0-haiku/tools/build/v2/engine/fileunix.c ---- boost_1_50_0/tools/build/v2/engine/fileunix.c 2012-04-26 05:35:55.037224448 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/fileunix.c 2012-08-16 13:54:03.000000000 +0200 -@@ -81,6 +81,7 @@ - - # if defined( OS_QNX ) || \ - defined( OS_BEOS ) || \ -+ defined( OS_HAIKU ) || \ - defined( OS_MPEIX ) - # define NO_AR - # define HAVE_AR -diff -Naur boost_1_50_0/tools/build/v2/engine/jam.h boost_1_50_0-haiku/tools/build/v2/engine/jam.h ---- boost_1_50_0/tools/build/v2/engine/jam.h 2012-06-06 06:00:21.039059456 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/jam.h 2012-08-16 13:57:51.000000000 +0200 -@@ -151,6 +151,11 @@ - #define OS_BEOS - #define NO_VFORK - #endif -+#ifdef __HAIKU__ -+ #define unix -+ #define OSMINOR "OS=HAIKU" -+ #define OS_HAIKU -+#endif - #ifdef __bsdi__ - #define OSMINOR "OS=BSDI" - #define OS_BSDI -diff -Naur boost_1_50_0/tools/build/v2/engine/jambase.c boost_1_50_0-haiku/tools/build/v2/engine/jambase.c ---- boost_1_50_0/tools/build/v2/engine/jambase.c 2011-06-06 22:36:21.039321600 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/engine/jambase.c 2012-08-16 14:03:05.000000000 +0200 -@@ -548,6 +548,18 @@ - "NOARSCAN ?= true ;\n", - "STDHDRS ?= /boot/develop/headers/posix ;\n", - "}\n", -+"else if $(OS) = HAIKU\n", -+"{\n", -+"BINDIR ?= /boot/common/bin ;\n", -+"CC ?= gcc ;\n", -+"C++ ?= $(CC) ;\n", -+"FORTRAN ?= \"\" ;\n", -+"LIBDIR ?= /boot/common/lib ;\n", -+"LINK ?= gcc ;\n", -+"LINKLIBS ?= -lnetwork ;\n", -+"NOARSCAN ?= true ;\n", -+"STDHDRS ?= /boot/develop/headers/posix ;\n", -+"}\n", - "else if $(OS) = BEOS\n", - "{\n", - "BINDIR ?= /boot/apps ;\n", -diff -Naur boost_1_50_0/tools/build/v2/tools/builtin.jam boost_1_50_0-haiku/tools/build/v2/tools/builtin.jam ---- boost_1_50_0/tools/build/v2/tools/builtin.jam 2011-06-06 22:36:21.022020096 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/tools/builtin.jam 2012-08-16 15:57:04.000000000 +0200 -@@ -40,7 +40,7 @@ - - - .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd -- openbsd osf qnx qnxnto sgi solaris unix unixware windows -+ openbsd osf qnx qnxnto sgi solaris unix unixware windows haiku - elf # Not actually an OS -- used for targeting bare metal where - # object format is ELF. This catches both -elf and -eabi gcc - # targets and well as other compilers targeting ELF. It is not -@@ -75,6 +75,7 @@ - case COHERENT : host-os = unix ; - case DRAGONFLYBSD : host-os = bsd ; - case IRIX : host-os = sgi ; -+ case HAIKU : host-os = haiku ; - case MACOSX : host-os = darwin ; - case KFREEBSD : host-os = freebsd ; - case LINUX : host-os = linux ; -diff -Naur boost_1_50_0/tools/build/v2/tools/builtin.py boost_1_50_0-haiku/tools/build/v2/tools/builtin.py ---- boost_1_50_0/tools/build/v2/tools/builtin.py 2012-04-26 05:35:55.022020096 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/tools/builtin.py 2012-08-16 15:59:13.000000000 +0200 -@@ -103,6 +103,7 @@ - elif host_os == 'MACOSX': host_os = 'darwin' - elif host_os == 'KFREEBSD': host_os = 'freebsd' - elif host_os == 'LINUX': host_os = 'linux' -+ elif host_os == 'HAIKU': host_os = 'haiku' - else: host_os = 'unix' - return host_os.lower() - -diff -Naur boost_1_50_0/tools/build/v2/tools/gcc.jam boost_1_50_0-haiku/tools/build/v2/tools/gcc.jam ---- boost_1_50_0/tools/build/v2/tools/gcc.jam 2012-04-26 05:35:55.025165824 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/tools/gcc.jam 2012-08-16 13:40:12.000000000 +0200 -@@ -1050,6 +1050,10 @@ - case beos : - { - # BeOS has no threading options, so do not set anything here. -+ } -+ case haiku : -+ { -+ option = ; - } - case *bsd : - { -@@ -1067,7 +1071,7 @@ - } - case * : - { -- option = -pthread ; -+ option = -pthreads ; - libs = rt ; - } - } -diff -Naur boost_1_50_0/tools/build/v2/tools/gcc.py boost_1_50_0-haiku/tools/build/v2/tools/gcc.py ---- boost_1_50_0/tools/build/v2/tools/gcc.py 2012-04-26 05:35:55.025165824 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/tools/gcc.py 2012-08-16 15:06:53.000000000 +0200 -@@ -675,6 +675,9 @@ - elif host_os_name == 'BeOS': - # BeOS has no threading options, don't set anything here. - pass -+ elif host_os_name == 'Haiku': -+ flags('gcc', 'OPTIONS', ['multi'], ['-lroot']) -+ # there is no -lrt on HAIKU - elif host_os_name.endswith('BSD'): - flags('gcc', 'OPTIONS', ['multi'], ['-pthread']) - # there is no -lrt on BSD -diff -Naur boost_1_50_0/tools/build/v2/tools/python.jam boost_1_50_0-haiku/tools/build/v2/tools/python.jam ---- boost_1_50_0/tools/build/v2/tools/python.jam 2012-04-26 05:35:55.029097984 +0200 -+++ boost_1_50_0-haiku/tools/build/v2/tools/python.jam 2012-08-16 15:52:51.000000000 +0200 -@@ -648,13 +648,14 @@ - case qnx* : return ; - case darwin : return ; - case windows : return ; -+ case haiku : return ; - - case hpux : return rt ; - case *bsd : return pthread gcc:util ; - - case aix : return pthread dl ; - -- case * : return pthread dl -+ case * : return ; pthread dl - gcc:util linux:util ; - } - } diff --git a/dev-libs/boost/patches/boost-1.53.0.patch b/dev-libs/boost/patches/boost-1.53.0.patch deleted file mode 100644 index 7210abc07..000000000 --- a/dev-libs/boost/patches/boost-1.53.0.patch +++ /dev/null @@ -1,337 +0,0 @@ -diff -urN boost_1_53_0/boost/config/platform/haiku.hpp boost_1_53_0-haiku/boost/config/platform/haiku.hpp ---- boost_1_53_0/boost/config/platform/haiku.hpp 1969-12-31 16:00:00.000000000 -0800 -+++ boost_1_53_0-haiku/boost/config/platform/haiku.hpp 2013-03-28 00:49:51.271056896 -0700 -@@ -0,0 +1,27 @@ -+//  (C) Copyright John Maddock 2001. -+//  Use, modification and distribution are subject to the -+//  Boost Software License, Version 1.0. (See accompanying file -+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -+ -+//  See http://www.boost.org for most recent version. -+ -+//  Haiku specific config options: -+ -+#define BOOST_PLATFORM "Haiku" -+ -+#define BOOST_NO_INTRINSIC_WCHAR_T -+#define BOOST_HAS_UNISTD_H -+ -+#define BOOST_HAS_BETHREADS -+ -+#ifndef BOOST_DISABLE_THREADS -+# define BOOST_HAS_THREADS -+#endif -+ -+// -+// thread API's not auto detected: -+// -+#define BOOST_HAS_GETTIMEOFDAY -+ -+// boilerplate code: -+#include -diff -urN boost_1_53_0/boost/config/select_platform_config.hpp boost_1_53_0-haiku/boost/config/select_platform_config.hpp ---- boost_1_53_0/boost/config/select_platform_config.hpp 2011-10-10 04:50:55.036175872 -0700 -+++ boost_1_53_0-haiku/boost/config/select_platform_config.hpp 2013-03-28 00:40:07.746586112 -0700 -@@ -41,6 +41,10 @@ - // win32: - # define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp" - -+#elif defined(__HAIKU__) -+// Haiku -+# define BOOST_PLATFORM_CONFIG "boost/config/platform/haiku.hpp" -+ - #elif defined(__BEOS__) - // BeOS - # define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp" -diff -urN boost_1_53_0/boost/config/stdlib/libstdcpp3.hpp boost_1_53_0-haiku/boost/config/stdlib/libstdcpp3.hpp ---- boost_1_53_0/boost/config/stdlib/libstdcpp3.hpp 2012-07-15 08:59:05.036700160 -0700 -+++ boost_1_53_0-haiku/boost/config/stdlib/libstdcpp3.hpp 2013-03-28 00:40:17.162267136 -0700 -@@ -35,7 +35,8 @@ - # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ - || defined(_GLIBCXX__PTHREADS) \ - || defined(_GLIBCXX_HAS_GTHREADS) \ -- || defined(_WIN32) -+ || defined(_WIN32) \ -+ || defined(__HAIKU__) - // - // If the std lib has thread support turned on, then turn it on in Boost - // as well. We do this because some gcc-3.4 std lib headers define _REENTANT -diff -urN boost_1_53_0/boost/thread/detail/platform.hpp boost_1_53_0-haiku/boost/thread/detail/platform.hpp ---- boost_1_53_0/boost/thread/detail/platform.hpp 2012-07-08 22:55:01.064225280 -0700 -+++ boost_1_53_0-haiku/boost/thread/detail/platform.hpp 2013-03-28 00:40:28.586153984 -0700 -@@ -34,6 +34,8 @@ - # define BOOST_THREAD_WIN32 - #elif defined(__BEOS__) - # define BOOST_THREAD_BEOS -+#elif defined(__HAIKU__) -+# define BOOST_THREAD_BEOS - #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) - # define BOOST_THREAD_MACOS - //# define BOOST_THREAD_WAIT_BUG boost::posix_time::microseconds(1000) -diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/dyn_load.c boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/dyn_load.c ---- boost_1_53_0/tools/build/v2/engine/boehm_gc/dyn_load.c 2011-06-06 13:36:21.029360128 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/dyn_load.c 2013-03-28 00:40:38.863240192 -0700 -@@ -64,7 +64,7 @@ - !defined(AIX) && !defined(SCO_ELF) && !defined(DGUX) && \ - !(defined(FREEBSD) && defined(__ELF__)) && \ - !(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \ -- !defined(DARWIN) && !defined(CYGWIN32) -+ !defined(DARWIN) && !defined(CYGWIN32) !(defined(HAIKU) - --> We only know how to find data segments of dynamic libraries for the - --> above. Additional SVR4 variants might not be too - --> hard to add. -@@ -82,6 +82,10 @@ - # define ELFSIZE ARCH_ELFSIZE - #endif - -+#if defined(HAIKU) -+ -+#endif -+ - #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \ - (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \ - (defined(NETBSD) && defined(__ELF__)) || defined(HURD) -@@ -216,7 +220,8 @@ - - #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \ - (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \ -- (defined(NETBSD) && defined(__ELF__)) || defined(HURD) -+ (defined(NETBSD) && defined(__ELF__)) || defined(HURD) || \ -+ defined(HAIKU) - - - #ifdef USE_PROC_FOR_LIBRARIES -diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h ---- boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h 2011-06-06 13:36:21.031719424 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h 2013-03-28 00:40:49.546045952 -0700 -@@ -45,7 +45,8 @@ - || defined(GC_AIX_THREADS) \ - || defined(GC_LINUX_THREADS) \ - || defined(GC_NETBSD_THREADS) \ -- || defined(GC_GNU_THREADS)) -+ || defined(GC_GNU_THREADS)) \ -+ || defined(GC_HAIKU_THREADS) - # define _REENTRANT - /* Better late than never. This fails if system headers that */ - /* depend on this were previously included. */ -@@ -62,6 +63,7 @@ - # if defined(GC_SOLARIS_THREADS) || defined(GC_FREEBSD_THREADS) || \ - defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) || \ - defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \ -+ defined(GC_HAIKU_THREADS) || \ - defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \ - defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \ - (defined(GC_WIN32_THREADS) && defined(__CYGWIN32__)) || \ -diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc.h boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/gc.h ---- boost_1_53_0/tools/build/v2/engine/boehm_gc/include/gc.h 2011-06-06 13:36:21.031195136 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/gc.h 2013-03-28 00:40:57.427556864 -0700 -@@ -494,7 +494,7 @@ - /* of compilers. */ - /* This may also be desirable if it is possible but expensive to */ - /* retrieve the call chain. */ --#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) \ -+#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) \ - || defined(__FreeBSD__) || defined(__DragonFly__)) & !defined(GC_CAN_SAVE_CALL_STACKS) - # define GC_ADD_CALLER - # if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h ---- boost_1_53_0/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h 2011-06-06 13:36:21.034078720 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h 2013-03-28 00:41:08.074448896 -0700 -@@ -215,6 +215,11 @@ - # define BEOS - # define mach_type_known - # endif -+# if defined(__HAIKU__) && defined(_X86_) -+# define I386 -+# define HAIKU -+# define mach_type_known -+# endif - # if defined(LINUX) && (defined(i386) || defined(__i386__)) - # define I386 - # define mach_type_known -@@ -1014,6 +1019,13 @@ - extern int etext[]; - # define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) - # endif -+# ifdef HAIKU -+# define OS_TYPE "HAIKU" -+# include -+# define GETPAGESIZE() B_PAGE_SIZE -+ extern int etext[]; -+# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) -+# endif - # ifdef SOLARIS - # define OS_TYPE "SOLARIS" - extern int _etext[], _end[]; -diff -urN boost_1_53_0/tools/build/v2/engine/boehm_gc/os_dep.c boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/os_dep.c ---- boost_1_53_0/tools/build/v2/engine/boehm_gc/os_dep.c 2011-06-06 13:36:21.039583744 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/boehm_gc/os_dep.c 2013-03-28 00:41:17.561774592 -0700 -@@ -777,6 +777,16 @@ - # endif /* BEOS */ - - -+# ifdef HAIKU -+# include -+ptr_t GC_get_main_stack_base(void){ -+ thread_info th; -+ get_thread_info(find_thread(NULL),&th); -+ return th.stack_end; -+} -+# endif /* HAIKU */ -+ -+ - # ifdef OS2 - - ptr_t GC_get_main_stack_base(void) -@@ -1095,7 +1105,7 @@ - - #endif /* FREEBSD_STACKBOTTOM */ - --#if !defined(BEOS) && !defined(AMIGA) && !defined(MSWIN32) \ -+#if !defined(BEOS) && !defined(HAIKU) && !defined(AMIGA) && !defined(MSWIN32) \ - && !defined(MSWINCE) && !defined(OS2) && !defined(NOSYS) && !defined(ECOS) \ - && !defined(CYGWIN32) - -@@ -1154,7 +1164,7 @@ - # endif /* STACKBOTTOM */ - } - --# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !NOSYS, !ECOS */ -+# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !HAIKU, !NOSYS, !ECOS */ - - #if defined(GC_LINUX_THREADS) && !defined(HAVE_GET_STACK_BASE) - -diff -urN boost_1_53_0/tools/build/v2/engine/fileunix.c boost_1_53_0-haiku/tools/build/v2/engine/fileunix.c ---- boost_1_53_0/tools/build/v2/engine/fileunix.c 2012-04-25 20:35:55.046399488 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/fileunix.c 2013-03-28 00:41:26.497549312 -0700 -@@ -81,6 +81,7 @@ - - # if defined( OS_QNX ) || \ - defined( OS_BEOS ) || \ -+ defined( OS_HAIKU ) || \ - defined( OS_MPEIX ) - # define NO_AR - # define HAVE_AR -diff -urN boost_1_53_0/tools/build/v2/engine/jam.h boost_1_53_0-haiku/tools/build/v2/engine/jam.h ---- boost_1_53_0/tools/build/v2/engine/jam.h 2012-06-05 21:00:21.048234496 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/jam.h 2013-03-28 00:41:36.127139840 -0700 -@@ -151,6 +151,11 @@ - #define OS_BEOS - #define NO_VFORK - #endif -+#ifdef __HAIKU__ -+ #define unix -+ #define OSMINOR "OS=HAIKU" -+ #define OS_HAIKU -+#endif - #ifdef __bsdi__ - #define OSMINOR "OS=BSDI" - #define OS_BSDI -diff -urN boost_1_53_0/tools/build/v2/engine/jambase.c boost_1_53_0-haiku/tools/build/v2/engine/jambase.c ---- boost_1_53_0/tools/build/v2/engine/jambase.c 2011-06-06 13:36:21.048496640 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/engine/jambase.c 2013-03-28 00:41:44.670040064 -0700 -@@ -548,6 +548,18 @@ - "NOARSCAN ?= true ;\n", - "STDHDRS ?= /boot/develop/headers/posix ;\n", - "}\n", -+"else if $(OS) = HAIKU\n", -+"{\n", -+"BINDIR ?= /boot/common/bin ;\n", -+"CC ?= gcc ;\n", -+"C++ ?= $(CC) ;\n", -+"FORTRAN ?= \"\" ;\n", -+"LIBDIR ?= /boot/common/lib ;\n", -+"LINK ?= gcc ;\n", -+"LINKLIBS ?= -lnetwork ;\n", -+"NOARSCAN ?= true ;\n", -+"STDHDRS ?= /boot/develop/headers/posix ;\n", -+"}\n", - "else if $(OS) = BEOS\n", - "{\n", - "BINDIR ?= /boot/apps ;\n", -diff -urN boost_1_53_0/tools/build/v2/tools/builtin.jam boost_1_53_0-haiku/tools/build/v2/tools/builtin.jam ---- boost_1_53_0/tools/build/v2/tools/builtin.jam 2011-06-06 13:36:21.033816576 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/tools/builtin.jam 2013-03-28 00:41:54.663748608 -0700 -@@ -40,7 +40,7 @@ - - - .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd -- openbsd osf qnx qnxnto sgi solaris unix unixware windows -+ openbsd osf qnx qnxnto sgi solaris unix unixware windows haiku - elf # Not actually an OS -- used for targeting bare metal where - # object format is ELF. This catches both -elf and -eabi gcc - # targets and well as other compilers targeting ELF. It is not -@@ -75,6 +75,7 @@ - case COHERENT : host-os = unix ; - case DRAGONFLYBSD : host-os = bsd ; - case IRIX : host-os = sgi ; -+ case HAIKU : host-os = haiku ; - case MACOSX : host-os = darwin ; - case KFREEBSD : host-os = freebsd ; - case LINUX : host-os = linux ; -diff -urN boost_1_53_0/tools/build/v2/tools/builtin.py boost_1_53_0-haiku/tools/build/v2/tools/builtin.py ---- boost_1_53_0/tools/build/v2/tools/builtin.py 2012-04-25 20:35:55.034078720 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/tools/builtin.py 2013-03-28 00:42:04.759693312 -0700 -@@ -103,6 +103,7 @@ - elif host_os == 'MACOSX': host_os = 'darwin' - elif host_os == 'KFREEBSD': host_os = 'freebsd' - elif host_os == 'LINUX': host_os = 'linux' -+ elif host_os == 'HAIKU': host_os = 'haiku' - else: host_os = 'unix' - return host_os.lower() - -diff -urN boost_1_53_0/tools/build/v2/tools/gcc.jam boost_1_53_0-haiku/tools/build/v2/tools/gcc.jam ---- boost_1_53_0/tools/build/v2/tools/gcc.jam 2012-04-25 20:35:55.037224448 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/tools/gcc.jam 2013-03-28 00:42:15.700710912 -0700 -@@ -1050,6 +1050,10 @@ - case beos : - { - # BeOS has no threading options, so do not set anything here. -+ } -+ case haiku : -+ { -+ option = ; - } - case *bsd : - { -@@ -1067,7 +1071,7 @@ - } - case * : - { -- option = -pthread ; -+ option = -pthreads ; - libs = rt ; - } - } -diff -urN boost_1_53_0/tools/build/v2/tools/gcc.py boost_1_53_0-haiku/tools/build/v2/tools/gcc.py ---- boost_1_53_0/tools/build/v2/tools/gcc.py 2012-04-25 20:35:55.037224448 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/tools/gcc.py 2013-03-28 00:42:26.814219264 -0700 -@@ -675,6 +675,9 @@ - elif host_os_name == 'BeOS': - # BeOS has no threading options, don't set anything here. - pass -+ elif host_os_name == 'Haiku': -+ flags('gcc', 'OPTIONS', ['multi'], ['-lroot']) -+ # there is no -lrt on HAIKU - elif host_os_name.endswith('BSD'): - flags('gcc', 'OPTIONS', ['multi'], ['-pthread']) - # there is no -lrt on BSD -diff -urN boost_1_53_0/tools/build/v2/tools/python.jam boost_1_53_0-haiku/tools/build/v2/tools/python.jam ---- boost_1_53_0/tools/build/v2/tools/python.jam 2012-04-25 20:35:55.041156608 -0700 -+++ boost_1_53_0-haiku/tools/build/v2/tools/python.jam 2013-03-28 00:42:37.560463872 -0700 -@@ -648,13 +648,14 @@ - case qnx* : return ; - case darwin : return ; - case windows : return ; -+ case haiku : return ; - - case hpux : return rt ; - case *bsd : return pthread gcc:util ; - - case aix : return pthread dl ; - -- case * : return pthread dl -+ case * : return ; pthread dl - gcc:util linux:util ; - } - } From 3b8353d558899facf84fcec7f7e912f6a3b0d8bd Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Sun, 22 Dec 2013 16:08:38 -0500 Subject: [PATCH 107/206] sdl_mixer: Fix inverted summary and description. --- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe index 8d565361d..c6fa95bdb 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -1,11 +1,11 @@ -SUMMARY="sdl_mixer is a simple multi-channel audio mixer library. It supports any number of simultaneously playing channels of 16 bit stereo audio, plus a single channel of music, mixed by the popular FLAC, MikMoD MOD, Timidity MIDI, Ogg Vorbis, and SMPEG MP3 libraries." -DESCRIPTION="Simple Direct Layer Mixer Library" +SUMMARY="Simple Direct Layer Mixer Library" +DESCRIPTION="sdl_mixer is a simple multi-channel audio mixer library. It supports any number of simultaneously playing channels of 16 bit stereo audio, plus a single channel of music, mixed by the popular FLAC, MikMoD MOD, Timidity MIDI, Ogg Vorbis, and SMPEG MP3 libraries." HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz" CHECKSUM_MD5="e03ff73d77a55e3572ad0217131dc4a1" LICENSE="Zlib" COPYRIGHT="1997-2012 Sam Lantinga" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" From b21e942c2652e720f35d0145f2a586b119027ef9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 22 Dec 2013 14:16:50 -0800 Subject: [PATCH 108/206] Fixed formatting of boost recipe and merged patches into one patchset --- dev-libs/boost/boost-1.55.0.recipe | 172 +++++--- dev-libs/boost/patches/boost-1.55.0.patchset | 403 +++++++++++++++++++ 2 files changed, 511 insertions(+), 64 deletions(-) create mode 100644 dev-libs/boost/patches/boost-1.55.0.patchset diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index b1a2daff6..a7c54ba93 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -7,7 +7,7 @@ DESCRIPTION=" " SUMMARY="Boost is a set of libraries for the C++ programming language." HOMEPAGE="http://www.boost.org/" -SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download" +SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2" CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354" REVISION="1" LICENSE="Boost v1.0" @@ -17,20 +17,31 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" fi SECONDARY_ARCHITECTURES="x86 ?x86_64" + SOURCE_DIR="boost_1_55_0" -PATCHES=" - boost-1.55.0.patch - type_traits.patch -" + +PATCHES="boost-1.55.0.patchset" PROVIDES=" lib:boost = 1.55.0 " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libiconv$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libiconv$secondaryArchSuffix + devel:libbz2$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " + BUILD_PREREQUIRES=" boehm_gc - libiconv - libiconv_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:jam @@ -38,18 +49,6 @@ BUILD_PREREQUIRES=" cmd:make binutils " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - devel:libiconv - devel:libbz2 - devel:libz - " - -REQUIRES=" - lib:libiconv - lib:libbz2 - lib:libz - " BUILD() { @@ -117,154 +116,199 @@ INSTALL() PROVIDES_devel=" boost_devel$secondaryArchSuffix = $portVersion " + REQUIRES_devel=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_atomic=" boost_atomic$secondaryArchSuffix = $portVersion -" + " + REQUIRES_atomic=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion -" + " + REQUIRES_chrono=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion -" + " + PROVIDES_context=" boost_context$secondaryArchSuffix = $portVersion -" + " + REQUIRES_context=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_coroutine=" boost_coroutine$secondaryArchSuffix = $portVersion -" + " + REQUIRES_coroutine=" boost_context$secondaryArchSuffix == $portVersion -" + " + PROVIDES_date_time=" boost_date_time$secondaryArchSuffix = $portVersion -" + " + REQUIRES_date_time=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_exception=" boost_exception$secondaryArchSuffix = $portVersion -" + " + REQUIRES_exception=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_filesystem=" boost_filesystem$secondaryArchSuffix = $portVersion -" + " + REQUIRES_filesystem=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion lib:libz$secondaryArchSuffix lib:libbz2$secondaryArchSuffix -" + " + PROVIDES_graph=" boost_graph$secondaryArchSuffix = $portVersion -" + " + REQUIRES_graph=" haiku$secondaryArchSuffix >= $haikuVersion boost_regex$secondaryArchSuffix == $portVersion -" + " + PROVIDES_iostreams=" boost_iostreams$secondaryArchSuffix = $portVersion -" + " + REQUIRES_iostreams=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_locale=" boost_locale$secondaryArchSuffix = $portVersion -" + " + REQUIRES_locale=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion boost_thread$secondaryArchSuffix == $portVersion -" + " + PROVIDES_log=" boost_log$secondaryArchSuffix = $portVersion -" + " + REQUIRES_log=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion boost_date_time$secondaryArchSuffix == $portVersion boost_thread$secondaryArchSuffix == $portVersion -" + " + PROVIDES_math=" boost_math$secondaryArchSuffix = $portVersion -" + " + REQUIRES_math=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_program_options=" boost_program_options$secondaryArchSuffix = $portVersion -" + " + REQUIRES_program_options=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_random=" boost_random$secondaryArchSuffix = $portVersion -" + " + REQUIRES_random=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_regex=" boost_regex$secondaryArchSuffix = $portVersion -" + " + REQUIRES_regex=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_serialization=" boost_serialization$secondaryArchSuffix = $portVersion -" + " + REQUIRES_serialization=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_signals=" boost_signals$secondaryArchSuffix = $portVersion -" + " + REQUIRES_signals=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_system=" boost_system$secondaryArchSuffix = $portVersion -" + " + REQUIRES_system=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_test=" boost_test$secondaryArchSuffix = $portVersion -" + " + REQUIRES_test=" haiku$secondaryArchSuffix >= $haikuVersion -" + " + PROVIDES_thread=" boost_thread$secondaryArchSuffix = $portVersion -" + " + REQUIRES_thread=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion boost_chrono$secondaryArchSuffix == $portVersion -" + " + PROVIDES_timer=" boost_timer$secondaryArchSuffix = $portVersion -" + " + REQUIRES_timer=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion -" + " + PROVIDES_wave=" boost_wave$secondaryArchSuffix = $portVersion -" + " + REQUIRES_wave=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion @@ -272,4 +316,4 @@ REQUIRES_wave=" boost_filesystem$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion boost_thread$secondaryArchSuffix == $portVersion -" + " diff --git a/dev-libs/boost/patches/boost-1.55.0.patchset b/dev-libs/boost/patches/boost-1.55.0.patchset new file mode 100644 index 000000000..899f987a2 --- /dev/null +++ b/dev-libs/boost/patches/boost-1.55.0.patchset @@ -0,0 +1,403 @@ +From f194ab93c5c29020d5f0f4915b1f554645986587 Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Sun, 22 Dec 2013 10:01:12 -0800 +Subject: applying patch boost-1.55.0.patch + + +diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp +new file mode 100644 +index 0000000..1b15c7e +--- /dev/null ++++ b/boost/config/platform/haiku.hpp +@@ -0,0 +1,27 @@ ++//  (C) Copyright John Maddock 2001. ++//  Use, modification and distribution are subject to the ++//  Boost Software License, Version 1.0. (See accompanying file ++//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ++ ++//  See http://www.boost.org for most recent version. ++ ++//  Haiku specific config options: ++ ++#define BOOST_PLATFORM "Haiku" ++ ++#define BOOST_NO_INTRINSIC_WCHAR_T ++#define BOOST_HAS_UNISTD_H ++ ++#define BOOST_HAS_BETHREADS ++ ++#ifndef BOOST_DISABLE_THREADS ++# define BOOST_HAS_THREADS ++#endif ++ ++// ++// thread API's not auto detected: ++// ++#define BOOST_HAS_GETTIMEOFDAY ++ ++// boilerplate code: ++#include +diff --git a/boost/config/select_platform_config.hpp b/boost/config/select_platform_config.hpp +index 2af61d2..5052d85 100644 +--- a/boost/config/select_platform_config.hpp ++++ b/boost/config/select_platform_config.hpp +@@ -41,6 +41,10 @@ + // win32: + # define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp" + ++#elif defined(__HAIKU__) ++// Haiku ++# define BOOST_PLATFORM_CONFIG "boost/config/platform/haiku.hpp" ++ + #elif defined(__BEOS__) + // BeOS + # define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp" +diff --git a/boost/config/stdlib/libstdcpp3.hpp b/boost/config/stdlib/libstdcpp3.hpp +index 976ab76..66bc96d 100644 +--- a/boost/config/stdlib/libstdcpp3.hpp ++++ b/boost/config/stdlib/libstdcpp3.hpp +@@ -36,7 +36,8 @@ + || defined(_GLIBCXX__PTHREADS) \ + || defined(_GLIBCXX_HAS_GTHREADS) \ + || defined(_WIN32) \ +- || defined(_AIX) ++ || defined(_AIX) \ ++ || defined(__HAIKU__) + // + // If the std lib has thread support turned on, then turn it on in Boost + // as well. We do this because some gcc-3.4 std lib headers define _REENTANT +diff --git a/boost/thread/detail/platform.hpp b/boost/thread/detail/platform.hpp +index 1f33b1a..1b8917c 100644 +--- a/boost/thread/detail/platform.hpp ++++ b/boost/thread/detail/platform.hpp +@@ -34,6 +34,8 @@ + # define BOOST_THREAD_WIN32 + #elif defined(__BEOS__) + # define BOOST_THREAD_BEOS ++#elif defined(__HAIKU__) ++# define BOOST_THREAD_BEOS + #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) + # define BOOST_THREAD_MACOS + //# define BOOST_THREAD_WAIT_BUG boost::posix_time::microseconds(1000) +diff --git a/tools/build/v2/engine/boehm_gc/dyn_load.c b/tools/build/v2/engine/boehm_gc/dyn_load.c +index 36968ba..e725bdc 100644 +--- a/tools/build/v2/engine/boehm_gc/dyn_load.c ++++ b/tools/build/v2/engine/boehm_gc/dyn_load.c +@@ -64,7 +64,7 @@ static int (*GC_has_static_roots)(const char *, void *, size_t); + !defined(AIX) && !defined(SCO_ELF) && !defined(DGUX) && \ + !(defined(FREEBSD) && defined(__ELF__)) && \ + !(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \ +- !defined(DARWIN) && !defined(CYGWIN32) ++ !defined(DARWIN) && !defined(CYGWIN32) !(defined(HAIKU) + --> We only know how to find data segments of dynamic libraries for the + --> above. Additional SVR4 variants might not be too + --> hard to add. +@@ -82,6 +82,10 @@ static int (*GC_has_static_roots)(const char *, void *, size_t); + # define ELFSIZE ARCH_ELFSIZE + #endif + ++#if defined(HAIKU) ++ ++#endif ++ + #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \ + (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \ + (defined(NETBSD) && defined(__ELF__)) || defined(HURD) +@@ -216,7 +220,8 @@ void GC_register_dynamic_libraries() + + #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \ + (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \ +- (defined(NETBSD) && defined(__ELF__)) || defined(HURD) ++ (defined(NETBSD) && defined(__ELF__)) || defined(HURD) || \ ++ defined(HAIKU) + + + #ifdef USE_PROC_FOR_LIBRARIES +diff --git a/tools/build/v2/engine/boehm_gc/include/gc.h b/tools/build/v2/engine/boehm_gc/include/gc.h +index cc95088..590a868 100644 +--- a/tools/build/v2/engine/boehm_gc/include/gc.h ++++ b/tools/build/v2/engine/boehm_gc/include/gc.h +@@ -494,7 +494,7 @@ GC_API void * GC_malloc_atomic_ignore_off_page(size_t lb); + /* of compilers. */ + /* This may also be desirable if it is possible but expensive to */ + /* retrieve the call chain. */ +-#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) \ ++#if (defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__HAIKU__) \ + || defined(__FreeBSD__) || defined(__DragonFly__)) & !defined(GC_CAN_SAVE_CALL_STACKS) + # define GC_ADD_CALLER + # if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +diff --git a/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h b/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h +index 66abf0b..797eddd 100644 +--- a/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h ++++ b/tools/build/v2/engine/boehm_gc/include/gc_config_macros.h +@@ -45,7 +45,8 @@ + || defined(GC_AIX_THREADS) \ + || defined(GC_LINUX_THREADS) \ + || defined(GC_NETBSD_THREADS) \ +- || defined(GC_GNU_THREADS)) ++ || defined(GC_GNU_THREADS)) \ ++ || defined(GC_HAIKU_THREADS) + # define _REENTRANT + /* Better late than never. This fails if system headers that */ + /* depend on this were previously included. */ +@@ -62,6 +63,7 @@ + # if defined(GC_SOLARIS_THREADS) || defined(GC_FREEBSD_THREADS) || \ + defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) || \ + defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \ ++ defined(GC_HAIKU_THREADS) || \ + defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \ + defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \ + (defined(GC_WIN32_THREADS) && defined(__CYGWIN32__)) || \ +diff --git a/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h b/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h +index 20f35bc..7e798a7 100644 +--- a/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h ++++ b/tools/build/v2/engine/boehm_gc/include/private/gcconfig.h +@@ -215,6 +215,11 @@ + # define BEOS + # define mach_type_known + # endif ++# if defined(__HAIKU__) && defined(_X86_) ++# define I386 ++# define HAIKU ++# define mach_type_known ++# endif + # if defined(LINUX) && (defined(i386) || defined(__i386__)) + # define I386 + # define mach_type_known +@@ -1014,6 +1019,13 @@ + extern int etext[]; + # define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) + # endif ++# ifdef HAIKU ++# define OS_TYPE "HAIKU" ++# include ++# define GETPAGESIZE() B_PAGE_SIZE ++ extern int etext[]; ++# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff)) ++# endif + # ifdef SOLARIS + # define OS_TYPE "SOLARIS" + extern int _etext[], _end[]; +diff --git a/tools/build/v2/engine/boehm_gc/os_dep.c b/tools/build/v2/engine/boehm_gc/os_dep.c +index bb8fa08..a7edf72 100644 +--- a/tools/build/v2/engine/boehm_gc/os_dep.c ++++ b/tools/build/v2/engine/boehm_gc/os_dep.c +@@ -777,6 +777,16 @@ ptr_t GC_get_main_stack_base(void){ + # endif /* BEOS */ + + ++# ifdef HAIKU ++# include ++ptr_t GC_get_main_stack_base(void){ ++ thread_info th; ++ get_thread_info(find_thread(NULL),&th); ++ return th.stack_end; ++} ++# endif /* HAIKU */ ++ ++ + # ifdef OS2 + + ptr_t GC_get_main_stack_base(void) +@@ -1095,7 +1105,7 @@ ptr_t GC_get_main_stack_base(void) + + #endif /* FREEBSD_STACKBOTTOM */ + +-#if !defined(BEOS) && !defined(AMIGA) && !defined(MSWIN32) \ ++#if !defined(BEOS) && !defined(HAIKU) && !defined(AMIGA) && !defined(MSWIN32) \ + && !defined(MSWINCE) && !defined(OS2) && !defined(NOSYS) && !defined(ECOS) \ + && !defined(CYGWIN32) + +@@ -1154,7 +1164,7 @@ ptr_t GC_get_main_stack_base(void) + # endif /* STACKBOTTOM */ + } + +-# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !NOSYS, !ECOS */ ++# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !HAIKU, !NOSYS, !ECOS */ + + #if defined(GC_LINUX_THREADS) && !defined(HAVE_GET_STACK_BASE) + +diff --git a/tools/build/v2/engine/fileunix.c b/tools/build/v2/engine/fileunix.c +index bff3a42..1f60be2 100644 +--- a/tools/build/v2/engine/fileunix.c ++++ b/tools/build/v2/engine/fileunix.c +@@ -80,7 +80,10 @@ struct ar_hdr /* archive file member header - printable ascii */ + }; + #endif + +-#if defined( OS_QNX ) || defined( OS_BEOS ) || defined( OS_MPEIX ) ++# if defined( OS_QNX ) || \ ++ defined( OS_BEOS ) || \ ++ defined( OS_HAIKU ) || \ ++ defined( OS_MPEIX ) + # define NO_AR + # define HAVE_AR + #endif +diff --git a/tools/build/v2/engine/jam.h b/tools/build/v2/engine/jam.h +index 86ad0e8..7c0bb69 100644 +--- a/tools/build/v2/engine/jam.h ++++ b/tools/build/v2/engine/jam.h +@@ -125,6 +125,11 @@ + #define OS_BEOS + #define NO_VFORK + #endif ++#ifdef __HAIKU__ ++ #define unix ++ #define OSMINOR "OS=HAIKU" ++ #define OS_HAIKU ++#endif + #ifdef __bsdi__ + #define OSMINOR "OS=BSDI" + #define OS_BSDI +diff --git a/tools/build/v2/engine/jambase.c b/tools/build/v2/engine/jambase.c +index b15282b..5a127a1 100644 +--- a/tools/build/v2/engine/jambase.c ++++ b/tools/build/v2/engine/jambase.c +@@ -548,6 +548,18 @@ char *jambase[] = { + "NOARSCAN ?= true ;\n", + "STDHDRS ?= /boot/develop/headers/posix ;\n", + "}\n", ++"else if $(OS) = HAIKU\n", ++"{\n", ++"BINDIR ?= /boot/common/bin ;\n", ++"CC ?= gcc ;\n", ++"C++ ?= $(CC) ;\n", ++"FORTRAN ?= \"\" ;\n", ++"LIBDIR ?= /boot/common/lib ;\n", ++"LINK ?= gcc ;\n", ++"LINKLIBS ?= -lnetwork ;\n", ++"NOARSCAN ?= true ;\n", ++"STDHDRS ?= /boot/develop/headers/posix ;\n", ++"}\n", + "else if $(OS) = BEOS\n", + "{\n", + "BINDIR ?= /boot/apps ;\n", +diff --git a/tools/build/v2/tools/builtin.jam b/tools/build/v2/tools/builtin.jam +index 176de13..1c3466f 100644 +--- a/tools/build/v2/tools/builtin.jam ++++ b/tools/build/v2/tools/builtin.jam +@@ -41,7 +41,7 @@ import generate ; + + + .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd openbsd osf +- qnx qnxnto sgi solaris unix unixware windows ++ qnx qnxnto sgi solaris unix unixware windows haiku + elf # Not actually an OS -- used for targeting bare metal where object + # format is ELF. This catches both -elf and -eabi gcc targets and well + # as other compilers targeting ELF. It is not clear how often we need +@@ -76,6 +76,7 @@ local rule default-host-os ( ) + case COHERENT : host-os = unix ; + case DRAGONFLYBSD : host-os = bsd ; + case IRIX : host-os = sgi ; ++ case HAIKU : host-os = haiku ; + case MACOSX : host-os = darwin ; + case KFREEBSD : host-os = freebsd ; + case LINUX : host-os = linux ; +diff --git a/tools/build/v2/tools/builtin.py b/tools/build/v2/tools/builtin.py +index 35c1a40..c430fad 100644 +--- a/tools/build/v2/tools/builtin.py ++++ b/tools/build/v2/tools/builtin.py +@@ -103,6 +103,7 @@ def default_host_os(): + elif host_os == 'MACOSX': host_os = 'darwin' + elif host_os == 'KFREEBSD': host_os = 'freebsd' + elif host_os == 'LINUX': host_os = 'linux' ++ elif host_os == 'HAIKU': host_os = 'haiku' + else: host_os = 'unix' + return host_os.lower() + +diff --git a/tools/build/v2/tools/gcc.jam b/tools/build/v2/tools/gcc.jam +index ef90f05..2de76cf 100644 +--- a/tools/build/v2/tools/gcc.jam ++++ b/tools/build/v2/tools/gcc.jam +@@ -1029,10 +1029,11 @@ rule setup-threading ( targets * : sources * : properties * ) + case cygwin : option = -mthreads ; + case solaris : option = -pthreads ; libs = rt ; + case beos : # No threading options. ++ case haiku : option = ; + case *bsd : option = -pthread ; # There is no -lrt on BSD. + case sgi : # gcc on IRIX does not support multi-threading. + case darwin : # No threading options. +- case * : option = -pthread ; libs = rt ; ++ case * : option = -pthreads ; libs = rt ; + } + + if $(option) +diff --git a/tools/build/v2/tools/gcc.py b/tools/build/v2/tools/gcc.py +index c2f3b02..4f60d22 100644 +--- a/tools/build/v2/tools/gcc.py ++++ b/tools/build/v2/tools/gcc.py +@@ -677,6 +677,9 @@ elif bjam.variable('UNIX'): + elif host_os_name == 'BeOS': + # BeOS has no threading options, don't set anything here. + pass ++ elif host_os_name == 'Haiku': ++ flags('gcc', 'OPTIONS', ['multi'], ['-lroot']) ++ # there is no -lrt on HAIKU + elif host_os_name.endswith('BSD'): + flags('gcc', 'OPTIONS', ['multi'], ['-pthread']) + # there is no -lrt on BSD +diff --git a/tools/build/v2/tools/python.jam b/tools/build/v2/tools/python.jam +index d48bb78..070f5d2 100644 +--- a/tools/build/v2/tools/python.jam ++++ b/tools/build/v2/tools/python.jam +@@ -639,13 +639,14 @@ local rule system-library-dependencies ( target-os ) + case qnx* : return ; + case darwin : return ; + case windows : return ; ++ case haiku : return ; + + case hpux : return rt ; + case *bsd : return pthread gcc:util ; + + case aix : return pthread dl ; + +- case * : return pthread dl ++ case * : return ; pthread dl + gcc:util linux:util ; + } + } +-- +1.8.3.4 + + +From 0d11043b05a45a1bc8091387ba45f1fe41fe2e55 Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Sun, 22 Dec 2013 10:01:23 -0800 +Subject: applying patch type_traits.patch + + +diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp +index 1b15c7e..9a3becd 100644 +--- a/boost/config/platform/haiku.hpp ++++ b/boost/config/platform/haiku.hpp +@@ -9,18 +9,26 @@ + + #define BOOST_PLATFORM "Haiku" + +-#define BOOST_NO_INTRINSIC_WCHAR_T + #define BOOST_HAS_UNISTD_H ++#define GLIBC_HAVE_LONG_LONG ++#define BOOST_HAS_STDINT_H ++#define BOOST_HASH_NO_EXTENSIONS + + #define BOOST_HAS_BETHREADS + + #ifndef BOOST_DISABLE_THREADS + # define BOOST_HAS_THREADS + #endif ++#define BOOST_NO_CXX11_HDR_TYPE_TRAITS ++#define BOOST_NO_CXX11_ATOMIC_SMART_PTR ++#define BOOST_NO_CXX11_STATIC_ASSERT ++#define BOOST_NO_CXX11_VARIADIC_MACROS + + // + // thread API's not auto detected: + // ++#define BOOST_HAS_SCHED_YIELD ++#define BOOST_HAS_PTHREAD_YIELD + #define BOOST_HAS_GETTIMEOFDAY + + // boilerplate code: +-- +1.8.3.4 + From 94b731a9392f26204503118e414b17989dc37332 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 22 Dec 2013 16:13:28 -0700 Subject: [PATCH 109/206] Fix libmikmod on secondary arch's --- media-libs/libmikmod/libmikmod-3.3.3.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libmikmod/libmikmod-3.3.3.recipe b/media-libs/libmikmod/libmikmod-3.3.3.recipe index 86867168d..9df23963c 100644 --- a/media-libs/libmikmod/libmikmod-3.3.3.recipe +++ b/media-libs/libmikmod/libmikmod-3.3.3.recipe @@ -5,7 +5,7 @@ SRC_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/3.3.3/libmikmod- CHECKSUM_MD5="0e0f9bce8f8e598ca292b41e0ae385c8" LICENSE="GNU LGPL v2.1" COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, Steve McIntyre, Peter Amstutz, and Miodrag Vallat." -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -69,5 +69,5 @@ PROVIDES_devel=" " REQUIRES_devel=" - libmikmod == $portVersion base + libmikmod$secondaryArchSuffix == $portVersion base " From 1b39f2f4a16e52b08d0381a7767e235c9a1d65c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 23 Dec 2013 00:33:00 +0100 Subject: [PATCH 110/206] qemacs: Add a recipe for current CVS The Haiku port has been upstreamed, so no need for a patch. --- app-editors/qemacs/qemacs-0.4.0dev.recipe | 65 +++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 app-editors/qemacs/qemacs-0.4.0dev.recipe diff --git a/app-editors/qemacs/qemacs-0.4.0dev.recipe b/app-editors/qemacs/qemacs-0.4.0dev.recipe new file mode 100644 index 000000000..1c698813c --- /dev/null +++ b/app-editors/qemacs/qemacs-0.4.0dev.recipe @@ -0,0 +1,65 @@ +SUMMARY="QEmacs editor" +DESCRIPTION="QEmacs (for Quick Emacs), a very small but powerful UNIX editor. + It has features that even big editors lack : + - Full screen editor with an Emacs look and feel with all Emacs common features. + - Full UTF8 support. + - WYSIWYG HTML/XML/CSS2 mode graphical editing. + - WYSIWYG DocBook. + - C mode: coloring with immediate update. Emacs like auto-indent. + - Shell mode, Hexadecimal editing... + + The provided qemacs-pe2qe script converts your Pe color settings to the Qemacs syntax." +HOMEPAGE="http://bellard.org/qemacs/" +SRC_URI="cvs://:pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs/qemacs" +#CHECKSUM_MD5="" +REVISION="1" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2000-2003 Fabrice Bellard" + +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + qemacs$secondaryArchSuffix = $portVersion + app:qemacs$secondaryArchSuffix = $portVersion + cmd:qemacs$secondaryArchSuffix = $portVersion + cmd:qe$secondaryArchSuffix = $portVersion + cmd:html2png$secondaryArchSuffix = $portVersion + cmd:qemacs_pe2qe$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libpng$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix +# lib:libavcodec$secondaryArchSuffix +# lib:libavformat$secondaryArchSuffix + " + +BUILD_REQUIRES=" + devel:libpng$secondaryArchSuffix +# devel:libavcodec$secondaryArchSuffix +# devel:libavformat$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:which + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:texi2html + " + +BUILD() +{ + ./configure --prefix=$prefix --datadir=$dataDir --mandir=$manDir + make +} + +INSTALL() +{ + make install + install -m 755 haiku-pe2qe.sh $binDir/qemacs-pe2qe + addAppDeskbarSymlink $binDir/qe QEmacs +} + From c60ef3bce26b4a1141b71e9b69cd7732122401f4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 23 Dec 2013 01:01:22 +0100 Subject: [PATCH 111/206] openjdk: Build with external zlib * Patch the build system to allow building with an external zlib instead of using the included one. Since the included zlib symbols would be visible also to other JNI code (e.g. translators used by the SWT libs), this could cause problems where a newer version was required (e.g. libpng used by the PNG translator). * Verified ALT_JDK_IMPORT_PATH as needed to be set. --- .../openjdk/openjdk-1.7_2013_11_08.recipe | 8 +- .../openjdk-1.7_2013_11_08-source8.patchset | 203 +++++++++++++++++- 2 files changed, 203 insertions(+), 8 deletions(-) diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe index 8d2d49743..a3c65686b 100644 --- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe +++ b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe @@ -40,7 +40,7 @@ CHECKSUM_MD5_11="18d15dfd71117daadb332af003d08212" SRC_URI_12="http://ports-space.haiku-files.org/source/openjdk/jdk7-jaxws2_2_4-b03-2011_05_27.zip#noarchive" CHECKSUM_MD5_12="2f5b829ade70f67fe272d0b322e3e702" -REVISION="1" +REVISION="2" ARCHITECTURES="x86 !x86_gcc2" DISABLE_SOURCE_PACKAGE=yes @@ -91,12 +91,14 @@ REQUIRES=" haiku >= $haikuVersion lib:libfreetype lib:libiconv + lib:libz " BUILD_REQUIRES=" haiku_devel >= $haikuVersion devel:libfreetype devel:libiconv + devel:libz " BUILD_PREREQUIRES=" @@ -154,7 +156,7 @@ BUILD() # set up environment export ALT_BOOTDIR=${OPENJDK_DIR}/j2sdk-image -export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR + export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR export ANT=${OPENJDK_DIR}/ant export ALT_OUTPUTDIR=${OPENJDK_DIR}/output export LANG=C @@ -169,6 +171,8 @@ export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR export ALLOW_DOWNLOADS=false + export USE_EXTERNAL_ZLIB=true + # Build. cd jdk make diff --git a/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset b/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset index 6ebc6e320..2e55306cb 100644 --- a/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset +++ b/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset @@ -1,4 +1,4 @@ -From 5cca79ee50fbf704e67d337a16adf66877a976cd Mon Sep 17 00:00:00 2001 +From 255d3c92d7bf021c109a7ef7a0376fcbf7cb9ac5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 9 Nov 2013 02:30:27 +0100 Subject: Defs-haiku.gmk: Fix Haiku specific *_PATH variables @@ -67,7 +67,7 @@ index c1cc440..134e128 100644 1.8.3.4 -From cab8b76a94407e51e0a9c665b53f28588e003a8b Mon Sep 17 00:00:00 2001 +From 9e2dcc26b19f2fa0694ee7608c74ad3716054679 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 9 Nov 2013 02:35:20 +0100 Subject: PLATFORM_API_HaikuOS_PCM.cpp: Fix SoundConsumer include @@ -91,7 +91,7 @@ index ec111fc..d69c6a9 100644 1.8.3.4 -From f8a888057bba2123556300ca7cb200ff6b0f3186 Mon Sep 17 00:00:00 2001 +From 645161b7ecc348da7f94ddac74277a9569321f6b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 9 Nov 2013 14:52:36 +0100 Subject: Fix freetype paths for Haiku @@ -116,7 +116,7 @@ index a478f97..c0dc0d0 100644 1.8.3.4 -From aad23df8dd37db1f0b5c3cd82cb90bb3f23e303f Mon Sep 17 00:00:00 2001 +From daedb42f69c0c3b4a39e4ea354a53799c89265ab Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 9 Nov 2013 14:53:56 +0100 Subject: HaikuFontManager: Use BPathFinder API to find font dirs @@ -165,7 +165,7 @@ index a645d00..66af9ab 100644 1.8.3.4 -From dcfb77462ec97c8b72c746dcb3d18bf2d488fe62 Mon Sep 17 00:00:00 2001 +From 7052c7beb2d10b40f35ac6c4868cb238d3b0d7db Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 26 Nov 2013 17:50:46 +0100 Subject: Make use of $ORIGIN in rpath now supported in Haiku @@ -234,7 +234,7 @@ index bb0db1e..74e744e 100644 1.8.3.4 -From d71b1d303b0b6681b76c7557eec6e581734e0a7c Mon Sep 17 00:00:00 2001 +From c0578bc31277c67e94d8a8d71f7e47db49d0ec37 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 4 Dec 2013 03:23:53 +0100 Subject: make/java/java/Makefile: Missing generated classes @@ -257,3 +257,194 @@ index 93878e6..bd94e8f 100644 -- 1.8.3.4 + +From e730fb5a7d27fdc3f9213f2d75ad5ef5519e20c4 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sun, 22 Dec 2013 21:21:11 +0100 +Subject: Add support for using an external zlib + +To enable it, USE_EXTERNAL_ZLIB must be set to true. EXTERNAL_ZLIB_LIB +and EXTERNAL_ZLIB_HEADERS_PATH can be set to the library to link +against and the headers path respectively. The former defaults to +"-lz". + +diff --git a/make/com/sun/java/pack/Makefile b/make/com/sun/java/pack/Makefile +index 22e0b69..ce28479 100644 +--- a/make/com/sun/java/pack/Makefile ++++ b/make/com/sun/java/pack/Makefile +@@ -70,9 +70,14 @@ ifeq ($(STANDALONE),true) + $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \ + $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX) + +- ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) +- OTHER_CXXFLAGS += $(ZINCLUDE) +- LDDFLAGS += $(ZIPOBJS) ++ ifeq ($(USE_EXTERNAL_ZLIB), true) ++ OTHER_CXXFLAGS += $(EXTERNAL_ZLIB_CPPFLAGS) ++ LDDFLAGS += $(EXTERNAL_ZLIB_LIB) ++ else ++ ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) ++ OTHER_CXXFLAGS += $(ZINCLUDE) ++ LDDFLAGS += $(ZIPOBJS) ++ endif + else + OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI + OTHER_LDLIBS += $(JVMLIB) +diff --git a/make/common/Defs.gmk b/make/common/Defs.gmk +index c0dc0d0..07849f3 100644 +--- a/make/common/Defs.gmk ++++ b/make/common/Defs.gmk +@@ -210,6 +210,21 @@ ZLIB_VERSION = 1.2.3 + + + # ++# External zlib support ++# ++ifeq ($(USE_EXTERNAL_ZLIB), true) ++ ifndef EXTERNAL_ZLIB_LIB ++ EXTERNAL_ZLIB_LIB = -lz ++ endif ++ ifdef EXTERNAL_ZLIB_HEADERS_PATH ++ EXTERNAL_ZLIB_CPPFLAGS = -I$(EXTERNAL_ZLIB_HEADERS_PATH) ++ else ++ EXTERNAL_ZLIB_CPPFLAGS = ++ endif ++endif ++ ++ ++# + # Localizations for the different parts of the product beyond English + # + +diff --git a/make/java/jli/Makefile b/make/java/jli/Makefile +index 3e5994d..5500e73 100644 +--- a/make/java/jli/Makefile ++++ b/make/java/jli/Makefile +@@ -69,13 +69,17 @@ FILES_c = \ + parse_manifest.c \ + version_comp.c \ + wildcard.c \ +- jli_util.c \ +- inflate.c \ +- inftrees.c \ +- inffast.c \ +- zadler32.c \ +- zcrc32.c \ +- zutil.c ++ jli_util.c ++ ++ifneq ($(USE_EXTERNAL_ZLIB), true) ++ FILES_c += \ ++ inflate.c \ ++ inftrees.c \ ++ inffast.c \ ++ zadler32.c \ ++ zcrc32.c \ ++ zutil.c ++endif + + ifneq ($(PLATFORM), windows) + FILES_c += ergo.c +@@ -131,7 +135,12 @@ endif + + OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) + OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC) +-OTHER_INCLUDES += -I$(ZIP_SRC) ++ ++ifeq ($(USE_EXTERNAL_ZLIB), true) ++ OTHER_INCLUDES += $(EXTERNAL_ZLIB_CPPFLAGS) ++else ++ OTHER_INCLUDES += -I$(ZIP_SRC) ++endif + + # + # Library to compile. +@@ -164,6 +173,13 @@ library:: $(STATIC_LIBRARY) + endif # PLATFORM + + # +-# Add to ambient vpath so we pick up the library files ++# Add to ambient vpath so we pick up the library files. When using an external ++# zlib, add the library instead of the sources. + # +-vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC) ++vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC) ++ ++ifeq ($(USE_EXTERNAL_ZLIB), true) ++ LDLIBS += $(EXTERNAL_ZLIB_LIB) ++else ++ vpath %.c $(ZIP_SRC) ++endif +diff --git a/make/java/zip/FILES_c.gmk b/make/java/zip/FILES_c.gmk +index 6664887..97c6d3f 100644 +--- a/make/java/zip/FILES_c.gmk ++++ b/make/java/zip/FILES_c.gmk +@@ -29,16 +29,20 @@ FILES_c = \ + Deflater.c \ + Inflater.c \ + ZipFile.c \ +- zip_util.c \ +- compress.c \ +- deflate.c \ +- gzio.c \ +- infback.c \ +- inffast.c \ +- inflate.c \ +- inftrees.c \ +- trees.c \ +- uncompr.c \ +- zadler32.c \ +- zcrc32.c \ +- zutil.c ++ zip_util.c ++ ++ifneq ($(USE_EXTERNAL_ZLIB), true) ++ FILES_c += \ ++ compress.c \ ++ deflate.c \ ++ gzio.c \ ++ infback.c \ ++ inffast.c \ ++ inflate.c \ ++ inftrees.c \ ++ trees.c \ ++ uncompr.c \ ++ zadler32.c \ ++ zcrc32.c \ ++ zutil.c ++endif +diff --git a/make/java/zip/Makefile b/make/java/zip/Makefile +index 906e7e8..15b2d45 100644 +--- a/make/java/zip/Makefile ++++ b/make/java/zip/Makefile +@@ -74,14 +74,24 @@ else + CPPFLAGS += -UDEBUG + endif + +-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) ++ifeq ($(USE_EXTERNAL_ZLIB), true) ++ CPPFLAGS += $(EXTERNAL_ZLIB_CPPFLAGS) ++else ++ CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) ++endif ++ + CPPFLAGS += -I$(SHARE_SRC)/native/java/io + CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io + + # +-# Add to ambient vpath so we pick up the library files ++# Add to ambient vpath so we pick up the library files. When using an external ++# zlib, add the library instead. + # +-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION) ++ifeq ($(USE_EXTERNAL_ZLIB), true) ++ LDLIBS += $(EXTERNAL_ZLIB_LIB) ++else ++ vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION) ++endif + + # + # Link to JVM library for JVM_Zip* functions +-- +1.8.3.4 + From 7d325a720c9a7914bbed8004dbf56993b2d91805 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Dec 2013 01:38:17 +0000 Subject: [PATCH 112/206] mesa: Add Mesa 10.0.1 for x86 * Drop 10.0.0 as it didn't include the OpenGL kit headers and wasn't used yet --- ...{mesa-10.0.0.recipe => mesa-10.0.1.recipe} | 28 +- sys-libs/mesa/patches/mesa-10.0.1.patchset | 354 ++++++++++++++++++ 2 files changed, 374 insertions(+), 8 deletions(-) rename sys-libs/mesa/{mesa-10.0.0.recipe => mesa-10.0.1.recipe} (85%) create mode 100644 sys-libs/mesa/patches/mesa-10.0.1.patchset diff --git a/sys-libs/mesa/mesa-10.0.0.recipe b/sys-libs/mesa/mesa-10.0.1.recipe similarity index 85% rename from sys-libs/mesa/mesa-10.0.0.recipe rename to sys-libs/mesa/mesa-10.0.1.recipe index 493995545..3167cd28c 100644 --- a/sys-libs/mesa/mesa-10.0.0.recipe +++ b/sys-libs/mesa/mesa-10.0.1.recipe @@ -7,9 +7,9 @@ DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification. HOMEPAGE="http://www.mesa3d.org/" COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." LICENSE="MIT" -SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0/MesaLib-10.0.0.tar.bz2" -CHECKSUM_MD5="f3fe55d9735bea158bbe97ed9a0da819" -REVISION="2" +SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0.1/MesaLib-10.0.1.tar.bz2" +CHECKSUM_MD5="0a72ca5b36046a658bf6038326ff32ed" +REVISION="1" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -28,6 +28,8 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion " + +PATCHES="mesa-10.0.1.patchset" # We're locked to LLVM 3.2 as 3.3 is broken at the moment on Haiku. # Mesa should build with any newer LLVM version however. @@ -60,11 +62,6 @@ INSTALL() { mesaBuildDir=build/haiku-$effectiveTargetArchitecture - mkdir -p $includeDir/GL - cp include/GL/gl.h $includeDir/GL/ - cp include/GL/gl_mangle.h $includeDir/GL/ - cp include/GL/glext.h $includeDir/GL/ - # libGL.so makes up the core of our OpenGL kit mkdir -p $libDir cp $(find $mesaBuildDir -name 'libGL.so') $libDir @@ -76,6 +73,21 @@ INSTALL() cp $(find $mesaBuildDir -name 'libswpipe.so') \ "$addOnsDir/opengl/Software Pipe" + # OpenGL Kit + mkdir -p $includeDir/os/opengl/GL + cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ + cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/ + cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/ + + # Standard GL headers + cp ./include/GL/gl.h $includeDir/os/opengl/GL/ + cp ./include/GL/gl_mangle.h $includeDir/os/opengl/GL/ + cp ./include/GL/glext.h $includeDir/os/opengl/GL/ + + # Symlink GL in kit to system GL directory + cd $includeDir + ln -snf os/opengl/GL GL + # devel package packageEntries devel \ $developDir diff --git a/sys-libs/mesa/patches/mesa-10.0.1.patchset b/sys-libs/mesa/patches/mesa-10.0.1.patchset new file mode 100644 index 000000000..9aed3f820 --- /dev/null +++ b/sys-libs/mesa/patches/mesa-10.0.1.patchset @@ -0,0 +1,354 @@ +From dfe5d4f383c16208d32c498e2c3e92095422d532 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Sat, 14 Dec 2013 11:46:05 -0600 +Subject: [PATCH] Haiku: Add in public GL kit headers + +* These make up the base of what C++ GL Haiku + applications use for 3D rendering. +* Not placed in includes/GL to prevent Haiku headers + from getting installed on non-Haiku systems +--- + include/HaikuGL/GLRenderer.h | 76 +++++++++++++++++ + include/HaikuGL/GLView.h | 193 +++++++++++++++++++++++++++++++++++++++++++ + include/HaikuGL/OpenGLKit.h | 10 +++ + include/HaikuGL/README | 28 +++++++ + 4 files changed, 307 insertions(+) + create mode 100644 include/HaikuGL/GLRenderer.h + create mode 100644 include/HaikuGL/GLView.h + create mode 100644 include/HaikuGL/OpenGLKit.h + create mode 100644 include/HaikuGL/README + +diff --git a/include/HaikuGL/GLRenderer.h b/include/HaikuGL/GLRenderer.h +new file mode 100644 +index 0000000..7ffcc34 +--- /dev/null ++++ b/include/HaikuGL/GLRenderer.h +@@ -0,0 +1,76 @@ ++/* ++ * Copyright 2006, Philippe Houdoin. All rights reserved. ++ * Distributed under the terms of the MIT License. ++ ++ * This header defines BGLRenderer, the base class making up ++ * the Haiku GL renderer add-ons (essentially selfcontained C++ ++ * shared libraries that do the actual rendering such as ++ * libswpipe.so and libswrast.so) ++ */ ++#ifndef GLRENDERER_H ++#define GLRENDERER_H ++ ++ ++#include ++#include ++ ++ ++class BGLDispatcher; ++class GLRendererRoster; ++ ++typedef unsigned long renderer_id; ++ ++class BGLRenderer ++{ ++ // Private unimplemented copy constructors ++ BGLRenderer(const BGLRenderer &); ++ BGLRenderer & operator=(const BGLRenderer &); ++ ++public: ++ BGLRenderer(BGLView *view, ulong bgl_options, ++ BGLDispatcher *dispatcher); ++ virtual ~BGLRenderer(); ++ ++ void Acquire(); ++ void Release(); ++ ++ virtual void LockGL(); ++ virtual void UnlockGL(); ++ ++ virtual void SwapBuffers(bool VSync = false); ++ virtual void Draw(BRect updateRect); ++ virtual status_t CopyPixelsOut(BPoint source, BBitmap *dest); ++ virtual status_t CopyPixelsIn(BBitmap *source, BPoint dest); ++ ++ virtual void FrameResized(float width, float height); ++ ++ virtual void DirectConnected(direct_buffer_info *info); ++ virtual void EnableDirectMode(bool enabled); ++ ++ inline int32 ReferenceCount() const { return fRefCount; }; ++ inline ulong Options() const { return fOptions; }; ++ inline BGLView* GLView() { return fView; }; ++ inline BGLDispatcher* GLDispatcher() { return fDispatcher; }; ++ ++private: ++ friend class GLRendererRoster; ++ ++ virtual status_t _Reserved_Renderer_0(int32, void *); ++ virtual status_t _Reserved_Renderer_1(int32, void *); ++ virtual status_t _Reserved_Renderer_2(int32, void *); ++ virtual status_t _Reserved_Renderer_3(int32, void *); ++ virtual status_t _Reserved_Renderer_4(int32, void *); ++ ++ volatile int32 fRefCount; // How much we're still usefull? ++ BGLView* fView; // Never forget who is the boss! ++ ulong fOptions; // Keep that tune in memory ++ BGLDispatcher* fDispatcher;// Our personal GL API call dispatcher ++ ++ GLRendererRoster* fOwningRoster; ++ renderer_id fID; ++}; ++ ++extern "C" _EXPORT BGLRenderer* instantiate_gl_renderer(BGLView *view, ulong options, BGLDispatcher *dispatcher); ++ ++ ++#endif // GLRENDERER_H +diff --git a/include/HaikuGL/GLView.h b/include/HaikuGL/GLView.h +new file mode 100644 +index 0000000..b848578 +--- /dev/null ++++ b/include/HaikuGL/GLView.h +@@ -0,0 +1,193 @@ ++/* ++ * Copyright 2008-2013, Haiku, Inc. All Rights Reserved. ++ * Distributed under the terms of the MIT License. ++ * ++ * This header defines BGLView, the base class making up ++ * the Haiku GL Kit. ++ * ++ */ ++#ifndef BGLVIEW_H ++#define BGLVIEW_H ++ ++ ++#include ++ ++#define BGL_RGB 0 ++#define BGL_INDEX 1 ++#define BGL_SINGLE 0 ++#define BGL_DOUBLE 2 ++#define BGL_DIRECT 0 ++#define BGL_INDIRECT 4 ++#define BGL_ACCUM 8 ++#define BGL_ALPHA 16 ++#define BGL_DEPTH 32 ++#define BGL_OVERLAY 64 ++#define BGL_UNDERLAY 128 ++#define BGL_STENCIL 512 ++ ++#ifdef __cplusplus ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++struct glview_direct_info; ++class BGLRenderer; ++class GLRendererRoster; ++ ++class BGLView : public BView { ++public: ++ BGLView(BRect rect, const char* name, ++ ulong resizingMode, ulong mode, ++ ulong options); ++ virtual ~BGLView(); ++ ++ void LockGL(); ++ void UnlockGL(); ++ void SwapBuffers(); ++ void SwapBuffers(bool vSync); ++ ++ BView* EmbeddedView(); // deprecated, returns NULL ++ void* GetGLProcAddress(const char* procName); ++ ++ status_t CopyPixelsOut(BPoint source, BBitmap *dest); ++ status_t CopyPixelsIn(BBitmap *source, BPoint dest); ++ ++ // Mesa's GLenum is uint where Be's ones was ulong! ++ virtual void ErrorCallback(unsigned long errorCode); ++ ++ virtual void Draw(BRect updateRect); ++ virtual void AttachedToWindow(); ++ virtual void AllAttached(); ++ virtual void DetachedFromWindow(); ++ virtual void AllDetached(); ++ ++ virtual void FrameResized(float newWidth, float newHeight); ++ virtual status_t Perform(perform_code d, void *arg); ++ ++ virtual status_t Archive(BMessage *data, bool deep = true) const; ++ ++ virtual void MessageReceived(BMessage *message); ++ virtual void SetResizingMode(uint32 mode); ++ ++ virtual void Show(); ++ virtual void Hide(); ++ ++ virtual BHandler* ResolveSpecifier(BMessage *msg, int32 index, ++ BMessage *specifier, int32 form, ++ const char *property); ++ virtual status_t GetSupportedSuites(BMessage *data); ++ ++ void DirectConnected(direct_buffer_info *info); ++ void EnableDirectMode(bool enabled); ++ ++ void* getGC() { return fGc; } // ??? ++ ++ virtual void GetPreferredSize(float* width, float* height); ++ ++private: ++ ++ virtual void _ReservedGLView1(); ++ virtual void _ReservedGLView2(); ++ virtual void _ReservedGLView3(); ++ virtual void _ReservedGLView4(); ++ virtual void _ReservedGLView5(); ++ virtual void _ReservedGLView6(); ++ virtual void _ReservedGLView7(); ++ virtual void _ReservedGLView8(); ++ ++ BGLView(const BGLView &); ++ BGLView &operator=(const BGLView &); ++ ++ void _DitherFront(); ++ bool _ConfirmDither(); ++ void _Draw(BRect rect); ++ void _CallDirectConnected(); ++ ++ void* fGc; ++ uint32 fOptions; ++ uint32 fDitherCount; ++ BLocker fDrawLock; ++ BLocker fDisplayLock; ++ glview_direct_info* fClipInfo; ++ ++ BGLRenderer* fRenderer; ++ GLRendererRoster* fRoster; ++ ++ BBitmap* fDitherMap; ++ BRect fBounds; ++ int16* fErrorBuffer[2]; ++ uint64 _reserved[8]; ++ ++ void _LockDraw(); ++ void _UnlockDraw(); ++ ++// BeOS compatibility ++private: ++ BGLView(BRect rect, char* name, ++ ulong resizingMode, ulong mode, ++ ulong options); ++}; ++ ++ ++class BGLScreen : public BWindowScreen { ++public: ++ BGLScreen(char* name, ++ ulong screenMode, ulong options, ++ status_t *error, bool debug=false); ++ ~BGLScreen(); ++ ++ void LockGL(); ++ void UnlockGL(); ++ void SwapBuffers(); ++ // Mesa's GLenum is uint where Be's ones was ulong! ++ virtual void ErrorCallback(unsigned long errorCode); ++ ++ virtual void ScreenConnected(bool connected); ++ virtual void FrameResized(float width, float height); ++ virtual status_t Perform(perform_code code, void *arg); ++ ++ virtual status_t Archive(BMessage *data, bool deep = true) const; ++ virtual void MessageReceived(BMessage *message); ++ ++ virtual void Show(); ++ virtual void Hide(); ++ ++ virtual BHandler* ResolveSpecifier(BMessage *message, ++ int32 index, ++ BMessage *specifier, ++ int32 form, ++ const char *property); ++ virtual status_t GetSupportedSuites(BMessage *data); ++ ++private: ++ ++ virtual void _ReservedGLScreen1(); ++ virtual void _ReservedGLScreen2(); ++ virtual void _ReservedGLScreen3(); ++ virtual void _ReservedGLScreen4(); ++ virtual void _ReservedGLScreen5(); ++ virtual void _ReservedGLScreen6(); ++ virtual void _ReservedGLScreen7(); ++ virtual void _ReservedGLScreen8(); ++ ++ BGLScreen(const BGLScreen &); ++ BGLScreen &operator=(const BGLScreen &); ++ ++ void* fGc; ++ long fOptions; ++ BLocker fDrawLock; ++ ++ int32 fColorSpace; ++ uint32 fScreenMode; ++ ++ uint64 _reserved[7]; ++}; ++ ++#endif // __cplusplus ++ ++#endif // BGLVIEW_H +diff --git a/include/HaikuGL/OpenGLKit.h b/include/HaikuGL/OpenGLKit.h +new file mode 100644 +index 0000000..f482871 +--- /dev/null ++++ b/include/HaikuGL/OpenGLKit.h +@@ -0,0 +1,10 @@ ++/* ++ * Master include file for the Haiku OpenGL Kit. ++ */ ++ ++#include ++#include ++ ++// Projects needing GL/glu.h and GL/glut.h should now ++// include these headers independently as glu and glut ++// are no longe core parts of mesa +diff --git a/include/HaikuGL/README b/include/HaikuGL/README +new file mode 100644 +index 0000000..0f8503f +--- /dev/null ++++ b/include/HaikuGL/README +@@ -0,0 +1,28 @@ ++These headers make up the Haiku Op*nGL kit. ++ ++Headers in this directory preserve some BeOS™ compatibility ++compatibility, so changes should be mentioned to the Haiku ++project mailing list. ++ ++http://haiku-os.org ++ ++Normal Haiku Op*enGL layout: ++ ++ * headers/os/OpenGLKit.h ++ * headers/os/opengl/GLView.h ++ * headers/os/opengl/GLRenderer.h ++ * headers/os/opengl/GL/gl.h ++ * headers/os/opengl/GL/gl_mangle.h ++ * headers/os/opengl/GL/glext.h ++ * headers/os/opengl/GL/osmesa.h (needed?) ++ ++Extras: ++ ++ * headers/os/opengl/GL/glu.h ++ * headers/os/opengl/GL/glut.h ++ ++OpenGL™ is a trademark of SGI. The usage of this trademark ++in the Haiku GL Kit is not a sign of any certification or ++endorsement by SGI or its affiliates. Usage is purely to ++allow legacy compatibility with the BeOS™ and its 3D GL ++rendering subsystem. +-- +1.8.3.4 + From 9bdf703e0f4ce1081ce58ec885756571c389a6a8 Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Mon, 23 Dec 2013 02:33:31 +0000 Subject: [PATCH 113/206] Add Cherry Blossom recipe and patch --- .../cherry_blossom/cherry_blossom-1.0.recipe | 46 +++++++++++++++++++ .../patches/cherry_blossom-1.0.patch | 36 +++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe create mode 100644 haiku-apps/cherry_blossom/patches/cherry_blossom-1.0.patch diff --git a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe new file mode 100644 index 000000000..9fed0758c --- /dev/null +++ b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe @@ -0,0 +1,46 @@ +SUMMARY="Cherry Blossom is an iTunes style media player for the Haiku Operating System." +HOMEPAGE="http://gitorious.org/cherry-blossom/" +SRC_URI="git+http://gitorious.org/cherry-blossom/cherry-blossom.git" +REVISION="1" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + cherry_blosom = $portVersion + app:cherry_blosom = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + taglib_devel + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:make + cmd:mkdepend + " + +PATCHES="cherry_blossom-1.0.patch" + +BUILD() +{ + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + mkdir -p ${appsDir} + cp -a objects/Cherry_Blossom $appsDir + addAppDeskbarSymlink ${appsDir}/Cherry_Blossom +} +LICENSE="MIT" +COPYRIGHT="Copyright (c) 2010 Bryce Groff" + +DESCRIPTION=" Cherry Blossom is a 100% native application and does not try to be portable to any other operating system. Cherry Blossom uses Haiku specific API’s for handling media, so if Haiku can play your media files, then Cherry Blossom will also be able to play your files." diff --git a/haiku-apps/cherry_blossom/patches/cherry_blossom-1.0.patch b/haiku-apps/cherry_blossom/patches/cherry_blossom-1.0.patch new file mode 100644 index 000000000..984da661e --- /dev/null +++ b/haiku-apps/cherry_blossom/patches/cherry_blossom-1.0.patch @@ -0,0 +1,36 @@ +diff --git a/makefile b/makefile +new file mode 100644 +index 0000000..d134de0 +--- /dev/null ++++ b/makefile +@@ -0,0 +1,30 @@ ++NAME= Cherry_Blossom ++ ++TYPE= APP ++ ++SRCS= interface/DrawingTidbits.cpp \ ++interface/PositionToolTip.cpp \ ++interface/TransportButton.cpp \ ++interface/PeakView.cpp \ ++interface/SeekSlider.cpp \ ++interface/VolumeSlider.cpp \ ++views/AlbumView.cpp \ ++views/ControlView.cpp \ ++views/MusicView.cpp \ ++views/SearchView.cpp \ ++views/ArtistView.cpp \ ++views/GenreView.cpp \ ++views/PlayListView.cpp \ ++views/SongView.cpp \ ++CherryBlossom.cpp \ ++CherryBlossomWindow.cpp \ ++ ++SYSTEM_INCLUDE_PATHS = /boot/system/develop/headers/private/interface/ \ ++ /boot/system/develop/headers/private/shared/ ++ ++ ++LIBS= be locale tag ++ ++APP_VERSION = 1.0 ++ ++include $(BUILDHOME)/etc/makefile-engine From 0b4fe2733a61baee4d215504ceb30409687b819b Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 22 Dec 2013 19:52:52 -0700 Subject: [PATCH 114/206] Mark dragonmemory as broken The game doesn't actually run. Apparently nobody bothered to test the students work --- games-kids/dragonmemory/dragonmemory-1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-kids/dragonmemory/dragonmemory-1.recipe b/games-kids/dragonmemory/dragonmemory-1.recipe index cdf2e8c96..d8f734df7 100644 --- a/games-kids/dragonmemory/dragonmemory-1.recipe +++ b/games-kids/dragonmemory/dragonmemory-1.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://sourceforge.net/projects/dragonmemory/" SRC_URI="http://cznic.dl.sourceforge.net/project/dragonmemory/DragonMemory-source.tgz" SRC_URI2="http://heanet.dl.sourceforge.net/project/dragonmemory/DragonMemory-source.tgz" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="!x86_gcc2 !x86 !x86_64" SOURCE_DIR="DragonMemory" PROVIDES=" From 46c9aa22eb6eae39aa98cf44d0604ebe9b509ae8 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 22 Dec 2013 19:57:58 -0700 Subject: [PATCH 115/206] Fix rezerware build ... since nobody bothered to check the work of the student Also, enable sound effects so I can test sdl-mixer --- .../rezerwar/patches/rezerwar-0.4.2.patch | 33 --------- .../rezerwar/patches/rezerwar-0.4.2.patchset | 68 +++++++++++++++++++ games-puzzle/rezerwar/rezerwar-0.4.2.recipe | 8 +-- 3 files changed, 71 insertions(+), 38 deletions(-) delete mode 100644 games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch create mode 100644 games-puzzle/rezerwar/patches/rezerwar-0.4.2.patchset diff --git a/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch b/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch deleted file mode 100644 index 18254aacf..000000000 --- a/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- ../configure 2010-05-09 16:25:03.000524288 +0000 -+++ configure-new 2013-12-14 00:36:47.137887744 +0000 -@@ -232,7 +232,7 @@ - Haiku|BeOS) - check_sdl - check_sdl_mixer -- [ -z "$PREFIX" ] && PREFIX="/boot/apps/rezerwar" -+ [ -z "$PREFIX" ] && PREFIX="data" - [ -z "$TARGET" ] && TARGET="$PREFIX" - TARGET_BIN="$TARGET" - TARGET_DOC="$TARGET" ---- ../src/main.c 2010-05-09 16:25:03.002097152 +0000 -+++ main-new.c 2013-12-13 23:59:59.994312192 +0000 -@@ -32,7 +32,8 @@ - #endif - - #include "SDL.h" -- -+#include -+#include - #include "rezerwar.h" - #include "config.h" - -@@ -231,7 +232,8 @@ - bool loop = true; - char *path; - SDL_Joystick *js; -- -+ // For tracker -+ chdir(dirname(av[0])); - /* Version number only */ - if (has_flag(ac, av, "-v")) { - printf("%s\n", VERSION); diff --git a/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patchset b/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patchset new file mode 100644 index 000000000..1ac7b966e --- /dev/null +++ b/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patchset @@ -0,0 +1,68 @@ +From 4daa17a279a72f67e7ca9414e3be6ef6d95c21ad Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Sun, 22 Dec 2013 19:53:37 -0700 +Subject: applying patch rezerwar-0.4.2.patch + + +diff --git a/configure b/configure +index 7933d69..623bd32 100755 +--- a/configure ++++ b/configure +@@ -232,7 +232,7 @@ Debug) + Haiku|BeOS) + check_sdl + check_sdl_mixer +- [ -z "$PREFIX" ] && PREFIX="/boot/apps/rezerwar" ++ [ -z "$PREFIX" ] && PREFIX="data" + [ -z "$TARGET" ] && TARGET="$PREFIX" + TARGET_BIN="$TARGET" + TARGET_DOC="$TARGET" +diff --git a/src/main.c b/src/main.c +index ffc8a06..3132672 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -32,7 +32,8 @@ + #endif + + #include "SDL.h" +- ++#include ++#include + #include "rezerwar.h" + #include "config.h" + +@@ -231,7 +232,8 @@ main(int ac, char **av) + bool loop = true; + char *path; + SDL_Joystick *js; +- ++ // For tracker ++ chdir(dirname(av[0])); + /* Version number only */ + if (has_flag(ac, av, "-v")) { + printf("%s\n", VERSION); +-- +1.8.3.4 + + +From 8fcb551ba8ea30777bf83db46a163c24f3308a06 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Sun, 22 Dec 2013 19:54:31 -0700 +Subject: Enable sound fx + + +diff --git a/configure b/configure +index 623bd32..10584ec 100755 +--- a/configure ++++ b/configure +@@ -239,7 +239,6 @@ Haiku|BeOS) + TARGET_DATA="$TARGET" + CFG_DATAPATH="$TARGET" + CFG_CFGPATH=".rezerwar" +- CFG_NOSOUND=1 + MK_EXTRAOBJS="strsep.o" + ;; + Win32|MINGW32*) +-- +1.8.3.4 + diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe index 8443aefe7..8f9e51990 100644 --- a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe +++ b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe @@ -35,13 +35,11 @@ BUILD_PREREQUIRES=" cmd:sdl_config$secondaryArchSuffix " -PATCHES=" - rezerwar-0.4.2.patch - " +PATCHES="rezerwar-0.4.2.patchset" BUILD() { - configure + ./configure make } @@ -53,4 +51,4 @@ INSTALL() cp src/rezerwar $appsDir/rezerwar/rezerwar addAppDeskbarSymlink $appsDir/rezerwar/rezerwar "Rezerwar" -} \ No newline at end of file +} From a833b6c1949f96c3ffa714de8e252c7455094905 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 22 Dec 2013 20:00:56 -0700 Subject: [PATCH 116/206] Fix SDL DECLSPEC value on Haiku Remove the Haiku specific code and just use the default method Resolves issue #77 --- media-libs/libsdl/libsdl-1.2.15.recipe | 2 +- .../libsdl/patches/libsdl-1.2.15.patchset | 31 ++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index dee7ebf21..7f01025c3 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Simple Direct Media Layer is a cross-platform development library d HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz" CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85" -REVISION="1" +REVISION="2" LICENSE="GNU LGPL v2.1" COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/libsdl/patches/libsdl-1.2.15.patchset b/media-libs/libsdl/patches/libsdl-1.2.15.patchset index b4adbd8ae..d36d015a9 100644 --- a/media-libs/libsdl/patches/libsdl-1.2.15.patchset +++ b/media-libs/libsdl/patches/libsdl-1.2.15.patchset @@ -1,4 +1,4 @@ -From db1b7894554a9d3460483d278b8dd50595e43135 Mon Sep 17 00:00:00 2001 +From 59cfb52a4c0564e1713c37be2ae6026f9e4e76a9 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 22 Nov 2013 23:38:56 +0100 Subject: Remove Alsa and ESD detection @@ -36,7 +36,7 @@ index 08c8e1e..84d9a55 100644 1.8.3.4 -From 4243b5c80de7a51abb05d6f4eb5a82984607024e Mon Sep 17 00:00:00 2001 +From b2657c374826ed213072b5e80263f59a42e76faf Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 22 Nov 2013 23:39:26 +0100 Subject: Fix samples vs bytes issues @@ -67,7 +67,7 @@ index de635f8..7faf571 100644 1.8.3.4 -From 03c94f6b8dbaec508da9ec16fecbb3411f70c0c7 Mon Sep 17 00:00:00 2001 +From 847264a916bb4b9e3bfa1ff8217beed67b37b8a4 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 22 Nov 2013 23:40:12 +0100 Subject: Various fixes to the video code @@ -147,7 +147,7 @@ index c32b661..a26f18b 100644 1.8.3.4 -From b0294206194d97e8bb8a69a214e4c8bd3311ed03 Mon Sep 17 00:00:00 2001 +From 6a8dccbefe9522f65a07177441a93251cfcc8d9f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 23 Nov 2013 11:59:00 +0100 Subject: Actually fix the sample vs bytes problem in audio driver. @@ -200,3 +200,26 @@ index 7faf571..300bf03 100644 -- 1.8.3.4 + +From 112569083122d8d14b2571aaf2b73483ce3738db Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Sun, 22 Dec 2013 18:37:30 -0700 +Subject: Remove Haiku from specialized DECLSPEC definition + + +diff --git a/include/begin_code.h b/include/begin_code.h +index 27e2f7b..d5e2f1f 100644 +--- a/include/begin_code.h ++++ b/include/begin_code.h +@@ -41,7 +41,7 @@ + * Some compilers use a special export keyword + */ + #ifndef DECLSPEC +-# if defined(__BEOS__) || defined(__HAIKU__) ++# if defined(__BEOS__) + # if defined(__GNUC__) + # define DECLSPEC + # else +-- +1.8.3.4 + From 8acdaec3e962517d486b7902b480af320d82f6b2 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Dec 2013 04:31:53 +0000 Subject: [PATCH 117/206] mesa: Fix missing developLibDir symlink --- sys-libs/mesa/mesa-10.0.1.recipe | 4 +++- sys-libs/mesa/mesa-7.9.2.recipe | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe index 3167cd28c..51e5dcfe0 100644 --- a/sys-libs/mesa/mesa-10.0.1.recipe +++ b/sys-libs/mesa/mesa-10.0.1.recipe @@ -9,7 +9,7 @@ COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." LICENSE="MIT" SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0.1/MesaLib-10.0.1.tar.bz2" CHECKSUM_MD5="0a72ca5b36046a658bf6038326ff32ed" -REVISION="1" +REVISION="2" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -65,6 +65,8 @@ INSTALL() # libGL.so makes up the core of our OpenGL kit mkdir -p $libDir cp $(find $mesaBuildDir -name 'libGL.so') $libDir + mkdir -p $developLibDir + symlinkRelative -s $libDir/libGL.so $developLibDir # Our rendering add-ons mkdir -p $addOnsDir/opengl diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index ae5a26b99..4ce2b3d50 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -10,7 +10,7 @@ LICENSE="MIT" # remember to update SOURCE_DIR as well for the -X revision SRC_URI="https://github.com/kallisti5/mesa/archive/7.9.2-3.tar.gz" CHECKSUM_MD5="1f7d846ea2982ffa175c906443aaabd3" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2" if [ $effectiveTargetArchitecture != x86 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -59,6 +59,8 @@ INSTALL() # libGL.so makes up the core of our OpenGL kit mkdir -p $libDir cp $(find ./lib/ -name 'libGL.so') $libDir + mkdir -p $developLibDir + symlinkRelative -s $libDir/libGL.so $developLibDir # Our rendering add-on mkdir -p $addOnsDir/opengl From 675da32d28311cb0297e1da12eeaf7690a844b5e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 22 Dec 2013 22:08:13 -0800 Subject: [PATCH 118/206] Removed the download at the end of the sourceforge url for optipng --- media-gfx/optipng/optipng-0.7.4.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe index 8f1d55968..354d2cac9 100644 --- a/media-gfx/optipng/optipng-0.7.4.recipe +++ b/media-gfx/optipng/optipng-0.7.4.recipe @@ -6,7 +6,7 @@ DESCRIPTION=" GIF, PNM and TIFF, to PNG files. " HOMEPAGE="http://optipng.sourceforge.net/" -SRC_URI="http://prdownloads.sourceforge.net/optipng/optipng-0.7.4.tar.gz?download" +SRC_URI="http://prdownloads.sourceforge.net/optipng/optipng-0.7.4.tar.gz" CHECKSUM_MD5="8853d89aaf859065e95dcdf98b6bed73" LICENSE="Zlib" COPYRIGHT="2001-2012 Cosmin Truta" @@ -31,6 +31,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion " + BUILD_PREREQUIRES=" cmd:ar cmd:gcc$secondaryArchSuffix From eac5997828984f331d20cecc546405ad193866df Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Dec 2013 06:28:53 +0000 Subject: [PATCH 119/206] mesa: Fix reversed header symlink --- sys-libs/mesa/mesa-10.0.1.recipe | 26 +++++++++++++------------- sys-libs/mesa/mesa-7.9.2.recipe | 16 ++++++++-------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe index 51e5dcfe0..c6de0d81b 100644 --- a/sys-libs/mesa/mesa-10.0.1.recipe +++ b/sys-libs/mesa/mesa-10.0.1.recipe @@ -9,7 +9,7 @@ COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." LICENSE="MIT" SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0.1/MesaLib-10.0.1.tar.bz2" CHECKSUM_MD5="0a72ca5b36046a658bf6038326ff32ed" -REVISION="2" +REVISION="3" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -75,20 +75,20 @@ INSTALL() cp $(find $mesaBuildDir -name 'libswpipe.so') \ "$addOnsDir/opengl/Software Pipe" - # OpenGL Kit - mkdir -p $includeDir/os/opengl/GL - cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ - cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/ - cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/ + # OpenGL Kit + mkdir -p $includeDir/os/opengl + cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ + cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/ + cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/ - # Standard GL headers - cp ./include/GL/gl.h $includeDir/os/opengl/GL/ - cp ./include/GL/gl_mangle.h $includeDir/os/opengl/GL/ - cp ./include/GL/glext.h $includeDir/os/opengl/GL/ + # Standard GL headers + mkdir -p $includeDir/GL + cp ./include/GL/gl.h $includeDir/GL/ + cp ./include/GL/gl_mangle.h $includeDir/GL/ + cp ./include/GL/glext.h $includeDir/GL/ - # Symlink GL in kit to system GL directory - cd $includeDir - ln -snf os/opengl/GL GL + # Create GL symlink in opengl kit + symlinkRelative -s $includeDir/GL $includeDir/os/opengl/GL # devel package packageEntries devel \ diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index 4ce2b3d50..2d0e30d24 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -10,7 +10,7 @@ LICENSE="MIT" # remember to update SOURCE_DIR as well for the -X revision SRC_URI="https://github.com/kallisti5/mesa/archive/7.9.2-3.tar.gz" CHECKSUM_MD5="1f7d846ea2982ffa175c906443aaabd3" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2" if [ $effectiveTargetArchitecture != x86 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -68,19 +68,19 @@ INSTALL() "$addOnsDir/opengl/Legacy Software Rasterizer" # OpenGL Kit - mkdir -p $includeDir/os/opengl/GL + mkdir -p $includeDir/os/opengl cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/ cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/ # Standard GL headers - cp ./include/GL/gl.h $includeDir/os/opengl/GL/ - cp ./include/GL/gl_mangle.h $includeDir/os/opengl/GL/ - cp ./include/GL/glext.h $includeDir/os/opengl/GL/ + mkdir -p $includeDir/GL + cp ./include/GL/gl.h $includeDir/GL/ + cp ./include/GL/gl_mangle.h $includeDir/GL/ + cp ./include/GL/glext.h $includeDir/GL/ - # Symlink GL in kit to system GL directory - cd $includeDir - ln -snf os/opengl/GL GL + # Create GL symlink in opengl kit + symlinkRelative -s $includeDir/GL $includeDir/os/opengl/GL # devel package packageEntries devel \ From fa383dd65140c378b70d7f20106e6fbbeb556480 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Dec 2013 07:25:22 +0000 Subject: [PATCH 120/206] mesa: Flag 7.9.2 as tested on x86_gcc2 secondary --- sys-libs/mesa/mesa-7.9.2.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index 2d0e30d24..8aa51a19d 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -17,7 +17,7 @@ if [ $effectiveTargetArchitecture != x86 ]; then # for a different secondary architecture. ARCHITECTURES="$ARCHITECTURES x86" fi -SECONDARY_ARCHITECTURES="?x86_gcc2" +SECONDARY_ARCHITECTURES="x86_gcc2" PROVIDES=" mesa$secondaryArchSuffix = $portVersion compat >= 7.9 From e9e665c314a7d18f20ede81db8165c56a3befd79 Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Mon, 23 Dec 2013 14:41:39 +0000 Subject: [PATCH 121/206] Move license, copyright and description to the top --- haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe index 9fed0758c..e1a8bc377 100644 --- a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe +++ b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe @@ -1,10 +1,14 @@ -SUMMARY="Cherry Blossom is an iTunes style media player for the Haiku Operating System." +DESCRIPTION="Cherry Blossom is a 100% native application and does not try to be portable to any other operating system. Cherry Blossom uses Haiku specific API’s for handling media, so if Haiku can play your media files, then Cherry Blossom will also be able to play your files." +SUMMARY="Cherry Blossom is media player for the Haiku Operating System." HOMEPAGE="http://gitorious.org/cherry-blossom/" SRC_URI="git+http://gitorious.org/cherry-blossom/cherry-blossom.git" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +LICENSE="MIT" +COPYRIGHT="2010 Bryce Groff" + PROVIDES=" cherry_blosom = $portVersion app:cherry_blosom = $portVersion @@ -40,7 +44,3 @@ INSTALL() cp -a objects/Cherry_Blossom $appsDir addAppDeskbarSymlink ${appsDir}/Cherry_Blossom } -LICENSE="MIT" -COPYRIGHT="Copyright (c) 2010 Bryce Groff" - -DESCRIPTION=" Cherry Blossom is a 100% native application and does not try to be portable to any other operating system. Cherry Blossom uses Haiku specific API’s for handling media, so if Haiku can play your media files, then Cherry Blossom will also be able to play your files." From a8c79c70ccd4597ad780e4a144c560c1302da08d Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Mon, 23 Dec 2013 14:45:54 +0000 Subject: [PATCH 122/206] Remove mention of other operating system --- haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe index e1a8bc377..545814d11 100644 --- a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe +++ b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe @@ -1,4 +1,4 @@ -DESCRIPTION="Cherry Blossom is a 100% native application and does not try to be portable to any other operating system. Cherry Blossom uses Haiku specific API’s for handling media, so if Haiku can play your media files, then Cherry Blossom will also be able to play your files." +DESCRIPTION="Cherry Blossom is a 100% native application. Cherry Blossom uses Haiku specific API’s for handling media, so if Haiku can play your media files, then Cherry Blossom will also be able to play your files." SUMMARY="Cherry Blossom is media player for the Haiku Operating System." HOMEPAGE="http://gitorious.org/cherry-blossom/" SRC_URI="git+http://gitorious.org/cherry-blossom/cherry-blossom.git" From 7eb12d20946d1c4618ab973bb03befe5dec7d8f0 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Dec 2013 10:33:59 -0600 Subject: [PATCH 123/206] llvm: Properly flag 3.3 as broken to ensure proper Mesa build --- sys-devel/llvm/llvm-3.3.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/llvm/llvm-3.3.recipe b/sys-devel/llvm/llvm-3.3.recipe index f78c5b4ff..9dd0abcd1 100644 --- a/sys-devel/llvm/llvm-3.3.recipe +++ b/sys-devel/llvm/llvm-3.3.recipe @@ -8,9 +8,9 @@ REVISION="1" CHECKSUM_MD5="40564e1dc390f9844f1711c08b08e391" ARCHITECTURES="!x86 !x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - ARCHITECTURES="$ARCHITECTURES x86_gcc2" + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi -SECONDARY_ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="!x86" PROVIDES=" llvm$secondaryArchSuffix = $portVersion From 1b319035c326a41adcfaf8eff94fea6120e440a9 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 23 Dec 2013 10:34:53 -0600 Subject: [PATCH 124/206] mesa: Require proper llvm secondaryArchSuffix --- sys-libs/mesa/mesa-10.0.1.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe index c6de0d81b..cc30f8926 100644 --- a/sys-libs/mesa/mesa-10.0.1.recipe +++ b/sys-libs/mesa/mesa-10.0.1.recipe @@ -9,7 +9,7 @@ COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." LICENSE="MIT" SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0.1/MesaLib-10.0.1.tar.bz2" CHECKSUM_MD5="0a72ca5b36046a658bf6038326ff32ed" -REVISION="3" +REVISION="4" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -37,7 +37,7 @@ PATCHES="mesa-10.0.1.patchset" # changing LLVM versions shouldn't introduce any abi issues. BUILD_PREREQUIRES=" libxml2_python - llvm == 3.2 + llvm${secondaryArchSuffix} == 3.2 cmd:bison cmd:find cmd:flex From 2a3641bc154a0ab1d17a096823a1e8f20cb0048d Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 23 Dec 2013 12:29:53 -0700 Subject: [PATCH 125/206] Add gcc2 support for optipng Also switched it to use the system lib{png,z} --- media-gfx/optipng/optipng-0.7.4.recipe | 22 +++++---- media-gfx/optipng/patches/optipng-0.7.4.patch | 25 ----------- .../optipng/patches/optipng-0.7.4.patchset | 45 +++++++++++++++++++ 3 files changed, 55 insertions(+), 37 deletions(-) delete mode 100644 media-gfx/optipng/patches/optipng-0.7.4.patch create mode 100644 media-gfx/optipng/patches/optipng-0.7.4.patchset diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe index 354d2cac9..b20530acf 100644 --- a/media-gfx/optipng/optipng-0.7.4.recipe +++ b/media-gfx/optipng/optipng-0.7.4.recipe @@ -10,14 +10,8 @@ SRC_URI="http://prdownloads.sourceforge.net/optipng/optipng-0.7.4.tar.gz" CHECKSUM_MD5="8853d89aaf859065e95dcdf98b6bed73" LICENSE="Zlib" COPYRIGHT="2001-2012 Cosmin Truta" -REVISION="1" -ARCHITECTURES="?x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86" -if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - # x86_gcc2 is fine as primary target architecture as long as we're building - # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES x86_gcc2" -fi +REVISION="2" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" optipng$secondaryArchSuffix = $portVersion @@ -26,10 +20,14 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libpng + lib:libz " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libpng + devel:libz " BUILD_PREREQUIRES=" @@ -39,13 +37,13 @@ BUILD_PREREQUIRES=" cmd:ranlib " -PATCHES=" - optipng-0.7.4.patch - " +PATCHES="optipng-0.7.4.patchset" BUILD() { - ./configure -bindir=$binDir -mandir=$manDir + ./configure -bindir=$binDir -mandir=$manDir \ + -with-system-libpng \ + -with-system-zlib make } diff --git a/media-gfx/optipng/patches/optipng-0.7.4.patch b/media-gfx/optipng/patches/optipng-0.7.4.patch deleted file mode 100644 index 8f27d354f..000000000 --- a/media-gfx/optipng/patches/optipng-0.7.4.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8fc175d03be69e84940012866ffdfa0b7b6c865b Mon Sep 17 00:00:00 2001 -From: Luke -Date: Fri, 20 Dec 2013 17:11:40 +0000 -Subject: [PATCH] Remove reference to libm - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 5437b74..f7087fe 100755 ---- a/configure -+++ b/configure -@@ -305,7 +305,7 @@ sed_config=" - s#@ARFLAGS@#${ARFLAGS-cru}#g - s#@RANLIB@#${RANLIB-ranlib}#g - s#@LIBS@#${LIBS-}#g -- s#@LIBM@#${LIBM--lm}#g -+ s#@LIBM@#${LIBM-}#g - s#@LIBZ@#${LIBZ--lz}#g - s#@LIBPNG@#${LIBPNG--lpng}#g - s#@DIFF@#${DIFF-diff -b -u}#g --- -1.8.3.4 - diff --git a/media-gfx/optipng/patches/optipng-0.7.4.patchset b/media-gfx/optipng/patches/optipng-0.7.4.patchset new file mode 100644 index 000000000..aeb75492f --- /dev/null +++ b/media-gfx/optipng/patches/optipng-0.7.4.patchset @@ -0,0 +1,45 @@ +From 9aeb37585d609791981ff00956a99d54a9bf446e Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 23 Dec 2013 12:13:23 -0700 +Subject: applying patch optipng-0.7.4.patch + + +diff --git a/configure b/configure +index 5437b74..f7087fe 100755 +--- a/configure ++++ b/configure +@@ -305,7 +305,7 @@ sed_config=" + s#@ARFLAGS@#${ARFLAGS-cru}#g + s#@RANLIB@#${RANLIB-ranlib}#g + s#@LIBS@#${LIBS-}#g +- s#@LIBM@#${LIBM--lm}#g ++ s#@LIBM@#${LIBM-}#g + s#@LIBZ@#${LIBZ--lz}#g + s#@LIBPNG@#${LIBPNG--lpng}#g + s#@DIFF@#${DIFF-diff -b -u}#g +-- +1.8.3.4 + + +From 02727f980a432201225b91c51f7f76fad3d12cca Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 23 Dec 2013 12:16:17 -0700 +Subject: Remove Wextra from CFLAGS to make gcc2 happy + + +diff --git a/configure b/configure +index f7087fe..f3bca47 100755 +--- a/configure ++++ b/configure +@@ -192,7 +192,7 @@ rm -f $test.c $test.o + if test $gccish -ne 0 + then + CC="${CC-$cc}" +- CFLAGS="${CFLAGS--O2 -Wall -Wextra}" ++ CFLAGS="${CFLAGS--O2 -Wall}" + else + CC="${CC-cc}" + CFLAGS="${CFLAGS--O}" +-- +1.8.3.4 + From 10d97d7caff6943827fee56442095626362c229f Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 23 Dec 2013 14:57:01 -0700 Subject: [PATCH 126/206] Update keepassx to 2.0a5 --HG-- rename : app-admin/keepassx/keepassx-2.0a4.git.recipe => app-admin/keepassx/keepassx-2.0a5.recipe rename : app-admin/keepassx/patches/keepassx-2.0a4.git.patchset => app-admin/keepassx/patches/keepassx-2.0a5.patchset --- app-admin/keepassx/additional-files/keepassx.rdef | 2 +- .../{keepassx-2.0a4.git.recipe => keepassx-2.0a5.recipe} | 4 ++-- .../{keepassx-2.0a4.git.patchset => keepassx-2.0a5.patchset} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename app-admin/keepassx/{keepassx-2.0a4.git.recipe => keepassx-2.0a5.recipe} (95%) rename app-admin/keepassx/patches/{keepassx-2.0a4.git.patchset => keepassx-2.0a5.patchset} (100%) diff --git a/app-admin/keepassx/additional-files/keepassx.rdef b/app-admin/keepassx/additional-files/keepassx.rdef index b42fffa85..2ca7d82b6 100644 --- a/app-admin/keepassx/additional-files/keepassx.rdef +++ b/app-admin/keepassx/additional-files/keepassx.rdef @@ -7,7 +7,7 @@ resource app_version { minor = 0, variety = B_APPV_ALPHA, - internal = 4, + internal = 5, short_info = "Qt password manager", long_info = "" diff --git a/app-admin/keepassx/keepassx-2.0a4.git.recipe b/app-admin/keepassx/keepassx-2.0a5.recipe similarity index 95% rename from app-admin/keepassx/keepassx-2.0a4.git.recipe rename to app-admin/keepassx/keepassx-2.0a5.recipe index 1cd686d36..a8d9ddc3a 100644 --- a/app-admin/keepassx/keepassx-2.0a4.git.recipe +++ b/app-admin/keepassx/keepassx-2.0a5.recipe @@ -18,7 +18,7 @@ Especially someone who generates passwords frequently will appreciate this feature. " HOMEPAGE="http://www.keepassx.org/" -SRC_URI="git+https://github.com/keepassx/keepassx.git#755241df5c" +SRC_URI="git+https://github.com/keepassx/keepassx.git#2.0-alpha5" COPYRIGHT=" 2010-2012, Felix Geyer 2011-2012, Florian Geyer @@ -63,7 +63,7 @@ BUILD_PREREQUIRES=" cmd:xres " -PATCHES="keepassx-2.0a4.git.patchset" +PATCHES="keepassx-2.0a5.patchset" BUILD() { diff --git a/app-admin/keepassx/patches/keepassx-2.0a4.git.patchset b/app-admin/keepassx/patches/keepassx-2.0a5.patchset similarity index 100% rename from app-admin/keepassx/patches/keepassx-2.0a4.git.patchset rename to app-admin/keepassx/patches/keepassx-2.0a5.patchset From 78cbf32a67505cd78dd019604aaed9539ae1069d Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 24 Dec 2013 15:05:56 +0000 Subject: [PATCH 127/206] Added gnulib recipe. Just copies binary and related files to $dataDir/gnulib and symlinks binary to $binDir/gnulib_tool --- dev-libs/gnulib/gnulib-2013_12_17.recipe | 47 ++++++++++++++++++++++++ dev-libs/gnulib/gnulib-9999.recipe | 24 ------------ 2 files changed, 47 insertions(+), 24 deletions(-) create mode 100644 dev-libs/gnulib/gnulib-2013_12_17.recipe delete mode 100644 dev-libs/gnulib/gnulib-9999.recipe diff --git a/dev-libs/gnulib/gnulib-2013_12_17.recipe b/dev-libs/gnulib/gnulib-2013_12_17.recipe new file mode 100644 index 000000000..5a206279a --- /dev/null +++ b/dev-libs/gnulib/gnulib-2013_12_17.recipe @@ -0,0 +1,47 @@ +DESCRIPTION="Gnulib is a source code library that provides basic functionality to programs and libraries. +Many software packages make use of Gnulib to avoid reinventing the portability wheel. +Gnulib is intended to be the canonical source for most of the important “portability” and/or common files for software projects. +These are files intended to be shared at the source level; Gnulib is not a typical library meant to be installed and linked against. Thus, unlike most projects, Gnulib does not normally generate a source tarball distribution; instead, developers grab modules directly from the source repository." +SUMMARY="Gnulib is a library of common routines intended to be shared at the source level" +HOMEPAGE="http://www.gnu.org/software/gnulib" +SRC_URI="git+git://git.savannah.gnu.org/gnulib.git" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" +LICENSE="GNULIB" +COPYRIGHT="1985-2013 Free Software Foundation." + +PROVIDES=" + gnulib = $portVersion + cmd:gnulib_tool$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES="" # No build, no requirements + +BUILD_PREREQUIRES="" # No build, no requirements + +BUILD() +{ + # Nothing to build + exit 0 +} + +INSTALL() +{ + # Try to install gnulib-tool + + mkdir -p $dataDir/gnulib $binDir + + cp gnulib-tool $dataDir/gnulib/gnulib_tool # Fix binary name in help + cp -R check-copyright check-module posix-modules build-aux config doc lib m4 modules tests top $dataDir/gnulib + ln -s $dataDir/gnulib/gnulib_tool $binDir/gnulib_tool +} + +TEST() +{ + make check +} diff --git a/dev-libs/gnulib/gnulib-9999.recipe b/dev-libs/gnulib/gnulib-9999.recipe deleted file mode 100644 index 35cbc5db5..000000000 --- a/dev-libs/gnulib/gnulib-9999.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="Gnulib is a library of common routines intended to be shared at the source level" -HOMEPAGE="http://www.gnu.org/software/gnulib" -SRC_URI="git+git://git.savannah.gnu.org/gnulib.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -#CHECKSUM_MD5="" -BUILD() -{ - echo "gnulib isn't meant to be built." -} - -INSTALL() -{ - echo "gnulib isn't meant to be installed." -} - -TEST() -{ - make check -} - -LICENSE="GNULIB" -COPYRIGHT="1985-2011 Free Software Foundation." From 85fd14ca9a33ffb43326b1c6d03aa7fc92499a32 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Wed, 25 Dec 2013 00:03:36 -0500 Subject: [PATCH 128/206] Add OptiPNGTranslator recipe --- .../optipngtranslator-0.0.1.recipe | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe diff --git a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe new file mode 100644 index 000000000..4930cc182 --- /dev/null +++ b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe @@ -0,0 +1,50 @@ +SUMMARY="Save optimized PNG files" +DESCRIPTION=" + The OptiPNGTranslator for Haiku allows you to save images as + PNG files which have been optimized by OptiPNG. + " +HOMEPAGE="https://github.com/noryb009/OptiPNGTranslator/" +SRC_URI="git://github.com/noryb009/OptiPNGTranslator.git#8e3996a92d840f3c097cf954e001d4f371265161" +LICENSE="MIT" +COPYRIGHT="2013 Luke (noryb009)" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +if [ $buildArchitecture = x86_gcc2 ] && \ + [ $targetArchitecture = x86_gcc2 ]; then + optipngSuffix="_x86" +fi + +PROVIDES=" + optipngtranslator = $portVersion + app:optipngtranslator = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:optipng$optipngSuffix + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:as + cmd:gcc + makefile_engine + cmd:make + cmd:mkdepend + " + +BUILD() +{ + make \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` \ + TARGET_DIR=. +} + +INSTALL() +{ + mkdir -p $addOnsDir/Translators + cp OptiPNGTranslator $addOnsDir/Translators +} From 87aec6f02d7cfb90a6ced3fb8b0487a81a2d17ca Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Wed, 25 Dec 2013 16:45:30 +0000 Subject: [PATCH 129/206] Trying to make a functional gnulib recipe in x86 --- dev-libs/gnulib/gnulib-2013_12_17.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-libs/gnulib/gnulib-2013_12_17.recipe b/dev-libs/gnulib/gnulib-2013_12_17.recipe index 5a206279a..a60138d83 100644 --- a/dev-libs/gnulib/gnulib-2013_12_17.recipe +++ b/dev-libs/gnulib/gnulib-2013_12_17.recipe @@ -6,8 +6,8 @@ SUMMARY="Gnulib is a library of common routines intended to be shared at the sou HOMEPAGE="http://www.gnu.org/software/gnulib" SRC_URI="git+git://git.savannah.gnu.org/gnulib.git" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" LICENSE="GNULIB" COPYRIGHT="1985-2013 Free Software Foundation." @@ -17,7 +17,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES="" # No build, no requirements From 8000bae547c2e9951d15a0e3fc3e697cf79eeb14 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 24 Dec 2013 20:27:43 +0000 Subject: [PATCH 130/206] Added libidn recipe and patch (not sure if needed) --- dev-libs/libidn/libidn-1.9.recipe | 100 +++++++++++++++++++++++ dev-libs/libidn/patches/libidn-1.9.patch | 11 +++ 2 files changed, 111 insertions(+) create mode 100644 dev-libs/libidn/libidn-1.9.recipe create mode 100644 dev-libs/libidn/patches/libidn-1.9.patch diff --git a/dev-libs/libidn/libidn-1.9.recipe b/dev-libs/libidn/libidn-1.9.recipe new file mode 100644 index 000000000..e65e192d3 --- /dev/null +++ b/dev-libs/libidn/libidn-1.9.recipe @@ -0,0 +1,100 @@ +SUMMARY="libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications." +DESCRIPTION="GNU Libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications. Libidn's purpose is to encode and decode internationalized domain names." + +HOMEPAGE="http://www.gnu.org/software/libidn/" +SRC_URI="http://ftpmirror.gnu.org/libidn/libidn-1.9.tar.gz" +CHECKSUM_MD5="f4d794639564256a367566302611224e" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +REVISION="1" + +LICENSE=" + GNU GPL v3 + GNU LGPL v2.1 + " +COPYRIGHT=" + 2004-2008 Simon Josefsson + 1998, 1999 Tom Tromey + 2001 Red Hat Software + 1994-2007 Free Software Foundation + " + +PROVIDES=" + libidn = $portVersion + lib:libidn$secondaryArchSuffix = $portVersion + cmd:idn$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libiconv$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libiconv$secondaryArchSuffix + gettext${secondaryArchSuffix}_libintl + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:gnulib_tool$secondaryArchSuffix + cmd:gperf + cmd:help2man$secondaryArchSuffix + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:make + cmd:makeinfo + " + +PATCHES="libidn-1.9.patch" + +BUILD() +{ + gnulib_tool --import --local-dir=gl/override --source-base=gl \ + --m4-base=gl/m4 --libtool --no-vc-files \ + csharpcomp-script error fdl gendocs getopt gnupload gpl-3.0 lgpl-2.1 \ + maintainer-makefile progname version-etc + + gnulib_tool --import --local-dir=lib/gl/override --source-base=lib/gl \ + --m4-base=lib/gl/m4 --lgpl=2 --libtool --macro-prefix=lgl --no-vc-files \ + gettext-h stdint striconv strverscmp + + libtoolize --force --copy --install + + # Libtoolize is going to ask us to add the contents of some files + # to aclocal.m4 + for i in m4/{libtool,lt{options,sugar,version,~obsolete}}.m4; do cat $i >> aclocal.m4; done + + aclocal -I m4 -I gl/m4 -I lib/gl/m4 + autoconf + automake --add-missing + + runConfigure ./configure --enable-shared + make +} + +INSTALL() +{ + make install + + prepareInstalledDevelLib libidn + fixPkgconfig + + packageEntries devel \ + $developDir \ + $documentationDir +} + +# ------ devel package ------------------------------------------------------ + +PROVIDES_devel=" + libidn${secondaryArchSuffix}_devel = $portVersion + devel:libidn$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + libidn$secondaryArchSuffix == $portVersion base + " diff --git a/dev-libs/libidn/patches/libidn-1.9.patch b/dev-libs/libidn/patches/libidn-1.9.patch new file mode 100644 index 000000000..75210c0fe --- /dev/null +++ b/dev-libs/libidn/patches/libidn-1.9.patch @@ -0,0 +1,11 @@ +diff -ur libidn-1.9-orig/configure.ac libidn-1.9/configure.ac +--- libidn-1.9-orig/configure.ac 2013-12-24 15:51:24.035913728 +0000 ++++ libidn-1.9/configure.ac 2013-12-24 16:39:55.968622080 +0000 +@@ -28,6 +28,7 @@ + AC_SUBST(LT_REVISION, 38) + AC_SUBST(LT_AGE, 5) + ++AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_AUX_DIR([build-aux]) + AM_INIT_AUTOMAKE([1.10]) + AB_INIT From fbdc84afceda2c39ff517b530a812a950e47b1fe Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 24 Dec 2013 15:45:49 +0000 Subject: [PATCH 131/206] Added help2man recipe --- app-text/help2man/help2man-1.43.3.recipe | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 app-text/help2man/help2man-1.43.3.recipe diff --git a/app-text/help2man/help2man-1.43.3.recipe b/app-text/help2man/help2man-1.43.3.recipe new file mode 100644 index 000000000..9ccf6bb17 --- /dev/null +++ b/app-text/help2man/help2man-1.43.3.recipe @@ -0,0 +1,45 @@ +SUMMARY="help2man produces simple manual pages from the ‘--help’ and ‘--version’ output of other commands." +DESCRIPTION="help2man is a tool for automatically generating simple manual pages from program output. +This program is intended to provide an easy way for software authors to include a manual page in their distribution without having to maintain that document. +Given a program which produces reasonably standard ‘--help’ and ‘--version’ outputs, help2man can re-arrange that output into something which resembles a manual page." + +HOMEPAGE="http://www.gnu.org/software/help2man/" +SRC_URI="http://ftpmirror.gnu.org/help2man/help2man-1.43.3.tar.gz" +CHECKSUM_MD5="a84868db7c139238df8add5d86a0b54f" + +REVISION="1" + +LICENSE="GNU GPL v3" +COPYRIGHT="1997-2013 Free Software Foundation" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + help2man = $portVersion + cmd:help2man$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + cmd:perl + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:perl + " + +BUILD() +{ + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} From f16ec6872a0df57f76c8a85e20551fb7194dcca4 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 25 Dec 2013 12:26:43 -0800 Subject: [PATCH 132/206] Fixed antiword recipe --- app-text/antiword/antiword-0.37.recipe | 38 ++++++++++++------- app-text/antiword/patches/antiword-0.37.patch | 8 ++-- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/app-text/antiword/antiword-0.37.recipe b/app-text/antiword/antiword-0.37.recipe index 43db486d6..aa1b51eeb 100644 --- a/app-text/antiword/antiword-0.37.recipe +++ b/app-text/antiword/antiword-0.37.recipe @@ -15,33 +15,43 @@ COPYRIGHT="1998-2005 A.J. van Os" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PROVIDES=" - antiword = $portVersion - cmd:antiword = $portVersion -" + antiword = $portVersion + cmd:antiword = $portVersion + cmd:kantiword =$portVersion + " REQUIRES=" - haiku >= $haikuVersion -" + haiku >= $haikuVersion + " BUILD_REQUIRES=" -" + haiku_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:make -" + cmd:gcc + cmd:make + " PATCHES=" - antiword-0.37.patch -" + antiword-0.37.patch + " + +USER_SETTINGS_FILES=" + settings/antiword_settings + " BUILD() { - make --makefile Makefile.haiku + + make --makefile Makefile.haiku BINDIR=$binDir \ + ANTIWORD_SETTINGS=$settingsDir/antiword \ + ANTIWORD_DATA=$dataDir/antiword } INSTALL() { - make --makefile Makefile.haiku global_install + make --makefile Makefile.haiku global_install BINDIR=$binDir \ + ANTIWORD_SETTINGS=$settingsDir/antiword \ + ANTIWORD_DATA=$dataDir/antiword } diff --git a/app-text/antiword/patches/antiword-0.37.patch b/app-text/antiword/patches/antiword-0.37.patch index 02cf41c35..117c4e06a 100644 --- a/app-text/antiword/patches/antiword-0.37.patch +++ b/app-text/antiword/patches/antiword-0.37.patch @@ -51,11 +51,11 @@ diff -Naur antiword-0.37/Makefile.haiku antiword-0.37-haiku/Makefile.haiku + antiword\ + kantiword + -+LOCAL_INSTALL_DIR = $(HOME)/bin -+LOCAL_RESOURCES_DIR = $(HOME)/.antiword ++LOCAL_INSTALL_DIR = $(BINDIR) ++LOCAL_RESOURCES_DIR = $(ANTIWORD_SETTINGS) + -+GLOBAL_INSTALL_DIR = /boot/common/bin -+GLOBAL_RESOURCES_DIR = /boot/common/data/antiword ++GLOBAL_INSTALL_DIR = $(BINDIR) ++GLOBAL_RESOURCES_DIR = $(ANTIWORD_DATA) + +all: $(PROGS) + From 57d1b03533e9d5c2c068faa08785891ee03803a9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 25 Dec 2013 12:28:04 -0800 Subject: [PATCH 133/206] Enable libGL for libsdl --- media-libs/libsdl/libsdl-1.2.15.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index 7f01025c3..2fbd2668e 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Simple Direct Media Layer is a cross-platform development library d HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz" CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85" -REVISION="2" +REVISION="3" LICENSE="GNU LGPL v2.1" COPYRIGHT="1997-2012 Sam Lantinga" @@ -15,9 +15,10 @@ PROVIDES=" lib:libSDL$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0 lib:libSDL_1.2$secondaryArchSuffix = 0.11.4 compat >= 0 " + REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion -# lib:libGL$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -25,7 +26,7 @@ REQUIRES=" " BUILD_REQUIRES=" -# devel:libGL$secondaryArchSuffix + devel:libGL$secondaryArchSuffix devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix From 76d471398f26191d078462eac3d65931cba76b5a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 25 Dec 2013 12:38:16 -0800 Subject: [PATCH 134/206] Enable libGL for libsdl2 --- media-libs/libsdl2/libsdl2-2.0.1.recipe | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/media-libs/libsdl2/libsdl2-2.0.1.recipe b/media-libs/libsdl2/libsdl2-2.0.1.recipe index 335db0da9..83cf33207 100644 --- a/media-libs/libsdl2/libsdl2-2.0.1.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.1.recipe @@ -19,7 +19,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion -# lib:libGL$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -27,17 +27,15 @@ REQUIRES=" " BUILD_REQUIRES=" -# devel:mesa + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libGL$secondaryArchSuffix devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix - devel:libpng$secondaryArchSuffix >= 1.5 -# ^^ Haikuporter fails if we try to check this one? - devel:libjpeg$secondaryArchSuffix >= 9 - devel:libtiff$secondaryArchSuffix >= 3.9 + devel:libjpeg$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:autoconf cmd:libtool cmd:aclocal @@ -66,16 +64,16 @@ INSTALL() libSDL2-2.0 fixPkgconfig - fixDevelopLibDirReferences $binDir/sdl2-config + fixDevelopLibDirReferences $binDir/sdl2-config$secondaryArchSuffix packageEntries devel \ - $developDir $binDir/sdl2-config $dataDir + $developDir $binDir/sdl2-config$secondaryArchSuffix $dataDir } # ----- devel package ------------------------------------- PROVIDES_devel=" libsdl2${secondaryArchSuffix}_devel = $portVersion compat >= 2.0 - cmd:sdl2_config = $portVersion compat >= 2.0 + cmd:sdl2_config$secondaryArchSuffix = $portVersion compat >= 2.0 devel:libSDL2$secondaryArchSuffix = 2.0_0.1.0 compat >= 2.0_0 devel:libSDL2main$secondaryArchSuffix = 2.0_0.1.0 compat >= 2.0_0 devel:libSDL2_test$secondaryArchSuffix = 2.0_0.1.0 compat >= 2.0_0 From fdcfc804586101cf2e23768f24dcd15e32004753 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 25 Dec 2013 12:48:36 -0800 Subject: [PATCH 135/206] Updated taglib recipe, but will still need a bit more work for secondaryArchSuffix --- media-libs/taglib/taglib-1.7.2.recipe | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe index 878fcf5e8..28059eae7 100644 --- a/media-libs/taglib/taglib-1.7.2.recipe +++ b/media-libs/taglib/taglib-1.7.2.recipe @@ -1,5 +1,5 @@ SUMMARY="TabLib Audio Meta-Data Library" -DESCRIPTION="TagLib Audio Meta-Data Library" +DESCRIPTION="TagLib is a library for reading and editing the meta-data of several popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files." HOMEPAGE="http://github.com/taglib" SRC_URI="http://taglib.github.io/releases/taglib-1.7.2.tar.gz" CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720" @@ -13,43 +13,44 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" taglib$secondaryArchSuffix = $portVersion - cmd:taglib_config lib:libtag$secondaryArchSuffix = 1.7.2 compat >= 1.7 lib:libtag_c$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libz + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libz + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix - cmd:cmake$secondaryArchSuffix + cmd:cmake cmd:make " -SOURCE_DIR="$portVersionedName" +#SOURCE_DIR="$portVersionedName" BUILD() { cmake . -DCMAKE_INSTALL_PREFIX:PATH=$prefix \ -DBIN_INSTALL_DIR=$binDir \ - -DLIB_INSTALL_DIR=$developLibDir - make + -DLIB_INSTALL_DIR=$developLibDir \ + -DLIB_SUFFIX="/${secondaryArchSuffx/_/}" + make $jobArgs } -#-DINCLUDE_INSTALL_DIR=$developDir/headers \ + INSTALL() { make install mkdir -p $developDir/headers mv $prefix/include/taglib $developDir/headers + rm -rf $prefix/include prepareInstalledDevelLibs \ libtag \ @@ -67,6 +68,7 @@ PROVIDES_devel=" taglib${secondaryArchSuffix}_devel = $portVersion compat >= 1.7 devel:libtag$secondaryArchSuffix = 1.7.2 compat >= 1.7 devel:libtag_c$secondaryArchSuffix = 0.0.0 compat >= 0 + cmd:taglib_config$secondaryArchSuffix " REQUIRES_devel=" From db9ff2f3f484e77f80a41ca5e9ab0dd926edcadd Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 25 Dec 2013 13:19:55 -0800 Subject: [PATCH 136/206] Fixed apr url as reported in issue #73 --- dev-libs/apr/apr-1.4.6.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index d8b6ed15f..2e532b2bb 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -1,6 +1,6 @@ SUMMARY="Apache Portable Runtime Library" HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz" +SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.6.tar.gz" COPYRIGHT="2012 The Apache Software Foundation." LICENSE="Apache v2" CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb" From d97a2aabd96fa00b00b76d75a52ce8acf221ffb4 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 17:52:56 -0600 Subject: [PATCH 137/206] all: Don't use portVersionedName for SOURCE_DIR * portVersionedName contains the secondary architecture, so using it means secondary package builds fail. example: $portVersionedName is libwow_x86-0.0.0 when doing an x86 build on x86_gcc2 --- app-arch/bzip2/bzip2-1.0.6.recipe | 1 - app-arch/libarchive/libarchive-3.1.2.recipe | 1 - app-arch/tar/tar-1.26.recipe | 1 - app-doc/doxygen/doxygen-1.6.3.recipe | 1 - app-editors/nano/nano-2.2.6.recipe | 1 - app-misc/colordiff/colordiff-1.0.13.recipe | 1 - app-misc/getopt/getopt-1.1.5.recipe | 1 - app-shells/zsh/zsh-5.0.2.recipe | 1 - app-text/asciidoc/asciidoc-8.6.8.recipe | 1 - app-text/aspell/aspell-0.60.6.1.recipe | 1 - app-text/discount/discount-2.1.3.recipe | 1 - app-text/dos2unix/dos2unix-1.0.recipe | 1 - app-text/htmldoc/htmldoc-1.8.27.recipe | 1 - app-text/mdocml/mdocml-1.12.2.recipe | 1 - app-text/rman/rman-3.2.recipe | 1 - app-text/texi2html/texi2html-1.82.recipe | 1 - dev-lang/nasm/nasm-2.08.01.recipe | 1 - dev-lang/perl/perl-5.10.1.recipe | 1 - dev-lang/perl/perl-5.18.1.recipe | 1 - dev-lang/swig/swig-2.0.11.recipe | 1 - dev-lang/yasm/yasm-1.1.0.recipe | 1 - dev-lang/yasm/yasm-1.2.0.recipe | 1 - dev-libs/apr/apr-1.4.6.recipe | 1 - dev-libs/apr_util/apr_util-1.3.10.recipe | 1 - dev-libs/gmp/gmp-5.1.1.recipe | 2 -- dev-libs/libcss/libcss-0.2.0_git.recipe | 1 - dev-libs/libevent/libevent-1.4.14b.recipe | 2 +- dev-libs/libevent/libevent-2.0.21.recipe | 2 +- dev-libs/libparserutils/libparserutils-0.1.2_git.recipe | 1 - dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe | 1 - dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe | 1 - dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe | 1 - dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe | 1 - dev-libs/openssl/openssl-1.0.0d.recipe | 1 - dev-python/docutils/docutils-0.11.recipe | 1 - dev-python/dulwich/dulwich-0.9.1.recipe | 1 - dev-python/ordereddict/ordereddict-1.1.recipe | 1 - dev-scheme/chicken/chicken-4.8.0.5.recipe | 1 - dev-util/cmake/cmake-2.8.5.recipe | 1 - dev-util/cscope/cscope-15.7a.recipe | 1 - dev-util/ctags/ctags-5.8.recipe | 1 - dev-util/fastdep/fastdep-0.16.recipe | 1 - dev-util/global/global-6.2.9.recipe | 1 - dev-util/idutils/idutils-4.6.recipe | 1 - dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe | 1 - dev-util/patchutils/patchutils-0.3.3.recipe | 1 - dev-vcs/cvs/cvs-1.12.13.1.recipe | 1 - dev-vcs/git/git-1.7.10.2.recipe | 1 - dev-vcs/git/git-1.8.3.4.recipe | 1 - dev-vcs/mercurial/mercurial-2.2.2.recipe | 1 - dev-vcs/subversion/subversion-1.6.15.recipe | 1 - dev-vcs/subversion/subversion-1.6.18.recipe | 1 - haiku-apps/armyknife/armyknife-66.recipe | 1 - haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe | 1 - haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe | 1 - haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe | 1 - haiku-apps/mkdepend/mkdepend-1.7.recipe | 1 - haiku-apps/pe/pe-2.4.3_hg602.recipe | 1 - haiku-apps/pe/pe-2.4.3_hg606.recipe | 1 - haiku-apps/pe/pe-2.4.3_hg610.recipe | 1 - haiku-apps/pe/pe-2.4.3_hg611.recipe | 1 - haiku-apps/pe/pe-2.4.3_hg614.recipe | 1 - haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe | 1 - haiku-apps/vision/vision-0.9.7.r947.recipe | 1 - media-gfx/graphviz/graphviz-2.26.3.recipe | 1 - media-gfx/pngcrush/pngcrush-1.7.67.recipe | 2 +- media-libs/taglib/taglib-1.7.2.recipe | 1 - media-sound/lame/lame-3.99.5.recipe | 1 - net-misc/neon/neon-0.29.6.recipe | 1 - net-misc/openssh/openssh-5.8p2.recipe | 1 - net-misc/openssh/openssh-6.0p1.recipe | 1 - net-misc/rsync/rsync-3.1.0.recipe | 1 - net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe | 2 +- net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe | 1 - sys-apps/diffutils/diffutils-3.3.recipe | 1 - sys-apps/dtc/dtc-1.4.0.recipe | 2 +- sys-apps/ed/ed-1.7.recipe | 1 - sys-apps/file/file-5.15.recipe | 1 - sys-apps/gawk/gawk-3.1.8.recipe | 1 - sys-apps/grep/grep-2.14.recipe | 1 - sys-apps/groff/groff-1.20.1.recipe | 1 - sys-apps/man/man-1.6g.recipe | 1 - sys-apps/sed/sed-4.2.1.recipe | 1 - sys-devel/autoconf/autoconf-2.68.recipe | 1 - sys-devel/autoconf/autoconf-2.69.recipe | 1 - sys-devel/automake/automake-1.11.1.recipe | 1 - sys-devel/automake/automake-1.12.2.recipe | 1 - sys-devel/automake/automake-1.13.1.recipe | 1 - sys-devel/binutils/binutils-2.17_2013_04_21.recipe | 2 +- sys-devel/bison/bison-2.4.3.recipe | 1 - sys-devel/bison/bison-2.5.recipe | 2 +- sys-devel/flex/flex-2.5.35.recipe | 1 - sys-devel/jam/jam-2.5_2012_10_12.recipe | 2 +- sys-devel/libtool/libtool-2.4.recipe | 1 - sys-devel/m4/m4-1.4.16.recipe | 1 - sys-devel/make/make-3.82.recipe | 1 - sys-devel/patch/patch-2.7.1.recipe | 1 - sys-libs/readline/readline-6.2.recipe | 1 - sys-libs/slang/slang-2.2.4.recipe | 1 - www-client/w3m/w3m-0.5.3.recipe | 1 - 100 files changed, 8 insertions(+), 101 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index b13574a48..f9ffdcfcb 100644 --- a/app-arch/bzip2/bzip2-1.0.6.recipe +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -44,7 +44,6 @@ BUILD_PREREQUIRES=" cmd:sed " -#SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-arch/libarchive/libarchive-3.1.2.recipe b/app-arch/libarchive/libarchive-3.1.2.recipe index 4443a094d..ea29f56d2 100644 --- a/app-arch/libarchive/libarchive-3.1.2.recipe +++ b/app-arch/libarchive/libarchive-3.1.2.recipe @@ -94,7 +94,6 @@ REQUIRES_devel=" PATCHES="libarchive-3.1.2.patchset" -#SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index 4bb2b7dd7..8f5dcc2a0 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -43,7 +43,6 @@ BUILD_PREREQUIRES=" defineDebugInfoPackage tar \ $binDir/tar -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe index cc4ac12bf..b71b257ab 100644 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -39,7 +39,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe index 168ac8b4c..a820e115c 100644 --- a/app-editors/nano/nano-2.2.6.recipe +++ b/app-editors/nano/nano-2.2.6.recipe @@ -39,7 +39,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-misc/colordiff/colordiff-1.0.13.recipe b/app-misc/colordiff/colordiff-1.0.13.recipe index e28644734..c31aa1735 100644 --- a/app-misc/colordiff/colordiff-1.0.13.recipe +++ b/app-misc/colordiff/colordiff-1.0.13.recipe @@ -11,7 +11,6 @@ REVISION="1" ARCHITECTURES="any" LICENSE="GNU GPL v2" COPYRIGHT="2002-2012 Dave Ewart" -SOURCE_DIR="$portVersionedName" PATCHES="colordiff-1.0.13.patch" PROVIDES=" diff --git a/app-misc/getopt/getopt-1.1.5.recipe b/app-misc/getopt/getopt-1.1.5.recipe index 8cd7bf544..920f38b8d 100644 --- a/app-misc/getopt/getopt-1.1.5.recipe +++ b/app-misc/getopt/getopt-1.1.5.recipe @@ -22,7 +22,6 @@ LICENSE="GNU GPL v2" COPYRIGHT="1997-2012 Frodo Looijaard" ARCHITECTURES="x86 x86_gcc2" -SOURCE_DIR="$portVersionedName" PROVIDES=" getopt = $portVersion diff --git a/app-shells/zsh/zsh-5.0.2.recipe b/app-shells/zsh/zsh-5.0.2.recipe index 95f01ab0e..b3c0a5f82 100644 --- a/app-shells/zsh/zsh-5.0.2.recipe +++ b/app-shells/zsh/zsh-5.0.2.recipe @@ -36,7 +36,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-text/asciidoc/asciidoc-8.6.8.recipe b/app-text/asciidoc/asciidoc-8.6.8.recipe index b95ef81bf..cd4e26ef0 100644 --- a/app-text/asciidoc/asciidoc-8.6.8.recipe +++ b/app-text/asciidoc/asciidoc-8.6.8.recipe @@ -30,7 +30,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/app-text/aspell/aspell-0.60.6.1.recipe b/app-text/aspell/aspell-0.60.6.1.recipe index f58de8e60..04f7afdf2 100644 --- a/app-text/aspell/aspell-0.60.6.1.recipe +++ b/app-text/aspell/aspell-0.60.6.1.recipe @@ -65,7 +65,6 @@ REQUIRES_devel=" aspell == $portVersion " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/app-text/discount/discount-2.1.3.recipe b/app-text/discount/discount-2.1.3.recipe index 01a6664bf..44a76bbae 100644 --- a/app-text/discount/discount-2.1.3.recipe +++ b/app-text/discount/discount-2.1.3.recipe @@ -14,7 +14,6 @@ LICENSE="BSD (4-clause)" COPYRIGHT="2007-2012 David Loren Parsons" ARCHITECTURES="x86 x86_gcc2" CHECKSUM_MD5="a1a4eade44f8141e38f2be7f2ed56c98" -SOURCE_DIR="$portVersionedName" PROVIDES=" discount = $portVersion compat >= 2 diff --git a/app-text/dos2unix/dos2unix-1.0.recipe b/app-text/dos2unix/dos2unix-1.0.recipe index da241b4d2..b4cc9e89a 100644 --- a/app-text/dos2unix/dos2unix-1.0.recipe +++ b/app-text/dos2unix/dos2unix-1.0.recipe @@ -24,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:gcc " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe index f597e02da..a8849a6f8 100644 --- a/app-text/htmldoc/htmldoc-1.8.27.recipe +++ b/app-text/htmldoc/htmldoc-1.8.27.recipe @@ -38,7 +38,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/app-text/mdocml/mdocml-1.12.2.recipe b/app-text/mdocml/mdocml-1.12.2.recipe index 8455c8fdb..46e834274 100644 --- a/app-text/mdocml/mdocml-1.12.2.recipe +++ b/app-text/mdocml/mdocml-1.12.2.recipe @@ -13,7 +13,6 @@ COPYRIGHT="2008-2013 Ingo Schwarze, Kristaps Dzonsons" LICENSE="ISC" REVISION="1" ARCHITECTURES="x86 x86_gcc2" -SOURCE_DIR="$portVersionedName" PROVIDES=" mdocml = $portVersion diff --git a/app-text/rman/rman-3.2.recipe b/app-text/rman/rman-3.2.recipe index 8eedc8590..22fb11fd4 100644 --- a/app-text/rman/rman-3.2.recipe +++ b/app-text/rman/rman-3.2.recipe @@ -9,7 +9,6 @@ COPYRIGHT="2003 Thomas A. Phelps" SRC_URI="http://downloads.sourceforge.net/project/polyglotman/polyglotman/3.2/rman-3.2.tar.gz" CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6" PATCHES="rman-3.2.patch" -SOURCE_DIR="$portVersionedName" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe index 60e23953b..4c2ebd478 100644 --- a/app-text/texi2html/texi2html-1.82.recipe +++ b/app-text/texi2html/texi2html-1.82.recipe @@ -33,7 +33,6 @@ BUILD_PREREQUIRES=" cmd:perl " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-lang/nasm/nasm-2.08.01.recipe b/dev-lang/nasm/nasm-2.08.01.recipe index 7c47d5cab..0c4664f23 100644 --- a/dev-lang/nasm/nasm-2.08.01.recipe +++ b/dev-lang/nasm/nasm-2.08.01.recipe @@ -27,7 +27,6 @@ BUILD_PREREQUIRES=" cmd:perl " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index 586b5b5af..28cafe29d 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -85,7 +85,6 @@ GLOBAL_WRITABLE_FILES=" non-packaged/lib/perl5/site_perl/5.10.1/BePC-haiku directory " -SOURCE_DIR="$portVersionedName" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL BUILD() diff --git a/dev-lang/perl/perl-5.18.1.recipe b/dev-lang/perl/perl-5.18.1.recipe index fbdf7710c..a1f39b5df 100644 --- a/dev-lang/perl/perl-5.18.1.recipe +++ b/dev-lang/perl/perl-5.18.1.recipe @@ -97,7 +97,6 @@ GLOBAL_WRITABLE_FILES=" non-packaged/lib/perl5/site_perl/$portVersion/$perlArchName directory keep-old " -SOURCE_DIR="$portVersionedName" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL BUILD() diff --git a/dev-lang/swig/swig-2.0.11.recipe b/dev-lang/swig/swig-2.0.11.recipe index b746c7c55..c7a1652eb 100644 --- a/dev-lang/swig/swig-2.0.11.recipe +++ b/dev-lang/swig/swig-2.0.11.recipe @@ -28,7 +28,6 @@ CHECKSUM_MD5="291ba57c0acd218da0b0916c280dcbae" REVISION="1" ARCHITECTURES="?x86 ?x86_gcc2" -SOURCE_DIR="$portVersionedName" PROVIDES=" swig = $portVersion diff --git a/dev-lang/yasm/yasm-1.1.0.recipe b/dev-lang/yasm/yasm-1.1.0.recipe index 4ae067250..3bd64ea40 100644 --- a/dev-lang/yasm/yasm-1.1.0.recipe +++ b/dev-lang/yasm/yasm-1.1.0.recipe @@ -31,7 +31,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe index 70e7758f5..72376125f 100644 --- a/dev-lang/yasm/yasm-1.2.0.recipe +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -33,7 +33,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index 2e532b2bb..12ff0d6bd 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -28,7 +28,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/apr_util/apr_util-1.3.10.recipe b/dev-libs/apr_util/apr_util-1.3.10.recipe index d54f98417..eac650587 100644 --- a/dev-libs/apr_util/apr_util-1.3.10.recipe +++ b/dev-libs/apr_util/apr_util-1.3.10.recipe @@ -31,7 +31,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe index 8edc663a3..ae82b8f71 100644 --- a/dev-libs/gmp/gmp-5.1.1.recipe +++ b/dev-libs/gmp/gmp-5.1.1.recipe @@ -22,8 +22,6 @@ BUILD_REQUIRES=" cmd:make " -SOURE_DIR="$portVersionedName" - BUILD() { libtoolize --force --copy --install diff --git a/dev-libs/libcss/libcss-0.2.0_git.recipe b/dev-libs/libcss/libcss-0.2.0_git.recipe index 37944be56..95c448e3b 100644 --- a/dev-libs/libcss/libcss-0.2.0_git.recipe +++ b/dev-libs/libcss/libcss-0.2.0_git.recipe @@ -37,7 +37,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe index 3681bbc1a..854e20439 100644 --- a/dev-libs/libevent/libevent-1.4.14b.recipe +++ b/dev-libs/libevent/libevent-1.4.14b.recipe @@ -38,7 +38,7 @@ BUILD_PREREQUIRES=" cmd:libtoolize cmd:make " -SOURCE_DIR="$portVersionedName-stable" +SOURCE_DIR="libevent-${portVersion}-stable" PATCHES="libevent-1.4.14b.patch" diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index adde785c0..4091668cc 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -50,7 +50,7 @@ BUILD_PREREQUIRES=" cmd:libtoolize cmd:make " -SOURCE_DIR="$portVersionedName-stable" +SOURCE_DIR="libevent-${portVersion}-stable" PATCHES="libevent-2.0.21.patch" diff --git a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe index cd3f2e789..773612158 100644 --- a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe +++ b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe @@ -34,7 +34,6 @@ BUILD_PREREQUIRES=" cmd:perl " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe index 522d04a76..921e0572a 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe @@ -23,7 +23,6 @@ BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe index 9f14ce4ff..1a7e22288 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe @@ -23,7 +23,6 @@ BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe index 3d86900af..1f19d399e 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe @@ -27,7 +27,6 @@ BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe index 137b0efeb..5dc1ad5cb 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe +++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe @@ -31,7 +31,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe index 5bc4a71bd..8003a24bd 100644 --- a/dev-libs/openssl/openssl-1.0.0d.recipe +++ b/dev-libs/openssl/openssl-1.0.0d.recipe @@ -50,7 +50,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-python/docutils/docutils-0.11.recipe b/dev-python/docutils/docutils-0.11.recipe index 1843e0372..56bf9de62 100644 --- a/dev-python/docutils/docutils-0.11.recipe +++ b/dev-python/docutils/docutils-0.11.recipe @@ -17,7 +17,6 @@ LICENSE="Public Domain Python" REVISION="1" ARCHITECTURES="x86 x86_gcc2" -SOURCE_DIR="$portVersionedName" PROVIDES=" docutils = $portVersion diff --git a/dev-python/dulwich/dulwich-0.9.1.recipe b/dev-python/dulwich/dulwich-0.9.1.recipe index a0f4383a6..ef14719da 100644 --- a/dev-python/dulwich/dulwich-0.9.1.recipe +++ b/dev-python/dulwich/dulwich-0.9.1.recipe @@ -34,7 +34,6 @@ BUILD_PREREQUIRES=" cmd:gcc " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-python/ordereddict/ordereddict-1.1.recipe b/dev-python/ordereddict/ordereddict-1.1.recipe index 283e6ba3f..113e0e55e 100644 --- a/dev-python/ordereddict/ordereddict-1.1.recipe +++ b/dev-python/ordereddict/ordereddict-1.1.recipe @@ -13,7 +13,6 @@ LICENSE="MIT" REVISION="1" ARCHITECTURES="x86 x86_gcc2" -SOURCE_DIR="$portVersionedName" PROVIDES=" ordereddict = $portVersion diff --git a/dev-scheme/chicken/chicken-4.8.0.5.recipe b/dev-scheme/chicken/chicken-4.8.0.5.recipe index fd6eff435..a79f72325 100644 --- a/dev-scheme/chicken/chicken-4.8.0.5.recipe +++ b/dev-scheme/chicken/chicken-4.8.0.5.recipe @@ -8,7 +8,6 @@ LICENSE="BSD (2-clause)" COPYRIGHT="2008-2013 The Chicken Team 2000-2007 Felix L. Winkelmann" -SOURCE_DIR="$portVersionedName" ARCHITECTURES="?x86 ?x86_gcc2" PROVIDES=" diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe index bb36e152c..1aeea4b7c 100644 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -31,7 +31,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-util/cscope/cscope-15.7a.recipe b/dev-util/cscope/cscope-15.7a.recipe index af4f32cdd..8636e606d 100644 --- a/dev-util/cscope/cscope-15.7a.recipe +++ b/dev-util/cscope/cscope-15.7a.recipe @@ -18,7 +18,6 @@ ARCHITECTURES="x86 x86_gcc2" LICENSE="BSD (3-clause)" COPYRIGHT="1998-2000 The Santa Cruz Operation" -SOURCE_DIR="$portVersionedName" PATCHES="cscope-15.7a.patch" diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe index ada66ce26..2316e3d98 100644 --- a/dev-util/ctags/ctags-5.8.recipe +++ b/dev-util/ctags/ctags-5.8.recipe @@ -25,7 +25,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe index 8b20c2e5b..27460178e 100644 --- a/dev-util/fastdep/fastdep-0.16.recipe +++ b/dev-util/fastdep/fastdep-0.16.recipe @@ -28,7 +28,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-util/global/global-6.2.9.recipe b/dev-util/global/global-6.2.9.recipe index d2871ddb8..e6ea3dc58 100644 --- a/dev-util/global/global-6.2.9.recipe +++ b/dev-util/global/global-6.2.9.recipe @@ -17,7 +17,6 @@ LICENSE="GNU GPL v3" COPYRIGHT="2000-2013 Tama Communications Corporation 2007-2013 Free Software Foundation, Inc." -SOURCE_DIR="$portVersionedName" ARCHITECTURES="x86 x86_gcc2" PATCHES="global-6.2.9.patch" diff --git a/dev-util/idutils/idutils-4.6.recipe b/dev-util/idutils/idutils-4.6.recipe index 6dfc6310f..0f120bac7 100644 --- a/dev-util/idutils/idutils-4.6.recipe +++ b/dev-util/idutils/idutils-4.6.recipe @@ -19,7 +19,6 @@ CHECKSUM_MD5="99b572536377fcddb4d38e86a3c215fd" REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="1986-2012 Free Software Foundation, Inc." -SOURCE_DIR="$portVersionedName" ARCHITECTURES="x86 x86_gcc2" PATCHES="idutils-4.6.patchset" diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe index 7bdcadc5e..7ecec7633 100644 --- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe +++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe @@ -27,7 +27,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-util/patchutils/patchutils-0.3.3.recipe b/dev-util/patchutils/patchutils-0.3.3.recipe index 04e7517c7..9dcb4698c 100644 --- a/dev-util/patchutils/patchutils-0.3.3.recipe +++ b/dev-util/patchutils/patchutils-0.3.3.recipe @@ -28,7 +28,6 @@ CHECKSUM_MD5="b640b6b8af6183f83eacf7bd6d2460cb" REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2001-2013 Tim Waugh" -SOURCE_DIR="$portVersionedName" ARCHITECTURES="x86 x86_gcc2" PROVIDES=" diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index 90733f849..86927afbf 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -47,7 +47,6 @@ BUILD_PREREQUIRES=" cmd:nano " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe index 59acbc1d9..1f4011927 100644 --- a/dev-vcs/git/git-1.7.10.2.recipe +++ b/dev-vcs/git/git-1.7.10.2.recipe @@ -15,7 +15,6 @@ COPYRIGHT="2005-2012 Git Authors (see git web site for list)" SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz" CHECKSUM_MD5="2e2ee53243ab8e7cf10f15c5229c3fce" -SOURCE_DIR="$portVersionedName" PATCHES="git-1.7.10.2.patch" SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.7.10.2.tar.gz" diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe index 29cdc9ed1..a49785a80 100644 --- a/dev-vcs/git/git-1.8.3.4.recipe +++ b/dev-vcs/git/git-1.8.3.4.recipe @@ -15,7 +15,6 @@ COPYRIGHT="2005-2012 Git Authors (see git web site for list)" SRC_URI="http://git-core.googlecode.com/files/git-1.8.3.4.tar.gz" CHECKSUM_MD5="80eec3201a5d012913d287b85adaee8e" -SOURCE_DIR="$portVersionedName" PATCHES="git-1.8.3.4.patchset" SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.8.3.4.tar.gz" diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index 8439a5fa0..67e316361 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -34,7 +34,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe index 7f65e4efa..0fe86df65 100644 --- a/dev-vcs/subversion/subversion-1.6.15.recipe +++ b/dev-vcs/subversion/subversion-1.6.15.recipe @@ -64,7 +64,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index 310f8886f..b8f994d95 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -80,7 +80,6 @@ USER_SETTINGS_FILES=" settings/subversion directory " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/haiku-apps/armyknife/armyknife-66.recipe b/haiku-apps/armyknife/armyknife-66.recipe index ba8558809..740b2f82c 100644 --- a/haiku-apps/armyknife/armyknife-66.recipe +++ b/haiku-apps/armyknife/armyknife-66.recipe @@ -24,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:make cmd:unzip " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe index 174a7daa3..6411277fe 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe @@ -24,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe index e0d8b7520..682fca82e 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe @@ -24,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe index d73ddd84a..aa7ce58fe 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe @@ -24,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe index d79500d01..d3caf177a 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.recipe +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -24,7 +24,6 @@ BUILD_PREREQUIRES=" cmd:ld " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe index 12c5e075b..7b63d0768 100644 --- a/haiku-apps/pe/pe-2.4.3_hg602.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -43,7 +43,6 @@ USER_SETTINGS_FILES=" settings/pe directory " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/haiku-apps/pe/pe-2.4.3_hg606.recipe b/haiku-apps/pe/pe-2.4.3_hg606.recipe index 3b8507d15..03276a6b2 100644 --- a/haiku-apps/pe/pe-2.4.3_hg606.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg606.recipe @@ -43,7 +43,6 @@ USER_SETTINGS_FILES=" settings/pe directory " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/haiku-apps/pe/pe-2.4.3_hg610.recipe b/haiku-apps/pe/pe-2.4.3_hg610.recipe index cd5e867e4..8d59f898a 100644 --- a/haiku-apps/pe/pe-2.4.3_hg610.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg610.recipe @@ -41,7 +41,6 @@ USER_SETTINGS_FILES=" settings/pe directory " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/haiku-apps/pe/pe-2.4.3_hg611.recipe b/haiku-apps/pe/pe-2.4.3_hg611.recipe index 22439f93f..170f6020e 100644 --- a/haiku-apps/pe/pe-2.4.3_hg611.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg611.recipe @@ -45,7 +45,6 @@ USER_SETTINGS_FILES=" settings/pe directory " -SOURCE_DIR="$portVersionedName" PATCHES=" pe-2.4.3_hg611.patch diff --git a/haiku-apps/pe/pe-2.4.3_hg614.recipe b/haiku-apps/pe/pe-2.4.3_hg614.recipe index bf1a6eb7a..7a18426da 100644 --- a/haiku-apps/pe/pe-2.4.3_hg614.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg614.recipe @@ -45,7 +45,6 @@ USER_SETTINGS_FILES=" settings/pe directory " -SOURCE_DIR="$portVersionedName" PATCHES=" pe-2.4.3_hg611.patch3 diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe index 903c58163..2c7d52b42 100644 --- a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe +++ b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe @@ -32,7 +32,6 @@ BUILD_PREREQUIRES=" cmd:unzip cmd:xres " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/haiku-apps/vision/vision-0.9.7.r947.recipe b/haiku-apps/vision/vision-0.9.7.r947.recipe index 4a899e921..3143c09b1 100644 --- a/haiku-apps/vision/vision-0.9.7.r947.recipe +++ b/haiku-apps/vision/vision-0.9.7.r947.recipe @@ -32,7 +32,6 @@ USER_SETTINGS_FILES=" settings/Vision directory " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe index eb05ab454..db569ac21 100644 --- a/media-gfx/graphviz/graphviz-2.26.3.recipe +++ b/media-gfx/graphviz/graphviz-2.26.3.recipe @@ -34,7 +34,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/media-gfx/pngcrush/pngcrush-1.7.67.recipe b/media-gfx/pngcrush/pngcrush-1.7.67.recipe index c35be6463..e1e8590a9 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.67.recipe +++ b/media-gfx/pngcrush/pngcrush-1.7.67.recipe @@ -17,7 +17,7 @@ COPYRIGHT="1998-2009 Glenn Randers-Pehrson 2005 Greg Roelofs" ARCHITECTURES="x86 x86_gcc2" -SOURCE_DIR="${portVersionedName}-nolib" +SOURCE_DIR="pngcrush-${portVersion}-nolib" PROVIDES=" pngcrush = $portVersion compat >= 1.7 diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe index 28059eae7..422954734 100644 --- a/media-libs/taglib/taglib-1.7.2.recipe +++ b/media-libs/taglib/taglib-1.7.2.recipe @@ -33,7 +33,6 @@ BUILD_PREREQUIRES=" cmd:make " -#SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe index 5f6b8b0b3..b7acf7cf8 100644 --- a/media-sound/lame/lame-3.99.5.recipe +++ b/media-sound/lame/lame-3.99.5.recipe @@ -33,7 +33,6 @@ BUILD_REQUIRES=" " PATCHES="lame-3.99.5.patch" -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index 19118733b..6b71d573e 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -59,7 +59,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe index 8b0c28a9f..b149e3b18 100644 --- a/net-misc/openssh/openssh-5.8p2.recipe +++ b/net-misc/openssh/openssh-5.8p2.recipe @@ -50,7 +50,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index 7bb7085e7..b8316422b 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -70,7 +70,6 @@ PACKAGE_USERS=" " PACKAGE_GROUPS="sshd" -SOURCE_DIR="$portVersionedName" PATCH() { diff --git a/net-misc/rsync/rsync-3.1.0.recipe b/net-misc/rsync/rsync-3.1.0.recipe index 3af0133bf..44c28ca89 100644 --- a/net-misc/rsync/rsync-3.1.0.recipe +++ b/net-misc/rsync/rsync-3.1.0.recipe @@ -39,7 +39,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe index e6dd12837..a13ea3c74 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe @@ -30,7 +30,7 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName/wpa_supplicant" +SOURCE_DIR="wpa_supplicant-${portVersion}/wpa_supplicant" BUILD() { diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe index e40f8f37e..e9a67a6a5 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe @@ -31,7 +31,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/diffutils/diffutils-3.3.recipe b/sys-apps/diffutils/diffutils-3.3.recipe index 5391d5f56..583fc5da9 100644 --- a/sys-apps/diffutils/diffutils-3.3.recipe +++ b/sys-apps/diffutils/diffutils-3.3.recipe @@ -46,7 +46,6 @@ BUILD_PREREQUIRES=" PATCHES="diffutils-3.3.patchset" -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/dtc/dtc-1.4.0.recipe b/sys-apps/dtc/dtc-1.4.0.recipe index 907703ff7..387681a71 100644 --- a/sys-apps/dtc/dtc-1.4.0.recipe +++ b/sys-apps/dtc/dtc-1.4.0.recipe @@ -33,7 +33,7 @@ BUILD_PREREQUIRES=" cmd:make " -PATCHES="${portVersionedName}.patch" +PATCHES="dtc-${portVersion}.patch" BUILD() { diff --git a/sys-apps/ed/ed-1.7.recipe b/sys-apps/ed/ed-1.7.recipe index 1ce1ffa25..d1352e658 100644 --- a/sys-apps/ed/ed-1.7.recipe +++ b/sys-apps/ed/ed-1.7.recipe @@ -25,7 +25,6 @@ BUILD_REQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/file/file-5.15.recipe b/sys-apps/file/file-5.15.recipe index 6878f1668..b2f370b93 100644 --- a/sys-apps/file/file-5.15.recipe +++ b/sys-apps/file/file-5.15.recipe @@ -52,7 +52,6 @@ REQUIRES_devel=" PATCHES="file-5.15.patch" -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe index 0b1fe50e5..e2e5a4cdf 100644 --- a/sys-apps/gawk/gawk-3.1.8.recipe +++ b/sys-apps/gawk/gawk-3.1.8.recipe @@ -36,7 +36,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index 07bed6a21..fc3a7c32e 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -45,7 +45,6 @@ defineDebugInfoPackage grep \ $binDir/fgrep \ $binDir/grep -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe index 66cbd7eb0..49639b32d 100644 --- a/sys-apps/groff/groff-1.20.1.recipe +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -68,7 +68,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" DEPEND="" BUILD() diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index 2a0a618aa..b4c8456c4 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -62,7 +62,6 @@ GLOBAL_WRITABLE_FILES=" settings/man.conf keep-old " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index 7038c8e07..d7f82e46d 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -38,7 +38,6 @@ BUILD_PREREQUIRES=" defineDebugInfoPackage sed \ $binDir/sed -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 9065d079d..70b5deb7b 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -45,7 +45,6 @@ BUILD_PREREQUIRES=" " BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index d754e0e88..8e56bcf97 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -49,7 +49,6 @@ BUILD_PREREQUIRES=" " BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe index 41723ca7c..bfa7103d1 100644 --- a/sys-devel/automake/automake-1.11.1.recipe +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -39,7 +39,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/automake/automake-1.12.2.recipe b/sys-devel/automake/automake-1.12.2.recipe index c91eb34bc..d70818f7e 100644 --- a/sys-devel/automake/automake-1.12.2.recipe +++ b/sys-devel/automake/automake-1.12.2.recipe @@ -42,7 +42,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index 2b271b2b6..3195941f6 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -42,7 +42,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe index 384391eaa..4b17e93a7 100644 --- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe +++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe @@ -50,7 +50,7 @@ BUILD_PREREQUIRES=" cmd:tar " -SOURCE_DIR="$portVersionedName/legacy/binutils" +SOURCE_DIR="binutils-$portVersion/legacy/binutils" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL binutilsDir=$(pwd) diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index 1263bfbda..c6da80506 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -42,7 +42,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/bison/bison-2.5.recipe b/sys-devel/bison/bison-2.5.recipe index 2d61f06b9..c82ef16fc 100644 --- a/sys-devel/bison/bison-2.5.recipe +++ b/sys-devel/bison/bison-2.5.recipe @@ -20,7 +20,7 @@ REVISION="1" ARCHITECTURES="?x86" -PATCHES="${portVersionedName}.patch" +PATCHES="bison-${portVersion}.patch" PROVIDES=" bison = $portVersion compat >= 2.5 diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 3a5ac50a0..e568bb789 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -37,7 +37,6 @@ BUILD_PREREQUIRES=" cmd:makeinfo " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/jam/jam-2.5_2012_10_12.recipe b/sys-devel/jam/jam-2.5_2012_10_12.recipe index 713fa098f..37e98f628 100644 --- a/sys-devel/jam/jam-2.5_2012_10_12.recipe +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -42,7 +42,7 @@ BUILD_PREREQUIRES=" cmd:ld " -SOURCE_DIR="$portVersionedName/jam" +SOURCE_DIR="jam-${portVersion}/jam" BUILD() { diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index cec49589f..e9f5a42c3 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -45,7 +45,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index 31d1cf934..e3c3a4491 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -41,7 +41,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index 67c416f55..192519546 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -36,7 +36,6 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-devel/patch/patch-2.7.1.recipe b/sys-devel/patch/patch-2.7.1.recipe index 43966cda9..37388be0e 100644 --- a/sys-devel/patch/patch-2.7.1.recipe +++ b/sys-devel/patch/patch-2.7.1.recipe @@ -27,7 +27,6 @@ BUILD_PREREQUIRES=" cmd:gcc " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe index a261402a2..7526a15f9 100644 --- a/sys-libs/readline/readline-6.2.recipe +++ b/sys-libs/readline/readline-6.2.recipe @@ -34,7 +34,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" BUILD() { diff --git a/sys-libs/slang/slang-2.2.4.recipe b/sys-libs/slang/slang-2.2.4.recipe index 5fd2852d7..45cd8e32a 100644 --- a/sys-libs/slang/slang-2.2.4.recipe +++ b/sys-libs/slang/slang-2.2.4.recipe @@ -51,7 +51,6 @@ BUILD_PREREQUIRES=" cmd:ncurses5_config " -SOURCE_DIR="$portVersionedName" GLOBAL_WRITABLE_FILES=" settings/slsh.rc keep-old diff --git a/www-client/w3m/w3m-0.5.3.recipe b/www-client/w3m/w3m-0.5.3.recipe index 01a25beed..64abaf33e 100644 --- a/www-client/w3m/w3m-0.5.3.recipe +++ b/www-client/w3m/w3m-0.5.3.recipe @@ -14,7 +14,6 @@ LICENSE="W3M" COPYRIGHT="1994-2011 Akinori ITO 2002-2011 Hironori SAKAMOTO 2002-2011 Fumitoshi UKAI" -SOURCE_DIR="$portVersionedName" PATCHES="w3m-0.5.3.patch" From abe988f6a9dd727217cb2856bf94482889662ef6 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 17:56:03 -0600 Subject: [PATCH 138/206] taglib: stop silly wip name * Flagging as broken on all architectures should be enough to prevent it from being used --- ...-1.9.1.broken-recipe => taglib-1.9.1.recipe} | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) rename media-libs/taglib/{WIP-taglib-1.9.1.broken-recipe => taglib-1.9.1.recipe} (96%) diff --git a/media-libs/taglib/WIP-taglib-1.9.1.broken-recipe b/media-libs/taglib/taglib-1.9.1.recipe similarity index 96% rename from media-libs/taglib/WIP-taglib-1.9.1.broken-recipe rename to media-libs/taglib/taglib-1.9.1.recipe index fa7950f2a..173551bc4 100644 --- a/media-libs/taglib/WIP-taglib-1.9.1.broken-recipe +++ b/media-libs/taglib/taglib-1.9.1.recipe @@ -6,7 +6,7 @@ CHECKSUM_MD5="0d35df96822bbd564c5504cb3c2e4d86" COPYRIGHT="2002-2013 Scott Wheeler" LICENSE="GNU LGPL v2 MPL v1.1 - " + " REVISION="1" ARCHITECTURES="!x86 !x86_64" @@ -18,7 +18,7 @@ PROVIDES=" lib:libtag$secondaryArchSuffix = 1.9.1 compat >= 1.9 lib:libtag_c$secondaryArchSuffix = 0.0.0 compat >= 0 " - + REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libz @@ -35,29 +35,28 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" - -BUILD() +BUILD() { cmake . -DCMAKE_INSTALL_PREFIX:PATH=$prefix \ -DBIN_INSTALL_DIR=$binDir \ -DLIB_INSTALL_DIR=$developLibDir make } + #-DINCLUDE_INSTALL_DIR=$developDir/headers \ INSTALL() { make install - + mkdir -p $developDir/headers mv $prefix/include/taglib $developDir/headers - + prepareInstalledDevelLibs \ libtag \ libtag_c - + fixPkgconfig - + # devel package packageEntries devel \ $developDir \ From c40c7f837ba8e4c32a6a73ce41f36a5e3207bea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 26 Dec 2013 00:48:47 +0000 Subject: [PATCH 139/206] Agg 2.5 --- x11-libs/agg/agg-2.5.recipe | 66 +++++++++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe index e5d686489..a84cb6e4f 100644 --- a/x11-libs/agg/agg-2.5.recipe +++ b/x11-libs/agg/agg-2.5.recipe @@ -1,27 +1,65 @@ +SUMMARY="Anti-Grain Geometry (AGG)" DESCRIPTION="Anti-Grain Geometry (AGG) is an Open Source, free of charge graphic library, written in industrially standard C++." HOMEPAGE="http://antigrain.com" SRC_URI="http://www.antigrain.com/agg-2.5.tar.gz" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="0229a488bc47be10a2fee6cf0b2febd6" +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2006 Maxim Shemanarev" + +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + lib:libagg = $portVersion +" +REQUIRES=" + haiku >= $haikuVersion + lib:libsdl +" +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libsdl +" +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + cmd:autoconf + cmd:automake + cmd:ld + cmd:libtoolize +" + +SOURCE_DIR="agg-2.5" + BUILD() { - cd agg-2.5 - libtoolize --force --copy --install - aclocal - autoheader - autoconf - automake --foreign --add-missing --ignore-deps - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + #libtoolize --force --copy --install + #aclocal + #autoheader + #autoconf + #automake --foreign --add-missing --ignore-deps + #./configure --prefix=$prefix + #make + cd src + g++ -o libagg.so -shared -fPIC *.cpp ctrl/*.cpp -I../include -lbe -ltranslation } INSTALL() { - cd agg-2.5 - make install DESTDIR=${DESTDIR} + mkdir -p $libDir + mkdir -p $developDir/headers/agg + mkdir -p $developLibDir + + cp src/libagg.so $libDir + cp src/libagg.so $developLibDir + cp -r include/* $developDir/headers/agg/ + packageEntries devel \ + $developDir } +PROVIDES_devel=" + devel:libagg = $portVersion +" +REQUIRES_devel=" + lib:libagg == $portVersion base +" -LICENSE="GNU GPL v2" -COPYRIGHT="2002-2006 Maxim Shemanarev" From c86b0c5ec49904306a7e25f3e9064d10deef8d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 26 Dec 2013 00:50:16 +0000 Subject: [PATCH 140/206] Gnash 0.8.10 --- media-video/gnash/gnash-0.8.10.recipe | 97 +++++++++++++++++++ media-video/gnash/patches/GnashImageGif.patch | 14 +++ media-video/gnash/patches/utility.patch | 13 +++ 3 files changed, 124 insertions(+) create mode 100644 media-video/gnash/gnash-0.8.10.recipe create mode 100644 media-video/gnash/patches/GnashImageGif.patch create mode 100644 media-video/gnash/patches/utility.patch diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe new file mode 100644 index 000000000..855f94d9b --- /dev/null +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -0,0 +1,97 @@ +SUMMARY="Gnash" +DESCRIPTION="Gnash" +HOMEPAGE="http://www.gnu.org/software/gnash/" +SRC_URI="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2" +CHECKSUM_MD5="63e9f79c41d93d48c5a2fa94856548c4" +COPYRIGHT="2005-2012 Free Software Foundation" +LICENSE="GNU GPL v3" +REVISION="1" + +DISABLE_SOURCE_PACKAGE=yes + +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 x86_64" + +PROVIDES=" + gnash$secondaryArchSuffix = $portVersion +" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libgif$secondaryArchSuffix + lib:libavcodec$secondaryArchSuffix + lib:libspeex$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + boost_thread$secondaryArchSuffix + boost_program_options$secondaryArchSuffix + boost_iostreams$secondaryArchSuffix + boost_serialization$secondaryArchSuffix + boost_date_time$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libsdl_sound$secondaryArchSuffix + lib:libagg$secondaryArchSuffix + #lib:libfreetype$secondaryArchSuffix >= 2.5.0.1 + #lib:libfontconfig$secondaryArchSuffix +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libgif$secondaryArchSuffix + devel:libavcodec$secondaryArchSuffix + devel:libspeex$secondaryArchSuffix + devel:libexpat$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + boost_devel$secondaryArchSuffix + boost_thread$secondaryArchSuffix + boost_program_options$secondaryArchSuffix + boost_iostreams$secondaryArchSuffix + boost_serialization$secondaryArchSuffix + boost_date_time$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix + devel:libsdl_sound$secondaryArchSuffix + devel:libagg$secondaryArchSuffix + #devel:libfontconfig$secondaryArchSuffix + #devel:libfreetype$secondaryArchSuffix >= 2.5.0.1 +" +BUILD_PREREQUIRES=" + cmd:pkg_config + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make +" + +SOURCE_DIR="gnash-0.8.10" + +PATCHES=" + GnashImageGif.patch + utility.patch +" + +BUILD() +{ + runConfigure ./configure --enable-renderer=agg --enable-media=ffmpeg \ + --enable-gui=sdl --enable-sound=sdl --without-gconf --disable-extensions \ + --with-agg-incl=$portPackageLinksDir/devel~libagg/develop/headers/agg \ + --with-agg-lib=$portPackageLinksDir/lib~libagg/lib/ + make +} +INSTALL() +{ + make install +} +TEST() +{ + make check +} diff --git a/media-video/gnash/patches/GnashImageGif.patch b/media-video/gnash/patches/GnashImageGif.patch new file mode 100644 index 000000000..3d3e502c7 --- /dev/null +++ b/media-video/gnash/patches/GnashImageGif.patch @@ -0,0 +1,14 @@ +diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp +index eeba4b7..bddb452 100644 +--- a/libbase/GnashImageGif.cpp ++++ b/libbase/GnashImageGif.cpp +@@ -269,7 +269,8 @@ GifInput::processRecord(GifRecordType record) + void + GifInput::read() + { +- _gif = DGifOpen(_inStream.get(), &readData); ++ int error_code; ++ _gif = DGifOpen(_inStream.get(), &readData, &error_code); + + GifRecordType record; + diff --git a/media-video/gnash/patches/utility.patch b/media-video/gnash/patches/utility.patch new file mode 100644 index 000000000..865733ee0 --- /dev/null +++ b/media-video/gnash/patches/utility.patch @@ -0,0 +1,13 @@ +diff --git a/libbase/utility.h b/libbase/utility.h +index 8b9f48c..51ea858 100644 +--- a/libbase/utility.h ++++ b/libbase/utility.h +@@ -61,7 +61,7 @@ namespace std + }; + #endif + +-#if defined(__HAIKU__) ++#if defined(__HAIKU_OLD) + namespace std { + class wstring : public std::basic_string + { From a5a25257626fb5053a02eb3ac982d144b9bb40a8 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 19:23:49 -0600 Subject: [PATCH 141/206] libevent: Looking for lib:libnetwork which is not provided * While it built, wouldn't install due to this * Maybe haiku${secondaryArchSuffix} is supposed to have this provides, but currently doesn't --- dev-libs/libevent/libevent-2.0.21.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index 4091668cc..189d22bfb 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -7,7 +7,7 @@ CHECKSUM_MD5="b2405cc9ebf264aa47ff615d9de527a2" LICENSE="BSD (3-clause)" COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86" @@ -29,11 +29,11 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libnetwork$secondaryArchSuffix >= $haikuVersion lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix - lib:libnetwork >= $haikuVersion " +# haiku${secondaryArchSuffix} doesn't define included libraries yet +# lib:libnetwork$secondaryArchSuffix >= $haikuVersion BUILD_REQUIRES=" devel:libssl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix From 5f9ccf48589b9eaa79f19607b350d3033a829d1b Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 19:32:22 -0600 Subject: [PATCH 142/206] libevent: Actually provide libevent * Would prevent other packages from using it properly and prevent proper _devel installation --- dev-libs/libevent/libevent-2.0.21.recipe | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index 189d22bfb..9a1b241b8 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -7,25 +7,24 @@ CHECKSUM_MD5="b2405cc9ebf264aa47ff615d9de527a2" LICENSE="BSD (3-clause)" COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86" - SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" + libevent${secondaryArchSuffix} = ${portVersion} cmd:event_rpcgen.py - lib:libevent$secondaryArchSuffix = 2.0_5.1.9 compat >= 2.0_5 lib:libevent$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_openssl_2.0$secondaryArchSuffix= 5.1.9 compat >= 5 + lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_openssl$secondaryArchSuffix= 5.1.9 compat >= 5 + lib:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion @@ -99,7 +98,6 @@ PROVIDES_devel=" lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - devel:libevent$secondaryArchSuffix = 2.0_5.1.9 compat >= 2.0_5 devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5 devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 @@ -112,7 +110,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - libevent$secondaryArchSuffix == $portVersion base + libevent$secondaryArchSuffix == $portVersion base devel:libssl devel:libcrypto " From 95121224b7bf8711cea56885ba8b936b7a8e9b05 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 20:11:19 -0600 Subject: [PATCH 143/206] transmission: Fix patch * No work on recipe as this is GCI, just repair patch prefix --- net-p2p/transmission/patches/transmission-2.75.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net-p2p/transmission/patches/transmission-2.75.patch b/net-p2p/transmission/patches/transmission-2.75.patch index 91a47f0a3..4aa1b4cbe 100644 --- a/net-p2p/transmission/patches/transmission-2.75.patch +++ b/net-p2p/transmission/patches/transmission-2.75.patch @@ -1,6 +1,6 @@ -diff -Naur transmission-2.75/third-party/miniupnp/connecthostport.c transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/connecthostport.c +diff -Naur transmission-2.75/third-party/miniupnp/connecthostport.c transmission-2.75-haiku/third-party/miniupnp/connecthostport.c --- transmission-2.75/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 -+++ transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 ++++ transmission-2.75-haiku/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 @@ -24,6 +24,7 @@ #else /* #ifdef _WIN32 */ #include @@ -9,9 +9,9 @@ diff -Naur transmission-2.75/third-party/miniupnp/connecthostport.c transmission #include #define closesocket close #include -diff -Naur transmission-2.75/third-party/miniupnp/miniupnpc.c transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/miniupnpc.c +diff -Naur transmission-2.75/third-party/miniupnp/miniupnpc.c transmission-2.75-haiku/third-party/miniupnp/miniupnpc.c --- transmission-2.75/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 -+++ transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 ++++ transmission-2.75-haiku/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 @@ -17,7 +17,7 @@ #endif #endif @@ -21,9 +21,9 @@ diff -Naur transmission-2.75/third-party/miniupnp/miniupnpc.c transmission-2.75- #define HAS_IP_MREQN #endif -diff -Naur transmission-2.75/third-party/miniupnp/portlistingparse.c transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/portlistingparse.c +diff -Naur transmission-2.75/third-party/miniupnp/portlistingparse.c transmission-2.75-haiku/third-party/miniupnp/portlistingparse.c --- transmission-2.75/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 -+++ transmission-2.75-haiku/transmission-2.75/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 ++++ transmission-2.75-haiku/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 @@ -28,7 +28,7 @@ /* Helper function */ From 0d8ce154e2c27e4ee1c62484bcafc6f6f906ddeb Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Thu, 26 Dec 2013 02:13:56 +0000 Subject: [PATCH 144/206] Add BeVexed recipe --- haiku-games/BeVexed/bevexed-1.1.recipe | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 haiku-games/BeVexed/bevexed-1.1.recipe diff --git a/haiku-games/BeVexed/bevexed-1.1.recipe b/haiku-games/BeVexed/bevexed-1.1.recipe new file mode 100644 index 000000000..a23ae9a65 --- /dev/null +++ b/haiku-games/BeVexed/bevexed-1.1.recipe @@ -0,0 +1,46 @@ +SUMMARY="A maddeningly-addictive puzzle game." +DESCRIPTION="A maddeningly-addictive puzzle game. +The concept is simple: put the tiles in the grid on the left such that the numbers match wherever 2 tiles touch." +HOMEPAGE="https://github.com/HaikuArchives/BeVexed" +SRC_URI="git+https://github.com/HaikuArchives/BeVexed" +REVISION="1" + +LICENSE="MIT" +COPYRIGHT="2006 DarkWyrm" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + BeVexed = $portVersion + app:BeVexed = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:make + cmd:mkdepend + " + +BUILD() +{ + cd source + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + cd source + mkdir -p $appsDir + cp -a objects/BeVexed $appsDir + addAppDeskbarSymlink $appsDir/BeVexed +} From 9db398a240675e9e2a0e7f5681ed494c91ff13b7 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 20:25:04 -0600 Subject: [PATCH 145/206] glu: Fix GLU for new libGL provided by Mesa * Remove glapi hacks --- sys-libs/glu/glu-9.0.0.recipe | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe index 85569360c..6850e66d6 100644 --- a/sys-libs/glu/glu-9.0.0.recipe +++ b/sys-libs/glu/glu-9.0.0.recipe @@ -5,7 +5,7 @@ COPYRIGHT="Copyright (C) 1999-2012 Brian Paul and others. All Rights Reserved." LICENSE="MIT" SRC_URI="ftp://freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz" CHECKSUM_MD5="bbc57d4fe3bd3fb095bdbef6fcb977c4" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -15,12 +15,13 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libGL${secondaryArchSuffix} " BUILD_REQUIRES=" - devel:libglapi$secondaryArchSuffix + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libGL$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make @@ -29,13 +30,6 @@ BUILD_PREREQUIRES=" BUILD() { - # The Haiku build system builds libGL.so from libglapi and libglu. Since the - # glu build system requires libGL.so (since the shared libglu.so is linked - # against it), we build a dummy libGL.so from libglapi.a. - gcc -o libGL.so -shared -Xlinker --whole-archive -lglapi - libglLinkFlags="-L$(pwd)" - - LDFLAGS="$libglLinkFlags" \ runConfigure ./configure make $jobArgs } From 2a04cfa799c01b68bb763eb38356673341e72922 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 26 Dec 2013 02:34:48 +0000 Subject: [PATCH 146/206] Expanded the DESCRIPTION for sdl_image --- media-libs/sdl_image/sdl_image-1.2.12.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-libs/sdl_image/sdl_image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12.recipe index b96f04700..d1a9b9f1d 100644 --- a/media-libs/sdl_image/sdl_image-1.2.12.recipe +++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe @@ -1,5 +1,6 @@ SUMMARY="Simple Direct Media Layer Image Library" -DESCRIPTION="Simple Direct Media Layer Image Library" +DESCRIPTION="SDL_image is an image file loading library. It loads images as SDL surfaces, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV +As of SDL_image 1.2.5, JPEG, PNG, TIFF, and WEBP image loading libraries are dynamically loaded, so if you don't need to load those formats, you don't need to include those shared libraries. libpng depends on libz, and libtiff depends on both libz and libjpeg." HOMEPAGE="http://www.libsdl.org/projects/SDL_image" SRC_URI="http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz" CHECKSUM_MD5="a0f9098ebe5400f0bdc9b62e60797ecb" From f781cc04e8c8181361f8b829beb48bb4ab44e138 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 22:31:26 -0600 Subject: [PATCH 147/206] libsdl2: fix build as devel:libtiff is missing from haiku_devel --- media-libs/libsdl2/libsdl2-2.0.1.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media-libs/libsdl2/libsdl2-2.0.1.recipe b/media-libs/libsdl2/libsdl2-2.0.1.recipe index 83cf33207..2b00bcefe 100644 --- a/media-libs/libsdl2/libsdl2-2.0.1.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.1.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Simple DirectMedia Layer is a cross-platform development library de HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL2-2.0.1.tar.gz" CHECKSUM_MD5="0eb97039488bf463e775295f7b18b227" -REVISION="1" +REVISION="2" LICENSE="Zlib" COPYRIGHT="1997-2013 Sam Lantinga" @@ -12,6 +12,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libsdl2$secondaryArchSuffix = $portVersion compat >= 2.0 + cmd:sdl2_config = $portVersion lib:libSDL2$secondaryArchSuffix = 2.0_0.1.0 compat >= 2.0_0.0 lib:libSDL2_2.0$secondaryArchSuffix = 0.1.0 compat >= 0.0 lib:libSDL2_2.0.1$secondaryArchSuufix = 0.1.0 compat >= 0.0 @@ -32,8 +33,8 @@ BUILD_REQUIRES=" devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix - devel:libtiff$secondaryArchSuffix " +# devel:libtiff$secondaryArchSuffix # haiku_devel missing devel_libtiff BUILD_PREREQUIRES=" cmd:autoconf From 1e01e0e2654d2669ba97045739ea443907ac4019 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 25 Dec 2013 22:39:06 -0600 Subject: [PATCH 148/206] sdl2_ttf: Fix up recipe. --- media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe | 67 ++++++++++++++++------ 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe index 4e4931e00..4a7325c29 100644 --- a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe +++ b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe @@ -1,48 +1,79 @@ -SUMMARY="Simple Direct Media Layer Image Library" -DESCRIPTION="SDL" +SUMMARY="A TrueType font rendering library for SDL2" +DESCRIPTION=" + SDL_ttf is a TrueType font rendering library that is used with the SDL + library, and almost as portable. It depends on freetype2 to handle the + TrueType font data. It allows a programmer to use multiple TrueType fonts + without having to code a font rendering routine themselves. With the power + of outline fonts and antialiasing, high quality text output can be obtained + without much effort. + " HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.12.tar.gz" CHECKSUM_MD5="79787216b56cb4707f39d538f2225e00" -REVISION="1" +REVISION="2" LICENSE="Zlib" COPYRIGHT="1997-2013 Sam Lantinga" ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="?x86 ?x86_gcc2" PROVIDES=" - lib:SDL2_ttf + sdl2_ttf${secondaryArchSuffix} = $portVersion + lib:libSDL2_ttf${secondaryArchSuffix} " REQUIRES=" - lib:libsdl2 + haiku${secondaryArchSuffix} >= $haikuVersion + lib:libfreetype${secondaryArchSuffix} + lib:libSDL2${secondaryArchSuffix} + lib:libz${secondaryArchSuffix} " BUILD_REQUIRES=" - cmd:autoconf - cmd:libtool - cmd:aclocal - cmd:make - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libfreetype${secondaryArchSuffix} + devel:libSDL2${secondaryArchSuffix} + devel:libz${secondaryArchSuffix} " BUILD_PREREQUIRES=" + cmd:libtoolize + cmd:aclocal + cmd:automake + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make " SOURCE_DIR="SDL2_ttf-$portVersion" BUILD() { -# rm -f acinclude.m4 -# libtoolize --copy --force --install -# aclocal --install -I acinclude -# echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" -# ./autogen.sh - runConfigure ./configure - make + libtoolize --copy --force --install + aclocal --install -I acinclude + autoconf + runConfigure ./configure --with-x=no + make $jobArgs } INSTALL() { make install + + prepareInstalledDevelLibs libSDL2_ttf + fixPkgconfig + + packageEntries devel \ + $developDir } + +PROVIDES_devel=" + sdl2_ttf${secondaryArchSuffix}_devel = ${portVersion} compat >= 1.2 + devel:sdl2_ttf$secondaryArchSuffix = ${portVersion} compat >= 1.2 + devel:libSDL2_ttf$secondaryArchSuffix = 2.0_0.10.1 compat >= 2.0_0 + " + +REQUIRES_devel=" + sdl2_ttf$secondaryArchSuffix == $portVersion base + " From bfd53c6e2ff8d173822d51ca6f5d2a1540815c09 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 26 Dec 2013 00:07:32 -0600 Subject: [PATCH 149/206] sdl2_mixer: Add sdl2_mixer recipe --- .../sdl2_mixer/patches/sdl2_mixer-2.0.0.patch | 13 +++ media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe | 89 +++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 media-libs/sdl2_mixer/patches/sdl2_mixer-2.0.0.patch create mode 100644 media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe diff --git a/media-libs/sdl2_mixer/patches/sdl2_mixer-2.0.0.patch b/media-libs/sdl2_mixer/patches/sdl2_mixer-2.0.0.patch new file mode 100644 index 000000000..d27437b7a --- /dev/null +++ b/media-libs/sdl2_mixer/patches/sdl2_mixer-2.0.0.patch @@ -0,0 +1,13 @@ +diff --git a/configure.in b/configure.in +index f71c002..cd41fc0 100644 +--- a/configure.in ++++ b/configure.in +@@ -493,7 +493,7 @@ if test x$enable_music_ogg = xyes; then + fi + else + AC_CHECK_HEADER([vorbis/vorbisfile.h], [have_ogg_hdr=yes]) +- AC_CHECK_LIB([vorbisfile -lvorbis -logg -lm], [ov_open_callbacks], [have_ogg_lib=yes]) ++ AC_CHECK_LIB([vorbisfile -lvorbis -logg], [ov_open_callbacks], [have_ogg_lib=yes]) + if test x$have_ogg_hdr = xyes -a x$have_ogg_lib = xyes; then + case "$host" in + *-*-darwin*) diff --git a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe new file mode 100644 index 000000000..a219d9e46 --- /dev/null +++ b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe @@ -0,0 +1,89 @@ +SUMMARY="Simple Direct Layer Mixer Library" +DESCRIPTION="sdl2_mixer is a simple multi-channel audio mixer library. It supports any number of simultaneously playing channels of 16 bit stereo audio, plus a single channel of music, mixed by the popular FLAC, MikMoD MOD, Timidity MIDI, Ogg Vorbis, and SMPEG MP3 libraries." +HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" +SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.0.tar.gz" +CHECKSUM_MD5="65f6d80df073a1fb3bb537fbda031b50" +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PATCHES="sdl2_mixer-${portVersion}.patch" + +PROVIDES=" + sdl2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0 + lib:libSDL2_mixer$secondaryArchSuffix = 2.0 + lib:libSDL2_mixer_2.0$secondaryArchSuffix = 0.0 + cmd:playwave$secondaryArchSuffix + cmd:playmus$secondaryArchSuffix + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libSDL2$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libflac$secondaryArchSuffix +# lib:libfluidsynth$secondaryArchSuffix + lib:libmad$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix +# lib:libmikmod$secondaryArchSuffix # requires libSDL +# lib:libsmpeg$secondaryArchSuffix # requires libSDL + " + +BUILD_REQUIRES=" + devel:libSDL2$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libflac$secondaryArchSuffix +# devel:libfluidsynth$secondaryArchSuffix + devel:libmad$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix +# devel:libmikmod$secondaryArchSuffix # requires libSDL +# devel:libsmpeg$secondaryArchSuffix # requires libSDL + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtool + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +SOURCE_DIR="SDL2_mixer-$portVersion" + +BUILD() +{ + libtoolize --force --copy --install + aclocal --force --install -I acinclude + autoconf + runConfigure ./configure \ + SMPEG_CONFIG=smpeg_config$secondaryArchSuffix + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libSDL2_mixer + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + sdl2_mixer${secondaryArchSuffix}_devel = $portVersion compat >= 2.0 + devel:sdl2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0 + devel:libSDL2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0 + " + +REQUIRES_devel=" + sdl2_mixer$secondaryArchSuffix == $portVersion base + " From 86e97737a8f7eaf6d455d19d3f43f37c2f5fd629 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 26 Dec 2013 01:01:25 -0600 Subject: [PATCH 150/206] libzip: Fix recipe, add new version with configure * cmake version didn't create pkgconfig --- dev-libs/libzip/libzip-0.10.1.recipe | 65 +++++++++++++++++++++--- dev-libs/libzip/libzip-0.11.2.recipe | 75 ++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 7 deletions(-) create mode 100644 dev-libs/libzip/libzip-0.11.2.recipe diff --git a/dev-libs/libzip/libzip-0.10.1.recipe b/dev-libs/libzip/libzip-0.10.1.recipe index 11d333880..4975d1381 100644 --- a/dev-libs/libzip/libzip-0.10.1.recipe +++ b/dev-libs/libzip/libzip-0.10.1.recipe @@ -1,24 +1,75 @@ +SUMMARY="A C library for reading, creating, and modifying zip archives." DESCRIPTION="libzip is a C library for reading, creating, and modifying zip archives." HOMEPAGE="http://www.nih.at/libzip/" SRC_URI="http://www.nih.at/libzip/libzip-0.10.1.tar.bz2" CHECKSUM_MD5="d3e933ae049204badccf605f20aaecde" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libzip${secondaryArchSuffix} = $portVersion + lib:libzip${secondaryArchSuffix} = $portVersion + cmd:zipcmp${secondaryArchSuffix} + cmd:zipmerge${secondaryArchSuffix} + cmd:ziptorrent${secondaryArchSuffix} + " +REQUIRES=" + haiku${secondaryArchSuffix} >= $haikuVersion + lib:libz${secondaryArchSuffix} + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libz${secondaryArchSuffix} + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + BUILD() { - cd libzip-0.10.1 - sed -i 's/MAN_PATH man/MAN_PATH documentation\/man/' man/CMakeLists.txt sed -i 's/DESTINATION lib\/libzip\/include/DESTINATION include/' CMakeLists.txt - cmake . - make + + cmake -DCMAKE_INSTALL_PREFIX=$prefix + make $jobArgs } INSTALL() { - cd libzip-0.10.1 make install + + # clean up includes + mkdir -p $includeDir + mv $prefix/include/* $includeDir/ + rm -rf $prefix/include + + # clean up man pages + mkdir -p $manDir + mv $prefix/man/* $manDir/ + rm -rf $prefix/man + + prepareInstalledDevelLibs \ + libzip \ + + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } +PROVIDES_devel=" + libzip${secondaryArchSuffix}_devel = $portVersion + devel:libzip$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + libzip$secondaryArchSuffix == $portVersion base + " + LICENSE="BSD (3-clause)" COPYRIGHT="1999-2012 Dieter Baron and Thomas Klausner" diff --git a/dev-libs/libzip/libzip-0.11.2.recipe b/dev-libs/libzip/libzip-0.11.2.recipe new file mode 100644 index 000000000..9d22f1f4d --- /dev/null +++ b/dev-libs/libzip/libzip-0.11.2.recipe @@ -0,0 +1,75 @@ +SUMMARY="A C library for reading, creating, and modifying zip archives." +DESCRIPTION="libzip is a C library for reading, creating, and modifying zip archives." +HOMEPAGE="http://www.nih.at/libzip/" +SRC_URI="http://www.nih.at/libzip/libzip-0.11.2.tar.gz" +CHECKSUM_MD5="c5437df15e4825d40cdc3ec8b9b7516c" +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libzip${secondaryArchSuffix} = $portVersion + lib:libzip${secondaryArchSuffix} = $portVersion + cmd:zipcmp${secondaryArchSuffix} + cmd:zipmerge${secondaryArchSuffix} + cmd:ziptorrent${secondaryArchSuffix} + " +REQUIRES=" + haiku${secondaryArchSuffix} >= $haikuVersion + lib:libz${secondaryArchSuffix} + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libz${secondaryArchSuffix} + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + sed -i 's/LN = ln/LN = cp/' man/Makefile.in + + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + +# # clean up includes +# mkdir -p $includeDir +# mv $prefix/include/* $includeDir/ +# rm -rf $prefix/include +# +# # clean up man pages +# mkdir -p $manDir +# mv $prefix/man/* $manDir/ +# rm -rf $prefix/man + + prepareInstalledDevelLibs \ + libzip \ + + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + libzip${secondaryArchSuffix}_devel = $portVersion + devel:libzip$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + libzip$secondaryArchSuffix == $portVersion base + " + +LICENSE="BSD (3-clause)" +COPYRIGHT="1999-2012 Dieter Baron and Thomas Klausner" From 243625d0267a6600eaa244322bf64989722f0506 Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Thu, 26 Dec 2013 18:24:37 +0000 Subject: [PATCH 151/206] Add USER_SETTINGS_FILES to BeVexed recipe --- haiku-games/BeVexed/bevexed-1.1.recipe | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/haiku-games/BeVexed/bevexed-1.1.recipe b/haiku-games/BeVexed/bevexed-1.1.recipe index a23ae9a65..142389309 100644 --- a/haiku-games/BeVexed/bevexed-1.1.recipe +++ b/haiku-games/BeVexed/bevexed-1.1.recipe @@ -30,6 +30,10 @@ BUILD_PREREQUIRES=" cmd:mkdepend " +USER_SETTINGS_FILES=" + /boot/home/config/settings/BeVexed + " + BUILD() { cd source From 2cc9035401617e4371a5bd3c36884706c96cc8ff Mon Sep 17 00:00:00 2001 From: Adrian Jelen Date: Thu, 26 Dec 2013 19:25:53 +0000 Subject: [PATCH 152/206] Small correct BeVexed recipe --- haiku-games/BeVexed/bevexed-1.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-games/BeVexed/bevexed-1.1.recipe b/haiku-games/BeVexed/bevexed-1.1.recipe index 142389309..d08630b6b 100644 --- a/haiku-games/BeVexed/bevexed-1.1.recipe +++ b/haiku-games/BeVexed/bevexed-1.1.recipe @@ -31,7 +31,7 @@ BUILD_PREREQUIRES=" " USER_SETTINGS_FILES=" - /boot/home/config/settings/BeVexed + settings/BeVexed " BUILD() From f50ad9c9af2cfb388a0bc6cbcbaa5d8245b220b2 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Thu, 26 Dec 2013 20:57:50 +0000 Subject: [PATCH 153/206] Add RemoteControl recipe --- haiku-apps/remotecontrol/licenses/Unknown | 1 + .../remotecontrol/remotecontrol-1.1.recipe | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 haiku-apps/remotecontrol/licenses/Unknown create mode 100644 haiku-apps/remotecontrol/remotecontrol-1.1.recipe diff --git a/haiku-apps/remotecontrol/licenses/Unknown b/haiku-apps/remotecontrol/licenses/Unknown new file mode 100644 index 000000000..6f00e7a6b --- /dev/null +++ b/haiku-apps/remotecontrol/licenses/Unknown @@ -0,0 +1 @@ +The license is nowhere noted, but on BeBits and HaikuWare it says the license is Freeware. diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe new file mode 100644 index 000000000..b0090db97 --- /dev/null +++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe @@ -0,0 +1,54 @@ +SUMMARY="Remote control your Haiku machines with ease!" +DESCRIPTION=" + RemoteControl is an application that allows the user + to control a remote PC as if he was seating in front of it. + It can be useful if you have a PC with no screen, + keyboard or mouse connected, or simply if it is too far away. + " +HOMEPAGE="https://github.com/HaikuArchives/RemoteControl" +SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29" +REVISION="1" +LICENSE="Unknown" +COPYRIGHT="2001 Thomas Thiriez" + +ARCHITECTURES="x86 x86_gcc2" + + +PROVIDES=" + remotecontrol = $portVersion + cmd:rcserver = $portVersion + cmd:rcclient = $portVersion + addon:rcinputfilter = $portVersion + addon:rcinputdevice = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:g++ + cmd:xres + cmd:make + cmd:mkdepend + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD() +{ + cd sources + make -C RCClient + make -C RCInputDevice + make -C RCInputFilter + make -C RCServer +} + +INSTALL() +{ + cd sources + make -C RCClient install INSTALL_DIR=$binDir + make -C RCServer install INSTALL_DIR=$binDir + make -C RCInputDevice install INSTALL_DIR=$addOnsDir/input_server/devices + make -C RCInputFilter install INSTALL_DIR=$addOnsDir/input_server/filters +} From 655701431f35320e9b270204f2bcc20e5536b2ff Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 26 Dec 2013 14:31:32 -0800 Subject: [PATCH 154/206] Pin the bevexed recipe to the current working git commit --- haiku-games/{BeVexed => bevexed}/bevexed-1.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename haiku-games/{BeVexed => bevexed}/bevexed-1.1.recipe (92%) diff --git a/haiku-games/BeVexed/bevexed-1.1.recipe b/haiku-games/bevexed/bevexed-1.1.recipe similarity index 92% rename from haiku-games/BeVexed/bevexed-1.1.recipe rename to haiku-games/bevexed/bevexed-1.1.recipe index d08630b6b..d4e925d93 100644 --- a/haiku-games/BeVexed/bevexed-1.1.recipe +++ b/haiku-games/bevexed/bevexed-1.1.recipe @@ -2,7 +2,7 @@ SUMMARY="A maddeningly-addictive puzzle game." DESCRIPTION="A maddeningly-addictive puzzle game. The concept is simple: put the tiles in the grid on the left such that the numbers match wherever 2 tiles touch." HOMEPAGE="https://github.com/HaikuArchives/BeVexed" -SRC_URI="git+https://github.com/HaikuArchives/BeVexed" +SRC_URI="git+https://github.com/HaikuArchives/BeVexed#3a45d8f364" REVISION="1" LICENSE="MIT" From f38cb58805e43dcd43ce5edf683268bfb9595fb4 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 26 Dec 2013 14:34:10 -0800 Subject: [PATCH 155/206] Update libcoverart for secondaryArchSuffix support, but still fails to build due to directory issue. --- .../libcoverart/libcoverart-1.0.0.recipe | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/media-libs/libcoverart/libcoverart-1.0.0.recipe b/media-libs/libcoverart/libcoverart-1.0.0.recipe index 2abcb919e..dd701d87a 100644 --- a/media-libs/libcoverart/libcoverart-1.0.0.recipe +++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe @@ -7,41 +7,49 @@ LICENSE="GNU LGPL v2" COPYRIGHT="2012 Andrew Hawkins" REVISION="1" -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86 ?x86_64" PROVIDES=" - lib:libcoverart + libcoverart = $portVersion + lib:libcoverart$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku - lib:libjansson - lib:libneon + haiku$secondaryArchSuffix >= $haikuVersion + lib:libjansson$secondaryArchSuffix + lib:libneon$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libjansson - devel:libneon + devel:libjansson$secondaryArchSuffix + devel:libneon$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " SOURCE_DIR="libcoverart-{PROJECT_VERSION}" BUILD() { - cmake . + cmake . make } INSTALL() { make install + prepareInstalledDevelLibs libcoverart + fixPkgconfig + + packageEntries devel \ + $developDir } TEST() @@ -50,3 +58,12 @@ TEST() cd tests ./test } + +PROVIDES_devel=" + libcoverart${secondaryArchSuffix}_devel = $portVersion + devel:libcoverart$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + libcoverart$secondaryArchSuffix == $portVersion base + " From 8233edace18efad3de0c18e1d41f2c52119086ad Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 26 Dec 2013 14:36:13 -0800 Subject: [PATCH 156/206] Mark libcoverart as not tested --- media-libs/libcoverart/libcoverart-1.0.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libcoverart/libcoverart-1.0.0.recipe b/media-libs/libcoverart/libcoverart-1.0.0.recipe index dd701d87a..21ecc5edc 100644 --- a/media-libs/libcoverart/libcoverart-1.0.0.recipe +++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe @@ -7,8 +7,8 @@ LICENSE="GNU LGPL v2" COPYRIGHT="2012 Andrew Hawkins" REVISION="1" -ARCHITECTURES="x86_gcc2 x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86 ?x86_64" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86 ?x86_64" PROVIDES=" libcoverart = $portVersion From a45c9e2eac3833b6965b7d1b0f2062f816ca7321 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 26 Dec 2013 14:38:24 -0800 Subject: [PATCH 157/206] Fixed lame recipe --- media-sound/lame/lame-3.99.5.recipe | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe index b7acf7cf8..35d2a9d61 100644 --- a/media-sound/lame/lame-3.99.5.recipe +++ b/media-sound/lame/lame-3.99.5.recipe @@ -15,7 +15,7 @@ PROVIDES=" lib:libmp3lame = $portVersion compat >= 0.0.0 " REQUIRES=" - haiku + haiku >= $haikuVersion lib:libiconv " BUILD_REQUIRES=" @@ -85,6 +85,4 @@ PROVIDES_devel=" " REQUIRES_devel=" lame == $portVersion base - lib:libiconv >= 2 - lib:libroot " From 7dbd21bd91a23a0223580e22f6b7087cbda9beea Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 26 Dec 2013 22:15:30 -0600 Subject: [PATCH 158/206] boehm_bc: Fix recipe secondary arch issues * Recipe wasn't designed properly for secondary architecture building --- dev-libs/boehm_gc/boehm_gc-7.2d.recipe | 41 +++++++++++++------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dev-libs/boehm_gc/boehm_gc-7.2d.recipe b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe index f724e9412..ee03cfeca 100644 --- a/dev-libs/boehm_gc/boehm_gc-7.2d.recipe +++ b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe @@ -9,42 +9,33 @@ be otherwise accessed." HOMEPAGE="http://www.hpl.hp.com/personal/Hans_Boehm/gc/" SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz" -REVISION="1" -ARCHITECTURES="x86 x86_gcc2" +REVISION="2" +ARCHITECTURES="x86 x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" CHECKSUM_MD5="91340b28c61753a789eb6077675d87d2" SOURCE_DIR="gc-7.2" PATCHES="boehm_gc-7.2d.patch" PROVIDES=" - boehm_gc = $portVersion compat >= 7 - lib:libgc = $portVersion compat >= 7 - lib:libcord = $portVersion compat >= 7 + boehm_gc$secondaryArchSuffix = $portVersion compat >= 7 + lib:libgc$secondaryArchSuffix = $portVersion compat >= 7 + lib:libcord$secondaryArchSuffix = $portVersion compat >= 7 " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:libtoolize cmd:autoconf cmd:make - cmd:gcc - cmd:ld - " - -PROVIDES_devel=" - boehm_gc_devel = $portVersion compat >= 7 - devel:libgc = $portVersion compat >= 7 - devel:libcord = $portVersion compat >= 7 - " - -REQUIRES_devel=" - boehm_gc == $portVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix " BUILD() @@ -52,7 +43,7 @@ BUILD() libtoolize --force --copy --install autoconf -f runConfigure ./configure --enable-threads=posix \ - --enable-thread-local-alloc --enable-parallel-mark + --enable-thread-local-alloc --enable-parallel-mark make } @@ -69,6 +60,16 @@ TEST() make check } +PROVIDES_devel=" + boehm_gc${secondaryArchSuffix}_devel = $portVersion compat >= 7 + devel:libgc${secondaryArchSuffix} = $portVersion compat >= 7 + devel:libcord${secondaryArchSuffix} = $portVersion compat >= 7 + " + +REQUIRES_devel=" + boehm_gc${secondaryArchSuffix} == $portVersion base + " + LICENSE="BOEHM" COPYRIGHT="1988, 1989 Hans-J. Boehm, Alan J. Demers 1991-1996 by Xerox Corporation. All rights reserved. From 79654b99c84e036524afe4e084302f70cced88c4 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Fri, 27 Dec 2013 02:41:58 -0500 Subject: [PATCH 159/206] Add Recibe recipe --- haiku-apps/recibe/recibe-1.0b1.recipe | 52 +++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 haiku-apps/recibe/recibe-1.0b1.recipe diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe new file mode 100644 index 000000000..9ae0fd70d --- /dev/null +++ b/haiku-apps/recibe/recibe-1.0b1.recipe @@ -0,0 +1,52 @@ +SUMMARY="A cooking recipe manager" +DESCRIPTION=" + Recibe, written by DarkWyrm, is a cooking recipe manager. The + database, which needs to be downloaded separately, includes + around 52,000 different recipes for you to try. + + If you download the recipe database, place it inside your settings + directory, which is likely `/boot/home/config/settings/' . + " +HOMEPAGE="https://github.com/HaikuArchives/Recibe" +SRC_URI="git://github.com/HaikuArchives/Recibe.git#c1d5a57264d8964a2592bc9b43588b3430bd48ad" +LICENSE="MIT" +COPYRIGHT="2007 DarkWyrm" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + recibe = $portVersion + app:recibe = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libsqlite3 + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libsqlite3 + " + +BUILD_PREREQUIRES=" + cmd:gcc + makefile_engine + cmd:make + cmd:mkdepend + cmd:xres + " + +BUILD() +{ + cd sources + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + mkdir -p $appsDir + cp sources/objects/Recibe $appsDir + addAppDeskbarSymlink $appsDir/Recibe +} From a583f23662cb143449cd77f8f4b7fcb79121f66b Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 27 Dec 2013 10:02:09 +0000 Subject: [PATCH 160/206] RemoteControl: Fix DESCRIPTION --- haiku-apps/remotecontrol/remotecontrol-1.1.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe index b0090db97..6501984a1 100644 --- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe +++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe @@ -1,9 +1,9 @@ SUMMARY="Remote control your Haiku machines with ease!" DESCRIPTION=" - RemoteControl is an application that allows the user - to control a remote PC as if he was seating in front of it. - It can be useful if you have a PC with no screen, - keyboard or mouse connected, or simply if it is too far away. + With the Remote Control app, you can control another Haiku computer also + running the Remote Control app. The app is able to just view what's + on the screen, or also control the computer. This package contains the + RCClient client and RCServer server. Both are to be run in the terminal. " HOMEPAGE="https://github.com/HaikuArchives/RemoteControl" SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29" From 8b7e7a24bfa00b52968362d50022536d4e5f6d21 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 27 Dec 2013 10:19:40 +0000 Subject: [PATCH 161/206] Just rewrite it a bit more... --- haiku-apps/remotecontrol/remotecontrol-1.1.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe index 6501984a1..a5cbbc480 100644 --- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe +++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe @@ -1,9 +1,10 @@ SUMMARY="Remote control your Haiku machines with ease!" DESCRIPTION=" With the Remote Control app, you can control another Haiku computer also - running the Remote Control app. The app is able to just view what's - on the screen, or also control the computer. This package contains the - RCClient client and RCServer server. Both are to be run in the terminal. + running the Remote Control app, no matter where it is. + The app is able to just view what's on the screen, or also control the computer. + This package contains the RCClient client and RCServer server. + Both are to be run in the terminal. " HOMEPAGE="https://github.com/HaikuArchives/RemoteControl" SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29" From 313b29ceba4a315f84afa9641736ac195373ef58 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Thu, 26 Dec 2013 18:28:19 +0000 Subject: [PATCH 162/206] Fixed intltool-0.40.6 recipe to be compatible with .recipe format --- dev-util/intltool/intltool-0.40.6.recipe | 67 +++++++++++++++++++----- 1 file changed, 54 insertions(+), 13 deletions(-) diff --git a/dev-util/intltool/intltool-0.40.6.recipe b/dev-util/intltool/intltool-0.40.6.recipe index 05eb668c7..c1864ceb3 100644 --- a/dev-util/intltool/intltool-0.40.6.recipe +++ b/dev-util/intltool/intltool-0.40.6.recipe @@ -1,25 +1,66 @@ -DESCRIPTION="intltool" -HOMEPAGE="http://www.gnome.org/" +SUMMARY="intltool is a set of tools to centralize translation of file formats." +DESCRIPTION="intltool is a set of tools to centralize translation of many different file formats using GNU gettext-compatible PO files. + +The intltool collection can be used to do these things: + +* Extract translatable strings from various source files (.xml.in, +glade, .desktop.in, .server.in, .oaf.in). + +* Collect the extracted strings together with messages from traditional +source files (.c, .h) in po/PACKAGE.pot. + +* Merge back the translations from .po files into .xml, .desktop and +oaf files. This merge step will happen at build resp. installation time." + +HOMEPAGE="http://freedesktop.org/wiki/Software/intltool" SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-0.40.6.tar.gz" CHECKSUM_MD5="8e40f9d1c7308eddbfd24b22cd540631" -REVISION="2" -STATUS_HAIKU="stable" -MESSAGE="Requires XML::Parser perl module installed" -DEPEND="" + +LICENSE="GNU GPL v2" +COPYRIGHT="1994-1996, 1999-2002, 2004, 2005 Free Software Foundation, Inc." + +REVISION="3" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + intltool = $portVersion + cmd:intltool_extract$secondaryArchSuffix = $portVersion + cmd:intltool_merge$secondaryArchSuffix = $portVersion + cmd:intltool_prepare$secondaryArchSuffix = $portVersion + cmd:intltool_update$secondaryArchSuffix = $portVersion + cmd:intltoolize$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + cmd:perl + xml_parser + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + xml_parser + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:perl + cmd:autoconf + " + BUILD() { - cd intltool-0.40.6 - ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ - --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ - --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \ + runConfigure ./configure make } INSTALL() { - cd intltool-0.40.6 make install +} + +TEST () +{ make check } -LICENSE="GNU GPL v2" -COPYRIGHT="1994-1996, 1999-2002, 2004, 2005 Free Software Foundation, Inc." From b9f88033a805c85aef1e54fa33f04dfd118c4057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 27 Dec 2013 13:54:58 +0100 Subject: [PATCH 163/206] srm: Add recipe Current CVS has been fixed, so we don't need any patch. --- app-misc/srm/srm-1.2.12_cvs.recipe | 50 ++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 app-misc/srm/srm-1.2.12_cvs.recipe diff --git a/app-misc/srm/srm-1.2.12_cvs.recipe b/app-misc/srm/srm-1.2.12_cvs.recipe new file mode 100644 index 000000000..869e84fe8 --- /dev/null +++ b/app-misc/srm/srm-1.2.12_cvs.recipe @@ -0,0 +1,50 @@ +SUMMARY="srm - secure file deletion for posix systems" +DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking." +HOMEPAGE="http://srm.sourceforge.net/" +SRC_URI="cvs://:pserver:anonymous@srm.cvs.sourceforge.net:/cvsroot/srm/srm" +REVISION="1" +LICENSE="MIT (no promotion)" +COPYRIGHT="2000 Matthew D. Gauthier" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + srm$secondaryArchSuffix = $portVersion + cmd:srm = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:make + cmd:gcc$secondaryArchSuffix + " + +BUILD() +{ + #./autogen.sh ... + aclocal + autoheader + automake --add-missing + autoconf + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} + +# Beware, needs at least 5GB of disk space free. +TEST() +{ + make test +} From c5bb6aeca66099c1e3887e3e5bdf62e002709557 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Fri, 27 Dec 2013 13:15:03 +0000 Subject: [PATCH 164/206] Fixed libevent recipe (it was producing a broken symlink and throwed a policy warning when compiling on x86) --- dev-libs/libevent/libevent-2.0.21.recipe | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index 9a1b241b8..ca13be77a 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -7,14 +7,14 @@ CHECKSUM_MD5="b2405cc9ebf264aa47ff615d9de527a2" LICENSE="BSD (3-clause)" COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libevent${secondaryArchSuffix} = ${portVersion} - cmd:event_rpcgen.py + cmd:event_rpcgen.py$secondaryArchSuffix lib:libevent$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 @@ -76,10 +76,11 @@ INSTALL() libevent_pthreads \ libevent_openssl - mv .libs/libevent_core.* \ - .libs/libevent_extra.* \ - .libs/libevent_pthreads.* \ - .libs/libevent_openssl.* \ + cp .libs/libevent-*.so* \ + .libs/libevent_core-*.so* \ + .libs/libevent_extra-*.so* \ + .libs/libevent_pthreads-*.so* \ + .libs/libevent_openssl-*.so* \ $developLibDir fixPkgconfig From 08e04d1c9f3ff978c89d18c6dbf46fd42d1014af Mon Sep 17 00:00:00 2001 From: noryb009 Date: Fri, 27 Dec 2013 02:40:47 -0500 Subject: [PATCH 165/206] Update supported targets for OptiPNGTranslator Mark x86 and x86_64 as supported targets in OptiPNG and OptiPNGTranslator. --- haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe | 2 +- media-gfx/optipng/optipng-0.7.4.recipe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe index 4930cc182..bb58c9542 100644 --- a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe +++ b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe @@ -8,7 +8,7 @@ SRC_URI="git://github.com/noryb009/OptiPNGTranslator.git#8e3996a92d840f3c097cf95 LICENSE="MIT" COPYRIGHT="2013 Luke (noryb009)" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" if [ $buildArchitecture = x86_gcc2 ] && \ [ $targetArchitecture = x86_gcc2 ]; then diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe index b20530acf..1c7d493a2 100644 --- a/media-gfx/optipng/optipng-0.7.4.recipe +++ b/media-gfx/optipng/optipng-0.7.4.recipe @@ -11,7 +11,7 @@ CHECKSUM_MD5="8853d89aaf859065e95dcdf98b6bed73" LICENSE="Zlib" COPYRIGHT="2001-2012 Cosmin Truta" REVISION="2" -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" optipng$secondaryArchSuffix = $portVersion From e2fb3046f87bf6ebf106a76942b265e176f87496 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 27 Dec 2013 19:05:34 +0000 Subject: [PATCH 166/206] Update license and change website --- haiku-apps/remotecontrol/licenses/RemoteControl Unknown | 2 ++ haiku-apps/remotecontrol/licenses/Unknown | 1 - haiku-apps/remotecontrol/remotecontrol-1.1.recipe | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 haiku-apps/remotecontrol/licenses/RemoteControl Unknown delete mode 100644 haiku-apps/remotecontrol/licenses/Unknown diff --git a/haiku-apps/remotecontrol/licenses/RemoteControl Unknown b/haiku-apps/remotecontrol/licenses/RemoteControl Unknown new file mode 100644 index 000000000..2ae52a044 --- /dev/null +++ b/haiku-apps/remotecontrol/licenses/RemoteControl Unknown @@ -0,0 +1,2 @@ +There isn't a specific license set, but on BeBits and HaikuWare it says the license is Freeware. HaikuWare and BeBits also have the source when +you download it. The official website (http://thomas.thiriez.free.fr/beos/RemoteControl/index.html) also just says "freeware" diff --git a/haiku-apps/remotecontrol/licenses/Unknown b/haiku-apps/remotecontrol/licenses/Unknown deleted file mode 100644 index 6f00e7a6b..000000000 --- a/haiku-apps/remotecontrol/licenses/Unknown +++ /dev/null @@ -1 +0,0 @@ -The license is nowhere noted, but on BeBits and HaikuWare it says the license is Freeware. diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe index a5cbbc480..24a2c4370 100644 --- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe +++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe @@ -6,10 +6,10 @@ DESCRIPTION=" This package contains the RCClient client and RCServer server. Both are to be run in the terminal. " -HOMEPAGE="https://github.com/HaikuArchives/RemoteControl" +HOMEPAGE="http://thomas.thiriez.free.fr/beos/RemoteControl/index.html" SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29" REVISION="1" -LICENSE="Unknown" +LICENSE="RemoteControl Unknown" COPYRIGHT="2001 Thomas Thiriez" ARCHITECTURES="x86 x86_gcc2" From 3f14b4c88b89ca79cc3b6b17b009f2651cef83ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 27 Dec 2013 21:50:21 +0100 Subject: [PATCH 167/206] jamvm: Update recipe --- dev-java/jamvm/jamvm-1.5.4.recipe | 54 ++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe index 771a21d35..2308cea60 100644 --- a/dev-java/jamvm/jamvm-1.5.4.recipe +++ b/dev-java/jamvm/jamvm-1.5.4.recipe @@ -1,28 +1,60 @@ -DESCRIPTION="JamVM" -HOMEPAGE="http://jamvm.sourceforge.net" +SUMMARY="JamVM" +DESCRIPTION="JamVM is a new Java Virtual Machine which conforms to the JVM specification version 2 (blue book). + In comparison to most other VM's (free and commercial) it is extremely small," +HOMEPAGE="http://jamvm.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/jamvm/files/jamvm/JamVM%201.5.4/jamvm-1.5.4.tar.gz/download" REVISION="1" -STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="7654e9657691f5f09c4f481ed4686176" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +LICENSE="GNU GPL v2" +COPYRIGHT="2003-2010 Robert Lougher" + +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=" + jamvm$secondaryArchSuffix = $portVersion + cmd:jamvm$secondaryArchSuffix = $portVersion + lib:libjvm_x86 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libz$secondaryArchSuffix >= 1.2.8 + " +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:aclocal + cmd:libtool + cmd:make + cmd:gcc$secondaryArchSuffix + " + + +PATCHES="jamvm-1.5.4.patch" BUILD() { - cd jamvm-1.5.4 libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-classpath-install-dir=`finddir B_COMMON_DIRECTORY` + runConfigure ./configure \ + --with-classpath-install-dir= make } INSTALL() { - cd jamvm-1.5.4 make install + prepareInstalledDevelLibs } - -LICENSE="GNU GPL v2" -COPYRIGHT="2003-2010 Robert Lougher" From 4d5c0e3c569e3bcfe1df4933814fcfff2268b0a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 27 Dec 2013 22:06:39 +0100 Subject: [PATCH 168/206] jamvm: Fix devel libs --- dev-java/jamvm/jamvm-1.5.4.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe index 2308cea60..e402dfc2f 100644 --- a/dev-java/jamvm/jamvm-1.5.4.recipe +++ b/dev-java/jamvm/jamvm-1.5.4.recipe @@ -22,7 +22,8 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" jamvm$secondaryArchSuffix = $portVersion cmd:jamvm$secondaryArchSuffix = $portVersion - lib:libjvm_x86 + lib:libjvm$secondaryArchSuffix + devel:libjvm$secondaryArchSuffix " REQUIRES=" haiku$secondaryArchSuffix @@ -56,5 +57,5 @@ BUILD() INSTALL() { make install - prepareInstalledDevelLibs + prepareInstalledDevelLib libjvm } From 8e1c7cbcaa936193acdb024e1a4ff15c609fc221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 28 Dec 2013 09:22:20 +0100 Subject: [PATCH 169/206] recibe: Fix recipe (EOF due to backtick in description) --- haiku-apps/recibe/recibe-1.0b1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe index 9ae0fd70d..3d3516d93 100644 --- a/haiku-apps/recibe/recibe-1.0b1.recipe +++ b/haiku-apps/recibe/recibe-1.0b1.recipe @@ -5,7 +5,7 @@ DESCRIPTION=" around 52,000 different recipes for you to try. If you download the recipe database, place it inside your settings - directory, which is likely `/boot/home/config/settings/' . + directory, which is likely '/boot/home/config/settings/' . " HOMEPAGE="https://github.com/HaikuArchives/Recibe" SRC_URI="git://github.com/HaikuArchives/Recibe.git#c1d5a57264d8964a2592bc9b43588b3430bd48ad" From f754c72bb96d072527eefe13baa279134143d8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 28 Dec 2013 09:55:15 +0100 Subject: [PATCH 170/206] getconf: Add recipe to build the FreeBSD getconf We provide a makefile-engine makefile as a patch since the existing makefile requires FreeBSD's buildsystem. --- sys-apps/getconf/getconf-r260000.recipe | 46 +++++ .../getconf/patches/getconf-makefile.patch | 177 ++++++++++++++++++ 2 files changed, 223 insertions(+) create mode 100644 sys-apps/getconf/getconf-r260000.recipe create mode 100644 sys-apps/getconf/patches/getconf-makefile.patch diff --git a/sys-apps/getconf/getconf-r260000.recipe b/sys-apps/getconf/getconf-r260000.recipe new file mode 100644 index 000000000..b307ae299 --- /dev/null +++ b/sys-apps/getconf/getconf-r260000.recipe @@ -0,0 +1,46 @@ +SUMMARY="Prints out values of POSIX configuration variables" +DESCRIPTION="FreeBSD getconf + + The getconf command prints values of system configuration variables. + It is a command interface to the values returned by sysconf(3), confstr(3), and pathconf(3)." +HOMEPAGE="http://www.freebsd.org/" +COPYRIGHT="2000 Massachusetts Institute of Technology" +LICENSE="MIT" +SRC_URI="svn+http://svn.freebsd.org/base/head/usr.bin/getconf#260000" +#CHECKSUM_MD5="" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="getconf-makefile.patch" + +PROVIDES=" + getconf = $portVersion + cmd:getconf = $portVersion +" +REQUIRES=" + haiku >= $haikuVersion +" +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion +" +BUILD_PREREQUIRES=" + makefile_engine + cmd:mkdepend + cmd:gcc + cmd:make +" + +BUILD() +{ + export COPYRIGHT + export LICENSE + export PORT_VERSION=$portVersion + make -f makefile.haiku $jobArgs +} + +INSTALL() +{ + make -f makefile.haiku install INSTALL_DIR=$binDir + mkdir -p $manDir/man1 + install -m 644 getconf.1 $manDir/man1/ +} diff --git a/sys-apps/getconf/patches/getconf-makefile.patch b/sys-apps/getconf/patches/getconf-makefile.patch new file mode 100644 index 000000000..62d05bc28 --- /dev/null +++ b/sys-apps/getconf/patches/getconf-makefile.patch @@ -0,0 +1,177 @@ +From 0ad9f5b07a4d3734402efb6519a5778f9fc18b20 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= +Date: Sat, 28 Dec 2013 09:49:05 +0100 +Subject: [PATCH] Add Haiku makefile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: François Revol +--- + makefile.haiku | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 154 insertions(+) + create mode 100644 makefile.haiku + +diff --git a/makefile.haiku b/makefile.haiku +new file mode 100644 +index 0000000..ed83568 +--- /dev/null ++++ b/makefile.haiku +@@ -0,0 +1,154 @@ ++%.c: %.gperf ++ LC_ALL=C awk -f ${CURDIR}/fake-gperf.awk $< >$@ ++ ++GENSRC=confstr.c limits.c pathconf.c progenv.c sysconf.c ++ ++## BeOS Generic Makefile v2.5 ## ++ ++## Fill in this file to specify the project being created, and the referenced ++## makefile-engine will do all of the hard work for you. This handles both ++## Intel and PowerPC builds of the BeOS and Haiku. ++ ++## Application Specific Settings --------------------------------------------- ++ ++# specify the name of the binary ++NAME= getconf ++ ++# specify the type of binary ++# APP: Application ++# SHARED: Shared library or add-on ++# STATIC: Static library archive ++# DRIVER: Kernel Driver ++TYPE= APP ++ ++# if you plan to use localization features ++# specify the application MIME siganture ++APP_MIME_SIG= ++ ++# add support for new Pe and Eddie features ++# to fill in generic makefile ++ ++#%{ ++# @src->@ ++ ++# specify the source files to use ++# full paths or paths relative to the makefile can be included ++# all files, regardless of directory, will have their object ++# files created in the common object directory. ++# Note that this means this makefile will not work correctly ++# if two source files with the same name (source.c or source.cpp) ++# are included from different directories. Also note that spaces ++# in folder names do not work well with this makefile. ++SRCS= getconf.c $(GENSRC) ++ ++# specify the resource definition files to use ++# full path or a relative path to the resource file can be used. ++RDEFS= ++ ++# specify the resource files to use. ++# full path or a relative path to the resource file can be used. ++# both RDEFS and RSRCS can be defined in the same makefile. ++RSRCS= ++ ++# @<-src@ ++#%} ++ ++# end support for Pe and Eddie ++ ++# specify additional libraries to link against ++# there are two acceptable forms of library specifications ++# - if your library follows the naming pattern of: ++# libXXX.so or libXXX.a you can simply specify XXX ++# library: libbe.so entry: be ++# ++# - for version-independent linking of standard C++ libraries please add ++# $(STDCPPLIBS) instead of raw "stdc++[.r4] [supc++]" library names ++# ++# - for localization support add following libs: ++# locale localestub ++# ++# - if your library does not follow the standard library ++# naming scheme you need to specify the path to the library ++# and it's name ++# library: my_lib.a entry: my_lib.a or path/my_lib.a ++LIBS= bsd ++ ++# specify additional paths to directories following the standard ++# libXXX.so or libXXX.a naming scheme. You can specify full paths ++# or paths relative to the makefile. The paths included may not ++# be recursive, so include all of the paths where libraries can ++# be found. Directories where source files are found are ++# automatically included. ++LIBPATHS= ++ ++# additional paths to look for system headers ++# thes use the form: #include
++# source file directories are NOT auto-included here ++SYSTEM_INCLUDE_PATHS = ++ ++# additional paths to look for local headers ++# thes use the form: #include "header" ++# source file directories are automatically included ++LOCAL_INCLUDE_PATHS = ++ ++# specify the level of optimization that you desire ++# NONE, SOME, FULL ++OPTIMIZE= ++ ++# specify here the codes for languages you are going ++# to support in this application. The default "en" ++# one must be provided too. "make catkeys" will recreate only ++# locales/en.catkeys file. Use it as template for creating other ++# languages catkeys. All localization files must be placed ++# in "locales" sub-directory. ++LOCALES= ++ ++# specify any preprocessor symbols to be defined. The symbols will not ++# have their values set automatically; you must supply the value (if any) ++# to use. For example, setting DEFINES to "DEBUG=1" will cause the ++# compiler option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" ++# would pass "-DDEBUG" on the compiler's command line. ++DEFINES= ++ ++# specify special warning levels ++# if unspecified default warnings will be used ++# NONE = supress all warnings ++# ALL = enable all warnings ++WARNINGS = ++ ++# specify whether image symbols will be created ++# so that stack crawls in the debugger are meaningful ++# if TRUE symbols will be created ++SYMBOLS = ++ ++# specify debug settings ++# if TRUE will allow application to be run from a source-level ++# debugger. Note that this will disable all optimzation. ++DEBUGGER = ++ ++# specify additional compiler flags for all files ++COMPILER_FLAGS = ++ ++# specify additional linker flags ++LINKER_FLAGS = ++ ++# specify the version of this particular item ++# (for example, -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL") ++# This may also be specified in a resource. ++APP_VERSION = -long "$PORT_VERSION "`echo -n -e '\302\251'`"$COPYRIGHT ($LICENSE license)" ++ ++# (for TYPE == DRIVER only) Specify desired location of driver in the /dev ++# hierarchy. Used by the driverinstall rule. E.g., DRIVER_PATH = video/usb will ++# instruct the driverinstall rule to place a symlink to your driver's binary in ++# ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will appear at ++# /dev/video/usb when loaded. Default is "misc". ++DRIVER_PATH = ++ ++## include the makefile-engine ++DEVEL_DIRECTORY := \ ++ $(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY) ++include $(DEVEL_DIRECTORY)/etc/makefile-engine ++ ++clean :: FORCE ++ rm -r $(GENSRC) ++ +-- +1.8.3.4 + From 13883e78b6a7891057b9b12a393b6e1305227e6d Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Fri, 27 Dec 2013 14:06:33 +0000 Subject: [PATCH 171/206] Transmission 2.82 recipe and patch --- .../patches/transmission-2.82.patch | 108 ++++++++++++++++++ net-p2p/transmission/transmission-2.82.recipe | 104 +++++++++++++++++ 2 files changed, 212 insertions(+) create mode 100644 net-p2p/transmission/patches/transmission-2.82.patch create mode 100644 net-p2p/transmission/transmission-2.82.recipe diff --git a/net-p2p/transmission/patches/transmission-2.82.patch b/net-p2p/transmission/patches/transmission-2.82.patch new file mode 100644 index 000000000..d874f536a --- /dev/null +++ b/net-p2p/transmission/patches/transmission-2.82.patch @@ -0,0 +1,108 @@ +diff -ur transmission-2.82/libtransmission/platform-quota.c transmission-2.82-haiku/libtransmission/platform-quota.c +--- transmission-2.82/libtransmission/platform-quota.c 2013-08-09 02:45:44.822345728 +0000 ++++ transmission-2.82-haiku/libtransmission/platform-quota.c 2013-12-27 10:29:53.872415232 +0000 +@@ -16,7 +16,7 @@ + #include /* getuid() */ + #include /* evutil_ascii_strcasecmp () */ + +-#ifndef WIN32 ++#if !defined(WIN32) && !defined(__HAIKU__) + #include /* types needed by quota.h */ + #if defined(__FreeBSD__) || defined(__OpenBSD__) + #include /* quotactl() */ +@@ -67,7 +67,7 @@ + **** + ***/ + +-#ifndef WIN32 ++#if !defined(WIN32) && !defined(__HAIKU__) + static const char * + getdev (const char * path) + { +@@ -300,7 +300,7 @@ + { + int64_t ret = -1; + +-#ifndef WIN32 ++#if !defined(WIN32) && !defined(__HAIKU__) + + if (info->fstype && !evutil_ascii_strcasecmp(info->fstype, "xfs")) + { +@@ -347,7 +347,7 @@ + + info = tr_new0 (struct tr_device_info, 1); + info->path = tr_strdup (path); +-#ifndef WIN32 ++#if !defined(WIN32) && !defined(__HAIKU__) + info->device = tr_strdup (getblkdev (path)); + info->fstype = tr_strdup (getfstype (path)); + #endif +diff -ur transmission-2.82/third-party/miniupnp/connecthostport.c transmission-2.82-haiku/third-party/miniupnp/connecthostport.c +--- transmission-2.82/third-party/miniupnp/connecthostport.c 2013-08-09 02:47:50.398196736 +0000 ++++ transmission-2.82-haiku/third-party/miniupnp/connecthostport.c 2013-12-27 10:30:00.589037568 +0000 +@@ -24,6 +24,7 @@ + #else /* #ifdef _WIN32 */ + #include + #include ++#include + #include + #define closesocket close + #include +diff -ur transmission-2.82/third-party/miniupnp/miniupnpc.c transmission-2.82-haiku/third-party/miniupnp/miniupnpc.c +--- transmission-2.82/third-party/miniupnp/miniupnpc.c 2013-08-09 02:47:50.894435328 +0000 ++++ transmission-2.82-haiku/third-party/miniupnp/miniupnpc.c 2013-12-27 10:30:00.625737728 +0000 +@@ -17,7 +17,7 @@ + #endif + #endif + +-#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) ++#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) && !defined(__HAIKU__) + #define HAS_IP_MREQN + #endif + +diff -ur transmission-2.82/third-party/miniupnp/portlistingparse.c transmission-2.82-haiku/third-party/miniupnp/portlistingparse.c +--- transmission-2.82/third-party/miniupnp/portlistingparse.c 2013-08-09 02:47:50.074186752 +0000 ++++ transmission-2.82-haiku/third-party/miniupnp/portlistingparse.c 2013-12-27 10:30:00.638582784 +0000 +@@ -28,7 +28,7 @@ + + /* Helper function */ + static UNSIGNED_INTEGER +-atoui(const char * p, int l) ++my_atoui(const char * p, int l) + { + UNSIGNED_INTEGER r = 0; + while(l > 0 && *p) +@@ -92,7 +92,7 @@ + pm->remoteHost[l] = '\0'; + break; + case NewExternalPort: +- pm->externalPort = (unsigned short)atoui(data, l); ++ pm->externalPort = (unsigned short)my_atoui(data, l); + break; + case NewProtocol: + if(l > 3) +@@ -101,21 +101,21 @@ + pm->protocol[l] = '\0'; + break; + case NewInternalPort: +- pm->internalPort = (unsigned short)atoui(data, l); ++ pm->internalPort = (unsigned short)my_atoui(data, l); + break; + case NewInternalClient: + memcpy(pm->internalClient, data, l); + pm->internalClient[l] = '\0'; + break; + case NewEnabled: +- pm->enabled = (unsigned char)atoui(data, l); ++ pm->enabled = (unsigned char)my_atoui(data, l); + break; + case NewDescription: + memcpy(pm->description, data, l); + pm->description[l] = '\0'; + break; + case NewLeaseTime: +- pm->leaseTime = atoui(data, l); ++ pm->leaseTime = my_atoui(data, l); + break; + default: + break; diff --git a/net-p2p/transmission/transmission-2.82.recipe b/net-p2p/transmission/transmission-2.82.recipe new file mode 100644 index 000000000..f6e3acec1 --- /dev/null +++ b/net-p2p/transmission/transmission-2.82.recipe @@ -0,0 +1,104 @@ +SUMMARY="Transmission is a cross-platform open source BitTorrent client" +DESCRIPTION="Transmission is a cross-platform BitTorrent client that is: + +Open Source. + +Transmission is an open source, volunteer-based project. Unlike some BitTorrent clients, Transmission doesn't play games with its users to make money: + +Transmission doesn't bundle toolbars, pop-up ads, flash ads, twitter tools, or anything else. +It doesn't hold some feaures back for a payware version. +Its source code is available for anyone to review. +We don't track our users, and our website and forums have no third-party ads or analytics. + +Easy. + +Transmission is designed for easy, powerful use. We've set the defaults to Just Work and it only takes a few clicks to configure advanced features like watch directories, bad peer blocklists, and the web interface. + +Lean. + +In separate benchmarks, Linux Format and Lacrocivious both found Transmission to use less CPU than any other GUI client. It even used less CPU than some non-GUI clients. + +Transmission also has the lowest memory footprint of any major BitTorrent client. + +Imageshack chose Transmission for its BitTorrent farms because the competition requires amounts of memory several times greater than Transmission. + +Transmission's small footprint is one reason why many home device manufacturers, such as FON, Belkin, and Networked Media Tank ship with Transmission. When Belkin and Vuze Inc. partnered to write a Torrent Genie to let people who ran Vuze and owned a Belkin router keep sharing files even when Vuze wasn't running, they decided to use Transmission -- not Vuze's own BitTorrent client -- on the router. + +Native. + +Unlike many cross-platform applications, Transmission integrates seamlessly with your operating system. + +Powerful. + +Transmission has the features you want from a BitTorrent client: encryption, a web interface, peer exchange, magnet links, DHT, µTP, UPnP and NAT-PMP port forwarding, webseed support, watch directories, tracker editing, global and per-torrent speed limits, and more." + +HOMEPAGE="http://www.transmissionbt.com/" +SRC_URI="https://transmission.cachefly.net/transmission-2.82.tar.xz" +CHECKSUM_MD5="a5ef870c0410b12d10449c2d36fa4661" + +REVISION="1" + +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" + +PROVIDES=" + transmission = $portVersion + cmd:transmission_cli$secondaryArchSuffix + cmd:transmission_create$secondaryArchSuffix + cmd:transmission_daemon$secondaryArchSuffix + cmd:transmission_edit$secondaryArchSuffix + cmd:transmission_remote$secondaryArchSuffix + cmd:transmission_show$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libevent$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libssl$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libevent$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libgettextlib$secondaryArchSuffix >= 0.14.1 + intltool >= 0.40 + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:make + " + +LICENSE="Transmission + MIT + GNU GPL v2 + " +COPYRIGHT="2005-2013. All code is copyrighted by the respective authors." + +PATCHES="transmission-2.82.patch" + +BUILD() +{ + runConfigure ./configure --without-gtk --datadir=$dataDir + make +} + +INSTALL() +{ + make install +} From b15e9432673f95ceb5084f67cc431e8c94653dec Mon Sep 17 00:00:00 2001 From: Mrowqa Date: Sat, 28 Dec 2013 14:21:37 +0100 Subject: [PATCH 172/206] Added cleaned recipe for neverball --- games-puzzle/neverball/neverball-1.5.4.recipe | 72 +++++++++++++++++++ .../neverball/patches/neverball-1.5.4.patch | 13 ++++ 2 files changed, 85 insertions(+) create mode 100644 games-puzzle/neverball/neverball-1.5.4.recipe create mode 100644 games-puzzle/neverball/patches/neverball-1.5.4.patch diff --git a/games-puzzle/neverball/neverball-1.5.4.recipe b/games-puzzle/neverball/neverball-1.5.4.recipe new file mode 100644 index 000000000..0320cce4a --- /dev/null +++ b/games-puzzle/neverball/neverball-1.5.4.recipe @@ -0,0 +1,72 @@ +DESCRIPTION=" + Neverball is part puzzle game, part action game, and entirely a test + of skill. Tilt the floor to roll a ball through an obstacle course + before time runs out. + " +SUMMARY="Tilt the floor to roll a ball through an course before time runs out." +HOMEPAGE="http://neverball.org" +COPYRIGHT="2002-2010 The Neverball Team" +LICENSE="GNU GPL v2" +SRC_URI="http://neverball.org/neverball-1.5.4.tar.gz" +CHECKSUM_MD5="c523b0f72c2035831310e821162f7bd7" +REVISION="1" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" +PATCHES="neverball-1.5.4.patch" + +PROVIDES=" + neverball$secondaryArchSuffix = $portVersion + app:neverball$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libphysfs$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libsdl_mixer$secondaryArchSuffix + lib:libsdl_ttf$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + + lib:libpng$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libphysfs$secondaryArchSuffix + devel:libsdl$secondaryArchSuffix + devel:libsdl_mixer$secondaryArchSuffix + devel:libsdl_ttf$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + + devel:libpng$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + gettext$secondaryArchSuffix # it's needed + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:libpng_config$secondaryArchSuffix + " + +BUILD() +{ + make +} + +INSTALL() +{ + mkdir -p $appsDir/neverball + cp -rf neverball neverputt mapc README COPYING CHANGES data $appsDir/neverball + addAppDeskbarSymlink $appsDir/neverball/neverball +} diff --git a/games-puzzle/neverball/patches/neverball-1.5.4.patch b/games-puzzle/neverball/patches/neverball-1.5.4.patch new file mode 100644 index 000000000..60a118e94 --- /dev/null +++ b/games-puzzle/neverball/patches/neverball-1.5.4.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index a22fed1..e095a3a 100644 +--- a/Makefile ++++ b/Makefile +@@ -111,7 +111,7 @@ ifeq ($(ENABLE_WII),1) + TILT_LIBS := -lcwiimote -lbluetooth + endif + +-OGL_LIBS := -lGL -lm ++OGL_LIBS := -lGL -lintl + + ifdef MINGW + ifneq ($(ENABLE_NLS),0) From 833029bbb08981d11d53f2cdf41a27ee7bca2450 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sat, 28 Dec 2013 13:39:09 +0000 Subject: [PATCH 173/206] Fixed more policy warnings and added cmd:python to REQUIRES and BUILD_PREREQUIRES for libevent --- dev-libs/libevent/libevent-2.0.21.recipe | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index ca13be77a..e8ffed740 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -30,6 +30,7 @@ REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix + cmd:python " # haiku${secondaryArchSuffix} doesn't define included libraries yet # lib:libnetwork$secondaryArchSuffix >= $haikuVersion @@ -48,6 +49,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make + cmd:python " SOURCE_DIR="libevent-${portVersion}-stable" @@ -100,6 +102,7 @@ PROVIDES_devel=" lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 From cef0053f87bd85b712c4024a244c3590cf5b2e99 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sat, 28 Dec 2013 23:24:16 +0000 Subject: [PATCH 174/206] Added tor 0.2.4.20 recipe --- net-misc/tor/licenses/Tor | 141 +++++++++++++++++++++++++++++++ net-misc/tor/tor-0.2.4.20.recipe | 73 ++++++++++++++++ 2 files changed, 214 insertions(+) create mode 100644 net-misc/tor/licenses/Tor create mode 100644 net-misc/tor/tor-0.2.4.20.recipe diff --git a/net-misc/tor/licenses/Tor b/net-misc/tor/licenses/Tor new file mode 100644 index 000000000..4ed3bd8da --- /dev/null +++ b/net-misc/tor/licenses/Tor @@ -0,0 +1,141 @@ + This file contains the license for Tor, + a free software project to provide anonymity on the Internet. + + It also lists the licenses for other components used by Tor. + + For more information about Tor, see https://www.torproject.org/. + + If you got this file as a part of a larger bundle, + there may be other license terms that you should be aware of. + +=============================================================================== +Tor is distributed under this license: + +Copyright (c) 2001-2004, Roger Dingledine +Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson +Copyright (c) 2007-2013, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +=============================================================================== +src/ext/strlcat.c and src/ext/strlcpy.c by Todd C. Miller are licensed +under the following license: + + * Copyright (c) 1998 Todd C. Miller + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +=============================================================================== +src/ext/tor_queue.h is licensed under the following license: + + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + +=============================================================================== +src/config/geoip is licensed under the following license: + +OPEN DATA LICENSE (GeoLite Country and GeoLite City databases) + +Copyright (c) 2008 MaxMind, Inc. All Rights Reserved. + +All advertising materials and documentation mentioning features or use of +this database must display the following acknowledgment: +"This product includes GeoLite data created by MaxMind, available from +http://maxmind.com/" + +Redistribution and use with or without modification, are permitted provided +that the following conditions are met: +1. Redistributions must retain the above copyright notice, this list of +conditions and the following disclaimer in the documentation and/or other +materials provided with the distribution. +2. All advertising materials and documentation mentioning features or use of +this database must display the following acknowledgement: +"This product includes GeoLite data created by MaxMind, available from +http://maxmind.com/" +3. "MaxMind" may not be used to endorse or promote products derived from this +database without specific prior written permission. + +THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +=============================================================================== +If you got Tor as a static binary with OpenSSL included, then you should know: + "This product includes software developed by the OpenSSL Project + for use in the OpenSSL Toolkit (http://www.openssl.org/)" +=============================================================================== diff --git a/net-misc/tor/tor-0.2.4.20.recipe b/net-misc/tor/tor-0.2.4.20.recipe new file mode 100644 index 000000000..416a8dff6 --- /dev/null +++ b/net-misc/tor/tor-0.2.4.20.recipe @@ -0,0 +1,73 @@ +SUMMARY="A virtual layer that helps you improve privacy and anonymity" +DESCRIPTION="Tor is a network of virtual tunnels that allows people and groups to improve their privacy and security on the Internet. It also enables software developers to create new communication tools with built-in privacy features. Tor provides the foundation for a range of applications that allow organizations and individuals to share information over public networks without compromising their privacy. + +Individuals use Tor to keep websites from tracking them and their family members, or to connect to news sites, instant messaging services, or the like when these are blocked by their local Internet providers. Tor's hidden services let users publish web sites and other services without needing to reveal the location of the site. Individuals also use Tor for socially sensitive communication: chat rooms and web forums for rape and abuse survivors, or people with illnesses. + +Journalists use Tor to communicate more safely with whistleblowers and dissidents. Non-governmental organizations (NGOs) use Tor to allow their workers to connect to their home website while they're in a foreign country, without notifying everybody nearby that they're working with that organization. + +Groups such as Indymedia recommend Tor for safeguarding their members' online privacy and security. Activist groups like the Electronic Frontier Foundation (EFF) recommend Tor as a mechanism for maintaining civil liberties online. Corporations use Tor as a safe way to conduct competitive analysis, and to protect sensitive procurement patterns from eavesdroppers. They also use it to replace traditional VPNs, which reveal the exact amount and timing of communication. Which locations have employees working late? Which locations have employees consulting job-hunting websites? Which research divisions are communicating with the company's patent lawyers? + +A branch of the U.S. Navy uses Tor for open source intelligence gathering, and one of its teams used Tor while deployed in the Middle East recently. Law enforcement uses Tor for visiting or surveilling web sites without leaving government IP addresses in their web logs, and for security during sting operations. + +The variety of people who use Tor is actually part of what makes it so secure. Tor hides you among the other users on the network, so the more populous and diverse the user base for Tor is, the more your anonymity will be protected." + +HOMEPAGE="https://www.torproject.org" +SRC_URI="https://www.torproject.org/dist/tor-0.2.4.20.tar.gz" +CHECKSUM_MD5="a8cd8e3b3a3f6a7770f2c22d280f19b8" + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + tor = $portVersion + cmd:tor$secondaryArchSuffix + cmd:tor_gencert$secondaryArchSuffix + cmd:tor_resolve$secondaryArchSuffix + cmd:torify$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libevent$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libevent$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +LICENSE="Tor" +COPYRIGHT=" + 2001-2004, Roger Dingledine + 2004-2006, Roger Dingledine, Nick Mathewson + 2007-2013, The Tor Project, Inc. + " + +USER_SETTINGS_FILES=" + settings/tor directory + " + +GLOBAL_WRITABLE_FILES=" + settings/tor/torrc.sample auto-merge + " + +BUILD() +{ + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} From f297bf2782a3eaa21246463cf1376549212ab7a8 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sun, 29 Dec 2013 01:25:13 -0500 Subject: [PATCH 175/206] Update recibe's recipe Update recibe's recipe to include the recipe database. --- .../install_recipes_database.sh | 22 +++++++++++++++ haiku-apps/recibe/recibe-1.0b1.recipe | 27 +++++++++++++++---- 2 files changed, 44 insertions(+), 5 deletions(-) create mode 100755 haiku-apps/recibe/additional-files/install_recipes_database.sh diff --git a/haiku-apps/recibe/additional-files/install_recipes_database.sh b/haiku-apps/recibe/additional-files/install_recipes_database.sh new file mode 100755 index 000000000..4bbcf677c --- /dev/null +++ b/haiku-apps/recibe/additional-files/install_recipes_database.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +settingsDir="$(finddir B_USER_SETTINGS_DIRECTORY)" + +recibeSysDataDir="$(finddir B_SYSTEM_DATA_DIRECTORY)" +recibeUserDataDir="$(finddir B_USER_DATA_DIRECTORY)" +recibesFileBase="recibe/recipes.db.zip" + +if [ -f "$settingsDir/recipes.db" ]; then + exit 0 # already have a recipes database +fi + +if [ -f "$recibeSysDataDir/$recibesFileBase" ]; then + recipesZipFile="$recibeSysDataDir/$recibesFileBase" +elif [ -f "$recibeUserDataDir/$recibesFileBase" ]; then + recipesZipFile="$recibeUserDataDir/$recibesFileBase" +else + exit 1 # couldn't find recipes.db +fi + +cd "$settingsDir" +unzip "$recipesZipFile" diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe index 3d3516d93..aa060dc2f 100644 --- a/haiku-apps/recibe/recibe-1.0b1.recipe +++ b/haiku-apps/recibe/recibe-1.0b1.recipe @@ -1,19 +1,22 @@ SUMMARY="A cooking recipe manager" DESCRIPTION=" Recibe, written by DarkWyrm, is a cooking recipe manager. The - database, which needs to be downloaded separately, includes - around 52,000 different recipes for you to try. - - If you download the recipe database, place it inside your settings - directory, which is likely '/boot/home/config/settings/' . + included database contains around 52,000 different recipes for + you to try. " HOMEPAGE="https://github.com/HaikuArchives/Recibe" SRC_URI="git://github.com/HaikuArchives/Recibe.git#c1d5a57264d8964a2592bc9b43588b3430bd48ad" +SRC_URI_2="http://ports-space.haiku-files.org/recibe/recipes.db.zip#noarchive" +CHECKSUM_MD5_2="1dda608c90b426521b69ab51311f0f15" LICENSE="MIT" COPYRIGHT="2007 DarkWyrm" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ADDITIONAL_FILES=" + install_recipes_database.sh + " + PROVIDES=" recibe = $portVersion app:recibe = $portVersion @@ -37,6 +40,14 @@ BUILD_PREREQUIRES=" cmd:xres " +USER_SETTINGS_FILES=" + settings/recipes.db + settings/Recibe_favorites + " +POST_INSTALL_SCRIPTS=" + $relativePostInstallDir/install_recipes_database.sh + " + BUILD() { cd sources @@ -49,4 +60,10 @@ INSTALL() mkdir -p $appsDir cp sources/objects/Recibe $appsDir addAppDeskbarSymlink $appsDir/Recibe + + mkdir -p $dataDir/recibe + cp $sourceDir2/recipes.db.zip $dataDir/recibe + + mkdir -p $postInstallDir + cp $portDir/additional-files/install_recipes_database.sh $postInstallDir } From 54479651f4c661e1b6f854e94f52b0eb618c76b3 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 29 Dec 2013 01:07:08 -0700 Subject: [PATCH 176/206] Fix bzip2 library location and symlinks * Move the static library to $libDir on secondary arch builds * Create libbz2.so symlink so things can actually find/use the shared lib * Remove $binDir and $manDir on secondary arch builds The bin commands were already excluded from the package because of where they were installed. This just gets rid of the policy warning --- app-arch/bzip2/bzip2-1.0.6.recipe | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index f9ffdcfcb..9cdb5608f 100644 --- a/app-arch/bzip2/bzip2-1.0.6.recipe +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -5,7 +5,7 @@ LICENSE="bzip2" COPYRIGHT="1996-2010 Julian R Seward" SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz" CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86 x86_gcc2" @@ -57,8 +57,15 @@ INSTALL() make install PREFIX=$prefix mkdir -p $libDir + + #move the static library to the right dir for secondary arch builds + if [ -n "$secondaryArchSuffix" ];then + mv $prefix/lib/libbz2.a $libDir + fi + # also install shared lib - cp -a libbz2.so.1.0.6 libbz2.so.1.0 $libDir + ln -sf libbz2.so.1.0.6 libbz2.so + cp -a libbz2.so.1.0.6 libbz2.so.1.0 libbz2.so $libDir # move man pages mkdir -p $manDir @@ -77,6 +84,12 @@ INSTALL() # devel package packageEntries devel \ $developDir + + #remove bin commands and man pages when building for secondary arch + if [ -n "$secondaryArchSuffix" ];then + rm -rf $prefix/bin + rm -rf $manDir + fi } # ----- devel package ------------------------------------------------------- From af174e27ca5f0774a97c72b0e7d1b0cb5fcaec7d Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sun, 29 Dec 2013 01:17:00 -0700 Subject: [PATCH 177/206] Make boost into a usable recipe ... since apparently it wasn't tested when being merged * Fixed the _devel package so that it actually contains devel stuff (in particular the static libs and shared lib symlinks) * Fixed all of the REQUIRES/PROVIDES entries * Enable ICU support * Enable parallel building There should probably be a _doc package and we might want to split the _devel package with a separate package for each of the libs. --- dev-libs/boost/boost-1.55.0.recipe | 294 +++++++++++++++++++++-------- 1 file changed, 215 insertions(+), 79 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index a7c54ba93..9ea43b1ff 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -9,12 +9,14 @@ SUMMARY="Boost is a set of libraries for the C++ programming language." HOMEPAGE="http://www.boost.org/" SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2" CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354" -REVISION="1" +REVISION="2" LICENSE="Boost v1.0" COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al." ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi SECONDARY_ARCHITECTURES="x86 ?x86_64" @@ -23,106 +25,189 @@ SOURCE_DIR="boost_1_55_0" PATCHES="boost-1.55.0.patchset" PROVIDES=" - lib:boost = 1.55.0 + boost$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libiconv$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix - lib:libz$secondaryArchSuffix + boost_atomic$secondaryArchSuffix == $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_context$secondaryArchSuffix == $portVersion + boost_coroutine$secondaryArchSuffix == $portVersion + boost_date_time$secondaryArchSuffix == $portVersion + boost_filesystem$secondaryArchSuffix == $portVersion + boost_graph$secondaryArchSuffix == $portVersion + boost_iostreams$secondaryArchSuffix == $portVersion + boost_locale$secondaryArchSuffix == $portVersion + boost_log$secondaryArchSuffix == $portVersion + boost_math$secondaryArchSuffix == $portVersion + boost_program_options$secondaryArchSuffix == $portVersion + boost_random$secondaryArchSuffix == $portVersion + boost_regex$secondaryArchSuffix == $portVersion + boost_serialization$secondaryArchSuffix == $portVersion + boost_signals$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_test$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion + boost_timer$secondaryArchSuffix == $portVersion + boost_unit_test_framework$secondaryArchSuffix == $portVersion + boost_wave$secondaryArchSuffix == $portVersion " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion - devel:libiconv$secondaryArchSuffix devel:libbz2$secondaryArchSuffix devel:libz$secondaryArchSuffix + devel:libicuuc$secondaryArchSuffix + devel:libicui18n$secondaryArchSuffix + devel:libicudata$secondaryArchSuffix " BUILD_PREREQUIRES=" - boehm_gc cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:jam - cmd:iconv - cmd:make - binutils " BUILD() { ./bootstrap.sh \ - --without-icu \ --prefix=$prefix \ --exec-prefix=$binDir \ --libdir=$libDir \ --includedir=$includeDir - ./bjam \ - -sICU_PATH=$prefix \ - -sICONV_PATH=$prefix \ - -d2 \ + + ./b2 $jobArgs \ --without-mpi \ - --prefix=$prefix \ - --exec-prefix=$binDir \ - --libdir=$libDir \ - --includedir=$includeDir \ --enable-threads=posix \ --enable-thread-local-alloc \ --enable-parallel-mark \ inlining=on \ - linkflags=-L$libDir \ threading=multi \ variant=release \ - link=shared \ + link=static,shared \ runtime-link=shared \ - --without-python \ - --disable-icu + --without-python } INSTALL() { - mkdir -p $includeDir - mkdir -p $libDir - - cp -rf boost $includeDir - cp stage/lib/* $libDir - - packageEntries devel $includeDir - packageEntries atomic $libDir/*atomic* - packageEntries chrono $libDir/*chrono* - packageEntries context $libDir/*context* - packageEntries coroutine $libDir/*coroutine* - packageEntries date_time $libDir/*date_time* - packageEntries exception $libDir/*exception* - packageEntries filesystem $libDir/*filesystem* - packageEntries graph $libDir/*graph* - packageEntries iostreams $libDir/*iostreams* - packageEntries locale $libDir/*locale* - packageEntries log $libDir/*log* - packageEntries math $libDir/*math* - packageEntries program_options $libDir/*program_options* - packageEntries random $libDir/*random* - packageEntries regex $libDir/*regex* - packageEntries serialization $libDir/*serialization* - packageEntries signals $libDir/*signals* - packageEntries system $libDir/*system* - packageEntries test $libDir/*test* - packageEntries thread $libDir/*thread* - packageEntries timer $libDir/*timer* - packageEntries wave $libDir/*wave* + ./b2 $jobArgs \ + --without-mpi \ + --enable-threads=posix \ + --enable-thread-local-alloc \ + --enable-parallel-mark \ + inlining=on \ + threading=multi \ + variant=release \ + link=static,shared \ + runtime-link=shared \ + --without-python \ + install + + prepareInstalledDevelLibs libboost_atomic \ + libboost_chrono libboost_context libboost_coroutine \ + libboost_date_time libboost_filesystem libboost_iostreams \ + libboost_locale libboost_log libboost_log_setup \ + libboost_math_c99 libboost_math_c99f libboost_math_c99l \ + libboost_math_tr1 libboost_math_tr1f libboost_math_tr1l \ + libboost_program_options libboost_random libboost_regex \ + libboost_serialization libboost_signals libboost_system \ + libboost_thread libboost_timer libboost_unit_test_framework \ + libboost_wave libboost_wserialization libboost_prg_exec_monitor \ + libboost_exception libboost_graph libboost_test_exec_monitor + + packageEntries devel $developDir + packageEntries atomic $libDir/libboost_atomic* + packageEntries chrono $libDir/libboost_chrono* + packageEntries context $libDir/libboost_context* + packageEntries coroutine $libDir/libboost_coroutine* + packageEntries date_time $libDir/libboost_date_time* +# packageEntries exception $libDir/libboost_exception* + packageEntries filesystem $libDir/libboost_filesystem* + packageEntries graph $libDir/libboost_graph* + packageEntries iostreams $libDir/libboost_iostreams* + packageEntries locale $libDir/libboost_locale* + packageEntries log $libDir/libboost_log* + packageEntries math $libDir/libboost_math* + packageEntries program_options $libDir/libboost_program_options* + packageEntries random $libDir/libboost_random* + packageEntries regex $libDir/libboost_regex* + packageEntries serialization $libDir/libboost_serialization* $libDir/libboost_wserialization* + packageEntries signals $libDir/libboost_signals* + packageEntries system $libDir/libboost_system* + packageEntries test $libDir/libboost_prg_exec_monitor* + packageEntries thread $libDir/libboost_thread* + packageEntries timer $libDir/libboost_timer* + packageEntries unit_test_framework $libDir/libboost_unit_test_framework* + packageEntries wave $libDir/libboost_wave* } PROVIDES_devel=" boost_devel$secondaryArchSuffix = $portVersion + devel:libboost_atomic$secondaryArchSuffix = $portVersion + devel:libboost_chrono$secondaryArchSuffix = $portVersion + devel:libboost_context$secondaryArchSuffix = $portVersion + devel:libboost_coroutine$secondaryArchSuffix = $portVersion + devel:libboost_date_time$secondaryArchSuffix = $portVersion + devel:libboost_exception$secondaryArchSuffix = $portVersion + devel:libboost_filesystem$secondaryArchSuffix = $portVersion + devel:libboost_graph$secondaryArchSuffix = $portVersion + devel:libboost_iostreams$secondaryArchSuffix = $portVersion + devel:libboost_locale$secondaryArchSuffix = $portVersion + devel:libboost_log$secondaryArchSuffix = $portVersion + devel:libboost_log_setup$secondaryArchSuffix = $portVersion + devel:libboost_math_c99$secondaryArchSuffix = $portVersion + devel:libboost_math_c99f$secondaryArchSuffix = $portVersion + devel:libboost_math_c99l$secondaryArchSuffix = $portVersion + devel:libboost_math_tr1$secondaryArchSuffix = $portVersion + devel:libboost_math_tr1f$secondaryArchSuffix = $portVersion + devel:libboost_math_tr1l$secondaryArchSuffix = $portVersion + devel:libboost_prg_exec_monitor$secondaryArchSuffix = $portVersion + devel:libboost_program_options$secondaryArchSuffix = $portVersion + devel:libboost_random$secondaryArchSuffix = $portVersion + devel:libboost_regex$secondaryArchSuffix = $portVersion + devel:libboost_serialization$secondaryArchSuffix = $portVersion + devel:libboost_signals$secondaryArchSuffix = $portVersion + devel:libboost_system$secondaryArchSuffix = $portVersion + devel:libboost_test_exec_monitor$secondaryArchSuffix = $portVersion + devel:libboost_thread$secondaryArchSuffix = $portVersion + devel:libboost_timer$secondaryArchSuffix = $portVersion + devel:libboost_unit_test_framework$secondaryArchSuffix = $portVersion + devel:libboost_wave$secondaryArchSuffix = $portVersion + devel:libboost_wserialization$secondaryArchSuffix = $portVersion " REQUIRES_devel=" haiku$secondaryArchSuffix >= $haikuVersion + boost$secondaryArchSuffix == $portVersion + boost_atomic$secondaryArchSuffix == $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_context$secondaryArchSuffix == $portVersion + boost_coroutine$secondaryArchSuffix == $portVersion + boost_date_time$secondaryArchSuffix == $portVersion +# boost_exception$secondaryArchSuffix == $portVersion + boost_filesystem$secondaryArchSuffix == $portVersion + boost_graph$secondaryArchSuffix == $portVersion + boost_iostreams$secondaryArchSuffix == $portVersion + boost_locale$secondaryArchSuffix == $portVersion + boost_log$secondaryArchSuffix == $portVersion + boost_math$secondaryArchSuffix == $portVersion + boost_program_options$secondaryArchSuffix == $portVersion + boost_random$secondaryArchSuffix == $portVersion + boost_regex$secondaryArchSuffix == $portVersion + boost_serialization$secondaryArchSuffix == $portVersion + boost_signals$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_test$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion + boost_timer$secondaryArchSuffix == $portVersion + boost_unit_test_framework$secondaryArchSuffix == $portVersion + boost_wave$secondaryArchSuffix == $portVersion " PROVIDES_atomic=" boost_atomic$secondaryArchSuffix = $portVersion + lib:libboost_atomic$secondaryArchSuffix = $portVersion " REQUIRES_atomic=" @@ -131,15 +216,17 @@ REQUIRES_atomic=" PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion + lib:libboost_chrono$secondaryArchSuffix = $portVersion " REQUIRES_chrono=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion " PROVIDES_context=" boost_context$secondaryArchSuffix = $portVersion + lib:libboost_context$secondaryArchSuffix = $portVersion " REQUIRES_context=" @@ -148,81 +235,107 @@ REQUIRES_context=" PROVIDES_coroutine=" boost_coroutine$secondaryArchSuffix = $portVersion + lib:libboost_coroutine$secondaryArchSuffix = $portVersion " REQUIRES_coroutine=" - boost_context$secondaryArchSuffix == $portVersion + haiku$secondaryArchSuffix >= $haikuVersion + lib:libboost_context$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion " PROVIDES_date_time=" boost_date_time$secondaryArchSuffix = $portVersion + lib:libboost_date_time$secondaryArchSuffix = $portVersion " REQUIRES_date_time=" haiku$secondaryArchSuffix >= $haikuVersion " -PROVIDES_exception=" - boost_exception$secondaryArchSuffix = $portVersion - " +#PROVIDES_exception=" +# boost_exception$secondaryArchSuffix = $portVersion +# lib:libboost_exception$secondaryArchSuffix = $portVersion +# " -REQUIRES_exception=" - haiku$secondaryArchSuffix >= $haikuVersion - " +#REQUIRES_exception=" +# haiku$secondaryArchSuffix >= $haikuVersion +# " PROVIDES_filesystem=" boost_filesystem$secondaryArchSuffix = $portVersion + lib:libboost_filesystem$secondaryArchSuffix = $portVersion " REQUIRES_filesystem=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion lib:libz$secondaryArchSuffix lib:libbz2$secondaryArchSuffix " PROVIDES_graph=" boost_graph$secondaryArchSuffix = $portVersion + lib:libboost_graph$secondaryArchSuffix = $portVersion " REQUIRES_graph=" haiku$secondaryArchSuffix >= $haikuVersion - boost_regex$secondaryArchSuffix == $portVersion + lib:libboost_regex$secondaryArchSuffix == $portVersion + lib:libicuuc$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libicudata$secondaryArchSuffix " PROVIDES_iostreams=" boost_iostreams$secondaryArchSuffix = $portVersion + lib:libboost_iostreams$secondaryArchSuffix = $portVersion " REQUIRES_iostreams=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix " PROVIDES_locale=" boost_locale$secondaryArchSuffix = $portVersion + lib:libboost_locale$secondaryArchSuffix = $portVersion " REQUIRES_locale=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix == $portVersion - boost_system$secondaryArchSuffix == $portVersion - boost_thread$secondaryArchSuffix == $portVersion + lib:libboost_chrono$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion + lib:libboost_thread$secondaryArchSuffix == $portVersion + lib:libicuuc$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libicudata$secondaryArchSuffix " PROVIDES_log=" boost_log$secondaryArchSuffix = $portVersion + lib:libboost_log$secondaryArchSuffix = $portVersion + lib:libboost_log_setup$secondaryArchSuffix = $portVersion " REQUIRES_log=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix == $portVersion - boost_system$secondaryArchSuffix == $portVersion - boost_date_time$secondaryArchSuffix == $portVersion - boost_thread$secondaryArchSuffix == $portVersion + lib:libboost_chrono$secondaryArchSuffix == $portVersion + lib:libboost_filesystem$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion + lib:libboost_date_time$secondaryArchSuffix == $portVersion + lib:libboost_thread$secondaryArchSuffix == $portVersion " PROVIDES_math=" boost_math$secondaryArchSuffix = $portVersion + lib:libboost_math_c99$secondaryArchSuffix = $portVersion + lib:libboost_math_c99f$secondaryArchSuffix = $portVersion + lib:libboost_math_c99l$secondaryArchSuffix = $portVersion + lib:libboost_math_tr1$secondaryArchSuffix = $portVersion + lib:libboost_math_tr1f$secondaryArchSuffix = $portVersion + lib:libboost_math_tr1l$secondaryArchSuffix = $portVersion " REQUIRES_math=" @@ -231,6 +344,7 @@ REQUIRES_math=" PROVIDES_program_options=" boost_program_options$secondaryArchSuffix = $portVersion + lib:libboost_program_options$secondaryArchSuffix = $portVersion " REQUIRES_program_options=" @@ -239,6 +353,7 @@ REQUIRES_program_options=" PROVIDES_random=" boost_random$secondaryArchSuffix = $portVersion + lib:libboost_random$secondaryArchSuffix = $portVersion " REQUIRES_random=" @@ -247,14 +362,20 @@ REQUIRES_random=" PROVIDES_regex=" boost_regex$secondaryArchSuffix = $portVersion + lib:libboost_regex$secondaryArchSuffix = $portVersion " REQUIRES_regex=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libicuuc$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libicudata$secondaryArchSuffix " PROVIDES_serialization=" boost_serialization$secondaryArchSuffix = $portVersion + lib:libboost_serialization$secondaryArchSuffix = $portVersion + lib:libboost_wserialization$secondaryArchSuffix = $portVersion " REQUIRES_serialization=" @@ -263,6 +384,7 @@ REQUIRES_serialization=" PROVIDES_signals=" boost_signals$secondaryArchSuffix = $portVersion + lib:libboost_signals$secondaryArchSuffix = $portVersion " REQUIRES_signals=" @@ -271,6 +393,7 @@ REQUIRES_signals=" PROVIDES_system=" boost_system$secondaryArchSuffix = $portVersion + lib:libboost_system$secondaryArchSuffix = $portVersion " REQUIRES_system=" @@ -279,6 +402,8 @@ REQUIRES_system=" PROVIDES_test=" boost_test$secondaryArchSuffix = $portVersion + lib:libboost_prg_exec_monitor$secondaryArchSuffix = $portVersion +# lib:libboost_test_exec_monitor$secondaryArchSuffix = $portVersion " REQUIRES_test=" @@ -287,33 +412,44 @@ REQUIRES_test=" PROVIDES_thread=" boost_thread$secondaryArchSuffix = $portVersion + lib:libboost_thread$secondaryArchSuffix = $portVersion " REQUIRES_thread=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix == $portVersion - boost_chrono$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion " PROVIDES_timer=" boost_timer$secondaryArchSuffix = $portVersion + lib:libboost_timer$secondaryArchSuffix = $portVersion " REQUIRES_timer=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix == $portVersion - boost_system$secondaryArchSuffix == $portVersion + lib:libboost_chrono$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion + " + +PROVIDES_unit_test_framework=" + boost_unit_test_framework$secondaryArchSuffix = $portVersion + lib:libboost_unit_test_framework$secondaryArchSuffix = $portVersion + " + +REQUIRES_unit_test_framework=" + haiku$secondaryArchSuffix >= $haikuVersion " PROVIDES_wave=" boost_wave$secondaryArchSuffix = $portVersion + lib:libboost_wave$secondaryArchSuffix = $portVersion " REQUIRES_wave=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix == $portVersion - boost_date_time$secondaryArchSuffix == $portVersion - boost_filesystem$secondaryArchSuffix == $portVersion - boost_system$secondaryArchSuffix == $portVersion - boost_thread$secondaryArchSuffix == $portVersion + lib:libboost_chrono$secondaryArchSuffix == $portVersion + lib:libboost_date_time$secondaryArchSuffix == $portVersion + lib:libboost_filesystem$secondaryArchSuffix == $portVersion + lib:libboost_system$secondaryArchSuffix == $portVersion + lib:libboost_thread$secondaryArchSuffix == $portVersion " From dd8f97a9756cd3ffef2cef89eaf2b4248042a3a1 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 29 Dec 2013 18:09:23 +0000 Subject: [PATCH 178/206] Add BlogPositive 0.3 recipe --- .../blogpositive/blogpositive-0.3.0.recipe | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 haiku-apps/blogpositive/blogpositive-0.3.0.recipe diff --git a/haiku-apps/blogpositive/blogpositive-0.3.0.recipe b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe new file mode 100644 index 000000000..4ae39eebe --- /dev/null +++ b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe @@ -0,0 +1,63 @@ +SUMMARY="The one blog app to rule them all!" +DESCRIPTION=" + Want to blog, but WebPositive isn't quick enough? + Now you can use the new blog app: BlogPositive! + It can connect to Wordpress, LiveJournal and OnSugar blogs. + " +HOMEPAGE="http://blogpositive.puckipedia.com" +SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.3" +REVISION="1" + +LICENSE="MIT" +COPYRIGHT="2013 :Puck Meerburg" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +PROVIDES=" + blogpositive = $portVersion + app:blogpositive = $portVersion + " + +REQUIRES=" + lib:libcurl + lib:libz + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:g++ + cmd:xres + cmd:mkdepend + " +BUILD_REQUIRES=" + devel:libcurl + devel:libz + haiku_devel >= $haikuVersion + " + +USER_SETTINGS_FILES=" + settings/BlogPositive directory + " + +BUILD() +{ + make + for i in BlogPositivePlugins/*; do + if [ -f $i/makefile ]; then + make -C $i + fi + done + make bindcatalogs +} + +INSTALL() +{ + make install INSTALL_DIR=$appsDir + addAppDeskbarSymlink $appsDir/BlogPositive + + for i in BlogPositivePlugins/*; do + if [ -f $i/makefile ]; then + make -C $i install INSTALL_DIR=$addOnsDir/BlogPositive + fi + done +} From de5d8227ca526501f79add503b79dbb0b453bfff Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sun, 29 Dec 2013 18:32:37 +0000 Subject: [PATCH 179/206] Added CmakeHaiku recipe --- haiku-apps/cmake_haiku/cmake_haiku-git.recipe | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 haiku-apps/cmake_haiku/cmake_haiku-git.recipe diff --git a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe new file mode 100644 index 000000000..1a78ab88d --- /dev/null +++ b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe @@ -0,0 +1,45 @@ +SUMMARY="Cmake GUI with Haiku Native Widgets" +DESCRIPTION="cmake_haiku is a native GUI frontend for Cmake with features like configuring a project and generating files for other build systems like Makefiles, Ninja etc." + +HOMEPAGE="https://github.com/AdrianArroyoCalle/cmake-haiku" +SRC_URI="git+https://github.com/AdrianArroyoCalle/cmake-haiku.git#a42d55b" + +LICENSE="BSD (3-clause)" +COPYRIGHT="2012-2013 Adrián Arroyo Calle " + +REVISION="1" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + cmake_haiku = $portVersion + app:cmake_haiku = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + cmd:cmake + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:cmake + cmd:make + " + +BUILD() +{ + cmake . + make +} + +INSTALL() +{ + mkdir -p $appsDir + cp cmake-gui $appsDir/CmakeHaiku + + addAppDeskbarSymlink $appsDir/CmakeHaiku +} From c8891332288df08118628c724d5ab422691934a6 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 29 Dec 2013 20:53:25 -0800 Subject: [PATCH 180/206] Remove whitespace at end of line in gettext patch. --- sys-devel/gettext/patches/gettext-0.18.1.1.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/gettext/patches/gettext-0.18.1.1.patch b/sys-devel/gettext/patches/gettext-0.18.1.1.patch index 0250765dc..6752ab563 100644 --- a/sys-devel/gettext/patches/gettext-0.18.1.1.patch +++ b/sys-devel/gettext/patches/gettext-0.18.1.1.patch @@ -5,7 +5,7 @@ # define O_TEXT _O_TEXT #endif -#if defined __BEOS__ || defined __HAIKU__ -+#if defined __BEOS__ ++#if defined __BEOS__ /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */ # undef O_BINARY # undef O_TEXT From 76a513632690c7890255ccfd830131a548a7fd5f Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 30 Dec 2013 00:46:20 +0000 Subject: [PATCH 181/206] Added Aiksaurus 1.2.1 recipe and patch --- app-text/aiksaurus/aiksaurus-1.2.1.recipe | 84 +++++++++++++++++++ .../aiksaurus/patches/aiksaurus-1.2.1.patch | 67 +++++++++++++++ 2 files changed, 151 insertions(+) create mode 100644 app-text/aiksaurus/aiksaurus-1.2.1.recipe create mode 100644 app-text/aiksaurus/patches/aiksaurus-1.2.1.patch diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.recipe b/app-text/aiksaurus/aiksaurus-1.2.1.recipe new file mode 100644 index 000000000..8af6c678e --- /dev/null +++ b/app-text/aiksaurus/aiksaurus-1.2.1.recipe @@ -0,0 +1,84 @@ +SUMMARY="A set of libraries and applications for Thesaurus" +DESCRIPTION="Aiksaurus is a set of libraries and applications which provide a thesaurus (currently English only, based on Guttenburg's Moby thesaurus) using native GUI on several platforms: +* UNIX (GTK+ & Qt) +* Win32 & MacOSX (Cocoa). +The core library itself is platform-independent. The principal language is C++, with some use of Cocoa/ObjC++; wrappers are provided for C and Cocoa/ObjC." + +HOMEPAGE="http://aiksaurus.sourceforge.net" +SRC_URI="http://switch.dl.sourceforge.net/project/aiksaurus/aiksaurus/1.2.1/aiksaurus-1.2.1.tar.gz" +CHECKSUM_MD5="3eae03b7c49843ccc9262e52846ea6b4" + +REVISION="1" + +LICENSE="GNU GPL v2" +COPYRIGHT="2001-2002 Jared Davis + 2001 Michael D. Pritchett + " + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + aiksaurus$secondaryArchSuffix = $portVersion + lib:libAiksaurus_1.2$secondaryArchSuffix = $portVersion + cmd:aiksaurus$secondaryArchSuffix = $portVersion + cmd:caiksaurus$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +PATCHES="aiksaurus-1.2.1.patch" + +BUILD() +{ + # Automake complains about NEWS missing + touch NEWS + + libtoolize --force --copy --install + + # libtoolize is going to ask us to append the contents + # of some files to aclocal.m4 + + for i in m4/{libtool,lt{options,sugar,version,~obsolete}}.m4; do cat $i >> aclocal.m4; done + + aclocal -I m4 + autoconf + automake --add-missing + + runConfigure ./configure --without-gtk --datadir=$dataDir + make +} + +INSTALL() +{ + make install + + prepareInstalledDevelLib libAiksaurus + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + aiksaurus${secondaryArchSuffix}_devel = $portVersion + devel:aiksaurus$secondaryArchSuffix = $portVersion + devel:libAiksaurus$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + aiksaurus$secondaryArchSuffix == $portVersion base + " diff --git a/app-text/aiksaurus/patches/aiksaurus-1.2.1.patch b/app-text/aiksaurus/patches/aiksaurus-1.2.1.patch new file mode 100644 index 000000000..8121aa5d7 --- /dev/null +++ b/app-text/aiksaurus/patches/aiksaurus-1.2.1.patch @@ -0,0 +1,67 @@ +diff -ur aiksaurus-1.2.1/base/aiksaurus.t.cpp aiksaurus-1.2.1-haiku/base/aiksaurus.t.cpp +--- aiksaurus-1.2.1/base/aiksaurus.t.cpp 2003-06-27 01:44:38.003407872 +0000 ++++ aiksaurus-1.2.1-haiku/base/aiksaurus.t.cpp 2013-12-30 08:47:08.949747712 +0000 +@@ -24,6 +24,7 @@ + #include "config.h" + #include + #include ++#include + using namespace std; + using AiksaurusImpl::AsciiCompare; + +diff -ur aiksaurus-1.2.1/configure.ac aiksaurus-1.2.1-haiku/configure.ac +--- aiksaurus-1.2.1/configure.ac 2004-06-12 04:34:05.017563648 +0000 ++++ aiksaurus-1.2.1-haiku/configure.ac 2013-12-29 23:53:53.963903488 +0000 +@@ -1,5 +1,6 @@ + AC_INIT([aiksaurus],[1.2],[http://aiksaurus.sourceforge.net/]) + AC_CONFIG_SRCDIR([base/Aiksaurus.h]) ++AC_CONFIG_MACRO_DIR([m4]) + + # Aiksaurus, version 1.2.0 + +@@ -47,19 +48,19 @@ + + AC_SUBST(LT_RELEASE) + +-LT_CURRENT=`expr $AIK_MICRO_VERSION - $AIK_INTERFACE_AGE` +-LT_REVISION=$AIK_INTERFACE_AGE +-LT_AGE=`expr $AIK_BINARY_AGE - $AIK_INTERFACE_AGE` ++m4_define(LT_CURRENT,`expr $AIK_MICRO_VERSION - $AIK_INTERFACE_AGE`) ++m4_define(LT_REVISION,$AIK_INTERFACE_AGE) ++m4_define(LT_AGE,`expr $AIK_BINARY_AGE - $AIK_INTERFACE_AGE`) + +-LT_AIK_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" ++LT_AIK_VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()" + + AC_SUBST(LT_AIK_VERSION_INFO) + +-LT_CURRENT=`expr $AIK_MICRO_VERSION - $AIKGTK_INTERFACE_AGE` +-LT_REVISION=$AIKGTK_INTERFACE_AGE +-LT_AGE=`expr $AIKGTK_BINARY_AGE - $AIKGTK_INTERFACE_AGE` ++m4_define(LT_CURRENT,`expr $AIK_MICRO_VERSION - $AIKGTK_INTERFACE_AGE`) ++m4_define(LT_REVISION,$AIKGTK_INTERFACE_AGE) ++m4_define(LT_AGE,`expr $AIKGTK_BINARY_AGE - $AIKGTK_INTERFACE_AGE`) + +-LT_AIKGTK_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" ++LT_AIKGTK_VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()" + + AC_SUBST(LT_AIKGTK_VERSION_INFO) + +@@ -69,7 +70,7 @@ + + # Specify a configuration file + # +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AH_TOP([ + #ifndef AIKSAURUS_CONFIG_H +diff -ur aiksaurus-1.2.1/Makefile.am aiksaurus-1.2.1-haiku/Makefile.am +--- aiksaurus-1.2.1/Makefile.am 2003-06-15 10:17:42.018350080 +0000 ++++ aiksaurus-1.2.1-haiku/Makefile.am 2013-12-29 23:53:53.966000640 +0000 +@@ -27,3 +27,5 @@ + ac-helpers/pkg-config/pkg.m4 \ + aiksaurus.spec.in \ + aiksaurus.spec ++ ++ACLOCAL_AMFLAGS = -I m4 From bcaf4fa11fd4368ce0ec589ef6127fa24ebc1445 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Mon, 30 Dec 2013 12:07:35 +0100 Subject: [PATCH 182/206] Add Konfetti recipe --- haiku-apps/konfetti/konfetti-1.0.0.recipe | 44 +++++++++++++++++++ haiku-apps/konfetti/licenses/Unknown Konfetti | 1 + 2 files changed, 45 insertions(+) create mode 100644 haiku-apps/konfetti/konfetti-1.0.0.recipe create mode 100644 haiku-apps/konfetti/licenses/Unknown Konfetti diff --git a/haiku-apps/konfetti/konfetti-1.0.0.recipe b/haiku-apps/konfetti/konfetti-1.0.0.recipe new file mode 100644 index 000000000..4e0ffcb59 --- /dev/null +++ b/haiku-apps/konfetti/konfetti-1.0.0.recipe @@ -0,0 +1,44 @@ +SUMMARY="A little screensaver which draws confetti on your desktop" +DESCRIPTION=" + Konfetti is a small screensaver which draws semi-transparent confetti + on your desktop. + " +HOMEPAGE="https://github.com/HaikuArchives/Konfetti/" +SRC_URI="git://github.com/HaikuArchives/Konfetti.git#b667a6e39bc28300298c66bed6209c5141b04e71" +REVISION="1" +COPYRIGHT=" + 2001 Werner Freytag + " +LICENSE="Unknown Konfetti" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + konfetti = $portVersion + app:konfetti = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:mkdepend + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD() +{ + cd src + make +} + +INSTALL() +{ + mkdir -p $addOnsDir/Screen\ Savers + cd src + make install INSTALL_DIR=temp + mv temp/* $addOnsDir/Screen\ Savers +} diff --git a/haiku-apps/konfetti/licenses/Unknown Konfetti b/haiku-apps/konfetti/licenses/Unknown Konfetti new file mode 100644 index 000000000..e88e8d301 --- /dev/null +++ b/haiku-apps/konfetti/licenses/Unknown Konfetti @@ -0,0 +1 @@ +There is no license specified in the code, but on HaikuWare it says the license is "Freeware". From cd1659050f01403a57d214169f840b1b3225d0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 28 Dec 2013 13:01:43 +0100 Subject: [PATCH 183/206] gnu_classpath: Fix corrupted patch Seems a space got removed at start of line... --- dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch b/dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch index 0c5a9e8ae..33b7704e6 100644 --- a/dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch +++ b/dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch @@ -25,7 +25,7 @@ @@ -310,7 +310,7 @@ libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \ - $(top_builddir)/native/jni/native-lib/libclasspathnative.la \ + $(top_builddir)/native/jni/native-lib/libclasspathnative.la \ - $(LTLIBICONV) + -Wl,$(LIBICONV) From 373e8fd816b9e9a65b1e758c7e85e9ebfb07052f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 30 Dec 2013 12:45:26 +0100 Subject: [PATCH 184/206] jamvm: Forgot to pass $prefix as classpath-install-dir --- dev-java/jamvm/jamvm-1.5.4.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe index e402dfc2f..ba931b270 100644 --- a/dev-java/jamvm/jamvm-1.5.4.recipe +++ b/dev-java/jamvm/jamvm-1.5.4.recipe @@ -50,7 +50,7 @@ BUILD() aclocal autoconf runConfigure ./configure \ - --with-classpath-install-dir= + --with-classpath-install-dir=$prefix make } From 9f8594c2d7c76e28eb9f236aa63fe5f94acad3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Mon, 30 Dec 2013 15:18:23 +0000 Subject: [PATCH 185/206] Gnash and Agg updated --- media-video/gnash/gnash-0.8.10.recipe | 47 +++++++++++++++++---------- x11-libs/agg/agg-2.5.recipe | 23 ++++++------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe index 855f94d9b..7e25bb88b 100644 --- a/media-video/gnash/gnash-0.8.10.recipe +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -1,5 +1,5 @@ SUMMARY="Gnash" -DESCRIPTION="Gnash" +DESCRIPTION="Gnash is a player for the Adobe Flash technology" HOMEPAGE="http://www.gnu.org/software/gnash/" SRC_URI="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2" CHECKSUM_MD5="63e9f79c41d93d48c5a2fa94856548c4" @@ -12,6 +12,8 @@ DISABLE_SOURCE_PACKAGE=yes ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi SECONDARY_ARCHITECTURES="x86 x86_64" @@ -29,17 +31,18 @@ REQUIRES=" lib:libspeex$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libcurl$secondaryArchSuffix - boost_thread$secondaryArchSuffix - boost_program_options$secondaryArchSuffix - boost_iostreams$secondaryArchSuffix - boost_serialization$secondaryArchSuffix - boost_date_time$secondaryArchSuffix + lib:libboost_thread$secondaryArchSuffix + lib:libboost_program_options$secondaryArchSuffix + lib:libboost_iostreams$secondaryArchSuffix + lib:libboost_serialization$secondaryArchSuffix + lib:libboost_date_time$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libsdl_sound$secondaryArchSuffix lib:libagg$secondaryArchSuffix - #lib:libfreetype$secondaryArchSuffix >= 2.5.0.1 + #lib:libfreetype$secondaryArchSuffix #lib:libfontconfig$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion @@ -53,17 +56,18 @@ BUILD_REQUIRES=" devel:libexpat$secondaryArchSuffix devel:libcurl$secondaryArchSuffix boost_devel$secondaryArchSuffix - boost_thread$secondaryArchSuffix - boost_program_options$secondaryArchSuffix - boost_iostreams$secondaryArchSuffix - boost_serialization$secondaryArchSuffix - boost_date_time$secondaryArchSuffix + devel:libboost_thread$secondaryArchSuffix + devel:libboost_program_options$secondaryArchSuffix + devel:libboost_iostreams$secondaryArchSuffix + devel:libboost_serialization$secondaryArchSuffix + devel:libboost_date_time$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libsdl_sound$secondaryArchSuffix devel:libagg$secondaryArchSuffix #devel:libfontconfig$secondaryArchSuffix - #devel:libfreetype$secondaryArchSuffix >= 2.5.0.1 + #devel:libfreetype$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:pkg_config @@ -80,16 +84,25 @@ PATCHES=" " BUILD() -{ - runConfigure ./configure --enable-renderer=agg --enable-media=ffmpeg \ +{ + INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir + LIB_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir + + export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig" + + ./configure --enable-renderer=agg --enable-media=ffmpeg \ --enable-gui=sdl --enable-sound=sdl --without-gconf --disable-extensions \ - --with-agg-incl=$portPackageLinksDir/devel~libagg/develop/headers/agg \ - --with-agg-lib=$portPackageLinksDir/lib~libagg/lib/ + --with-agg-incl=$INCLUDE_DIR/agg \ + --with-agg-lib=$LIB_DIR + --includedir=$INCLUDE_DIR + --bindir=$appsDir + --libdir=$LIB_DIR make } INSTALL() { make install + addAppDeskbarSymlink $appsDir/Gnash Gnash } TEST() { diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe index a84cb6e4f..d72f98a07 100644 --- a/x11-libs/agg/agg-2.5.recipe +++ b/x11-libs/agg/agg-2.5.recipe @@ -8,24 +8,25 @@ LICENSE="GNU GPL v2" COPYRIGHT="2002-2006 Maxim Shemanarev" ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - lib:libagg = $portVersion + lib:libagg$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku >= $haikuVersion - lib:libsdl + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion - devel:libsdl + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:make cmd:autoconf cmd:automake - cmd:ld + cmd:ld$secondaryArchSuffix cmd:libtoolize " @@ -47,19 +48,19 @@ BUILD() INSTALL() { mkdir -p $libDir - mkdir -p $developDir/headers/agg + mkdir -p $includeDir/agg mkdir -p $developLibDir cp src/libagg.so $libDir cp src/libagg.so $developLibDir - cp -r include/* $developDir/headers/agg/ + cp -r include/* $includeDir/agg/ packageEntries devel \ $developDir } PROVIDES_devel=" - devel:libagg = $portVersion + devel:libagg$secondaryArchSuffix = $portVersion " REQUIRES_devel=" - lib:libagg == $portVersion base + lib:libagg$secondaryArchSuffix == $portVersion base " From 87782ca71306a31b931e85bfb435e945b16d06e1 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Mon, 30 Dec 2013 19:47:59 +0000 Subject: [PATCH 186/206] Konfetti: Set license to MIT --- haiku-apps/konfetti/konfetti-1.0.0.recipe | 6 ++---- haiku-apps/konfetti/licenses/Unknown Konfetti | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 haiku-apps/konfetti/licenses/Unknown Konfetti diff --git a/haiku-apps/konfetti/konfetti-1.0.0.recipe b/haiku-apps/konfetti/konfetti-1.0.0.recipe index 4e0ffcb59..c8d12fbc9 100644 --- a/haiku-apps/konfetti/konfetti-1.0.0.recipe +++ b/haiku-apps/konfetti/konfetti-1.0.0.recipe @@ -6,10 +6,8 @@ DESCRIPTION=" HOMEPAGE="https://github.com/HaikuArchives/Konfetti/" SRC_URI="git://github.com/HaikuArchives/Konfetti.git#b667a6e39bc28300298c66bed6209c5141b04e71" REVISION="1" -COPYRIGHT=" - 2001 Werner Freytag - " -LICENSE="Unknown Konfetti" +COPYRIGHT="2001 Werner Freytag" +LICENSE="MIT" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/haiku-apps/konfetti/licenses/Unknown Konfetti b/haiku-apps/konfetti/licenses/Unknown Konfetti deleted file mode 100644 index e88e8d301..000000000 --- a/haiku-apps/konfetti/licenses/Unknown Konfetti +++ /dev/null @@ -1 +0,0 @@ -There is no license specified in the code, but on HaikuWare it says the license is "Freeware". From d197a3424b5c8bf48ae4fd59ad0d0045e6a763e4 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 30 Dec 2013 19:53:31 +0000 Subject: [PATCH 187/206] Added ragel 6.8 recipe and patch --- dev-util/ragel/patches/ragel-6.8.patch | 23 +++++++++++ dev-util/ragel/ragel-6.8.recipe | 53 ++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 dev-util/ragel/patches/ragel-6.8.patch create mode 100644 dev-util/ragel/ragel-6.8.recipe diff --git a/dev-util/ragel/patches/ragel-6.8.patch b/dev-util/ragel/patches/ragel-6.8.patch new file mode 100644 index 000000000..756ff6a5b --- /dev/null +++ b/dev-util/ragel/patches/ragel-6.8.patch @@ -0,0 +1,23 @@ +diff -ur ragel-6.8/ragel/common.h ragel-6.8-haiku/ragel/common.h +--- ragel-6.8/ragel/common.h 2013-02-11 01:57:45.020971520 +0000 ++++ ragel-6.8-haiku/ragel/common.h 2013-12-30 19:13:12.330301440 +0000 +@@ -24,6 +24,7 @@ + + #include + #include ++#include + #include "dlist.h" + + /* Location in an input file. */ +diff -ur ragel-6.8/ragel/mlcodegen.cpp ragel-6.8-haiku/ragel/mlcodegen.cpp +--- ragel-6.8/ragel/mlcodegen.cpp 2013-02-11 01:57:45.022282240 +0000 ++++ ragel-6.8-haiku/ragel/mlcodegen.cpp 2013-12-30 19:18:36.937426944 +0000 +@@ -514,7 +514,7 @@ + { + data_prefix = string(fsmName) + "_"; + if (data_prefix.size() > 0) +- data_prefix[0] = ::tolower(data_prefix[0]); // uncapitalize ++ data_prefix[0] = tolower(data_prefix[0]); // uncapitalize + } + if ( !noPrefix ) + return data_prefix; diff --git a/dev-util/ragel/ragel-6.8.recipe b/dev-util/ragel/ragel-6.8.recipe new file mode 100644 index 000000000..5498ddc40 --- /dev/null +++ b/dev-util/ragel/ragel-6.8.recipe @@ -0,0 +1,53 @@ +SUMMARY="Ragel compiles executable finite state machines from regular languages" +DESCRIPTION=" +Ragel compiles executable finite state machines from regular languages. + +Ragel targets C, C++, Objective-C, C#, D, Java, Ruby, OCaml and Go. + +Ragel state machines can not only recognize byte sequences as regular expression machines do, but can also execute code at arbitrary points in the recognition of a regular language. +Code embedding is done using inline operators that do not disrupt the regular language syntax." + +HOMEPAGE="http://www.complang.org/ragel" +SRC_URI="http://www.complang.org/ragel/ragel-6.8.tar.gz" +CHECKSUM_MD5="1bb39745ac23da449019f9f2cb4b0d01" + +REVISION="1" + +LICENSE="GNU GPL v1" +COPYRIGHT=" + 2001-2009 Adrian Thurston + 2007 Victor Hugo Borja + 2011 Josef Goettgens + " + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + ragel = $portVersion + cmd:ragel$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +PATCHES="ragel-6.8.patch" + +BUILD() +{ + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} From 1e46554dcc1afbebc0fb53d9d846b2c090db3319 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 12:59:47 -0800 Subject: [PATCH 188/206] Remove old hare recipe --- haiku-apps/hare/hare-beta1_git.recipe | 52 --------------------------- 1 file changed, 52 deletions(-) delete mode 100644 haiku-apps/hare/hare-beta1_git.recipe diff --git a/haiku-apps/hare/hare-beta1_git.recipe b/haiku-apps/hare/hare-beta1_git.recipe deleted file mode 100644 index d6ff3eb19..000000000 --- a/haiku-apps/hare/hare-beta1_git.recipe +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY="Hare - Haiku Audio Ripper Encoder" -DESCRIPTION="Hare - Haiku Audio Ripper Encoder, formerly known as Flip-Side A.E." -HOMEPAGE="http://github.com/HaikuArchives/Hare" -SRC_URI="git://github.com/HaikuArchives/Hare.git" -LICENSE="MIT" -COPYRIGHT="2000 FlipSide Software - 2001-2003 BeUnited.org - 2009-2013 Hare Maintainers - " - -REVISION="1" - -ARCHITECTURES="x86_gcc2 !x86 !x86_64" - -PROVIDES=" - Hare = $portVersion - app:Hare = $portVersion - " - -REQUIRES=" - haiku >= $haikuVersion -# lib:liblame -# lib:liboggenc -# lib:libflac -# lib:libgogo - lib:libtag$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - devel:libtag$secondaryArchSuffix - " - -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:cmake - cmd:make - " - -BUILD() -{ - cmake . - make -} - -INSTALL() -{ - mkdir -p $appsDir/Hare - cp -r build/* $appsDir/Hare - addAppDeskbarSymlink $appsDir/Hare/Hare Hare -} - From ee970037522cbe2624a2fc0106997fa090c080c1 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 14:36:24 -0800 Subject: [PATCH 189/206] Update gogo_no_coda for secondaryArchSuffix --- .../gogo_no_coda/gogo_no_coda-3.13.recipe | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe index f1293900c..63dfb2fcc 100644 --- a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe +++ b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe @@ -6,26 +6,31 @@ CHECKSUM_MD5="7b3008a0aba2578a2b428ba538452e87" LICENSE="GNU LGPL v2" COPYRIGHT="2001-2003 Respective gogo-no-coda creators" REVISION="1" -ARCHITECTURES="?x86 x86_gcc2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="gogo_no_coda-3.13.patch" PROVIDES=" gogo_enc = $portVersion compat >= 1 + cmd:gogo_enc$secondaryArchSuffix " -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="haiku >= $haikuVersion" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:nasm " - SOURCE_DIR="gogo-no-coda-master" BUILD() @@ -37,7 +42,6 @@ BUILD() INSTALL() { cd linux - mkdir $prefix/bin + mkdir -p $prefix/bin make install prefix=$prefix } - From b238753251e627e1b13ac366983b96eaf8a5178c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 15:08:53 -0800 Subject: [PATCH 190/206] Update gogo_no_coda-3.13 for secondaryArchSuffix --- media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe index 63dfb2fcc..9b27ed9fd 100644 --- a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe +++ b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe @@ -12,7 +12,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="gogo_no_coda-3.13.patch" PROVIDES=" - gogo_enc = $portVersion compat >= 1 + gogo_enc$secondaryArchSuffix = $portVersion compat >= 1 cmd:gogo_enc$secondaryArchSuffix " From e398b6ed217aba0222636fc36c96d9c4ddeba853 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 15:10:09 -0800 Subject: [PATCH 191/206] Update hare to 1.1.1 --- haiku-apps/hare/hare-1.1.1.recipe | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 haiku-apps/hare/hare-1.1.1.recipe diff --git a/haiku-apps/hare/hare-1.1.1.recipe b/haiku-apps/hare/hare-1.1.1.recipe new file mode 100644 index 000000000..7cc44c01e --- /dev/null +++ b/haiku-apps/hare/hare-1.1.1.recipe @@ -0,0 +1,52 @@ +SUMMARY="Hare - Haiku Audio Ripper Encoder" +DESCRIPTION="Hare - Haiku Audio Ripper Encoder, formerly known as Flip-Side A.E." +HOMEPAGE="http://github.com/HaikuArchives/Hare" +SRC_URI="git://github.com/HaikuArchives/Hare.git#af69ba7b06" +LICENSE="MIT" +COPYRIGHT="2000 FlipSide Software + 2001-2003 BeUnited.org + 2009-2013 Hare Maintainers + " + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + Hare = $portVersion + app:Hare = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:lame + cmd:oggenc$secondaryArchSuffix + cmd:flac$secondaryArchSuffix + cmd:gogo_enc$secondaryArchSuffix + lib:libtag$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libtag$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:cmake + cmd:make + " + +BUILD() +{ + cmake . + make +} + +INSTALL() +{ + mkdir -p $appsDir/Hare + cp -r build/* $appsDir/Hare + addAppDeskbarSymlink $appsDir/Hare/Hare Hare +} From 3c25a8f3d239cced170cd4f98f38281d5449c30b Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 15:14:32 -0800 Subject: [PATCH 192/206] Fix secondaryArchSuffix for ragel --- dev-util/ragel/ragel-6.8.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/ragel/ragel-6.8.recipe b/dev-util/ragel/ragel-6.8.recipe index 5498ddc40..a936560be 100644 --- a/dev-util/ragel/ragel-6.8.recipe +++ b/dev-util/ragel/ragel-6.8.recipe @@ -24,7 +24,7 @@ ARCHITECTURES="x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - ragel = $portVersion + ragel$secondaryArchSuffix = $portVersion cmd:ragel$secondaryArchSuffix = $portVersion " REQUIRES=" From d9020ec859199787ccd54a4d7cb7af5b290b2087 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 15:21:47 -0800 Subject: [PATCH 193/206] Remove old armyknife recipes --- haiku-apps/armyknife/armyknife-61.recipe | 20 -------------------- haiku-apps/armyknife/armyknife-62.recipe | 20 -------------------- 2 files changed, 40 deletions(-) delete mode 100644 haiku-apps/armyknife/armyknife-61.recipe delete mode 100644 haiku-apps/armyknife/armyknife-62.recipe diff --git a/haiku-apps/armyknife/armyknife-61.recipe b/haiku-apps/armyknife/armyknife-61.recipe deleted file mode 100644 index b0628d81b..000000000 --- a/haiku-apps/armyknife/armyknife-61.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." -HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" -SRC_URI="svn+http://svn.osdrawer.net/armyknife#61" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/taglib >= 1.6.3" -#CHECKSUM_MD5="" -BUILD() -{ - cd armyknife-61 - make -} - -INSTALL() -{ - cd armyknife-61 - make zipfile - mkdir -p ${DESTDIR}/boot/apps - unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps -} diff --git a/haiku-apps/armyknife/armyknife-62.recipe b/haiku-apps/armyknife/armyknife-62.recipe deleted file mode 100644 index b76790c4b..000000000 --- a/haiku-apps/armyknife/armyknife-62.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." -HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" -SRC_URI="svn+http://svn.osdrawer.net/armyknife#62" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/taglib >= 1.6.3" -#CHECKSUM_MD5="" -BUILD() -{ - cd armyknife-62 - make -} - -INSTALL() -{ - cd armyknife-62 - make zipfile - mkdir -p ${DESTDIR}/boot/apps - unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps -} From b0d64b94a32d6e8a95f8739ebaa2f1a73085edc7 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 30 Dec 2013 18:30:03 -0800 Subject: [PATCH 194/206] Fix vorbis_tools now builds ok with gcc2 and gcc4. --- media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe index 997414636..0040c4d9f 100644 --- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe +++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe @@ -17,6 +17,7 @@ PROVIDES=" cmd:ogginfo$secondaryArchSuffix cmd:vcut$secondaryArchSuffix cmd:vorbiscomment$secondaryArchSuffix + cmd:ogg123$secondaryArchSuffix " REQUIRES=" @@ -30,12 +31,14 @@ REQUIRES=" lib:libcurl$secondaryArchSuffix lib:libvorbisfile$secondaryArchSuffix lib:libvorbisenc$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libvorbis$secondaryArchSuffix -# devel:libflac$secondaryArchSuffix + devel:libflac$secondaryArchSuffix devel:libspeex$secondaryArchSuffix devel:libao$secondaryArchSuffix devel:libogg$secondaryArchSuffix @@ -43,6 +46,8 @@ BUILD_REQUIRES=" devel:libcurl$secondaryArchSuffix devel:libvorbisfile$secondaryArchSuffix devel:libvorbisenc$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" From ad1ce17f8be0bab569f51f713d388021d19ab851 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 30 Dec 2013 23:14:09 -0600 Subject: [PATCH 195/206] mesa: Update Mesa 7.9.2-5 recipe to revision 5 * This revision fixes several issues including: - OpenGL screensavers not running due to a missing libGL linkage in renderer. - Build failure in recent images due to mesa not looking internally for the Haiku OpenGL kit headers. --- sys-libs/mesa/mesa-7.9.2.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index 8aa51a19d..28c637e37 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -8,9 +8,9 @@ HOMEPAGE="http://www.mesa3d.org/" COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." LICENSE="MIT" # remember to update SOURCE_DIR as well for the -X revision -SRC_URI="https://github.com/kallisti5/mesa/archive/7.9.2-3.tar.gz" -CHECKSUM_MD5="1f7d846ea2982ffa175c906443aaabd3" -REVISION="3" +SRC_URI="https://github.com/kallisti5/mesa/archive/7.9.2-5.tar.gz" +CHECKSUM_MD5="7e9aafbfffa04e14a57d450836d86bf1" +REVISION="5" ARCHITECTURES="x86_gcc2" if [ $effectiveTargetArchitecture != x86 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -43,7 +43,7 @@ BUILD_PREREQUIRES=" cmd:sed " -SOURCE_DIR="mesa-7.9.2-3" +SOURCE_DIR="mesa-7.9.2-5" BUILD() { From c2d2f582783d4d854265d7a265afb9f23116cf07 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 31 Dec 2013 07:17:42 +0000 Subject: [PATCH 196/206] Fixed armyknife recipe --- haiku-apps/armyknife/armyknife-66.recipe | 27 ++++++++++++++---------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/haiku-apps/armyknife/armyknife-66.recipe b/haiku-apps/armyknife/armyknife-66.recipe index 740b2f82c..87079ec1a 100644 --- a/haiku-apps/armyknife/armyknife-66.recipe +++ b/haiku-apps/armyknife/armyknife-66.recipe @@ -1,26 +1,30 @@ SUMMARY="The all-in-one metadata editor for audio files." DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." -HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" +HOMEPAGE="https://github.com/HaikuArchives/ArmyKnife" SRC_URI="git://github.com/HaikuArchives/ArmyKnife.git" COPYRIGHT="2000-2001 Jason Burgess" LICENSE="MIT" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 !x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 !x86" PROVIDES=" armyknife = $portVersion + app:ArmyKnife = $portVersion " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion - taglib${secondaryArchSuffix} + haiku$secondaryArchSuffix >= $haikuVersion + lib:libtag$secondaryArchSuffix + lib:libsanta$secondaryArchSuffix " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion taglib${secondaryArchSuffix}_devel + libsanta${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:unzip " @@ -33,9 +37,10 @@ BUILD() INSTALL() { make zipfile - mkdir -p ${appsDir} - unzip release/ArmyKnife-*.zip -d ${appsDir} + + mkdir -p $appsDir + unzip release/ArmyKnife-*.zip -d $appsDir - addAppDeskbarSymlink ${appsDir}/ArmyKnife/ArmyKnife + addAppDeskbarSymlink $appsDir/ArmyKnife/ArmyKnife } From 1d962c748f0bbee1b1ee7a8bccbe617734c81e75 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 31 Dec 2013 02:09:18 -0800 Subject: [PATCH 197/206] Update armyknife to 4.3.0 --- .../armyknife/{armyknife-66.recipe => armyknife-4.3.0.recipe} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename haiku-apps/armyknife/{armyknife-66.recipe => armyknife-4.3.0.recipe} (92%) diff --git a/haiku-apps/armyknife/armyknife-66.recipe b/haiku-apps/armyknife/armyknife-4.3.0.recipe similarity index 92% rename from haiku-apps/armyknife/armyknife-66.recipe rename to haiku-apps/armyknife/armyknife-4.3.0.recipe index 87079ec1a..67ca2e859 100644 --- a/haiku-apps/armyknife/armyknife-66.recipe +++ b/haiku-apps/armyknife/armyknife-4.3.0.recipe @@ -1,10 +1,10 @@ SUMMARY="The all-in-one metadata editor for audio files." DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." HOMEPAGE="https://github.com/HaikuArchives/ArmyKnife" -SRC_URI="git://github.com/HaikuArchives/ArmyKnife.git" +SRC_URI="git://github.com/HaikuArchives/ArmyKnife.git#67ce56a906" COPYRIGHT="2000-2001 Jason Burgess" LICENSE="MIT" -REVISION="2" +REVISION="1" ARCHITECTURES="x86_gcc2 !x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 !x86" From 9023e25ae9b4be003c51415f6b3a3343d351b6f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 31 Dec 2013 11:15:44 +0100 Subject: [PATCH 198/206] gnu_classpath: Update recipe Not marked as tested yet, since it needs to be bootstrap before it can build it seems... --- .../gnu_classpath/gnu_classpath-0.98.recipe | 88 ++++++++++++------- 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe index 56d07ee1d..5b7be2324 100644 --- a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe +++ b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe @@ -1,42 +1,9 @@ +SUMMARY="GNU Java class library" DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language" HOMEPAGE="http://www.gnu.org/software/classpath" SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-0.98.tar.gz" REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" CHECKSUM_MD5="90c6571b8b0309e372faa0f9f6255ea9" -BUILD() -{ - cd classpath-0.98 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ - --infodir=$COMMON_DOCS/info \ - --disable-gtk-peer \ - --disable-alsa \ - --disable-plugin \ - --disable-gconf-peer \ - --disable-gjdoc \ - LDFLAGS="-lnetwork" - make -} - -INSTALL() -{ - cd classpath-0.98 - make install -} - -TEST() -{ - cd classpath-0.98 -# make test -# make check -} - LICENSE="GNU GPL v2 GNU GPL v2 with classpath exceptions" COPYRIGHT="1998-1999, 2001-2008 Free Software Foundation @@ -48,3 +15,56 @@ COPYRIGHT="1998-1999, 2001-2008 Free Software Foundation 2004 World Wide Web Consortium 2005 Caolan McNamara 2005 Daniel Richard G." + +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + gnu_classpath = $portVersion +" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion +" +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:libtoolize + cmd:gcc$secondaryArchSuffix + cmd:make + # at least one java VM, for now just use jamvm + cmd:jamvm$secondaryArchSuffix +" + +SOURCE_DIR="classpath-0.98" + +PATCHES="gnu_classpath-0.98.patch" + +BUILD() +{ + libtoolize --force --copy --install + aclocal -I m4 + autoconf + runConfigure ./configure \ + --disable-gtk-peer \ + --disable-alsa \ + --disable-plugin \ + --disable-gconf-peer \ + --disable-gjdoc \ + LDFLAGS="-lnetwork" + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + : +# make test +# make check +} From bf260d558b1552dddaecff875c1e80a85f527649 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 31 Dec 2013 11:38:34 +0100 Subject: [PATCH 199/206] Add Finance recipe --- haiku-apps/finance/finance-1.0.0.recipe | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 haiku-apps/finance/finance-1.0.0.recipe diff --git a/haiku-apps/finance/finance-1.0.0.recipe b/haiku-apps/finance/finance-1.0.0.recipe new file mode 100644 index 000000000..bedc75a25 --- /dev/null +++ b/haiku-apps/finance/finance-1.0.0.recipe @@ -0,0 +1,53 @@ +SUMMARY="Manage all your finances with this easy-to-use app!" + +DESCRIPTION=" + Finance is an app made to provide all features expected from personal + finance software while using the style of Haiku. It allows for management + of multiple accounts and has graphs. + " + +HOMEPAGE="https://github.com/HaikuArchiveæs/Finance" +SRC_URI="git://github.com/puckipedia/Finance.git#329f2dac2115301f3bb9bfb054dfc398c419ccac" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT=" + 2001 Bunru Software + 2009 Pier Luigi Fiorini + " # See src/code/Finance.rdef + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + finance = $portVersion + app:finance = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:xres + cmd:gcc + cmd:jam + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +USER_SETTINGS_FILES=" + settings/BeFinancial_data + " + +BUILD() +{ + cd src + ./configure + jam +} + +INSTALL() +{ + cd src + mkdir -p $appsDir + cp generated/distro-haiku-*-release/Finance $appsDir + addAppDeskbarSymlink $appsDir/Finance +} From 8fb245a0fc1362ac9b48f04cd03fc8554a743eb7 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 31 Dec 2013 12:34:15 +0000 Subject: [PATCH 200/206] Finance: Add runConfigure, change repo --- haiku-apps/finance/finance-1.0.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/haiku-apps/finance/finance-1.0.0.recipe b/haiku-apps/finance/finance-1.0.0.recipe index bedc75a25..0c94dc460 100644 --- a/haiku-apps/finance/finance-1.0.0.recipe +++ b/haiku-apps/finance/finance-1.0.0.recipe @@ -6,8 +6,8 @@ DESCRIPTION=" of multiple accounts and has graphs. " -HOMEPAGE="https://github.com/HaikuArchiveæs/Finance" -SRC_URI="git://github.com/puckipedia/Finance.git#329f2dac2115301f3bb9bfb054dfc398c419ccac" +HOMEPAGE="https://github.com/HaikuArchives/Finance" +SRC_URI="git://github.com/HaikuArchives/Finance.git#c047e2da9a5e6c8cddb5ef3b430fcd43a429c2a4" REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT=" @@ -39,14 +39,14 @@ USER_SETTINGS_FILES=" BUILD() { - cd src - ./configure + cd trunk + runConfigure ./configure jam } INSTALL() { - cd src + cd trunk mkdir -p $appsDir cp generated/distro-haiku-*-release/Finance $appsDir addAppDeskbarSymlink $appsDir/Finance From 0dace48ecd592c2736a8f858d7ce03cb0403822b Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 31 Dec 2013 16:11:44 +0000 Subject: [PATCH 201/206] Fix Finance recipe, changes in repo --- haiku-apps/finance/finance-1.0.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/haiku-apps/finance/finance-1.0.0.recipe b/haiku-apps/finance/finance-1.0.0.recipe index 0c94dc460..ccd20c0fa 100644 --- a/haiku-apps/finance/finance-1.0.0.recipe +++ b/haiku-apps/finance/finance-1.0.0.recipe @@ -2,12 +2,14 @@ SUMMARY="Manage all your finances with this easy-to-use app!" DESCRIPTION=" Finance is an app made to provide all features expected from personal - finance software while using the style of Haiku. It allows for management - of multiple accounts and has graphs. + finance software while using the style of Haiku. + It can be used to balance multiple accounts and you can import Quicken or Money data, + reconcile statements, view spending categorization and net worth trends, + all with customizable categories and payees. " HOMEPAGE="https://github.com/HaikuArchives/Finance" -SRC_URI="git://github.com/HaikuArchives/Finance.git#c047e2da9a5e6c8cddb5ef3b430fcd43a429c2a4" +SRC_URI="git://github.com/HaikuArchives/Finance.git#33513a1c44b6f94a46ccae563f19a64440dea46a" REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT=" @@ -39,14 +41,12 @@ USER_SETTINGS_FILES=" BUILD() { - cd trunk runConfigure ./configure jam } INSTALL() { - cd trunk mkdir -p $appsDir cp generated/distro-haiku-*-release/Finance $appsDir addAppDeskbarSymlink $appsDir/Finance From ce274fdd923b4c0cfcf7dba09281a3e727039b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 31 Dec 2013 18:37:31 +0100 Subject: [PATCH 202/206] Gnash marked as broken and agg marked as untested --- media-video/gnash/gnash-0.8.10.recipe | 8 +++----- x11-libs/agg/agg-2.5.recipe | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe index 7e25bb88b..5d240f583 100644 --- a/media-video/gnash/gnash-0.8.10.recipe +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -7,15 +7,13 @@ COPYRIGHT="2005-2012 Free Software Foundation" LICENSE="GNU GPL v3" REVISION="1" -DISABLE_SOURCE_PACKAGE=yes - -ARCHITECTURES="x86 x86_64" +ARCHITECTURES="!x86 !x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - ARCHITECTURES="$ARCHITECTURES x86_gcc2" + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi -SECONDARY_ARCHITECTURES="x86 x86_64" +SECONDARY_ARCHITECTURES="!x86 !x86_64" PROVIDES=" gnash$secondaryArchSuffix = $portVersion diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe index d72f98a07..866e5b574 100644 --- a/x11-libs/agg/agg-2.5.recipe +++ b/x11-libs/agg/agg-2.5.recipe @@ -7,8 +7,8 @@ CHECKSUM_MD5="0229a488bc47be10a2fee6cf0b2febd6" LICENSE="GNU GPL v2" COPYRIGHT="2002-2006 Maxim Shemanarev" -ARCHITECTURES="x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES=" lib:libagg$secondaryArchSuffix = $portVersion From d3a0b72059f8c22ccaa570c46c5ed9dbe96e325c Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 31 Dec 2013 18:44:02 +0000 Subject: [PATCH 203/206] Remove comment --- haiku-apps/finance/finance-1.0.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/finance/finance-1.0.0.recipe b/haiku-apps/finance/finance-1.0.0.recipe index ccd20c0fa..722629db1 100644 --- a/haiku-apps/finance/finance-1.0.0.recipe +++ b/haiku-apps/finance/finance-1.0.0.recipe @@ -15,7 +15,7 @@ LICENSE="GNU GPL v2" COPYRIGHT=" 2001 Bunru Software 2009 Pier Luigi Fiorini - " # See src/code/Finance.rdef + " ARCHITECTURES="x86_gcc2" From dce4691b54fb4bc1c539ae1b865fa32a6a2ef15e Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 31 Dec 2013 13:07:54 -0600 Subject: [PATCH 204/206] solarus: Add WIP recipe * Shows missing sdl_image on my system even though sdl_image is activated * Marked broken on all architectures for now --- games-engines/solarus/solarus-1.1.1.recipe | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 games-engines/solarus/solarus-1.1.1.recipe diff --git a/games-engines/solarus/solarus-1.1.1.recipe b/games-engines/solarus/solarus-1.1.1.recipe new file mode 100644 index 000000000..c28a3152c --- /dev/null +++ b/games-engines/solarus/solarus-1.1.1.recipe @@ -0,0 +1,57 @@ +SUMMARY="An ARPG game engine" +DESCRIPTION="Solarus is an open-source Zelda-like 2D game engine." +HOMEPAGE="http://solarus-games.org" +SRC_URI="http://www.solarus-games.org/downloads/solarus/solarus-1.1.1-src.tar.gz" +CHECKSUM_MD5="168894091ce4b728889069c767a1532d" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="2006-2013 Christopho, Solarus" + +ARCHITECTURES="!x86_gcc2 !x86 !x86_64" +SECONDARY_ARCHITECTURES="!x86 !x86_64" + +PROVIDES=" + solarus = $portVersion + app:solarus = $portVersion +" +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libSDL$secondaryArchSuffix + lib:sdl_ttf$secondaryArchSuffix + lib:sdl_image$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libmodplug$secondaryArchSuffix >= 0.8.0 + lib:libphysfs$secondaryArchSuffix + lib:liblua$secondaryArchSuffix + lib:libopenal$secondaryArchSuffix +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libSDL$secondaryArchSuffix + devel:sdl_ttf$secondaryArchSuffix + devel:sdl_image$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libmodplug$secondaryArchSuffix >= 0.8.0 + devel:libphysfs$secondaryArchSuffix + devel:liblua$secondaryArchSuffix + devel:libopenal$secondaryArchSuffix +" +BUILD_PREREQUIRES=" + cmd:cmake + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize +" + +BUILD() +{ + cmake -DCMAKE_BUILD_TYPE=Release . + make $jobArgs +} + +INSTALL() +{ + make install + #addAppDeskbarSymlink $binDir/solarus +} From 92677f7315b35a4a834d3239025385d13f1def0c Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 31 Dec 2013 21:30:23 +0000 Subject: [PATCH 205/206] Added MasterPiece recipe and patch --- .../masterpiece/masterpiece-r742.recipe | 58 +++++++ .../patches/masterpiece-r742.patch | 150 ++++++++++++++++++ 2 files changed, 208 insertions(+) create mode 100644 haiku-apps/masterpiece/masterpiece-r742.recipe create mode 100644 haiku-apps/masterpiece/patches/masterpiece-r742.patch diff --git a/haiku-apps/masterpiece/masterpiece-r742.recipe b/haiku-apps/masterpiece/masterpiece-r742.recipe new file mode 100644 index 000000000..d6f71833c --- /dev/null +++ b/haiku-apps/masterpiece/masterpiece-r742.recipe @@ -0,0 +1,58 @@ +DESCRIPTION=" +This is an attempt to create a new way to create documents or books. \ +It moves away from the WYSIWYG paradigm of microsoft word, openoffice, etc. etc. etc. \ +It takes a more keyboard only, thought flowing and typing markup language, object oriented approach \ +where a user who has ideas or thoughts can jot these down and have them go into a list. to build their document/book, \ +they would then order the list of thoughts, images, tables, etc. into the correct order and preview/publish their book. +" +SUMMARY="New way to create opendocument compatible books/documents" + +HOMEPAGE="http://code.google.com/p/masterpiece/" +SRC_URI="svn+http://masterpiece.googlecode.com/svn/trunk#r742" + +REVISION="1" + +LICENSE="MIT" +COPYRIGHT="2010-2012 Pasquale J. Rinaldi, Jr." + +ARCHITECTURES="x86_gcc2 !x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 !x86" + +PROVIDES=" + masterpiece = $portVersion + app:masterpiece = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsqlite3$secondaryArchSuffix + lib:liblayout + lib:libpython2.6 + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsqlite3$secondaryArchSuffix + devel:libpython2.6 + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:mkdepend + cmd:make + " + +PATCHES="masterpiece-r742.patch" + +BUILD() +{ + make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` \ + OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + + cp objects/MasterPiece $appsDir + addAppDeskbarSymlink $appsDir/MasterPiece +} diff --git a/haiku-apps/masterpiece/patches/masterpiece-r742.patch b/haiku-apps/masterpiece/patches/masterpiece-r742.patch new file mode 100644 index 000000000..664639a2f --- /dev/null +++ b/haiku-apps/masterpiece/patches/masterpiece-r742.patch @@ -0,0 +1,150 @@ +diff -Pur masterpiece/Makefile masterpiece-haiku/Makefile +--- masterpiece/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ masterpiece-haiku/Makefile 2013-12-31 20:32:00.608960512 +0000 +@@ -0,0 +1,146 @@ ++## BeOS Generic Makefile v2.5 ## ++ ++## Fill in this file to specify the project being created, and the referenced ++## makefile-engine will do all of the hard work for you. This handles both ++## Intel and PowerPC builds of the BeOS and Haiku. ++ ++## Application Specific Settings --------------------------------------------- ++ ++# specify the name of the binary ++NAME= MasterPiece ++ ++# specify the type of binary ++#        APP:        Application ++#        SHARED:        Shared library or add-on ++#        STATIC:        Static library archive ++#        DRIVER: Kernel Driver ++TYPE= APP ++ ++#         if you plan to use localization features ++#         specify the application MIME siganture ++APP_MIME_SIG= ++ ++#        add support for new Pe and Eddie features ++#        to fill in generic makefile ++ ++#%{ ++# @src->@ ++ ++#        specify the source files to use ++#        full paths or paths relative to the makefile can be included ++#         all files, regardless of directory, will have their object ++#        files created in the common object directory. ++#        Note that this means this makefile will not work correctly ++#        if two source files with the same name (source.c or source.cpp) ++#        are included from different directories. Also note that spaces ++#        in folder names do not work well with this makefile. ++SRCS= AboutWindow.cpp App.cpp BuilderButton.cpp BuilderListView.cpp \ ++CommonFunctions.cpp EditIdeaName.cpp EditorTextView.cpp HelperWindows.cpp \ ++HelpStringItem.cpp IdeaStringItem.cpp MainMenu.cpp MarkupWindow.cpp \ ++MPBuilder.cpp MPEditor.cpp MPLauncher.cpp PublishFilePanel.cpp SaveIdea.cpp ++ ++#        specify the resource definition files to use ++#        full path or a relative path to the resource file can be used. ++RDEFS= Resources.rdef ++ ++#        specify the resource files to use. ++#        full path or a relative path to the resource file can be used. ++#        both RDEFS and RSRCS can be defined in the same makefile. ++RSRCS= Resources.rsrc ++ ++# @<-src@ ++#%} ++ ++#        end support for Pe and Eddie ++ ++#        specify additional libraries to link against ++#        there are two acceptable forms of library specifications ++#        -        if your library follows the naming pattern of: ++#                libXXX.so or libXXX.a you can simply specify XXX ++#                library: libbe.so entry: be ++# ++#        -        for version-independent linking of standard C++ libraries please add ++#                $(STDCPPLIBS) instead of raw "stdc++[.r4] [supc++]" library names ++# ++#        -        for localization support add following libs: ++#                locale localestub ++#                ++#        -         if your library does not follow the standard library ++#                naming scheme you need to specify the path to the library ++#                and it's name ++#                library: my_lib.a entry: my_lib.a or path/my_lib.a ++LIBS=root be sqlite3 $(STDCPPLIBS) python2.6 tracker ++ ++#        specify additional paths to directories following the standard ++#        libXXX.so or libXXX.a naming scheme. You can specify full paths ++#        or paths relative to the makefile. The paths included may not ++#        be recursive, so include all of the paths where libraries can ++#        be found. Directories where source files are found are ++#        automatically included. ++LIBPATHS= ++ ++#        additional paths to look for system headers ++#        thes use the form: #include
++#        source file directories are NOT auto-included here ++SYSTEM_INCLUDE_PATHS= ++ ++#        additional paths to look for local headers ++#        thes use the form: #include "header" ++#        source file directories are automatically included ++LOCAL_INCLUDE_PATHS= ++ ++#        specify the level of optimization that you desire ++#        NONE, SOME, FULL ++OPTIMIZE= ++ ++#         specify here the codes for languages you are going ++#         to support in this application. The default "en" ++#         one must be provided too. "make catkeys" will recreate only ++#         locales/en.catkeys file. Use it as template for creating other ++#         languages catkeys. All localization files must be placed ++#         in "locales" sub-directory. ++LOCALES= ++ ++#        specify any preprocessor symbols to be defined. The symbols will not ++#        have their values set automatically; you must supply the value (if any) ++#        to use. For example, setting DEFINES to "DEBUG=1" will cause the ++#        compiler option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" ++#        would pass "-DDEBUG" on the compiler's command line. ++DEFINES= ++ ++#        specify special warning levels ++#        if unspecified default warnings will be used ++#        NONE = supress all warnings ++#        ALL = enable all warnings ++WARNINGS= ++ ++#        specify whether image symbols will be created ++#        so that stack crawls in the debugger are meaningful ++#        if TRUE symbols will be created ++SYMBOLS= ++ ++#        specify debug settings ++#        if TRUE will allow application to be run from a source-level ++#        debugger. Note that this will disable all optimzation. ++DEBUGGER= ++ ++#        specify additional compiler flags for all files ++COMPILER_FLAGS= -g ++ ++#        specify additional linker flags ++LINKER_FLAGS= ++ ++#        specify the version of this particular item ++#        (for example, -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL") ++#        This may also be specified in a resource. ++APP_VERSION= ++ ++#        (for TYPE == DRIVER only) Specify desired location of driver in the /dev ++#        hierarchy. Used by the driverinstall rule. E.g., DRIVER_PATH = video/usb will ++#        instruct the driverinstall rule to place a symlink to your driver's binary in ++#        ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will appear at ++#        /dev/video/usb when loaded. Default is "misc". ++DRIVER_PATH= ++ ++## include the makefile-engine ++include $(BUILDHOME)/etc/makefile-engine From 57e39fff0f57e33fa38d2e3fda6a73d1058b2306 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 31 Dec 2013 16:09:07 -0600 Subject: [PATCH 206/206] mesa: Update Mesa-10.0.1 to fix #10360 * These changes are awaiting review by upstream mesa --- sys-libs/mesa/mesa-10.0.1.recipe | 7 +- sys-libs/mesa/patches/mesa-10.0.1.patchset | 2719 ++++++++++++++++++++ 2 files changed, 2725 insertions(+), 1 deletion(-) diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe index cc30f8926..ad2c370b3 100644 --- a/sys-libs/mesa/mesa-10.0.1.recipe +++ b/sys-libs/mesa/mesa-10.0.1.recipe @@ -9,7 +9,7 @@ COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." LICENSE="MIT" SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0.1/MesaLib-10.0.1.tar.bz2" CHECKSUM_MD5="0a72ca5b36046a658bf6038326ff32ed" -REVISION="4" +REVISION="5" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -75,6 +75,11 @@ INSTALL() cp $(find $mesaBuildDir -name 'libswpipe.so') \ "$addOnsDir/opengl/Software Pipe" + # Set some nice version info + setversion "$libDir/libGL.so" -app 10 0 1 -long "Haiku OpenGL kit" + setversion "$addOnsDir/opengl/Software Rasterizer" -app 10 0 1 -long "Mesa software rasterization renderer" + setversion "$addOnsDir/opengl/Software Pipe" -app 10 0 1 -long "Gallium LLVM software pipe renderer" + # OpenGL Kit mkdir -p $includeDir/os/opengl cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/ diff --git a/sys-libs/mesa/patches/mesa-10.0.1.patchset b/sys-libs/mesa/patches/mesa-10.0.1.patchset index 9aed3f820..8dbbc212a 100644 --- a/sys-libs/mesa/patches/mesa-10.0.1.patchset +++ b/sys-libs/mesa/patches/mesa-10.0.1.patchset @@ -352,3 +352,2722 @@ index 0000000..0f8503f -- 1.8.3.4 +From cc285772ce222f3672aa725dea18b52d9f94d2c2 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Mon, 30 Dec 2013 23:49:06 -0600 +Subject: [PATCH] haiku: Fix missing HaikuGL header paths + +--- + src/gallium/targets/haiku-softpipe/SConscript | 1 + + src/gallium/targets/libgl-haiku/SConscript | 1 + + src/mesa/drivers/haiku/swrast/SConscript | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript +index 40bf03c..16ce7cd 100644 +--- a/src/gallium/targets/haiku-softpipe/SConscript ++++ b/src/gallium/targets/haiku-softpipe/SConscript +@@ -21,6 +21,7 @@ env.Append(CPPPATH = [ + '#/src/mapi', + '#/src/mesa', + '#/src/mesa/main', ++ '#/include/HaikuGL', + '#/src/gallium/winsys/sw/hgl', + '/boot/system/develop/headers/private', + ]) +diff --git a/src/gallium/targets/libgl-haiku/SConscript b/src/gallium/targets/libgl-haiku/SConscript +index 2e6b628..43d15c5 100644 +--- a/src/gallium/targets/libgl-haiku/SConscript ++++ b/src/gallium/targets/libgl-haiku/SConscript +@@ -9,6 +9,7 @@ env.Append(CPPPATH = [ + '#/src/mapi', + '#/src/mesa', + '#/src/mesa/main', ++ '#/include/HaikuGL', + '/boot/system/develop/headers/private', + Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers + ]) +diff --git a/src/mesa/drivers/haiku/swrast/SConscript b/src/mesa/drivers/haiku/swrast/SConscript +index 71ce88e..ca0423e 100644 +--- a/src/mesa/drivers/haiku/swrast/SConscript ++++ b/src/mesa/drivers/haiku/swrast/SConscript +@@ -6,6 +6,7 @@ env.Append(CPPPATH = [ + '#/src/mapi', + '#/src/mesa', + '#/src/mesa/main', ++ '#/include/HaikuGL', + '/boot/system/develop/headers/private', + Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers + ]) +-- +1.8.3.4 + +From 72e0f3de1f2df3407dbf257183c78bd3f81c1a12 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Tue, 31 Dec 2013 15:39:49 -0600 +Subject: [PATCH] haiku libGL: Move from gallium target to src/hgl + +* The Haiku renderers need to link to libGL to function properly + in all usage contexts. As mesa drivers build before gallium + targets, we couldn't properly link the mesa swrast driver to + the gallium libGL target for Haiku. +* This is likely better as it mimics how glx is laid out ensuring + the Haiku libGL is better understood. +* All renderers properly link in libGL now. +--- + src/SConscript | 5 + + src/gallium/SConscript | 1 - + src/gallium/targets/haiku-softpipe/SConscript | 2 + + src/gallium/targets/libgl-haiku/GLDispatcher.cpp | 72 --- + src/gallium/targets/libgl-haiku/GLDispatcher.h | 109 ---- + src/gallium/targets/libgl-haiku/GLRenderer.cpp | 106 ---- + .../targets/libgl-haiku/GLRendererRoster.cpp | 224 ------- + src/gallium/targets/libgl-haiku/GLRendererRoster.h | 51 -- + src/gallium/targets/libgl-haiku/GLView.cpp | 643 --------------------- + src/gallium/targets/libgl-haiku/SConscript | 35 -- + src/hgl/GLDispatcher.cpp | 72 +++ + src/hgl/GLDispatcher.h | 109 ++++ + src/hgl/GLRenderer.cpp | 106 ++++ + src/hgl/GLRendererRoster.cpp | 224 +++++++ + src/hgl/GLRendererRoster.h | 51 ++ + src/hgl/GLView.cpp | 643 +++++++++++++++++++++ + src/hgl/SConscript | 36 ++ + src/mesa/drivers/haiku/swrast/SConscript | 2 + + 18 files changed, 1250 insertions(+), 1241 deletions(-) + delete mode 100644 src/gallium/targets/libgl-haiku/GLDispatcher.cpp + delete mode 100644 src/gallium/targets/libgl-haiku/GLDispatcher.h + delete mode 100644 src/gallium/targets/libgl-haiku/GLRenderer.cpp + delete mode 100644 src/gallium/targets/libgl-haiku/GLRendererRoster.cpp + delete mode 100644 src/gallium/targets/libgl-haiku/GLRendererRoster.h + delete mode 100644 src/gallium/targets/libgl-haiku/GLView.cpp + delete mode 100644 src/gallium/targets/libgl-haiku/SConscript + create mode 100644 src/hgl/GLDispatcher.cpp + create mode 100644 src/hgl/GLDispatcher.h + create mode 100644 src/hgl/GLRenderer.cpp + create mode 100644 src/hgl/GLRendererRoster.cpp + create mode 100644 src/hgl/GLRendererRoster.h + create mode 100644 src/hgl/GLView.cpp + create mode 100644 src/hgl/SConscript + +diff --git a/src/SConscript b/src/SConscript +index 1465918..a24acea 100644 +--- a/src/SConscript ++++ b/src/SConscript +@@ -18,6 +18,11 @@ if env['hostonly']: + # enable OpenGL ES support. + SConscript('mapi/glapi/gen/SConscript') + SConscript('mapi/glapi/SConscript') ++ ++# Haiku C++ libGL dispatch (renderers depend on libgl) ++if env['platform'] in ['haiku']: ++ SConscript('hgl/SConscript') ++ + SConscript('mesa/SConscript') + + SConscript('mapi/vgapi/SConscript') +diff --git a/src/gallium/SConscript b/src/gallium/SConscript +index 6e27be2..32bbdbe 100644 +--- a/src/gallium/SConscript ++++ b/src/gallium/SConscript +@@ -119,7 +119,6 @@ if not env['embedded']: + if env['platform'] == 'haiku': + SConscript([ + 'targets/haiku-softpipe/SConscript', +- 'targets/libgl-haiku/SConscript', + ]) + + if env['dri']: +diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript +index 16ce7cd..0381d05 100644 +--- a/src/gallium/targets/haiku-softpipe/SConscript ++++ b/src/gallium/targets/haiku-softpipe/SConscript +@@ -17,6 +17,8 @@ if True: + ]) + env.Prepend(LIBS = [softpipe]) + ++env.Prepend(LIBS = [libgl]) ++ + env.Append(CPPPATH = [ + '#/src/mapi', + '#/src/mesa', +diff --git a/src/gallium/targets/libgl-haiku/GLDispatcher.cpp b/src/gallium/targets/libgl-haiku/GLDispatcher.cpp +deleted file mode 100644 +index 46b91d5..0000000 +--- a/src/gallium/targets/libgl-haiku/GLDispatcher.cpp ++++ /dev/null +@@ -1,72 +0,0 @@ +-/* +- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +- * Copyright 2000-2012 Haiku, Inc. All Rights Reserved. +- * Distributed under the terms of the MIT License. +- * +- * Authors: +- * Brian Paul +- * Philippe Houdoin +- * Alexander von Gluck IV +- */ +- +- +-extern "C" { +-#include "glapi/glapi.h" +-#include "glapi/glapi_priv.h" +- +-/* +- * NOTE: this file portion implements C-based dispatch of the OpenGL entrypoints +- * (glAccum, glBegin, etc). +- * This code IS NOT USED if we're compiling on an x86 system and using +- * the glapi_x86.S assembly code. +- */ +-#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM)) +- +-#define KEYWORD1 PUBLIC +-#define KEYWORD2 +-#define NAME(func) gl##func +- +-#define DISPATCH(func, args, msg) \ +- const struct _glapi_table* dispatch; \ +- dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\ +- (dispatch->func) args +- +-#define RETURN_DISPATCH(func, args, msg) \ +- const struct _glapi_table* dispatch; \ +- dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\ +- return (dispatch->func) args +- +-#endif +-} +- +- +-/* NOTE: this file portion implement a thin OpenGL entrypoints dispatching +- C++ wrapper class +- */ +- +-#include "GLDispatcher.h" +- +-BGLDispatcher::BGLDispatcher() +-{ +-} +- +- +-BGLDispatcher::~BGLDispatcher() +-{ +-} +- +- +-status_t +-BGLDispatcher::CheckTable(const struct _glapi_table* table) +-{ +- _glapi_check_table(table ? table : _glapi_get_dispatch()); +- return B_OK; +-} +- +- +-status_t +-BGLDispatcher::SetTable(struct _glapi_table* table) +-{ +- _glapi_set_dispatch(table); +- return B_OK; +-} +diff --git a/src/gallium/targets/libgl-haiku/GLDispatcher.h b/src/gallium/targets/libgl-haiku/GLDispatcher.h +deleted file mode 100644 +index 44bca8c..0000000 +--- a/src/gallium/targets/libgl-haiku/GLDispatcher.h ++++ /dev/null +@@ -1,109 +0,0 @@ +-/* +- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +- * Copyright 2000-2012 Haiku, Inc. All Rights Reserved. +- * Distributed under the terms of the MIT License. +- * +- * Authors: +- * Brian Paul +- * Philippe Houdoin +- */ +-#ifndef GLDISPATCHER_H +-#define GLDISPATCHER_H +- +- +-#include +-#include +-#include +- +-#include "glheader.h" +- +-extern "C" { +-#include "glapi/glapi.h" +-} +- +- +-class BGLDispatcher +-{ +- // Private unimplemented copy constructors +- BGLDispatcher(const BGLDispatcher &); +- BGLDispatcher & operator=(const BGLDispatcher &); +- +- public: +- BGLDispatcher(); +- ~BGLDispatcher(); +- +- void SetCurrentContext(void* context); +- void* CurrentContext(); +- +- struct _glapi_table* Table(); +- status_t CheckTable( +- const struct _glapi_table* dispatch = NULL); +- status_t SetTable(struct _glapi_table* dispatch); +- uint32 TableSize(); +- +- const _glapi_proc operator[](const char* functionName); +- const char* operator[](uint32 offset); +- +- const _glapi_proc AddressOf(const char* functionName); +- uint32 OffsetOf(const char* functionName); +-}; +- +- +-// Inlines methods +-inline void +-BGLDispatcher::SetCurrentContext(void* context) +-{ +- _glapi_set_context(context); +-} +- +- +-inline void* +-BGLDispatcher::CurrentContext() +-{ +- return _glapi_get_context(); +-} +- +- +-inline struct _glapi_table* +-BGLDispatcher::Table() +-{ +- return _glapi_get_dispatch(); +-} +- +- +-inline uint32 +-BGLDispatcher::TableSize() +-{ +- return _glapi_get_dispatch_table_size(); +-} +- +- +-inline const _glapi_proc +-BGLDispatcher::operator[](const char* functionName) +-{ +- return _glapi_get_proc_address(functionName); +-} +- +- +-inline const char* +-BGLDispatcher::operator[](uint32 offset) +-{ +- return _glapi_get_proc_name((GLuint) offset); +-} +- +- +-inline const _glapi_proc +-BGLDispatcher::AddressOf(const char* functionName) +-{ +- return _glapi_get_proc_address(functionName); +-} +- +- +-inline uint32 +-BGLDispatcher::OffsetOf(const char* functionName) +-{ +- return (uint32) _glapi_get_proc_offset(functionName); +-} +- +- +-#endif // GLDISPATCHER_H +diff --git a/src/gallium/targets/libgl-haiku/GLRenderer.cpp b/src/gallium/targets/libgl-haiku/GLRenderer.cpp +deleted file mode 100644 +index 4573a64..0000000 +--- a/src/gallium/targets/libgl-haiku/GLRenderer.cpp ++++ /dev/null +@@ -1,106 +0,0 @@ +-/* +- * Copyright 2006-2008, Philippe Houdoin. All rights reserved. +- * Distributed under the terms of the MIT License. +- */ +- +- +-#include +- +-#include "GLRenderer.h" +- +-#include "GLDispatcher.h" +- +- +-BGLRenderer::BGLRenderer(BGLView* view, ulong glOptions, +- BGLDispatcher* dispatcher) +- : +- fRefCount(1), +- fView(view), +- fOptions(glOptions), +- fDispatcher(dispatcher) +-{ +-} +- +- +-BGLRenderer::~BGLRenderer() +-{ +- delete fDispatcher; +-} +- +- +-void +-BGLRenderer::Acquire() +-{ +- atomic_add(&fRefCount, 1); +-} +- +- +-void +-BGLRenderer::Release() +-{ +- if (atomic_add(&fRefCount, -1) < 1) +- delete this; +-} +- +- +-void +-BGLRenderer::LockGL() +-{ +-} +- +- +-void +-BGLRenderer::UnlockGL() +-{ +-} +- +- +-void +-BGLRenderer::SwapBuffers(bool VSync) +-{ +-} +- +- +-void +-BGLRenderer::Draw(BRect updateRect) +-{ +-} +- +- +-status_t +-BGLRenderer::CopyPixelsOut(BPoint source, BBitmap* dest) +-{ +- return B_ERROR; +-} +- +- +-status_t +-BGLRenderer::CopyPixelsIn(BBitmap* source, BPoint dest) +-{ +- return B_ERROR; +-} +- +- +-void +-BGLRenderer::FrameResized(float width, float height) +-{ +-} +- +- +-void +-BGLRenderer::DirectConnected(direct_buffer_info* info) +-{ +-} +- +- +-void +-BGLRenderer::EnableDirectMode(bool enabled) +-{ +-} +- +- +-status_t BGLRenderer::_Reserved_Renderer_0(int32 n, void* p) { return B_ERROR; } +-status_t BGLRenderer::_Reserved_Renderer_1(int32 n, void* p) { return B_ERROR; } +-status_t BGLRenderer::_Reserved_Renderer_2(int32 n, void* p) { return B_ERROR; } +-status_t BGLRenderer::_Reserved_Renderer_3(int32 n, void* p) { return B_ERROR; } +-status_t BGLRenderer::_Reserved_Renderer_4(int32 n, void* p) { return B_ERROR; } +diff --git a/src/gallium/targets/libgl-haiku/GLRendererRoster.cpp b/src/gallium/targets/libgl-haiku/GLRendererRoster.cpp +deleted file mode 100644 +index 1712a87..0000000 +--- a/src/gallium/targets/libgl-haiku/GLRendererRoster.cpp ++++ /dev/null +@@ -1,224 +0,0 @@ +-/* +- * Copyright 2006-2012 Haiku, Inc. All Rights Reserved. +- * Distributed under the terms of the MIT License. +- * +- * Authors: +- * Philippe Houdoin +- * Alexander von Gluck IV +- */ +- +- +-#include +-#include +- +-#include +-#include +- +-#include +-#include +-#include +-#include +-#include "GLDispatcher.h" +-#include "GLRendererRoster.h" +- +-#include +-#include +- +- +-extern "C" status_t _kern_get_safemode_option(const char* parameter, +- char* buffer, size_t* _bufferSize); +- +- +-GLRendererRoster::GLRendererRoster(BGLView* view, ulong options) +- : +- fNextID(0), +- fView(view), +- fOptions(options), +- fSafeMode(false), +- fABISubDirectory(NULL) +-{ +- char parameter[32]; +- size_t parameterLength = sizeof(parameter); +- +- if (_kern_get_safemode_option(B_SAFEMODE_SAFE_MODE, +- parameter, ¶meterLength) == B_OK) { +- if (!strcasecmp(parameter, "enabled") || !strcasecmp(parameter, "on") +- || !strcasecmp(parameter, "true") || !strcasecmp(parameter, "yes") +- || !strcasecmp(parameter, "enable") || !strcmp(parameter, "1")) +- fSafeMode = true; +- } +- +- if (_kern_get_safemode_option(B_SAFEMODE_DISABLE_USER_ADD_ONS, +- parameter, ¶meterLength) == B_OK) { +- if (!strcasecmp(parameter, "enabled") || !strcasecmp(parameter, "on") +- || !strcasecmp(parameter, "true") || !strcasecmp(parameter, "yes") +- || !strcasecmp(parameter, "enable") || !strcmp(parameter, "1")) +- fSafeMode = true; +- } +- +- // We might run in compatibility mode on a system with a different ABI. The +- // renderers matching our ABI can usually be found in respective +- // subdirectories of the opengl add-ons directories. +- system_info info; +- if (get_system_info(&info) == B_OK +- && (info.abi & B_HAIKU_ABI_MAJOR) +- != (B_HAIKU_ABI & B_HAIKU_ABI_MAJOR)) { +- switch (B_HAIKU_ABI & B_HAIKU_ABI_MAJOR) { +- case B_HAIKU_ABI_GCC_2: +- fABISubDirectory = "gcc2"; +- break; +- case B_HAIKU_ABI_GCC_4: +- fABISubDirectory = "gcc4"; +- break; +- } +- } +- +- AddDefaultPaths(); +-} +- +- +-GLRendererRoster::~GLRendererRoster() +-{ +- +-} +- +- +-BGLRenderer* +-GLRendererRoster::GetRenderer(int32 id) +-{ +- RendererMap::const_iterator iterator = fRenderers.find(id); +- if (iterator == fRenderers.end()) +- return NULL; +- +- struct renderer_item item = iterator->second; +- return item.renderer; +-} +- +- +-void +-GLRendererRoster::AddDefaultPaths() +-{ +- // add user directories first, so that they can override system renderers +- const directory_which paths[] = { +- B_USER_NONPACKAGED_ADDONS_DIRECTORY, +- B_USER_ADDONS_DIRECTORY, +- B_SYSTEM_ADDONS_DIRECTORY, +- }; +- +- for (uint32 i = fSafeMode ? 4 : 0; +- i < sizeof(paths) / sizeof(paths[0]); i++) { +- BPath path; +- status_t status = find_directory(paths[i], &path, true); +- if (status == B_OK && path.Append("opengl") == B_OK) +- AddPath(path.Path()); +- } +-} +- +- +-status_t +-GLRendererRoster::AddPath(const char* path) +-{ +- BDirectory directory(path); +- status_t status = directory.InitCheck(); +- if (status < B_OK) +- return status; +- +- // if a subdirectory for our ABI exists, use that instead +- if (fABISubDirectory != NULL) { +- BEntry entry(&directory, fABISubDirectory); +- if (entry.IsDirectory()) { +- status = directory.SetTo(&entry); +- if (status != B_OK) +- return status; +- } +- } +- +- node_ref nodeRef; +- status = directory.GetNodeRef(&nodeRef); +- if (status < B_OK) +- return status; +- +- int32 count = 0; +- int32 files = 0; +- +- entry_ref ref; +- BEntry entry; +- while (directory.GetNextRef(&ref) == B_OK) { +- entry.SetTo(&ref); +- if (entry.InitCheck() == B_OK && !entry.IsFile()) +- continue; +- +- if (CreateRenderer(ref) == B_OK) +- count++; +- +- files++; +- } +- +- if (files != 0 && count == 0) +- return B_BAD_VALUE; +- +- return B_OK; +-} +- +- +-status_t +-GLRendererRoster::AddRenderer(BGLRenderer* renderer, +- image_id image, const entry_ref* ref, ino_t node) +-{ +- renderer_item item; +- item.renderer = renderer; +- item.image = image; +- item.node = node; +- if (ref != NULL) +- item.ref = *ref; +- +- try { +- fRenderers[fNextID] = item; +- } catch (...) { +- return B_NO_MEMORY; +- } +- +- renderer->fOwningRoster = this; +- renderer->fID = fNextID++; +- return B_OK; +-} +- +- +-status_t +-GLRendererRoster::CreateRenderer(const entry_ref& ref) +-{ +- BEntry entry(&ref); +- node_ref nodeRef; +- status_t status = entry.GetNodeRef(&nodeRef); +- if (status < B_OK) +- return status; +- +- BPath path(&ref); +- image_id image = load_add_on(path.Path()); +- if (image < B_OK) +- return image; +- +- BGLRenderer* (*instantiate_renderer) +- (BGLView* view, ulong options, BGLDispatcher* dispatcher); +- +- status = get_image_symbol(image, "instantiate_gl_renderer", +- B_SYMBOL_TYPE_TEXT, (void**)&instantiate_renderer); +- if (status == B_OK) { +- BGLRenderer* renderer +- = instantiate_renderer(fView, fOptions, new BGLDispatcher()); +- if (!renderer) { +- unload_add_on(image); +- return B_UNSUPPORTED; +- } +- +- if (AddRenderer(renderer, image, &ref, nodeRef.node) != B_OK) { +- renderer->Release(); +- // this will delete the renderer +- unload_add_on(image); +- } +- return B_OK; +- } +- unload_add_on(image); +- +- return status; +-} +diff --git a/src/gallium/targets/libgl-haiku/GLRendererRoster.h b/src/gallium/targets/libgl-haiku/GLRendererRoster.h +deleted file mode 100644 +index 5c8da27..0000000 +--- a/src/gallium/targets/libgl-haiku/GLRendererRoster.h ++++ /dev/null +@@ -1,51 +0,0 @@ +-/* +- * Copyright 2006-2012, Haiku, Inc. All Rights Reserved. +- * Distributed under the terms of the MIT License. +- * +- * Authors: +- * Philippe Houdoin +- */ +-#ifndef _GLRENDERER_ROSTER_H +-#define _GLRENDERER_ROSTER_H +- +- +-#include +- +-#include +- +- +-struct renderer_item { +- BGLRenderer* renderer; +- entry_ref ref; +- ino_t node; +- image_id image; +-}; +- +-typedef std::map RendererMap; +- +- +-class GLRendererRoster { +- public: +- GLRendererRoster(BGLView* view, ulong options); +- virtual ~GLRendererRoster(); +- +- BGLRenderer* GetRenderer(int32 id = 0); +- +- private: +- void AddDefaultPaths(); +- status_t AddPath(const char* path); +- status_t AddRenderer(BGLRenderer* renderer, +- image_id image, const entry_ref* ref, ino_t node); +- status_t CreateRenderer(const entry_ref& ref); +- +- RendererMap fRenderers; +- int32 fNextID; +- BGLView* fView; +- ulong fOptions; +- bool fSafeMode; +- const char* fABISubDirectory; +- +-}; +- +- +-#endif /* _GLRENDERER_ROSTER_H */ +diff --git a/src/gallium/targets/libgl-haiku/GLView.cpp b/src/gallium/targets/libgl-haiku/GLView.cpp +deleted file mode 100644 +index 9ae5b5c..0000000 +--- a/src/gallium/targets/libgl-haiku/GLView.cpp ++++ /dev/null +@@ -1,643 +0,0 @@ +-/* +- * Copyright 2006-2012, Haiku. All rights reserved. +- * Distributed under the terms of the MIT License. +- * +- * Authors: +- * Jérôme Duval, korli@users.berlios.de +- * Philippe Houdoin, philippe.houdoin@free.fr +- * Stefano Ceccherini, burton666@libero.it +- */ +- +-#include +- +-#include +- +-#include +-#include +-#include +-#include +- +-#include +-#include +- +-#include "interface/DirectWindowPrivate.h" +-#include "GLDispatcher.h" +-#include "GLRendererRoster.h" +- +- +-struct glview_direct_info { +- direct_buffer_info* direct_info; +- bool direct_connected; +- bool enable_direct_mode; +- +- glview_direct_info(); +- ~glview_direct_info(); +-}; +- +- +-BGLView::BGLView(BRect rect, const char* name, ulong resizingMode, ulong mode, +- ulong options) +- : +- BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS), +- // | B_FULL_UPDATE_ON_RESIZE) +- fGc(NULL), +- fOptions(options), +- fDitherCount(0), +- fDrawLock("BGLView draw lock"), +- fDisplayLock("BGLView display lock"), +- fClipInfo(NULL), +- fRenderer(NULL), +- fRoster(NULL), +- fDitherMap(NULL) +-{ +- fRoster = new GLRendererRoster(this, options); +-} +- +- +-BGLView::~BGLView() +-{ +- delete fClipInfo; +- if (fRenderer) +- fRenderer->Release(); +-} +- +- +-void +-BGLView::LockGL() +-{ +- // TODO: acquire the OpenGL API lock it on this glview +- +- fDisplayLock.Lock(); +- if (fRenderer) +- fRenderer->LockGL(); +-} +- +- +-void +-BGLView::UnlockGL() +-{ +- if (fRenderer) +- fRenderer->UnlockGL(); +- fDisplayLock.Unlock(); +- +- // TODO: release the GL API lock to others glviews +-} +- +- +-void +-BGLView::SwapBuffers() +-{ +- SwapBuffers(false); +-} +- +- +-void +-BGLView::SwapBuffers(bool vSync) +-{ +- if (fRenderer) { +- _LockDraw(); +- fRenderer->SwapBuffers(vSync); +- _UnlockDraw(); +- } +-} +- +- +-BView* +-BGLView::EmbeddedView() +-{ +- return NULL; +-} +- +- +-void* +-BGLView::GetGLProcAddress(const char* procName) +-{ +- BGLDispatcher* glDispatcher = NULL; +- +- if (fRenderer) +- glDispatcher = fRenderer->GLDispatcher(); +- +- if (glDispatcher) +- return (void*)glDispatcher->AddressOf(procName); +- +- return NULL; +-} +- +- +-status_t +-BGLView::CopyPixelsOut(BPoint source, BBitmap* dest) +-{ +- if (!fRenderer) +- return B_ERROR; +- +- if (!dest || !dest->Bounds().IsValid()) +- return B_BAD_VALUE; +- +- return fRenderer->CopyPixelsOut(source, dest); +-} +- +- +-status_t +-BGLView::CopyPixelsIn(BBitmap* source, BPoint dest) +-{ +- if (!fRenderer) +- return B_ERROR; +- +- if (!source || !source->Bounds().IsValid()) +- return B_BAD_VALUE; +- +- return fRenderer->CopyPixelsIn(source, dest); +-} +- +- +-/*! Mesa's GLenum is not ulong but uint, so we can't use GLenum +- without breaking this method signature. +- Instead, we have to use the effective BeOS's SGI OpenGL GLenum type: +- unsigned long. +- */ +-void +-BGLView::ErrorCallback(unsigned long errorCode) +-{ +- char msg[32]; +- sprintf(msg, "GL: Error code $%04lx.", errorCode); +- // TODO: under BeOS R5, it call debugger(msg); +- fprintf(stderr, "%s\n", msg); +-} +- +- +-void +-BGLView::Draw(BRect updateRect) +-{ +- if (fRenderer) { +- _LockDraw(); +- fRenderer->Draw(updateRect); +- _UnlockDraw(); +- return; +- } +- // TODO: auto-size and center the string +- MovePenTo(8, 32); +- DrawString("No OpenGL renderer available!"); +-} +- +- +-void +-BGLView::AttachedToWindow() +-{ +- BView::AttachedToWindow(); +- +- fBounds = Bounds(); +- for (BView* view = this; view != NULL; view = view->Parent()) +- view->ConvertToParent(&fBounds); +- +- fRenderer = fRoster->GetRenderer(); +- if (fRenderer != NULL) { +- // Jackburton: The following code was commented because it doesn't look +- // good in "direct" mode: +- // when the window is moved, the app_server doesn't paint the view's +- // background, and the stuff behind the window itself shows up. +- // Setting the view color to black, instead, looks a bit more elegant. +-#if 0 +- // Don't paint white window background when resized +- SetViewColor(B_TRANSPARENT_32_BIT); +-#else +- SetViewColor(0, 0, 0); +-#endif +- +- // Set default OpenGL viewport: +- LockGL(); +- glViewport(0, 0, Bounds().IntegerWidth(), Bounds().IntegerHeight()); +- UnlockGL(); +- fRenderer->FrameResized(Bounds().IntegerWidth(), +- Bounds().IntegerHeight()); +- +- if (fClipInfo) { +- fRenderer->DirectConnected(fClipInfo->direct_info); +- fRenderer->EnableDirectMode(fClipInfo->enable_direct_mode); +- } +- +- return; +- } +- +- fprintf(stderr, "no renderer found! \n"); +- +- // No Renderer, no rendering. Setup a minimal "No Renderer" string drawing +- // context +- SetFont(be_bold_font); +- // SetFontSize(16); +-} +- +- +-void +-BGLView::AllAttached() +-{ +- BView::AllAttached(); +-} +- +- +-void +-BGLView::DetachedFromWindow() +-{ +- if (fRenderer) +- fRenderer->Release(); +- fRenderer = NULL; +- +- BView::DetachedFromWindow(); +-} +- +- +-void +-BGLView::AllDetached() +-{ +- BView::AllDetached(); +-} +- +- +-void +-BGLView::FrameResized(float width, float height) +-{ +- fBounds = Bounds(); +- for (BView* v = this; v; v = v->Parent()) +- v->ConvertToParent(&fBounds); +- +- if (fRenderer) { +- LockGL(); +- _LockDraw(); +- _CallDirectConnected(); +- fRenderer->FrameResized(width, height); +- _UnlockDraw(); +- UnlockGL(); +- } +- +- BView::FrameResized(width, height); +-} +- +- +-status_t +-BGLView::Perform(perform_code d, void* arg) +-{ +- return BView::Perform(d, arg); +-} +- +- +-status_t +-BGLView::Archive(BMessage* data, bool deep) const +-{ +- return BView::Archive(data, deep); +-} +- +- +-void +-BGLView::MessageReceived(BMessage* msg) +-{ +- BView::MessageReceived(msg); +-} +- +- +-void +-BGLView::SetResizingMode(uint32 mode) +-{ +- BView::SetResizingMode(mode); +-} +- +- +-void +-BGLView::GetPreferredSize(float* _width, float* _height) +-{ +- if (_width) +- *_width = 0; +- if (_height) +- *_height = 0; +-} +- +- +-void +-BGLView::Show() +-{ +- BView::Show(); +-} +- +- +-void +-BGLView::Hide() +-{ +- BView::Hide(); +-} +- +- +-BHandler* +-BGLView::ResolveSpecifier(BMessage* msg, int32 index, BMessage* specifier, +- int32 form, const char* property) +-{ +- return BView::ResolveSpecifier(msg, index, specifier, form, property); +-} +- +- +-status_t +-BGLView::GetSupportedSuites(BMessage* data) +-{ +- return BView::GetSupportedSuites(data); +-} +- +- +-void +-BGLView::DirectConnected(direct_buffer_info* info) +-{ +- if (fClipInfo == NULL) { +- fClipInfo = new (std::nothrow) glview_direct_info(); +- if (fClipInfo == NULL) +- return; +- } +- +- direct_buffer_info* localInfo = fClipInfo->direct_info; +- +- switch (info->buffer_state & B_DIRECT_MODE_MASK) { +- case B_DIRECT_START: +- fClipInfo->direct_connected = true; +- memcpy(localInfo, info, DIRECT_BUFFER_INFO_AREA_SIZE); +- _UnlockDraw(); +- break; +- +- case B_DIRECT_MODIFY: +- _LockDraw(); +- memcpy(localInfo, info, DIRECT_BUFFER_INFO_AREA_SIZE); +- _UnlockDraw(); +- break; +- +- case B_DIRECT_STOP: +- fClipInfo->direct_connected = false; +- _LockDraw(); +- break; +- } +- +- if (fRenderer) +- _CallDirectConnected(); +-} +- +- +-void +-BGLView::EnableDirectMode(bool enabled) +-{ +- if (fRenderer) +- fRenderer->EnableDirectMode(enabled); +- if (fClipInfo == NULL) { +- fClipInfo = new (std::nothrow) glview_direct_info(); +- if (fClipInfo == NULL) +- return; +- } +- +- fClipInfo->enable_direct_mode = enabled; +-} +- +- +-void +-BGLView::_LockDraw() +-{ +- if (!fClipInfo || !fClipInfo->enable_direct_mode) +- return; +- +- fDrawLock.Lock(); +-} +- +- +-void +-BGLView::_UnlockDraw() +-{ +- if (!fClipInfo || !fClipInfo->enable_direct_mode) +- return; +- +- fDrawLock.Unlock(); +-} +- +- +-void +-BGLView::_CallDirectConnected() +-{ +- if (!fClipInfo) +- return; +- +- direct_buffer_info* localInfo = fClipInfo->direct_info; +- direct_buffer_info* info = (direct_buffer_info*)malloc( +- DIRECT_BUFFER_INFO_AREA_SIZE); +- if (info == NULL) +- return; +- +- memcpy(info, localInfo, DIRECT_BUFFER_INFO_AREA_SIZE); +- +- // Collect the rects into a BRegion, then clip to the view's bounds +- BRegion region; +- for (uint32 c = 0; c < localInfo->clip_list_count; c++) +- region.Include(localInfo->clip_list[c]); +- BRegion boundsRegion = fBounds.OffsetByCopy(localInfo->window_bounds.left, +- localInfo->window_bounds.top); +- info->window_bounds = boundsRegion.RectAtInt(0); +- // window_bounds are now view bounds +- region.IntersectWith(&boundsRegion); +- +- info->clip_list_count = region.CountRects(); +- info->clip_bounds = region.FrameInt(); +- +- for (uint32 c = 0; c < info->clip_list_count; c++) +- info->clip_list[c] = region.RectAtInt(c); +- fRenderer->DirectConnected(info); +- free(info); +-} +- +- +-//---- virtual reserved methods ---------- +- +- +-void BGLView::_ReservedGLView1() {} +-void BGLView::_ReservedGLView2() {} +-void BGLView::_ReservedGLView3() {} +-void BGLView::_ReservedGLView4() {} +-void BGLView::_ReservedGLView5() {} +-void BGLView::_ReservedGLView6() {} +-void BGLView::_ReservedGLView7() {} +-void BGLView::_ReservedGLView8() {} +- +- +-// #pragma mark - +- +- +-// BeOS compatibility: contrary to others BView's contructors, +-// BGLView one wants a non-const name argument. +-BGLView::BGLView(BRect rect, char* name, ulong resizingMode, ulong mode, +- ulong options) +- : +- BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS), +- fGc(NULL), +- fOptions(options), +- fDitherCount(0), +- fDrawLock("BGLView draw lock"), +- fDisplayLock("BGLView display lock"), +- fClipInfo(NULL), +- fRenderer(NULL), +- fRoster(NULL), +- fDitherMap(NULL) +-{ +- fRoster = new GLRendererRoster(this, options); +-} +- +- +-#if 0 +-// TODO: implement BGLScreen class... +- +- +-BGLScreen::BGLScreen(char* name, ulong screenMode, ulong options, +- status_t* error, bool debug) +- : +- BWindowScreen(name, screenMode, error, debug) +-{ +-} +- +- +-BGLScreen::~BGLScreen() +-{ +-} +- +- +-void +-BGLScreen::LockGL() +-{ +-} +- +- +-void +-BGLScreen::UnlockGL() +-{ +-} +- +- +-void +-BGLScreen::SwapBuffers() +-{ +-} +- +- +-void +-BGLScreen::ErrorCallback(unsigned long errorCode) +-{ +- // Mesa's GLenum is not ulong but uint! +- char msg[32]; +- sprintf(msg, "GL: Error code $%04lx.", errorCode); +- // debugger(msg); +- fprintf(stderr, "%s\n", msg); +- return; +-} +- +- +-void +-BGLScreen::ScreenConnected(bool enabled) +-{ +-} +- +- +-void +-BGLScreen::FrameResized(float width, float height) +-{ +- return BWindowScreen::FrameResized(width, height); +-} +- +- +-status_t +-BGLScreen::Perform(perform_code d, void* arg) +-{ +- return BWindowScreen::Perform(d, arg); +-} +- +- +-status_t +-BGLScreen::Archive(BMessage* data, bool deep) const +-{ +- return BWindowScreen::Archive(data, deep); +-} +- +- +-void +-BGLScreen::MessageReceived(BMessage* msg) +-{ +- BWindowScreen::MessageReceived(msg); +-} +- +- +-void +-BGLScreen::Show() +-{ +- BWindowScreen::Show(); +-} +- +- +-void +-BGLScreen::Hide() +-{ +- BWindowScreen::Hide(); +-} +- +- +-BHandler* +-BGLScreen::ResolveSpecifier(BMessage* msg, int32 index, BMessage* specifier, +- int32 form, const char* property) +-{ +- return BWindowScreen::ResolveSpecifier(msg, index, specifier, +- form, property); +-} +- +- +-status_t +-BGLScreen::GetSupportedSuites(BMessage* data) +-{ +- return BWindowScreen::GetSupportedSuites(data); +-} +- +- +-//---- virtual reserved methods ---------- +- +-void BGLScreen::_ReservedGLScreen1() {} +-void BGLScreen::_ReservedGLScreen2() {} +-void BGLScreen::_ReservedGLScreen3() {} +-void BGLScreen::_ReservedGLScreen4() {} +-void BGLScreen::_ReservedGLScreen5() {} +-void BGLScreen::_ReservedGLScreen6() {} +-void BGLScreen::_ReservedGLScreen7() {} +-void BGLScreen::_ReservedGLScreen8() {} +-#endif +- +- +-const char* color_space_name(color_space space) +-{ +-#define C2N(a) case a: return #a +- +- switch (space) { +- C2N(B_RGB24); +- C2N(B_RGB32); +- C2N(B_RGBA32); +- C2N(B_RGB32_BIG); +- C2N(B_RGBA32_BIG); +- C2N(B_GRAY8); +- C2N(B_GRAY1); +- C2N(B_RGB16); +- C2N(B_RGB15); +- C2N(B_RGBA15); +- C2N(B_CMAP8); +- default: +- return "Unknown!"; +- }; +- +-#undef C2N +-}; +- +- +-glview_direct_info::glview_direct_info() +-{ +- // TODO: See direct_window_data() in app_server's ServerWindow.cpp +- direct_info = (direct_buffer_info*)calloc(1, DIRECT_BUFFER_INFO_AREA_SIZE); +- direct_connected = false; +- enable_direct_mode = false; +-} +- +- +-glview_direct_info::~glview_direct_info() +-{ +- free(direct_info); +-} +- +diff --git a/src/gallium/targets/libgl-haiku/SConscript b/src/gallium/targets/libgl-haiku/SConscript +deleted file mode 100644 +index 43d15c5..0000000 +--- a/src/gallium/targets/libgl-haiku/SConscript ++++ /dev/null +@@ -1,35 +0,0 @@ +-####################################################################### +-# SConscript for Haiku OpenGL kit +- +-Import('*') +- +-env = env.Clone() +- +-env.Append(CPPPATH = [ +- '#/src/mapi', +- '#/src/mesa', +- '#/src/mesa/main', +- '#/include/HaikuGL', +- '/boot/system/develop/headers/private', +- Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers +-]) +- +-env.Prepend(LIBS = [ +- glapi +-]) +- +-sources = [ +- 'GLView.cpp', +- 'GLRenderer.cpp', +- 'GLRendererRoster.cpp', +- 'GLDispatcher.cpp', +-] +- +-# libGL.so +-libgl = env.SharedLibrary( +- target ='GL', +- source = sources, +- SHLIBSUFFIX = env['SHLIBSUFFIX'], +-) +- +-env.Alias('libgl-haiku', libgl) +diff --git a/src/hgl/GLDispatcher.cpp b/src/hgl/GLDispatcher.cpp +new file mode 100644 +index 0000000..46b91d5 +--- /dev/null ++++ b/src/hgl/GLDispatcher.cpp +@@ -0,0 +1,72 @@ ++/* ++ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. ++ * Copyright 2000-2012 Haiku, Inc. All Rights Reserved. ++ * Distributed under the terms of the MIT License. ++ * ++ * Authors: ++ * Brian Paul ++ * Philippe Houdoin ++ * Alexander von Gluck IV ++ */ ++ ++ ++extern "C" { ++#include "glapi/glapi.h" ++#include "glapi/glapi_priv.h" ++ ++/* ++ * NOTE: this file portion implements C-based dispatch of the OpenGL entrypoints ++ * (glAccum, glBegin, etc). ++ * This code IS NOT USED if we're compiling on an x86 system and using ++ * the glapi_x86.S assembly code. ++ */ ++#if !(defined(USE_X86_ASM) || defined(USE_SPARC_ASM)) ++ ++#define KEYWORD1 PUBLIC ++#define KEYWORD2 ++#define NAME(func) gl##func ++ ++#define DISPATCH(func, args, msg) \ ++ const struct _glapi_table* dispatch; \ ++ dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\ ++ (dispatch->func) args ++ ++#define RETURN_DISPATCH(func, args, msg) \ ++ const struct _glapi_table* dispatch; \ ++ dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\ ++ return (dispatch->func) args ++ ++#endif ++} ++ ++ ++/* NOTE: this file portion implement a thin OpenGL entrypoints dispatching ++ C++ wrapper class ++ */ ++ ++#include "GLDispatcher.h" ++ ++BGLDispatcher::BGLDispatcher() ++{ ++} ++ ++ ++BGLDispatcher::~BGLDispatcher() ++{ ++} ++ ++ ++status_t ++BGLDispatcher::CheckTable(const struct _glapi_table* table) ++{ ++ _glapi_check_table(table ? table : _glapi_get_dispatch()); ++ return B_OK; ++} ++ ++ ++status_t ++BGLDispatcher::SetTable(struct _glapi_table* table) ++{ ++ _glapi_set_dispatch(table); ++ return B_OK; ++} +diff --git a/src/hgl/GLDispatcher.h b/src/hgl/GLDispatcher.h +new file mode 100644 +index 0000000..44bca8c +--- /dev/null ++++ b/src/hgl/GLDispatcher.h +@@ -0,0 +1,109 @@ ++/* ++ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. ++ * Copyright 2000-2012 Haiku, Inc. All Rights Reserved. ++ * Distributed under the terms of the MIT License. ++ * ++ * Authors: ++ * Brian Paul ++ * Philippe Houdoin ++ */ ++#ifndef GLDISPATCHER_H ++#define GLDISPATCHER_H ++ ++ ++#include ++#include ++#include ++ ++#include "glheader.h" ++ ++extern "C" { ++#include "glapi/glapi.h" ++} ++ ++ ++class BGLDispatcher ++{ ++ // Private unimplemented copy constructors ++ BGLDispatcher(const BGLDispatcher &); ++ BGLDispatcher & operator=(const BGLDispatcher &); ++ ++ public: ++ BGLDispatcher(); ++ ~BGLDispatcher(); ++ ++ void SetCurrentContext(void* context); ++ void* CurrentContext(); ++ ++ struct _glapi_table* Table(); ++ status_t CheckTable( ++ const struct _glapi_table* dispatch = NULL); ++ status_t SetTable(struct _glapi_table* dispatch); ++ uint32 TableSize(); ++ ++ const _glapi_proc operator[](const char* functionName); ++ const char* operator[](uint32 offset); ++ ++ const _glapi_proc AddressOf(const char* functionName); ++ uint32 OffsetOf(const char* functionName); ++}; ++ ++ ++// Inlines methods ++inline void ++BGLDispatcher::SetCurrentContext(void* context) ++{ ++ _glapi_set_context(context); ++} ++ ++ ++inline void* ++BGLDispatcher::CurrentContext() ++{ ++ return _glapi_get_context(); ++} ++ ++ ++inline struct _glapi_table* ++BGLDispatcher::Table() ++{ ++ return _glapi_get_dispatch(); ++} ++ ++ ++inline uint32 ++BGLDispatcher::TableSize() ++{ ++ return _glapi_get_dispatch_table_size(); ++} ++ ++ ++inline const _glapi_proc ++BGLDispatcher::operator[](const char* functionName) ++{ ++ return _glapi_get_proc_address(functionName); ++} ++ ++ ++inline const char* ++BGLDispatcher::operator[](uint32 offset) ++{ ++ return _glapi_get_proc_name((GLuint) offset); ++} ++ ++ ++inline const _glapi_proc ++BGLDispatcher::AddressOf(const char* functionName) ++{ ++ return _glapi_get_proc_address(functionName); ++} ++ ++ ++inline uint32 ++BGLDispatcher::OffsetOf(const char* functionName) ++{ ++ return (uint32) _glapi_get_proc_offset(functionName); ++} ++ ++ ++#endif // GLDISPATCHER_H +diff --git a/src/hgl/GLRenderer.cpp b/src/hgl/GLRenderer.cpp +new file mode 100644 +index 0000000..4573a64 +--- /dev/null ++++ b/src/hgl/GLRenderer.cpp +@@ -0,0 +1,106 @@ ++/* ++ * Copyright 2006-2008, Philippe Houdoin. All rights reserved. ++ * Distributed under the terms of the MIT License. ++ */ ++ ++ ++#include ++ ++#include "GLRenderer.h" ++ ++#include "GLDispatcher.h" ++ ++ ++BGLRenderer::BGLRenderer(BGLView* view, ulong glOptions, ++ BGLDispatcher* dispatcher) ++ : ++ fRefCount(1), ++ fView(view), ++ fOptions(glOptions), ++ fDispatcher(dispatcher) ++{ ++} ++ ++ ++BGLRenderer::~BGLRenderer() ++{ ++ delete fDispatcher; ++} ++ ++ ++void ++BGLRenderer::Acquire() ++{ ++ atomic_add(&fRefCount, 1); ++} ++ ++ ++void ++BGLRenderer::Release() ++{ ++ if (atomic_add(&fRefCount, -1) < 1) ++ delete this; ++} ++ ++ ++void ++BGLRenderer::LockGL() ++{ ++} ++ ++ ++void ++BGLRenderer::UnlockGL() ++{ ++} ++ ++ ++void ++BGLRenderer::SwapBuffers(bool VSync) ++{ ++} ++ ++ ++void ++BGLRenderer::Draw(BRect updateRect) ++{ ++} ++ ++ ++status_t ++BGLRenderer::CopyPixelsOut(BPoint source, BBitmap* dest) ++{ ++ return B_ERROR; ++} ++ ++ ++status_t ++BGLRenderer::CopyPixelsIn(BBitmap* source, BPoint dest) ++{ ++ return B_ERROR; ++} ++ ++ ++void ++BGLRenderer::FrameResized(float width, float height) ++{ ++} ++ ++ ++void ++BGLRenderer::DirectConnected(direct_buffer_info* info) ++{ ++} ++ ++ ++void ++BGLRenderer::EnableDirectMode(bool enabled) ++{ ++} ++ ++ ++status_t BGLRenderer::_Reserved_Renderer_0(int32 n, void* p) { return B_ERROR; } ++status_t BGLRenderer::_Reserved_Renderer_1(int32 n, void* p) { return B_ERROR; } ++status_t BGLRenderer::_Reserved_Renderer_2(int32 n, void* p) { return B_ERROR; } ++status_t BGLRenderer::_Reserved_Renderer_3(int32 n, void* p) { return B_ERROR; } ++status_t BGLRenderer::_Reserved_Renderer_4(int32 n, void* p) { return B_ERROR; } +diff --git a/src/hgl/GLRendererRoster.cpp b/src/hgl/GLRendererRoster.cpp +new file mode 100644 +index 0000000..1712a87 +--- /dev/null ++++ b/src/hgl/GLRendererRoster.cpp +@@ -0,0 +1,224 @@ ++/* ++ * Copyright 2006-2012 Haiku, Inc. All Rights Reserved. ++ * Distributed under the terms of the MIT License. ++ * ++ * Authors: ++ * Philippe Houdoin ++ * Alexander von Gluck IV ++ */ ++ ++ ++#include ++#include ++ ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include "GLDispatcher.h" ++#include "GLRendererRoster.h" ++ ++#include ++#include ++ ++ ++extern "C" status_t _kern_get_safemode_option(const char* parameter, ++ char* buffer, size_t* _bufferSize); ++ ++ ++GLRendererRoster::GLRendererRoster(BGLView* view, ulong options) ++ : ++ fNextID(0), ++ fView(view), ++ fOptions(options), ++ fSafeMode(false), ++ fABISubDirectory(NULL) ++{ ++ char parameter[32]; ++ size_t parameterLength = sizeof(parameter); ++ ++ if (_kern_get_safemode_option(B_SAFEMODE_SAFE_MODE, ++ parameter, ¶meterLength) == B_OK) { ++ if (!strcasecmp(parameter, "enabled") || !strcasecmp(parameter, "on") ++ || !strcasecmp(parameter, "true") || !strcasecmp(parameter, "yes") ++ || !strcasecmp(parameter, "enable") || !strcmp(parameter, "1")) ++ fSafeMode = true; ++ } ++ ++ if (_kern_get_safemode_option(B_SAFEMODE_DISABLE_USER_ADD_ONS, ++ parameter, ¶meterLength) == B_OK) { ++ if (!strcasecmp(parameter, "enabled") || !strcasecmp(parameter, "on") ++ || !strcasecmp(parameter, "true") || !strcasecmp(parameter, "yes") ++ || !strcasecmp(parameter, "enable") || !strcmp(parameter, "1")) ++ fSafeMode = true; ++ } ++ ++ // We might run in compatibility mode on a system with a different ABI. The ++ // renderers matching our ABI can usually be found in respective ++ // subdirectories of the opengl add-ons directories. ++ system_info info; ++ if (get_system_info(&info) == B_OK ++ && (info.abi & B_HAIKU_ABI_MAJOR) ++ != (B_HAIKU_ABI & B_HAIKU_ABI_MAJOR)) { ++ switch (B_HAIKU_ABI & B_HAIKU_ABI_MAJOR) { ++ case B_HAIKU_ABI_GCC_2: ++ fABISubDirectory = "gcc2"; ++ break; ++ case B_HAIKU_ABI_GCC_4: ++ fABISubDirectory = "gcc4"; ++ break; ++ } ++ } ++ ++ AddDefaultPaths(); ++} ++ ++ ++GLRendererRoster::~GLRendererRoster() ++{ ++ ++} ++ ++ ++BGLRenderer* ++GLRendererRoster::GetRenderer(int32 id) ++{ ++ RendererMap::const_iterator iterator = fRenderers.find(id); ++ if (iterator == fRenderers.end()) ++ return NULL; ++ ++ struct renderer_item item = iterator->second; ++ return item.renderer; ++} ++ ++ ++void ++GLRendererRoster::AddDefaultPaths() ++{ ++ // add user directories first, so that they can override system renderers ++ const directory_which paths[] = { ++ B_USER_NONPACKAGED_ADDONS_DIRECTORY, ++ B_USER_ADDONS_DIRECTORY, ++ B_SYSTEM_ADDONS_DIRECTORY, ++ }; ++ ++ for (uint32 i = fSafeMode ? 4 : 0; ++ i < sizeof(paths) / sizeof(paths[0]); i++) { ++ BPath path; ++ status_t status = find_directory(paths[i], &path, true); ++ if (status == B_OK && path.Append("opengl") == B_OK) ++ AddPath(path.Path()); ++ } ++} ++ ++ ++status_t ++GLRendererRoster::AddPath(const char* path) ++{ ++ BDirectory directory(path); ++ status_t status = directory.InitCheck(); ++ if (status < B_OK) ++ return status; ++ ++ // if a subdirectory for our ABI exists, use that instead ++ if (fABISubDirectory != NULL) { ++ BEntry entry(&directory, fABISubDirectory); ++ if (entry.IsDirectory()) { ++ status = directory.SetTo(&entry); ++ if (status != B_OK) ++ return status; ++ } ++ } ++ ++ node_ref nodeRef; ++ status = directory.GetNodeRef(&nodeRef); ++ if (status < B_OK) ++ return status; ++ ++ int32 count = 0; ++ int32 files = 0; ++ ++ entry_ref ref; ++ BEntry entry; ++ while (directory.GetNextRef(&ref) == B_OK) { ++ entry.SetTo(&ref); ++ if (entry.InitCheck() == B_OK && !entry.IsFile()) ++ continue; ++ ++ if (CreateRenderer(ref) == B_OK) ++ count++; ++ ++ files++; ++ } ++ ++ if (files != 0 && count == 0) ++ return B_BAD_VALUE; ++ ++ return B_OK; ++} ++ ++ ++status_t ++GLRendererRoster::AddRenderer(BGLRenderer* renderer, ++ image_id image, const entry_ref* ref, ino_t node) ++{ ++ renderer_item item; ++ item.renderer = renderer; ++ item.image = image; ++ item.node = node; ++ if (ref != NULL) ++ item.ref = *ref; ++ ++ try { ++ fRenderers[fNextID] = item; ++ } catch (...) { ++ return B_NO_MEMORY; ++ } ++ ++ renderer->fOwningRoster = this; ++ renderer->fID = fNextID++; ++ return B_OK; ++} ++ ++ ++status_t ++GLRendererRoster::CreateRenderer(const entry_ref& ref) ++{ ++ BEntry entry(&ref); ++ node_ref nodeRef; ++ status_t status = entry.GetNodeRef(&nodeRef); ++ if (status < B_OK) ++ return status; ++ ++ BPath path(&ref); ++ image_id image = load_add_on(path.Path()); ++ if (image < B_OK) ++ return image; ++ ++ BGLRenderer* (*instantiate_renderer) ++ (BGLView* view, ulong options, BGLDispatcher* dispatcher); ++ ++ status = get_image_symbol(image, "instantiate_gl_renderer", ++ B_SYMBOL_TYPE_TEXT, (void**)&instantiate_renderer); ++ if (status == B_OK) { ++ BGLRenderer* renderer ++ = instantiate_renderer(fView, fOptions, new BGLDispatcher()); ++ if (!renderer) { ++ unload_add_on(image); ++ return B_UNSUPPORTED; ++ } ++ ++ if (AddRenderer(renderer, image, &ref, nodeRef.node) != B_OK) { ++ renderer->Release(); ++ // this will delete the renderer ++ unload_add_on(image); ++ } ++ return B_OK; ++ } ++ unload_add_on(image); ++ ++ return status; ++} +diff --git a/src/hgl/GLRendererRoster.h b/src/hgl/GLRendererRoster.h +new file mode 100644 +index 0000000..5c8da27 +--- /dev/null ++++ b/src/hgl/GLRendererRoster.h +@@ -0,0 +1,51 @@ ++/* ++ * Copyright 2006-2012, Haiku, Inc. All Rights Reserved. ++ * Distributed under the terms of the MIT License. ++ * ++ * Authors: ++ * Philippe Houdoin ++ */ ++#ifndef _GLRENDERER_ROSTER_H ++#define _GLRENDERER_ROSTER_H ++ ++ ++#include ++ ++#include ++ ++ ++struct renderer_item { ++ BGLRenderer* renderer; ++ entry_ref ref; ++ ino_t node; ++ image_id image; ++}; ++ ++typedef std::map RendererMap; ++ ++ ++class GLRendererRoster { ++ public: ++ GLRendererRoster(BGLView* view, ulong options); ++ virtual ~GLRendererRoster(); ++ ++ BGLRenderer* GetRenderer(int32 id = 0); ++ ++ private: ++ void AddDefaultPaths(); ++ status_t AddPath(const char* path); ++ status_t AddRenderer(BGLRenderer* renderer, ++ image_id image, const entry_ref* ref, ino_t node); ++ status_t CreateRenderer(const entry_ref& ref); ++ ++ RendererMap fRenderers; ++ int32 fNextID; ++ BGLView* fView; ++ ulong fOptions; ++ bool fSafeMode; ++ const char* fABISubDirectory; ++ ++}; ++ ++ ++#endif /* _GLRENDERER_ROSTER_H */ +diff --git a/src/hgl/GLView.cpp b/src/hgl/GLView.cpp +new file mode 100644 +index 0000000..9ae5b5c +--- /dev/null ++++ b/src/hgl/GLView.cpp +@@ -0,0 +1,643 @@ ++/* ++ * Copyright 2006-2012, Haiku. All rights reserved. ++ * Distributed under the terms of the MIT License. ++ * ++ * Authors: ++ * Jérôme Duval, korli@users.berlios.de ++ * Philippe Houdoin, philippe.houdoin@free.fr ++ * Stefano Ceccherini, burton666@libero.it ++ */ ++ ++#include ++ ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include "interface/DirectWindowPrivate.h" ++#include "GLDispatcher.h" ++#include "GLRendererRoster.h" ++ ++ ++struct glview_direct_info { ++ direct_buffer_info* direct_info; ++ bool direct_connected; ++ bool enable_direct_mode; ++ ++ glview_direct_info(); ++ ~glview_direct_info(); ++}; ++ ++ ++BGLView::BGLView(BRect rect, const char* name, ulong resizingMode, ulong mode, ++ ulong options) ++ : ++ BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS), ++ // | B_FULL_UPDATE_ON_RESIZE) ++ fGc(NULL), ++ fOptions(options), ++ fDitherCount(0), ++ fDrawLock("BGLView draw lock"), ++ fDisplayLock("BGLView display lock"), ++ fClipInfo(NULL), ++ fRenderer(NULL), ++ fRoster(NULL), ++ fDitherMap(NULL) ++{ ++ fRoster = new GLRendererRoster(this, options); ++} ++ ++ ++BGLView::~BGLView() ++{ ++ delete fClipInfo; ++ if (fRenderer) ++ fRenderer->Release(); ++} ++ ++ ++void ++BGLView::LockGL() ++{ ++ // TODO: acquire the OpenGL API lock it on this glview ++ ++ fDisplayLock.Lock(); ++ if (fRenderer) ++ fRenderer->LockGL(); ++} ++ ++ ++void ++BGLView::UnlockGL() ++{ ++ if (fRenderer) ++ fRenderer->UnlockGL(); ++ fDisplayLock.Unlock(); ++ ++ // TODO: release the GL API lock to others glviews ++} ++ ++ ++void ++BGLView::SwapBuffers() ++{ ++ SwapBuffers(false); ++} ++ ++ ++void ++BGLView::SwapBuffers(bool vSync) ++{ ++ if (fRenderer) { ++ _LockDraw(); ++ fRenderer->SwapBuffers(vSync); ++ _UnlockDraw(); ++ } ++} ++ ++ ++BView* ++BGLView::EmbeddedView() ++{ ++ return NULL; ++} ++ ++ ++void* ++BGLView::GetGLProcAddress(const char* procName) ++{ ++ BGLDispatcher* glDispatcher = NULL; ++ ++ if (fRenderer) ++ glDispatcher = fRenderer->GLDispatcher(); ++ ++ if (glDispatcher) ++ return (void*)glDispatcher->AddressOf(procName); ++ ++ return NULL; ++} ++ ++ ++status_t ++BGLView::CopyPixelsOut(BPoint source, BBitmap* dest) ++{ ++ if (!fRenderer) ++ return B_ERROR; ++ ++ if (!dest || !dest->Bounds().IsValid()) ++ return B_BAD_VALUE; ++ ++ return fRenderer->CopyPixelsOut(source, dest); ++} ++ ++ ++status_t ++BGLView::CopyPixelsIn(BBitmap* source, BPoint dest) ++{ ++ if (!fRenderer) ++ return B_ERROR; ++ ++ if (!source || !source->Bounds().IsValid()) ++ return B_BAD_VALUE; ++ ++ return fRenderer->CopyPixelsIn(source, dest); ++} ++ ++ ++/*! Mesa's GLenum is not ulong but uint, so we can't use GLenum ++ without breaking this method signature. ++ Instead, we have to use the effective BeOS's SGI OpenGL GLenum type: ++ unsigned long. ++ */ ++void ++BGLView::ErrorCallback(unsigned long errorCode) ++{ ++ char msg[32]; ++ sprintf(msg, "GL: Error code $%04lx.", errorCode); ++ // TODO: under BeOS R5, it call debugger(msg); ++ fprintf(stderr, "%s\n", msg); ++} ++ ++ ++void ++BGLView::Draw(BRect updateRect) ++{ ++ if (fRenderer) { ++ _LockDraw(); ++ fRenderer->Draw(updateRect); ++ _UnlockDraw(); ++ return; ++ } ++ // TODO: auto-size and center the string ++ MovePenTo(8, 32); ++ DrawString("No OpenGL renderer available!"); ++} ++ ++ ++void ++BGLView::AttachedToWindow() ++{ ++ BView::AttachedToWindow(); ++ ++ fBounds = Bounds(); ++ for (BView* view = this; view != NULL; view = view->Parent()) ++ view->ConvertToParent(&fBounds); ++ ++ fRenderer = fRoster->GetRenderer(); ++ if (fRenderer != NULL) { ++ // Jackburton: The following code was commented because it doesn't look ++ // good in "direct" mode: ++ // when the window is moved, the app_server doesn't paint the view's ++ // background, and the stuff behind the window itself shows up. ++ // Setting the view color to black, instead, looks a bit more elegant. ++#if 0 ++ // Don't paint white window background when resized ++ SetViewColor(B_TRANSPARENT_32_BIT); ++#else ++ SetViewColor(0, 0, 0); ++#endif ++ ++ // Set default OpenGL viewport: ++ LockGL(); ++ glViewport(0, 0, Bounds().IntegerWidth(), Bounds().IntegerHeight()); ++ UnlockGL(); ++ fRenderer->FrameResized(Bounds().IntegerWidth(), ++ Bounds().IntegerHeight()); ++ ++ if (fClipInfo) { ++ fRenderer->DirectConnected(fClipInfo->direct_info); ++ fRenderer->EnableDirectMode(fClipInfo->enable_direct_mode); ++ } ++ ++ return; ++ } ++ ++ fprintf(stderr, "no renderer found! \n"); ++ ++ // No Renderer, no rendering. Setup a minimal "No Renderer" string drawing ++ // context ++ SetFont(be_bold_font); ++ // SetFontSize(16); ++} ++ ++ ++void ++BGLView::AllAttached() ++{ ++ BView::AllAttached(); ++} ++ ++ ++void ++BGLView::DetachedFromWindow() ++{ ++ if (fRenderer) ++ fRenderer->Release(); ++ fRenderer = NULL; ++ ++ BView::DetachedFromWindow(); ++} ++ ++ ++void ++BGLView::AllDetached() ++{ ++ BView::AllDetached(); ++} ++ ++ ++void ++BGLView::FrameResized(float width, float height) ++{ ++ fBounds = Bounds(); ++ for (BView* v = this; v; v = v->Parent()) ++ v->ConvertToParent(&fBounds); ++ ++ if (fRenderer) { ++ LockGL(); ++ _LockDraw(); ++ _CallDirectConnected(); ++ fRenderer->FrameResized(width, height); ++ _UnlockDraw(); ++ UnlockGL(); ++ } ++ ++ BView::FrameResized(width, height); ++} ++ ++ ++status_t ++BGLView::Perform(perform_code d, void* arg) ++{ ++ return BView::Perform(d, arg); ++} ++ ++ ++status_t ++BGLView::Archive(BMessage* data, bool deep) const ++{ ++ return BView::Archive(data, deep); ++} ++ ++ ++void ++BGLView::MessageReceived(BMessage* msg) ++{ ++ BView::MessageReceived(msg); ++} ++ ++ ++void ++BGLView::SetResizingMode(uint32 mode) ++{ ++ BView::SetResizingMode(mode); ++} ++ ++ ++void ++BGLView::GetPreferredSize(float* _width, float* _height) ++{ ++ if (_width) ++ *_width = 0; ++ if (_height) ++ *_height = 0; ++} ++ ++ ++void ++BGLView::Show() ++{ ++ BView::Show(); ++} ++ ++ ++void ++BGLView::Hide() ++{ ++ BView::Hide(); ++} ++ ++ ++BHandler* ++BGLView::ResolveSpecifier(BMessage* msg, int32 index, BMessage* specifier, ++ int32 form, const char* property) ++{ ++ return BView::ResolveSpecifier(msg, index, specifier, form, property); ++} ++ ++ ++status_t ++BGLView::GetSupportedSuites(BMessage* data) ++{ ++ return BView::GetSupportedSuites(data); ++} ++ ++ ++void ++BGLView::DirectConnected(direct_buffer_info* info) ++{ ++ if (fClipInfo == NULL) { ++ fClipInfo = new (std::nothrow) glview_direct_info(); ++ if (fClipInfo == NULL) ++ return; ++ } ++ ++ direct_buffer_info* localInfo = fClipInfo->direct_info; ++ ++ switch (info->buffer_state & B_DIRECT_MODE_MASK) { ++ case B_DIRECT_START: ++ fClipInfo->direct_connected = true; ++ memcpy(localInfo, info, DIRECT_BUFFER_INFO_AREA_SIZE); ++ _UnlockDraw(); ++ break; ++ ++ case B_DIRECT_MODIFY: ++ _LockDraw(); ++ memcpy(localInfo, info, DIRECT_BUFFER_INFO_AREA_SIZE); ++ _UnlockDraw(); ++ break; ++ ++ case B_DIRECT_STOP: ++ fClipInfo->direct_connected = false; ++ _LockDraw(); ++ break; ++ } ++ ++ if (fRenderer) ++ _CallDirectConnected(); ++} ++ ++ ++void ++BGLView::EnableDirectMode(bool enabled) ++{ ++ if (fRenderer) ++ fRenderer->EnableDirectMode(enabled); ++ if (fClipInfo == NULL) { ++ fClipInfo = new (std::nothrow) glview_direct_info(); ++ if (fClipInfo == NULL) ++ return; ++ } ++ ++ fClipInfo->enable_direct_mode = enabled; ++} ++ ++ ++void ++BGLView::_LockDraw() ++{ ++ if (!fClipInfo || !fClipInfo->enable_direct_mode) ++ return; ++ ++ fDrawLock.Lock(); ++} ++ ++ ++void ++BGLView::_UnlockDraw() ++{ ++ if (!fClipInfo || !fClipInfo->enable_direct_mode) ++ return; ++ ++ fDrawLock.Unlock(); ++} ++ ++ ++void ++BGLView::_CallDirectConnected() ++{ ++ if (!fClipInfo) ++ return; ++ ++ direct_buffer_info* localInfo = fClipInfo->direct_info; ++ direct_buffer_info* info = (direct_buffer_info*)malloc( ++ DIRECT_BUFFER_INFO_AREA_SIZE); ++ if (info == NULL) ++ return; ++ ++ memcpy(info, localInfo, DIRECT_BUFFER_INFO_AREA_SIZE); ++ ++ // Collect the rects into a BRegion, then clip to the view's bounds ++ BRegion region; ++ for (uint32 c = 0; c < localInfo->clip_list_count; c++) ++ region.Include(localInfo->clip_list[c]); ++ BRegion boundsRegion = fBounds.OffsetByCopy(localInfo->window_bounds.left, ++ localInfo->window_bounds.top); ++ info->window_bounds = boundsRegion.RectAtInt(0); ++ // window_bounds are now view bounds ++ region.IntersectWith(&boundsRegion); ++ ++ info->clip_list_count = region.CountRects(); ++ info->clip_bounds = region.FrameInt(); ++ ++ for (uint32 c = 0; c < info->clip_list_count; c++) ++ info->clip_list[c] = region.RectAtInt(c); ++ fRenderer->DirectConnected(info); ++ free(info); ++} ++ ++ ++//---- virtual reserved methods ---------- ++ ++ ++void BGLView::_ReservedGLView1() {} ++void BGLView::_ReservedGLView2() {} ++void BGLView::_ReservedGLView3() {} ++void BGLView::_ReservedGLView4() {} ++void BGLView::_ReservedGLView5() {} ++void BGLView::_ReservedGLView6() {} ++void BGLView::_ReservedGLView7() {} ++void BGLView::_ReservedGLView8() {} ++ ++ ++// #pragma mark - ++ ++ ++// BeOS compatibility: contrary to others BView's contructors, ++// BGLView one wants a non-const name argument. ++BGLView::BGLView(BRect rect, char* name, ulong resizingMode, ulong mode, ++ ulong options) ++ : ++ BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS), ++ fGc(NULL), ++ fOptions(options), ++ fDitherCount(0), ++ fDrawLock("BGLView draw lock"), ++ fDisplayLock("BGLView display lock"), ++ fClipInfo(NULL), ++ fRenderer(NULL), ++ fRoster(NULL), ++ fDitherMap(NULL) ++{ ++ fRoster = new GLRendererRoster(this, options); ++} ++ ++ ++#if 0 ++// TODO: implement BGLScreen class... ++ ++ ++BGLScreen::BGLScreen(char* name, ulong screenMode, ulong options, ++ status_t* error, bool debug) ++ : ++ BWindowScreen(name, screenMode, error, debug) ++{ ++} ++ ++ ++BGLScreen::~BGLScreen() ++{ ++} ++ ++ ++void ++BGLScreen::LockGL() ++{ ++} ++ ++ ++void ++BGLScreen::UnlockGL() ++{ ++} ++ ++ ++void ++BGLScreen::SwapBuffers() ++{ ++} ++ ++ ++void ++BGLScreen::ErrorCallback(unsigned long errorCode) ++{ ++ // Mesa's GLenum is not ulong but uint! ++ char msg[32]; ++ sprintf(msg, "GL: Error code $%04lx.", errorCode); ++ // debugger(msg); ++ fprintf(stderr, "%s\n", msg); ++ return; ++} ++ ++ ++void ++BGLScreen::ScreenConnected(bool enabled) ++{ ++} ++ ++ ++void ++BGLScreen::FrameResized(float width, float height) ++{ ++ return BWindowScreen::FrameResized(width, height); ++} ++ ++ ++status_t ++BGLScreen::Perform(perform_code d, void* arg) ++{ ++ return BWindowScreen::Perform(d, arg); ++} ++ ++ ++status_t ++BGLScreen::Archive(BMessage* data, bool deep) const ++{ ++ return BWindowScreen::Archive(data, deep); ++} ++ ++ ++void ++BGLScreen::MessageReceived(BMessage* msg) ++{ ++ BWindowScreen::MessageReceived(msg); ++} ++ ++ ++void ++BGLScreen::Show() ++{ ++ BWindowScreen::Show(); ++} ++ ++ ++void ++BGLScreen::Hide() ++{ ++ BWindowScreen::Hide(); ++} ++ ++ ++BHandler* ++BGLScreen::ResolveSpecifier(BMessage* msg, int32 index, BMessage* specifier, ++ int32 form, const char* property) ++{ ++ return BWindowScreen::ResolveSpecifier(msg, index, specifier, ++ form, property); ++} ++ ++ ++status_t ++BGLScreen::GetSupportedSuites(BMessage* data) ++{ ++ return BWindowScreen::GetSupportedSuites(data); ++} ++ ++ ++//---- virtual reserved methods ---------- ++ ++void BGLScreen::_ReservedGLScreen1() {} ++void BGLScreen::_ReservedGLScreen2() {} ++void BGLScreen::_ReservedGLScreen3() {} ++void BGLScreen::_ReservedGLScreen4() {} ++void BGLScreen::_ReservedGLScreen5() {} ++void BGLScreen::_ReservedGLScreen6() {} ++void BGLScreen::_ReservedGLScreen7() {} ++void BGLScreen::_ReservedGLScreen8() {} ++#endif ++ ++ ++const char* color_space_name(color_space space) ++{ ++#define C2N(a) case a: return #a ++ ++ switch (space) { ++ C2N(B_RGB24); ++ C2N(B_RGB32); ++ C2N(B_RGBA32); ++ C2N(B_RGB32_BIG); ++ C2N(B_RGBA32_BIG); ++ C2N(B_GRAY8); ++ C2N(B_GRAY1); ++ C2N(B_RGB16); ++ C2N(B_RGB15); ++ C2N(B_RGBA15); ++ C2N(B_CMAP8); ++ default: ++ return "Unknown!"; ++ }; ++ ++#undef C2N ++}; ++ ++ ++glview_direct_info::glview_direct_info() ++{ ++ // TODO: See direct_window_data() in app_server's ServerWindow.cpp ++ direct_info = (direct_buffer_info*)calloc(1, DIRECT_BUFFER_INFO_AREA_SIZE); ++ direct_connected = false; ++ enable_direct_mode = false; ++} ++ ++ ++glview_direct_info::~glview_direct_info() ++{ ++ free(direct_info); ++} ++ +diff --git a/src/hgl/SConscript b/src/hgl/SConscript +new file mode 100644 +index 0000000..70db149 +--- /dev/null ++++ b/src/hgl/SConscript +@@ -0,0 +1,36 @@ ++####################################################################### ++# SConscript for Haiku OpenGL kit ++ ++Import('*') ++ ++env = env.Clone() ++ ++env.Append(CPPPATH = [ ++ '#/src/mapi', ++ '#/src/mesa', ++ '#/src/mesa/main', ++ '#/include/HaikuGL', ++ '/boot/system/develop/headers/private', ++ Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers ++]) ++ ++env.Prepend(LIBS = [ ++ glapi ++]) ++ ++sources = [ ++ 'GLView.cpp', ++ 'GLRenderer.cpp', ++ 'GLRendererRoster.cpp', ++ 'GLDispatcher.cpp', ++] ++ ++# libGL.so ++libgl = env.SharedLibrary( ++ target ='GL', ++ source = sources, ++ SHLIBSUFFIX = env['SHLIBSUFFIX'], ++) ++ ++env.Alias('libgl-haiku', libgl) ++Export('libgl') +diff --git a/src/mesa/drivers/haiku/swrast/SConscript b/src/mesa/drivers/haiku/swrast/SConscript +index ca0423e..aef7300 100644 +--- a/src/mesa/drivers/haiku/swrast/SConscript ++++ b/src/mesa/drivers/haiku/swrast/SConscript +@@ -16,6 +16,8 @@ env.Prepend(LIBS = [ + mesa, + ]) + ++env.Prepend(LIBS = [libgl]) ++ + sources = [ + 'SoftwareRast.cpp' + ] +-- +1.8.3.4 +