Packman Build Service PMBS

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX.spec Changed

kodi.spec Changed

kodi-rsxs.patch Added

@@ -0,0 +1,179 @@
+---
+ xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h |   78 ++++++++++++------------
+ xbmc/screensavers/rsxs-0.9/lib/argp.h           |   30 ++++-----
+ 2 files changed, 56 insertions(+), 52 deletions(-)
+
+Index: b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h
+===================================================================
+--- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h
++++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h
+@@ -135,16 +135,6 @@ extern ssize_t argp_fmtstream_printf (ar
+ 				      const char *__fmt, ...)
+      __attribute__ ((__format__ (printf, 2, 3)));
+ 
+-extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
+-extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
+-
+-extern int __argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
+-extern int argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
+-
+-extern size_t __argp_fmtstream_write (argp_fmtstream_t __fs,
+-				      const char *__str, size_t __len);
+-extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
+-				    const char *__str, size_t __len);
+ &#xc;
+ /* Access macros for various bits of state.  */
+ #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
+@@ -154,33 +144,7 @@ extern size_t argp_fmtstream_write (argp
+ #define __argp_fmtstream_rmargin argp_fmtstream_rmargin
+ #define __argp_fmtstream_wmargin argp_fmtstream_wmargin
+ 
+-/* Set __FS's left margin to LMARGIN and return the old value.  */
+-extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
+-					  size_t __lmargin);
+-extern size_t __argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
+-					    size_t __lmargin);
+-
+-/* Set __FS's right margin to __RMARGIN and return the old value.  */
+-extern size_t argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
+-					  size_t __rmargin);
+-extern size_t __argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
+-					    size_t __rmargin);
+-
+-/* Set __FS's wrap margin to __WMARGIN and return the old value.  */
+-extern size_t argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
+-					  size_t __wmargin);
+-extern size_t __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
+-					    size_t __wmargin);
+-
+-/* Return the column number of the current output point in __FS.  */
+-extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
+-extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
+-
+-/* Internal routines.  */
+-extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
+-extern void __argp_fmtstream_update (argp_fmtstream_t __fs);
+ extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
+-extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
+ &#xc;
+ #ifdef __OPTIMIZE__
+ /* Inline versions of above routines.  */
+@@ -199,9 +163,9 @@ extern int __argp_fmtstream_ensure (argp
+ 
+ #ifndef ARGP_FS_EI
+ #ifdef __clang__
+-#define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
++#define ARGP_FS_EI static inline __attribute__ ((__gnu_inline__))
+ #else
+-#define ARGP_FS_EI extern inline
++#define ARGP_FS_EI static inline
+ #endif
+ #endif
+ 
+@@ -298,6 +262,44 @@ __argp_fmtstream_point (argp_fmtstream_t
+ #undef __argp_fmtstream_ensure
+ #endif
+ 
++#else
++extern size_t __argp_fmtstream_write (argp_fmtstream_t __fs,
++				      const char *__str, size_t __len);
++extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
++				    const char *__str, size_t __len);
++/* Set __FS's left margin to LMARGIN and return the old value.  */
++extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
++					  size_t __lmargin);
++extern size_t __argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
++					    size_t __lmargin);
++
++/* Set __FS's right margin to __RMARGIN and return the old value.  */
++extern size_t argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
++					  size_t __rmargin);
++extern size_t __argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
++					    size_t __rmargin);
++
++/* Set __FS's wrap margin to __WMARGIN and return the old value.  */
++extern size_t argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
++					  size_t __wmargin);
++extern size_t __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
++					    size_t __wmargin);
++
++/* Return the column number of the current output point in __FS.  */
++extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
++extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
++
++/* Internal routines.  */
++extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
++extern void __argp_fmtstream_update (argp_fmtstream_t __fs);
++extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
++
++extern int __argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
++extern int argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
++
++extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
++extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
++
+ #endif /* __OPTIMIZE__ */
+ 
+ #endif /* ARGP_FMTSTREAM_USE_LINEWRAP */
+Index: b/xbmc/screensavers/rsxs-0.9/lib/argp.h
+===================================================================
+--- a/xbmc/screensavers/rsxs-0.9/lib/argp.h
++++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h
+@@ -500,10 +500,6 @@ extern void __argp_state_help (const str
+ 			       FILE *__restrict __stream,
+ 			       unsigned int __flags);
+ 
+-/* Possibly output the standard usage message for ARGP to stderr and exit.  */
+-extern void argp_usage (const struct argp_state *__state);
+-extern void __argp_usage (const struct argp_state *__state);
+-
+ /* If appropriate, print the printf string FMT and following args, preceded
+    by the program name and `:', to stderr, and followed by a `Try ... --help'
+    message, then exit (1).  */
+@@ -531,15 +527,6 @@ extern void __argp_failure (const struct
+ 			    const char *__restrict __fmt, ...)
+      __attribute__ ((__format__ (__printf__, 4, 5)));
+ 
+-/* Returns true if the option OPT is a valid short option.  */
+-extern int _option_is_short (const struct argp_option *__opt) __THROW;
+-extern int __option_is_short (const struct argp_option *__opt) __THROW;
+-
+-/* Returns true if the option OPT is in fact the last (unused) entry in an
+-   options array.  */
+-extern int _option_is_end (const struct argp_option *__opt) __THROW;
+-extern int __option_is_end (const struct argp_option *__opt) __THROW;
+-
+ /* Return the input field for ARGP in the parser corresponding to STATE; used
+    by the help routines.  */
+ extern void *_argp_input (const struct argp *__restrict __argp,
+@@ -559,7 +546,7 @@ extern void *__argp_input (const struct
+ # endif
+ 
+ # ifndef ARGP_EI
+-#  define ARGP_EI extern __inline__
++#  define ARGP_EI static inline
+ # endif
+ 
+ ARGP_EI void
+@@ -592,6 +579,21 @@ __NTH (__option_is_end (const struct arg
+ #  undef __option_is_short
+ #  undef __option_is_end
+ # endif
++#else
++
++/* Possibly output the standard usage message for ARGP to stderr and exit.  */
++extern void argp_usage (const struct argp_state *__state);
++extern void __argp_usage (const struct argp_state *__state);
++
++/* Returns true if the option OPT is a valid short option.  */
++extern int _option_is_short (const struct argp_option *__opt) __THROW;
++extern int __option_is_short (const struct argp_option *__opt) __THROW;
++
++/* Returns true if the option OPT is in fact the last (unused) entry in an
++   options array.  */
++extern int _option_is_end (const struct argp_option *__opt) __THROW;
++extern int __option_is_end (const struct argp_option *__opt) __THROW;
++
+ #endif /* Use extern inlines.  */
+ 
+ #ifdef  __cplusplus

Changes of Revision 12