<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3f2cb32f2ab4e37186241ef8cac2e7eeb9eda1eb">https://github.com/macports/macports-ports/commit/3f2cb32f2ab4e37186241ef8cac2e7eeb9eda1eb</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3f2cb32f2ab lirc: update to 0.10.2
</span>3f2cb32f2ab is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3f2cb32f2ab4e37186241ef8cac2e7eeb9eda1eb
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Mon May 6 15:20:39 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> lirc: update to 0.10.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54651
</span>---
sysutils/lirc/Portfile | 37 ++++++++++++++---------
sysutils/lirc/files/patch-commandir_support.diff | 11 ++++---
sysutils/lirc/files/patch-include-media-lirc.diff | 19 ++++++++++++
sysutils/lirc/files/patch-lirc-options.diff | 15 +++++++++
sysutils/lirc/files/patch-makefile.diff | 11 +++++++
5 files changed, 73 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/lirc/Portfile b/sysutils/lirc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f6bb5a8368..672f6dbd6e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/lirc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/lirc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,12 +3,11 @@
</span> PortSystem 1.0
name lirc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.9.4d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.10.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories sysutils net
license {GPL-2+ OpenSSLException}
maintainers {ctreleaven @ctreleaven} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> description Linux Infrared Remote Control
long_description \
LIRC enables receiving and/or sending infra-red remote controls signals.\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,13 +20,13 @@ long_description \
</span> homepage http://www.lirc.org
master_sites sourceforge
#use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 998a726823a90ad79bde50fce3bd0417c950ab59 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e225c8a6ed004ee0b3180d9bc8d8129dbc2b9ac3e0daccc2ca5e61ca16aae8d3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9c2d7ded3e88ac69f5e591100dbfefb69f947710 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a44a26caf9ba55c2343e065f0a9451425c136572b279ea1e011ad012b36b607e
</span>
livecheck.distname LIRC
set lircuser _lirc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythonbranch 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythonbranch 3.12
</span> set pythonver python${pythonbranch}
configure.python ${prefix}/bin/${pythonver}
set pymodver py[join [split ${pythonbranch} .] ""]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,10 +37,16 @@ use_autoreconf yes
</span> autoreconf.cmd ./autogen.sh
# setting autoreconf.cmd means that autotools build dependencies are not added
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoid confusion with version header file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid confusion with the C++20 <version> header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the build copies the file there, so we do it ahead of time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/VERSION ${worksrcpath}/python-pkg
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args -o VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args -o VERSION
</span>
depends_build-append \
port:autoconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +55,7 @@ depends_build-append \
</span> port:libtool \
port:pkgconfig \
path:bin/doxygen:doxygen \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${pymodver}-setuptools \
</span> port:${pymodver}-yaml
depends_lib path:lib/pkgconfig/libusb-1.0.pc:libusb \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +63,10 @@ depends_lib path:lib/pkgconfig/libusb-1.0.pc:libusb \
</span> port:libftdi1 \
port:portaudio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-commandir_support.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-commandir_support.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-lirc-options.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-include-media-lirc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-makefile.diff
</span>
if {${os.platform} eq "darwin" && ${os.major} < 12} {
# https://trac.macports.org/ticket/53314
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,14 +80,13 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> post-patch {
reinplace -locale C "s|@PREFIX@|${prefix}|g" ${worksrcpath}/lirc_options.conf
reinplace -locale C "s|#!/usr/bin/env python3\$|#!${configure.python}|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/doc/data2hwdb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/doc/data2table \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/doc/make_rel_symlink.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/python-pkg/lirc/lirctool \
</span> ${worksrcpath}/tools/check_configs.py \
${worksrcpath}/tools/irdb-get \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/irtext2udp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/lirc-init-db \
</span> ${worksrcpath}/tools/lirc-setup/lirc-setup \
${worksrcpath}/tools/lircd-setup \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/tools/make_rel_symlink.py \
</span> ${worksrcpath}/tools/pronto2lirc
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/lirc/files/patch-commandir_support.diff b/sysutils/lirc/files/patch-commandir_support.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 62cfe82affd..442c274f2ab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/lirc/files/patch-commandir_support.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/lirc/files/patch-commandir_support.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugins/Makefile.am.orig 2017-01-23 06:31:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugins/Makefile.am 2017-01-23 10:11:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,12 +41,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- srm7500libusb_la_LDFLAGS = $(AM_LDFLAGS) @usb_libs@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugins/Makefile.am.orig 2022-09-25 14:03:38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/Makefile.am 2024-05-06 13:28:07
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,12 +40,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ srm7500libusb_la_LDFLAGS = $(AM_LDFLAGS) @LIBUSB_LIBS@
</span> srm7500libusb_la_CFLAGS = $(AM_CFLAGS) $(LIBUSB_CFLAGS)
-if LINUX_KERNEL
plugin_LTLIBRARIES += commandir.la
commandir_la_SOURCES = commandir.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>- commandir_la_LDFLAGS = $(AM_LDFLAGS) @usb_libs@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commandir_la_LDFLAGS = $(AM_LDFLAGS) @LIBUSB_LIBS@
</span> commandir_la_CFLAGS = $(AM_CFLAGS) $(LIBUSB_CFLAGS)
-endif
endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/lirc/files/patch-include-media-lirc.diff b/sysutils/lirc/files/patch-include-media-lirc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f6d038fb18b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/lirc/files/patch-include-media-lirc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/media/lirc.h.orig 2022-09-25 14:03:38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/media/lirc.h 2024-05-06 13:46:40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,8 +6,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef _LINUX_LIRC_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _LINUX_LIRC_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __linux__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <linux/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <linux/ioctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/ioctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __u64 uint64_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __u32 uint32_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __u16 uint16_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PULSE_BIT 0x01000000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PULSE_MASK 0x00FFFFFF
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/lirc/files/patch-lirc-options.diff b/sysutils/lirc/files/patch-lirc-options.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bceb1bac5ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/lirc/files/patch-lirc-options.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lirc_options.conf.orig 2024-05-06 13:31:28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lirc_options.conf 2024-05-06 13:33:26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,9 +10,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nodaemon = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ driver = devinput
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ device = auto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-output = /var/run/lirc/lircd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-pidfile = /var/run/lirc/lircd.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-plugindir = /usr/lib/lirc/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++output = @PREFIX@/var/run/lirc/lircd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pidfile = @PREFIX@/var/run/lirc/lircd.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++plugindir = @PREFIX@/lib/lirc/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ permission = 666
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allow-simulate = No
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ repeat-max = 600
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/lirc/files/patch-makefile.diff b/sysutils/lirc/files/patch-makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2f2806b4651
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/lirc/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.am.orig 2022-10-03 13:34:07
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.am 2024-05-06 14:41:16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,7 +182,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod -R u+w python-pkg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(PYTHON_TARBALL): $(abs_builddir)/python-pkg/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp $(top_builddir)/VERSION $(abs_builddir)/python-pkg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -cp $(top_builddir)/VERSION $(abs_builddir)/python-pkg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd $(abs_builddir)/python-pkg; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="$(PY_PKG_CFLAGS)" LDFLAGS="$(PY_PKG_LFLAGS)" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(SETUPTOOLS_ENV) \
</span></pre><pre style='margin:0'>
</pre>