summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2020-05-09 20:03:02 +0200
committerRobby Workman <rworkman@slackbuilds.org>2021-04-17 23:40:59 -0500
commite9ef36222ee915e5a996a3d3d76e5bcd71a05ccc (patch)
tree69a9ec4ab22c916525415673c029af72dcd3729a
parent6740f12d233c6a771628e20e41874b99cdf7eb91 (diff)
downloadslackbuilds-e9ef36222ee915e5a996a3d3d76e5bcd71a05ccc.tar.gz
libraries/libunicap: Patch for gcc >= 10.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--libraries/libunicap/gcc10.patch25
-rw-r--r--libraries/libunicap/libunicap.SlackBuild2
2 files changed, 27 insertions, 0 deletions
diff --git a/libraries/libunicap/gcc10.patch b/libraries/libunicap/gcc10.patch
new file mode 100644
index 0000000000..638f4eb8d9
--- /dev/null
+++ b/libraries/libunicap/gcc10.patch
@@ -0,0 +1,25 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for libunicap <= 0.9.12 to declare the
+struct as extern in header files (https://gcc.gnu.org/gcc-10/porting_to.html).
+
+--- libunicap-0.9.12/common/queue.h 2010-01-17 08:49:29.000000000 +0100
++++ libunicap-0.9.12/common/queue.h.gcc10 2020-02-09 23:30:16.963136320 +0100
+@@ -24,7 +24,7 @@
+ #include <sys/time.h>
+ #include <semaphore.h>
+
+-struct _unicap_queue
++extern struct _unicap_queue
+ {
+ sem_t sema;
+ sem_t *psema;
+--- libunicap-0.9.12/cpi/euvccam/queue.h 2010-01-19 07:52:49.000000000 +0100
++++ libunicap-0.9.12/cpi/euvccam/queue.h.gcc10 2020-02-09 23:30:05.037048713 +0100
+@@ -24,7 +24,7 @@
+ #include <sys/time.h>
+ #include <semaphore.h>
+
+-struct _unicap_queue
++extern struct _unicap_queue
+ {
+ sem_t sema;
+ sem_t *psema;
diff --git a/libraries/libunicap/libunicap.SlackBuild b/libraries/libunicap/libunicap.SlackBuild
index 35f2eee368..45b4174e18 100644
--- a/libraries/libunicap/libunicap.SlackBuild
+++ b/libraries/libunicap/libunicap.SlackBuild
@@ -52,6 +52,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+patch -p1 < $CWD/gcc10.patch
+
# This header has moved
sed -i "s|linux\/videodev\.|libv4l1-videodev.|" \
cpi/v4l/v4l.c cpi/v4l2cpi/uvcvideo.h