summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO28
-rw-r--r--PKGBUILD19
-rwxr-xr-xof-make-workspace30
-rw-r--r--openframeworks.install3
4 files changed, 55 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a2238aa12f64..12010dc4963e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,39 @@
pkgbase = openframeworks
pkgdesc = openFrameworks is an open source C++ toolkit for creative coding.
- pkgver = 0.8.4
- pkgrel = 2
+ pkgver = 0.9.0
+ pkgrel = 1
url = http://openframeworks.cc/
install = openframeworks.install
arch = x86_64
arch = i686
license = MIT
- depends = gcc
+ depends = make
depends = pkg-config
+ depends = gcc
depends = openal
+ depends = python-lxml
depends = glew
depends = freeglut
+ depends = freeimage
depends = gstreamer
- depends = cairo
- depends = mpg123
depends = gst-plugins-base
depends = gst-plugins-good
depends = gst-plugins-bad
depends = gst-plugins-ugly
- depends = freeimage
depends = gst-libav
- depends = python-lxml
- optdepends = codeblocks
+ depends = opencv
+ depends = libxcursor
+ depends = assimp
+ depends = boost
+ depends = mpg123
+ depends = rtaudio
+ optdepends = qtcreator
optdepends = xterm
- source = http://www.openframeworks.cc/versions/v0.8.4/of_v0.8.4_linux64_release.tar.gz
+ options = !strip
+ source = http://www.openframeworks.cc/versions/v0.9.0/of_v0.9.0_linux64_release.tar.gz
source = of-make-workspace
- md5sums = 8465ecdaf86a45f0e0f43443e98966fe
- md5sums = 6a6111a7a98279498899ef0eba789589
+ md5sums = 96b1076fdcac679ff1888542851c175c
+ md5sums = 594d0a3c82e0451f7b7fb353e3b658c6
pkgname = openframeworks
diff --git a/PKGBUILD b/PKGBUILD
index 9d153972fc61..5a39f28b5567 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,18 @@
# Contributor: Marco Pompili <marcs.pompili at gmail dot com>
pkgname=openframeworks
-pkgver=0.8.4
-pkgrel=2
+pkgver=0.9.0
+pkgrel=1
pkgdesc="openFrameworks is an open source C++ toolkit for creative coding."
url="http://openframeworks.cc/"
arch=('x86_64' 'i686')
license='MIT'
-depends=('gcc' 'pkg-config' 'openal' 'glew' 'freeglut' 'gstreamer' 'cairo' 'mpg123' 'gst-plugins-base' 'gst-plugins-good' 'gst-plugins-bad' 'gst-plugins-ugly' 'freeimage' 'gst-libav' 'python-lxml')
-optdepends=('codeblocks' 'xterm')
+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')
+optdepends=('qtcreator' 'xterm')
makedepends=()
+options=(!strip)
install=openframeworks.install
[[ "$CARCH" == "i686" ]] && _arch="linux" || _arch="linux64"
@@ -18,9 +21,9 @@ _name=of_v${pkgver}_${_arch}_release
source=("http://www.openframeworks.cc/versions/v${pkgver}/${_name}.tar.gz" "of-make-workspace")
-[[ "$CARCH" == "i686" ]] && md5sums=("ff38e469b8ebda0529c9d131bc4f499c") || md5sums=("8465ecdaf86a45f0e0f43443e98966fe")
+[[ "$CARCH" == "i686" ]] && md5sums=("4573107c7324e061043462e6efe5f85c") || md5sums=("96b1076fdcac679ff1888542851c175c")
-md5sums+=("6a6111a7a98279498899ef0eba789589")
+md5sums+=("594d0a3c82e0451f7b7fb353e3b658c6")
build() {
cd ${srcdir}/$_name/scripts/linux/
@@ -41,9 +44,9 @@ package() {
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.cbp
- chmod 644 "${pkgdir}"/opt/openFrameworks/apps/myApps/emptyExample/emptyExample.workspace
+ 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"
diff --git a/of-make-workspace b/of-make-workspace
index 0a7a503d3e6f..adf3ffeeb19f 100755
--- a/of-make-workspace
+++ b/of-make-workspace
@@ -9,13 +9,34 @@ cd $WS
cp -R /opt/openFrameworks/addons .
-mkdir -p apps/myApps
+OFPATH="/opt/openFrameworks/"
+
+if [ -d "${OFPATH}/projectGenerator-linux64" ]; then
+ PJ="projectGenerator-linux64"
+ PLATFORM="linux64"
+elif [ -d "${OFPATH}/projectGenerator" ]; then
+ PJ="projectGenerator"
+ PLATFORM="linux"
+fi
+
+OFWSPATH=`pwd`
-cd apps
+cp -R $OFPATH/$PJ .
-cp -R /opt/openFrameworks/projectGenerator .
+touch $PJ/resources/app/settings.json
+
+echo -e "{\n\t\"advancedMode\": false,\n\t \
+\"defaultOfPath\": \"$OFWSPATH\",\n\t \
+\"defaultPlatform\": \"$PLATFORM\",\n\t \
+\"defaultRelativeProjectPath\": \"apps/myApps\",\n\t \
+\"showConsole\": false,\n\t \
+\"showDeveloperTools\": false, \n\t \
+\"useDictionaryNameGenerator\": true,\n\t \
+\"verboseOutput\": false\n}" > $PJ/resources/app/settings.json
+
+mkdir -p apps/myApps
-cd myApps
+cd apps/myApps
ln -s /opt/openFrameworks/apps/myApps/emptyExample
@@ -29,6 +50,5 @@ ln -s /opt/openFrameworks/INSTALL.md
cp -R /opt/openFrameworks/libs .
ln -s /opt/openFrameworks/LICENSE.md
ln -s /opt/openFrameworks/other
-cp -R /opt/openFrameworks/projectGenerator .
ln -s /opt/openFrameworks/README.md
ln -s /opt/openFrameworks/scripts
diff --git a/openframeworks.install b/openframeworks.install
index 732bc0d31a4a..8d2cb4432cfa 100644
--- a/openframeworks.install
+++ b/openframeworks.install
@@ -5,5 +5,6 @@ post_install() {
}
post_update() {
- echo -e "Remeber to regenerate your local workspace using: \033[0;32mof-make-workspace\033[0m".
+ echo -e "Remeber to regenerate your local workspace using: \033[0;32mof-make-workspace\033[0m."
+ echo "If you have already a local workspace in your home, BACKUP YOUR PROJECTS BEFORE generating a new local workspace."
}