[PR PATCH] allegro5: fix build w/ musl-1.2.1 (time64)

[PR PATCH] allegro5: fix build w/ musl-1.2.1 (time64)

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

There is a new pull request by pullmoll against master on the void-packages repository

https://github.com/pullmoll/void-packages allegro5
https://github.com/void-linux/void-packages/pull/26982

allegro5: fix build w/ musl-1.2.1 (time64)


A patch file from https://github.com/void-linux/void-packages/pull/26982.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-allegro5-26982.patch --]
[-- Type: text/x-diff, Size: 1856 bytes --]

From e36a543cd530e887dd31c8f197a0854da8c0e805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 6 Dec 2020 09:58:56 +0100
Subject: [PATCH] allegro5: fix build w/ musl-1.2.1 (time64)

---
 srcpkgs/allegro5/patches/time64.patch | 49 +++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 srcpkgs/allegro5/patches/time64.patch

diff --git a/srcpkgs/allegro5/patches/time64.patch b/srcpkgs/allegro5/patches/time64.patch
new file mode 100644
index 00000000000..93b0491c613
--- /dev/null
+++ b/srcpkgs/allegro5/patches/time64.patch
@@ -0,0 +1,49 @@
+--- src/linux/lhaptic.c	2015-06-01 21:58:12.000000000 +0200
++++ src/linux/lhaptic.c	2020-12-06 09:50:58.475010832 +0100
+@@ -57,6 +57,7 @@
+ 
+ 
+ /* forward declarations */
++static void lhap_timerclear(struct input_event* event);
+ static bool lhap_init_haptic(void);
+ static void lhap_exit_haptic(void);
+ 
+@@ -162,6 +163,11 @@
+    { -1,          -1 }
+ };
+ 
++static void lhap_timerclear(struct input_event* event)
++{
++   event->input_event_sec = 0;
++   event->input_event_usec = 0;
++}
+ 
+ static bool lhap_init_haptic(void)
+ {
+@@ -622,7 +628,7 @@
+    struct input_event ie;
+ 
+    lhap->parent.gain = gain;
+-   timerclear(&ie.time);
++   lhap_timerclear(&ie);
+    ie.type = EV_FF;
+    ie.code = FF_GAIN;
+    ie.value = (__s32) ((double)0xFFFF * gain);
+@@ -639,7 +645,7 @@
+    struct input_event ie;
+ 
+    lhap->parent.autocenter = autocenter;
+-   timerclear(&ie.time);
++   lhap_timerclear(&ie);
+    ie.type = EV_FF;
+    ie.code = FF_AUTOCENTER;
+    ie.value = (__s32) ((double)0xFFFF * autocenter);
+@@ -765,7 +771,7 @@
+ 
+    fd = lhap->fd;
+ 
+-   timerclear(&play.time);
++   lhap_timerclear(&play);
+    play.type = EV_FF;
+    play.code = id->_handle;
+    loops = (loops < 0) ? 1 : loops;

Re: [PR PATCH] [Merged]: allegro5: fix build w/ musl-1.2.1 (time64)

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

There's a merged pull request on the void-packages repository

allegro5: fix build w/ musl-1.2.1 (time64)
https://github.com/void-linux/void-packages/pull/26982

Description:

Re: allegro5: fix build w/ musl-1.2.1 (time64)

[hippi777]

[-- Attachment #1: Type: text/plain, Size: 428 bytes --]

New comment by hippi777 on void-packages repository

https://github.com/void-linux/void-packages/pull/26982#issuecomment-740706887

Comment:
hi there! :)

i hope my question is relevant enough to be asked here, but why didnt u bump the revision number in the template? maybe it is reasonable and its just that im not aware of it, or a mistake, but i think i already saw this case, probably around patches...

thx, bests! :)

Re: allegro5: fix build w/ musl-1.2.1 (time64)

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/26982#issuecomment-740712052

Comment:
No need to rebuild allegro5 this time. When we switch to musl-1.2.1 all 32bit archtiectures need a (complete?) rebuild anyway.

Re: allegro5: fix build w/ musl-1.2.1 (time64)

[hippi777]

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]

New comment by hippi777 on void-packages repository

https://github.com/void-linux/void-packages/pull/26982#issuecomment-740728843

Comment:
got the missing link, thx! :)