Projects
home:sagiben
kodi
Sign Up
Log In
Username
Password
Problem getting expanded diff: bad link: conflict in file kodi.spec
×
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 21
View file
kodi-noX.changes
Changed
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jul 8 07:22:43 UTC 2015 - olaf@aepfle.de + +- Fix rsxs build in Factory + +------------------------------------------------------------------- Mon Apr 27 16:26:06 UTC 2015 - aloisio@gmx.com - Removed libhogweed2 build requirement to fix Factory/Tumbleweed
View file
kodi.changes
Changed
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jul 8 07:22:43 UTC 2015 - olaf@aepfle.de + +- Fix rsxs build in Factory + +------------------------------------------------------------------- Mon Apr 27 16:26:06 UTC 2015 - aloisio@gmx.com - Removed libhogweed2 build requirement to fix Factory/Tumbleweed
View file
kodi-noX.spec
Changed
@@ -7,9 +7,8 @@ %define _libtag_ver %(version="`rpm -q --qf '%{VERSION}' libtag-devel`"; echo "$version") %define _kodi_addons_dir %{_datadir}/kodi/addons -%define ffmpeg_archive_name 2.4.6-Helix -%define pvr_addons_archive_name Helix_rc3 -%define kodi_version Helix +%define ffmpeg_archive_name 2.6.2-Isengard-beta +%define kodi_version Isengard %bcond_without enable_rpi_build %bcond_without enable_rpi_omxplayer @@ -31,21 +30,24 @@ %endif Name: kodi-noX -Version: 14.2 +Version: 15.0rc1 Release: 0 Summary: Kodi Media center License: GPL-2.0+ and GPL-3.0+ Group: Productivity/Multimedia/Video/Players Url: http://kodi.tv/ -Source0: %{version}-%{kodi_version}.tar.gz -Source1: https://github.com/opdenkamp/xbmc-pvr-addons/archive/%{pvr_addons_archive_name}.tar.gz -Source2: https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_archive_name}.tar.gz -# PATCH-FIX-OPENSUSE -- enable all pvr addons -Patch0: pvr-addons-enable-all.patch +Source0: %{version}-%{kodi_version}.tar.gz +Source1: https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_archive_name}.tar.gz +Source2: pvr-addons.tar.bz2 +Source3: kodi-platform-054a42f66.tar.gz Patch1: no-xbmc-symbolic-link.patch +Patch2: kodi-rsxs.patch # Raspberry Pi (armv6): omxplayer 3D support is only available for non X11 KODI #Patch2: disable_omxplayer_3d_support.patch +Patch3: cmake_no_deps.patch +Patch4: cmake_do_not_download.patch +Patch5: cmake_build64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: ppc64 %if %{noX_build} @@ -95,6 +97,7 @@ %if %{with enable_opengl} BuildRequires: glew-devel %endif +BuildRequires: giflib-devel BuildRequires: glibc-devel BuildRequires: gmp-devel BuildRequires: gperf @@ -105,8 +108,9 @@ BuildRequires: libass-devel >= 0.9.7 BuildRequires: libbluray-devel BuildRequires: libbz2-devel +BuildRequires: libcap-devel BuildRequires: libcdio-devel -BuildRequires: libcec-devel >= 2.2.0 +BuildRequires: cec-client-devel >= 3.0.0 %ifarch %ix86 x86_64 BuildRequires: libcrystalhd-devel %endif @@ -114,8 +118,8 @@ BuildRequires: libdvdread-devel BuildRequires: libexpat-devel BuildRequires: libfaac-devel -#BuildRequires: libffmpeg-devel BuildRequires: libgcrypt-devel +BuildRequires: libgnutls-devel BuildRequires: libgpg-error-devel BuildRequires: libhdhomerun-devel BuildRequires: libjasper-devel @@ -123,17 +127,18 @@ BuildRequires: libmad-devel BuildRequires: libmicrohttpd-devel BuildRequires: libmodplug-devel +BuildRequires: libmp3lame-devel BuildRequires: libmpeg2-devel BuildRequires: libnettle-devel BuildRequires: libnfs-devel BuildRequires: libogg-devel BuildRequires: libpcrecpp0 +BuildRequires: libplatform-devel BuildRequires: libplist-devel BuildRequires: libpng-devel BuildRequires: libpulse-devel BuildRequires: librtmp-devel BuildRequires: libsamplerate-devel -BuildRequires: shairplay-devel BuildRequires: libsmbclient-devel BuildRequires: libssh-devel BuildRequires: libstdc++-devel @@ -146,6 +151,8 @@ BuildRequires: libvdpau-devel %endif BuildRequires: libvorbis-devel +BuildRequires: libxml2-devel +BuildRequires: libxslt-devel BuildRequires: libyajl-devel BuildRequires: lzo-devel BuildRequires: mysql-devel @@ -153,15 +160,14 @@ BuildRequires: pcre-devel BuildRequires: pkg-config BuildRequires: python-devel +BuildRequires: readline-devel +BuildRequires: shairplay-devel +BuildRequires: sidplay-libs-devel libsidplay2-1 BuildRequires: sqlite-devel BuildRequires: swig -BuildRequires: tinyxml-devel -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel +BuildRequires: tinyxml2-devel tinyxml-devel BuildRequires: unzip -BuildRequires: libgnutls-devel BuildRequires: bluez-devel -BuildRequires: libcap-devel %if !%{noX_build} BuildRequires: xorg-x11-devel %endif @@ -214,44 +220,42 @@ %endif %description devel -Development files for the Kodi media Center +Development files for Kodi Media Center + +%package pvr.addons +Summary: PVR Addons files for Kodi +Group: Productivity/Multimedia/Video/Players +Requires: %{name} +%if %{noX_build} +Conflicts: %{name}-pvr.addons +%else +Conflicts: %{name}-noX-pvr.addons +%endif +BuildRequires: jsoncpp-devel +Requires: libjsoncpp1 + +%description pvr.addons +PVR Addons for Kodi Media Center %prep %setup -q -n xbmc-%{version}-%{kodi_version} -%patch0 + %patch1 -%if !%{noX_build} -#%%patch2 +%patch2 -p1 +%patch3 +%patch4 +%ifarch x86_64 +%patch5 %endif -tar -xf %{SOURCE1} -mv xbmc-pvr-addons-%{pvr_addons_archive_name} pvr-addons -pushd pvr-addons -./bootstrap -popd - -#cp %{SOURCE2} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz +cp %{SOURCE1} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') -FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes) - -# remove it in ffmpeg archive and repackage it -tar xpfz %{SOURCE2} -C tools/depends/target/ffmpeg/ -for file in tools/depends/target/ffmpeg/FFmpeg-%{ffmpeg_archive_name}/ffprobe.c tools/depends/target/ffmpeg/FFmpeg-%{ffmpeg_archive_name}/cmdutils.c; do +for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp; do sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file done -tar cpfz tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz -C tools/depends/target/ffmpeg/ FFmpeg-%{ffmpeg_archive_name}/ -rm -r tools/depends/target/ffmpeg/FFmpeg-%{ffmpeg_archive_name} - -# remove the remaining occurencies in the source tree -for file in lib/timidity/timidity/speex_a.c xbmc/Application.cpp xbmc/GUIInfoManager.cpp ; do - sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file -done -for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do - sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/" $file -done chmod +x bootstrap ./bootstrap @@ -306,10 +310,27 @@ %endif make %{?_smp_mflags} -#make -j1 V=0 + +pushd project/cmake/addons +mkdir -p build/download +tar xvf %{SOURCE2} -C build/download +tar zxvf %{SOURCE3} --strip-components=1 -C depends/common/kodi-platform
View file
kodi.spec
Changed
@@ -42,7 +42,7 @@ Source2: pvr-addons.tar.bz2 Source3: kodi-platform-054a42f66.tar.gz Patch1: no-xbmc-symbolic-link.patch -Patch2: float_tk.patch +Patch2: kodi-rsxs.patch # Raspberry Pi (armv6): omxplayer 3D support is only available for non X11 KODI #Patch2: disable_omxplayer_3d_support.patch Patch3: cmake_no_deps.patch @@ -239,11 +239,9 @@ %prep %setup -q -n xbmc-%{version}-%{kodi_version} -#%if !%{noX_build} -#%patch2 -#%endif %patch1 +%patch2 -p1 %patch3 %patch4 %ifarch x86_64
View file
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); +  + /* 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); +  + #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
View file
_link
Changed
@@ -1,4 +1,4 @@ -<link project="Multimedia" baserev="f51e7fa4db92cd2bd56138457ef821b2"> +<link project="Multimedia" baserev="a363d3189ffd4be539eb9ed9faf4cbad"> <patches> <branch/> </patches>
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.