summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Nehls2015-11-19 15:00:45 +0100
committerRobin Nehls2015-11-19 15:00:45 +0100
commit929e25924d50865ca561c63249d395adbf1b7464 (patch)
tree41ec900bfba0327c3c0bc3daf0c8eb04ddfd6d7a
parent20ff9171c4067b5f59e2d11c17b401426521854b (diff)
downloadaur-929e25924d50865ca561c63249d395adbf1b7464.tar.gz
fix build error with new freetype2
-rw-r--r--.SRCINFO4
-rw-r--r--0001-add-subpath-for-freetype.patch15
-rw-r--r--PKGBUILD13
3 files changed, 28 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6348a4596145..856743ca096e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gr-fosphor-git
pkgdesc = GNU Radio block for RTSA-like spectrum visualization using OpenCL and OpenGL acceleration
- pkgver = 3fdfe7c
+ pkgver = 4ae2f53
pkgrel = 1
url = http://sdr.osmocom.org/trac/wiki/fosphor
arch = any
@@ -14,7 +14,9 @@ pkgbase = gr-fosphor-git
depends = freetype2
provides = gr-fosphor
source = git://git.osmocom.org/gr-fosphor
+ source = 0001-add-subpath-for-freetype.patch
sha1sums = SKIP
+ sha1sums = 2567e84a022a456655e10f0560365b38abef19c4
pkgname = gr-fosphor-git
diff --git a/0001-add-subpath-for-freetype.patch b/0001-add-subpath-for-freetype.patch
new file mode 100644
index 000000000000..99216ff7e99c
--- /dev/null
+++ b/0001-add-subpath-for-freetype.patch
@@ -0,0 +1,15 @@
+diff --git a/cmake/Modules/FindFreetype2.cmake b/cmake/Modules/FindFreetype2.cmake
+index 7047c03..f8cdb2a 100644
+--- a/cmake/Modules/FindFreetype2.cmake
++++ b/cmake/Modules/FindFreetype2.cmake
+@@ -62,6 +62,7 @@ if(NOT FREETYPE2_FOUND)
+ ENV FREETYPE2_DIR
+ PATH_SUFFIXES
+ freetype2
++ freetype
+ include/freetype2
+ include
+ NO_DEFAULT_PATH
+--
+2.6.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 5916cab18b0b..3e4cde17a25a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Robin Nehls <aur@manol.is>
pkgname=gr-fosphor-git
-pkgver=3fdfe7c
+pkgver=4ae2f53
pkgrel=1
pkgdesc="GNU Radio block for RTSA-like spectrum visualization using OpenCL and OpenGL acceleration"
arch=('any')
@@ -10,8 +10,10 @@ license=(unknown)
depends=('gnuradio' 'boost' 'swig' 'glfw' 'opencl-headers' 'freetype2')
makedepends=('cmake')
provides=('gr-fosphor')
-source=('git://git.osmocom.org/gr-fosphor')
-sha1sums=('SKIP')
+source=('git://git.osmocom.org/gr-fosphor'
+ '0001-add-subpath-for-freetype.patch')
+sha1sums=('SKIP'
+ '2567e84a022a456655e10f0560365b38abef19c4')
_gitname=gr-fosphor
pkgver() {
@@ -19,6 +21,11 @@ pkgver() {
echo $(git describe --always | sed 's/-/./g')
}
+prepare() {
+ cd $_gitname
+ patch -p1 -i $srcdir/0001-add-subpath-for-freetype.patch
+}
+
build() {
cd $_gitname
mkdir build && cd build