diff options
Diffstat (limited to 'meta-oe/recipes-support/read-edid')
5 files changed, 81 insertions, 51 deletions
diff --git a/meta-oe/recipes-support/read-edid/read-edid/0001-Do-not-install-license-file.patch b/meta-oe/recipes-support/read-edid/read-edid/0001-Do-not-install-license-file.patch new file mode 100644 index 0000000000..a9b9476bd6 --- /dev/null +++ b/meta-oe/recipes-support/read-edid/read-edid/0001-Do-not-install-license-file.patch @@ -0,0 +1,17 @@ +Do not install license file + +File name is incorrect as well; must be LICENSE instead of COPYING. + +Upstream-Status: Submitted [pyrophobicman@gmail.com] + +Signed-off-by: Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com> + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,5 +13,5 @@ + add_subdirectory (parse-edid) + + INSTALL(FILES get-edid.1 DESTINATION share/man/man1) +-INSTALL(FILES AUTHORS ChangeLog COPYING README DESTINATION ++INSTALL(FILES AUTHORS ChangeLog README DESTINATION + share/doc/read-edid) diff --git a/meta-oe/recipes-support/read-edid/read-edid/0001-configure-remove-check-for-x86.h-we-don-t-build-get-.patch b/meta-oe/recipes-support/read-edid/read-edid/0001-configure-remove-check-for-x86.h-we-don-t-build-get-.patch deleted file mode 100644 index 4408002356..0000000000 --- a/meta-oe/recipes-support/read-edid/read-edid/0001-configure-remove-check-for-x86.h-we-don-t-build-get-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From eb7590cc2cdd5c35403af4567d8524e017010f1c Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Sat, 11 May 2013 07:58:17 +0200 -Subject: [PATCH] configure: remove check for x86.h, we don't build get-edid - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> - -Upstream-status: Inappropriate [OE specific] ---- - configure.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.in b/configure.in -index ac85a21..f53e904 100644 ---- a/configure.in -+++ b/configure.in -@@ -8,8 +8,6 @@ dnl Checks for programs - - AC_PROG_CC - --AC_CHECK_HEADER([libx86.h], [], [AC_MSG_ERROR([libx86.h not found])]) -- - dnl Simple, huh? - - AC_OUTPUT([Makefile]) --- -1.8.1.4 - diff --git a/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch b/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch new file mode 100644 index 0000000000..5147f17c3a --- /dev/null +++ b/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch @@ -0,0 +1,44 @@ +From 9da8eb6663d0ba046bc0570172c549d421de043a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 12 Aug 2020 23:39:32 -0700 +Subject: [PATCH] get-edid: define quiet once + +Fixes build with gcc 10 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + 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.28.0 + diff --git a/meta-oe/recipes-support/read-edid/read-edid_2.0.0.bb b/meta-oe/recipes-support/read-edid/read-edid_2.0.0.bb deleted file mode 100644 index b002906fa6..0000000000 --- a/meta-oe/recipes-support/read-edid/read-edid_2.0.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "read-edid elucidates various very useful informations from a conforming PnP monitor" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d0bf70fa1ef81fe4741ec0e6231dadfd" - -SRC_URI = "http://polypux.org/projects/read-edid/read-edid-${PV}.tar.gz \ - file://0001-configure-remove-check-for-x86.h-we-don-t-build-get-.patch" - -SRC_URI[md5sum] = "586e7fa1167773b27f4e505edc93274b" -SRC_URI[sha256sum] = "246ec14ec509e09ac26fe6862b120481b2cc881e2f142ba40886d6eec15e77e8" - -inherit autotools - -do_compile() { - oe_runmake parse-edid -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 parse-edid ${D}${bindir} -} - -PACKAGES =+ "parse-edid" -FILES_parse-edid = "${bindir}/parse-edid" diff --git a/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb new file mode 100644 index 0000000000..28da51a21c --- /dev/null +++ b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "A pair of tools for reading the EDID from a monitor" +DESCRIPTION = "read-edid is a set of two tools - get-edid, which gets the raw \ + EDID information from the monitor, and parse-edid, which turns \ + the raw binary information into a xorg.conf-compatible monitor \ + section." +HOMEPAGE = "http://www.polypux.org/projects/read-edid/" +SECTION = "console/utils" +LICENSE = "read-edid" +LIC_FILES_CHKSUM = "file://LICENSE;md5=292c42e2aedc4af636636bf7af0e2b26" + +SRC_URI = "http://polypux.org/projects/read-edid/read-edid-${PV}.tar.gz \ + file://0001-Do-not-install-license-file.patch \ + file://0001-get-edid-define-quiet-once.patch \ + " +SRC_URI[md5sum] = "016546e438bf6c98739ff74061df9854" +SRC_URI[sha256sum] = "c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f" + +EXTRA_OECMAKE = "-DCLASSICBUILD=OFF" + +inherit cmake |