From f5035b13449693bf4a260c7b969885e4f664e87c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 9 Dec 2013 10:27:30 +0000 Subject: [PATCH 1/5] Fixed fastdep so that it builds again --- dev-util/fastdep/fastdep-0.16.recipe | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe index 9aebf221e..8b20c2e5b 100644 --- a/dev-util/fastdep/fastdep-0.16.recipe +++ b/dev-util/fastdep/fastdep-0.16.recipe @@ -1,6 +1,6 @@ -SUMMARY="fastdep is a fast dependency generator for C/C++ files." +SUMMARY="fastdep is a fast dependency generator for C/C++ files." DESCRIPTION="fastdep is a preprocessor which generates dependency information suitable for Makefile inclusion from C or C++ source files. Meant to run on slower hardware, it is several orders of magnitude faster than gcc." -HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/" +HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/" SRC_URI="http://ports-space.haiku-files.org/dev-util/source/fastdep-0.16.tar.gz" REVISION="1" CHECKSUM_MD5="838c08b790a5dfe9a50a4aec7947bc54" @@ -14,14 +14,15 @@ PATCHES="fastdep-0.16.patch" PROVIDES=" cmd:fastdep = $portVersion compat >= 0 " - + REQUIRES=" - lib:libstdc++.r4 - lib:libroot >= $haikuVersion" - -BUILD_REQUIRES=" + haiku >= $haikuVersion " - + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + BUILD_PREREQUIRES=" cmd:gcc cmd:make @@ -40,5 +41,3 @@ INSTALL() mkdir -p $binDir cp -f fastdep $binDir } - - From 7afffc1dd96eb9d2412be2557e5298331b0c7947 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 9 Dec 2013 10:27:56 +0000 Subject: [PATCH 2/5] Fixed ccache so that it builds again --- dev-util/ccache/ccache-3.1.9.recipe | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dev-util/ccache/ccache-3.1.9.recipe b/dev-util/ccache/ccache-3.1.9.recipe index 3ab1af323..0cc56695c 100644 --- a/dev-util/ccache/ccache-3.1.9.recipe +++ b/dev-util/ccache/ccache-3.1.9.recipe @@ -1,6 +1,6 @@ SUMMARY="ccache is a fast compiler cache." -DESCRIPTION="ccache is a compiler cache. It speeds up recompilation by caching previous compilations and detecting when same compilation is being done again. Supported languages are C, C++, Objective-C and Objective-C++." -HOMEPAGE="http://ccache.samba.org/" +DESCRIPTION="ccache is a compiler cache. It speeds up recompilation by caching previous compilations and detecting when same compilation is being done again. Supported languages are C, C++, Objective-C and Objective-C++." +HOMEPAGE="http://ccache.samba.org/" SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.9.tar.bz2" REVISION="1" @@ -11,15 +11,21 @@ COPYRIGHT="2002-2007 Andrew Tridgell CHECKSUM_MD5="65f48376a91d3651d6527ca568858be8" ARCHITECTURES="x86 x86_gcc2" + PROVIDES=" + ccache = $portVersion cmd:ccache " + REQUIRES=" - lib:libroot >= $haikuVersion + haiku >= $haikuVersion lib:libz >= 1 " + BUILD_REQUIRES=" + haiku_devel >= $haikuVersion " + BUILD_PREREQUIRES=" cmd:gcc cmd:make From 695aa4856c77e942cc07a35c58a98044675316da Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 9 Dec 2013 10:47:50 +0000 Subject: [PATCH 3/5] Added fastdep and ccache to paladine recipe, this fixes makefile export, but paledit is still broken --- haiku-apps/paladin/paladin-1.3.recipe | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/haiku-apps/paladin/paladin-1.3.recipe b/haiku-apps/paladin/paladin-1.3.recipe index 950bf44c9..7095700d1 100644 --- a/haiku-apps/paladin/paladin-1.3.recipe +++ b/haiku-apps/paladin/paladin-1.3.recipe @@ -1,6 +1,6 @@ SUMMARY="Paladin is a open source integrated development environment (IDE)" -DESCRIPTION="Paladin is an open source integrated development environment (IDE) modeled after BeOS' BeIDE." -HOMEPAGE="http://paladin.sourceforge.net" +DESCRIPTION="Paladin is an open source integrated development environment (IDE) modeled after BeOS' BeIDE." +HOMEPAGE="http://paladin.sourceforge.net" SRC_URI="http://sourceforge.net/projects/paladin/files/Paladin-1.3.src.zip/download" REVISION="2" CHECKSUM_MD5="5cf4b445f77626f71956ccc325ed77dc" @@ -25,6 +25,8 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion lib:libpcre + cmd:fastdep + cmd:ccache " BUILD_REQUIRES=" devel:libpcre @@ -51,12 +53,12 @@ BUILD() cd Paladin ./build.sh cd .. - + #Rez cd PalEdit/rez/Sources g++ -o rez *.cpp -I. -lbe cd ../../.. - + #PalEdit cd PalEdit/Sources g++ -shared -fPIC -o libhekkel.so HAppResFile.cpp HButtonBar.cpp HColorControl.cpp \ @@ -76,7 +78,7 @@ BUILD() utf-support.cpp Utils.cpp libhekkel.so -lpcre -lbe -ltracker -lmail -ltextencoding -ltranslation \ -lnetwork cd ../.. - + #SymbolFinder cd SymbolFinder g++ -o SymbolFinder *.cpp -lbe -lroot @@ -88,23 +90,23 @@ INSTALL() mkdir -p $appsDir/Paladin mkdir -p $libDir mkdir -p $binDir - + #Paladin cp Paladin/Paladin $appsDir/Paladin cp Paladin/README $appsDir/Paladin cp -r Templates $appsDir/Paladin cp -r Paladin/Licenses $appsDir/Paladin - + #Rez cp PalEdit/rez/Sources/rez $binDir - + #PalEdit cp PalEdit/Sources/PalEdit $appsDir/Paladin/PalEdit cp PalEdit/Sources/libhekkel.so $libDir - + #SymbolFinder cp SymbolFinder/SymbolFinder $appsDir/Paladin - + addAppDeskbarSymlink $appsDir/Paladin/Paladin Paladin addAppDeskbarSymlink $appsDir/Paladin/PalEdit PalEdit addAppDeskbarSymlink $appsDir/Paladin/SymbolFinder "Symbol Finder" From 09b00f319c95f09b9089bf74c9992d1a3f34c9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 9 Dec 2013 13:15:35 +0100 Subject: [PATCH 4/5] Comment out libtiff dependency in libsdl Since we don't actually require it at build time, it's not needed at runtime either. --- media-libs/libsdl/libsdl-1.2.15.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index 4e9a5b657..6e04a168a 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -21,7 +21,7 @@ REQUIRES=" lib:libglu$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix - lib:libtiff$secondaryArchSuffix +# lib:libtiff$secondaryArchSuffix " BUILD_REQUIRES=" From 53f9afc3e15c76eda0e6687f157139ae5f255de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 9 Dec 2013 13:41:24 +0100 Subject: [PATCH 5/5] Fix ocp recipe Although it doesn't seem to detect SDL.h yet... --- media-sound/ocp/ocp-0.1.21_git.recipe | 66 +++++++++++++++++++++------ 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe index 0abc28e07..fec139bb0 100644 --- a/media-sound/ocp/ocp-0.1.21_git.recipe +++ b/media-sound/ocp/ocp-0.1.21_git.recipe @@ -1,28 +1,66 @@ +SUMMARY="ocp - Open Cubic Player" DESCRIPTION="ocp - Open Cubic Player, a music player ported from DOS" HOMEPAGE="http://stian.cubic.org/project-ocp.php" SRC_URI="git://git.code.sf.net/p/opencubicplayer/code" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libvorbis >= 1.3.1 - media-libs/libogg >= 1.2.2 - sys-devel/gettext >= 0.18.1.1 - media-libs/libsdl >= 1.2.14" -# media-libs/flac >= 1.2.1" -# ncurses zlib ... cf. ocp.spec -MESSAGE="This port requires gcc4" +LICENSE="GNU GPL v2" +COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others" +#DEPEND="media-libs/libvorbis >= 1.3.1 +# media-libs/libogg >= 1.2.2 +# sys-devel/gettext >= 0.18.1.1 +# media-libs/libsdl >= 1.2.14" +## media-libs/flac >= 1.2.1" +## ncurses zlib ... cf. ocp.spec + +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + ocp$secondaryArchSuffix = $portVersion + cmd:ocp = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + libsdl$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libogg$secondaryArchSuffix >= 0.8.0 + lib:libvorbis$secondaryArchSuffix >= 0.4.5 + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl_1.2$secondaryArchSuffix >= 0.10 + devel:libiconv$secondaryArchSuffix + devel:libncurses$secondaryArchSuffix + devel:libz$secondaryArchSuffix >= 1.2.8 + devel:libogg$secondaryArchSuffix >= 0.8.0 + devel:libvorbis$secondaryArchSuffix >= 0.4.5 + " +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:sdl_config + " + + +SOURCE_DIR="code" + BUILD() { - cd code autoconf - CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=$prefix make } INSTALL() { - cd code make install } - -LICENSE="GNU GPL v2" -COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others"