ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove libpng direct dependency. 

Followup on 513af13d which replaces the use of libpng with the stb_image
headers.

- Remove the use of libpng in cmake.

- Remove libpng from list of vcpkg dependencies.

- Add libpng to list of wxwidgets link libraries when using vcpkg, since
  it is no longer linked directly. This is necessary for static builds.

- Remove libpng from all package lists in installdeps.

- Remove libpng-dev from the debian control file.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2020-03-01 12:45:56 +00:00
parent f2e81b8e4b
commit 05bd2a95cd
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -25,7 +25,7 @@ if(TAG_RELEASE)
include(MakeReleaseCommitAndTag) include(MakeReleaseCommitAndTag)
endif() endif()
set(VCPKG_DEPS zlib libpng SDL2 SFML gettext wxWidgets) set(VCPKG_DEPS zlib SDL2 SFML gettext wxWidgets)
# appveyor job goes over time limit if building ffmpeg during initial cache # appveyor job goes over time limit if building ffmpeg during initial cache
# generation. So build initial cache without ffmpeg. # generation. So build initial cache without ffmpeg.
@ -311,7 +311,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
endif() endif()
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(PNG REQUIRED)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
if(WIN32) if(WIN32)
@ -327,7 +326,6 @@ set(
${SFML_LIBRARIES} ${SFML_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
${PNG_LIBRARY}
) )
if(ENABLE_FFMPEG) if(ENABLE_FFMPEG)
@ -977,7 +975,6 @@ set(
include_directories( include_directories(
${ZLIB_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
fex fex
${PNG_INCLUDE_DIR}
${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIR}
) )

24
installdeps
View File

@ -194,7 +194,7 @@ freebsd_installdeps() {
check sudo pkg update check sudo pkg update
pkgs="llvm-devel cmake ccache nasm ffmpeg gettext-tools gettext png pkgconf sdl2 sfml wx31-gtk3 iconv zip ninja" pkgs="llvm-devel cmake ccache nasm ffmpeg gettext-tools gettext pkgconf sdl2 sfml wx31-gtk3 iconv zip ninja"
[ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg" [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg"
@ -335,7 +335,7 @@ debian_installdeps() {
wx_lib_dev=libwxgtk3.0-dev wx_lib_dev=libwxgtk3.0-dev
fi fi
pkgs="build-essential g++ nasm cmake ccache gettext zlib1g-dev libgl1-mesa-dev libgettextpo-dev libpng-dev libsdl2-dev libsdl2-2.0 libglu1-mesa-dev libglu1-mesa libgles2-mesa-dev libsfml-dev $sfml_libs $glew_lib $wx_lib $wx_lib_dev libgtk2.0-dev libgtk-3-dev ccache zip ninja-build" pkgs="build-essential g++ nasm cmake ccache gettext zlib1g-dev libgl1-mesa-dev libgettextpo-dev libsdl2-dev libsdl2-2.0 libglu1-mesa-dev libglu1-mesa libgles2-mesa-dev libsfml-dev $sfml_libs $glew_lib $wx_lib $wx_lib_dev libgtk2.0-dev libgtk-3-dev ccache zip ninja-build"
[ -n "$ENABLE_OPENAL" ] && pkgs="$pkgs libopenal-dev" [ -n "$ENABLE_OPENAL" ] && pkgs="$pkgs libopenal-dev"
[ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs libavcodec-dev libavformat-dev libswscale-dev libavutil-dev $libswresample_dev" [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs libavcodec-dev libavformat-dev libswscale-dev libavutil-dev $libswresample_dev"
@ -482,7 +482,7 @@ fedora_installdeps() {
# this is sometimes necessary for rawhide # this is sometimes necessary for rawhide
set -- --exclude='glibc32*' set -- --exclude='glibc32*'
fi fi
for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel libpng-devel SDL2-devel SFML-devel openal-soft-devel wxGTK3-devel gtk3-devel; do for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL2-devel SFML-devel openal-soft-devel wxGTK3-devel gtk3-devel; do
case $pkg in case $pkg in
*ffmpeg*) *ffmpeg*)
[ -z "$ENABLE_FFMPEG" ] && continue [ -z "$ENABLE_FFMPEG" ] && continue
@ -570,7 +570,7 @@ fedora_installdeps() {
;; ;;
esac esac
# install static deps # install static deps
for pkg in zlib gettext libpng SDL2 wxWidgets3; do for pkg in zlib gettext SDL2 wxWidgets3; do
set -- "$@" "${target}-${pkg}-static" set -- "$@" "${target}-${pkg}-static"
done done
# install deps that are not available as static # install deps that are not available as static
@ -668,7 +668,7 @@ rhel_installdeps() {
warning='RHEL does not currently have SFML packages, LINK support will be disabled' warning='RHEL does not currently have SFML packages, LINK support will be disabled'
for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel libpng-devel SDL2-devel openal-soft-devel wxGTK3-devel gtk3-devel; do for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL2-devel openal-soft-devel wxGTK3-devel gtk3-devel; do
case $pkg in case $pkg in
*ffmpeg*) *ffmpeg*)
[ -z "$ENABLE_FFMPEG" ] && continue [ -z "$ENABLE_FFMPEG" ] && continue
@ -756,7 +756,7 @@ rhel_installdeps() {
;; ;;
esac esac
# install static deps # install static deps
for pkg in zlib gettext libpng SDL2 wxWidgets; do for pkg in zlib gettext SDL2 wxWidgets; do
set -- "$@" "${target}-${pkg}-static" set -- "$@" "${target}-${pkg}-static"
done done
# install deps that are not available as static # install deps that are not available as static
@ -787,7 +787,7 @@ suse_installdeps() {
tools="make cmake ccache nasm gettext-tools pkg-config ccache zip sfml2-devel ninja" tools="make cmake ccache nasm gettext-tools pkg-config ccache zip sfml2-devel ninja"
libs="gcc gcc-c++ libpng16-devel libSDL2-devel wxWidgets-3_0-devel" # ffmpeg-devel libs="gcc gcc-c++ libSDL2-devel wxWidgets-3_0-devel" # ffmpeg-devel
[ -n "$ENABLE_OPENAL" ] && libs="$libs openal-soft-devel" [ -n "$ENABLE_OPENAL" ] && libs="$libs openal-soft-devel"
# ffmpeg requires packman repos # ffmpeg requires packman repos
@ -845,7 +845,7 @@ archlinux_installdeps() {
$pacman -Q gtk3-classic >/dev/null 2>&1 && gtk=gtk3-classic $pacman -Q gtk3-classic >/dev/null 2>&1 && gtk=gtk3-classic
libs="zlib mesa gettext libpng sdl2 wxgtk3 $gtk sfml" libs="zlib mesa gettext sdl2 wxgtk3 $gtk sfml"
[ -n "$ENABLE_OPENAL" ] && libs="$libs openal" [ -n "$ENABLE_OPENAL" ] && libs="$libs openal"
[ -n "$ENABLE_FFMPEG" ] && libs="$libs ffmpeg" [ -n "$ENABLE_FFMPEG" ] && libs="$libs ffmpeg"
@ -937,7 +937,7 @@ EOF
fi fi
done done
deps="zlib gettext libpng pkg-config sdl2 wxmsw" deps="zlib gettext pkg-config sdl2 wxmsw"
[ -n "$ENABLE_OPENAL" ] && deps="$deps openal" [ -n "$ENABLE_OPENAL" ] && deps="$deps openal"
@ -1113,7 +1113,7 @@ brew_installdeps() {
check brew -v update check brew -v update
brews="nasm cmake ccache gettext libpng pkg-config sdl2 wxmac ccache ninja" brews="nasm cmake ccache gettext pkg-config sdl2 wxmac ccache ninja"
[ -n "$ENABLE_FFMPEG" ] && brews="$brews ffmpeg" [ -n "$ENABLE_FFMPEG" ] && brews="$brews ffmpeg"
@ -1143,7 +1143,7 @@ macports_installdeps() {
check sudo port -v selfupdate check sudo port -v selfupdate
ports="cmake ccache nasm gettext libpng pkgconfig libsdl2 sfml wxWidgets-3.0 libiconv ninja" ports="cmake ccache nasm gettext pkgconfig libsdl2 sfml wxWidgets-3.0 libiconv ninja"
[ -n "$ENABLE_FFMPEG" ] && ports="$ports ffmpeg" [ -n "$ENABLE_FFMPEG" ] && ports="$ports ffmpeg"
@ -1159,7 +1159,7 @@ fink_installdeps() {
check sudo fink -vy selfupdate check sudo fink -vy selfupdate
pkgs="cmake ccache nasm libgettext8-dev gettext-tools libpng16 pkgconfig sdl2 wxwidgets300-osxcocoa libiconv-dev sfml24-dev ccache ninja" pkgs="cmake ccache nasm libgettext8-dev gettext-tools pkgconfig sdl2 wxwidgets300-osxcocoa libiconv-dev sfml24-dev ccache ninja"
[ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg" [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg"

1
src/debian/control
View File

@ -4,7 +4,6 @@ Priority: optional
Maintainer: Sérgio Benjamim <sergio_br2@yahoo.com.br> Maintainer: Sérgio Benjamim <sergio_br2@yahoo.com.br>
Build-Depends: debhelper (>= 9), Build-Depends: debhelper (>= 9),
cmake (>= 2.6.0), cmake (>= 2.6.0),
libpng12-dev,
imagemagick, imagemagick,
libopenal-dev, libopenal-dev,
libsdl2.0-dev, libsdl2.0-dev,

3
src/wx/CMakeLists.txt
View File

@ -152,11 +152,14 @@ if(WIN32 AND CMAKE_TOOLCHAIN_FILE MATCHES vcpkg AND (X86_32 OR AMD64))
set(deb_suffix d) set(deb_suffix d)
endif() endif()
file(GLOB png_lib ${wxWidgets_LIB_DIR}/libpng*.lib)
list(APPEND wxWidgets_LIBRARIES list(APPEND wxWidgets_LIBRARIES
${wxWidgets_LIB_DIR}/jpeg${deb_suffix}.lib ${wxWidgets_LIB_DIR}/jpeg${deb_suffix}.lib
${wxWidgets_LIB_DIR}/tiff${deb_suffix}.lib ${wxWidgets_LIB_DIR}/tiff${deb_suffix}.lib
${wxWidgets_LIB_DIR}/lzma${deb_suffix}.lib ${wxWidgets_LIB_DIR}/lzma${deb_suffix}.lib
${wxWidgets_LIB_DIR}/expat.lib ${wxWidgets_LIB_DIR}/expat.lib
${png_lib}
) )
endif() endif()