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

Merge branch 'master' into x86_64

Browse Source 
Conflicts:
	src/servers/app/ServerWindow.cpp
This commit is contained in:
Alex Smith
2012-08-16 21:11:15 +01:00
parent 602d9c96a5 8ffa652cac
commit e688bf23d4
445 changed files with 7063 additions and 5041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+1 -1
View File
@@ -128,7 +128,7 @@ SYSTEM_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant
SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
HVIFTranslator ICOTranslator JPEGTranslator JPEG2000Translator
PCXTranslator PNGTranslator PPMTranslator
RAWTranslator RTF-Translator SGITranslator STXTTranslator TGATranslator
RAWTranslator RTFTranslator SGITranslator STXTTranslator TGATranslator
TIFFTranslator WebPTranslator WonderBrushTranslator
;
SYSTEM_ADD_ONS_LOCALE_CATALOGS = <catalog-addon>plaintext ;
build/jam/LocaleRules
+3 -6
View File
@@ -17,11 +17,7 @@ rule ExtractCatalogEntries target : sources : signature : regexp
defines = $(DEFINES) ;
headers = $(HAIKU_CONFIG_HEADERS) $(SEARCH_SOURCE) $(SUBDIRHDRS)
$(HDRS) ;
# insert specific header folder containing the Catalog.h that should be
# used when collecting the catalog keys:
sysHeaders = [ FDirName $(HAIKU_TOP) headers private locale collecting ]
$(SUBDIRSYSHDRS) $(SYSHDRS) ;
sysHeaders = $(SUBDIRSYSHDRS) $(SYSHDRS) ;
if $(PLATFORM) = host {
sysHeaders += $(HOST_HDRS) ;
@@ -71,7 +67,8 @@ rule ExtractCatalogEntries target : sources : signature : regexp
actions ExtractCatalogEntries1
{
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
cat "$(2[2-])" | $(CC) -E $(CCDEFS) $(HDRS) - > "$(1)".pre
cat "$(2[2-])" \
| $(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) - > "$(1)".pre
$(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \
-w -o "$(1)" "$(1)".pre
}
build/jam/OptionalBuildFeatures
+2 -2
View File
@@ -228,14 +228,14 @@ if $(TARGET_ARCH) = x86 {
local ffmpegBaseURL = $(baseURL)/lib ;
if $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_FFMPEG_FILE = ffmpeg-0.11.1-x86-gcc4-2012-08-07.zip ;
HAIKU_FFMPEG_FILE = ffmpeg-0.10.2-x86-gcc4-2012-03-28.zip ;
HAIKU_SPEEX_FILE = speex-1.2rc1-x86-gcc4-2012-03-12.zip ;
HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-x86-gcc4-2012-03-12.zip ;
HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-x86-gcc4-2012-03-12.zip ;
HAIKU_LIBOGG_FILE = libogg-1.3.0-x86-gcc4-2012-03-12.zip ;
HAIKU_LIBVPX_FILE = libvpx-1.0.0-x86-gcc4-2012-03-14.zip ;
} else {
HAIKU_FFMPEG_FILE = ffmpeg-0.11.1-x86-gcc2-2012-08-06.zip ;
HAIKU_FFMPEG_FILE = ffmpeg-0.10.2-x86-gcc2-2012-03-28.zip ;
HAIKU_SPEEX_FILE = speex-1.2rc1-x86-gcc2-2012-03-11.zip ;
HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-x86-gcc2-2012-03-11.zip ;
HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-x86-gcc2-2012-03-11.zip ;
build/jam/OptionalLibPackages
+2 -2
View File
@@ -233,11 +233,11 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] {
guilib-1.2.1-x86-gcc4-2012-05-31.zip
: $(baseURL)/lib/guilib-1.2.1-x86-gcc4-2012-05-31.zip ;
InstallOptionalHaikuImagePackage
sdl-gfx-2.0.23-x86-gcc4-2011-05-31.zip
sdl-gfx-2.0.23-x86-gcc4-2012-05-31.zip
: $(baseURL)/lib/sdl-gfx-2.0.23-x86-gcc4-2012-05-31.zip ;
InstallOptionalHaikuImagePackage
sdl-image-1.2.12-x86-gcc4-2012-05-31.zip
: $(baseURL)/lib/sdl-image-1.2.12-x86-gcc4-2011-05-31.zip ;
: $(baseURL)/lib/sdl-image-1.2.12-x86-gcc4-2012-05-31.zip ;
InstallOptionalHaikuImagePackage
sdl-mixer-1.2.11-x86-gcc4-2012-05-31.zip
: $(baseURL)/lib/sdl-mixer-1.2.11-x86-gcc4-2012-05-31.zip ;
build/jam/OptionalPackages
+22 -12
View File
@@ -209,18 +209,23 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] {
if [ IsOptionalHaikuImagePackageAdded Beam ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Beam available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package Beam available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage Beam-1.2alpha-x86-gcc2-2012-06-04.zip
: $(baseURL)/Beam-1.2alpha-x86-gcc2-2012-06-04.zip ;
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
beam-1.2alpha-x86-gcc4-2012-08-11.zip
: $(baseURL)/beam-1.2alpha-x86-gcc4-2012-08-11.zip ;
} else {
InstallOptionalHaikuImagePackage
Beam-1.2alpha-x86-gcc2-2012-06-04.zip
: $(baseURL)/Beam-1.2alpha-x86-gcc2-2012-06-04.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/Beam/Beam ;
}
}
# BeBook
# bebook
if [ IsOptionalHaikuImagePackageAdded BeBook ] {
InstallOptionalHaikuImagePackage bebook_20081026.zip
: $(baseURL)/bebook_20081026.zip
@@ -267,12 +272,16 @@ if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] {
if [ IsOptionalHaikuImagePackageAdded BePDF ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package BePDF available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package BePDF available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage
bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip
: $(baseURL)/bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip ;
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
bepdf-1.1.1b4-x86-gcc4-2012-08-11.zip
: $(baseURL)/bepdf-1.1.1b4-x86-gcc4-2012-08-11.zip ;
} else {
InstallOptionalHaikuImagePackage
bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip
: $(baseURL)/bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/BePDF/BePDF ;
}
@@ -1249,8 +1258,9 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package LibLayout available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package LibLayout available for gcc4" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage liblayout-1.4.1-gcc4-2012-08-11.zip
: $(baseURL)/liblayout-1.4.1-gcc4-2012-08-11.zip ;
} else {
InstallOptionalHaikuImagePackage liblayout-1.4.0-gcc2-2009-03-08.zip
: $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip ;