| 1 |
commit: fab5eef76374e27acdf1aca851f5b7f336000159 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 31 12:20:08 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 31 12:20:08 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab5eef7 |
| 7 |
|
| 8 |
app-misc/acdctl: update EAPI 6 -> 8 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/722400 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
.../{acdctl-1.1-r1.ebuild => acdctl-1.1-r2.ebuild} | 17 ++++++++++++++--- |
| 14 |
app-misc/acdctl/files/acdctl-1.1-makefile.patch | 13 +++++++++++++ |
| 15 |
app-misc/acdctl/files/acdctl-1.1-warnings.patch | 20 ++++++++++++++++++++ |
| 16 |
3 files changed, 47 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-misc/acdctl/acdctl-1.1-r1.ebuild b/app-misc/acdctl/acdctl-1.1-r2.ebuild |
| 19 |
similarity index 66% |
| 20 |
rename from app-misc/acdctl/acdctl-1.1-r1.ebuild |
| 21 |
rename to app-misc/acdctl/acdctl-1.1-r2.ebuild |
| 22 |
index bde44c11ce75..df2784238b54 100644 |
| 23 |
--- a/app-misc/acdctl/acdctl-1.1-r1.ebuild |
| 24 |
+++ b/app-misc/acdctl/acdctl-1.1-r2.ebuild |
| 25 |
@@ -1,7 +1,9 @@ |
| 26 |
-# Copyright 1999-2018 Gentoo Foundation |
| 27 |
+# Copyright 1999-2022 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
-EAPI=6 |
| 31 |
+EAPI=8 |
| 32 |
+ |
| 33 |
+inherit toolchain-funcs |
| 34 |
|
| 35 |
DESCRIPTION="Apple Cinema Display Control" |
| 36 |
HOMEPAGE="https://web.archive.org/web/20090725222711/http://technocage.com:80/~caskey/acdctl/" |
| 37 |
@@ -14,7 +16,16 @@ KEYWORDS="ppc" |
| 38 |
RDEPEND="virtual/libusb:0" |
| 39 |
DEPEND="${RDEPEND}" |
| 40 |
|
| 41 |
+PATCHES=( |
| 42 |
+ "${FILESDIR}"/${P}-makefile.patch |
| 43 |
+ "${FILESDIR}"/${P}-warnings.patch |
| 44 |
+) |
| 45 |
+ |
| 46 |
+src_configure() { |
| 47 |
+ tc-export CC |
| 48 |
+} |
| 49 |
+ |
| 50 |
src_install() { |
| 51 |
+ dobin acdctl |
| 52 |
einstalldocs |
| 53 |
- dobin "${PN}" |
| 54 |
} |
| 55 |
|
| 56 |
diff --git a/app-misc/acdctl/files/acdctl-1.1-makefile.patch b/app-misc/acdctl/files/acdctl-1.1-makefile.patch |
| 57 |
new file mode 100644 |
| 58 |
index 000000000000..ac63da0c5e1d |
| 59 |
--- /dev/null |
| 60 |
+++ b/app-misc/acdctl/files/acdctl-1.1-makefile.patch |
| 61 |
@@ -0,0 +1,13 @@ |
| 62 |
+--- a/Makefile |
| 63 |
++++ b/Makefile |
| 64 |
+@@ -25,8 +25,8 @@ |
| 65 |
+ #**************************************************************************** |
| 66 |
+ |
| 67 |
+ |
| 68 |
+-CFLAGS=-Wall |
| 69 |
+-LDFLAGS=-lusb |
| 70 |
++CFLAGS += -Wall |
| 71 |
++LDLIBS = -lusb |
| 72 |
+ |
| 73 |
+ all:acdctl |
| 74 |
+ |
| 75 |
|
| 76 |
diff --git a/app-misc/acdctl/files/acdctl-1.1-warnings.patch b/app-misc/acdctl/files/acdctl-1.1-warnings.patch |
| 77 |
new file mode 100644 |
| 78 |
index 000000000000..e86d80918b4a |
| 79 |
--- /dev/null |
| 80 |
+++ b/app-misc/acdctl/files/acdctl-1.1-warnings.patch |
| 81 |
@@ -0,0 +1,20 @@ |
| 82 |
+--- a/acdctl.c |
| 83 |
++++ b/acdctl.c |
| 84 |
+@@ -130,7 +130,7 @@ |
| 85 |
+ next->vendor, next->product, next->description, next->year); |
| 86 |
+ next++; |
| 87 |
+ } |
| 88 |
+- printf("\n%d displays supported\n", displayCount); |
| 89 |
++ printf("\n%ld displays supported\n", displayCount); |
| 90 |
+ } |
| 91 |
+ |
| 92 |
+ void help(const char* program_name) { |
| 93 |
+@@ -277,7 +277,7 @@ |
| 94 |
+ } |
| 95 |
+ |
| 96 |
+ void found_display(int index, struct usb_device *dev) { |
| 97 |
+- int ret; |
| 98 |
++ int ret = 0; |
| 99 |
+ usb_dev_handle* display_device = usb_open(dev); |
| 100 |
+ |
| 101 |
+ if(display_device) { |
Archives