Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Port to async introspection and GUPnP 1.2#167

Closed
phako wants to merge 6 commits intointel:masterfrom
phako:master
Closed

Port to async introspection and GUPnP 1.2#167
phako wants to merge 6 commits intointel:masterfrom
phako:master

Conversation

@phako
Copy link

@phako phako commented Sep 21, 2019

Also fix a log message to be english, not french. Ideally gasync-task.[ch] should be in dleyna-core, though.

Should fix the issue with sometimes not shutting down properly

Fixes #166

@phako
Copy link
Author

phako commented Sep 21, 2019

There is an issue on shutdown where it crashes in the linux context manager when used with 1.2. That still needs fixing

@phako
Copy link
Author

phako commented Sep 21, 2019

crash is gone. was caused by bad linking on my machine

@kloczek
Copy link

kloczek commented Oct 29, 2019

Looks like still something is missing

/bin/sh ../../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../..    -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include  -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include  -I/usr/include/dleyna-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -pthread -I/usr/include/gupnp-1.2 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2  -I/usr/include/gssdp-1.2  -I/usr/include/gupnp-1.2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/libsoup-2.4 -I/usr/include/libxml2  -I/usr/include/gupnp-av-1.0  -I/usr/include/gupnp-dlna-2.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -pthread  -I/usr/include/libsoup-2.4 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include  -include config.h -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -flto -Os -Wno-format-extra-args -Wl,--no-undefined -c -o gasync-task.lo gasync-task.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../.. -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/dleyna-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -pthread -I/usr/include/gupnp-1.2 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gssdp-1.2 -I/usr/include/gupnp-1.2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gupnp-av-1.0 -I/usr/include/gupnp-dlna-2.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -pthread -I/usr/include/libsoup-2.4 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -include config.h -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -flto -Os -Wno-format-extra-args -Wl,--no-undefined -c gasync-task.c  -fPIC -DPIC -o .libs/gasync-task.o
gasync-task.c:22:10: fatal error: task-processor.h: No such file or directory
   22 | #include "task-processor.h"
      |          ^~~~~~~~~~~~~~~~~~
compilation terminated.
make[2]: *** [Makefile:550: gasync-task.lo] Error 1
make[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/dleyna-renderer-0.6.0/libdleyna/renderer'
make[1]: *** [Makefile:442: all-recursive] Error 1
make[1]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/dleyna-renderer-0.6.0'
make: *** [Makefile:374: all] Error 2
error: Bad exit status from /var/tmp/rpm-tmp.irm4w7 (%build)

@kloczek
Copy link

kloczek commented Oct 30, 2019

Here is build fix.

--- a/libdleyna/renderer/Makefile.am~	2019-10-29 23:19:39.000000000 +0000
+++ b/libdleyna/renderer/Makefile.am	2019-10-29 23:31:28.842665044 +0000
@@ -37,6 +38,15 @@
 					$(GUPNPDLNA_LIBS) 	\
 					$(SOUP_LIBS)		\
 					-lm
+libdleyna_renderer_1_0_la_CFLAGS =	$(GLIB_CFLAGS)		\
+					$(GIO_CFLAGS)		\
+					$(DLEYNA_CORE_CFLAGS)	\
+					$(GSSDP_CFLAGS)		\
+					$(GUPNP_CFLAGS)		\
+					$(GUPNPDLNA_CFLAGS)	\
+					$(GUPNPAV_CFLAGS)	\
+					$(SOUP_CFLAGS)		\
+					-include config.h
 
 MAINTAINERCLEANFILES =	Makefile.in		\
 			aclocal.m4		\
--- a/libdleyna/renderer/gasync-task.c~	2019-10-29 23:52:22.000000000 +0000
+++ b/libdleyna/renderer/gasync-task.c	2019-10-29 23:55:30.438411905 +0000
@@ -19,7 +19,7 @@
  */
 
 #include "gasync-task.h"
-#include "task-processor.h"
+#include <libdleyna/core/task-processor.h>
 
 struct dleyna_gasync_task_t_ {
 	dleyna_task_atom_t base;


vt-alt pushed a commit to altlinux/specs that referenced this pull request Mar 28, 2020
- ported to gupnp-1.2 (
  see intel/dleyna-renderer#167)

mate-file-manager-extensions-1.24.0-alt2 Valery Inozemtsev <shrek@altlinux.ru>

- rebuild with gupnp 1.2

dleyna-core-0.6.0-alt2

- updated to v0.6.0-2-g1c6853f (ported to gupnp-1.2)

dleyna-server-0.6.0-alt2

- updated to 0.6.0-2-geb895ae (ported to (gssdp/gupnp)-1.2)

Co-authored-by: Valery Inozemtsev <shrek@altlinux.ru>
@phako
Copy link
Author

phako commented Dec 1, 2020

Sorry I messed up my branches, the new clean pull request is now #168

@phako phako closed this Dec 1, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0.6.0: does not build against gupnp 1.2

3 participants