| 1 |
commit: 78c22f568a3feaa88baa273e19c5e0c65c235d9f |
| 2 |
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> |
| 3 |
AuthorDate: Thu Jun 30 21:29:49 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 5 09:47:13 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c22f56 |
| 7 |
|
| 8 |
media-plugins/vdr-streamdev: fix Makefiles calling ar directly |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/854885 |
| 11 |
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/26174 |
| 13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/vdr-streamdev-0.6.3-Makefile.patch | 36 ++++++++++++++++++++++ |
| 16 |
.../vdr-streamdev/vdr-streamdev-0.6.3.ebuild | 7 ++++- |
| 17 |
2 files changed, 42 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.3-Makefile.patch b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.3-Makefile.patch |
| 20 |
new file mode 100644 |
| 21 |
index 000000000000..282108476c7b |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.3-Makefile.patch |
| 24 |
@@ -0,0 +1,36 @@ |
| 25 |
+diff -Naur vdr-plugin-streamdev-0.6.3.orig/libdvbmpeg/Makefile vdr-plugin-streamdev-0.6.3/libdvbmpeg/Makefile |
| 26 |
+--- vdr-plugin-streamdev-0.6.3.orig/libdvbmpeg/Makefile 2022-01-22 17:07:53.000000000 +0100 |
| 27 |
++++ vdr-plugin-streamdev-0.6.3/libdvbmpeg/Makefile 2022-06-30 23:15:50.274114529 +0200 |
| 28 |
+@@ -15,7 +15,7 @@ |
| 29 |
+ |
| 30 |
+ .PHONY: clean |
| 31 |
+ libdvbmpegtools.a: $(OBJS) |
| 32 |
+- ar -rcs libdvbmpegtools.a $(OBJS) |
| 33 |
++ $(AR) -rcs libdvbmpegtools.a $(OBJS) |
| 34 |
+ |
| 35 |
+ ### Implicit rules: |
| 36 |
+ |
| 37 |
+diff -Naur vdr-plugin-streamdev-0.6.3.orig/remux/Makefile vdr-plugin-streamdev-0.6.3/remux/Makefile |
| 38 |
+--- vdr-plugin-streamdev-0.6.3.orig/remux/Makefile 2022-01-22 17:07:53.000000000 +0100 |
| 39 |
++++ vdr-plugin-streamdev-0.6.3/remux/Makefile 2022-06-30 23:15:18.845454583 +0200 |
| 40 |
+@@ -11,7 +11,7 @@ |
| 41 |
+ |
| 42 |
+ .PHONY: clean |
| 43 |
+ remux.a: $(OBJS) |
| 44 |
+- ar -rcs remux.a $^ |
| 45 |
++ $(AR) -rcs remux.a $^ |
| 46 |
+ |
| 47 |
+ ### Implicit rules: |
| 48 |
+ |
| 49 |
+diff -Naur vdr-plugin-streamdev-0.6.3.orig/tools/Makefile vdr-plugin-streamdev-0.6.3/tools/Makefile |
| 50 |
+--- vdr-plugin-streamdev-0.6.3.orig/tools/Makefile 2022-01-22 17:07:53.000000000 +0100 |
| 51 |
++++ vdr-plugin-streamdev-0.6.3/tools/Makefile 2022-06-30 23:16:14.494623068 +0200 |
| 52 |
+@@ -11,7 +11,7 @@ |
| 53 |
+ |
| 54 |
+ .PHONY: clean |
| 55 |
+ sockettools.a: $(OBJS) |
| 56 |
+- ar -rcs sockettools.a $(OBJS) |
| 57 |
++ $(AR) -rcs sockettools.a $(OBJS) |
| 58 |
+ |
| 59 |
+ ### Implicit rules: |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild |
| 63 |
index 3565a40465d6..02b5e7e2ae29 100644 |
| 64 |
--- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild |
| 65 |
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild |
| 66 |
@@ -3,7 +3,7 @@ |
| 67 |
|
| 68 |
EAPI=8 |
| 69 |
|
| 70 |
-inherit vdr-plugin-2 |
| 71 |
+inherit toolchain-funcs vdr-plugin-2 |
| 72 |
|
| 73 |
DESCRIPTION="VDR Plugin: Client/Server and http streaming plugin" |
| 74 |
HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-streamdev" |
| 75 |
@@ -24,6 +24,7 @@ RDEPEND="${DEPEND}" |
| 76 |
QA_FLAGS_IGNORED=" |
| 77 |
usr/lib/vdr/plugins/libvdr-streamdev-.* |
| 78 |
usr/lib64/vdr/plugins/libvdr-streamdev-.*" |
| 79 |
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch" ) |
| 80 |
|
| 81 |
# vdr-plugin-2.eclass changes |
| 82 |
PO_SUBDIR="client server" |
| 83 |
@@ -51,6 +52,10 @@ src_prepare() { |
| 84 |
fix_vdr_libsi_include server/livestreamer.c |
| 85 |
} |
| 86 |
|
| 87 |
+src_compile() { |
| 88 |
+ emake AR="$(tc-getAR)" |
| 89 |
+} |
| 90 |
+ |
| 91 |
src_install() { |
| 92 |
vdr-plugin-2_src_install |
Archives