Skip to content

Commit 1ae3196

Browse files
committed
Merge pull request #6373
eb4f35d depends: bump qrencode to 3.4.4 (Cory Fields) 142ee60 depends: bump protobuf to 2.6.1 (Cory Fields) d5b1851 depends: bump ccache to 3.2.2 (Cory Fields) 00c5a73 depends: bump miniupnpc to 1.9.20150609 (Cory Fields) 4bdad99 depends: bump boost to 1.58.0 (Cory Fields)
2 parents 8491375 + eb4f35d commit 1ae3196

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

depends/packages/boost.mk

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package=boost
2-
$(package)_version=1_55_0
3-
$(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.55.0
2+
$(package)_version=1_58_0
3+
$(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.58.0
44
$(package)_file_name=$(package)_$($(package)_version).tar.bz2
5-
$(package)_sha256_hash=fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52
6-
$(package)_patches=darwin_boost_atomic-1.patch darwin_boost_atomic-2.patch gcc_5_no_cxx11.patch
5+
$(package)_sha256_hash=fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5
76

87
define $(package)_set_vars
98
$(package)_config_opts_release=variant=release
@@ -26,9 +25,6 @@ $(package)_cxxflags_linux=-fPIC
2625
endef
2726

2827
define $(package)_preprocess_cmds
29-
patch -p2 < $($(package)_patch_dir)/darwin_boost_atomic-1.patch && \
30-
patch -p2 < $($(package)_patch_dir)/darwin_boost_atomic-2.patch && \
31-
patch -p2 < $($(package)_patch_dir)/gcc_5_no_cxx11.patch && \
3228
echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
3329
endef
3430

depends/packages/miniupnpc.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package=miniupnpc
2-
$(package)_version=1.9.20140701
2+
$(package)_version=1.9.20150609
33
$(package)_download_path=http://miniupnp.free.fr/files
44
$(package)_file_name=$(package)-$($(package)_version).tar.gz
5-
$(package)_sha256_hash=26f3985bad7768b8483b793448ae49414cdc4451d0ec83e7c1944367e15f9f07
5+
$(package)_sha256_hash=86e6ccec5b660ba6889893d1f3fca21db087c6466b1a90f495a1f87ab1cd1c36
66

77
define $(package)_set_vars
88
$(package)_build_opts=CC="$($(package)_cc)"

depends/packages/native_ccache.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package=native_ccache
2-
$(package)_version=3.1.9
2+
$(package)_version=3.2.2
33
$(package)_download_path=http://samba.org/ftp/ccache
44
$(package)_file_name=ccache-$($(package)_version).tar.bz2
5-
$(package)_sha256_hash=04d3e2e438ac8d4cc4b110b68cdd61bd59226c6588739a4a386869467f5ced7c
5+
$(package)_sha256_hash=440f5e15141cc72d2bfff467c977020979810eb800882e3437ad1a7153cce7b2
66

77
define $(package)_set_vars
88
$(package)_config_opts=

depends/packages/native_protobuf.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package=native_protobuf
2-
$(package)_version=2.5.0
3-
$(package)_download_path=https://protobuf.googlecode.com/files
2+
$(package)_version=2.6.1
3+
$(package)_download_path=https://github.com/google/protobuf/releases/download/v$($(package)_version)
44
$(package)_file_name=protobuf-$($(package)_version).tar.bz2
5-
$(package)_sha256_hash=13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677
5+
$(package)_sha256_hash=ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910
66

77
define $(package)_set_vars
88
$(package)_config_opts=--disable-shared

depends/packages/qrencode.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package=qrencode
2-
$(package)_version=3.4.3
2+
$(package)_version=3.4.4
33
$(package)_download_path=https://fukuchi.org/works/qrencode/
44
$(package)_file_name=qrencode-$(qrencode_version).tar.bz2
5-
$(package)_sha256_hash=dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98
5+
$(package)_sha256_hash=efe5188b1ddbcbf98763b819b146be6a90481aac30cfc8d858ab78a19cde1fa5
66

77
define $(package)_set_vars
88
$(package)_config_opts=--disable-shared -without-tools --disable-sdltest

0 commit comments

Comments
 (0)