[haiku-commits] r39224 - haiku/trunk/build/jam
- From: scott mc <scottmc2@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 31 Oct 2010 05:32:48 +0100 (CET)
Author: scottmc
Date: 2010-10-31 05:32:48 +0100 (Sun, 31 Oct 2010)
New Revision: 39224
Changeset: http://dev.haiku-os.org/changeset/39224
Modified:
haiku/trunk/build/jam/OptionalLibPackages
haiku/trunk/build/jam/OptionalPackages
Log:
Update libevent. Added some more gcc4 packages, including builds of the
SDLLibs, AllegroLibs, and XiphLibs.
Modified: haiku/trunk/build/jam/OptionalLibPackages
===================================================================
--- haiku/trunk/build/jam/OptionalLibPackages 2010-10-31 00:56:14 UTC (rev
39223)
+++ haiku/trunk/build/jam/OptionalLibPackages 2010-10-31 04:32:48 UTC (rev
39224)
@@ -17,7 +17,6 @@
# fribidi
# lcms
# libart_lgpl
-# libevent
# libmad
# libmikmod
# libmng
@@ -38,7 +37,15 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package AllegroLibs available for
$(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
- Echo "No optional package AllegroLibs available for gcc4" ;
+ InstallOptionalHaikuImagePackage
+ allegro-4.4.1.1-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/allegro-4.4.1.1-x86-gcc4-2010-10-30.zip
;
+ InstallOptionalHaikuImagePackage
+ dumb-0.9.3-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/dumb-0.9.3-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ jgmod-0.99-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/jgmod-0.99-x86-gcc4-2010-10-30.zip ;
} else {
InstallOptionalHaikuImagePackage
allegro-4.4.1.1-x86-gcc2-2010-10-30.zip
@@ -57,6 +64,13 @@
if [ IsOptionalHaikuImagePackageAdded fribidi ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package fribidi available for $(TARGET_ARCH)"
;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+ InstallOptionalHaikuImagePackage
+ fribidi-0.19.2-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/fribidi-0.19.2-x86-gcc4-2010-10-30.zip
+ :
+ : true
+ ;
} else {
InstallOptionalHaikuImagePackage
fribidi-0.19.2-x86-gcc2-2010-10-29.zip
@@ -98,22 +112,6 @@
}
-# TODO: LibEvent exists in OptionalPackages!
-# libevent
-if [ IsOptionalHaikuImagePackageAdded libevent ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package libevent available for
$(TARGET_ARCH)" ;
- } else {
- InstallOptionalHaikuImagePackage
- libevent-1.4.13-x86-gcc2-2010-10-29.zip
- : $(baselibURL)/libevent-1.4.13-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
- }
-}
-
-
# libmad
if [ IsOptionalHaikuImagePackageAdded libmad ] {
if $(TARGET_ARCH) != x86 {
@@ -193,6 +191,13 @@
if [ IsOptionalHaikuImagePackageAdded physfs ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package physfs available for $(TARGET_ARCH)" ;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+ InstallOptionalHaikuImagePackage
+ physfs-2.0.1-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/physfs-2.0.1-x86-gcc4-2010-10-30.zip
+ :
+ : true
+ ;
} else {
InstallOptionalHaikuImagePackage
physfs-2.0.1-x86-gcc2-2010-10-29.zip
@@ -209,10 +214,45 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package SDLLibs available for $(TARGET_ARCH)"
;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
- Echo "No optional package SDLLibs available for gcc4" ;
+ InstallOptionalHaikuImagePackage
+ libsdl-1.2-hg-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/libsdl-1.2-hg-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ guilib-1.2.1-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/guilib-1.2.1-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ sdl-image-1.2.10-x86-gcc2-2010-10-30.zip
+ :
$(baselibURL)/sdl-image-1.2.10-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ sdl-mixer-1.2.11-x86-gcc2-2010-10-30.zip
+ :
$(baselibURL)/sdl-mixer-1.2.11-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ sdl-net-1.2.7-x86-gcc2-2010-10-30.zip
+ : $(baselibURL)/sdl-net-1.2.7-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ sdl-sound-1.0.3-x86-gcc2-2010-10-30.zip
+ : $(baselibURL)/sdl-sound-1.0.3-x86-gcc4-2010-10-30.zip
;
+ InstallOptionalHaikuImagePackage
+ sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ sge-030809-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/sge-030809-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ smjpeg-0.2.1-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/smjpeg-0.2.1-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ smpeg-0.4.5-x86-gcc4-2010-10-29.zip
+ : $(baselibURL)/smpeg-0.4.5-x86-gcc4-2010-10-29.zip ;
} else {
InstallOptionalHaikuImagePackage
- libsdl-1.2-hg-x86-gcc-2-2010-10-29.zip
+ libsdl-1.2-hg-x86-gcc2-2010-10-29.zip
: $(baselibURL)/libsdl-1.2-hg-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
guilib-1.2.1-x86-gcc2-2010-10-29.zip
@@ -256,7 +296,27 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package XiphLibs available for
$(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
- Echo "No optional package XiphLibs available for gcc4" ;
+ InstallOptionalHaikuImagePackage
+ flac-1.2.1-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/flac-1.2.1-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ libao-1.0.0-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/libao-1.0.0-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ libogg-1.2.0-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/libogg-1.2.0-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ libtheora-1.1.1-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/libtheora-1.1.1-x86-gcc4-2010-10-30.zip
;
+ InstallOptionalHaikuImagePackage
+ libvorbis-1.3.1-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/libvorbis-1.3.1-x86-gcc4-2010-10-30.zip
;
+ InstallOptionalHaikuImagePackage
+ speex-1.2-git-x86-gcc4-2010-10-30.zip
+ : $(baselibURL)/speex-1.2-git-x86-gcc4-2010-10-30.zip ;
+ InstallOptionalHaikuImagePackage
+ vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip
+ :
$(baselibURL)/vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip ;
} else {
InstallOptionalHaikuImagePackage
flac-1.2.1-x86-gcc2-2010-10-29.zip
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2010-10-31 00:56:14 UTC (rev
39223)
+++ haiku/trunk/build/jam/OptionalPackages 2010-10-31 04:32:48 UTC (rev
39224)
@@ -940,24 +940,18 @@
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- libevent-1.4.13-x86-gcc4-2010-05-06.zip
- :
$(baseURL)/libevent-1.4.13-x86-gcc4-2010-05-06.zip
+ libevent-1.4.13-x86-gcc4-2010-10-30.zip
+ :
$(baseURL)/libevent-1.4.13-x86-gcc4-2010-10-30.zip
:
: true
;
- InstallSourceArchive
libevent-1.4.13_haiku-2010-05-06.tar.xz
- :
$(baseSourceURL)/libevent-1.4.13_haiku-2010-05-06.tar.xz ;
- } else if $(HAIKU_GCC_VERSION[1]) = 2 && $(isHybridBuild) {
+ } else {
InstallOptionalHaikuImagePackage
- libevent-1.4.13-x86-gcc2h-2010-05-06.zip
- :
$(baseURL)/libevent-1.4.13-x86-gcc2h-2010-05-06.zip
+ libevent-1.4.13-x86-gcc2-2010-10-29.zip
+ :
$(baseURL)/libevent-1.4.13-x86-gcc2-2010-10-29.zip
:
: true
;
- InstallSourceArchive
libevent-1.4.13_haiku-2010-05-06.tar.xz
- :
$(baseSourceURL)/libevent-1.4.13_haiku-2010-05-06.tar.xz ;
- } else {
- Echo "No optional package LibEvent available for
$(TARGET_ARCH)-gcc2" ;
}
}
}
Other related posts:
