[arch-commits] Commit in zita-at1/trunk (PKGBUILD zita-at1-pkgconf.patch)

[David Runge]

    Date: Friday, July 20, 2018 @ 20:16:48
  Author: dvzrv
Revision: 362633

upgpkg: zita-at1 0.6.0-6

Fixing call to freetype-config with call to pkgconf. Removing dedicated patch.

Modified:
  zita-at1/trunk/PKGBUILD
Deleted:
  zita-at1/trunk/zita-at1-pkgconf.patch

------------------------+
 PKGBUILD               |   13 ++++++-------
 zita-at1-pkgconf.patch |   12 ------------
 2 files changed, 6 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-20 20:05:42 UTC (rev 362632)
+++ PKGBUILD	2018-07-20 20:16:48 UTC (rev 362633)
@@ -2,7 +2,7 @@
 # Maintainer: David Runge <dave at sleepmap.de>
 pkgname=zita-at1
 pkgver=0.6.0
-pkgrel=5
+pkgrel=6
 pkgdesc="An 'autotuner' Jack application."
 arch=('x86_64')
 url="https://kokkinizita.linuxaudio.org/linuxaudio/zita-at1-doc/quickguide.html"
@@ -9,16 +9,15 @@
 license=('GPL2')
 groups=('pro-audio')
 depends=('cairo' 'clxclient' 'clthreads' 'fftw' 'jack' 'zita-resampler')
-source=("https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${pkgver}.tar.bz2"
-        "${pkgname}-pkgconf.patch")
-sha512sums=('835bc336c35c9364753f1adaca9569852ed9eabdff20d618acc128735dafd383dfcb9a8b8c9f631f7bc6fe549dae3af9c5508ad378ed85169406855d37b4608d'
-            '1888e5b5bdfe0d3fac0cd655dce0f9f0d38cdbb027d289ba604a05fce5dd124ef9c1a1859d2ade1c7cf35e68ab553796c9fb3e0f82b0daa33e9e297108858971')
+source=("https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${pkgver}.tar.bz2")
+sha512sums=('835bc336c35c9364753f1adaca9569852ed9eabdff20d618acc128735dafd383dfcb9a8b8c9f631f7bc6fe549dae3af9c5508ad378ed85169406855d37b4608d')
 
 prepare() {
   cd "${pkgname}-${pkgver}/source"
-  patch -Np2 -i "../../${pkgname}-pkgconf.patch"
   # strip march=native
-  sed -e '/native/d' -i Makefile
+  sed -e '/native/d' \
+      -e 's/freetype-config\ --cflags/pkgconf\ --cflags\ freetype2/' \
+      -i Makefile
 }
 
 build() {

Deleted: zita-at1-pkgconf.patch
===================================================================
--- zita-at1-pkgconf.patch	2018-07-20 20:05:42 UTC (rev 362632)
+++ zita-at1-pkgconf.patch	2018-07-20 20:16:48 UTC (rev 362633)
@@ -1,12 +0,0 @@
-diff -ruN zita-at1-0.6.0/source/Makefile zita-at1-0.6.0-b/source/Makefile
---- zita-at1-0.6.0/source/Makefile	2017-08-09 23:04:06.000000000 +0200
-+++ zita-at1-0.6.0-b/source/Makefile	2018-07-18 23:12:48.093318136 +0200
-@@ -34,7 +34,7 @@
- 
- ZITA-AT1_O = zita-at1.o styles.o jclient.o mainwin.o png2img.o guiclass.o \
-              button.o rotary.o tmeter.o retuner.o
--zita-at1:	CPPFLAGS += -I/usr/X11R6/include `freetype-config --cflags`
-+zita-at1:	CPPFLAGS += -I/usr/X11R6/include `pkgconf --cflags freetype2`
- zita-at1:	LDLIBS += -lcairo -lclxclient -lclthreads -lzita-resampler -lfftw3f -ljack -lpthread -lpng -lXft -lX11 -lrt
- zita-at1:	LDFLAGS += -L/usr/X11R6/lib
- zita-at1:	$(ZITA-AT1_O)