09816566f4
After some effort to upstream the libv4l patches, 4 out of our 5 patches are now upstream. This commit updates those patches to indicate their upstream status. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
From 9eec274c2a92beb2bb1a3a1eeffef1988c7dd016 Mon Sep 17 00:00:00 2001
|
|
From: Peter Seiderer <ps.report@gmx.net>
|
|
Date: Fri, 16 Oct 2015 20:32:45 +0200
|
|
Subject: [PATCH] dvb/keytable: fix missing libintl linking
|
|
|
|
Patch upstream at
|
|
http://git.linuxtv.org/v4l-utils.git/commit/?id=ceaec539b62d83ffb5fdb5231e574a6adef0bf83.
|
|
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
utils/dvb/Makefile.am | 8 ++++----
|
|
utils/keytable/Makefile.am | 1 +
|
|
2 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/utils/dvb/Makefile.am b/utils/dvb/Makefile.am
|
|
index 6aae408..a96a1a2 100644
|
|
--- a/utils/dvb/Makefile.am
|
|
+++ b/utils/dvb/Makefile.am
|
|
@@ -2,19 +2,19 @@ bin_PROGRAMS = dvb-fe-tool dvbv5-zap dvbv5-scan dvb-format-convert
|
|
man_MANS = dvb-fe-tool.1 dvbv5-zap.1 dvbv5-scan.1 dvb-format-convert.1
|
|
|
|
dvb_fe_tool_SOURCES = dvb-fe-tool.c
|
|
-dvb_fe_tool_LDADD = ../../lib/libdvbv5/libdvbv5.la
|
|
+dvb_fe_tool_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@
|
|
dvb_fe_tool_LDFLAGS = $(ARGP_LIBS) -lm
|
|
|
|
dvbv5_zap_SOURCES = dvbv5-zap.c
|
|
-dvbv5_zap_LDADD = ../../lib/libdvbv5/libdvbv5.la
|
|
+dvbv5_zap_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@
|
|
dvbv5_zap_LDFLAGS = $(ARGP_LIBS) -lm
|
|
|
|
dvbv5_scan_SOURCES = dvbv5-scan.c
|
|
-dvbv5_scan_LDADD = ../../lib/libdvbv5/libdvbv5.la
|
|
+dvbv5_scan_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@
|
|
dvbv5_scan_LDFLAGS = $(ARGP_LIBS) -lm
|
|
|
|
dvb_format_convert_SOURCES = dvb-format-convert.c
|
|
-dvb_format_convert_LDADD = ../../lib/libdvbv5/libdvbv5.la
|
|
+dvb_format_convert_LDADD = ../../lib/libdvbv5/libdvbv5.la @LIBINTL@
|
|
dvb_format_convert_LDFLAGS = $(ARGP_LIBS) -lm
|
|
|
|
EXTRA_DIST = README
|
|
diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am
|
|
index 925c8ea..8444ac2 100644
|
|
--- a/utils/keytable/Makefile.am
|
|
+++ b/utils/keytable/Makefile.am
|
|
@@ -5,6 +5,7 @@ keytablesystem_DATA = $(srcdir)/rc_keymaps/*
|
|
udevrules_DATA = 70-infrared.rules
|
|
|
|
ir_keytable_SOURCES = keytable.c parse.h
|
|
+ir_keytable_LDADD = @LIBINTL@
|
|
ir_keytable_LDFLAGS = $(ARGP_LIBS)
|
|
|
|
EXTRA_DIST = 70-infrared.rules rc_keymaps rc_keymaps_userspace gen_keytables.pl ir-keytable.1 rc_maps.cfg
|
|
--
|
|
2.1.4
|
|
|