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

Update packages ffmpeg, openssh, p7zip

Browse Source
This commit is contained in:
Ingo Weinhold 2013-06-30 11:49:40 +02:00
parent 26ea70667a
commit 94307089f9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/jam/BuildFeatures
View File

@ -343,8 +343,8 @@ if $(TARGET_ARCH) = x86 {
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 {
HAIKU_FFMPEG_PACKAGE = ffmpeg-0.10.2-1-x86_gcc2.hpkg ;
HAIKU_FFMPEG_DEVEL_PACKAGE = ffmpeg_devel-0.10.2-1-x86_gcc2.hpkg ;
HAIKU_FFMPEG_PACKAGE = ffmpeg-0.10.2-2-x86_gcc2.hpkg ;
HAIKU_FFMPEG_DEVEL_PACKAGE = ffmpeg_devel-0.10.2-2-x86_gcc2.hpkg ;
HAIKU_SPEEX_PACKAGE = speex-1.2~rc1-1-x86_gcc2.hpkg ;
HAIKU_SPEEX_DEVEL_PACKAGE = speex_devel-1.2~rc1-1-x86_gcc2.hpkg ;
HAIKU_LIBTHEORA_PACKAGE = libtheora-1.1.1-1-x86_gcc2.hpkg ;

4
build/jam/OptionalPackages
View File

@ -1558,7 +1558,7 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
$(baseURL)/openssh-6.0p1-r1a4-x86-gcc4-2012-09-29.zip ;
} else {
InstallOptionalHaikuImagePackage
$(hpkgBaseURL)/openssh-6.0p1-5-x86_gcc2.hpkg ;
$(hpkgBaseURL)/openssh-6.0p1-6-x86_gcc2.hpkg ;
}
AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true
@ -1591,7 +1591,7 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] {
$(baseURL)/p7zip-9.20.1-r1a4-x86-gcc4-2012-08-30.zip ;
} else {
InstallOptionalHaikuImagePackage
$(hpkgBaseURL)/p7zip-9.20.1-3-x86_gcc2.hpkg ;
$(hpkgBaseURL)/p7zip-9.20.1-4-x86_gcc2.hpkg ;
}
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage