[haiku-commits] r39209 - haiku/trunk/build/jam
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 30 Oct 2010 18:16:34 +0200 (CEST)
Author: mmadia
Date: 2010-10-30 18:16:34 +0200 (Sat, 30 Oct 2010)
New Revision: 39209
Changeset: http://dev.haiku-os.org/changeset/39209
Modified:
haiku/trunk/build/jam/OptionalLibPackages
Log:
More cleanup.
* Removed commented code
* Removed incorrect comments for pkgconfig, readline
* Fixed names of archives
* Added a TODO about duplicate libevent, LibEvent
Modified: haiku/trunk/build/jam/OptionalLibPackages
===================================================================
--- haiku/trunk/build/jam/OptionalLibPackages 2010-10-30 16:08:06 UTC (rev
39208)
+++ haiku/trunk/build/jam/OptionalLibPackages 2010-10-30 16:16:34 UTC (rev
39209)
@@ -23,10 +23,8 @@
# libmng
# libmodplug
# libpaper
-# SDLLibs
# physfs
-# pkgconfig
-# readline
+# SDLLibs
# XiphLibs
@@ -41,15 +39,6 @@
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
@@ -85,8 +74,8 @@
Echo "No optional package lcms available for $(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
- lcms-2.0a--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/lcms-2.0a--x86-gcc2-2010-10-29.zip
+ lcms-2.0a-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/lcms-2.0a-x86-gcc2-2010-10-29.zip
:
: true
;
@@ -100,8 +89,8 @@
Echo "No optional package libart_lgpl available for
$(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
- libart_lgpl-2.3.21--x86-gcc2-2010-10-29.zip
- :
$(baselibURL)/libart_lgpl-2.3.21--x86-gcc2-2010-10-29.zip
+ libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip
+ :
$(baselibURL)/libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip
:
: true
;
@@ -109,14 +98,15 @@
}
+# 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
+ libevent-1.4.13-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/libevent-1.4.13-x86-gcc2-2010-10-29.zip
:
: true
;
@@ -130,8 +120,8 @@
Echo "No optional package libmad available for $(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
- libmad-0.15.1--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/libmad-0.15.1--x86-gcc2-2010-10-29.zip
+ libmad-0.15.1-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/libmad-0.15.1-x86-gcc2-2010-10-29.zip
:
: true
;
@@ -145,8 +135,8 @@
Echo "No optional package libmikmod available for
$(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
- libmikmod-3.1.11--x86-gcc2-2010-10-29.zip
- :
$(baselibURL)/libmikmod-3.1.11--x86-gcc2-2010-10-29.zip
+ libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
:
: true
;
@@ -160,8 +150,8 @@
Echo "No optional package libmng available for $(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
- libmng-1.0.10--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/libmng-1.0.10--x86-gcc2-2010-10-29.zip
+ libmng-1.0.10-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/libmng-1.0.10-x86-gcc2-2010-10-29.zip
:
: true
;
@@ -175,8 +165,8 @@
Echo "No optional package libmodplug available for
$(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
- libmodplug-0.8.7--x86-gcc2-2010-10-29.zip
- :
$(baselibURL)/libmodplug-0.8.7--x86-gcc2-2010-10-29.zip
+ libmodplug-0.8.7-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/libmodplug-0.8.7-x86-gcc2-2010-10-29.zip
:
: true
;
@@ -190,8 +180,8 @@
Echo "No optional package libpaper available for
$(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
- libpaper-1.1.24--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/libpaper-1.1.24--x86-gcc2-2010-10-29.zip
+ libpaper-1.1.24-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/libpaper-1.1.24-x86-gcc2-2010-10-29.zip
:
: true
;
@@ -205,8 +195,8 @@
Echo "No optional package physfs available for $(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage
- physfs-2.0.1--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/physfs-2.0.1--x86-gcc2-2010-10-29.zip
+ physfs-2.0.1-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/physfs-2.0.1-x86-gcc2-2010-10-29.zip
:
: true
;
@@ -220,61 +210,28 @@
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-gcc-4-2010-10-29.zip
-# : $(baselibURL)/libsdl-1.2-hg-x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# sdl-gfx-2.0.20-x86-gcc-4-2010-10-29.zip
-# : $(baselibURL)/sdl-gfx-2.0.20-x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# sdl-image-1.2.10--x86-gcc4-2010-10-29.zip
-# :
$(baselibURL)/sdl-image-1.2.10--x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# sdl-mixer-1.2.11--x86-gcc4-2010-10-29.zip
-# :
$(baselibURL)/sdl-mixer-1.2.11--x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# sdl-net-1.2.7--x86-gcc4-2010-10-29.zip
-# : $(baselibURL)/sdl-net-1.2.7--x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# sdl-sound-1.0.3--x86-gcc4-2010-10-29.zip
-# :
$(baselibURL)/sdl-sound-1.0.3--x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# sdl-rtf-0.1.0-x86-gcc4-2010-10-29.zip
-# : $(baselibURL)/sdl-rtf-0.1.0-x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# sdl-ttf-2.0.10-x86-gcc4-2010-10-29.zip
-# : $(baselibURL)/sdl-ttf-2.0.10-x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# sge-030809--x86-gcc4-2010-10-29.zip
-# : $(baselibURL)/sge-030809--x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# smjpeg-0.2.1--x86-gcc4-2010-10-29.zip
-# : $(baselibURL)/smjpeg-0.2.1--x86-gcc4-2010-10-29.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
- : $(baselibURL)/libsdl-1.2-hg--x86-gcc2-2010-10-29.zip ;
+ libsdl-1.2-hg-x86-gcc-2-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
- : $(baselibURL)/guilib-1.2.1--x86-gcc2-2010-10-29.zip ;
+ guilib-1.2.1-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/guilib-1.2.1-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
- sdl-gfx-2.0.20--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/sdl-gfx-2.0.20--x86-gcc2-2010-10-29.zip
;
+ sdl-gfx-2.0.20-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/sdl-gfx-2.0.20-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
- sdl-image-1.2.10--x86-gcc2-2010-10-29.zip
- :
$(baselibURL)/sdl-image-1.2.10--x86-gcc2-2010-10-29.zip ;
+ sdl-image-1.2.10-x86-gcc2-2010-10-29.zip
+ :
$(baselibURL)/sdl-image-1.2.10-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
- sdl-mixer-1.2.11--x86-gcc2-2010-10-29.zip
- :
$(baselibURL)/sdl-mixer-1.2.11--x86-gcc2-2010-10-29.zip ;
+ sdl-mixer-1.2.11-x86-gcc2-2010-10-29.zip
+ :
$(baselibURL)/sdl-mixer-1.2.11-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
- sdl-net-1.2.7--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/sdl-net-1.2.7--x86-gcc2-2010-10-29.zip ;
+ sdl-net-1.2.7-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/sdl-net-1.2.7-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
- sdl-sound-1.0.3--x86-gcc2-2010-10-29.zip
- :
$(baselibURL)/sdl-sound-1.0.3--x86-gcc2-2010-10-29.zip ;
+ sdl-sound-1.0.3-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/sdl-sound-1.0.3-x86-gcc2-2010-10-29.zip
;
InstallOptionalHaikuImagePackage
sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip
: $(baselibURL)/sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip ;
@@ -282,14 +239,14 @@
sdl-ttf-2.0.10-x86-gcc2-2010-10-29.zip
: $(baselibURL)/sdl-ttf-2.0.10-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
- sge-030809--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/sge-030809--x86-gcc2-2010-10-29.zip ;
+ sge-030809-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/sge-030809-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
- smjpeg-0.2.1--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/smjpeg-0.2.1--x86-gcc2-2010-10-29.zip ;
+ smjpeg-0.2.1-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/smjpeg-0.2.1-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
- smpeg-0.4.5--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/smpeg-0.4.5--x86-gcc2-2010-10-29.zip ;
+ smpeg-0.4.5-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/smpeg-0.4.5-x86-gcc2-2010-10-29.zip ;
}
}
@@ -300,49 +257,28 @@
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-29.zip
-# : $(baselibURL)/flac-1.2.1--x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# libao-1.0.0--x86-gcc4-2010-10-29.zip
-# : $(baselibURL)/libao-1.0.0--x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# libogg-1.2.0--x86-gcc4-2010-10-29.zip
-# : $(baselibURL)/libogg-1.2.0--x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# libtheora-1.1.1-x86-gcc4-2010-10-29.zip
-# : $(baselibURL)/libtheora-1.1.1-x86-gcc4-2010-10-29.zip
;
-# InstallOptionalHaikuImagePackage
-# libvorbis-1.3.1--x86-gcc4-2010-10-29.zip
-# :
$(baselibURL)/libvorbis-1.3.1--x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# speex-1.2-git--x86-gcc4-2010-10-29.zip
-# : $(baselibURL)/speex-1.2-git--x86-gcc4-2010-10-29.zip ;
-# InstallOptionalHaikuImagePackage
-# vorbis-tools-1.4.0--x86-gcc4-2010-10-29.zip
-# :
$(baselibURL)/vorbis-tools-1.4.0--x86-gcc4-2010-10-29.zip ;
} else {
InstallOptionalHaikuImagePackage
- flac-1.2.1--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/flac-1.2.1--x86-gcc2-2010-10-29.zip ;
+ flac-1.2.1-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/flac-1.2.1-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
- libao-1.0.0--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/libao-1.0.0--x86-gcc2-2010-10-29.zip ;
+ libao-1.0.0-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/libao-1.0.0-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
- libogg-1.2.0--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/libogg-1.2.0--x86-gcc2-2010-10-29.zip ;
+ libogg-1.2.0-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/libogg-1.2.0-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
libtheora-1.1.1-x86-gcc2-2010-10-29.zip
: $(baselibURL)/libtheora-1.1.1-x86-gcc2-2010-10-29.zip
;
InstallOptionalHaikuImagePackage
- libvorbis-1.3.1--x86-gcc2-2010-10-29.zip
- :
$(baselibURL)/libvorbis-1.3.1--x86-gcc2-2010-10-29.zip ;
+ libvorbis-1.3.1-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/libvorbis-1.3.1-x86-gcc2-2010-10-29.zip
;
InstallOptionalHaikuImagePackage
- speex-1.2-git--x86-gcc2-2010-10-29.zip
- : $(baselibURL)/speex-1.2-git--x86-gcc2-2010-10-29.zip ;
+ speex-1.2-git-x86-gcc2-2010-10-29.zip
+ : $(baselibURL)/speex-1.2-git-x86-gcc2-2010-10-29.zip ;
InstallOptionalHaikuImagePackage
- vorbis-tools-1.4.0--x86-gcc2-2010-10-29.zip
- :
$(baselibURL)/vorbis-tools-1.4.0--x86-gcc2-2010-10-29.zip ;
+ vorbis-tools-1.4.0-x86-gcc2-2010-10-29.zip
+ :
$(baselibURL)/vorbis-tools-1.4.0-x86-gcc2-2010-10-29.zip ;
}
}
Other related posts:
