Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lirc: fix lock directory / rework VERSION_NODOTS computation #9521

Merged
merged 2 commits into from
Nov 24, 2024

Conversation

mglae
Copy link
Contributor

@mglae mglae commented Nov 22, 2024

Backport of #9520

This forum post reports use of not existent /var/lock/lockdev directory of lirc.

configure does detect /var/lock correctly but there is a left over lib/lirc/config.h in lirc release archive 0.10.2 overwriting the path. Delete the file.

Furthermore define lock directory using --with-lockdir=/var/lock because lirc's configure does check the host file system and set /var/lock/lockdev if existing.

I difference to master branch the missing VERSION_NODOTS value only generate a warning in get_server_version() even being a bug. Change the disable python patch to use shell script instead of python code to compute the value.

Left over lib/lirc/config.h lead to "LIRC_LOCKDIR" redefined to not existing
"/var/lock/lockdir" (beside others):

/home/docker/LibreELEC.tv/build.LibreELEC-gbm.x86_64-12.0-devel-mg/build/lirc-0.10.2/lib/lirc/config.h:198: warning: "LIRC_LOCKDIR" redefined
  198 | #define LIRC_LOCKDIR "/var/lock/lockdev"
      |
In file included from /home/docker/LibreELEC.tv/build.LibreELEC-gbm.x86_64-12.0-devel-mg/build/lirc-0.10.2/lib/driver.c:12:
./config.h:198: note: this is the location of the previous definition
  198 | #define LIRC_LOCKDIR "/var/lock"
      |

Furthermore define lock dir because lirc's configure does check the host system and use
/var/lock/lockdev if existing.
@CvH CvH merged commit fea1174 into LibreELEC:libreelec-12.0 Nov 24, 2024
@mglae mglae deleted the le12_lirc_fix branch November 25, 2024 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants