[haiku-commits] BRANCH HaikuPM-github.package-management [9430708] build/jam
- From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 30 Jun 2013 12:00:39 +0200 (CEST)
added 1 changeset to branch 'refs/remotes/HaikuPM-github/package-management'
old head: 26ea70667a0c3c6274e6bbe91646a74b59a9e8b1
new head: 94307089f9388a229705cde79465b9b319033f62
overview: https://github.com/haiku/HaikuPM/compare/26ea706...9430708
----------------------------------------------------------------------------
9430708: Update packages ffmpeg, openssh, p7zip
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
Commit: 94307089f9388a229705cde79465b9b319033f62
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Sun Jun 30 09:49:40 2013 UTC
----------------------------------------------------------------------------
2 files changed, 4 insertions(+), 4 deletions(-)
build/jam/BuildFeatures | 4 ++--
build/jam/OptionalPackages | 4 ++--
----------------------------------------------------------------------------
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index f0dd596..0201dd4 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -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 ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index f73b0b9..a3375fb 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -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
Other related posts:
- » [haiku-commits] BRANCH HaikuPM-github.package-management [9430708] build/jam - HaikuPM-github . package-management
