summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Reimer2018-04-30 15:56:22 +0200
committerChristopher Reimer2018-04-30 15:56:22 +0200
commitb7ab1ce85d68be45efc98afc1c0570a00c2f551b (patch)
tree5d927f8c7c4428ee56c0551238a7dd0857557ea8
parentd6ec8fd94db5545bc4fd5e9bac8dc837bd25915d (diff)
downloadaur-b7ab1ce85d68be45efc98afc1c0570a00c2f551b.tar.gz
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/444334fa2478d2a0ed2905129283a7f4c1ad0674)
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
-rw-r--r--serdisplib-2.01-add-destdir-support.patch82
3 files changed, 93 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ed6be0a59f4..6b4196ec578 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by makepkg 5.0.2
-# Thu Sep 7 22:03:04 UTC 2017
+# Mon Apr 30 13:56:22 UTC 2018
pkgbase = serdisplib
pkgdesc = Library to drive displays with built-in controllers
pkgver = 2.01
@@ -15,8 +15,10 @@ pkgbase = serdisplib
depends = libusb-compat
depends = sdl
source = http://sourceforge.net/projects/serdisplib/files/serdisplib/2.01/serdisplib-2.01.tar.gz
+ source = serdisplib-2.01-add-destdir-support.patch
source = 99-serdisplib.rules
md5sums = 4eb17cd70aa963c30a237d426ac24449
+ md5sums = 2358c7b2eb705f4927a623016317725f
md5sums = ee2c17141cec151a9acc68c56506f2d1
pkgname = serdisplib
diff --git a/PKGBUILD b/PKGBUILD
index 690f418175b..99c3817e1f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,17 +10,22 @@ arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
license=('GPL2')
depends=('gd' 'libusb-compat' 'sdl')
source=("http://sourceforge.net/projects/serdisplib/files/serdisplib/$pkgver/$pkgname-$pkgver.tar.gz"
+ 'serdisplib-2.01-add-destdir-support.patch'
'99-serdisplib.rules')
md5sums=('4eb17cd70aa963c30a237d426ac24449'
+ '2358c7b2eb705f4927a623016317725f'
'ee2c17141cec151a9acc68c56506f2d1')
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -p1 -i "${srcdir}/serdisplib-2.01-add-destdir-support.patch"
+}
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
- --includedir=${pkgdir}/usr/include \
- --bindir=${pkgdir}/usr/bin \
- --libdir=${pkgdir}/usr/lib \
--enable-libusb \
--enable-libSDL
make
diff --git a/serdisplib-2.01-add-destdir-support.patch b/serdisplib-2.01-add-destdir-support.patch
new file mode 100644
index 00000000000..32a0575510d
--- /dev/null
+++ b/serdisplib-2.01-add-destdir-support.patch
@@ -0,0 +1,82 @@
+diff -rup a/Makefile.in b/Makefile.in
+--- a/Makefile.in 2017-02-02 13:37:48.000000000 +0100
++++ b/Makefile.in 2017-12-23 13:59:41.554575235 +0100
+@@ -9,10 +9,10 @@ top_srcdir = @top_srcdir@
+ srcdir = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir = @bindir@
+-libdir = @libdir@
+-datarootdir = @datarootdir@
+-mandir = @mandir@
++bindir = $(DESTDIR)@bindir@
++libdir = $(DESTDIR)@libdir@
++datarootdir = $(DESTDIR)@datarootdir@
++mandir = $(DESTDIR)@mandir@
+
+ abs_top_srcdir=@abs_top_srcdir@
+ base_abs_top_srcdir=$(shell /bin/basename $(abs_top_srcdir))
+diff -rup a/server/Makefile.in b/server/Makefile.in
+--- a/server/Makefile.in 2013-05-25 12:58:14.000000000 +0200
++++ b/server/Makefile.in 2017-12-23 14:01:41.267125405 +0100
+@@ -13,13 +13,13 @@ top_srcdir = @top_srcdir@
+ srcdir = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libdir = @libdir@
+-mandir = @mandir@
+-includedir = @includedir@
+-sysconfdir = @sysconfdir@
+-datarootdir = @datarootdir@
++bindir = $(DESTDIR)@bindir@
++sbindir = $(DESTDIR)@sbindir@
++libdir = $(DESTDIR)@libdir@
++mandir = $(DESTDIR)@mandir@
++includedir = $(DESTDIR)@includedir@
++sysconfdir = $(DESTDIR)@sysconfdir@
++datarootdir = $(DESTDIR)@datarootdir@
+
+ CC=@CC@
+ AR=@AR@ -r
+diff -rup a/src/Makefile.in b/src/Makefile.in
+--- a/src/Makefile.in 2017-02-02 13:37:48.000000000 +0100
++++ b/src/Makefile.in 2017-12-23 14:00:26.513015081 +0100
+@@ -21,11 +21,11 @@ top_srcdir = @top_srcdir@
+ srcdir = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir = @bindir@
+-libdir = @libdir@
+-mandir = @mandir@
+-includedir = @includedir@
+-datarootdir = @datarootdir@
++bindir = $(DESTDIR)@bindir@
++libdir = $(DESTDIR)@libdir@
++mandir = $(DESTDIR)@mandir@
++includedir = $(DESTDIR)@includedir@
++datarootdir = $(DESTDIR)@datarootdir@
+
+ CC=@CC@
+ AR=@AR@ -r
+diff -rup a/tools/Makefile.in b/tools/Makefile.in
+--- a/tools/Makefile.in 2014-03-30 09:13:59.000000000 +0200
++++ b/tools/Makefile.in 2017-12-23 14:00:49.462225494 +0100
+@@ -10,11 +10,11 @@ top_srcdir = @top_srcdir@
+ srcdir = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir = @bindir@
+-libdir = @libdir@
+-mandir = @mandir@
+-includedir = @includedir@
+-datarootdir = @datarootdir@
++bindir = $(DESTDIR)@bindir@
++libdir = $(DESTDIR)@libdir@
++mandir = $(DESTDIR)@mandir@
++includedir = $(DESTDIR)@includedir@
++datarootdir = $(DESTDIR)@datarootdir@
+
+ CC=@CC@
+ AR=@AR@ -r