Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 07:18:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updates in preparation for package sync on gcc2h.

Browse Source
This commit is contained in:
Augustin Cavalier 2024-08-10 17:34:55 -04:00
parent 9d62be21bf
commit 050c34d5d1
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jamfile
View File

@ -22,15 +22,15 @@ for architectureObject in [ MultiArchSubDirSetup ] {
AddHaikuImageSystemPackages [ FFilterByBuildFeatures AddHaikuImageSystemPackages [ FFilterByBuildFeatures
bash bc freetype zlib bash bc freetype zlib
!gcc2 @{ coreutils icu74 }@ !gcc2 @{ coreutils icu74 wget }@
gcc2 @{ coreutils_x86 icu icu74_x86@secondary_x86 }@ gcc2 @{ coreutils_x86 wget_x86 icu icu74_x86@secondary_x86 }@
regular_image @{ regular_image @{
bzip2 expat ffmpeg6 glu gutenprint9 gzip bzip2 expat ffmpeg6 glu gutenprint9 gzip
lame less libedit libicns lame less libedit libicns
mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2 mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2
netcat netcat
sed sharutils sed sharutils
unzip wget which zip unzip which zip
!gcc2 @{ diffutils findutils gawk grep tar tcpdump zstd }@ !gcc2 @{ diffutils findutils gawk grep tar tcpdump zstd }@
gcc2 @{ gcc2 @{

1
build/jam/ArchitectureRules
View File

@ -155,6 +155,7 @@ rule ArchitectureSetup architecture
if $(HAIKU_CC_IS_LEGACY_GCC_$(architecture)) = 1 { if $(HAIKU_CC_IS_LEGACY_GCC_$(architecture)) = 1 {
HAIKU_DEFINES_$(architecture) += _BEOS_R5_COMPATIBLE_ ; HAIKU_DEFINES_$(architecture) += _BEOS_R5_COMPATIBLE_ ;
HAIKU_WERROR_FLAGS_$(architecture) += -Wno-unknown-pragmas ;
} }
# private shared kernel/libroot headers # private shared kernel/libroot headers

4
build/jam/OptionalPackages
View File

@ -129,8 +129,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
# Git # Git
if [ IsOptionalHaikuImagePackageAdded Git ] { if [ IsOptionalHaikuImagePackageAdded Git ] {
AddHaikuImageSystemPackages git git_daemon perl ; AddHaikuImageSystemPackages git@!gcc2 git_x86@secondary_x86 ;
AddHaikuImageSourcePackages git ; AddHaikuImageSourcePackages git@!gcc2 git_x86@secondary_x86 ;
} }

11
src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
View File

@ -461,15 +461,22 @@ write_rgba32b(jas_matrix_t** pixels, uchar* scanline, int width)
// #pragma mark - jasper I/O // #pragma mark - jasper I/O
#if __GNUC__ == 2
typedef int jasper_length_t;
#else
typedef unsigned int jasper_length_t;
#endif
static int static int
Read(jas_stream_obj_t* object, char* buffer, const unsigned int length) Read(jas_stream_obj_t* object, char* buffer, const jasper_length_t length)
{ {
return (*(BPositionIO**)object)->Read(buffer, length); return (*(BPositionIO**)object)->Read(buffer, length);
} }
static int static int
Write(jas_stream_obj_t* object, const char* buffer, const unsigned int length) Write(jas_stream_obj_t* object, const char* buffer, const jasper_length_t length)
{ {
return (*(BPositionIO**)object)->Write(buffer, length); return (*(BPositionIO**)object)->Write(buffer, length);
} }

2
src/data/package_infos/x86/haiku_secondary
View File

@ -33,7 +33,7 @@ requires {
lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0 lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2 lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
#endif #endif
lib:libz_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libz_%HAIKU_SECONDARY_PACKAGING_ARCH%

2
src/data/package_infos/x86_gcc2/haiku_secondary
View File

@ -33,7 +33,7 @@ requires {
lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libpng16_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0 lib:libpng16_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.6 lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libavcodec_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 60 lib:libavcodec_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 60