From ab56470dec183446dfee52cc99a7d6f6b3569570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 22 Mar 2013 22:36:12 +0100 Subject: [PATCH] Updated PKGBUILDs and added ES2/ES3 variants. --- PKGBUILD | 9 ++++++--- PKGBUILD-es2 | 44 ++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD-es2desktop | 45 +++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD-es3 | 44 ++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD-mingw32 | 7 ++++--- PKGBUILD-nacl | 2 +- PKGBUILD-release | 13 ++++++++----- 7 files changed, 152 insertions(+), 12 deletions(-) create mode 100644 PKGBUILD-es2 create mode 100644 PKGBUILD-es2desktop create mode 100644 PKGBUILD-es3 diff --git a/PKGBUILD b/PKGBUILD index ca4a64126..f0f8701c7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,11 +2,11 @@ pkgname=magnum pkgver=dev pkgrel=1 -pkgdesc="OpenGL 3 graphics engine" +pkgdesc="OpenGL graphics engine" arch=('i686' 'x86_64') url="https://github.com/mosra/magnum" license=('MIT') -depends=('corrade' 'glew') +depends=('corrade' 'glew' 'sdl-hg' 'freeglut') makedepends=('cmake') options=(!strip) provides=('magnum-git') @@ -27,13 +27,16 @@ build() { cmake .. \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_GLUTAPPLICATION=ON \ + -DWITH_GLXAPPLICATION=ON \ + -DWITH_SDL2APPLICATION=ON \ -DBUILD_TESTS=TRUE make } check() { cd "$startdir/build" - ctest --output-on-failure -E Benchmark + ctest --output-on-failure } package() { diff --git a/PKGBUILD-es2 b/PKGBUILD-es2 new file mode 100644 index 000000000..e4c937d64 --- /dev/null +++ b/PKGBUILD-es2 @@ -0,0 +1,44 @@ +# Author: mosra +pkgname=magnum +pkgver=dev.es2 +pkgrel=1 +pkgdesc="OpenGL graphics engine (OpenGL ES 2.0 version)" +arch=('i686' 'x86_64') +url="https://github.com/mosra/magnum" +license=('MIT') +depends=('corrade' 'glew') +makedepends=('cmake') +options=(!strip) +provides=('magnum-git') + +build() { + mkdir -p "$startdir/build-es2" + cd "$startdir/build-es2" + + if [ "$CXX" = clang++ ] ; then + newcxxflags=$(echo $CXXFLAGS | sed s/--param=ssp-buffer-size=4//g) + export CXXFLAGS="$newcxxflags" + fi + + cmake .. \ + -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_TESTS=ON \ + -DTARGET_GLES=ON \ + -DTARGET_GLES2=ON \ + -DWITH_TEXT=OFF \ + -DWITH_TEXTURETOOLS=OFF \ + -DWITH_MAGNUMINFO=OFF \ + -DWITH_XEGLAPPLICATION=ON + make +} + +check() { + cd "$startdir/build-es2" + ctest --output-on-failure +} + +package() { + cd "$startdir/build-es2" + make DESTDIR="$pkgdir/" install +} diff --git a/PKGBUILD-es2desktop b/PKGBUILD-es2desktop new file mode 100644 index 000000000..55fa9ccb9 --- /dev/null +++ b/PKGBUILD-es2desktop @@ -0,0 +1,45 @@ +# Author: mosra +pkgname=magnum +pkgver=dev.es2desktop +pkgrel=1 +pkgdesc="OpenGL graphics engine (desktop OpenGL ES 2.0 version)" +arch=('i686' 'x86_64') +url="https://github.com/mosra/magnum" +license=('MIT') +depends=('corrade' 'glew') +makedepends=('cmake') +options=(!strip) +provides=('magnum-git') + +build() { + mkdir -p "$startdir/build-es2desktop" + cd "$startdir/build-es2desktop" + + if [ "$CXX" = clang++ ] ; then + newcxxflags=$(echo $CXXFLAGS | sed s/--param=ssp-buffer-size=4//g) + export CXXFLAGS="$newcxxflags" + fi + + cmake .. \ + -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_TESTS=ON \ + -DTARGET_GLES=ON \ + -DTARGET_GLES2=ON \ + -DTARGET_DESKTOP_GLES=ON \ + -DWITH_TEXT=OFF \ + -DWITH_TEXTURETOOLS=OFF \ + -DWITH_MAGNUMINFO=OFF \ + -DWITH_XEGLAPPLICATION=ON + make +} + +check() { + cd "$startdir/build-es2desktop" + ctest --output-on-failure +} + +package() { + cd "$startdir/build-es2desktop" + make DESTDIR="$pkgdir/" install +} diff --git a/PKGBUILD-es3 b/PKGBUILD-es3 new file mode 100644 index 000000000..e567c82a8 --- /dev/null +++ b/PKGBUILD-es3 @@ -0,0 +1,44 @@ +# Author: mosra +pkgname=magnum +pkgver=dev.es3 +pkgrel=1 +pkgdesc="OpenGL graphics engine (OpenGL ES 3.0 version)" +arch=('i686' 'x86_64') +url="https://github.com/mosra/magnum" +license=('MIT') +depends=('corrade' 'glew') +makedepends=('cmake') +options=(!strip) +provides=('magnum-git') + +build() { + mkdir -p "$startdir/build-es3" + cd "$startdir/build-es3" + + if [ "$CXX" = clang++ ] ; then + newcxxflags=$(echo $CXXFLAGS | sed s/--param=ssp-buffer-size=4//g) + export CXXFLAGS="$newcxxflags" + fi + + cmake .. \ + -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_TESTS=ON \ + -DTARGET_GLES=ON \ + -DTARGET_GLES2=OFF \ + -DWITH_TEXT=OFF \ + -DWITH_TEXTURETOOLS=OFF \ + -DWITH_MAGNUMINFO=OFF \ + -DWITH_XEGLAPPLICATION=ON + make +} + +check() { + cd "$startdir/build-es3" + ctest --output-on-failure +} + +package() { + cd "$startdir/build-es3" + make DESTDIR="$pkgdir/" install +} diff --git a/PKGBUILD-mingw32 b/PKGBUILD-mingw32 index 42b3835c3..7d9526c8f 100644 --- a/PKGBUILD-mingw32 +++ b/PKGBUILD-mingw32 @@ -2,11 +2,11 @@ pkgname=mingw32-magnum pkgver=dev pkgrel=1 -pkgdesc="OpenGL 3 graphics engine (mingw32)" +pkgdesc="OpenGL graphics engine (mingw32)" arch=('any') url="https://github.com/mosra/magnum" license=('MIT') -depends=('mingw32-runtime' 'mingw32-corrade' 'mingw32-glew') +depends=('mingw32-runtime' 'mingw32-corrade' 'mingw32-glew' 'mingw32-freeglut') makedepends=('mingw32-gcc' 'cmake' 'corrade') options=(!buildflags !strip) @@ -19,7 +19,8 @@ build() { cmake .. \ -DCMAKE_TOOLCHAIN_FILE=../toolchains/archlinux/basic-mingw32.cmake \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr/i486-mingw32 + -DCMAKE_INSTALL_PREFIX=/usr/i486-mingw32 \ + -DWITH_GLUTAPPLICATION=ON make } diff --git a/PKGBUILD-nacl b/PKGBUILD-nacl index 668cafd4c..22f79f985 100644 --- a/PKGBUILD-nacl +++ b/PKGBUILD-nacl @@ -2,7 +2,7 @@ pkgname=nacl-magnum pkgver=dev pkgrel=1 -pkgdesc="OpenGL 3 graphics engine (NaCl x86-64 version)" +pkgdesc="OpenGL graphics engine (NaCl version)" arch=('any') url="https://github.com/mosra/magnum" license=('MIT') diff --git a/PKGBUILD-release b/PKGBUILD-release index a09e48d39..80453d0f9 100644 --- a/PKGBUILD-release +++ b/PKGBUILD-release @@ -1,13 +1,13 @@ # Author: mosra pkgname=magnum -pkgver=dev_release +pkgver=dev.release pkgrel=1 -pkgdesc="OpenGL 3 graphics engine" +pkgdesc="OpenGL graphics engine" arch=('i686' 'x86_64') url="https://github.com/mosra/magnum" license=('MIT') -depends=('corrade' 'glew') -makedepends=('cmake' 'qt') +depends=('corrade' 'glew' 'sdl-hg' 'freeglut') +makedepends=('cmake') provides=('magnum-git') build() { @@ -22,13 +22,16 @@ build() { cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_GLUTAPPLICATION=ON \ + -DWITH_GLXAPPLICATION=ON \ + -DWITH_SDL2APPLICATION=ON -DBUILD_TESTS=TRUE make } check() { cd "$startdir/build" - ctest --output-on-failure -E Benchmark + ctest --output-on-failure } package() {