Update packages ffmpeg, openssh, p7zip
This commit is contained in:
@@ -343,8 +343,8 @@ if $(TARGET_ARCH) = x86 {
|
|||||||
HAIKU_LIBOGG_PACKAGE = libogg-1.3.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 ;
|
HAIKU_LIBVPX_PACKAGE = libvpx-1.0.0-r1a4-x86-gcc4-2012-09-02.zip ;
|
||||||
} else {
|
} else {
|
||||||
HAIKU_FFMPEG_PACKAGE = ffmpeg-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-1-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_PACKAGE = speex-1.2~rc1-1-x86_gcc2.hpkg ;
|
||||||
HAIKU_SPEEX_DEVEL_PACKAGE = speex_devel-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 ;
|
HAIKU_LIBTHEORA_PACKAGE = libtheora-1.1.1-1-x86_gcc2.hpkg ;
|
||||||
|
|||||||
@@ -1558,7 +1558,7 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
|
|||||||
$(baseURL)/openssh-6.0p1-r1a4-x86-gcc4-2012-09-29.zip ;
|
$(baseURL)/openssh-6.0p1-r1a4-x86-gcc4-2012-09-29.zip ;
|
||||||
} else {
|
} else {
|
||||||
InstallOptionalHaikuImagePackage
|
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
|
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 ;
|
$(baseURL)/p7zip-9.20.1-r1a4-x86-gcc4-2012-08-30.zip ;
|
||||||
} else {
|
} else {
|
||||||
InstallOptionalHaikuImagePackage
|
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 {
|
} else if $(TARGET_ARCH) = x86_64 {
|
||||||
InstallOptionalHaikuImagePackage
|
InstallOptionalHaikuImagePackage
|
||||||
|
|||||||
Reference in New Issue
Block a user