Update ffmpeg packages for x86 and x86_64.
* add ffmpeg2 package for x86 for compatibility. * specify required versions of ffmpeg and icu for haiku packages x86 and x86_64.
This commit is contained in:
@@ -87,8 +87,10 @@ RemotePackageRepository HaikuPorts
|
||||
file-5.15-1
|
||||
file_devel-5.15-1
|
||||
findutils-4.4.2-3
|
||||
ffmpeg-2.8.2-2
|
||||
ffmpeg_devel-2.8.2-2
|
||||
ffmpeg-3.0.1-1
|
||||
ffmpeg_devel-3.0.1-1
|
||||
ffmpeg2-2.8.6-1
|
||||
ffmpeg2_devel-2.8.6-1
|
||||
flac-1.3.1-1
|
||||
flac_devel-1.3.1-1
|
||||
flex-2.5.39-2
|
||||
@@ -449,6 +451,7 @@ RemotePackageRepository HaikuPorts
|
||||
file
|
||||
findutils
|
||||
ffmpeg
|
||||
ffmpeg2
|
||||
flac
|
||||
flex
|
||||
fossil
|
||||
|
||||
@@ -92,8 +92,8 @@ RemotePackageRepository HaikuPorts
|
||||
file-5.25-1
|
||||
file_devel-5.25-1
|
||||
findutils-4.4.2-1
|
||||
ffmpeg-3.0-1
|
||||
ffmpeg_devel-3.0-1
|
||||
ffmpeg-3.0.1-1
|
||||
ffmpeg_devel-3.0.1-1
|
||||
ffmpeg2-2.8.6-1
|
||||
ffmpeg2_devel-2.8.6-1
|
||||
flac-1.3.1-1
|
||||
|
||||
@@ -64,14 +64,14 @@ requires {
|
||||
lib:libcurl
|
||||
lib:libfreetype
|
||||
lib:libgcc_s
|
||||
lib:libicudata
|
||||
lib:libicui18n
|
||||
lib:libicuio
|
||||
lib:libicule
|
||||
lib:libiculx
|
||||
lib:libicutest
|
||||
lib:libicutu
|
||||
lib:libicuuc
|
||||
lib:libicudata >= 56
|
||||
lib:libicui18n >= 56
|
||||
lib:libicuio >= 56
|
||||
lib:libicule >= 56
|
||||
lib:libiculx >= 56
|
||||
lib:libicutest >= 56
|
||||
lib:libicutu >= 56
|
||||
lib:libicuuc >= 56
|
||||
lib:libncurses >= 6.0
|
||||
#ifdef HAIKU_REGULAR_BUILD
|
||||
#ifdef HAIKU_BUILD_FEATURE_X86_EXPAT_ENABLED
|
||||
@@ -103,6 +103,16 @@ requires {
|
||||
lib:libssl >= 1.0.0
|
||||
lib:libcrypto >= 1.0.0
|
||||
#endif
|
||||
#ifdef HAIKU_BUILD_FEATURE_X86_FFMPEG_ENABLED
|
||||
lib:libavcodec >= 57
|
||||
lib:libavdevice >= 57
|
||||
lib:libavfilter >= 6
|
||||
lib:libavformat >= 57
|
||||
lib:libavresample >= 3
|
||||
lib:libavutil >= 55
|
||||
lib:libswscale >= 2
|
||||
lib:libswresample >= 4
|
||||
#endif
|
||||
#endif
|
||||
lib:libsolv
|
||||
lib:libsolvext
|
||||
|
||||
@@ -63,14 +63,14 @@ requires {
|
||||
lib:libcurl
|
||||
lib:libgcc_s
|
||||
lib:libfreetype
|
||||
lib:libicudata
|
||||
lib:libicui18n
|
||||
lib:libicuio
|
||||
lib:libicule
|
||||
lib:libiculx
|
||||
lib:libicutest
|
||||
lib:libicutu
|
||||
lib:libicuuc
|
||||
lib:libicudata >= 56
|
||||
lib:libicui18n >= 56
|
||||
lib:libicuio >= 56
|
||||
lib:libicule >= 56
|
||||
lib:libiculx >= 56
|
||||
lib:libicutest >= 56
|
||||
lib:libicutu >= 56
|
||||
lib:libicuuc >= 56
|
||||
lib:libncurses >= 6.0
|
||||
#ifdef HAIKU_REGULAR_BUILD
|
||||
#ifdef HAIKU_BUILD_FEATURE_X86_64_EXPAT_ENABLED
|
||||
@@ -102,6 +102,16 @@ requires {
|
||||
lib:libssl >= 1.0.0
|
||||
lib:libcrypto >= 1.0.0
|
||||
#endif
|
||||
#ifdef HAIKU_BUILD_FEATURE_X86_64_FFMPEG_ENABLED
|
||||
lib:libavcodec >= 57
|
||||
lib:libavdevice >= 57
|
||||
lib:libavfilter >= 6
|
||||
lib:libavformat >= 57
|
||||
lib:libavresample >= 3
|
||||
lib:libavutil >= 55
|
||||
lib:libswscale >= 2
|
||||
lib:libswresample >= 4
|
||||
#endif
|
||||
#endif
|
||||
lib:libsolv
|
||||
lib:libsolvext
|
||||
|
||||
Reference in New Issue
Block a user