i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated openssl to 1.0.0c

Browse Source 
Updated curl to 7.21.3
Updated build of SDL to include off by 1 resolution fix by GCI student Daniel Marth, 
and the OpenGL fix by Urias McCullough



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39940 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary
2010-12-24 19:21:12 +00:00
parent 3bd54e05be
commit 15426bc2a4
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+2 -2
View File
@@ -12,9 +12,9 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
} }
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0a-x86-gcc4-2010-11-12.zip ; HAIKU_OPENSSL_PACKAGE = openssl-1.0.0c-x86-gcc4-2010-12-23.zip ;
} else { } else {
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0a-x86-gcc2-2010-08-29.zip ; HAIKU_OPENSSL_PACKAGE = openssl-1.0.0c-x86-gcc2-2010-12-23.zip ;
} }
local baseURL = http://haiku-files.org/files/optional-packages ; local baseURL = http://haiku-files.org/files/optional-packages ;
build/jam/OptionalLibPackages
+4 -4
View File
@@ -261,8 +261,8 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
Echo "No optional package SDLLibs available for $(TARGET_ARCH)" ; Echo "No optional package SDLLibs available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libsdl-1.2-hg-x86-gcc4-2010-10-30.zip libsdl-1.2-hg-x86-gcc4-2010-12-23.zip
: $(baseURL)/lib/libsdl-1.2-hg-x86-gcc4-2010-10-30.zip ; : $(baseURL)/lib/libsdl-1.2-hg-x86-gcc4-2010-12-23.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
guilib-1.2.1-x86-gcc4-2010-10-30.zip guilib-1.2.1-x86-gcc4-2010-10-30.zip
: $(baseURL)/lib/guilib-1.2.1-x86-gcc4-2010-10-30.zip ; : $(baseURL)/lib/guilib-1.2.1-x86-gcc4-2010-10-30.zip ;
@@ -298,8 +298,8 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
: $(baseURL)/lib/smpeg-0.4.5-x86-gcc4-2010-10-29.zip ; : $(baseURL)/lib/smpeg-0.4.5-x86-gcc4-2010-10-29.zip ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libsdl-1.2-hg-x86-gcc2-2010-10-29.zip libsdl-1.2-hg-x86-gcc2-2010-12-23.zip
: $(baseURL)/lib/libsdl-1.2-hg-x86-gcc2-2010-10-29.zip ; : $(baseURL)/lib/libsdl-1.2-hg-x86-gcc2-2010-12-23.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
guilib-1.2.1-x86-gcc2-2010-10-29.zip guilib-1.2.1-x86-gcc2-2010-10-29.zip
: $(baseURL)/lib/guilib-1.2.1-x86-gcc2-2010-10-29.zip ; : $(baseURL)/lib/guilib-1.2.1-x86-gcc2-2010-10-29.zip ;
build/jam/OptionalPackages
+4 -4
View File
@@ -474,12 +474,12 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package Curl available for $(TARGET_ARCH)" ; Echo "No optional package Curl available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage curl-7.21.2-x86-gcc4-2010-11-12.zip InstallOptionalHaikuImagePackage curl-7.21.3-x86-gcc4-2010-12-23.zip
: $(baseURL)/curl-7.21.2-x86-gcc4-2010-11-12.zip : $(baseURL)/curl-7.21.3-x86-gcc4-2010-12-23.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage curl-7.21.2-x86-gcc2-2010-10-13.zip InstallOptionalHaikuImagePackage curl-7.21.3-x86-gcc2-2010-12-23.zip
: $(baseURL)/curl-7.21.2-x86-gcc2-2010-10-13.zip : $(baseURL)/curl-7.21.3-x86-gcc2-2010-12-23.zip
: : true ; : : true ;
} }
} }