summaryrefslogtreecommitdiffstats
path: root/display/read-edid
diff options
context:
space:
mode:
authorFlorian Franzmann2021-07-18 14:45:21 +0200
committerFlorian Franzmann2021-07-21 21:41:35 +0200
commit83b4fa15c220251ac4d00dd103f04a6c7325817b (patch)
treef642b422200b0262a780f5c5974f8c463a6f75b1 /display/read-edid
parentc50d2bf6f5f0091dce0094aa6f7bdc3c65379cfd (diff)
display/read-edid: fix linking error
Diffstat (limited to 'display/read-edid')
-rw-r--r--display/read-edid/HISTORY3
-rwxr-xr-xdisplay/read-edid/PRE_BUILD2
-rw-r--r--display/read-edid/patches/0001-Fix-linking-error.patch39
3 files changed, 44 insertions, 0 deletions
diff --git a/display/read-edid/HISTORY b/display/read-edid/HISTORY
index 9199870e87..0a207aa75d 100644
--- a/display/read-edid/HISTORY
+++ b/display/read-edid/HISTORY
@@ -1,3 +1,6 @@
+2021-07-18 Florian Franzmann <bwlf@bandrate.org>
+ * PRE_BUILD, patches/0001-Fix-linking-error.patch: fix linking error
+
2018-06-14 Florian Franzmann <bwlf@bandrate.org>
* DETAILS: version 3.0.2
* DEPENDS, BUILD: use cmake
diff --git a/display/read-edid/PRE_BUILD b/display/read-edid/PRE_BUILD
index 875da4af1c..817a0bf274 100755
--- a/display/read-edid/PRE_BUILD
+++ b/display/read-edid/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir &&
+
cp LICENSE COPYING
diff --git a/display/read-edid/patches/0001-Fix-linking-error.patch b/display/read-edid/patches/0001-Fix-linking-error.patch
new file mode 100644
index 0000000000..cb54c2801e
--- /dev/null
+++ b/display/read-edid/patches/0001-Fix-linking-error.patch
@@ -0,0 +1,39 @@
+From c658840b56a9383683efb18695677749e6a8019b Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf@bandrate.org>
+Date: Sun, 18 Jul 2021 14:43:18 +0200
+Subject: [PATCH] Fix linking error
+
+---
+ get-edid/classic.c | 2 +-
+ get-edid/i2c.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/get-edid/classic.c b/get-edid/classic.c
+index 9cc8ee3..b13f5f0 100644
+--- a/get-edid/classic.c
++++ b/get-edid/classic.c
+@@ -26,7 +26,7 @@ typedef byte* real_ptr;
+ #define dosmemput(buffer,length,offset) memcpy(offset,buffer,length)
+
+ #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); }
+-int quiet;
++extern int quiet;
+
+ real_ptr far_ptr_to_real_ptr( uint32 farptr )
+ {
+diff --git a/get-edid/i2c.c b/get-edid/i2c.c
+index 625d7cb..0929e98 100644
+--- a/get-edid/i2c.c
++++ b/get-edid/i2c.c
+@@ -15,7 +15,7 @@
+
+ //Ideas (but not too much actual code) taken from i2c-tools. Thanks guys.
+
+-int quiet;
++extern int quiet;
+
+ #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); }
+
+--
+2.32.0
+