From fec97cb13d5627606a2c4efe5fbbeeea64c69173 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 31 Mar 2014 09:01:03 +0200 Subject: [PATCH 01/31] llvm: make it work with haikuporter -S * Missing provides for all commands * Configure script seems to ignore docDir and incldueDir, so manually move them in place at install step... --- sys-devel/llvm/llvm-3.4.recipe | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys-devel/llvm/llvm-3.4.recipe b/sys-devel/llvm/llvm-3.4.recipe index 028146381..d3ffae81a 100644 --- a/sys-devel/llvm/llvm-3.4.recipe +++ b/sys-devel/llvm/llvm-3.4.recipe @@ -48,6 +48,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" @@ -79,11 +80,16 @@ BUILD() # Haiku C++ requires rtti in a lot of central system components # such as Mesa export REQUIRES_RTTI=1 - runConfigure ./configure --enable-optimized + runConfigure ./configure --enable-optimized make $jobArgs } INSTALL() { make install + + # It seems configure options don't work as expected ? + mv $prefix/include $developDir + mkdir -p $docDir/.. + mv $prefix/docs $docDir } From 922af57c82db9b491cec085fba283f724e796cc8 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 1 Apr 2014 22:34:49 +0200 Subject: [PATCH 02/31] =?UTF-8?q?More=20hacking=20on=20L=C3=B6ve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fails to link with a strange libtool error about libstdc++.la ("no such file or directory", but the file is there). I'm clueless. --- games-engines/love/love-0.9.0.recipe | 6 +++-- .../love/patches/love-0.9.0.patchset | 26 ++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/games-engines/love/love-0.9.0.recipe b/games-engines/love/love-0.9.0.recipe index 506fe173a..d2fc04315 100644 --- a/games-engines/love/love-0.9.0.recipe +++ b/games-engines/love/love-0.9.0.recipe @@ -59,15 +59,17 @@ BUILD_PREREQUIRES=" cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix -# cmd:libtoolize cmd:pkg_config$secondaryArchSuffix + cmd:awk " PATCHES="love-0.9.0.patchset" BUILD() { runConfigure ./configure - make $jobArgs + # The pkg-config for freetype doesn't give this directory, which means + # there is no good way of finding it... + make $jobArgs CXXFLAGS="-I/system/develop/headers/x86/freetype2/ --std=c++11" } INSTALL() diff --git a/games-engines/love/patches/love-0.9.0.patchset b/games-engines/love/patches/love-0.9.0.patchset index 5dc81f5fd..ff417add8 100644 --- a/games-engines/love/patches/love-0.9.0.patchset +++ b/games-engines/love/patches/love-0.9.0.patchset @@ -1,4 +1,4 @@ -From 42a0ac9d4b717dccdb1c6f3d9615b702255574d2 Mon Sep 17 00:00:00 2001 +From 812eb4fa9c69400b4bd0c10e29db3ca14dc51bf0 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 28 Jan 2014 20:25:18 +0100 Subject: Hack Glee to compile (we don't need GLX!) @@ -53,3 +53,27 @@ index 631cddc..42782ec 100644 -- 1.8.3.4 + +From cd63b6001a9dca28e0af9803b50f5127621ef1b7 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 1 Apr 2014 22:32:15 +0200 +Subject: Remove dupliczte definition of __stdcall + +* Haiku defines that to empty already, for legacy reasons. + +diff --git a/src/modules/graphics/opengl/GLee.c b/src/modules/graphics/opengl/GLee.c +index 850a87d..1f46525 100644 +--- a/src/modules/graphics/opengl/GLee.c ++++ b/src/modules/graphics/opengl/GLee.c +@@ -55,7 +55,7 @@ typedef GLuint(*GLEE_LINK_FUNCTION)(void); + + GLboolean __GLeeInited=GL_FALSE; + +-#ifndef _WIN32 ++#if !defined(_WIN32) && !defined(__HAIKU__) + #define __stdcall /* nothing */ + #endif + +-- +1.8.3.4 + From ec3beb8184ad0396f86503d3ed1f9b91fe3849a7 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 1 Apr 2014 21:00:21 +0000 Subject: [PATCH 03/31] python: fixes 2.7.6 patchset for libs and headers. * should help for hashlib, etc --- dev-lang/python/patches/python-2.7.6.patchset | 63 ++++++++++++++++--- 1 file changed, 56 insertions(+), 7 deletions(-) diff --git a/dev-lang/python/patches/python-2.7.6.patchset b/dev-lang/python/patches/python-2.7.6.patchset index aaf1c963f..80c66fa0d 100644 --- a/dev-lang/python/patches/python-2.7.6.patchset +++ b/dev-lang/python/patches/python-2.7.6.patchset @@ -1,4 +1,4 @@ -From b06b5f1a27ce987aba1de80599a8082065399dde Mon Sep 17 00:00:00 2001 +From 3a159ca3a63ebdddbd2802c08589049e26fbdf40 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Mar 2014 21:17:06 +0000 Subject: initial Haiku patch @@ -673,22 +673,23 @@ index 891d568..24959b3 100644 esac AC_MSG_CHECKING(for --with-libm=STRING) diff --git a/setup.py b/setup.py -index 40ad843..5ea9c94 100644 +index 40ad843..24621ef 100644 --- a/setup.py +++ b/setup.py -@@ -523,6 +523,11 @@ class PyBuildExt(build_ext): +@@ -523,6 +523,12 @@ class PyBuildExt(build_ext): lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) inc_dirs += ['/system/include', '/atheos/autolnk/include'] inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + + # Haiku-specific include and library locations + if host_platform == 'haiku1': -+ inc_dirs += ['/boot/develop/headers/posix', '/boot/develop/headers/3rdparty'] -+ lib_dirs += ['/boot/system/lib', '/boot/develop/lib/x86'] ++ inc_dirs += ['/boot/develop/headers/posix', ++ '/boot/system/develop/headers'] ++ lib_dirs += ['/boot/system/develop/lib'] # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) if host_platform in ['osf1', 'unixware7', 'openunix8']: -@@ -551,7 +556,7 @@ class PyBuildExt(build_ext): +@@ -551,7 +557,7 @@ class PyBuildExt(build_ext): # Check for MacOS X, which doesn't need libm.a at all math_libs = ['m'] @@ -697,7 +698,55 @@ index 40ad843..5ea9c94 100644 math_libs = [] # XXX Omitted modules: gl, pure, dl, SGI-specific modules -@@ -1324,7 +1329,7 @@ class PyBuildExt(build_ext): +@@ -788,15 +794,22 @@ class PyBuildExt(build_ext): + '/usr/local/ssl/include', + '/usr/contrib/ssl/include/' + ] +- ssl_incs = find_file('openssl/ssl.h', inc_dirs, ++ ssl_incs = find_file('openssl/ssl.h', [], ++ inc_dirs + search_for_ssl_incs_in ++ ) ++ ssl_incs_to_add = find_file('openssl/ssl.h', inc_dirs, + search_for_ssl_incs_in + ) + if ssl_incs is not None: + krb5_h = find_file('krb5.h', inc_dirs, + ['/usr/kerberos/include']) + if krb5_h: +- ssl_incs += krb5_h +- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, ++ ssl_incs_to_add += krb5_h ++ ssl_libs = find_library_file(self.compiler, 'ssl', [], ++ lib_dirs + ['/usr/local/ssl/lib', ++ '/usr/contrib/ssl/lib/' ++ ] ) ++ ssl_libs_to_add = find_library_file(self.compiler, 'ssl', lib_dirs, + ['/usr/local/ssl/lib', + '/usr/contrib/ssl/lib/' + ] ) +@@ -804,8 +817,8 @@ class PyBuildExt(build_ext): + if (ssl_incs is not None and + ssl_libs is not None): + exts.append( Extension('_ssl', ['_ssl.c'], +- include_dirs = ssl_incs, +- library_dirs = ssl_libs, ++ include_dirs = ssl_incs_to_add, ++ library_dirs = ssl_libs_to_add, + libraries = ['ssl', 'crypto'], + depends = ['socketmodule.h']), ) + else: +@@ -843,8 +856,8 @@ class PyBuildExt(build_ext): + # The _hashlib module wraps optimized implementations + # of hash functions from the OpenSSL library. + exts.append( Extension('_hashlib', ['_hashopenssl.c'], +- include_dirs = ssl_incs, +- library_dirs = ssl_libs, ++ include_dirs = ssl_incs_to_add, ++ library_dirs = ssl_libs_to_add, + libraries = ['ssl', 'crypto']) ) + else: + print ("warning: openssl 0x%08x is too old for _hashlib" % +@@ -1324,7 +1337,7 @@ class PyBuildExt(build_ext): missing.append('resource') # Sun yellow pages. Some systems have the functions in libc. From b5672bc24ca3324412e9bb0b5da60890837d719c Mon Sep 17 00:00:00 2001 From: Jim Date: Sat, 29 Mar 2014 22:09:30 -0700 Subject: [PATCH 04/31] minor clean-up of digiclock recipe --- haiku-apps/digiclock/digiclock-1.0.recipe | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/haiku-apps/digiclock/digiclock-1.0.recipe b/haiku-apps/digiclock/digiclock-1.0.recipe index 01dd23c1b..4ede0549c 100644 --- a/haiku-apps/digiclock/digiclock-1.0.recipe +++ b/haiku-apps/digiclock/digiclock-1.0.recipe @@ -1,18 +1,15 @@ SUMMARY="DigiClock Screensaver" -DESCRIPTION="Based on BinaryClock by David Enderson Uses filled rectangles and random colors." +DESCRIPTION="Based on BinaryClock by David Enderson. DigiClock uses filled rectangles and random colors." HOMEPAGE="https://github.com/bbjimmy/DigiClock" SRC_URI="git+https://github.com/bbjimmy/DigiClock.git#7c49eb1ec29b1eb1046f9d7911646e2d5f5e6def" LICENSE="GNU GPL v2" -COPYRIGHT="2012 Jim Saxton, Fat Elk Softrware" +COPYRIGHT="2012 Jim Saxton, Fat Elk Software" ARCHITECTURES="x86_gcc2 x86 ?x86_64" -#SOURCE_DIR="digiclock-$portVersion" - PROVIDES=" - app:digiclock = $portVersion" REVISION="1" @@ -21,8 +18,7 @@ REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion" BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - " + haiku${secondaryArchSuffix}_devel >= $haikuVersion" BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix @@ -30,7 +26,6 @@ BUILD_PREREQUIRES=" makefile_engine" BUILD() - { cd source make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` @@ -47,7 +42,3 @@ INSTALL() cp "FAT ELK" $dataDir/FatElk/ cp "Fat Elk" $dataDir/FatElk/ } - - - - From a152810ec0d76df95960bdfd1b0190c0850c73fe Mon Sep 17 00:00:00 2001 From: Jim Date: Sun, 30 Mar 2014 20:04:16 -0700 Subject: [PATCH 05/31] clean-up yab and yab_ide recipes, removed chmod commands. --- dev-lang/yab/yab-1.7.02.recipe | 2 +- haiku-apps/yab_ide/yab_ide-2.2.1.recipe | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dev-lang/yab/yab-1.7.02.recipe b/dev-lang/yab/yab-1.7.02.recipe index bf0e698f2..45caf7219 100644 --- a/dev-lang/yab/yab-1.7.02.recipe +++ b/dev-lang/yab/yab-1.7.02.recipe @@ -4,7 +4,7 @@ yab is an extended version of yabasic, a BASIC programming language, with \ special commands designed for Haiku. " HOMEPAGE="http://sourceforge.net/projects/yab-interpreter" -SRC_URI="git+https://github.com/bbjimmy/Yab.git#f4dcf31ed252a098337994aa7f03ec63bf44d544" +SRC_URI="git+https://github.com/HaikuArchives/Yab.git#a5681d8a3403c142eae0ad416a59abd2aa7a28e4" REVISION="2" diff --git a/haiku-apps/yab_ide/yab_ide-2.2.1.recipe b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe index 055257e4e..0a2e295dc 100644 --- a/haiku-apps/yab_ide/yab_ide-2.2.1.recipe +++ b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe @@ -3,7 +3,7 @@ DESCRIPTION=" Yab allows fast prototyping with simple and clean code. yab contains a large number of BeAPI specific commands for GUI creation and much, much more. " HOMEPAGE="http://sourceforge.net/projects/yab-interpreter" -SRC_URI="git+https://github.com/bbjimmy/Yab.git#f4dcf31ed252a098337994aa7f03ec63bf44d544" +SRC_URI="git+https://github.com/HaikuArchives/Yab.git#a5681d8a3403c142eae0ad416a59abd2aa7a28e4" REVISION="2" LICENSE="Artistic" @@ -54,16 +54,10 @@ BUILD() INSTALL() { - - - mkdir -p $binDir - - - mkdir -p tmp mkdir -p tmp/buildfactory - cp -r src/* tmp/buildfactory + cp -r src/* tmp/buildfactory cp -r yab-IDE/BuildFactory/* tmp/buildfactory/ unzip -o tmp/buildfactory/parts/yabstuff.zip -d tmp/buildfactory/parts cp yab-IDE/src/yab-IDE.yab tmp/buildfactory/ @@ -71,13 +65,8 @@ INSTALL() BuildFactory.yab yab-IDE yab-IDE.yab application/x-vnd.yab-IDE cd .. cd .. - - mkdir -p $appsDir cp -r yab-IDE/ $appsDir/ cp tmp/buildfactory/yab-IDE $appsDir/yab-IDE/ cp yab-IDE/src/yab-IDE.yab $appsDir/yab-IDE/src/ - - - } From 89725cc854160d1db7db3e7c9c47d262d16ebb53 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 5 Apr 2014 13:11:58 +0000 Subject: [PATCH 06/31] libpcre: fix keyword typo. --- dev-libs/libpcre/libpcre-8.33.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libpcre/libpcre-8.33.recipe b/dev-libs/libpcre/libpcre-8.33.recipe index 1d9810354..6797117fb 100644 --- a/dev-libs/libpcre/libpcre-8.33.recipe +++ b/dev-libs/libpcre/libpcre-8.33.recipe @@ -14,7 +14,7 @@ COPYRIGHT=" 2007-2011, Google Inc. All rights reserved. " SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.33.tar.bz2" -CECKSUM_SIZE="1440869" +CHECKSUM_SIZE="1440869" CHECKSUM_MD5="21514018448ac10062ece7a668fca949" CHECKSUM_RMD160="de60ac0aaad1f04bc272f39136d9048b1adc9299" CHECKSUM_SHA512="12ff53127c549a37241a32ad22b6d0dd50eb3c44546c56f4ddd5dd3e23b0c71060d5b9d12583f9ad98354ff01804269a4d51b166561787014b820e4c72e2e599" From 36d6d4d2cf0e6595b91a1c36e1d41dea3ea043f3 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 5 Apr 2014 13:12:35 +0000 Subject: [PATCH 07/31] x86_64: enable python-2.7.6 * increase revisions for scons and git as they depend on 2.6.x at the moment. --- dev-lang/python/python-2.7.6.recipe | 2 +- dev-util/scons/scons-2.2.0.recipe | 4 ++-- dev-vcs/git/git-1.8.3.4.recipe | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-lang/python/python-2.7.6.recipe b/dev-lang/python/python-2.7.6.recipe index a710d1fa6..ea3645453 100644 --- a/dev-lang/python/python-2.7.6.recipe +++ b/dev-lang/python/python-2.7.6.recipe @@ -17,7 +17,7 @@ CHECKSUM_MD5="bcf93efa8eaf383c98ed3ce40b763497" CHECKSUM_RMD160="8efc73a01a466d8fa16c5c1734c89be79c2c538a" CHECKSUM_SHA512="e56e6cdd96ff7bcb680d11ad606c00f4264e413fc43ba7605b2d2e4a743fd6e464cbedabf18b461f742102e936f45d840302a99665b5f988b1df08b25285c238" REVISION="1" -ARCHITECTURES="!x86_gcc2 !x86 !x86_64" +ARCHITECTURES="!x86_gcc2 !x86 x86_64" PATCHES="python-2.7.6.patchset" diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe index e8a1e94ab..6f3918c6e 100644 --- a/dev-util/scons/scons-2.2.0.recipe +++ b/dev-util/scons/scons-2.2.0.recipe @@ -9,9 +9,9 @@ easier, more reliable and faster way to build software. HOMEPAGE="http://www.scons.org/" LICENSE="MIT" COPYRIGHT="2001-2012 The SCons Foundation" -SRC_URI="http://superb-dca3.dl.sourceforge.net/project/scons/scons/2.2.0/scons-2.2.0.tar.gz" +SRC_URI="http://sourceforge.net/projects/scons/files/scons/2.2.0/scons-2.2.0.tar.gz" CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="scons-2.2.0.patchset" diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe index bd2e4f207..6e9f4939d 100644 --- a/dev-vcs/git/git-1.8.3.4.recipe +++ b/dev-vcs/git/git-1.8.3.4.recipe @@ -31,7 +31,7 @@ CHECKSUM_RMD160_3="4a8e4a2a0bf53b0de7e7bfaa9e6deba0df5747d7" CHECKSUM_SHA512_3="8c21b68f12836c20b28e9e777a0476c391c940b0ad204d24abdca8a3232165e979c5a89027eb16d975a825c3091cb291092dfb2425e2e14188140dce647e6f7d" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" From 9118f44b09c3d107ed6cc05803d5b4f918f83a4f Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 6 Apr 2014 00:03:42 +0200 Subject: [PATCH 08/31] Mark python-2.7.6 broken again as it breaks libxml2 It seems python-2.7.6 isn't installing some necessary headers. --- dev-lang/python/python-2.7.6.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/python/python-2.7.6.recipe b/dev-lang/python/python-2.7.6.recipe index ea3645453..a710d1fa6 100644 --- a/dev-lang/python/python-2.7.6.recipe +++ b/dev-lang/python/python-2.7.6.recipe @@ -17,7 +17,7 @@ CHECKSUM_MD5="bcf93efa8eaf383c98ed3ce40b763497" CHECKSUM_RMD160="8efc73a01a466d8fa16c5c1734c89be79c2c538a" CHECKSUM_SHA512="e56e6cdd96ff7bcb680d11ad606c00f4264e413fc43ba7605b2d2e4a743fd6e464cbedabf18b461f742102e936f45d840302a99665b5f988b1df08b25285c238" REVISION="1" -ARCHITECTURES="!x86_gcc2 !x86 x86_64" +ARCHITECTURES="!x86_gcc2 !x86 !x86_64" PATCHES="python-2.7.6.patchset" From a4dddbd1bda9ee5f9d59a8f117e836a79f81bed1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 5 Apr 2014 23:07:23 +0000 Subject: [PATCH 09/31] python: fix config header path * enabled libxml2 2.9.1 on x86_64 --- dev-lang/python/patches/python-2.7.6.patchset | 25 ++++++++++++++++++- dev-lang/python/python-2.7.6.recipe | 4 +-- dev-libs/libxml2/libxml2-2.9.1.recipe | 7 ++++-- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dev-lang/python/patches/python-2.7.6.patchset b/dev-lang/python/patches/python-2.7.6.patchset index 80c66fa0d..22d516fe1 100644 --- a/dev-lang/python/patches/python-2.7.6.patchset +++ b/dev-lang/python/patches/python-2.7.6.patchset @@ -1,4 +1,4 @@ -From 3a159ca3a63ebdddbd2802c08589049e26fbdf40 Mon Sep 17 00:00:00 2001 +From faaf6967e31a129b062c3a3a9b6752944aee865f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Mar 2014 21:17:06 +0000 Subject: initial Haiku patch @@ -758,3 +758,26 @@ index 40ad843..24621ef 100644 -- 1.8.3.4 + +From 6e1205e2b0b90002f678ed93a8a27ab567e8bd86 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 5 Apr 2014 21:16:40 +0000 +Subject: fix pyconfig.h path + + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index cf75650..bb54b6f 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -105,7 +105,7 @@ BINDIR= @bindir@ + LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ +-CONFINCLUDEDIR= $(exec_prefix)/include ++CONFINCLUDEDIR= $(INCLUDEDIR) + SCRIPTDIR= $(prefix)/lib + + # Detailed destination directories +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.7.6.recipe b/dev-lang/python/python-2.7.6.recipe index a710d1fa6..9458ba5dd 100644 --- a/dev-lang/python/python-2.7.6.recipe +++ b/dev-lang/python/python-2.7.6.recipe @@ -16,8 +16,8 @@ CHECKSUM_SIZE="10431288" CHECKSUM_MD5="bcf93efa8eaf383c98ed3ce40b763497" CHECKSUM_RMD160="8efc73a01a466d8fa16c5c1734c89be79c2c538a" CHECKSUM_SHA512="e56e6cdd96ff7bcb680d11ad606c00f4264e413fc43ba7605b2d2e4a743fd6e464cbedabf18b461f742102e936f45d840302a99665b5f988b1df08b25285c238" -REVISION="1" -ARCHITECTURES="!x86_gcc2 !x86 !x86_64" +REVISION="2" +ARCHITECTURES="!x86_gcc2 !x86 x86_64" PATCHES="python-2.7.6.patchset" diff --git a/dev-libs/libxml2/libxml2-2.9.1.recipe b/dev-libs/libxml2/libxml2-2.9.1.recipe index 9c374179c..336ac21aa 100644 --- a/dev-libs/libxml2/libxml2-2.9.1.recipe +++ b/dev-libs/libxml2/libxml2-2.9.1.recipe @@ -3,9 +3,12 @@ HOMEPAGE="http://www.xmlsoft.org/" LICENSE="MIT" COPYRIGHT="1998-2013 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz" +CHECKSUM_SIZE="5172503" CHECKSUM_MD5="9c0cfef285d5c4a5c80d00904ddab380" -REVISION="1" -ARCHITECTURES="!x86_gcc2 !x86 !x86_64" +CHECKSUM_RMD160="257285d9ac070ed9f58666b7bd7c4653651c871b" +CHECKSUM_SHA512="7b10de749485bc2eb2108063e97d89e70d6fbb78b1bf195ab5528c8c64e79483d55223a49d95934f4e00b00e906c18bdd34344703ffe158dcf08096905a44c1b" +REVISION="2" +ARCHITECTURES="!x86_gcc2 !x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" PATCHES="libxml2-2.9.1.patchset" From c105427cd8cf07337403d8a5275fcfca7343cc00 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 6 Apr 2014 02:28:32 +0200 Subject: [PATCH 10/31] python-2.7.6: Add missing provides --- dev-lang/python/python-2.7.6.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-lang/python/python-2.7.6.recipe b/dev-lang/python/python-2.7.6.recipe index 9458ba5dd..e86a68b5f 100644 --- a/dev-lang/python/python-2.7.6.recipe +++ b/dev-lang/python/python-2.7.6.recipe @@ -27,6 +27,8 @@ PROVIDES=" cmd:idle = $portVersion compat >= 2.7 cmd:pydoc = $portVersion compat >= 2.7 cmd:python = $portVersion compat >= 2.7 + cmd:python2 = $portVersion compat >= 2.7 + cmd:python2_config = $portVersion compat >= 2.7 cmd:python2.7 = $portVersion compat >= 2.7 cmd:python2.7_config = $portVersion compat >= 2.7 cmd:python_config = $portVersion compat >= 2.7 From 164cf3edb4ed0b3f3fa143b6748c880ab9dc2f30 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 6 Apr 2014 02:55:54 +0200 Subject: [PATCH 11/31] scons: Add checksums --- dev-util/scons/scons-2.2.0.recipe | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe index 6f3918c6e..c95c90eb6 100644 --- a/dev-util/scons/scons-2.2.0.recipe +++ b/dev-util/scons/scons-2.2.0.recipe @@ -10,7 +10,10 @@ HOMEPAGE="http://www.scons.org/" LICENSE="MIT" COPYRIGHT="2001-2012 The SCons Foundation" SRC_URI="http://sourceforge.net/projects/scons/files/scons/2.2.0/scons-2.2.0.tar.gz" +CHECKSUM_SIZE="591836" CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632" +CHECKSUM_RMD160="fc83225c7c8be4a16c198250fe827729f2f8aabf" +CHECKSUM_SHA512="b1910c2faf9bf888e32f90c567a5c3fe4b7066f48a3457639570868f02075e9d3ef20d0315d5bab5940576987bacdaa0f675aaf8f5bdb1efb1a0806cb0153738" REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" From 72872aede2f89ba5ae0edc2cd88d5146518b6fa2 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 6 Apr 2014 03:03:46 +0200 Subject: [PATCH 12/31] clang-3.4: Add checksums --- sys-devel/clang/clang-3.4.recipe | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys-devel/clang/clang-3.4.recipe b/sys-devel/clang/clang-3.4.recipe index d2a8f29ce..9c7a325d7 100644 --- a/sys-devel/clang/clang-3.4.recipe +++ b/sys-devel/clang/clang-3.4.recipe @@ -11,9 +11,17 @@ LICENSE="UIUC" COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign" SRC_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz" +CHECKSUM_SIZE="15920544" CHECKSUM_MD5="46ed668a1ce38985120dbf6344cf6116" +CHECKSUM_RMD160="67e3f7baa679ca95d944b9cc3528d1ffbe3cdee0" +CHECKSUM_SHA512="4ccd8c4fc15dd9abc43f93b62f0b1349c419a2afeba05304fa98c157325e31dbbdb1587afc18d0a3f5dba14c95d64a3d40a825efe89ddf6f93fa96002496675c" + SRC_URI_2="http://llvm.org/releases/${portVersion}/clang-${portVersion}.src.tar.gz" +CHECKSUM_SIZE_2="10619607" CHECKSUM_MD5_2="b378f1e2c424e03289effc75268d3d2c" +CHECKSUM_RMD160_2="4fbd7e735edc96e224a82ebe2277c69efc488e6b" +CHECKSUM_SHA512_2="eac282c26d46d04f3e74c6a34629aa6496882aa6f64387728be86de3eba963a97388fd4214aea7d47a801215e61c0a54663d65474effec8be2e39be1b1ed89f1" + REVISION="2" ARCHITECTURES="x86 x86_64" From 557903a154d29e99b2c12fc35e2224ff3ae0a164 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 4 Apr 2014 22:03:43 +0200 Subject: [PATCH 13/31] Add recipe for cream. It builds, but needs a vim with clientserver support, which we don't have yet. --- app-vim/cream/cream-0.43.recipe | 60 +++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 app-vim/cream/cream-0.43.recipe diff --git a/app-vim/cream/cream-0.43.recipe b/app-vim/cream/cream-0.43.recipe new file mode 100644 index 000000000..9329068f3 --- /dev/null +++ b/app-vim/cream/cream-0.43.recipe @@ -0,0 +1,60 @@ +SUMMARY="a modern configuration of the Vim text editor" +DESCRIPTION=" +Vim is a powerful and full-featured text editor, the popular descendant of the \ +1976 Vi text editor. + +But Vim has a steep learning curve. It was not primarily designed to be easy to \ +use, favoring performance and technical flexibility instead. Because it is so \ +different, learning to use Vim takes time. + +Cream shapes Vim into an interface you probably already know (sometimes called \ +Common User Access). Whether you are writing emails or developing large \ +software applications, Cream saves you time and gets you up and running quickly. +" +HOMEPAGE="http://cream.sf.net" +SRC_URI="http://freefr.dl.sourceforge.net/project/$portName/Cream/$portVersion/$portName-$portVersion.tar.gz" +CHECKSUM_SIZE="785889" +CHECKSUM_RMD160="1998a29c4c5beeefff9d7f418d9b78a5c5c3b8c0" +CHECKSUM_SHA512="6e6c139bcb5f1ed8cb9718f2c1453a69453c87f2588b6074264f94877dd5b7f78842f5a7c45df693effc2249020e5fa61a88ab5d4e3e13806e2674f1f57dccb7" + +REVISION="1" +ARCHITECTURES="!any" + +PROVIDES=" + cream = $portVersion + cmd:cream + " + +REQUIRES=" + cmd:vim == 7.4 + " + +BUILD_REQUIRES=" + cmd:vim + " + +BUILD_PREREQUIRES=" + cmd:which + cmd:perl + " + +BUILD() +{ + true +} + +INSTALL() +{ + export VIMRUNTIME=$dataDir/vim/vim74/ + mkdir -p $VIMRUNTIME + + sh INSTALL.sh $prefix + + rm -r $prefix/share # Useless .desktop file + addAppDeskbarSymlink $binDir/cream "Cream" +} + +# no TEST script available + +COPYRIGHT="2001-2014 Cream contributors" +LICENSE="GNU GPL v3" From c3d080908e431f58a46fcb1bc5bb9a4a87fc8a7d Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Apr 2014 18:27:12 +0200 Subject: [PATCH 14/31] Add recipe for libclaw. --- dev-libs/libclaw/libclaw-1.7.4.recipe | 90 +++++++++++++++++++ .../libclaw/patches/libclaw-1.7.4.patchset | 89 ++++++++++++++++++ 2 files changed, 179 insertions(+) create mode 100644 dev-libs/libclaw/libclaw-1.7.4.recipe create mode 100644 dev-libs/libclaw/patches/libclaw-1.7.4.patchset diff --git a/dev-libs/libclaw/libclaw-1.7.4.recipe b/dev-libs/libclaw/libclaw-1.7.4.recipe new file mode 100644 index 000000000..a79193a0b --- /dev/null +++ b/dev-libs/libclaw/libclaw-1.7.4.recipe @@ -0,0 +1,90 @@ +SUMMARY="Absolutely Wonderful C++ Library" +DESCRIPTION=" +Claw is a generalist library written in C++ and providing various structures +and algorithms, like containers, string algorithms, tweeners, Bézier curves and +more. + +The story of Claw begins when I wanted to group all the small tools I have made +along my studies at the university. The library progress from time to time, +mostly when I need a new tool for Plee the Bear, a game I am actively working +on. + +Claw wants to be standard compliant and as portable as possible. Of course, +because I'm currently the only developer, the task is a little bit difficult +and you could have some minor problems. If you experience any problem, please +let me know by contacting me. + +Claw stands for \"C++ Library Absolutely Wonderful\". +" +HOMEPAGE="http://libclaw.sourceforge.net/" +SRC_URI="http://sourceforge.net/projects/libclaw/files/libclaw/$portVersion/libclaw-$portVersion.tar.gz" +CHECKSUM_SIZE="341952" +CHECKSUM_RMD160="65347487ad9973b08f3f1d4aa0418ac4f947ec61" +CHECKSUM_SHA512="704dc49832210a502b69b691fba75272a7fa62ab4b1ee3b8c99a7923fd537084abdc6263fde495585113f4b3da257e0fe0525ccc2e2601347a8642aff6f0384b" + +REVISION="1" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2008-2014 Julien Jorge" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + libclaw$secondaryArchSuffix = $portVersion + lib:libclaw$secondaryArchSuffix + cmd:claw_config + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libpng$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libz$secondaryArchSuffix + boost_devel${secondaryArchSuffix} + " + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:cmake + cmd:make + cmd:gettext + " + +PATCHES="libclaw-$portVersion.patchset" +BUILD() +{ + cmake . -DCMAKE_INSTALL_PREFIX=$prefix + make $jobArgs +} + +INSTALL() +{ + make install + + packageEntries devel $developDir $libDir/libclaw/ +} + +TEST() { + true +} + +PROVIDES_devel=" + libclaw${secondaryArchSuffix}_devel = $portVersion + devel:libclaw$secondaryArchSuffix + " + +REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion + libclaw$secondaryArchSuffix == $portVersion base + " diff --git a/dev-libs/libclaw/patches/libclaw-1.7.4.patchset b/dev-libs/libclaw/patches/libclaw-1.7.4.patchset new file mode 100644 index 000000000..23b771b53 --- /dev/null +++ b/dev-libs/libclaw/patches/libclaw-1.7.4.patchset @@ -0,0 +1,89 @@ +From 3741d051e648f729859cb3957be8cfb35a3263c1 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Apr 2014 18:04:49 +0200 +Subject: Add missing include. + + +diff --git a/claw/socket_traits_unix.hpp b/claw/socket_traits_unix.hpp +index 16761ab..bc471b0 100644 +--- a/claw/socket_traits_unix.hpp ++++ b/claw/socket_traits_unix.hpp +@@ -31,6 +31,7 @@ + #define __CLAW_SOCKET_TRAITS_UNIX_HPP__ + + #include ++#include + #include + #include + #include +-- +1.8.3.4 + + +From 5e3860a46838f92828846b2f8408ea2a458ae9b8 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Apr 2014 18:09:50 +0200 +Subject: Fix installation paths for Haiku. + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0716825..66607b0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,12 +27,20 @@ if(SVN_ENTRIES) + endif(Subversion_FOUND) + endif(SVN_ENTRIES) + +-set( CLAW_CODE_DIR claw/code/ ) ++if (HAIKU) ++set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/develop/headers/" ) ++set( CLAW_INSTALLDIR_DOC data/doc/libclaw${CLAW_VERSION_MAJOR}/ ) ++set( CLAW_TRANSLATIONS_INSTALL_DIR "data/locale" ) ++set( CLAW_INSTALLDIR_SOURCE develop/headers/claw/ ) ++else() + set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/include/" ) +-set( CLAW_INSTALLDIR_SOURCE include/claw/ ) +-set( CLAW_INSTALLDIR_LIB lib/ ) + set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ ) + set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" ) ++set( CLAW_INSTALLDIR_SOURCE include/claw/ ) ++endif() ++ ++set( CLAW_CODE_DIR claw/code/ ) ++set( CLAW_INSTALLDIR_LIB lib/ ) + set( CLAW_EXECUTABLE_DIR bin/ ) + + set( CLAW_LIBRARIES +diff --git a/cmake-module/CMakeLists.txt b/cmake-module/CMakeLists.txt +index a08a799..c486c5c 100644 +--- a/cmake-module/CMakeLists.txt ++++ b/cmake-module/CMakeLists.txt +@@ -3,7 +3,11 @@ cmake_minimum_required(VERSION 2.6) + project(claw:cmake-modules) + + if( NOT CLAW_CMAKE_MODULES_INSTALL_PATH ) +- set( CLAW_CMAKE_MODULES_INSTALL_PATH "share/cmake/libclaw" ) ++ if(HAIKU) ++ set( CLAW_CMAKE_MODULES_INSTALL_PATH "lib/${CMAKE_HAIKU_SECONDARY_ARCH}/libclaw/cmake/" ) ++ else() ++ set( CLAW_CMAKE_MODULES_INSTALL_PATH "share/cmake/libclaw" ) ++ endif() + endif( NOT CLAW_CMAKE_MODULES_INSTALL_PATH ) + + set( CLAW_CMAKE_MODULES +diff --git a/desktop/locale/libclaw/CMakeLists.txt b/desktop/locale/libclaw/CMakeLists.txt +index f0973ac..8de90bd 100644 +--- a/desktop/locale/libclaw/CMakeLists.txt ++++ b/desktop/locale/libclaw/CMakeLists.txt +@@ -22,7 +22,7 @@ macro(GETTEXT_CREATE_TRANSLATIONS_CUSTOM _targetName _potFile _firstPoFile) + + install( + FILES ${_gmoFile} +- DESTINATION share/locale/${_lang}/LC_MESSAGES ++ DESTINATION ${CLAW_TRANSLATIONS_INSTALL_DIR}/${_lang}/LC_MESSAGES + RENAME ${_potBasename}.mo + ) + +-- +1.8.3.4 + From 13954bc16ac3d1e05a79e5900c6b250795ff6e4f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Apr 2014 19:34:51 +0200 Subject: [PATCH 15/31] SDL2_mixer: fix missing provides. --- media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe index 3d4a50699..38895389c 100644 --- a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe +++ b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe @@ -28,7 +28,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libGL$secondaryArchSuffix # No clue, it wants it - lib:libSDL2$secondaryArchSuffix + lib:libSDL2_2.0$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libflac$secondaryArchSuffix # lib:libfluidsynth$secondaryArchSuffix @@ -79,6 +79,7 @@ INSTALL() make install prepareInstalledDevelLibs libSDL2_mixer + prepareInstalledDevelLibs libSDL2_mixer-2.0 fixPkgconfig packageEntries devel \ @@ -89,6 +90,7 @@ 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 + devel:libSDL2_mixer_2.0$secondaryArchSuffix = $portVersion compat >= 2.0 " REQUIRES_devel=" From dcb801514f8c761de9939e7ba6e6a1f49bb34b52 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 11:05:38 +0200 Subject: [PATCH 16/31] Add recipe for CMake 3.0.0-rc3. * Reuses the patch from rc1, and still seems to work. --- dev-util/cmake/cmake-3.0.0_rc3.recipe | 75 +++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 dev-util/cmake/cmake-3.0.0_rc3.recipe diff --git a/dev-util/cmake/cmake-3.0.0_rc3.recipe b/dev-util/cmake/cmake-3.0.0_rc3.recipe new file mode 100644 index 000000000..679872b24 --- /dev/null +++ b/dev-util/cmake/cmake-3.0.0_rc3.recipe @@ -0,0 +1,75 @@ +SUMMARY="Cross platform Make" +DESCRIPTION=" +CMake is a cross-platform, open-source build system. It is a family of tools \ +designed to build, test and package software. CMake is used to control the \ +software compilation process using simple platform and compiler independent \ +configuration files. CMake generates native makefiles and workspaces that can \ +be used in the compiler environment of your choice. +" +HOMEPAGE="http://www.cmake.org" +LICENSE="CMake" +COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved." +SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc3.tar.gz" +CHECKSUM_SIZE="5486721" +CHECKSUM_RMD160="122b2fe3ed13af3959d5231f447ada2f8831a80e" +CHECKSUM_SHA512="36d9b42f85c0a472af7f20db832b4dbb3f171172def72c38e1ca1b8f42be3ed07d893069addb53c5e9d6c887237900731d0052267dd0a378377718c4e98d7302" +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=" + cmake = $portVersion compat >= 3.0 + cmd:cmake = $portVersion compat >= 3.0 + cmd:ccmake = $portVersion compat >= 3.0 + cmd:cpack = $portVersion compat >= 3.0 + cmd:ctest = $portVersion compat >= 3.0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libstdc++$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libncurses$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:grep + cmd:ld$secondaryArchSuffix + cmd:libtool + cmd:make + cmd:sed + " +PATCHES="cmake-3.0.0_rc1.patchset" +SOURCE_DIR="cmake-3.0.0-rc3" +BUILD() +{ + ./configure --prefix=$prefix \ + --datadir=/$relativeDataDir/cmake \ + --docdir=/$relativeDocDir \ + --mandir=/$relativeManDir + make $jobArgs +} + +INSTALL() +{ + make install + + # No way to tell this to configure... + mv $prefix/share/aclocal $dataDir + rmdir $prefix/share +} + +TEST() +{ + cp bin/ctest Bootstrap.cmk/ + make test VERBOSE=1 +} + From fd4fad5ccbd87b14fcce88ac1abf5b6284a5c86a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 11:18:51 +0200 Subject: [PATCH 17/31] Add patch for htmltidy I forgot to commit. --- .../patches/htmltidy-20092812.patchset | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 app-text/htmltidy/patches/htmltidy-20092812.patchset diff --git a/app-text/htmltidy/patches/htmltidy-20092812.patchset b/app-text/htmltidy/patches/htmltidy-20092812.patchset new file mode 100644 index 000000000..ea11a2def --- /dev/null +++ b/app-text/htmltidy/patches/htmltidy-20092812.patchset @@ -0,0 +1,45 @@ +From 1f39ac359161c8bb06a4f1d8e85465a70298bd5b Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 30 Mar 2014 12:30:32 +0200 +Subject: Fix path of generated binaries for tests. + + +diff --git a/test/testone.sh b/test/testone.sh +index 8abb3b9..b3dbd0f 100755 +--- a/test/testone.sh ++++ b/test/testone.sh +@@ -24,7 +24,7 @@ set +f + + TESTNO=$1 + EXPECTED=$2 +-TIDY=../bin/tidy ++TIDY=../console/tidy + INFILES=./input/in_${TESTNO}.*ml + CFGFILE=./input/cfg_${TESTNO}.txt + +-- +1.8.3.4 + + +From 2b3f8f044417309878612b135edff9726553fcad Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 30 Mar 2014 12:30:49 +0200 +Subject: Make file aware of Haiku. + + +diff --git a/include/platform.h b/include/platform.h +index c30946b..ae7843c 100644 +--- a/include/platform.h ++++ b/include/platform.h +@@ -417,7 +417,7 @@ extern "C" { + #if PRESERVE_FILE_TIMES + + #ifndef HAS_FUTIME +-#if defined(CYGWIN_OS) || defined(BE_OS) || defined(OS2_OS) || defined(HPUX_OS) || defined(SOLARIS_OS) || defined(LINUX_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(IRIX_OS) || defined(AIX_OS) || defined(__BORLANDC__) ++#if defined(CYGWIN_OS) || defined(BE_OS) || defined(OS2_OS) || defined(HPUX_OS) || defined(SOLARIS_OS) || defined(LINUX_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(IRIX_OS) || defined(AIX_OS) || defined(__BORLANDC__) || defined(__HAIKU__) + #define HAS_FUTIME 0 + #else + #define HAS_FUTIME 1 +-- +1.8.3.4 + From 08337167b53d34db43af8b6e119c08b6309faa9e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 11:19:46 +0200 Subject: [PATCH 18/31] LZO: add mising awk require. --- dev-libs/lzo/lzo-2.06.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-libs/lzo/lzo-2.06.recipe b/dev-libs/lzo/lzo-2.06.recipe index 75ed95ee7..5967e5d4d 100644 --- a/dev-libs/lzo/lzo-2.06.recipe +++ b/dev-libs/lzo/lzo-2.06.recipe @@ -40,6 +40,7 @@ BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:make + cmd:awk " BUILD() From 2db3e0e4cb638d543b7afe4411232b54552e4a6a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 21:17:41 +0200 Subject: [PATCH 19/31] Add recipe for Plee the Bear. Not working yet, fails at runtime with: Could not resolve symbol '_Unwind_GetRegionStart' --- .../patches/plee_the_bear-0.7.0.patchset | 129 ++++++++++++++++++ .../plee_the_bear/plee_the_bear-0.7.0.recipe | 109 +++++++++++++++ 2 files changed, 238 insertions(+) create mode 100644 games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset create mode 100644 games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe diff --git a/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset b/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset new file mode 100644 index 000000000..fdd9681f1 --- /dev/null +++ b/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset @@ -0,0 +1,129 @@ +From 03033c51349e01d5d06ee74545a15a534525d785 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 6 Apr 2014 14:54:36 +0200 +Subject: Fix search paths for SDL2 header files. + + +diff --git a/bear/cmake-helper/FindSDL2.cmake b/bear/cmake-helper/FindSDL2.cmake +index 7665a55..bcd3050 100644 +--- a/bear/cmake-helper/FindSDL2.cmake ++++ b/bear/cmake-helper/FindSDL2.cmake +@@ -70,7 +70,7 @@ + find_path(SDL2_INCLUDE_DIR SDL.h + HINTS + ENV SDL2DIR +- PATH_SUFFIXES include/SDL2 include ++ PATH_SUFFIXES include/SDL2 include SDL2 + ) + + # SDL2-1.1 is the name used by FreeBSD ports... +diff --git a/bear/cmake-helper/FindSDL2_mixer.cmake b/bear/cmake-helper/FindSDL2_mixer.cmake +index 59ed911..d795965 100644 +--- a/bear/cmake-helper/FindSDL2_mixer.cmake ++++ b/bear/cmake-helper/FindSDL2_mixer.cmake +@@ -40,7 +40,7 @@ find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h + HINTS + ENV SDL2MIXERDIR + ENV SDL2DIR +- PATH_SUFFIXES include/SDL2 include ++ PATH_SUFFIXES include/SDL2 include SDL2 + ) + + if(NOT SDL2_MIXER_LIBRARY AND SDL2MIXER_LIBRARY) +-- +1.8.3.4 + + +From 4a4404ab5a5b9c67925ec6d910ddc5f47fb1b910 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 6 Apr 2014 17:02:35 +0200 +Subject: Link libintl on haiku. + + +diff --git a/bear/bear-engine/running_bear/CMakeLists.txt b/bear/bear-engine/running_bear/CMakeLists.txt +index 8b04d89..4fffd94 100644 +--- a/bear/bear-engine/running_bear/CMakeLists.txt ++++ b/bear/bear-engine/running_bear/CMakeLists.txt +@@ -38,7 +38,7 @@ set( + ${CLAW_APPLICATION_LIBRARIES} + ) + +-if(WIN32) ++if(WIN32 OR HAIKU) + set( + RUNNING_BEAR_LINK_LIBRARIES + ${RUNNING_BEAR_LINK_LIBRARIES} +diff --git a/plee-the-bear/launcher/src/CMakeLists.txt b/plee-the-bear/launcher/src/CMakeLists.txt +index 9ed5d32..ff88206 100644 +--- a/plee-the-bear/launcher/src/CMakeLists.txt ++++ b/plee-the-bear/launcher/src/CMakeLists.txt +@@ -121,7 +121,7 @@ set( + ${CLAW_APPLICATION_LIBRARIES} + ) + +-if(WIN32) ++if(WIN32 OR HAIKU) + set( + PTB_LAUNCHER_LINK_LIBRARIES + ${PTB_LAUNCHER_LINK_LIBRARIES} +-- +1.8.3.4 + + +From 415c83accad83bf6677dd3d578ab6712582910b9 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 6 Apr 2014 19:41:58 +0200 +Subject: Fix install directories. + + +diff --git a/bear/cmake-helper/bear-config.cmake b/bear/cmake-helper/bear-config.cmake +index e66d79e..b483445 100644 +--- a/bear/cmake-helper/bear-config.cmake ++++ b/bear/cmake-helper/bear-config.cmake +@@ -47,7 +47,7 @@ if( NOT BEAR_ENGINE_INSTALL_LIBRARY_DIR ) + "${BEAR_ENGINE_INSTALL_EXECUTABLE_DIR}" + ) + else( WIN32 ) +- set( BEAR_ENGINE_INSTALL_LIBRARY_DIR lib ) ++ set( BEAR_ENGINE_INSTALL_LIBRARY_DIR lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ) + endif( WIN32 ) + endif( NOT BEAR_ENGINE_INSTALL_LIBRARY_DIR ) + +diff --git a/bear/cmake-module/CMakeLists.txt b/bear/cmake-module/CMakeLists.txt +index e182689..24c2113 100644 +--- a/bear/cmake-module/CMakeLists.txt ++++ b/bear/cmake-module/CMakeLists.txt +@@ -1,7 +1,7 @@ + project(bear:cmake-modules) + + if( NOT BEAR_CMAKE_MODULES_INSTALL_PATH ) +- set( BEAR_CMAKE_MODULES_INSTALL_PATH "share/cmake/bear-engine" ) ++ set( BEAR_CMAKE_MODULES_INSTALL_PATH "data/cmake/bear-engine" ) + endif( NOT BEAR_CMAKE_MODULES_INSTALL_PATH ) + + set( BEAR_CMAKE_MODULES +diff --git a/plee-the-bear/CMakeLists.txt b/plee-the-bear/CMakeLists.txt +index 6a123d9..9bc8df3 100644 +--- a/plee-the-bear/CMakeLists.txt ++++ b/plee-the-bear/CMakeLists.txt +@@ -23,7 +23,7 @@ include( docbook-to-man ) + #------------------------------------------------------------------------------- + # where the game resources are installed + if( NOT PTB_INSTALL_DATA_DIR ) +- set( PTB_INSTALL_DATA_DIR share/plee-the-bear ) ++ set( PTB_INSTALL_DATA_DIR data/plee-the-bear ) + endif( NOT PTB_INSTALL_DATA_DIR ) + + # where the game executables are installed +@@ -154,7 +154,7 @@ subdirs( + + install( + DIRECTORY "lib/item-description" +- DESTINATION "share/bear-factory/plee-the-bear" ++ DESTINATION "data/bear-factory/plee-the-bear" + FILE_PERMISSIONS OWNER_READ OWNER_WRITE + GROUP_READ + WORLD_READ +-- +1.8.3.4 + diff --git a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe new file mode 100644 index 000000000..9b0156aff --- /dev/null +++ b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe @@ -0,0 +1,109 @@ +SUMMARY="A platform game in which you play an angry bear whose son has been kidnapped by god." +HOMEPAGE="http://www.stuff-o-matic.com/plee-the-bear/" +LICENSE="GNU GPL v3" +COPYRIGHT="2012 Stuff O Matic" +SRC_URI="http://www.stuff-o-matic.com/plee-the-bear/download/file.php?platform=source" +CHECKSUM_SIZE="74496396" +CHECKSUM_RMD160="4f7648c345b5f3445581530c9c45dfcc44512a53" +CHECKSUM_SHA512="6d8942b69a01ce122851371bd5a0179093706bc37eb0e051d775f0856fa2a3561c93e940c091b4e3126ec939c7030bafb6c28e0907add66a65d9cea745e1a39e" + +REVISION="1" +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 +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + plee_the_bear = $portVersion + cmd:plee_the_bear = $portVersion + lib:libbear_audio$secondaryArchSuffix + lib:libbear_communication$secondaryArchSuffix + lib:libbear_debug$secondaryArchSuffix + lib:libbear_engine$secondaryArchSuffix + lib:libbear_expr$secondaryArchSuffix + lib:libbear_generic_items$secondaryArchSuffix + lib:libbear_gui$secondaryArchSuffix + lib:libbear_input$secondaryArchSuffix + lib:libbear_net$secondaryArchSuffix + lib:libbear_text_interface$secondaryArchSuffix + lib:libbear_time$secondaryArchSuffix + lib:libbear_universe$secondaryArchSuffix + lib:libbear_visual$secondaryArchSuffix + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libstdc++$secondaryArchSuffix + lib:libsdl2$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libsdl2_mixer$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libclaw_dynamic_library$secondaryArchSuffix + lib:libclaw_graphic$secondaryArchSuffix + lib:libclaw_net$secondaryArchSuffix + lib:libclaw_tween$secondaryArchSuffix + lib:libboost_system$secondaryArchSuffix + lib:libboost_thread$secondaryArchSuffix + lib:libboost_filesystem$secondaryArchSuffix + lib:libboost_regex$secondaryArchSuffix + lib:libfreetype$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libsdl2$secondaryArchSuffix + devel:libsdl2_mixer$secondaryArchSuffix + devel:libsdl$secondaryArchSuffix + devel:sdl_mixer$secondaryArchSuffix + devel:libfreetype$secondaryArchSuffix + devel:libclaw_application$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libintl$secondaryArchSuffix + boost_devel${secondaryArchSuffix} + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:cmake >= 3.0 + " + +SOURCE_DIR="plee-the-bear-0.7.0-light" +PATCHES="plee_the_bear-$portVersion.patchset" +BUILD() +{ + cmake . -DBEAR_EDITORS_ENABLED=FALSE -DCMAKE_INSTALL_PREFIX=$prefix + make $jobArgs +} + +INSTALL() +{ + make install + rm -r $prefix/share + + addAppDeskbarSymlink $binDir/plee_the_bear "Plee the Bear" +} + +# ----- DESCRIPTION ----------------------------------------------------------- + +DESCRIPTION=" +Plee the Bear is a platform game in which you play an angry bear whose son has +been kidnapped by god. Here is a guy hard to brave! Jump in this amazing journey +to find and rescue your son. Because you want to rescue him, don't you? Or to +slap him? Maybe both…. + +With three levels of the storyline and four mini-games, Plee the Bear did +received very positive criticisms. The players loved the fun, the graphics and +the music; the community around the free software movement appreciated the +overall process and the quality of the resources, remarkable for a free game; +and the indie gaming community was pleasantly surprised by the technical skills +and the details of the game. +" From 1e8792d775f108d0ad45d968b9f2c5c1bf093e15 Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Mon, 7 Apr 2014 03:00:15 +0200 Subject: [PATCH 20/31] cppunit: turn bep into recipe. --- dev-util/cppunit/cppunit-1.12.1.recipe | 80 ++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 10 deletions(-) diff --git a/dev-util/cppunit/cppunit-1.12.1.recipe b/dev-util/cppunit/cppunit-1.12.1.recipe index ccad5254c..c463ac254 100644 --- a/dev-util/cppunit/cppunit-1.12.1.recipe +++ b/dev-util/cppunit/cppunit-1.12.1.recipe @@ -1,23 +1,83 @@ -DESCRIPTION="C++ port of the famous JUnit framework for unit testing" -HOMEPAGE="http://cppunit.sourceforge.net/" -SRC_URI="http://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/cppunit-1.12.1.tar.gz/download" +SUMMARY="C++ unit testing framework" +DESCRIPTION=" +CppUnit is a C++ unit testing framework. It started its life as a port of \ +JUnit to C++ by Michael Feathers. +" +HOMEPAGE="http://cppunit.sourceforge.net/" +SRC_URI="http://downloads.sourceforge.net/cppunit/cppunit-1.12.1.tar.gz" +LICENSE="GNU LGPL v2.1" +COPYRIGHT=" + Michael Feathers + Jerome Lacoste + E. Sommerlade + Baptiste Lepilleur + Bastiaan Bakker + Steve Robbins + " +CHECKSUM_SIZE="762803" CHECKSUM_MD5="bd30e9cf5523cdfc019b94f5e1d7fd19" +CHECKSUM_RMD160="c5f38b1d201afcba7913f2b53fb7558add3d21f5" +CHECKSUM_SHA512="7af3569d028d5fa49106ece281f478cc2757cc5deca8c2512406796a7dbd6473928a1e730f28880467d19c6e59b31e55bf4f92f5cf2498a3a875ab32c5b2a081" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86 x86_gcc2" + +SOURCE_DIR="$portName-$portVersion" + +PROVIDES=" + cppunit = $portVersion compat >= 1.12 + cmd:cppunit_config = $portVersion compat >= 1.12 + cmd:DllPlugInTester = $portVersion compat >= 1.12 + lib:libcppunit = $portVersion compat >= 1.12 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:libtoolize + cmd:autoreconf + cmd:g++ + cmd:ld + cmd:make + cmd:sed + " + +PATCH() +{ + # change obsolete macro + sed -i -e 's#AM_CONFIG_HEADER(\(.*\))#AC_CONFIG_HEADERS([\1])#g' \ + configure.in +} + BUILD() { - cd cppunit-1.12.1 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + + # there seems to be a problem with dirname + sed -i -e 's#\/\* automatically generated \*\/#$ac_prefix_conf_INP#g' \ + configure + + runConfigure ./configure + make $jobArgs } INSTALL() { - cd cppunit-1.12.1 make install + + prepareInstalledDevelLib libcppunit + fixPkgconfig + + packageEntries devel $developDir } -LICENSE="GNU LGPL v2.1" +PROVIDES_devel=" + cppunit_devel = $portVersion + devel:libcppunit = $portVersion compat >= 1.12 + " +REQUIRES_devel=" + cppunit == $portVersion base + " From cf1fd87f3a4ee51a31692aa4a35cd3efd8cd7985 Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Mon, 7 Apr 2014 07:55:18 +0200 Subject: [PATCH 21/31] Updated glew (glewinfo working, visualinfo still missing) --- media-libs/glew/glew-1.10.0.recipe | 56 +- media-libs/glew/patches/glew-1.10.0.patch | 258 --------- media-libs/glew/patches/glew-1.10.0.patchset | 529 +++++++++++++++++++ 3 files changed, 566 insertions(+), 277 deletions(-) delete mode 100644 media-libs/glew/patches/glew-1.10.0.patch create mode 100644 media-libs/glew/patches/glew-1.10.0.patchset diff --git a/media-libs/glew/glew-1.10.0.recipe b/media-libs/glew/glew-1.10.0.recipe index 8de973375..bbdefc1cd 100644 --- a/media-libs/glew/glew-1.10.0.recipe +++ b/media-libs/glew/glew-1.10.0.recipe @@ -5,39 +5,40 @@ C/C++ extension loading library. GLEW provides efficient run-time mechanisms \ for determining which OpenGL extensions are supported on the target platform. " LICENSE="BSD (3-clause)" -COPYRIGHT="2007 The Kronos Group Inc. - 2002-2007 Milan Ikits - 2002-2007 Marcelo E. Magallon +COPYRIGHT="2007 The Kronos Group Inc. + 2002-2007 Milan Ikits + 2002-2007 Marcelo E. Magallon 2002 Lev Povalahev" -HOMEPAGE="http://glew.sourceforge.net" +HOMEPAGE="http://glew.sourceforge.net" SRC_URI="http://downloads.sourceforge.net/project/glew/glew/${portVersion}/glew-${portVersion}.tgz" -REVISION="1" +REVISION="2" +CHECKSUM_SIZE="567605" CHECKSUM_MD5="2f09e5e6cb1b9f3611bcac79bc9c2d5d" +CHECKSUM_RMD160="cd9772b37e4f48fe2e25a55303eb89363ce91467" +CHECKSUM_SHA512="0c998fda9fe01c9296a3453966c0449c9968f4f5f989065ca65f0da3830ae8d805699d0ee0362c3b18765420222ba18842b9db20986212afceb36c971ae1bdca" ARCHITECTURES="x86 ?x86_gcc2 ?x86_64" -PATCHES="glew-1.10.0.patch" +PATCHES="glew-1.10.0.patchset" PROVIDES=" glew$secondaryArchSuffix = $portVersion - lib:libGLEW + lib:libGLEW = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion lib:libGL " BUILD_REQUIRES=" devel:libGL - " + " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:aclocal - cmd:autoconf - cmd:automake cmd:gcc$secondaryArchSuffix + cmd:g++$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make " @@ -46,24 +47,41 @@ SOURCE_DIR="glew-${portVersion}" BUILD() { - make GLEW_DEST=$prefix BINDIR=$binDir LIBDIR=$libDir INCDIR=$includeDir + make $jobArgs GLEW_DEST=$prefix BINDIR=$binDir LIBDIR=$libDir INCDIR=$includeDir } INSTALL() { make install GLEW_DEST=$prefix BINDIR=$binDir LIBDIR=$libDir INCDIR=$includeDir + make install.bin GLEW_DEST=$prefix BINDIR=$binDir LIBDIR=$libDir INCDIR=$includeDir + prepareInstalledDevelLib libGLEW fixPkgconfig - packageEntries devel \ - $developDir + packageEntries devel $developDir + packageEntries util $binDir } # ----- devel package ------------------------------------- PROVIDES_devel=" - libGLEW${secondaryArchSuffix}_devel = $portVersion - " + glew${secondaryArchSuffix}_devel = $portVersion + devel:libGLEW = $portVersion + " REQUIRES_devel=" - libGLEW$secondaryArchSuffix == $portVersion base - " + glew$secondaryArchSuffix == $portVersion base + " + +# ----- util package -------------------------------------- +PROVIDES_util=" + glew${secondaryArchSuffix}_util = $portVersion + cmd:glewinfo +# cmd:visualinfo + " + +REQUIRES_util=" + glew$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix >= $haikuVersion + lib:libGL$secondaryArchSuffix + lib:libGLEW$secondaryArchSuffix + " diff --git a/media-libs/glew/patches/glew-1.10.0.patch b/media-libs/glew/patches/glew-1.10.0.patch deleted file mode 100644 index 9ec82005f..000000000 --- a/media-libs/glew/patches/glew-1.10.0.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff -Naur glew-1.10.0/config/Makefile.haiku glew-1.10.0-haiku/config/Makefile.haiku ---- glew-1.10.0/config/Makefile.haiku 1970-01-01 00:00:00.000000000 +0000 -+++ glew-1.10.0-haiku/config/Makefile.haiku 2013-10-30 22:18:49.161480704 +0000 -@@ -0,0 +1,29 @@ -+NAME = $(GLEW_NAME) -+CC = cc -+LD = cc -+ifneq (undefined, $(origin GLEW_MX)) -+ CFLAGS.EXTRA = -DGLEW_MX -+endif -+ -+LDFLAGS.GL = -lGL -+LDFLAGS.STATIC = -Wl,-Bstatic -+LDFLAGS.DYNAMIC = -Wl,-Bdynamic -+ -+NAME = GLEW -+WARN = -Wall -W -+POPT = -O2 -+ -+BIN.SUFFIX = -+ -+LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) -+LIB.DEVLNK = lib$(NAME).so -+LIB.SHARED = lib$(NAME).so.$(SO_VERSION) -+LIB.STATIC = lib$(NAME).a -+LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) -+ -+LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) -+LIB.DEVLNK.MX = lib$(NAME)mx.so -+LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) -+LIB.STATIC.MX = lib$(NAME)mx.a -+LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX) -+ -diff -Naur glew-1.10.0/src/glew.c glew-1.10.0-haiku/src/glew.c ---- glew-1.10.0/src/glew.c 2013-07-22 14:11:22.008912896 +0000 -+++ glew-1.10.0-haiku/src/glew.c 2013-10-30 23:18:58.931135488 +0000 -@@ -33,7 +33,7 @@ - - #if defined(_WIN32) - # include --#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) -+#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) - # include - #endif - -@@ -66,7 +66,7 @@ - # define GLXEW_CONTEXT_ARG_DEF_LIST void - #endif /* GLEW_MX */ - --#if defined(__sgi) || defined (__sun) || defined(GLEW_APPLE_GLX) -+#if defined(__sgi) || defined (__sun) || defined(GLEW_APPLE_GLX) || defined(__HAIKU__) - #include - #include - #include -@@ -162,7 +162,7 @@ - # define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name) - #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) - # define glewGetProcAddress(name) NSGLGetProcAddress(name) --#elif defined(__sgi) || defined(__sun) -+#elif defined(__sgi) || defined(__sun) || defined(__HAIKU__) - # define glewGetProcAddress(name) dlGetProcAddress(name) - #elif defined(__ANDROID__) - # define glewGetProcAddress(name) NULL /* TODO */ -@@ -12324,7 +12324,7 @@ - return GLEW_OK; - } - --#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) -+#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) - - PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay = NULL; - -@@ -13432,7 +13432,7 @@ - return GLEW_OK; - } - --#endif /* !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */ -+#endif /* !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */ - - /* ------------------------------------------------------------------------ */ - -@@ -13472,7 +13472,7 @@ - - #if defined(_WIN32) - extern GLenum GLEWAPIENTRY wglewContextInit (void); --#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) -+#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) - extern GLenum GLEWAPIENTRY glxewContextInit (void); - #endif /* _WIN32 */ - -@@ -13483,7 +13483,7 @@ - if ( r != 0 ) return r; - #if defined(_WIN32) - return wglewContextInit(); --#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */ -+#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */ - return glxewContextInit(); - #else - return r; -@@ -17616,7 +17616,7 @@ - return ret; - } - --#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) -+#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) - - #if defined(GLEW_MX) - GLboolean glxewContextIsSupported (const GLXEWContext* ctx, const char* name) -diff -Naur glew-1.10.0/src/glewinfo.c glew-1.10.0-haiku/src/glewinfo.c ---- glew-1.10.0/src/glewinfo.c 2013-07-22 14:11:22.009699328 +0000 -+++ glew-1.10.0-haiku/src/glewinfo.c 2013-10-30 23:39:14.891551744 +0000 -@@ -35,7 +35,7 @@ - #include - #if defined(_WIN32) - #include --#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) -+#elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) - #include - #endif - -@@ -51,7 +51,7 @@ - #ifdef _WIN32 - WGLEWContext _wglewctx; - #define wglewGetContext() (&_wglewctx) --#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) -+#elif !defined(__APPLE__)&& !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) - GLXEWContext _glxewctx; - #define glxewGetContext() (&_glxewctx) - #endif -@@ -59,7 +59,7 @@ - - #if defined(_WIN32) - GLboolean glewCreateContext (int* pixelformat); --#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) -+#elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) - GLboolean glewCreateContext (const char* display, int* visual); - #else - GLboolean glewCreateContext (); -@@ -10613,6 +10613,22 @@ - - /* ------------------------------------------------------------------------ */ - -+#elif defined(__HAIKU__) -+ -+GLboolean glewCreateContext () -+{ -+ // TODO: Haiku: We need to call C++ code here :-/ -+ return GL_FALSE; -+} -+ -+void glewDestroyContext () -+{ -+ // TODO: Haiku: We need to call C++ code here :-/ -+} -+ -+ -+/* ------------------------------------------------------------------------ */ -+ - #else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */ - - Display* dpy = NULL; -diff -Naur glew-1.10.0/src/visualinfo.c glew-1.10.0-haiku/src/visualinfo.c ---- glew-1.10.0/src/visualinfo.c 2013-07-22 14:11:22.007340032 +0000 -+++ glew-1.10.0-haiku/src/visualinfo.c 2013-10-30 21:54:43.389808128 +0000 -@@ -37,7 +37,7 @@ - #include - #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) - #include --#else -+#elif !defined(__HAIKU__) - #include - #endif - -@@ -47,7 +47,7 @@ - # ifdef _WIN32 - WGLEWContext _wglewctx; - # define wglewGetContext() (&_wglewctx) --# elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) -+# elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) - GLXEWContext _glxewctx; - # define glxewGetContext() (&_glxewctx) - # endif -@@ -61,7 +61,7 @@ - HGLRC rc; - #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) - AGLContext ctx, octx; --#else -+#elif !defined(__HAIKU__) - Display* dpy; - XVisualInfo* vi; - GLXContext ctx; -@@ -129,7 +129,7 @@ - err = glewContextInit(glewGetContext()); - # ifdef _WIN32 - err = err || wglewContextInit(wglewGetContext()); --# elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) -+# elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) - err = err || glxewContextInit(glxewGetContext()); - # endif - #else -@@ -182,6 +182,8 @@ - } - #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) - -+#elif defined(__HAIKU__) -+ - #else - /* GLX extensions */ - fprintf(file, "GLX extensions (GLX_): \n"); -@@ -598,6 +600,16 @@ - */ - } - -+/* ---------------------------------------------------------------------- */ -+ -+#elif defined(__HAIKU__) -+ -+void -+VisualInfo (GLContext* ctx) -+{ -+ // TODO -+} -+ - #else /* GLX */ - - void -@@ -1074,6 +1086,31 @@ - - /* ------------------------------------------------------------------------ */ - -+#elif defined(__HAIKU__) -+ -+void -+InitContext (GLContext* ctx) -+{ -+ // TODO -+} -+ -+ -+GLboolean -+CreateContext (GLContext* ctx) -+{ -+ // TODO -+ return GL_FALSE; -+} -+ -+ -+void -+DestroyContext (GLContext* ctx) -+{ -+ // TODO -+} -+ -+/* ------------------------------------------------------------------------ */ -+ - #else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */ - - void InitContext (GLContext* ctx) diff --git a/media-libs/glew/patches/glew-1.10.0.patchset b/media-libs/glew/patches/glew-1.10.0.patchset new file mode 100644 index 000000000..a5ead52ae --- /dev/null +++ b/media-libs/glew/patches/glew-1.10.0.patchset @@ -0,0 +1,529 @@ +From 00fdc98132634a72cf5b3f6b2f1fd3088374c5d8 Mon Sep 17 00:00:00 2001 +From: Kacper Kasper +Date: Mon, 7 Apr 2014 07:04:04 +0200 +Subject: Haiku support + + +diff --git a/Makefile b/Makefile +index e6f08a7..1e57596 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,24 +4,24 @@ + ## Copyright (C) 2002-2008, Marcelo E. Magallon + ## Copyright (C) 2002, Lev Povalahev + ## All rights reserved. +-## +-## Redistribution and use in source and binary forms, with or without ++## ++## 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, ++## ++## * 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 ++## * 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. +-## * The name of the author may be used to endorse or promote products ++## * The name of the author 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 ++## 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 ++## 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) +@@ -179,12 +179,15 @@ glewmx.pc: glew.pc.in + + # GLEW utility programs + +-BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL) ++BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL) -lbe -lstdc++ + + GLEWINFO.BIN := glewinfo$(BIN.SUFFIX) + GLEWINFO.BIN.SRC := src/glewinfo.c ++GLEWINFO.BIN.HAIKU := src/glewinfo_haiku.cpp + GLEWINFO.BIN.OBJ := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(GLEWINFO.BIN.SRC))) + GLEWINFO.BIN.OBJ := $(GLEWINFO.BIN.OBJ:.c=.o) ++GLEWINFO.BIN.HAIKU_OBJ := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(GLEWINFO.BIN.HAIKU))) ++GLEWINFO.BIN.HAIKU_OBJ := $(GLEWINFO.BIN.HAIKU_OBJ:.cpp=.o) + + VISUALINFO.BIN := visualinfo$(BIN.SUFFIX) + VISUALINFO.BIN.SRC := src/visualinfo.c +@@ -196,14 +199,14 @@ VISUALINFO.BIN.OBJ := $(VISUALINFO.BIN.OBJ:.c=.o) + ifneq ($(filter nacl%,$(SYSTEM)),) + glew.bin: glew.lib bin + else +-glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) ++glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) + endif + + bin: + mkdir bin + +-bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED) +- $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) ++bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) $(GLEWINFO.BIN.HAIKU_OBJ) lib/$(LIB.SHARED) ++ $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(GLEWINFO.BIN.HAIKU_OBJ) $(BIN.LIBS) + ifneq ($(STRIP),) + $(STRIP) -x $@ + endif +@@ -218,6 +221,10 @@ $(GLEWINFO.BIN.OBJ): $(GLEWINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h in + @mkdir -p $(dir $@) + $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< + ++$(GLEWINFO.BIN.HAIKU_OBJ): $(GLEWINFO.BIN.HAIKU) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h ++ @mkdir -p $(dir $@) ++ $(CXX) -DGLEW_NO_GLU $(CXXFLAGS) $(CXXFLAGS.SO) -o $@ -c $< ++ + $(VISUALINFO.BIN.OBJ): $(VISUALINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h + @mkdir -p $(dir $@) + $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< +@@ -328,7 +335,7 @@ dist-win32: + cp -a bin $(DIST_DIR) + cp -a lib $(DIST_DIR) + $(RM) -f $(DIST_DIR)/bin/*/*/*.pdb $(DIST_DIR)/bin/*/*/*.exp +- $(RM) -f $(DIST_DIR)/bin/*/*/glewinfo-*.exe $(DIST_DIR)/bin/*/*/visualinfo-*.exe ++ $(RM) -f $(DIST_DIR)/bin/*/*/glewinfo-*.exe $(DIST_DIR)/bin/*/*/visualinfo-*.exe + $(RM) -f $(DIST_DIR)/lib/*/*/*.pdb $(DIST_DIR)/lib/*/*/*.exp + unix2dos $(DIST_DIR)/include/GL/*.h + unix2dos $(DIST_DIR)/doc/*.txt +diff --git a/config/Makefile.haiku b/config/Makefile.haiku +new file mode 100644 +index 0000000..57bf3d6 +--- /dev/null ++++ b/config/Makefile.haiku +@@ -0,0 +1,30 @@ ++NAME = $(GLEW_NAME) ++CC = cc ++CXX = g++ ++LD = cc ++ifneq (undefined, $(origin GLEW_MX)) ++ CFLAGS.EXTRA = -DGLEW_MX ++endif ++ ++LDFLAGS.GL = -lGL ++LDFLAGS.STATIC = -Wl,-Bstatic ++LDFLAGS.DYNAMIC = -Wl,-Bdynamic ++ ++NAME = GLEW ++WARN = -Wall -W ++POPT = -O2 ++ ++BIN.SUFFIX = ++ ++LIB.SONAME = lib$(NAME).so.$(SO_MAJOR) ++LIB.DEVLNK = lib$(NAME).so ++LIB.SHARED = lib$(NAME).so.$(SO_VERSION) ++LIB.STATIC = lib$(NAME).a ++LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) ++ ++LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR) ++LIB.DEVLNK.MX = lib$(NAME)mx.so ++LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION) ++LIB.STATIC.MX = lib$(NAME)mx.a ++LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX) ++ +diff --git a/src/glew.c b/src/glew.c +index d075b52..daff07d 100644 +--- a/src/glew.c ++++ b/src/glew.c +@@ -33,7 +33,7 @@ + + #if defined(_WIN32) + # include +-#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) ++#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) + # include + #endif + +@@ -66,7 +66,7 @@ + # define GLXEW_CONTEXT_ARG_DEF_LIST void + #endif /* GLEW_MX */ + +-#if defined(__sgi) || defined (__sun) || defined(GLEW_APPLE_GLX) ++#if defined(__sgi) || defined (__sun) || defined(GLEW_APPLE_GLX) || defined(__HAIKU__) + #include + #include + #include +@@ -162,7 +162,7 @@ void* NSGLGetProcAddress (const GLubyte *name) + # define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name) + #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) + # define glewGetProcAddress(name) NSGLGetProcAddress(name) +-#elif defined(__sgi) || defined(__sun) ++#elif defined(__sgi) || defined(__sun) || defined(__HAIKU__) + # define glewGetProcAddress(name) dlGetProcAddress(name) + #elif defined(__ANDROID__) + # define glewGetProcAddress(name) NULL /* TODO */ +@@ -12324,7 +12324,7 @@ GLenum GLEWAPIENTRY wglewContextInit (WGLEW_CONTEXT_ARG_DEF_LIST) + return GLEW_OK; + } + +-#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) ++#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) + + PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay = NULL; + +@@ -13432,7 +13432,7 @@ GLenum glxewContextInit (GLXEW_CONTEXT_ARG_DEF_LIST) + return GLEW_OK; + } + +-#endif /* !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */ ++#endif /* !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) */ + + /* ------------------------------------------------------------------------ */ + +@@ -13472,7 +13472,7 @@ GLboolean glewExperimental = GL_FALSE; + + #if defined(_WIN32) + extern GLenum GLEWAPIENTRY wglewContextInit (void); +-#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) ++#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) + extern GLenum GLEWAPIENTRY glxewContextInit (void); + #endif /* _WIN32 */ + +@@ -13483,7 +13483,7 @@ GLenum GLEWAPIENTRY glewInit (void) + if ( r != 0 ) return r; + #if defined(_WIN32) + return wglewContextInit(); +-#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */ ++#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */ + return glxewContextInit(); + #else + return r; +@@ -17616,7 +17616,7 @@ GLboolean GLEWAPIENTRY wglewIsSupported (const char* name) + return ret; + } + +-#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) ++#elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) + + #if defined(GLEW_MX) + GLboolean glxewContextIsSupported (const GLXEWContext* ctx, const char* name) +diff --git a/src/glewinfo.c b/src/glewinfo.c +index ad44f72..ca065d1 100644 +--- a/src/glewinfo.c ++++ b/src/glewinfo.c +@@ -4,24 +4,24 @@ + ** Copyright (C) 2002-2008, Marcelo E. Magallon + ** Copyright (C) 2002, Lev Povalahev + ** All rights reserved. +-** +-** Redistribution and use in source and binary forms, with or without ++** ++** 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, ++** ++** * 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 ++** * 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. +-** * The name of the author may be used to endorse or promote products ++** * The name of the author 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 ++** 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 ++** 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) +@@ -35,7 +35,7 @@ + #include + #if defined(_WIN32) + #include +-#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) ++#elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) + #include + #endif + +@@ -51,7 +51,7 @@ GLEWContext _glewctx; + #ifdef _WIN32 + WGLEWContext _wglewctx; + #define wglewGetContext() (&_wglewctx) +-#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) ++#elif !defined(__APPLE__)&& !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) + GLXEWContext _glxewctx; + #define glxewGetContext() (&_glxewctx) + #endif +@@ -59,7 +59,7 @@ GLXEWContext _glxewctx; + + #if defined(_WIN32) + GLboolean glewCreateContext (int* pixelformat); +-#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) ++#elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) + GLboolean glewCreateContext (const char* display, int* visual); + #else + GLboolean glewCreateContext (); +@@ -10468,10 +10468,10 @@ int main (void) + #if defined(_WIN32) + fprintf(f, "Reporting capabilities of pixelformat %d\n", visual); + #elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) +- fprintf(f, "Reporting capabilities of display %s, visual 0x%x\n", ++ fprintf(f, "Reporting capabilities of display %s, visual 0x%x\n", + display == NULL ? getenv("DISPLAY") : display, visual); + #endif +- fprintf(f, "Running on a %s from %s\n", ++ fprintf(f, "Running on a %s from %s\n", + glGetString(GL_RENDERER), glGetString(GL_VENDOR)); + fprintf(f, "OpenGL version %s is supported\n", glGetString(GL_VERSION)); + glewInfo(); +@@ -10540,7 +10540,7 @@ GLboolean glewCreateContext (int* pixelformat) + wc.lpszClassName = "GLEW"; + if (0 == RegisterClass(&wc)) return GL_TRUE; + /* create window */ +- wnd = CreateWindow("GLEW", "GLEW", 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, ++ wnd = CreateWindow("GLEW", "GLEW", 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, NULL, NULL, GetModuleHandle(NULL), NULL); + if (NULL == wnd) return GL_TRUE; + /* get the device context */ +@@ -10613,6 +10613,13 @@ void glewDestroyContext () + + /* ------------------------------------------------------------------------ */ + ++#elif defined(__HAIKU__) ++ ++extern GLboolean glewCreateContext (); ++extern void glewDestroyContext (); ++ ++/* ------------------------------------------------------------------------ */ ++ + #else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */ + + Display* dpy = NULL; +@@ -10658,8 +10665,8 @@ GLboolean glewCreateContext (const char* display, int* visual) + cmap = XCreateColormap(dpy, RootWindow(dpy, vi->screen), vi->visual, AllocNone); + swa.border_pixel = 0; + swa.colormap = cmap; +- wnd = XCreateWindow(dpy, RootWindow(dpy, vi->screen), +- 0, 0, 1, 1, 0, vi->depth, InputOutput, vi->visual, ++ wnd = XCreateWindow(dpy, RootWindow(dpy, vi->screen), ++ 0, 0, 1, 1, 0, vi->depth, InputOutput, vi->visual, + CWBorderPixel | CWColormap, &swa); + /* make context current */ + if (!glXMakeCurrent(dpy, wnd, ctx)) return GL_TRUE; +diff --git a/src/glewinfo_haiku.cpp b/src/glewinfo_haiku.cpp +new file mode 100644 +index 0000000..3d32d00 +--- /dev/null ++++ b/src/glewinfo_haiku.cpp +@@ -0,0 +1,93 @@ ++/* ++ * glewinfo Haiku glue code ++ * Copyright 2013 Kacper Kasper ++ * All rights reserved. Distributed under the terms of the MIT license. ++ */ ++ ++#include ++#include ++#include ++ ++class GLEWInfoView : public BGLView { ++public: ++ GLEWInfoView(BRect frame, uint32 type); ++ virtual void AttachedToWindow(void); ++ ++ void ContextInit() { LockGL(); } ++ void ContextDestroy() { UnlockGL(); } ++}; ++ ++GLEWInfoView::GLEWInfoView(BRect frame, uint32 type) ++ : BGLView(frame, "GLEWInfoView", B_FOLLOW_ALL_SIDES, 0, type) ++{ ++} ++ ++void GLEWInfoView::AttachedToWindow(void) ++{ ++ LockGL(); ++ BGLView::AttachedToWindow(); ++ UnlockGL(); ++} ++ ++class GLEWInfoWindow : public BWindow { ++public: ++ GLEWInfoWindow(BRect frame, uint32 type); ++ virtual bool QuitRequested(); ++ ++private: ++ GLEWInfoView *view; ++}; ++ ++GLEWInfoWindow::GLEWInfoWindow(BRect frame, uint32 type) ++ : BWindow(frame, "GLEWInfoWindow", B_TITLED_WINDOW, B_QUIT_ON_WINDOW_CLOSE) ++{ ++ AddChild(view = new GLEWInfoView(Bounds(), type)); ++ view->ContextInit(); ++} ++ ++bool GLEWInfoWindow::QuitRequested() ++{ ++ view->ContextDestroy(); ++ ++ view->RemoveSelf(); ++ ++ delete view; ++ ++ return true; ++} ++ ++class GLEWInfoApp : public BApplication ++{ ++public: ++ GLEWInfoApp(); ++ ~GLEWInfoApp(); ++ ++private: ++ GLEWInfoWindow *window; ++}; ++ ++GLEWInfoApp::GLEWInfoApp() ++ : BApplication("application/x-vnd.glew-GLEWInfo") ++{ ++ BRect rect = BRect(0, 0, 1, 1); ++ window = new GLEWInfoWindow(rect, BGL_RGB | BGL_DOUBLE); ++} ++ ++GLEWInfoApp::~GLEWInfoApp() ++{ ++ window->Quit(); ++} ++ ++GLEWInfoApp *app; ++ ++extern "C" GLboolean glewCreateContext () ++{ ++ app = new GLEWInfoApp(); ++ ++ return GL_FALSE; ++} ++ ++extern "C" void glewDestroyContext () ++{ ++ delete app; ++} +diff --git a/src/visualinfo.c b/src/visualinfo.c +index b8bb59e..742fdd6 100644 +--- a/src/visualinfo.c ++++ b/src/visualinfo.c +@@ -37,7 +37,7 @@ + #include + #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) + #include +-#else ++#elif !defined(__HAIKU__) + #include + #endif + +@@ -47,7 +47,7 @@ GLEWContext _glewctx; + # ifdef _WIN32 + WGLEWContext _wglewctx; + # define wglewGetContext() (&_wglewctx) +-# elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) ++# elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) + GLXEWContext _glxewctx; + # define glxewGetContext() (&_glxewctx) + # endif +@@ -61,7 +61,7 @@ typedef struct GLContextStruct + HGLRC rc; + #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) + AGLContext ctx, octx; +-#else ++#elif !defined(__HAIKU__) + Display* dpy; + XVisualInfo* vi; + GLXContext ctx; +@@ -129,7 +129,7 @@ main (int argc, char** argv) + err = glewContextInit(glewGetContext()); + # ifdef _WIN32 + err = err || wglewContextInit(wglewGetContext()); +-# elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) ++# elif !defined(__APPLE__) && !defined(__HAIKU__) || defined(GLEW_APPLE_GLX) + err = err || glxewContextInit(glxewGetContext()); + # endif + #else +@@ -182,6 +182,8 @@ main (int argc, char** argv) + } + #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) + ++#elif defined(__HAIKU__) ++ + #else + /* GLX extensions */ + fprintf(file, "GLX extensions (GLX_): \n"); +@@ -598,6 +600,16 @@ VisualInfo (GLContext* ctx) + */ + } + ++/* ---------------------------------------------------------------------- */ ++ ++#elif defined(__HAIKU__) ++ ++void ++VisualInfo (GLContext* ctx) ++{ ++ // TODO ++} ++ + #else /* GLX */ + + void +@@ -1074,6 +1086,31 @@ void DestroyContext (GLContext* ctx) + + /* ------------------------------------------------------------------------ */ + ++#elif defined(__HAIKU__) ++ ++void ++InitContext (GLContext* ctx) ++{ ++ // TODO ++} ++ ++ ++GLboolean ++CreateContext (GLContext* ctx) ++{ ++ // TODO ++ return GL_FALSE; ++} ++ ++ ++void ++DestroyContext (GLContext* ctx) ++{ ++ // TODO ++} ++ ++/* ------------------------------------------------------------------------ */ ++ + #else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */ + + void InitContext (GLContext* ctx) +-- +1.8.3.4 + From 1ba1ff42cdeb553932f2483c7c48cb56e73b5da8 Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Mon, 7 Apr 2014 16:55:05 +0200 Subject: [PATCH 22/31] Removed redundant changes from glew patchset --- media-libs/glew/patches/glew-1.10.0.patchset | 133 +------------------ 1 file changed, 5 insertions(+), 128 deletions(-) diff --git a/media-libs/glew/patches/glew-1.10.0.patchset b/media-libs/glew/patches/glew-1.10.0.patchset index a5ead52ae..54c2fa3ef 100644 --- a/media-libs/glew/patches/glew-1.10.0.patchset +++ b/media-libs/glew/patches/glew-1.10.0.patchset @@ -1,50 +1,13 @@ -From 00fdc98132634a72cf5b3f6b2f1fd3088374c5d8 Mon Sep 17 00:00:00 2001 +From 9e62b8084f970f94b9df86f0764284b042bf822b Mon Sep 17 00:00:00 2001 From: Kacper Kasper -Date: Mon, 7 Apr 2014 07:04:04 +0200 +Date: Mon, 7 Apr 2014 16:48:59 +0200 Subject: Haiku support diff --git a/Makefile b/Makefile -index e6f08a7..1e57596 100644 +index e6f08a7..24b9d22 100644 --- a/Makefile +++ b/Makefile -@@ -4,24 +4,24 @@ - ## Copyright (C) 2002-2008, Marcelo E. Magallon - ## Copyright (C) 2002, Lev Povalahev - ## All rights reserved. --## --## Redistribution and use in source and binary forms, with or without -+## -+## 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, -+## -+## * 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 -+## * 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. --## * The name of the author may be used to endorse or promote products -+## * The name of the author 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 -+## 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 -+## 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) @@ -179,12 +179,15 @@ glewmx.pc: glew.pc.in # GLEW utility programs @@ -62,14 +25,7 @@ index e6f08a7..1e57596 100644 VISUALINFO.BIN := visualinfo$(BIN.SUFFIX) VISUALINFO.BIN.SRC := src/visualinfo.c -@@ -196,14 +199,14 @@ VISUALINFO.BIN.OBJ := $(VISUALINFO.BIN.OBJ:.c=.o) - ifneq ($(filter nacl%,$(SYSTEM)),) - glew.bin: glew.lib bin - else --glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) -+glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) - endif - +@@ -202,8 +205,8 @@ endif bin: mkdir bin @@ -91,15 +47,6 @@ index e6f08a7..1e57596 100644 $(VISUALINFO.BIN.OBJ): $(VISUALINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h @mkdir -p $(dir $@) $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< -@@ -328,7 +335,7 @@ dist-win32: - cp -a bin $(DIST_DIR) - cp -a lib $(DIST_DIR) - $(RM) -f $(DIST_DIR)/bin/*/*/*.pdb $(DIST_DIR)/bin/*/*/*.exp -- $(RM) -f $(DIST_DIR)/bin/*/*/glewinfo-*.exe $(DIST_DIR)/bin/*/*/visualinfo-*.exe -+ $(RM) -f $(DIST_DIR)/bin/*/*/glewinfo-*.exe $(DIST_DIR)/bin/*/*/visualinfo-*.exe - $(RM) -f $(DIST_DIR)/lib/*/*/*.pdb $(DIST_DIR)/lib/*/*/*.exp - unix2dos $(DIST_DIR)/include/GL/*.h - unix2dos $(DIST_DIR)/doc/*.txt diff --git a/config/Makefile.haiku b/config/Makefile.haiku new file mode 100644 index 0000000..57bf3d6 @@ -213,46 +160,9 @@ index d075b52..daff07d 100644 #if defined(GLEW_MX) GLboolean glxewContextIsSupported (const GLXEWContext* ctx, const char* name) diff --git a/src/glewinfo.c b/src/glewinfo.c -index ad44f72..ca065d1 100644 +index ad44f72..d65d702 100644 --- a/src/glewinfo.c +++ b/src/glewinfo.c -@@ -4,24 +4,24 @@ - ** Copyright (C) 2002-2008, Marcelo E. Magallon - ** Copyright (C) 2002, Lev Povalahev - ** All rights reserved. --** --** Redistribution and use in source and binary forms, with or without -+** -+** 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, -+** -+** * 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 -+** * 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. --** * The name of the author may be used to endorse or promote products -+** * The name of the author 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 -+** 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 -+** 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) @@ -35,7 +35,7 @@ #include #if defined(_WIN32) @@ -280,28 +190,6 @@ index ad44f72..ca065d1 100644 GLboolean glewCreateContext (const char* display, int* visual); #else GLboolean glewCreateContext (); -@@ -10468,10 +10468,10 @@ int main (void) - #if defined(_WIN32) - fprintf(f, "Reporting capabilities of pixelformat %d\n", visual); - #elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) -- fprintf(f, "Reporting capabilities of display %s, visual 0x%x\n", -+ fprintf(f, "Reporting capabilities of display %s, visual 0x%x\n", - display == NULL ? getenv("DISPLAY") : display, visual); - #endif -- fprintf(f, "Running on a %s from %s\n", -+ fprintf(f, "Running on a %s from %s\n", - glGetString(GL_RENDERER), glGetString(GL_VENDOR)); - fprintf(f, "OpenGL version %s is supported\n", glGetString(GL_VERSION)); - glewInfo(); -@@ -10540,7 +10540,7 @@ GLboolean glewCreateContext (int* pixelformat) - wc.lpszClassName = "GLEW"; - if (0 == RegisterClass(&wc)) return GL_TRUE; - /* create window */ -- wnd = CreateWindow("GLEW", "GLEW", 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, -+ wnd = CreateWindow("GLEW", "GLEW", 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, NULL, NULL, GetModuleHandle(NULL), NULL); - if (NULL == wnd) return GL_TRUE; - /* get the device context */ @@ -10613,6 +10613,13 @@ void glewDestroyContext () /* ------------------------------------------------------------------------ */ @@ -316,17 +204,6 @@ index ad44f72..ca065d1 100644 #else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */ Display* dpy = NULL; -@@ -10658,8 +10665,8 @@ GLboolean glewCreateContext (const char* display, int* visual) - cmap = XCreateColormap(dpy, RootWindow(dpy, vi->screen), vi->visual, AllocNone); - swa.border_pixel = 0; - swa.colormap = cmap; -- wnd = XCreateWindow(dpy, RootWindow(dpy, vi->screen), -- 0, 0, 1, 1, 0, vi->depth, InputOutput, vi->visual, -+ wnd = XCreateWindow(dpy, RootWindow(dpy, vi->screen), -+ 0, 0, 1, 1, 0, vi->depth, InputOutput, vi->visual, - CWBorderPixel | CWColormap, &swa); - /* make context current */ - if (!glXMakeCurrent(dpy, wnd, ctx)) return GL_TRUE; diff --git a/src/glewinfo_haiku.cpp b/src/glewinfo_haiku.cpp new file mode 100644 index 0000000..3d32d00 From 14ecc2c15dd1d7fa8e748383e17e80e986b1a202 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 8 Apr 2014 08:53:11 +0000 Subject: [PATCH 23/31] openssl: recipe for version 1.0.1g --- dev-libs/openssl/openssl-1.0.1g.recipe | 122 +++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 dev-libs/openssl/openssl-1.0.1g.recipe diff --git a/dev-libs/openssl/openssl-1.0.1g.recipe b/dev-libs/openssl/openssl-1.0.1g.recipe new file mode 100644 index 000000000..3173cdbc3 --- /dev/null +++ b/dev-libs/openssl/openssl-1.0.1g.recipe @@ -0,0 +1,122 @@ +SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)" +DESCRIPTION=" +The OpenSSL Project is a collaborative effort to develop a robust, \ +commercial-grade, full-featured, and Open Source toolkit implementing the \ +Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \ +protocols as well as a full-strength general purpose cryptography library. The \ +project is managed by a worldwide community of volunteers that use the \ +Internet to communicate, plan, and develop the OpenSSL toolkit and its related \ +documentation. +OpenSSL is based on the excellent SSLeay library developed by Eric A. Young \ +and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style \ +licence, which basically means that you are free to get and use it for \ +commercial and non-commercial purposes subject to some simple license \ +conditions. +" +HOMEPAGE="http://www.openssl.org/" +SRC_URI="http://www.openssl.org/source/openssl-1.0.1g.tar.gz" +CHECKSUM_SIZE="4509047" +CHECKSUM_RMD160="cd2eb879646a2b91b2f67dfaf99eb9668ba5d7ea" +CHECKSUM_SHA512="66ebbad3c8ad98a07b486d39d0c3ae62b00133f8f2877cf8b97c461e7c7f40b29cf9c3cae82cf73a92dcf1daa63d33aa76c910fbcbe60158589fc7cb48f41e6d" +LICENSE="OpenSSL" +COPYRIGHT=" + 1995-1998 Eric Young + 1998-2013 The OpenSSL Project. + " +REVISION="1" +ARCHITECTURES="!x86_gcc2 !x86 !x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" + +PATCHES="openssl-1.0.1e.patchset" + +PROVIDES=" + openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 + lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0 + lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:c_rehash = $portVersion compat >= 1 + cmd:openssl = $portVersion compat >= 1 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix >= 1.2.3 + " +if [ -n "$secondaryArchSuffix" ]; then + REQUIRES="$REQUIRES + openssl == $portVersion base + " +fi + +BUILD_REQUIRES=" + devel:libz$secondaryArchSuffix >= 1.2.3 + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc${secondaryArchSuffix} + cmd:ld${secondaryArchSuffix} + cmd:make + cmd:perl >= 5 + cmd:sed + " + +PATCH() +{ + # fix hard-coded perl path + sed -i 's,/usr/bin/perl,/bin/env perl,g' apps/tsget +} + +BUILD() +{ + PERL="/bin/env perl" \ + ./config --prefix=$prefix --libdir=$relativeLibDir \ + --openssldir=$dataRootDir/ssl \ + zlib shared + make + # multi-job builds don't work correctly +} + +INSTALL() +{ + make MANDIR=$manDir install + + # move include dir to correct location + mkdir -p $(dirname $includeDir) + mv $prefix/include $includeDir + + # prepare develop/lib + prepareInstalledDevelLibs libcrypto libssl + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 + + # Remove stuff we don't need in the secondary architecture base package, + # since we make it depend on the primary package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $prefix/bin + rm -rf $dataRootDir/ssl + rm -rf $documentationDir + fi +} + +TEST() +{ + make test +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + openssl${secondaryArchSuffix}_devel = $portVersion + devel:libcrypto${secondaryArchSuffix} = $portVersion compat >= 1.0.1 + devel:libssl${secondaryArchSuffix} = $portVersion compat >= 1.0.1 + " +REQUIRES_devel=" + openssl${secondaryArchSuffix} == $portVersion base + " From 98483d98d775dc77237d8c42ebfcb89ff57e61cf Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 8 Apr 2014 08:54:34 +0000 Subject: [PATCH 24/31] openssl: delete recipe for version 1.0.1e --- dev-libs/openssl/openssl-1.0.1e.recipe | 123 ------------------------- 1 file changed, 123 deletions(-) delete mode 100644 dev-libs/openssl/openssl-1.0.1e.recipe diff --git a/dev-libs/openssl/openssl-1.0.1e.recipe b/dev-libs/openssl/openssl-1.0.1e.recipe deleted file mode 100644 index 170b1426a..000000000 --- a/dev-libs/openssl/openssl-1.0.1e.recipe +++ /dev/null @@ -1,123 +0,0 @@ -SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)" -DESCRIPTION=" -The OpenSSL Project is a collaborative effort to develop a robust, \ -commercial-grade, full-featured, and Open Source toolkit implementing the \ -Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \ -protocols as well as a full-strength general purpose cryptography library. The \ -project is managed by a worldwide community of volunteers that use the \ -Internet to communicate, plan, and develop the OpenSSL toolkit and its related \ -documentation. -OpenSSL is based on the excellent SSLeay library developed by Eric A. Young \ -and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style \ -licence, which basically means that you are free to get and use it for \ -commercial and non-commercial purposes subject to some simple license \ -conditions. -" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.1e.tar.gz" -CHECKSUM_SIZE="4459777" -CHECKSUM_MD5="66bf6f10f060d561929de96f9dfe5b8c" -CHECKSUM_RMD160="380827c16f18bed4f2eb3d54a387c7c089b2b299" -CHECKSUM_SHA512="c76857e439431b2ef6f2aa123997e53f82b9c3c964d4d765d7cc6c0c20b37a21adf578f9b759b2b65ae3925454c432a01b7de0cd320ece7181dc292e00d3244e" -LICENSE="OpenSSL" -COPYRIGHT=" - 1995-1998 Eric Young - 1998-2013 The OpenSSL Project. - " -REVISION="6" -ARCHITECTURES="?x86_gcc2 ?x86 !x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" - -PATCHES="openssl-1.0.1e.patchset" - -PROVIDES=" - openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 - lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0 - lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 - " -if [ -z "$secondaryArchSuffix" ]; then - PROVIDES="$PROVIDES - cmd:c_rehash = $portVersion compat >= 1 - cmd:openssl = $portVersion compat >= 1 - " -fi - -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - lib:libz$secondaryArchSuffix >= 1.2.3 - " -if [ -n "$secondaryArchSuffix" ]; then - REQUIRES="$REQUIRES - openssl == $portVersion base - " -fi - -BUILD_REQUIRES=" - devel:libz$secondaryArchSuffix >= 1.2.3 - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} - cmd:make - cmd:perl >= 5 - cmd:sed - " - -PATCH() -{ - # fix hard-coded perl path - sed -i 's,/usr/bin/perl,/bin/env perl,g' apps/tsget -} - -BUILD() -{ - PERL="/bin/env perl" \ - ./config --prefix=$prefix --libdir=$relativeLibDir \ - --openssldir=$dataRootDir/ssl \ - zlib shared - make - # multi-job builds don't work correctly -} - -INSTALL() -{ - make MANDIR=$manDir install - - # move include dir to correct location - mkdir -p $(dirname $includeDir) - mv $prefix/include $includeDir - - # prepare develop/lib - prepareInstalledDevelLibs libcrypto libssl - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir \ - $manDir/man3 - - # Remove stuff we don't need in the secondary architecture base package, - # since we make it depend on the primary package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $prefix/bin - rm -rf $dataRootDir/ssl - rm -rf $documentationDir - fi -} - -TEST() -{ - make test -} - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - openssl${secondaryArchSuffix}_devel = $portVersion - devel:libcrypto${secondaryArchSuffix} = $portVersion compat >= 1.0.1 - devel:libssl${secondaryArchSuffix} = $portVersion compat >= 1.0.1 - " -REQUIRES_devel=" - openssl${secondaryArchSuffix} == $portVersion base - " From cd777182c825915c17ebe5e572b5cf3837e3f4b6 Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Wed, 9 Apr 2014 05:11:18 +0200 Subject: [PATCH 25/31] hunspell: turn bep into recipe --- app-text/hunspell/hunspell-1.3.2.recipe | 94 ++++++++++++++++++++----- 1 file changed, 77 insertions(+), 17 deletions(-) diff --git a/app-text/hunspell/hunspell-1.3.2.recipe b/app-text/hunspell/hunspell-1.3.2.recipe index a4e26881a..6fe75f18c 100644 --- a/app-text/hunspell/hunspell-1.3.2.recipe +++ b/app-text/hunspell/hunspell-1.3.2.recipe @@ -1,35 +1,95 @@ -DESCRIPTION="hunspell - spellchecker, forked from myspell" -HOMEPAGE="http://hunspell.sourceforge.net/" +SUMMARY="Spellchecker, forked from myspell" +DESCRIPTION=" + Hunspell is a spell checker and morphological analyzer library and program + designed for languages with rich morphology and complex word compounding or + character encoding. + " +HOMEPAGE="http://hunspell.sourceforge.net/" SRC_URI="http://downloads.sourceforge.net/hunspell/hunspell-1.3.2.tar.gz" +LICENSE=" + GNU GPL v2 + GNU LGPL v2.1 + MPL v1.1 + " +COPYRIGHT=" + 2007-2011 Hunspell developers et al. + 2002-2008 László Németh (Hunspell) + 2001-2002 Kevin Hendricks (MySpell) + " REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +CHECKSUM_SIZE="975917" CHECKSUM_MD5="3121aaf3e13e5d88dfff13fb4a5f1ab8" +CHECKSUM_RMD160="f193de180f9ac29cfb54824a45366ba57b27e5c4" +CHECKSUM_SHA512="fdc165af6fc7d66b858184e34851fb6d8022736af4133fe51535afcadd9c7fdb824c05c3d33b948fafcea165ccc23f5918adb7d81e5eeb5525c05abda0cbd43c" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + $portName = $portVersion + cmd:affixcompress = $portVersion + cmd:analyze = $portVersion + cmd:chmorph = $portVersion + cmd:hunspell = $portVersion + cmd:hunzip = $portVersion + cmd:hzip = $portVersion + cmd:ispellaff2myspell = $portVersion + cmd:makealias = $portVersion + cmd:munch = $portVersion + cmd:unmunch = $portVersion + cmd:wordforms = $portVersion + cmd:wordlist2hunspell = $portVersion + lib:libhunspell_1.3 = $portVersion compat >= 1.3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + " + +SOURCE_DIR="$portName-$portVersion" + BUILD() { - cd hunspell-1.3.2 libtoolize --force --copy --install aclocal -I m4 autoconf - automake + automake --add-missing touch po/t-hu.gmo touch po/t-it.gmo - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd hunspell-1.3.2 make install + + prepareInstalledDevelLibs libhunspell-1.3 libparsers + fixPkgconfig + + packageEntries devel $developDir } -LICENSE="GNU GPL v2 - GNU LGPL v2.1 - MPL v1.1" +TEST() +{ + make check +} -COPYRIGHT="2007-2011 Hunspell developers et al. - 2002-2008 László Németh (Hunspell) - 2001-2002 Kevin Hendricks (MySpell)" +PROVIDES_devel=" + hunspell_devel = $portVersion + devel:libhunspell_1.3 = $portVersion compat >= 1.3 + devel:libparsers = $portVersion compat >= 1.3 + " +REQUIRES_devel=" + hunspell == $portVersion base + " From 4086edfc772a5e87b1c28380e4227d396dbb685d Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Wed, 9 Apr 2014 06:45:04 +0200 Subject: [PATCH 26/31] cppunit: add missing lib in provides section --- dev-util/cppunit/cppunit-1.12.1.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-util/cppunit/cppunit-1.12.1.recipe b/dev-util/cppunit/cppunit-1.12.1.recipe index c463ac254..93b35cd17 100644 --- a/dev-util/cppunit/cppunit-1.12.1.recipe +++ b/dev-util/cppunit/cppunit-1.12.1.recipe @@ -28,6 +28,7 @@ PROVIDES=" cmd:cppunit_config = $portVersion compat >= 1.12 cmd:DllPlugInTester = $portVersion compat >= 1.12 lib:libcppunit = $portVersion compat >= 1.12 + lib:libcppunit_1.12 = $portVersion compat >= 1.12 " REQUIRES=" haiku >= $haikuVersion From d078fa5bebd1f76d58b5b744d54d1e5f3482d432 Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Wed, 9 Apr 2014 21:06:14 +0200 Subject: [PATCH 27/31] glew: add missing secondaryArchSuffix macros --- media-libs/glew/glew-1.10.0.recipe | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/media-libs/glew/glew-1.10.0.recipe b/media-libs/glew/glew-1.10.0.recipe index bbdefc1cd..662bc7538 100644 --- a/media-libs/glew/glew-1.10.0.recipe +++ b/media-libs/glew/glew-1.10.0.recipe @@ -5,37 +5,38 @@ C/C++ extension loading library. GLEW provides efficient run-time mechanisms \ for determining which OpenGL extensions are supported on the target platform. " LICENSE="BSD (3-clause)" -COPYRIGHT="2007 The Kronos Group Inc. +COPYRIGHT=" + 2007 The Kronos Group Inc. 2002-2007 Milan Ikits 2002-2007 Marcelo E. Magallon - 2002 Lev Povalahev" + 2002 Lev Povalahev + " HOMEPAGE="http://glew.sourceforge.net" SRC_URI="http://downloads.sourceforge.net/project/glew/glew/${portVersion}/glew-${portVersion}.tgz" -REVISION="2" +REVISION="3" CHECKSUM_SIZE="567605" CHECKSUM_MD5="2f09e5e6cb1b9f3611bcac79bc9c2d5d" CHECKSUM_RMD160="cd9772b37e4f48fe2e25a55303eb89363ce91467" CHECKSUM_SHA512="0c998fda9fe01c9296a3453966c0449c9968f4f5f989065ca65f0da3830ae8d805699d0ee0362c3b18765420222ba18842b9db20986212afceb36c971ae1bdca" ARCHITECTURES="x86 ?x86_gcc2 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PATCHES="glew-1.10.0.patchset" PROVIDES=" glew$secondaryArchSuffix = $portVersion - lib:libGLEW = $portVersion + lib:libGLEW$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libGL + lib:libGL$secondaryArchSuffix " - BUILD_REQUIRES=" - devel:libGL + devel:libGL$secondaryArchSuffix " - BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:g++$secondaryArchSuffix @@ -43,8 +44,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="glew-${portVersion}" - BUILD() { make $jobArgs GLEW_DEST=$prefix BINDIR=$binDir LIBDIR=$libDir INCDIR=$includeDir @@ -65,7 +64,7 @@ INSTALL() # ----- devel package ------------------------------------- PROVIDES_devel=" glew${secondaryArchSuffix}_devel = $portVersion - devel:libGLEW = $portVersion + devel:libGLEW$secondaryArchSuffix = $portVersion " REQUIRES_devel=" @@ -75,8 +74,8 @@ REQUIRES_devel=" # ----- util package -------------------------------------- PROVIDES_util=" glew${secondaryArchSuffix}_util = $portVersion - cmd:glewinfo -# cmd:visualinfo + cmd:glewinfo$secondaryArchSuffix +# cmd:visualinfo$secondaryArchSuffix " REQUIRES_util=" From cdc3d874b196518dc1989f2fa3fafa6a5afb7e6c Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Wed, 9 Apr 2014 21:39:11 +0200 Subject: [PATCH 28/31] hunspell: remove redundant SOURCE_DIR --- app-text/hunspell/hunspell-1.3.2.recipe | 2 -- 1 file changed, 2 deletions(-) diff --git a/app-text/hunspell/hunspell-1.3.2.recipe b/app-text/hunspell/hunspell-1.3.2.recipe index 6fe75f18c..bcc358e93 100644 --- a/app-text/hunspell/hunspell-1.3.2.recipe +++ b/app-text/hunspell/hunspell-1.3.2.recipe @@ -56,8 +56,6 @@ BUILD_PREREQUIRES=" cmd:automake " -SOURCE_DIR="$portName-$portVersion" - BUILD() { libtoolize --force --copy --install From 8160068ec140774bbe546e1c9fa255d206ba63e9 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Wed, 9 Apr 2014 23:26:36 +0200 Subject: [PATCH 29/31] Added recipe for version 1.9.4 --- .../bescreencapture-1.9.4.recipe | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe new file mode 100644 index 000000000..97aea2b1a --- /dev/null +++ b/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe @@ -0,0 +1,50 @@ +SUMMARY="A screen recorder utility" +DESCRIPTION=" +BeScreenCapture, created by Stefano Ceccherini, is a screen recorder utility \ +for Haiku. It allows you to record what happens on your screen, then save it \ +to any media format that Haiku supports. +BeScreenCapture can record either the entire screen, or just a section you \ +select. +" +HOMEPAGE="https://github.com/jackburton79/bescreencapture" +SRC_URI="https://github.com/jackburton79/bescreencapture/archive/v1.9.4.tar.gz" +LICENSE=" + BSD (3-clause) + MIT + " +COPYRIGHT="2014 Stefano Ceccherini" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + bescreencapture = $portVersion + app:bescreencapture = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + make OBJ_DIR=objects \ + BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a objects/BeScreenCapture $appsDir + addAppDeskbarSymlink $appsDir/BeScreenCapture +} From 8fb7b5beb8a6c336d88aa720441bba6213591a44 Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Thu, 10 Apr 2014 18:58:51 +0000 Subject: [PATCH 30/31] glew: removed unnecessary haiku_devel from BUILD_PREREQUIRES --- media-libs/glew/glew-1.10.0.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/media-libs/glew/glew-1.10.0.recipe b/media-libs/glew/glew-1.10.0.recipe index 662bc7538..cbf25aeff 100644 --- a/media-libs/glew/glew-1.10.0.recipe +++ b/media-libs/glew/glew-1.10.0.recipe @@ -13,7 +13,7 @@ COPYRIGHT=" " HOMEPAGE="http://glew.sourceforge.net" SRC_URI="http://downloads.sourceforge.net/project/glew/glew/${portVersion}/glew-${portVersion}.tgz" -REVISION="3" +REVISION="4" CHECKSUM_SIZE="567605" CHECKSUM_MD5="2f09e5e6cb1b9f3611bcac79bc9c2d5d" CHECKSUM_RMD160="cd9772b37e4f48fe2e25a55303eb89363ce91467" @@ -36,7 +36,6 @@ BUILD_REQUIRES=" devel:libGL$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:g++$secondaryArchSuffix From 8a1f8ed5c5ded5edb0d22c6e956b966f100600d1 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 11 Apr 2014 20:58:10 +0200 Subject: [PATCH 31/31] HaikuWebkit: version 1.3.0. --- .../haikuwebkit/haikuwebkit-1.3.0.recipe | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe new file mode 100644 index 000000000..8d1de03ff --- /dev/null +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe @@ -0,0 +1,110 @@ +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-2014 Apple Inc., Google Inc., et al" +LICENSE=" + GNU LGPL v2 + GNU LGPL v2.1 + MIT + " +SRC_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz" +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 + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +CHECKSUM_SIZE="606182770" +CHECKSUM_RMD160="c57f74fa842d3cef8908ca2a9da67e5bb608938c" +CHECKSUM_SHA512="fa6cbbc4c384a713d3c88716d92607619488420d358cd6562e7a09123c8c3044fb0490fded9ee814b7b56cf6408720cd769a34347b687bd9a0f47bca664e3b15" + +if [ $effectiveTargetArchitecture == x86_64 ]; then + PATCHES="haikuwebkit-1.2.5.patchset" +fi + +PROVIDES=" + haikuwebkit$secondaryArchSuffix = $portVersion + lib:libWebKit$secondaryArchSuffix = $portVersion + cmd:jsc$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libicuuc$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libsqlite3$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libxslt$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libavcodec$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel >= $haikuVersion + devel:libicuuc$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libsqlite3$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libxslt$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libavcodec$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:pkg_config + 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="webkit-$portVersion" + +BUILD() +{ + export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig" + Tools/Scripts/build-webkit --haiku --no-webkit2 \ + --cmakeargs="-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 + "