summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pompili2023-04-18 21:10:38 +0200
committerMarco Pompili2023-04-18 21:12:40 +0200
commit0599b0542a8138290ee358b1e6c1c303bc351701 (patch)
tree9550e2288602d421a2e210fef515801c4fbe843c
parent881162fc898da109bf055f348c4a38338a559223 (diff)
downloadaur-0599b0542a8138290ee358b1e6c1c303bc351701.tar.gz
Version 0.11.2-2
- add libsndfile-error patch
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD16
-rw-r--r--fix-libsndfile-error.patch28
3 files changed, 42 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0280ff13a712..3cf10493d747 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = openframeworks
pkgdesc = An open source C++ toolkit for creative coding.
pkgver = 0.11.2
- pkgrel = 1
+ pkgrel = 2
url = http://openframeworks.cc/
install = openframeworks.install
arch = x86_64
@@ -35,8 +35,9 @@ pkgbase = openframeworks
options = !strip
source = of-make-workspace
source = https://openframeworks.cc/versions/v0.11.2/of_v0.11.2_linux64gcc6_release.tar.gz
+ source = https://gist.githubusercontent.com/kerrickstaley/7f8c65a27a1f4e79a942235b87c1f0c0/raw/28f7d0dd94237076f72b8eaf2e009831d7d61a5d/fix-libsndfile-error.patch
sha256sums = b4fc38288595df566f770018d871970fb13fb2ad4af7e9e5cddc60288f338806
sha256sums = 9907beae6c786751470f5a55f1273280f3c240b4a93ce0c4a32c4a62b401470c
+ sha256sums = 67693b69e2c36861d14ce9fa57b6855898c48fa4ed90e6aa14d7ce3a779b6110
pkgname = openframeworks
-
diff --git a/PKGBUILD b/PKGBUILD
index adc677df4258..4f74fd07865e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer: Marco Pompili <aur@mg.odd.red>
+# Maintainer: Marco Pompili <aur@odd.red>
DLAGENTS=("https::/usr/bin/curl -k -o %o %u")
pkgname=openframeworks
pkgver=0.11.2
-pkgrel=1
+pkgrel=2
pkgdesc="An open source C++ toolkit for creative coding."
url="http://openframeworks.cc/"
arch=('x86_64')
@@ -16,9 +16,11 @@ install=openframeworks.install
source=(
"of-make-workspace"
"https://openframeworks.cc/versions/v${pkgver}/of_v${pkgver}_linux64gcc6_release.tar.gz"
+ "https://gist.githubusercontent.com/kerrickstaley/7f8c65a27a1f4e79a942235b87c1f0c0/raw/28f7d0dd94237076f72b8eaf2e009831d7d61a5d/fix-libsndfile-error.patch"
)
sha256sums=('b4fc38288595df566f770018d871970fb13fb2ad4af7e9e5cddc60288f338806'
- '9907beae6c786751470f5a55f1273280f3c240b4a93ce0c4a32c4a62b401470c')
+ '9907beae6c786751470f5a55f1273280f3c240b4a93ce0c4a32c4a62b401470c'
+ '67693b69e2c36861d14ce9fa57b6855898c48fa4ed90e6aa14d7ce3a779b6110')
_name="of_v${pkgver}_linux64gcc6_release"
@@ -45,11 +47,15 @@ prepare() {
while getopts tj: opt ; do
case "$opt" in
t) # testing, only build Debug
- BUILD="test" ;;
+ BUILD="test" ;;
j) # make job count for parallel build
- JOBS="$OPTARG"
+ JOBS="$OPTARG"
esac
done
+
+ msg2 "Apply patch to fix libsndfile error..."
+ cd ${srcdir}/${_name}
+ patch -p1 < ${srcdir}/fix-libsndfile-error.patch
}
build() {
diff --git a/fix-libsndfile-error.patch b/fix-libsndfile-error.patch
new file mode 100644
index 000000000000..ceacc8f03a5b
--- /dev/null
+++ b/fix-libsndfile-error.patch
@@ -0,0 +1,28 @@
+diff --git a/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp b/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp
+index 71caf42d8..39146d7d6 100644
+--- a/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp
++++ b/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp
+@@ -7,7 +7,6 @@
+ #include "glm/common.hpp"
+ #include "ofLog.h"
+ #include "ofEvents.h"
+-#include <sndfile.h>
+
+ #if defined (TARGET_OF_IOS) || defined (TARGET_OSX)
+ #include <OpenAL/al.h>
+diff --git a/libs/openFrameworks/sound/ofOpenALSoundPlayer.h b/libs/openFrameworks/sound/ofOpenALSoundPlayer.h
+index 042f7b354..80df4f90c 100644
+--- a/libs/openFrameworks/sound/ofOpenALSoundPlayer.h
++++ b/libs/openFrameworks/sound/ofOpenALSoundPlayer.h
+@@ -12,10 +12,7 @@ typedef unsigned int ALuint;
+
+ #include "kiss_fft.h"
+ #include "kiss_fftr.h"
+-
+-
+-
+-typedef struct SNDFILE_tag SNDFILE ;
++#include <sndfile.h>
+
+
+ #ifdef OF_USING_MPG123