Merged haikuports/haikuports into master

2026-04-22 11:40:06 +02:00 · 2013-12-21 12:30:56 +01:00
parent 85dd49df72 b450788458
commit 4223e0d96d
7 changed files with 376 additions and 73 deletions
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -12,10 +12,16 @@ CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354"
 REVISION="1"
 LICENSE="Boost v1.0"
 COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al."
-ARCHITECTURES="?x86_gcc2 ?x86"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86 ?x86_64"
 SOURCE_DIR="boost_1_55_0"	
-PATCHES="boost-1.55.0.patch"
+PATCHES="
+	boost-1.55.0.patch
+	type_traits.patch
+"

 PROVIDES="
 	lib:boost = 1.55.0
@@ -29,60 +35,241 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:jam
 	cmd:iconv
+	cmd:make
+	binutils
 	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libiconv
+	devel:libbz2
+	devel:libz
 	"

 REQUIRES="
 	lib:libiconv
+	lib:libbz2
+	lib:libz
 	"

 BUILD()
 {
 	./bootstrap.sh \
 		--without-icu \
-		--prefix=`finddir B_SYSTEM_DIRECTORY` \
-		--exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \
-		--libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \
-		#--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` 
+		--prefix=$prefix \
+		--exec-prefix=$binDir \
+		--libdir=$libDir \
+		--includedir=$includeDir
 	./bjam \
-		 -sICU_PATH=`finddir B_SYSTEM_DIRECTORY` \
-		 -sICONV_PATH=`finddir B_SYSTEM_DIRECTORY` \
+		 -sICU_PATH=$prefix \
+		 -sICONV_PATH=$prefix \
 		-d2 \
 		--without-mpi \
-		--prefix=`finddir B_SYSTEM_DIRECTORY` \
-		--exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \
-		--libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \
-		#--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` \
+		--prefix=$prefix \
+		--exec-prefix=$binDir \
+		--libdir=$libDir \
+		--includedir=$includeDir \
 		--enable-threads=posix \
 		--enable-thread-local-alloc \
-		--enable-parallel-mark \
+ 		--enable-parallel-mark \
 		inlining=on \
-		linkflags=-L`finddir B_SYSTEM_LIB_DIRECTORY` \
+		linkflags=-L$libDir \
 		threading=multi \
 		variant=release \
 		link=shared \
-		runtime-link=shared
+		runtime-link=shared \
+		--without-python \
+		--disable-icu 
 }

 INSTALL()
 {
-	./bjam install \
-		-d2 \
-		--prefix=$prefix \
-		#--exec-prefix=${DESTDIR}/`finddir B_SYSTEM_BIN_DIRECTORY` \
-		#--libdir=${DESTDIR}/`finddir B_SYSTEM_LIB_DIRECTORY` \		
-		#--includedir=${DESTDIR}/`finddir B_SYSTEM_HEADERS_DIRECTORY` \
-		inlining=on \
-		--without-mpi 
+	mkdir -p $includeDir
+	mkdir -p $libDir
+	
+	cp -rf boost $includeDir
+	cp stage/lib/* $libDir
+		
+	packageEntries devel $includeDir
+	packageEntries atomic $libDir/*atomic*
+	packageEntries chrono $libDir/*chrono*
+	packageEntries context $libDir/*context*
+	packageEntries coroutine $libDir/*coroutine*
+	packageEntries date_time $libDir/*date_time*
+	packageEntries exception $libDir/*exception*
+	packageEntries filesystem $libDir/*filesystem*
+	packageEntries graph $libDir/*graph*
+	packageEntries iostreams $libDir/*iostreams*
+	packageEntries locale $libDir/*locale*
+	packageEntries log $libDir/*log*
+	packageEntries math $libDir/*math*
+	packageEntries program_options $libDir/*program_options*
+	packageEntries random $libDir/*random*
+	packageEntries regex $libDir/*regex*
+	packageEntries serialization $libDir/*serialization*
+	packageEntries signals $libDir/*signals*
+	packageEntries system $libDir/*system* 
+	packageEntries test $libDir/*test*
+	packageEntries thread $libDir/*thread*
+	packageEntries timer $libDir/*timer*
+	packageEntries wave $libDir/*wave*
 }

 PROVIDES_devel="
-	boost${secondaryArchSuffix} = $portVersion
+	boost_devel$secondaryArchSuffix = $portVersion
 	"
-	
 REQUIRES_devel="
-	boost${secondaryArchSuffix} == $portVersion base
-	"
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_atomic="
+	boost_atomic$secondaryArchSuffix = $portVersion
+"
+REQUIRES_atomic="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_chrono="
+	boost_chrono$secondaryArchSuffix = $portVersion
+"
+REQUIRES_chrono="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_system$secondaryArchSuffix == $portVersion
+"
+PROVIDES_context="
+	boost_context$secondaryArchSuffix = $portVersion
+"
+REQUIRES_context="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_coroutine="
+	boost_coroutine$secondaryArchSuffix = $portVersion
+"
+REQUIRES_coroutine="
+	boost_context$secondaryArchSuffix == $portVersion
+"
+PROVIDES_date_time="
+	boost_date_time$secondaryArchSuffix = $portVersion
+"
+REQUIRES_date_time="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_exception="
+	boost_exception$secondaryArchSuffix = $portVersion
+"
+REQUIRES_exception="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_filesystem="
+	boost_filesystem$secondaryArchSuffix = $portVersion
+"
+REQUIRES_filesystem="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	lib:libz$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+"
+PROVIDES_graph="
+	boost_graph$secondaryArchSuffix = $portVersion
+"
+REQUIRES_graph="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_regex$secondaryArchSuffix == $portVersion
+"
+PROVIDES_iostreams="
+	boost_iostreams$secondaryArchSuffix = $portVersion
+"
+REQUIRES_iostreams="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_locale="
+	boost_locale$secondaryArchSuffix = $portVersion
+"
+REQUIRES_locale="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	boost_thread$secondaryArchSuffix == $portVersion
+"
+PROVIDES_log="
+	boost_log$secondaryArchSuffix = $portVersion
+"
+REQUIRES_log="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	boost_date_time$secondaryArchSuffix == $portVersion
+	boost_thread$secondaryArchSuffix == $portVersion
+"
+PROVIDES_math="
+	boost_math$secondaryArchSuffix = $portVersion
+"
+REQUIRES_math="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_program_options="
+	boost_program_options$secondaryArchSuffix = $portVersion
+"
+REQUIRES_program_options="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_random="
+	boost_random$secondaryArchSuffix = $portVersion
+"
+REQUIRES_random="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_regex="
+	boost_regex$secondaryArchSuffix = $portVersion
+"
+REQUIRES_regex="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_serialization="
+	boost_serialization$secondaryArchSuffix = $portVersion
+"
+REQUIRES_serialization="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_signals="
+	boost_signals$secondaryArchSuffix = $portVersion
+"
+REQUIRES_signals="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_system="
+	boost_system$secondaryArchSuffix = $portVersion
+"
+REQUIRES_system="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_test="
+	boost_test$secondaryArchSuffix = $portVersion
+"
+REQUIRES_test="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_thread="
+	boost_thread$secondaryArchSuffix = $portVersion
+"
+REQUIRES_thread="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+"
+PROVIDES_timer="
+	boost_timer$secondaryArchSuffix = $portVersion
+"
+REQUIRES_timer="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
+"
+PROVIDES_wave="
+	boost_wave$secondaryArchSuffix = $portVersion
+"
+REQUIRES_wave="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+	boost_date_time$secondaryArchSuffix == $portVersion
+	boost_filesystem$secondaryArchSuffix == $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	boost_thread$secondaryArchSuffix == $portVersion
+"
--- a/dev-libs/boost/patches/type_traits.patch
+++ b/dev-libs/boost/patches/type_traits.patch
@@ -0,0 +1,35 @@
+diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp
+index 1b15c7e..9a3becd 100644
+--- a/boost/config/platform/haiku.hpp
+++ b/boost/config/platform/haiku.hpp
+@@ -9,18 +9,29 @@
+ 
+ #define BOOST_PLATFORM "Haiku"
+ 
+-#define BOOST_NO_INTRINSIC_WCHAR_T
+//#define BOOST_NO_INTRINSIC_WCHAR_T
+ #define BOOST_HAS_UNISTD_H
+#define BOOST_NO_AUTO_PTR
+#define GLIBC_HAVE_LONG_LONG
+#define BOOST_HAS_STDINT_H
+//#define BOOST_NOT_STD_WSTRING
+#define BOOST_HASH_NO_EXTENSIONS
+ 	
+ #define BOOST_HAS_BETHREADS
+ 	
+ #ifndef BOOST_DISABLE_THREADS
+ #   define BOOST_HAS_THREADS
+ #endif
+#define BOOST_NO_CXX11_HDR_TYPE_TRAITS
+#define BOOST_NO_CXX11_ATOMIC_SMART_PTR
+#define BOOST_NO_CXX11_STATIC_ASSERT
+#define BOOST_NO_CXX11_VARIADIC_MACROS
+ 
+ //
+ // thread API's not auto detected:
+ //
+#define BOOST_HAS_SCHED_YIELD
+#define BOOST_HAS_PTHREAD_YIELD
+ #define BOOST_HAS_GETTIMEOFDAY
+ 
+ // boilerplate code:
--- a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe
+++ b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe
@@ -0,0 +1,72 @@
+SUMMARY="Minimize all your apps with the press of a button!"
+DESCRIPTION="
+	MinimizeAll is a small app that minimizes all your apps with
+	the press of a button on the Deskbar, or with a keypress.
+	The app contains two parts: A standalone app that minimizes the whole app,
+	and a replicant for your Deskbar. Both do the same: Minimize all your apps!
+	"
+
+HOMEPAGE="https://github.com/HaikuArchives/MinimizeAll/"
+SRC_URI="git://github.com/HaikuArchives/MinimizeAll.git#12fefdf26131375f695693a680bf01edb35d57a9"
+
+REVISION="1"
+
+COPYRIGHT="
+	2001-2008 Werner Freytag
+	2009 Haiku
+	"
+
+LICENSE="MIT"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	MinimizeAll = $portVersion
+	app:MinimizeAll = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:xres
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD()
+{
+	cd trunk
+	mkdir -p bin
+
+	# Step 1 - Building the app
+	cd app
+	gcc -o ../bin/MinimizeAll -lbe main.cpp ../minimize.cpp
+	rc -o ../bin/MinimizeAll.rsrc Application.rdef
+	xres -o ../bin/MinimizeAll ../bin/MinimizeAll.rsrc
+	mimeset -f ../bin/MinimizeAll
+	cd ..
+
+	# Step 2 - The DeskBar AddOn!
+	cd "deskbar add-on"
+	gcc -o ../bin/DeskbarAddOn -lbe DeskbarView.cpp ../minimize.cpp
+	rc -o ../bin/DeskbarAddOn.rsrc DeskbarAddOn.rdef
+	xres -o ../bin/DeskbarAddOn ../bin/DeskbarAddOn.rsrc
+	mimeset -f ../bin/DeskbarAddOn
+	cd ..
+
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/MinimizeAll
+	cp trunk/bin/MinimizeAll $appsDir/MinimizeAll/MinimizeAll
+	cp trunk/bin/DeskbarAddOn $appsDir/MinimizeAll/DeskbarAddOn
+	addAppDeskbarSymlink $appsDir/MinimizeAll/MinimizeAll
+	mkdir -p "$dataDir/deskbar/menu/Desktop applets"
+	symlinkRelative -s "$appsDir/MinimizeAll/DeskbarAddOn"  \
+		"$dataDir/deskbar/menu/Desktop applets/MinimizeAll"
+}
--- a/media-libs/jasper/jasper-1.900.1.recipe
+++ b/media-libs/jasper/jasper-1.900.1.recipe
@@ -8,8 +8,8 @@ CHECKSUM_MD5="a342b2b4495b3e1394e161eb5d85d754"
 LICENSE="JasPer v2"
 COPYRIGHT="1999-2007 Michael D. Adams"

-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
 	jasper$secondaryArchSuffix = $portVersion compat >= 1.0.0
@@ -89,14 +89,13 @@ REQUIRES_devel="
 if [ -z "$secondaryArchSuffix" ]; then
 	SUMMARY_tools="The jasper tools"
 	PROVIDES_tools="
-		jasper_tools = $portVersion
-		cmd:imgcmp = $portVersion
-		cmd:imginfo = $portVersion
-		cmd:jasper = $portVersion
-		cmd:tmrdemo = $portVersion
+		jasper_tools$secondaryArchSuffix = $portVersion
+		cmd:imgcmp$secondaryArchSuffix = $portVersion
+		cmd:imginfo$secondaryArchSuffix = $portVersion
+		cmd:jasper$secondaryArchSuffix = $portVersion
+		cmd:tmrdemo$secondaryArchSuffix = $portVersion
 		"
 	REQUIRES_tools="
-		haiku >= $haikuVersion
-		jasper == $portVersion base
+		jasper$secondaryArchSuffix == $portVersion base
 		"
-fi
+fi
--- a/media-libs/lcms/lcms-2.5.recipe
+++ b/media-libs/lcms/lcms-2.5.recipe
@@ -8,32 +8,35 @@ LICENSE="MIT"
 COPYRIGHT="2007 Marti Maria"

 ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
-	lcms = 2.5 compat >= 2
-	lib:liblcms2
-	cmd:jpgicc
-	cmd:linkicc
-	cmd:psicc
-	cmd:tificc
-	cmd:transicc	
+	lcms$secondaryArchSuffix = 2.5 compat >= 2
+	lib:liblcms2$secondaryArchSuffix
+	cmd:jpgicc$secondaryArchSuffix
+	cmd:linkicc$secondaryArchSuffix
+	cmd:psicc$secondaryArchSuffix
+	cmd:tificc$secondaryArchSuffix
+	cmd:transicc$secondaryArchSuffix
 	"

 REQUIRES="
-	haiku
-	lib:libjpeg
-	lib:libpng
-	lib:libtiff
-	lib:libz"
+	haiku >= $haikuVersion
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"

 BUILD_REQUIRES="
-	devel:libjpeg
-	devel:libpng
-	devel:libtiff
-	devel:libz"
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"

 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:libtoolize
@@ -71,10 +74,10 @@ INSTALL()
 # ----- devel package ---------------------------------------

 PROVIDES_devel="
-	lcms_devel = $portVersion
-	devel:lcms = 2.5 compat >= 2
-	devel:liblcms2 = 2.0.1 compat >= 2
+	lcms${secondaryArchSuffix}_devel = $portVersion
+	devel:lcms$secondaryArchSuffix = 2.5 compat >= 2
+	devel:liblcms2$secondaryArchSuffix = 2.0.1 compat >= 2
 	"
 REQUIRES_devel="
-	lcms == $portVersion base
+	lcms$secondaryArchSuffix == $portVersion base
 	"
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
@@ -7,20 +7,23 @@ REVISION="1"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2001-2010 Mathieu Lacage and Raph Levien"

-ARCHITECTURES="x86 x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
-	libart_lgpl= $portVersion
-	cmd:libart2_config = $portVersion compat >= 2
-	lib:libart_lgpl_2 = 2.3.21 compat >= 2
-	" 
+	libart_lgpl$secondaryArchSuffix = $portVersion
+	lib:libart_lgpl_2$secondaryArchSuffix = 2.3.21 compat >= 2
+	"
+
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
+
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoreconf
 	cmd:libtool
@@ -28,6 +31,7 @@ BUILD_PREREQUIRES="
 	cmd:ld${secondaryArchSuffix}
 	cmd:gcc${secondaryArchSuffix}
 	"
+
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -45,15 +49,18 @@ INSTALL()
 	
 	# devel package
 	packageEntries devel \
-		$developDir
+		$developDir \
+		$binDir
 }

 # ----- devel package

 PROVIDES_devel="
-	libart_lgpl_2 = $portVersion
-	devel:libart_lgpl_2 = 2.3.21 compat >= 2
+	libart_lgpl_2$secondaryArchSuffix = $portVersion
+	devel:libart_lgpl_2$secondaryArchSuffix = 2.3.21 compat >= 2
+	cmd:libart2_config$secondaryArchSuffix = $portVersion compat >= 2
 	"
+
 REQUIRES_devel="
-	libart_lgpl_2 == $portVersion base
+	libart_lgpl_2$secondaryArchSuffix == $portVersion base
 	"
--- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
+++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
@@ -7,8 +7,8 @@ LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2007-2012 Josh Green, Pedro Lopez-Cabanillas, David Henningsson"

 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"

 PROVIDES="
 	fluidsynth$secondaryArchSuffix = $portVersion
@@ -23,10 +23,10 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"

 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:cmake
 	cmd:make
 	cmd:gcc$secondaryArchSuffix