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

Update jpeg package

Browse Source 
* Also make use of new build feature rules.
* Since the hacky long_jump_buffer field has been removed from the
  jpeg_error_mgr struct in the new package, the structure is now
  wrapped in the JPEGTranslator code to achieve the same behavior.
This commit is contained in:
Ingo Weinhold
2013-06-14 00:48:11 +02:00
parent e9f440fdfd
commit e4bd005daf
12 changed files with 99 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+17 -30
View File
@@ -550,44 +550,31 @@ if $(TARGET_ARCH) in arm ppc x86 x86_64 {
local jpegBaseURL = $(baseURL)/lib ;
if $(TARGET_ARCH) in arm ppc x86 x86_64 {
if $(TARGET_ARCH) = arm {
HAIKU_JPEG_FILE = jpeg-8d-arm-2012-11-21.zip ;
HAIKU_JPEG_PACKAGE = jpeg-8d-arm-2012-11-21.zip ;
} else if $(TARGET_ARCH) = ppc {
HAIKU_JPEG_FILE = jpeg-8d-ppc-gcc4-2012-08-27.zip ;
HAIKU_JPEG_PACKAGE = jpeg-8d-ppc-gcc4-2012-08-27.zip ;
} else if $(TARGET_ARCH) = x86_64 {
HAIKU_JPEG_FILE = jpeg-8d-x86_64-2012-11-18.zip ;
HAIKU_JPEG_PACKAGE = jpeg-8d-x86_64-2012-11-18.zip ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_JPEG_FILE = jpeg-8d-x86-gcc4-2012-08-23.zip ;
HAIKU_JPEG_PACKAGE = jpeg-8d-x86-gcc4-2012-08-23.zip ;
} else {
HAIKU_JPEG_FILE = jpeg-8d-x86-gcc2-2012-08-23.zip ;
HAIKU_JPEG_PACKAGE = jpeg-9-2-x86_gcc2.hpkg ;
HAIKU_JPEG_DEVEL_PACKAGE = jpeg_devel-9-2-x86_gcc2.hpkg ;
}
local jpegZipFile = [ DownloadFile $(HAIKU_JPEG_FILE)
: $(jpegBaseURL)/$(HAIKU_JPEG_FILE) ] ;
HAIKU_JPEG_URL = $(hpkgBaseURL)/$(HAIKU_JPEG_PACKAGE) ;
HAIKU_JPEG_DEVEL_URL = $(hpkgBaseURL)/$(HAIKU_JPEG_DEVEL_PACKAGE) ;
HAIKU_JPEG_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(HAIKU_JPEG_FILE:B) ] ;
ExtractBuildFeatureArchives jpeg :
file: base $(HAIKU_JPEG_URL)
runtime: lib
file: devel $(HAIKU_JPEG_DEVEL_URL)
depends: base
library: develop/lib/libjpeg.so
headers: develop/headers
;
HAIKU_JPEG_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_JPEG_DIR)
: common/include : $(jpegZipFile)
: extracted-jpeg ] ;
HAIKU_JPEG_LIB = [ ExtractArchive $(HAIKU_JPEG_DIR)
:
common/lib/libjpeg.so
: $(jpegZipFile)
: extracted-jpeg ] ;
HAIKU_JPEG_CURRENT_LIB = [ ExtractArchive $(HAIKU_JPEG_DIR)
:
common/lib/libjpeg.so.8.4.0
: $(jpegZipFile)
: extracted-jpeg ] ;
Depends $(HAIKU_JPEG_LIB) $(HAIKU_JPEG_CURRENT_LIB) : $(HAIKU_JPEG_HEADERS_DEPENDENCY) ;
HAIKU_JPEG_CURRENT_LINK = libjpeg.so.8 ;
HAIKU_JPEG_HEADERS = [ FDirName $(HAIKU_JPEG_DIR) common include ] ;
EnableBuildFeatures libjpeg ;
EnableBuildFeatures jpeg ;
} else {
Echo "jpeg support not available on $(TARGET_ARCH)" ;
}
build/jam/HaikuImage
-1
View File
@@ -76,7 +76,6 @@ SYSTEM_LIBS = [ FFilterByBuildFeatures
$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
] ;
PRIVATE_SYSTEM_LIBS = [ FFilterByBuildFeatures
$(HAIKU_JPEG_CURRENT_LIB)
libalm.so
libfluidsynth.so
libilmimf.so
build/jam/OptionalPackageDependencies
+5 -3
View File
@@ -12,7 +12,7 @@ OptionalPackageDependencies CDRecord : GetTextLibintl LibIconv ;
OptionalPackageDependencies Curl : OpenSSL ;
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies Development :
DevelopmentBase FFMpeg-devel FreeType-devel GLU-devel Libpng-devel Perl
DevelopmentBase FFMpeg-devel FreeType-devel GLU-devel Jpeg Libpng-devel Perl
Zlib-devel
;
OptionalPackageDependencies DevelopmentPowerPC : DevelopmentMin ;
@@ -47,5 +47,7 @@ OptionalPackageDependencies wpa_supplicant : OpenSSL ;
OptionalPackageDependencies XZ-Utils : Tar ;
OptionalPackageDependencies Zlib-devel : Zlib ;
OptionalPackageDependencies MandatoryPackages
: Bzip Ctags FFMpeg FreeType GLU Grep ICU Libpng LibSolv Mesa Sed Tar Zlib ;
OptionalPackageDependencies MandatoryPackages :
Bzip Ctags FFMpeg FreeType GLU Grep ICU Jpeg Libpng LibSolv Mesa Sed Tar
Zlib
;
build/jam/OptionalPackages
+22
View File
@@ -60,6 +60,8 @@
# Groff - text formatter used for man pages
# HGrep - header grep tool
# ICU-devel - the headers and lib-links for ICU (for development)
# Jpeg - JPEG image compression library and tools
# Jpeg-devel - the Jpeg development files
# KeymapSwitcher - Easy to use keymap switcher
# LGrep - Library Grep tool
# LibEdit - A BSD licensed replacement for GNU readline
@@ -1131,6 +1133,26 @@ if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
}
# Jpeg
if [ IsOptionalHaikuImagePackageAdded Jpeg ] {
if $(TARGET_ARCH) in arm ppc x86 x86_64 {
InstallOptionalHaikuImagePackage $(HAIKU_JPEG_URL) : system ;
} else {
Echo "No optional package Jpeg available for $(TARGET_ARCH)" ;
}
}
# Jpeg-devel
if [ IsOptionalHaikuImagePackageAdded Jpeg-devel ] {
if $(TARGET_ARCH) in arm ppc x86 x86_64 {
InstallOptionalHaikuImagePackage $(HAIKU_JPEG_DEVEL_URL) : system ;
} else {
Echo "No optional package Jpeg-devel available for $(TARGET_ARCH)" ;
}
}
# KeymapSwitcher
if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
if $(TARGET_ARCH) = x86 {
build/jam/packages/Haiku
-13
View File
@@ -102,19 +102,6 @@ SYSTEM_LIBS_ALIASES =
libnetapi.so
;
OPTIONAL_LIBS_ALIASES =
libjpeg.so
libz.so
;
# TODO: Remove the following symlinks when the libraries have been packaged
# properly!
# libjpeg.so links to the current libjpeg
AddSymlinkToPackage lib : $(HAIKU_JPEG_CURRENT_LIB:BS)
: $(HAIKU_JPEG_CURRENT_LINK) : : true ;
AddSymlinkToPackage lib : $(HAIKU_JPEG_CURRENT_LINK)
: libjpeg.so : : true ;
# TODO: Remove when the packages have been rebuilt!
AddSymlinkToPackage lib : libbe.so : liblocale.so ;
build/jam/packages/HaikuDevel
-2
View File
@@ -71,8 +71,6 @@ AddHeaderDirectoryToPackage compatibility gnu : gnu ;
AddHeaderDirectoryToPackage libs termcap : 3rdparty ;
AddHeaderDirectoryToPackage libs tiff : 3rdparty ;
CopyDirectoryToPackage develop headers : $(HAIKU_JPEG_HEADERS_DEPENDENCY)
: 3rdparty : : isTarget ;
# cpp headers
if $(HAIKU_GCC_VERSION[1]) = 2 {
# GCC 2 only -- for GCC 4 they come with the DevelopmentBase package