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

Update ffmpeg package and its requirements

Browse Source 
Also make use of new build feature rules.
This commit is contained in:
Ingo Weinhold
2013-06-14 00:48:09 +02:00
parent e97e4b74a0
commit 14d5e307b4
5 changed files with 97 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+41 -108
View File
@@ -335,120 +335,53 @@ if $(TARGET_ARCH) = x86 {
local ffmpegBaseURL = $(baseURL)/lib ; local ffmpegBaseURL = $(baseURL)/lib ;
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_FFMPEG_FILE = ffmpeg-0.10.2-r1a4-x86-gcc4-2012-09-02.zip ; # TODO:...
HAIKU_SPEEX_FILE = speex-1.2rc1-r1a4-x86-gcc4-2012-09-02.zip ; HAIKU_FFMPEG_PACKAGE = ffmpeg-0.10.2-r1a4-x86-gcc4-2012-09-02.zip ;
HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-r1a4-x86-gcc4-2012-09-02.zip ; HAIKU_SPEEX_PACKAGE = speex-1.2rc1-r1a4-x86-gcc4-2012-09-02.zip ;
HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-r1a4-x86-gcc4-2012-09-02.zip ; HAIKU_LIBTHEORA_PACKAGE = libtheora-1.1.1-r1a4-x86-gcc4-2012-09-02.zip ;
HAIKU_LIBOGG_FILE = libogg-1.3.0-r1a4-x86-gcc4-2012-09-02.zip ; HAIKU_LIBVORBIS_PACKAGE = libvorbis-1.3.2-r1a4-x86-gcc4-2012-09-02.zip ;
HAIKU_LIBVPX_FILE = libvpx-1.0.0-r1a4-x86-gcc4-2012-09-02.zip ; HAIKU_LIBOGG_PACKAGE = libogg-1.3.0-r1a4-x86-gcc4-2012-09-02.zip ;
HAIKU_LIBVPX_PACKAGE = libvpx-1.0.0-r1a4-x86-gcc4-2012-09-02.zip ;
} else { } else {
HAIKU_FFMPEG_FILE = ffmpeg-0.10.2-r1a4-x86-gcc2-2012-08-30.zip ; HAIKU_FFMPEG_PACKAGE = ffmpeg-0.10.2-1-x86_gcc2.hpkg ;
HAIKU_SPEEX_FILE = speex-1.2rc1-r1a4-x86-gcc2-2012-08-29.zip ; HAIKU_FFMPEG_DEVEL_PACKAGE = ffmpeg_devel-0.10.2-1-x86_gcc2.hpkg ;
HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-r1a4-x86-gcc2-2012-08-29.zip ; HAIKU_SPEEX_PACKAGE = speex-1.2~rc1-1-x86_gcc2.hpkg ;
HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-r1a4-x86-gcc2-2012-08-29.zip ; HAIKU_SPEEX_DEVEL_PACKAGE = speex_devel-1.2~rc1-1-x86_gcc2.hpkg ;
HAIKU_LIBOGG_FILE = libogg-1.3.0-r1a4-x86-gcc2-2012-08-29.zip ; HAIKU_LIBTHEORA_PACKAGE = libtheora-1.1.1-1-x86_gcc2.hpkg ;
HAIKU_LIBVPX_FILE = libvpx-1.0.0-r1a4-x86-gcc2-2012-08-29.zip ; HAIKU_LIBTHEORA_DEVEL_PACKAGE = libtheora_devel-1.1.1-1-x86_gcc2.hpkg ;
HAIKU_LIBVORBIS_PACKAGE = libvorbis-1.3.2-1-x86_gcc2.hpkg ;
HAIKU_LIBVORBIS_DEVEL_PACKAGE = libvorbis_devel-1.3.2-1-x86_gcc2.hpkg ;
HAIKU_LIBOGG_PACKAGE = libogg-1.3.0-1-x86_gcc2.hpkg ;
HAIKU_LIBOGG_DEVEL_PACKAGE = libogg_devel-1.3.0-1-x86_gcc2.hpkg ;
HAIKU_LIBVPX_PACKAGE = libvpx-1.0.0-1-x86_gcc2.hpkg ;
HAIKU_LIBVPX_DEVEL_PACKAGE = libvpx_devel-1.0.0-1-x86_gcc2.hpkg ;
} }
local ffmpegZipFile = [ DownloadFile $(HAIKU_FFMPEG_FILE) local ffmpegLibs = libavformat.so libavcodec.so libavdevice.so
: $(ffmpegBaseURL)/$(HAIKU_FFMPEG_FILE) ] ; libavfilter.so libswscale.so libavutil.so ;
local speexZipFile = [ DownloadFile $(HAIKU_SPEEX_FILE) local speexLibs = libspeex.so ;
: $(ffmpegBaseURL)/$(HAIKU_SPEEX_FILE) ] ; local libtheoraLibs = libtheora.so libtheoradec.so libtheoraenc.so ;
local libtheoraZipFile = [ DownloadFile $(HAIKU_LIBTHEORA_FILE) local libvorbisLibs = libvorbis.so libvorbisenc.so ;
: $(ffmpegBaseURL)/$(HAIKU_LIBTHEORA_FILE) ] ; local liboggLibs = libogg.so ;
local libvorbisZipFile = [ DownloadFile $(HAIKU_LIBVORBIS_FILE) local libvpxLibs = libvpx.so ;
: $(ffmpegBaseURL)/$(HAIKU_LIBVORBIS_FILE) ] ;
local liboggZipFile = [ DownloadFile $(HAIKU_LIBOGG_FILE)
: $(ffmpegBaseURL)/$(HAIKU_LIBOGG_FILE) ] ;
local libvpxZipFile = [ DownloadFile $(HAIKU_LIBVPX_FILE)
: $(ffmpegBaseURL)/$(HAIKU_LIBVPX_FILE) ] ;
HAIKU_FFMPEG_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) local feature ;
$(HAIKU_FFMPEG_FILE:B) ] ; for feature in ffmpeg speex libtheora libvorbis libogg libvpx {
HAIKU_SPEEX_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) HAIKU_$(feature:U)_URL = $(hpkgBaseURL)/$(HAIKU_$(feature:U)_PACKAGE) ;
$(HAIKU_SPEEX_FILE:B) ] ; HAIKU_$(feature:U)_DEVEL_URL
HAIKU_LIBTHEORA_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) = $(hpkgBaseURL)/$(HAIKU_$(feature:U)_DEVEL_PACKAGE) ;
$(HAIKU_LIBTHEORA_FILE:B) ] ;
HAIKU_LIBVORBIS_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(HAIKU_LIBVORBIS_FILE:B) ] ;
HAIKU_LIBOGG_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(HAIKU_LIBOGG_FILE:B) ] ;
HAIKU_LIBVPX_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(HAIKU_LIBVPX_FILE:B) ] ;
HAIKU_FFMPEG_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_FFMPEG_DIR) ExtractBuildFeatureArchives $(feature) :
: common/include/ : $(ffmpegZipFile) : extracted-ffmpeg ] ; file: base $(HAIKU_$(feature:U)_URL)
HAIKU_SPEEX_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_SPEEX_DIR) runtime: lib
: common/include/ : $(speexZipFile) : extracted-speex ] ; file: devel $(HAIKU_$(feature:U)_DEVEL_URL)
HAIKU_LIBTHEORA_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_LIBTHEORA_DIR) depends: base
: common/include/ : $(libtheoraZipFile) : extracted-libtheora ] ; libraries: develop/lib/$($(feature)Libs)
HAIKU_LIBVORBIS_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_LIBVORBIS_DIR) headers: develop/headers
: common/include/ : $(libvorbisZipFile) : extracted-libvorbis ] ; ;
HAIKU_LIBOGG_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_LIBOGG_DIR)
: common/include/ : $(liboggZipFile) : extracted-libogg ] ;
HAIKU_LIBVPX_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_LIBVPX_DIR)
: common/include/ : $(libvpxZipFile) : extracted-libvpx ] ;
HAIKU_FFMPEG_LIBS = [ ExtractArchive $(HAIKU_FFMPEG_DIR) EnableBuildFeatures $(feature) ;
: }
common/lib/libavformat.a
common/lib/libavcodec.a
common/lib/libavdevice.a
common/lib/libavfilter.a
common/lib/libswscale.a
common/lib/libavutil.a
: $(ffmpegZipFile)
: extracted-ffmpeg ] ;
Depends $(HAIKU_FFMPEG_LIBS) : $(HAIKU_FFMPEG_HEADERS_DEPENDENCY) ;
HAIKU_SPEEX_LIBS = [ ExtractArchive $(HAIKU_SPEEX_DIR)
:
common/lib/libspeex.a
: $(speexZipFile)
: extracted-speex ] ;
Depends $(HAIKU_SPEEX_LIBS) : $(HAIKU_SPEEX_HEADERS_DEPENDENCY) ;
HAIKU_LIBTHEORA_LIBS = [ ExtractArchive $(HAIKU_LIBTHEORA_DIR)
:
common/lib/libtheora.a
common/lib/libtheoradec.a
common/lib/libtheoraenc.a
: $(libtheoraZipFile)
: extracted-libtheora ] ;
Depends $(HAIKU_LIBTHEORA_LIBS) : $(HAIKU_LIBTHEORA_HEADERS_DEPENDENCY) ;
HAIKU_LIBVORBIS_LIBS = [ ExtractArchive $(HAIKU_LIBVORBIS_DIR)
:
common/lib/libvorbis.a
common/lib/libvorbisenc.a
: $(libvorbisZipFile)
: extracted-libvorbis ] ;
Depends $(HAIKU_LIBVORBIS_LIBS) : $(HAIKU_LIBVORBIS_HEADERS_DEPENDENCY) ;
HAIKU_LIBOGG_LIBS = [ ExtractArchive $(HAIKU_LIBOGG_DIR)
:
common/lib/libogg.a
: $(liboggZipFile)
: extracted-libogg ] ;
Depends $(HAIKU_LIBOGG_LIBS) : $(HAIKU_LIBOGG_HEADERS_DEPENDENCY) ;
HAIKU_LIBVPX_LIBS = [ ExtractArchive $(HAIKU_LIBVPX_DIR)
:
common/lib/libvpx.a
: $(libvpxZipFile)
: extracted-libvpx ] ;
Depends $(HAIKU_LIBVPX_LIBS) : $(HAIKU_LIBVPX_HEADERS_DEPENDENCY) ;
HAIKU_FFMPEG_HEADERS = [ FDirName $(HAIKU_FFMPEG_DIR) common include ] ;
HAIKU_SPEEX_HEADERS = [ FDirName $(HAIKU_SPEEX_DIR) common include ] ;
HAIKU_LIBTHEORA_HEADERS = [ FDirName $(HAIKU_LIBTHEORA_DIR) common include ] ;
HAIKU_LIBVORBIS_HEADERS = [ FDirName $(HAIKU_LIBVORBIS_DIR) common include ] ;
HAIKU_LIBOGG_HEADERS = [ FDirName $(HAIKU_LIBOGG_DIR) common include ] ;
HAIKU_LIBVPX_HEADERS = [ FDirName $(HAIKU_LIBVPX_DIR) common include ] ;
EnableBuildFeatures ffmpeg ;
} else { } else {
Echo "FFMpeg support not available on $(TARGET_ARCH)" ; Echo "FFMpeg support not available on $(TARGET_ARCH)" ;
} }
build/jam/OptionalPackageDependencies
+2 -2
View File
@@ -12,7 +12,7 @@ OptionalPackageDependencies CDRecord : GetTextLibintl LibIconv ;
OptionalPackageDependencies Curl : OpenSSL ; OptionalPackageDependencies Curl : OpenSSL ;
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ; OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies Development OptionalPackageDependencies Development
: DevelopmentBase GLU-devel Perl Zlib-devel ; : DevelopmentBase FFMpeg-devel GLU-devel Perl Zlib-devel ;
OptionalPackageDependencies DevelopmentPowerPC : DevelopmentMin ; OptionalPackageDependencies DevelopmentPowerPC : DevelopmentMin ;
OptionalPackageDependencies GetText : GetTextLibintl ; OptionalPackageDependencies GetText : GetTextLibintl ;
OptionalPackageDependencies GetTextLibintl : LibIconv ; OptionalPackageDependencies GetTextLibintl : LibIconv ;
@@ -46,4 +46,4 @@ OptionalPackageDependencies XZ-Utils : Tar ;
OptionalPackageDependencies Zlib-devel : Zlib ; OptionalPackageDependencies Zlib-devel : Zlib ;
OptionalPackageDependencies MandatoryPackages OptionalPackageDependencies MandatoryPackages
: Bzip Ctags GLU Grep ICU LibSolv Mesa Sed Tar Zlib ; : Bzip Ctags FFMpeg GLU Grep ICU LibSolv Mesa Sed Tar Zlib ;
build/jam/OptionalPackages
+30
View File
@@ -44,6 +44,8 @@
# Droid - Font family from Google's Android project # Droid - Font family from Google's Android project
# Expat - XML parsing libraries # Expat - XML parsing libraries
# Fastdep - fast dependency generator for C/C++ files # Fastdep - fast dependency generator for C/C++ files
# FFMpeg - audio/video library
# FFMpeg-devel - FFMpeg development files
# friss - RSS/ATOM/... feeds reader # friss - RSS/ATOM/... feeds reader
# GetText - a framework to help produce multi-lingual messages. # GetText - a framework to help produce multi-lingual messages.
# GetTextLibintl - GetText's libintl # GetTextLibintl - GetText's libintl
@@ -858,6 +860,34 @@ if [ IsOptionalHaikuImagePackageAdded Fastdep ] {
} }
# FFMpeg
if [ IsOptionalHaikuImagePackageAdded FFMpeg ] {
if $(TARGET_ARCH) = x86 {
local feature ;
for feature in ffmpeg speex libtheora libvorbis libogg libvpx {
InstallOptionalHaikuImagePackage $(HAIKU_$(feature:U)_URL)
: system ;
}
} else {
Echo "No optional package FFMpeg available for $(TARGET_ARCH)" ;
}
}
# FFMpeg-devel
if [ IsOptionalHaikuImagePackageAdded FFMpeg-devel ] {
if $(TARGET_ARCH) = x86 {
local feature ;
for feature in ffmpeg speex libtheora libvorbis libogg libvpx {
InstallOptionalHaikuImagePackage $(HAIKU_$(feature:U)_DEVEL_URL)
: system ;
}
} else {
Echo "No optional package FFMpeg-devel available for $(TARGET_ARCH)" ;
}
}
# friss # friss
if [ IsOptionalHaikuImagePackageAdded friss ] { if [ IsOptionalHaikuImagePackageAdded friss ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
src/add-ons/media/media-add-ons/dvb/Jamfile
+7 -6
View File
@@ -2,10 +2,11 @@ SubDir HAIKU_TOP src add-ons media media-add-ons dvb ;
UsePrivateHeaders drivers ; UsePrivateHeaders drivers ;
UseHeaders [ FDirName $(HAIKU_FFMPEG_HEADERS) ] ; local ffmpegHeaders = [ BuildFeatureAttribute ffmpeg : headers : path ] ;
UseHeaders [ FDirName $(HAIKU_FFMPEG_HEADERS) libavcodec ] ; UseHeaders $(ffmpegHeaders) ;
UseHeaders [ FDirName $(HAIKU_FFMPEG_HEADERS) libavformat ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavcodec ] ;
UseHeaders [ FDirName $(HAIKU_FFMPEG_HEADERS) libavutil ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavformat ] ;
UseHeaders [ FDirName $(ffmpegHeaders) libavutil ] ;
Addon dvb.media_addon : Addon dvb.media_addon :
@@ -21,5 +22,5 @@ Addon dvb.media_addon :
: be media $(TARGET_LIBSUPC++) : be media $(TARGET_LIBSUPC++)
; ;
Includes [ FGristFiles MediaFormat.cpp ] : $(HAIKU_FFMPEG_HEADERS_DEPENDENCY) ; Includes [ FGristFiles MediaFormat.cpp ]
: [ BuildFeatureAttribute ffmpeg : headers ] ;
src/add-ons/media/plugins/ffmpeg/Jamfile
+17 -15
View File
@@ -25,16 +25,18 @@ local sources =
; ;
SubDirSysHdrs $(HAIKU_FFMPEG_HEADERS) ; UseBuildFeatureHeaders ffmpeg ;
Includes [ FGristFiles $(sources) ] : $(HAIKU_FFMPEG_HEADERS_DEPENDENCY) ; Includes [ FGristFiles $(sources) ]
: [ BuildFeatureAttribute ffmpeg : headers ] ;
UseHeaders [ FDirName $(HAIKU_FFMPEG_HEADERS) ] ; local ffmpegHeaders = [ BuildFeatureAttribute ffmpeg : headers : path ] ;
UseHeaders [ FDirName $(HAIKU_FFMPEG_HEADERS) libavcodec ] ; UseHeaders $(ffmpegHeaders) ;
UseHeaders [ FDirName $(HAIKU_FFMPEG_HEADERS) libavdevice ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavcodec ] ;
UseHeaders [ FDirName $(HAIKU_FFMPEG_HEADERS) libavfilter ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavdevice ] ;
UseHeaders [ FDirName $(HAIKU_FFMPEG_HEADERS) libavformat ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavfilter ] ;
UseHeaders [ FDirName $(HAIKU_FFMPEG_HEADERS) libavutil ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavformat ] ;
UseHeaders [ FDirName $(HAIKU_FFMPEG_HEADERS) libswscale ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavutil ] ;
UseHeaders [ FDirName $(ffmpegHeaders) libswscale ] ;
Addon ffmpeg : Addon ffmpeg :
$(sources) $(sources)
@@ -45,13 +47,13 @@ Addon ffmpeg :
: :
# FFmpeg libraries (from FFmpeg optional package): # FFmpeg libraries (from FFmpeg optional package):
$(HAIKU_FFMPEG_LIBS) [ BuildFeatureAttribute ffmpeg : libraries ]
$(HAIKU_SPEEX_LIBS) [ BuildFeatureAttribute speex : libraries ]
$(HAIKU_LIBTHEORA_LIBS) [ BuildFeatureAttribute libtheora : libraries ]
$(HAIKU_LIBVORBIS_LIBS) [ BuildFeatureAttribute libvorbis : libraries ]
$(HAIKU_LIBOGG_LIBS) [ BuildFeatureAttribute libogg : libraries ]
$(HAIKU_LIBVPX_LIBS) [ BuildFeatureAttribute libvpx : libraries ]
libbz2_ffmpeg.a libbz2_ffmpeg.a
be be