libupnp/libupnp.patch@4ecfc2416fd8 (annotated)
libupnp/libupnp.patch
Tue, 29 Mar 2011 19:46:35 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 29 Mar 2011 19:46:35 +0200
- changeset 333
- 4ecfc2416fd8
- child 632
- 804f172af162
- permissions
- -rw-r--r--
Correct and introduce slightly needed logic, leading to better reliability:
Update bash(1) patch logic, correct several buildconf make location
errors, correct failed bash(1) configure invocation, enable perl(1) to
build with unpathed make(1), patch rpm(1) to correctly link with
internal libdb(3), and lastly unsuscessfully try to reorganize rpm patch
hunks.
| michael@70 | 1 | Index: upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c |
| michael@70 | 2 | diff -Nau upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c.orig upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c |
| michael@70 | 3 | --- upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c.orig 2008-03-22 17:48:13.000000000 +0100 |
| michael@70 | 4 | +++ upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c 2009-01-12 16:05:10.847325711 +0100 |
| michael@70 | 5 | @@ -429,7 +429,11 @@ |
| michael@70 | 6 | */ |
| michael@70 | 7 | sigemptyset( &sigs_to_catch ); |
| michael@70 | 8 | sigaddset( &sigs_to_catch, SIGINT ); |
| michael@70 | 9 | +#if (defined(sun) && defined(__svr4__)) |
| michael@70 | 10 | + sigwait( &sigs_to_catch ); |
| michael@70 | 11 | +#else |
| michael@70 | 12 | sigwait( &sigs_to_catch, &sig ); |
| michael@70 | 13 | +#endif |
| michael@70 | 14 | |
| michael@70 | 15 | SampleUtil_Print( "Shutting down on signal %d...", sig ); |
| michael@70 | 16 | #else |
| michael@70 | 17 | Index: upnp/sample/tvcombo/linux/upnp_tv_combo_main.c |
| michael@70 | 18 | diff -Nau upnp/sample/tvcombo/linux/upnp_tv_combo_main.c.orig upnp/sample/tvcombo/linux/upnp_tv_combo_main.c |
| michael@70 | 19 | --- upnp/sample/tvcombo/linux/upnp_tv_combo_main.c.orig 2009-01-12 16:12:00.406762331 +0100 |
| michael@70 | 20 | +++ upnp/sample/tvcombo/linux/upnp_tv_combo_main.c 2009-01-12 16:14:23.401611284 +0100 |
| michael@70 | 21 | @@ -477,7 +477,11 @@ |
| michael@70 | 22 | */ |
| michael@70 | 23 | sigemptyset( &sigs_to_catch ); |
| michael@70 | 24 | sigaddset( &sigs_to_catch, SIGINT ); |
| michael@70 | 25 | +#if (defined(sun) && defined(__svr4__)) |
| michael@70 | 26 | + sigwait( &sigs_to_catch ); |
| michael@70 | 27 | +#else |
| michael@70 | 28 | sigwait( &sigs_to_catch, &sig ); |
| michael@70 | 29 | +#endif |
| michael@70 | 30 | |
| michael@70 | 31 | SampleUtil_Print( "Shutting down on signal %d...\n", sig ); |
| michael@70 | 32 | #else |
| michael@70 | 33 | Index: upnp/sample/tvdevice/linux/upnp_tv_device_main.c |
| michael@70 | 34 | diff -Nau upnp/sample/tvdevice/linux/upnp_tv_device_main.c.orig upnp/sample/tvdevice/linux/upnp_tv_device_main.c |
| michael@70 | 35 | --- upnp/sample/tvdevice/linux/upnp_tv_device_main.c.orig 2008-03-22 18:04:30.000000000 +0100 |
| michael@70 | 36 | +++ upnp/sample/tvdevice/linux/upnp_tv_device_main.c 2009-01-12 16:19:03.504059810 +0100 |
| michael@70 | 37 | @@ -184,7 +184,11 @@ |
| michael@70 | 38 | */ |
| michael@70 | 39 | sigemptyset( &sigs_to_catch ); |
| michael@70 | 40 | sigaddset( &sigs_to_catch, SIGINT ); |
| michael@70 | 41 | +#if (defined(sun) && defined(__svr4__)) |
| michael@70 | 42 | + sigwait( &sigs_to_catch ); |
| michael@70 | 43 | +#else |
| michael@70 | 44 | sigwait( &sigs_to_catch, &sig ); |
| michael@70 | 45 | +#endif |
| michael@70 | 46 | |
| michael@70 | 47 | SampleUtil_Print( "Shutting down on signal %d...\n", sig ); |
| michael@70 | 48 | #else |
