diff options
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | PKGBUILD | 53 | ||||
| -rw-r--r-- | glew_fix.patch | 11 |
3 files changed, 21 insertions, 60 deletions
@@ -1,18 +1,19 @@ pkgbase = openframeworks pkgdesc = An open source C++ toolkit for creative coding. - pkgver = 0.10.1 - pkgrel = 2 + pkgver = 0.12.0 + pkgrel = 3 url = http://openframeworks.cc/ install = openframeworks.install arch = x86_64 license = MIT depends = make - depends = pkg-config + depends = pkgconf depends = gcc + depends = poco depends = openal depends = python-lxml depends = glew - depends = glfw + depends = glfw-x11 depends = pugixml depends = freeglut depends = freeimage @@ -29,15 +30,13 @@ pkgbase = openframeworks depends = mpg123 depends = rtaudio depends = uriparser + depends = libxinerama optdepends = qtcreator optdepends = xterm options = !strip - source = glew_fix.patch source = of-make-workspace - source = https://openframeworks.cc/versions/v0.10.1/of_v0.10.1_linux64gcc6_release.tar.gz - sha256sums = 1c36ee2b8d931c4450e7113324a58a63222465f9469e6732419616de803cddcc + source = https://github.com/openframeworks/openFrameworks/releases/download/0.12.0/of_v0.12.0_linux64gcc6_release.tar.gz sha256sums = b4fc38288595df566f770018d871970fb13fb2ad4af7e9e5cddc60288f338806 - sha256sums = 9cc5133028b84d5031dbd054719238095e46a5aed507f3b32265fa2906f37905 + sha256sums = 942cd299c903e0aeea5f05e429ab813702e0ba4f99a5a3d0e7c21e61be9b3b2b pkgname = openframeworks - @@ -1,43 +1,31 @@ -# Maintainer: Marco Pompili <aur (at) mg.odd.red> - -DLAGENTS=("https::/usr/bin/curl -k -o %o %u") +# Maintainer: Marco Pompili <aur@odd.red> pkgname=openframeworks -pkgver=0.10.1 -pkgrel=2 +pkgver=0.12.0 +pkgrel=3 pkgdesc="An open source C++ toolkit for creative coding." url="http://openframeworks.cc/" arch=('x86_64') license=('MIT') -depends=('make' 'pkg-config' 'gcc' 'openal' 'python-lxml' 'glew' 'glfw' 'pugixml' 'freeglut' 'freeimage' 'gstreamer' 'gst-plugins-base' 'gst-plugins-good' 'gst-plugins-bad' 'gst-plugins-ugly' 'gst-libav' 'opencv' 'libxcursor' 'assimp' 'boost' 'mpg123' 'rtaudio' 'uriparser') +depends=('make' 'pkgconf' 'gcc' 'poco' 'openal' 'python-lxml' 'glew' 'glfw-x11' 'pugixml' 'freeglut' 'freeimage' 'gstreamer' 'gst-plugins-base' 'gst-plugins-good' 'gst-plugins-bad' 'gst-plugins-ugly' 'gst-libav' 'opencv' 'libxcursor' 'assimp' 'boost' 'mpg123' 'rtaudio' 'uriparser' 'libxinerama') optdepends=('qtcreator' 'xterm') options=(!strip) install=openframeworks.install source=( - "glew_fix.patch" "of-make-workspace" - "https://openframeworks.cc/versions/v${pkgver}/of_v${pkgver}_linux64gcc6_release.tar.gz") -sha256sums=('1c36ee2b8d931c4450e7113324a58a63222465f9469e6732419616de803cddcc' - 'b4fc38288595df566f770018d871970fb13fb2ad4af7e9e5cddc60288f338806' - '9cc5133028b84d5031dbd054719238095e46a5aed507f3b32265fa2906f37905') + "https://github.com/openframeworks/openFrameworks/releases/download/0.12.0/of_v0.12.0_linux64gcc6_release.tar.gz" +) +sha256sums=('b4fc38288595df566f770018d871970fb13fb2ad4af7e9e5cddc60288f338806' + '942cd299c903e0aeea5f05e429ab813702e0ba4f99a5a3d0e7c21e61be9b3b2b') _name="of_v${pkgver}_linux64gcc6_release" prepare() { cd ${srcdir} - msg2 "Applying fix for glew redeclaration" - # copy patch - cp glew_fix.patch ${_name} - - # apply patch - cd ${_name} - patch -p0 < glew_fix.patch - - - export OF_ROOT=${srcdir}/${_name} export LC_ALL=C + export CXXFLAGS="-Wall -Wno-error -Wno-format-security" ARCH=$(uname -m) @@ -46,21 +34,6 @@ prepare() { else LIBSPATH=linux fi - - pushd `dirname $0` > /dev/null - SCRIPTPATH=`pwd` - popd > /dev/null - - BUILD="install" - JOBS=1 - while getopts tj: opt ; do - case "$opt" in - t) # testing, only build Debug - BUILD="test" ;; - j) # make job count for parallel build - JOBS="$OPTARG" - esac - done } build() { @@ -69,22 +42,22 @@ build() { cd libs/openFrameworksCompiled/project msg2 "Building openFrameworks Debug version" - make -j$cores Debug + make -s Debug msg2 "Building openFrameworks Release version" - make -j$cores Release + make -s Release cd ${srcdir}/${_name} msg2 "Building OF Project Generator tool..." cd apps/projectGenerator/commandLine - make -j$cores Release + make -s Release cd ${srcdir}/${_name} msg2 "Building OF Project Generator interface..." cd libs/openFrameworksCompiled/project - make -j$cores Release + make -s Release } package() { diff --git a/glew_fix.patch b/glew_fix.patch deleted file mode 100644 index 16585a335ed7..000000000000 --- a/glew_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/openFrameworks/utils/ofConstants.back 2018-12-20 17:00:10.600334546 +0100 -+++ libs/openFrameworks/utils/ofConstants.h 2018-12-20 17:00:28.527301800 +0100 -@@ -209,7 +209,7 @@ - #define GL_GLEXT_PROTOTYPES - #include <GL/glew.h> - #include <GL/gl.h> -- #include <GL/glext.h> -+ // #include <GL/glext.h> - #endif - - // for some reason, this isn't defined at compile time, |