Merge pull request #8062 from Rmys/master

libdmtx ver. bump

multimedia/graphics/libdmtx/actions.py

@@ -5,9 +5,11 @@
 
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
 def setup():
+    shelltools.system("sh ./autogen.sh")
     autotools.configure("--disable-static")
 
 def build():
@@ -19,4 +21,4 @@ def check():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    pisitools.dodoc("AUTHORS", "NEWS", "README", "README.linux")
+    pisitools.dodoc("AUTHORS", "NEWS", "README", "README.linux")

multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-c99.patch

@@ -0,0 +1,36 @@
+diff -up libdmtx-0.7.5/test/multi_test/Makefile.am.std libdmtx-0.7.5/test/multi_test/Makefile.am
+--- libdmtx-0.7.5/test/multi_test/Makefile.am.std	2018-04-06 13:14:23.000000000 +0200
++++ libdmtx-0.7.5/test/multi_test/Makefile.am	2018-04-06 13:14:27.000000000 +0200
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
++AM_CPPFLAGS = -Wshadow -Wall -pedantic -std=c99
+ 
+ check_PROGRAMS = multi_test
+ 
+diff -up libdmtx-0.7.5/test/rotate_test/Makefile.am.std libdmtx-0.7.5/test/rotate_test/Makefile.am
+--- libdmtx-0.7.5/test/rotate_test/Makefile.am.std	2018-04-06 13:14:13.000000000 +0200
++++ libdmtx-0.7.5/test/rotate_test/Makefile.am	2018-04-06 13:14:18.000000000 +0200
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
++AM_CPPFLAGS = -Wshadow -Wall -pedantic -std=c99
+ 
+ check_PROGRAMS = rotate_test
+ 
+diff -up libdmtx-0.7.5/test/simple_test/Makefile.am.std libdmtx-0.7.5/test/simple_test/Makefile.am
+--- libdmtx-0.7.5/test/simple_test/Makefile.am.std	2018-04-06 13:13:59.000000000 +0200
++++ libdmtx-0.7.5/test/simple_test/Makefile.am	2018-04-06 13:14:04.000000000 +0200
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
++AM_CPPFLAGS = -Wshadow -Wall -pedantic -std=c99
+ 
+ check_PROGRAMS = simple_test
+ 
+diff -up libdmtx-0.7.5/test/unit_test/Makefile.am.std libdmtx-0.7.5/test/unit_test/Makefile.am
+--- libdmtx-0.7.5/test/unit_test/Makefile.am.std	2018-04-06 13:13:41.000000000 +0200
++++ libdmtx-0.7.5/test/unit_test/Makefile.am	2018-04-06 13:13:53.000000000 +0200
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
++AM_CPPFLAGS = -Wshadow -Wall -pedantic -std=c99
+ 
+ check_PROGRAMS = unit_test
+ 

multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-math.patch

@@ -0,0 +1,11 @@
+diff -up libdmtx-0.7.5/test/simple_test/simple_test.c.math libdmtx-0.7.5/test/simple_test/simple_test.c
+--- libdmtx-0.7.5/test/simple_test/simple_test.c.math	2018-04-06 13:19:44.000000000 +0200
++++ libdmtx-0.7.5/test/simple_test/simple_test.c	2018-04-06 13:19:52.000000000 +0200
+@@ -18,6 +18,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <assert.h>
++#include <math.h>
+ #include <dmtx.h>
+ 
+ int

multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-size_t.patch

@@ -0,0 +1,29 @@
+diff -up libdmtx-0.7.5/test/simple_test/simple_test.c.size_t libdmtx-0.7.5/test/simple_test/simple_test.c
+--- libdmtx-0.7.5/test/simple_test/simple_test.c.size_t	2018-04-06 13:16:35.000000000 +0200
++++ libdmtx-0.7.5/test/simple_test/simple_test.c	2018-04-06 13:17:14.000000000 +0200
+@@ -58,9 +58,9 @@ main(int argc, char *argv[])
+ 
+    dmtxEncodeDestroy(&enc);
+ 
+-   fprintf(stdout, "width:  \"%d\"\n", width);
+-   fprintf(stdout, "height: \"%d\"\n", height);
+-   fprintf(stdout, "bpp:    \"%d\"\n", bytesPerPixel);
++   fprintf(stdout, "width:  \"%zd\"\n", width);
++   fprintf(stdout, "height: \"%zd\"\n", height);
++   fprintf(stdout, "bpp:    \"%zd\"\n", bytesPerPixel);
+ 
+    for (int i=0; i<width*height; i++){
+       fprintf(stdout, "%d", (pxl[i*3])==0);
+@@ -81,9 +81,9 @@ main(int argc, char *argv[])
+    if(reg != NULL) {
+       msg = dmtxDecodeMatrixRegion(dec, reg, DmtxUndefined);
+ 
+-      fprintf(stdout, "msg->arraySize :  \"%d\"\n", msg->arraySize );
+-      fprintf(stdout, "msg->codeSize  :  \"%d\"\n", msg->codeSize  );
+-      fprintf(stdout, "msg->outputSize:  \"%d\"\n", msg->outputSize);
++      fprintf(stdout, "msg->arraySize :  \"%zd\"\n", msg->arraySize );
++      fprintf(stdout, "msg->codeSize  :  \"%zd\"\n", msg->codeSize  );
++      fprintf(stdout, "msg->outputSize:  \"%zd\"\n", msg->outputSize);
+       int oned = sqrt(msg->arraySize);
+       for (int i=0; i<msg->arraySize; i++){
+          fprintf(stdout, " %c.", msg->array[i]);

multimedia/graphics/libdmtx/pspec.xml

@@ -12,7 +12,12 @@
         <IsA>library</IsA>
         <Summary>A Library for working with Data Matrix 2D bar-codes</Summary>
         <Description>libdmtx is an open source software for reading and writing Data Matrix 2D bar-codes on Linux, Unix, OS X, Windows and mobile devices.</Description>
-        <Archive sha1sum="7a353da736cf37e8730e2c22aca4629035aeadcd" type="targz">mirrors://sourceforge/libdmtx/libdmtx/0.7.4/libdmtx-0.7.4.tar.gz</Archive>
+        <Archive sha1sum="5a9742e7f74e8d1c154a212b3b0f37a740b6f0f2" type="targz">https://github.com/dmtx/libdmtx/archive/v0.7.5.tar.gz</Archive>
+        <Patches>
+            <Patch level="1">fedora/libdmtx-0.7.5-c99.patch</Patch>
+            <Patch level="1">fedora/libdmtx-0.7.5-math.patch</Patch>
+            <Patch level="1">fedora/libdmtx-0.7.5-size_t.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
@@ -37,6 +42,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2020-03-06</Date>
+            <Version>0.7.5</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2018-08-11</Date>
             <Version>0.7.4</Version>