From f372666d306d9c4da03177f3152e72af939f6470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 2 Apr 2016 00:40:41 +0200 Subject: [PATCH 1/3] Lower libpng requirement to 1.2 --- CMakeLists.txt | 5 ++++- debian/control | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fb86f74a9..3e062cdefb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,10 @@ endif (DISABLE_NETWORK) option(STATIC "Create a static build.") -PKG_CHECK_MODULES(PNG libpng>=1.6) +PKG_CHECK_MODULES(PNG libpng>=1.2) +if (NOT PNG_FOUND) + PKG_CHECK_MODULES(PNG libpng12) +endif (NOT PNG_FOUND) if (NOT PNG_FOUND) PKG_CHECK_MODULES(PNG REQUIRED libpng16) endif (NOT PNG_FOUND) diff --git a/debian/control b/debian/control index 3a01e3e36f..ee42fe1764 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Section: misc Priority: optional Standards-Version: 3.9.2 Multi-Arch: same -Build-Depends: debhelper (>= 9), cmake, libsdl2-dev, libsdl2-ttf-dev, gcc, pkg-config, g++-multilib, gcc-multilib, libjansson4 (>= 2.7), libjansson-dev (>= 2.7), libspeex-dev, libspeexdsp-dev, libcurl4-openssl-dev, libcrypto++-dev, libfontconfig1-dev, libfreetype6-dev, libpng-dev, libpng16-dev +Build-Depends: debhelper (>= 9), cmake, libsdl2-dev, libsdl2-ttf-dev, gcc, pkg-config, g++-multilib, gcc-multilib, libjansson4 (>= 2.7), libjansson-dev (>= 2.7), libspeex-dev, libspeexdsp-dev, libcurl4-openssl-dev, libcrypto++-dev, libfontconfig1-dev, libfreetype6-dev, libpng-dev Package: openrct2 Architecture: i386 From e8f73d0ff7ec64e34a28b21cf16fa7fb335f1666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 2 Apr 2016 00:44:50 +0200 Subject: [PATCH 2/3] Remove libpng16 from Linux install scripts --- scripts/linux/install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/linux/install.sh b/scripts/linux/install.sh index 0342494678..998f26ecf2 100755 --- a/scripts/linux/install.sh +++ b/scripts/linux/install.sh @@ -165,9 +165,8 @@ elif [[ $(uname) == "Linux" ]]; then case "$TARGET" in "linux") sudo dpkg --add-architecture i386 - sudo add-apt-repository -y ppa:djcj/tools sudo apt-get update - sudo apt-get install --no-install-recommends -y --force-yes cmake libsdl2-dev:i386 libsdl2-ttf-dev:i386 gcc-4.8 pkg-config:i386 g++-4.8-multilib gcc-4.8-multilib libjansson-dev:i386 libspeex-dev:i386 libspeexdsp-dev:i386 libcurl4-openssl-dev:i386 libcrypto++-dev:i386 clang libfontconfig1-dev:i386 libfreetype6-dev:i386 libpng-dev:i386 libpng16-dev:i386 + sudo apt-get install --no-install-recommends -y --force-yes cmake libsdl2-dev:i386 libsdl2-ttf-dev:i386 gcc-4.8 pkg-config:i386 g++-4.8-multilib gcc-4.8-multilib libjansson-dev:i386 libspeex-dev:i386 libspeexdsp-dev:i386 libcurl4-openssl-dev:i386 libcrypto++-dev:i386 clang libfontconfig1-dev:i386 libfreetype6-dev:i386 libpng-dev:i386 download https://launchpad.net/ubuntu/+archive/primary/+files/libjansson4_2.7-1ubuntu1_i386.deb libjansson4_2.7-1ubuntu1_i386.deb download https://launchpad.net/ubuntu/+archive/primary/+files/libjansson-dev_2.7-1ubuntu1_i386.deb libjansson-dev_2.7-1ubuntu1_i386.deb sudo dpkg -i libjansson4_2.7-1ubuntu1_i386.deb From 5fe2623613415a4a4d0eba319856bdb0aa41b653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 2 Apr 2016 00:49:59 +0200 Subject: [PATCH 3/3] Prefer libpng1.6 over libpng1.2 if available --- CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e062cdefb..caed4dda44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,12 +49,15 @@ endif (DISABLE_NETWORK) option(STATIC "Create a static build.") -PKG_CHECK_MODULES(PNG libpng>=1.2) +PKG_CHECK_MODULES(PNG libpng>=1.6) if (NOT PNG_FOUND) - PKG_CHECK_MODULES(PNG libpng12) + PKG_CHECK_MODULES(PNG libpng16) endif (NOT PNG_FOUND) if (NOT PNG_FOUND) - PKG_CHECK_MODULES(PNG REQUIRED libpng16) + PKG_CHECK_MODULES(PNG libpng>=1.2) +endif (NOT PNG_FOUND) +if (NOT PNG_FOUND) + PKG_CHECK_MODULES(PNG REQUIRED libpng12) endif (NOT PNG_FOUND) PKG_CHECK_MODULES(ZLIB REQUIRED zlib)