diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | PKGBUILD | 152 | ||||
| -rw-r--r-- | glew_fix.patch | 11 | ||||
| -rw-r--r-- | rtAudio.patch | 11 |
4 files changed, 97 insertions, 97 deletions
@@ -1,13 +1,12 @@ # Generated by mksrcinfo v8 -# Thu Dec 1 14:14:25 UTC 2016 +# Thu Dec 20 16:18:35 UTC 2018 pkgbase = openframeworks pkgdesc = An open source C++ toolkit for creative coding. - pkgver = 0.9.8 - pkgrel = 2 + pkgver = 0.10.1 + pkgrel = 1 url = http://openframeworks.cc/ install = openframeworks.install arch = x86_64 - arch = i686 license = MIT depends = make depends = pkg-config @@ -29,17 +28,16 @@ pkgbase = openframeworks depends = boost depends = mpg123 depends = rtaudio + depends = uriparser optdepends = qtcreator optdepends = xterm options = !strip - source = rtAudio.patch + source = glew_fix.patch source = of-make-workspace - md5sums = 31600cdc597a275295fa35cf178f83c0 - md5sums = d4a0cfda1970138b71d28f1cd81220da - source_x86_64 = http://www.openframeworks.cc/versions/v0.9.8/of_v0.9.8_linux64_release.tar.gz - md5sums_x86_64 = 58816a7b9d87bb745d15cbcbed24f95b - source_i686 = http://www.openframeworks.cc/versions/v0.9.8/of_v0.9.8_linux_release.tar.gz - md5sums_i686 = 00b7d47b096e602ef346c50447f22639 + source = https://openframeworks.cc/versions/v0.10.1/of_v0.10.1_linux64gcc6_release.tar.gz + sha256sums = 1c36ee2b8d931c4450e7113324a58a63222465f9469e6732419616de803cddcc + sha256sums = b4fc38288595df566f770018d871970fb13fb2ad4af7e9e5cddc60288f338806 + sha256sums = 9cc5133028b84d5031dbd054719238095e46a5aed507f3b32265fa2906f37905 pkgname = openframeworks @@ -1,106 +1,108 @@ -# Maintainer: Marco Pompili <aur@emarcs.org> +# Maintainer: Marco Pompili <aur (at) mg.odd.red> + +DLAGENTS=("https::/usr/bin/curl -k -o %o %u") pkgname=openframeworks -pkgver=0.9.8 -pkgrel=2 +pkgver=0.10.1 +pkgrel=1 pkgdesc="An open source C++ toolkit for creative coding." url="http://openframeworks.cc/" -arch=('x86_64' 'i686') +arch=('x86_64') license=('MIT') -depends=('make' 'pkg-config' 'gcc' 'openal' 'python-lxml' 'glew' 'freeglut' -'freeimage' 'gstreamer' 'gst-plugins-base' 'gst-plugins-good' 'gst-plugins-bad' -'gst-plugins-ugly' 'gst-libav' 'opencv' 'libxcursor' 'assimp' 'boost' 'mpg123' 'rtaudio') +depends=('make' 'pkg-config' 'gcc' 'openal' 'python-lxml' 'glew' 'freeglut' 'freeimage' 'gstreamer' 'gst-plugins-base' 'gst-plugins-good' 'gst-plugins-bad' 'gst-plugins-ugly' 'gst-libav' 'opencv' 'libxcursor' 'assimp' 'boost' 'mpg123' 'rtaudio' 'uriparser') 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') -[[ "$CARCH" == "i686" ]] && _arch="linux" || _arch="linux64" -_name="of_v${pkgver}_${_arch}_release" - -source=("rtAudio.patch" "of-make-workspace") - -source_i686=("http://www.openframeworks.cc/versions/v${pkgver}/of_v${pkgver}_linux_release.tar.gz") -source_x86_64=("http://www.openframeworks.cc/versions/v${pkgver}/of_v${pkgver}_linux64_release.tar.gz") -md5sums=('31600cdc597a275295fa35cf178f83c0' - 'd4a0cfda1970138b71d28f1cd81220da') -md5sums_x86_64=('58816a7b9d87bb745d15cbcbed24f95b') -md5sums_i686=('00b7d47b096e602ef346c50447f22639') +_name="of_v${pkgver}_linux64gcc6_release" prepare() { - export OF_ROOT=${srcdir}/${_name} - export LC_ALL=C - - ARCH=$(uname -m) - - if [ "$ARCH" = "x86_64" ]; then - LIBSPATH=linux64 - else - LIBSPATH=linux - fi - - GCC_MAJOR_GT_4=$(expr `gcc -dumpversion | cut -f1 -d.` \> 4) - if [ $GCC_MAJOR_GT_4 -eq 1 ]; then - msg2 "Rebuilding POCO libraries for gcc5, this could take a while..." - - sys_cores=$(getconf _NPROCESSORS_ONLN) - - if [ $sys_cores -gt 1 ]; then - cores=$(($sys_cores-1)) - else - cores=1 - fi - - msg2 "Found $sys_cores core/s, set sail!" - - cd ${OF_ROOT}/scripts/apothecary - ./apothecary -j${cores} update poco - fi - - msg2 "Fix RtAudio.h path" - cd $srcdir - patch ${srcdir}/${_name}/libs/openFrameworks/sound/ofRtAudioSoundStream.cpp rtAudio.patch + 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 + + ARCH=$(uname -m) + + if [ "$ARCH" = "x86_64" ]; then + LIBSPATH=linux64 + 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() { - cd ${srcdir}/${_name} + cd ${srcdir}/${_name} - cd libs/openFrameworksCompiled/project + cd libs/openFrameworksCompiled/project - msg2 "Building openFrameworks Debug version" - make -j$cores Debug + msg2 "Building openFrameworks Debug version" + make -j$cores Debug - msg2 "Building openFrameworks Release version" - make -j$cores Release + msg2 "Building openFrameworks Release version" + make -j$cores Release - cd ${srcdir}/${_name} + cd ${srcdir}/${_name} - msg2 "Building OF Project Generator tool..." - cd apps/projectGenerator/commandLine - make -j$cores Release + msg2 "Building OF Project Generator tool..." + cd apps/projectGenerator/commandLine + make -j$cores Release - cd ${srcdir}/${_name} + cd ${srcdir}/${_name} - msg2 "Building OF Project Generator interface..." - cd libs/openFrameworksCompiled/project - make -j$cores Release + msg2 "Building OF Project Generator interface..." + cd libs/openFrameworksCompiled/project + make -j$cores Release } package() { - install -Dm755 "${srcdir}/${_name}/apps/projectGenerator/commandLine/bin/projectGenerator" \ - "${pkgdir}/usr/bin/projectGenerator" + install -Dm755 "${srcdir}/${_name}/apps/projectGenerator/commandLine/bin/projectGenerator" \ + "${pkgdir}/usr/bin/projectGenerator" - install -dm755 "${pkgdir}/opt" + install -dm755 "${pkgdir}/opt" - cp -R "${srcdir}/${_name}" "${pkgdir}/opt/openFrameworks" + cp -R "${srcdir}/${_name}" "${pkgdir}/opt/openFrameworks" - install -Dm775 "${srcdir}/of-make-workspace" "${pkgdir}/opt/openFrameworks/scripts/of-make-workspace" + install -Dm775 "${srcdir}/of-make-workspace" "${pkgdir}/opt/openFrameworks/scripts/of-make-workspace" - msg2 "Fixing emptyExample project files permissions..." + msg2 "Fixing emptyExample project files permissions..." - chmod 644 "${pkgdir}"/opt/openFrameworks/apps/myApps/emptyExample/addons.make - chmod 644 "${pkgdir}"/opt/openFrameworks/apps/myApps/emptyExample/config.make - chmod 644 "${pkgdir}"/opt/openFrameworks/apps/myApps/emptyExample/emptyExample.qbs - chmod 644 "${pkgdir}"/opt/openFrameworks/apps/myApps/emptyExample/Makefile + chmod 644 "${pkgdir}"/opt/openFrameworks/apps/myApps/emptyExample/addons.make + chmod 644 "${pkgdir}"/opt/openFrameworks/apps/myApps/emptyExample/config.make + chmod 644 "${pkgdir}"/opt/openFrameworks/apps/myApps/emptyExample/emptyExample.qbs + chmod 644 "${pkgdir}"/opt/openFrameworks/apps/myApps/emptyExample/Makefile - install -D -m644 "${srcdir}/${_name}/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md" + install -D -m644 "${srcdir}/${_name}/LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md" } diff --git a/glew_fix.patch b/glew_fix.patch new file mode 100644 index 000000000000..16585a335ed7 --- /dev/null +++ b/glew_fix.patch @@ -0,0 +1,11 @@ +--- 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, diff --git a/rtAudio.patch b/rtAudio.patch deleted file mode 100644 index 3150088e0c96..000000000000 --- a/rtAudio.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ofRtAudioSoundStream.cpp 2016-03-09 17:40:44.000000000 +0100 -+++ ofRtAudioSoundStream.cpp.fixed 2016-04-29 18:06:13.321128680 +0200 -@@ -5,7 +5,7 @@ - #include "ofSoundStream.h" - #include "ofMath.h" - #include "ofUtils.h" --#include "RtAudio.h" -+#include "rtaudio/RtAudio.h" - - - //------------------------------------------------------------------------------ |