Skip to content

Commit

Permalink
depends: Split libpng out of Qt
Browse files Browse the repository at this point in the history
Github-Pull: bitcoin#14066
Rebased-From: 2a50974
  • Loading branch information
luke-jr committed Oct 22, 2018
1 parent 34faa78 commit 771043a
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 4 deletions.
23 changes: 23 additions & 0 deletions depends/packages/libpng.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package=libpng
$(package)_version=1.6.34
$(package)_download_path=http://ftp.osuosl.org/pub/libpng/src/libpng16/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=574623a4901a9969080ab4a2df9437026c8a87150dfd5c235e28c94b212964a7
$(package)_dependencies=zlib

define $(package)_set_vars
$(package)_config_opts=--enable-static --disable-shared
endef

define $(package)_config_cmds
$($(package)_autoconf)
endef

define $(package)_build_cmds
$(MAKE) $($(package)_build_opts) PNG_COPTS='-fPIC'
endef

define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install $($(package)_build_opts)
endef

2 changes: 1 addition & 1 deletion depends/packages/packages.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
packages:=boost openssl libevent zeromq

qt_native_packages = native_protobuf
qt_packages = qrencode protobuf zlib
qt_packages = libpng qrencode protobuf zlib

qt_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans

Expand Down
4 changes: 2 additions & 2 deletions depends/packages/qt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $(package)_download_path=https://download.qt.io/official_releases/qt/5.9/$($(pac
$(package)_suffix=opensource-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
$(package)_sha256_hash=eed620cb268b199bd83b3fc6a471c51d51e1dc2dbb5374fc97a0cc75facbe36f
$(package)_dependencies=openssl zlib
$(package)_dependencies=libpng openssl zlib
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
$(package)_qt_libs=corelib network widgets gui plugins testlib
Expand Down Expand Up @@ -61,7 +61,7 @@ $(package)_config_opts += -optimized-qmake
$(package)_config_opts += -pch
$(package)_config_opts += -pkg-config
$(package)_config_opts += -prefix $(host_prefix)
$(package)_config_opts += -qt-libpng
$(package)_config_opts += -system-libpng
$(package)_config_opts += -qt-libjpeg
$(package)_config_opts += -qt-pcre
$(package)_config_opts += -system-zlib
Expand Down
2 changes: 1 addition & 1 deletion doc/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
| HarfBuzz-NG | | | | | |
| libevent | [2.1.8-stable](https://github.com/libevent/libevent/releases) | 2.0.22 | No | | |
| libjpeg | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L65) |
| libpng | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L64) |
| libpng | | | | | No |
| MiniUPnPc | [2.0.20180203](http://miniupnp.free.fr/files) | | No | | |
| OpenSSL | [1.0.1k](https://www.openssl.org/source) | | Yes | | |
| PCRE | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L66) |
Expand Down

0 comments on commit 771043a

Please sign in to comment.