Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build against libpng16 instead of libpng.

Browse Source 
* Also migrate freetype at the same time, otherwise freetype_devel
wouldn't install anymore.
This commit is contained in:
Jérôme Duval 2014-11-12 22:59:26 +01:00
parent f44d20cb49
commit 242c022af8
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jamfile
View File

@ -27,7 +27,8 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
regular_image @{
bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jasper jpeg
less libicns libpng libwebp mesa mesa_devel mesa_swrast sed sharutils
less libicns libpng libpng16 libwebp mesa mesa_devel mesa_swrast
sed sharutils
tar tiff wget which
}@
] ;

6
build/jam/BuildFeatures
View File

@ -361,11 +361,11 @@ if [ IsPackageAvailable haikuwebkit_devel ] {
# libpng
if [ IsPackageAvailable libpng_devel ] {
ExtractBuildFeatureArchives libpng :
file: base libpng
file: base libpng16
runtime: lib
file: devel libpng_devel
file: devel libpng16_devel
depends: base
library: $(developLibDir)/libpng.so
library: $(developLibDir)/libpng16.so
headers: $(developHeadersDir)
;

2
build/jam/OptionalPackages
View File

@ -103,7 +103,7 @@ if [ IsOptionalHaikuImagePackageAdded Development ] {
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
AddHaikuImagePackages curl_devel ffmpeg_devel freetype_devel
glu_devel jpeg_devel libpng_devel zlib_devel ;
glu_devel jpeg_devel libpng16_devel zlib_devel ;
}
}
}

8
build/jam/repositories/HaikuPorts/x86
View File

@ -43,8 +43,8 @@ RemotePackageRepository HaikuPorts
ffmpeg_devel-0.10.2-4
flex-2.5.39-1
fossil-1.29-1
freetype-2.5.3-1
freetype_devel-2.5.3-1
freetype-2.5.3-4
freetype_devel-2.5.3-4
gawk-4.1.0-2
gcc-4.8.3_2014_07_26-2
gcc_syslibs-4.8.3_2014_07_26-2
@ -202,8 +202,8 @@ RemotePackageRepository HaikuPorts
expat_x86_gcc2_devel-2.0.1-7
ffmpeg_x86_gcc2-0.10.2-4
ffmpeg_x86_gcc2_devel-0.10.2-4
freetype_x86_gcc2-2.5.3-1
freetype_x86_gcc2_devel-2.5.3-1
freetype_x86_gcc2-2.5.3-4
freetype_x86_gcc2_devel-2.5.3-4
gcc_x86_gcc2-2.95.3_2014_07_26-1
gcc_x86_gcc2_syslibs_devel-2.95.3_2014_07_26-1
gettext_x86_gcc2-0.18.1.1-6

4
build/jam/repositories/HaikuPorts/x86_64
View File

@ -41,8 +41,8 @@ RemotePackageRepository HaikuPorts
flac_devel-1.3.0-3
flex-2.5.39-1
fossil-1.29-1
freetype-2.5.3-3
freetype_devel-2.5.3-3
freetype-2.5.3-4
freetype_devel-2.5.3-4
fribidi-0.19.6-2
fribidi_devel-0.19.6-2
gawk-4.1.0-2

8
build/jam/repositories/HaikuPorts/x86_gcc2
View File

@ -78,8 +78,8 @@ RemotePackageRepository HaikuPorts
fluidsynth-1.1.6-2
fluidsynth_devel-1.1.6-2
fossil-1.29-1
freetype-2.5.3-1
freetype_devel-2.5.3-1
freetype-2.5.3-4
freetype_devel-2.5.3-4
fribidi-0.19.5-1
fribidi_devel-0.19.5-1
friss-0.8.0-1
@ -403,8 +403,8 @@ RemotePackageRepository HaikuPorts
fontconfig_x86-2.11.1-2
fontconfig_x86_devel-2.11.1-2
freedroidrpg_x86-0.15.1-1
freetype_x86-2.5.3-3
freetype_x86_devel-2.5.3-3
freetype_x86-2.5.3-4
freetype_x86_devel-2.5.3-4
fribidi_x86-0.19.5-1
fribidi_x86_devel-0.19.5-1
gcc_x86-4.8.3_2014_07_26-3