diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-19 14:23:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-19 14:23:52 +0300 |
| commit | d3fe6cbd77ac51c6d62ac6fffaf72a7825e7f853 (patch) | |
| tree | 2e3d31568a5cf4f56e9da81e7954b56d3eadbdda /packaging/nacl/ports/manaplus | |
| parent | bc28a803b641cb7b33829a6bfd5f9a704cf21fbe (diff) | |
| download | plus-d3fe6cbd77ac51c6d62ac6fffaf72a7825e7f853.tar.gz plus-d3fe6cbd77ac51c6d62ac6fffaf72a7825e7f853.tar.bz2 plus-d3fe6cbd77ac51c6d62ac6fffaf72a7825e7f853.tar.xz plus-d3fe6cbd77ac51c6d62ac6fffaf72a7825e7f853.zip | |
Update nacl ports.
Diffstat (limited to 'packaging/nacl/ports/manaplus')
| -rwxr-xr-x | packaging/nacl/ports/manaplus/build.sh | 35 | ||||
| -rw-r--r-- | packaging/nacl/ports/manaplus/pkg_info | 6 |
2 files changed, 16 insertions, 25 deletions
diff --git a/packaging/nacl/ports/manaplus/build.sh b/packaging/nacl/ports/manaplus/build.sh index 5947f3b53..19f97cabd 100755 --- a/packaging/nacl/ports/manaplus/build.sh +++ b/packaging/nacl/ports/manaplus/build.sh @@ -3,40 +3,31 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -GitCloneStep() { - if CheckKeyStamp clone "$URL" ; then - Banner "Skipping git clone step" - return - fi - - local GIT_URL=${URL%@*} - rm -rf ${SRC_DIR} - mkdir ${SRC_DIR} - git clone ${GIT_URL} ${SRC_DIR} - - TouchKeyStamp clone "$URL" -} - ConfigureStep() { Banner "Configuring ${PACKAGE_NAME}" SetupCrossEnvironment + + # export the nacl tools export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR} + export SDL_CONFIG=${NACLPORTS_LIBDIR}/../bin/sdl-config SDL_CFLAGS=`$SDL_CONFIG --cflags` - SDL_LIBS="-lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_gfx -lSDL_net `$SDL_CONFIG --libs` -lfreetype -ljpeg -lpng16 -lwebp -lvorbisfile -lvorbis -logg -lmikmod -lz -lbz2" - export LIBS="-L${NACLPORTS_LIBDIR} ${SDL_LIBS} -lnacl_io -lppapi_cpp -lppapi -lpthread -lstdc++ -lRegal -lm -lc" - autoreconf -i ${SRC_DIR} - ${SRC_DIR}/configure \ + SDL_LIBS="-lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_gfx -lSDL_net -lfreetype -ljpeg -lpng16 -lwebp -lvorbisfile -lvorbis -logg -lmikmod -lz -lbz2 -ltiff" + export LIBS="-L${NACLPORTS_LIBDIR} ${SDL_LIBS} -lnacl_io -lpthread -lRegal -lm" + export MANAPLUSDIR="${START_DIR}/src" + +# autoreconf -i ${SRC_DIR} + autoreconf -i ${MANAPLUSDIR} +# ${SRC_DIR}/configure + ${MANAPLUSDIR}/configure \ --enable-naclbuild \ --disable-nls \ - --without-opengl \ + --with-opengl \ --without-librt \ --without-mumble \ + --without-dyecmd \ --host=nacl \ --prefix=${PREFIX} } - -DefaultPackageInstall -exit 0 diff --git a/packaging/nacl/ports/manaplus/pkg_info b/packaging/nacl/ports/manaplus/pkg_info index 4b1f44ec2..aad0c16bd 100644 --- a/packaging/nacl/ports/manaplus/pkg_info +++ b/packaging/nacl/ports/manaplus/pkg_info @@ -1,6 +1,6 @@ NAME=manaplus VERSION=1 -URL=git://gitorious.org/manaplus/manaplus.git +#URL=https://gitlab.com/manaplus/manaplus.git@master LICENSE=GPL -DEPENDS=(sdl sdl-gfx sdl-mixer sdl-ttf sdl-image sdl-net physfs curl libxml2 libwebp) -SHA1=ed2fe0e228a3d367017839a0cc4c548d526e516f +DEPENDS=(sdl sdl-gfx sdl-mixer sdl-ttf sdl-image sdl-net physfs curl libxml2 libwebp zlib) +SHA1=4178d0c709b34b811d1781fc6dc183ea4979c2b5 |