Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

media-plugins/vdr-streamdev: fix Makefiles calling ar directly #26174

Closed
wants to merge 1 commit into from
Closed

media-plugins/vdr-streamdev: fix Makefiles calling ar directly #26174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 36 additions & 0 deletions media-plugins/vdr-streamdev/files/vdr-streamdev-0.6.3-Makefile.patch
View file
Open in desktop
@@ -0,0 +1,36 @@
diff -Naur vdr-plugin-streamdev-0.6.3.orig/libdvbmpeg/Makefile vdr-plugin-streamdev-0.6.3/libdvbmpeg/Makefile
--- vdr-plugin-streamdev-0.6.3.orig/libdvbmpeg/Makefile 2022-01-22 17:07:53.000000000 +0100
+++ vdr-plugin-streamdev-0.6.3/libdvbmpeg/Makefile 2022-06-30 23:15:50.274114529 +0200
@@ -15,7 +15,7 @@

.PHONY: clean
libdvbmpegtools.a: $(OBJS)
- ar -rcs libdvbmpegtools.a $(OBJS)
+ $(AR) -rcs libdvbmpegtools.a $(OBJS)

### Implicit rules:

diff -Naur vdr-plugin-streamdev-0.6.3.orig/remux/Makefile vdr-plugin-streamdev-0.6.3/remux/Makefile
--- vdr-plugin-streamdev-0.6.3.orig/remux/Makefile 2022-01-22 17:07:53.000000000 +0100
+++ vdr-plugin-streamdev-0.6.3/remux/Makefile 2022-06-30 23:15:18.845454583 +0200
@@ -11,7 +11,7 @@

.PHONY: clean
remux.a: $(OBJS)
- ar -rcs remux.a $^
+ $(AR) -rcs remux.a $^

### Implicit rules:

diff -Naur vdr-plugin-streamdev-0.6.3.orig/tools/Makefile vdr-plugin-streamdev-0.6.3/tools/Makefile
--- vdr-plugin-streamdev-0.6.3.orig/tools/Makefile 2022-01-22 17:07:53.000000000 +0100
+++ vdr-plugin-streamdev-0.6.3/tools/Makefile 2022-06-30 23:16:14.494623068 +0200
@@ -11,7 +11,7 @@

.PHONY: clean
sockettools.a: $(OBJS)
- ar -rcs sockettools.a $(OBJS)
+ $(AR) -rcs sockettools.a $(OBJS)

### Implicit rules:

7 changes: 6 additions & 1 deletion media-plugins/vdr-streamdev/vdr-streamdev-0.6.3.ebuild
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@

EAPI=8

inherit vdr-plugin-2
inherit toolchain-funcs vdr-plugin-2

DESCRIPTION="VDR Plugin: Client/Server and http streaming plugin"
HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-streamdev"
Expand All @@ -24,6 +24,7 @@ RDEPEND="${DEPEND}"
QA_FLAGS_IGNORED="
usr/lib/vdr/plugins/libvdr-streamdev-.*
usr/lib64/vdr/plugins/libvdr-streamdev-.*"
PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )

# vdr-plugin-2.eclass changes
PO_SUBDIR="client server"
Expand Down Expand Up @@ -51,6 +52,10 @@ src_prepare() {
fix_vdr_libsi_include server/livestreamer.c
}

src_compile() {
emake AR="$(tc-getAR)"
}

src_install() {
vdr-plugin-2_src_install

Expand Down