summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2018-07-19 23:38:41 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2018-07-22 13:12:52 +0200
commit1619d3f927c2afde21f152785de50594dfa12b9c (patch)
tree27609b5e3201bb19606af6c795ab578482f2ff18
parent624f02abc8cce0b23f50f43b963b1ac98475fc3a (diff)
downloadmedia-master.tar.gz
media-master.tar.xz
libdmtx: Version bump to 0.7.5HEADmaster
Apparently the project moved to github. libdmtx.org redirects to something unrelated.
-rw-r--r--packages/media-libs/libdmtx/files/libdmtx-0.7.5-sqrt-needs-math.h.patch26
-rw-r--r--packages/media-libs/libdmtx/files/libdmtx-0.7.5-test-makefile-migrating-ANSI-C-C99.patch58
-rw-r--r--packages/media-libs/libdmtx/libdmtx-0.7.5.exheres-0 (renamed from packages/media-libs/libdmtx/libdmtx-0.7.4.exheres-0)9
3 files changed, 91 insertions, 2 deletions
diff --git a/packages/media-libs/libdmtx/files/libdmtx-0.7.5-sqrt-needs-math.h.patch b/packages/media-libs/libdmtx/files/libdmtx-0.7.5-sqrt-needs-math.h.patch
new file mode 100644
index 0000000..ab47611
--- /dev/null
+++ b/packages/media-libs/libdmtx/files/libdmtx-0.7.5-sqrt-needs-math.h.patch
@@ -0,0 +1,26 @@
+Upstream: yes
+
+From 4e8dfcd53154b1728615aaa8c35b4dcb772aa10d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Fri, 6 Apr 2018 13:30:47 +0200
+Subject: [PATCH] sqrt() needs math.h
+
+---
+ test/simple_test/simple_test.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/simple_test/simple_test.c b/test/simple_test/simple_test.c
+index 9a4cedc..73daa85 100644
+--- a/test/simple_test/simple_test.c
++++ b/test/simple_test/simple_test.c
+@@ -18,6 +18,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <assert.h>
++#include <math.h>
+ #include <dmtx.h>
+
+ int
+--
+2.18.0
+
diff --git a/packages/media-libs/libdmtx/files/libdmtx-0.7.5-test-makefile-migrating-ANSI-C-C99.patch b/packages/media-libs/libdmtx/files/libdmtx-0.7.5-test-makefile-migrating-ANSI-C-C99.patch
new file mode 100644
index 0000000..d5750b7
--- /dev/null
+++ b/packages/media-libs/libdmtx/files/libdmtx-0.7.5-test-makefile-migrating-ANSI-C-C99.patch
@@ -0,0 +1,58 @@
+Upstream: Yes
+Reason: Fix building of the tests
+
+From 59d210c1d2fa8b48f141f7997ade92f15c99185f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Fri, 6 Apr 2018 13:29:51 +0200
+Subject: [PATCH] test/makefile: migrating ANSI C -> C99
+
+---
+ test/multi_test/Makefile.am | 2 +-
+ test/rotate_test/Makefile.am | 2 +-
+ test/simple_test/Makefile.am | 2 +-
+ test/unit_test/Makefile.am | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/multi_test/Makefile.am b/test/multi_test/Makefile.am
+index 6163494..911de34 100644
+--- a/test/multi_test/Makefile.am
++++ b/test/multi_test/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
++AM_CPPFLAGS = -Wshadow -Wall -pedantic -std=c99
+
+ check_PROGRAMS = multi_test
+
+diff --git a/test/rotate_test/Makefile.am b/test/rotate_test/Makefile.am
+index 40b75db..4889ed4 100644
+--- a/test/rotate_test/Makefile.am
++++ b/test/rotate_test/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
++AM_CPPFLAGS = -Wshadow -Wall -pedantic -std=c99
+
+ check_PROGRAMS = rotate_test
+
+diff --git a/test/simple_test/Makefile.am b/test/simple_test/Makefile.am
+index dc3e2a8..3245c1c 100644
+--- a/test/simple_test/Makefile.am
++++ b/test/simple_test/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
++AM_CPPFLAGS = -Wshadow -Wall -pedantic -std=c99
+
+ check_PROGRAMS = simple_test
+
+diff --git a/test/unit_test/Makefile.am b/test/unit_test/Makefile.am
+index 9e36074..7454e60 100644
+--- a/test/unit_test/Makefile.am
++++ b/test/unit_test/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
++AM_CPPFLAGS = -Wshadow -Wall -pedantic -std=c99
+
+ check_PROGRAMS = unit_test
+
+--
+2.18.0
+
diff --git a/packages/media-libs/libdmtx/libdmtx-0.7.4.exheres-0 b/packages/media-libs/libdmtx/libdmtx-0.7.5.exheres-0
index 026dbb9..c0561bb 100644
--- a/packages/media-libs/libdmtx/libdmtx-0.7.4.exheres-0
+++ b/packages/media-libs/libdmtx/libdmtx-0.7.5.exheres-0
@@ -1,10 +1,10 @@
# Copyright 2013 Heiko Becker <heirecka@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require sourceforge
+require github [ user=dmtx tag=v${PV} ]
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
SUMMARY="${PN} is open source software for reading and writing Data Matrix barcodes"
-HOMEPAGE+=" http://www.libdmtx.org/"
LICENCES="BSD-2"
SLOT="0"
@@ -16,6 +16,11 @@ DEPENDENCIES=""
BUGS_TO="heirecka@exherbo.org"
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/${PNV}-test-makefile-migrating-ANSI-C-C99.patch
+ "${FILES}"/${PNV}-sqrt-needs-math.h.patch
+)
+
DEFAULT_SRC_INSTALL_EXCLUDE=( README.cygwin README.freebsd README.mingw README.osx README.unix )
src_test() {