From 112137eeaa8be4736756e09fcadd065e438d0dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 9 Jan 2013 01:48:14 +0100 Subject: [PATCH 1/7] allegro4: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit error message was: | CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the following cache variables appropriately: | ALLEGRO_USE_CONSTRUCTOR_EXITCODE (advanced) | For details see /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/allegro4/4.4.2-r0/allegro-4.4.2/TryRunResults.cmake Signed-off-by: Andreas Müller --- ...on-t-try-to-run-in-cross-environment.patch | 37 +++++++++++++++++++ recipes-gamelib/allegro4/allegro4_4.4.2.bb | 5 ++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 recipes-gamelib/allegro4/allegro4-4.4.2/0001-CMakeLists.txt-don-t-try-to-run-in-cross-environment.patch diff --git a/recipes-gamelib/allegro4/allegro4-4.4.2/0001-CMakeLists.txt-don-t-try-to-run-in-cross-environment.patch b/recipes-gamelib/allegro4/allegro4-4.4.2/0001-CMakeLists.txt-don-t-try-to-run-in-cross-environment.patch new file mode 100644 index 0000000..7de9002 --- /dev/null +++ b/recipes-gamelib/allegro4/allegro4-4.4.2/0001-CMakeLists.txt-don-t-try-to-run-in-cross-environment.patch @@ -0,0 +1,37 @@ +From ad105eee25e248e56c87d82fe8c70c44b4676bd9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 9 Jan 2013 01:31:38 +0100 +Subject: [PATCH] CMakeLists.txt: don't try to run in cross environment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 8 -------- + 1 files changed, 0 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 245be10..8f4e331 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -189,14 +189,6 @@ if(UNIX) + set(MAP_FAILED "((void *) -1)") + endif() + +- check_c_source_runs(" +- static int notsupported = 1; +- void test_ctor (void) __attribute__((constructor)); +- void test_ctor (void) { notsupported = 0; } +- int main(void) { return (notsupported); } +- " +- ALLEGRO_USE_CONSTRUCTOR) +- + find_library(RT_LIBRARY rt) + check_c_source_compiles(" + #include +-- +1.7.4.4 + diff --git a/recipes-gamelib/allegro4/allegro4_4.4.2.bb b/recipes-gamelib/allegro4/allegro4_4.4.2.bb index d2a9f42..3abe39b 100644 --- a/recipes-gamelib/allegro4/allegro4_4.4.2.bb +++ b/recipes-gamelib/allegro4/allegro4_4.4.2.bb @@ -10,7 +10,8 @@ PR = "r0" DEPENDS = "virtual/libgl libglu libx11 libxcursor physfs openal jpeg" SRC_URI = "${SOURCEFORGE_MIRROR}/alleg/allegro/${PV}/allegro-${PV}.tar.gz \ -file://avoid_lib_paths.patch \ + file://avoid_lib_paths.patch \ + file://0001-CMakeLists.txt-don-t-try-to-run-in-cross-environment.patch \ " SRC_URI[md5sum] = "4db71b0460fc99926ae91d223199c2e6" @@ -20,3 +21,5 @@ inherit cmake binconfig S = "${WORKDIR}/allegro-${PV}" +FILES_${PN} += "${libdir}/allegro" +FILES_${PN}-dbg += "${libdir}/allegro/*/.debug" From 2eefd63b02dfc61f4559e37f6cdf3563a8b5073b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 11 Jan 2013 01:31:55 +0100 Subject: [PATCH 2/7] pingus: inherit pythonnative MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit error message was: ERROR: Function failed: do_compile (see /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/pingus/0.7.6-r0/temp/log.do_compile.986 for further information) ERROR: Logfile of failure stored in: /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/pingus/0.7.6-r0/temp/log.do_compile.986 Log data follows: | DEBUG: Executing shell function do_compile | Traceback (most recent call last): | File "/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin/scons", line 187, in | import SCons.Script | ImportError: No module named SCons.Script | ERROR: scons build execution failed. | ERROR: Function failed: do_compile (see /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/pingus/0.7.6-r0/temp/log.do_compile.986 for further information) ERROR: Task 718 (/home/Superandy/data/oe-core/sources/meta-games/recipes-games/pingus/pingus_0.7.6.bb, do_compile) failed with exit code '1' Signed-off-by: Andreas Müller --- recipes-games/pingus/pingus_0.7.6.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-games/pingus/pingus_0.7.6.bb b/recipes-games/pingus/pingus_0.7.6.bb index 322873e..971ae07 100644 --- a/recipes-games/pingus/pingus_0.7.6.bb +++ b/recipes-games/pingus/pingus_0.7.6.bb @@ -3,11 +3,11 @@ DEPENDS = "virtual/libiconv boost libpng libglu" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" HOMEPAGE = "http://pingus.seul.org/" +PR = "r1" RDEPENDS += "libmikmod" -inherit scons -inherit sdl +inherit scons sdl pythonnative SRC_URI = "\ http://${PN}.googlecode.com/files/${P}.tar.bz2 \ From efec281b0114c42d2bf83006dcc392a8cd74a00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 12 Jan 2013 18:15:19 +0100 Subject: [PATCH 3/7] pingus: fix typo in pingus.desktop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-games/pingus/pingus/pingus.desktop | 2 +- recipes-games/pingus/pingus_0.7.6.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-games/pingus/pingus/pingus.desktop b/recipes-games/pingus/pingus/pingus.desktop index 20a1de2..b30f3b8 100644 --- a/recipes-games/pingus/pingus/pingus.desktop +++ b/recipes-games/pingus/pingus/pingus.desktop @@ -8,4 +8,4 @@ Icon=pingus Exec=pingus -d /usr/share/pingus/data/ -f -g 640x480 -m Terminal=false StartupNotify=false -Categories=Application;Games;ArcadeGame; +Categories=Application;Game;ArcadeGame; diff --git a/recipes-games/pingus/pingus_0.7.6.bb b/recipes-games/pingus/pingus_0.7.6.bb index 971ae07..786a56b 100644 --- a/recipes-games/pingus/pingus_0.7.6.bb +++ b/recipes-games/pingus/pingus_0.7.6.bb @@ -3,7 +3,7 @@ DEPENDS = "virtual/libiconv boost libpng libglu" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" HOMEPAGE = "http://pingus.seul.org/" -PR = "r1" +PR = "r2" RDEPENDS += "libmikmod" From 8f64eabf6918b5ffd08ca3381c93732d1e0405e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 11 Jan 2013 02:07:19 +0100 Subject: [PATCH 4/7] freeciv: pack pngs and fix QA warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-games/freeciv/freeciv.inc | 3 +++ recipes-games/freeciv/freeciv_2.3.3.bb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-games/freeciv/freeciv.inc b/recipes-games/freeciv/freeciv.inc index bf9d6ab..00e9823 100644 --- a/recipes-games/freeciv/freeciv.inc +++ b/recipes-games/freeciv/freeciv.inc @@ -36,6 +36,7 @@ FILES_${PN}-common = "\ ${libdir}/libfreeciv.so.0.0.0 \ ${libdir}/libfreeciv.so.0 \ ${datadir}/po \ +${datadir}/icons/hicolor/*/*/freeciv-client.png \ " RDEPENDS_${PN}-server = "freeciv-common" @@ -44,6 +45,7 @@ ${bindir}/freeciv-server \ ${datadir}/freeciv/default \ ${datadir}/freeciv/default.serv \ ${datadir}/freeciv/nation \ +${datadir}/icons/hicolor/*/*/freeciv-server.png \ " FILES_${PN}-client-common = "\ @@ -54,6 +56,7 @@ ${datadir}/freeciv/amplio2.tilespec \ ${datadir}/freeciv/amplio2 \ ${datadir}/freeciv/stdsounds.soundspec \ ${datadir}/freeciv/stdsounds \ +${datadir}/icons/hicolor/*/*/freeciv-modpack.png \ " RDEPENDS_${PN}-gtk2 = "freeciv-common freeciv-client-common" diff --git a/recipes-games/freeciv/freeciv_2.3.3.bb b/recipes-games/freeciv/freeciv_2.3.3.bb index 266dbdc..a2b82b9 100644 --- a/recipes-games/freeciv/freeciv_2.3.3.bb +++ b/recipes-games/freeciv/freeciv_2.3.3.bb @@ -1,6 +1,6 @@ require freeciv.inc -PR = "r0" +PR = "r1" SRC_URI += "${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2" From 064d2848c97c1f475579072933e7f44acb68aa0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 12 Jan 2013 15:05:10 +0100 Subject: [PATCH 5/7] wesnoth: fix QA warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-games/wesnoth/wesnoth_1.10.5.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-games/wesnoth/wesnoth_1.10.5.bb b/recipes-games/wesnoth/wesnoth_1.10.5.bb index f93b422..77a1da6 100644 --- a/recipes-games/wesnoth/wesnoth_1.10.5.bb +++ b/recipes-games/wesnoth/wesnoth_1.10.5.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://copyright;md5=846b2c52d78ca4f0169b5f048d877508" DEPENDS = "asio freetype libsdl-image libsdl-mixer libsdl-net libsdl-ttf zlib boost pango libpng" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-1.10/${P}/${P}.tar.bz2" @@ -86,6 +86,7 @@ FILES_${PN}-data = "\ ${datadir}/wesnoth/data \ ${datadir}/wesnoth/fonts \ ${datadir}/wesnoth/translations \ + ${datadir}/wesnoth/l10n-track \ " FILES_${PN} = "\ @@ -97,6 +98,7 @@ FILES_${PN} = "\ FILES_${PN}-server = "\ ${bindir}/wesnothd \ + ${localstatedir}/run/wesnothd \ " FILES_${PN}-low ="\ From 84d10b338b3ea46e94d2d4e7ce3eeb295cb4e77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 11 Jan 2013 01:32:44 +0100 Subject: [PATCH 6/7] supertux2: initial add MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-games/supertux/supertux2_git.bb | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 recipes-games/supertux/supertux2_git.bb diff --git a/recipes-games/supertux/supertux2_git.bb b/recipes-games/supertux/supertux2_git.bb new file mode 100644 index 0000000..66903e0 --- /dev/null +++ b/recipes-games/supertux/supertux2_git.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "SuperTux is a classic 2D jump'n run sidescroller game in a style similar to the original Super Mario games covered under the GPL" +HOMEAPAGE = "http://supertux.lethargik.org" +SECTION = "x11/application" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" +DEPENDS = "boost libsdl libsdl-image libvorbis curl openal-soft physfs glew" + +# somehow boost is not dragged in +RDEPENDS_${PN} += "boost" + +inherit cmake + +SRCREV = "947098af8085388eef4b5352f5c5d0b6edbcd78a" +PV = "0.3.3+git${SRCPV}" +S = "${WORKDIR}/git" + +SRC_URI = "git://code.google.com/p/supertux;protocol=https" +SRC_URI[md5sum] = "f3f803e629ee51a9de0b366a036e393d" +SRC_URI[sha256sum] = "fceaf95251092d5698211ff0f51f1c50237fa5e2a6690464e9835a66e18301d0" + +EXTRA_OECMAKE = "-DINSTALL_SUBDIR_BIN=bin -DCMAKE_BUILD_TYPE=RELEASE" + +do_install_append() { + # Most of us don't have OpenGL. SDL in fullscreen seems to work best + sed -i 's#Exec=supertux2#Exec=supertux2 --renderer sdl -f#' ${D}${datadir}/applications/supertux2.desktop +} + +FILES_${PN} += "${datadir}/games/supertux2" From 08658c22fbef21b0e16acb81d1738446b400a636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 9 Jan 2013 00:32:10 +0100 Subject: [PATCH 7/7] remove openal and physfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * they are now in meta-oe/meta-multimedia. * openal was replaced by openal-soft which is a further developed fork e.g supporting ARM neon / Intel SSE Signed-off-by: Andreas Müller --- dependencies/freealut/freealut_1.1.0.bb | 4 ++-- dependencies/openal/openal_0.0.8.bb | 24 ------------------- .../physfs/physfs-2.0.2/compile_fixes.patch | 13 ---------- dependencies/physfs/physfs_2.0.2.bb | 19 --------------- recipes-gamelib/allegro4/allegro4_4.4.2.bb | 4 ++-- 5 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 dependencies/openal/openal_0.0.8.bb delete mode 100644 dependencies/physfs/physfs-2.0.2/compile_fixes.patch delete mode 100644 dependencies/physfs/physfs_2.0.2.bb diff --git a/dependencies/freealut/freealut_1.1.0.bb b/dependencies/freealut/freealut_1.1.0.bb index 011a5c8..2a3a894 100644 --- a/dependencies/freealut/freealut_1.1.0.bb +++ b/dependencies/freealut/freealut_1.1.0.bb @@ -4,9 +4,9 @@ SECTION = "libs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=7ec51bd663119a90c3d50704d6051fae" -PR = "r0" +PR = "r1" -DEPENDS = "openal" +DEPENDS = "openal-soft" SRC_URI = "http://connect.creativelabs.com/openal/Downloads/ALUT/${PN}-${PV}.tar.gz" diff --git a/dependencies/openal/openal_0.0.8.bb b/dependencies/openal/openal_0.0.8.bb deleted file mode 100644 index ed35288..0000000 --- a/dependencies/openal/openal_0.0.8.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "OpenAL is a cross-platform 3D audio API." -SECTION = "libs" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=7ec51bd663119a90c3d50704d6051fae" - -PR = "r0" - -DEPENDS = "alsa-lib virtual/libsdl libvorbis" - -SRC_URI = "ftp://ftp.eenet.ee/pub/FreeBSD/distfiles/${PN}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "641cf53761f35ee979f3e888614797a0" -SRC_URI[sha256sum] = "723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe" - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = "--enable-alsa --enable-sdl --enable-vorbis --disable-mp3 \ - --disable-smpeg --disable-arts" - -do_configure_append () { - sed -i "s/@requirements@/alsa vorbis/" admin/pkgconfig/openal.pc -} diff --git a/dependencies/physfs/physfs-2.0.2/compile_fixes.patch b/dependencies/physfs/physfs-2.0.2/compile_fixes.patch deleted file mode 100644 index f6bedd7..0000000 --- a/dependencies/physfs/physfs-2.0.2/compile_fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nurd physfs-2.0.2/archivers/wad.c physfs-2.0.2-/archivers/wad.c ---- physfs-2.0.2/archivers/wad.c 2011-02-18 23:17:31.000000000 +0200 -+++ physfs-2.0.2-/archivers/wad.c 2012-10-05 16:47:03.105547992 +0300 -@@ -245,9 +245,6 @@ - PHYSFS_uint32 fileCount; - PHYSFS_uint32 directoryOffset; - WADentry *entry; -- char lastDirectory[9]; -- -- lastDirectory[8] = 0; /* Make sure lastDirectory stays null-terminated. */ - - BAIL_IF_MACRO(!wad_open(name, forWriting, &fh, &fileCount,&directoryOffset), NULL, 0); - info->entryCount = fileCount; diff --git a/dependencies/physfs/physfs_2.0.2.bb b/dependencies/physfs/physfs_2.0.2.bb deleted file mode 100644 index c314698..0000000 --- a/dependencies/physfs/physfs_2.0.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "PhysicsFS is a library to provide abstract access to various archives." -SECTION = "libs" - -LICENSE = "zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ad5dfd37e76cb8e82b47c55a99097d5" - -PR = "r0" - -DEPENDS = "readline" - -SRC_URI = "http://icculus.org/physfs/downloads/physfs-${PV}.tar.gz \ - file://compile_fixes.patch \ -" -SRC_URI[md5sum] = "4e8927c3d30279b03e2592106eb9184a" -SRC_URI[sha256sum] = "ae296d3148228e03fd56cc9ea58af02f87dcbb1fadef125c18b709ab37f0bc09" - -S = "${WORKDIR}/physfs-${PV}" - -inherit cmake diff --git a/recipes-gamelib/allegro4/allegro4_4.4.2.bb b/recipes-gamelib/allegro4/allegro4_4.4.2.bb index 3abe39b..f3cead9 100644 --- a/recipes-gamelib/allegro4/allegro4_4.4.2.bb +++ b/recipes-gamelib/allegro4/allegro4_4.4.2.bb @@ -5,9 +5,9 @@ SECTION = "libs" LICENSE = "Allegro4" LIC_FILES_CHKSUM = "file://docs/txt/license.txt;md5=55ec083de776f786d0da79bbbb887c50" -PR = "r0" +PR = "r1" -DEPENDS = "virtual/libgl libglu libx11 libxcursor physfs openal jpeg" +DEPENDS = "virtual/libgl libglu libx11 libxcursor physfs openal-soft jpeg" SRC_URI = "${SOURCEFORGE_MIRROR}/alleg/allegro/${PV}/allegro-${PV}.tar.gz \ file://avoid_lib_paths.patch \