diff --git a/recipes-games/freeciv/freeciv.inc b/recipes-games/freeciv/freeciv.inc index 1e5b017..6d4f9d5 100644 --- a/recipes-games/freeciv/freeciv.inc +++ b/recipes-games/freeciv/freeciv.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SECTION = "games" -DEPENDS = "gtk+ readline libsdl-mixer bzip2 curl xz" +DEPENDS = "gtk+ readline bzip2 curl xz" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \ @@ -28,7 +28,6 @@ EXTRA_OECONF = "\ --disable-mapimg \ --disable-sdltest \ --disable-sdl2test \ -SDL_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl' \ " acpaths = "-I ${S}/m4 -I ${S}/dependencies/m4" diff --git a/recipes-games/freeciv/freeciv_2.4.5.bb b/recipes-games/freeciv/freeciv_2.4.5.bb index cde0bf0..986f50b 100644 --- a/recipes-games/freeciv/freeciv_2.4.5.bb +++ b/recipes-games/freeciv/freeciv_2.4.5.bb @@ -2,5 +2,11 @@ FREECIV_GUI = "gtk2" require freeciv.inc +DEPENDS += "libsdl-mixer" + +EXTRA_OECONF += "\ +SDL_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl' \ +" + SRC_URI[md5sum] = "fae43d37c65416c104595713e337a740" SRC_URI[sha256sum] = "ce4e5d083d26c7323e781d0803e858fb9be986858d9f776b8a9a97544e13b3f9" diff --git a/recipes-games/freeciv/freeciv_2.5.3.bb b/recipes-games/freeciv/freeciv_2.5.3.bb index 87cac7c..6fd97c3 100644 --- a/recipes-games/freeciv/freeciv_2.5.3.bb +++ b/recipes-games/freeciv/freeciv_2.5.3.bb @@ -2,12 +2,14 @@ FREECIV_GUI = "gtk2,gtk3,qt" require freeciv.inc -DEPENDS += "gtk+3 qtbase" +DEPENDS += "libsdl2-mixer gtk+3 qtbase" EXTRA_OECONF += "\ --with-qt5-includes=${STAGING_INCDIR}/qt5 \ --with-qt5-libs=${STAGING_LIBDIR}/qt5 \ MOCCMD=${STAGING_BINDIR_NATIVE}/qt5/moc \ +SDL2_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl2' \ +-enable-sdl-mixer=sdl2 \ " SRC_URI[md5sum] = "6bbdfa23392ca88fdb0b8f7caca66ddd"