Projects
home:sagiben
kodi
Sign Up
Log In
Username
Password
Problem getting expanded diff: bad link: conflict in file kodi.spec
×
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 141
View file
kodi-noX-raspberry-pi.changes
Changed
@@ -1,9 +1,16 @@ ------------------------------------------------------------------- -Sat Nov 25 14:41:22 UTC 2017 - sagiben@gmail.com +Fri Dec 22 07:27:37 UTC 2017 - olaf@aepfle.de - Version update to Kodi 17.6 Krypton ------------------------------------------------------------------- +Sun Dec 10 22:41:00 UTC 2017 - olaf@aepfle.de + +- Remove netcdf from BuildRequires + SLE_12 does not support it, and the private copy of ffmpeg will + most likely work just fine without it + +------------------------------------------------------------------- Mon Nov 20 09:49:03 UTC 2017 - davejplater@gmail.com - Build with kodi's ffmpeg, version 17.x doesn't work with
View file
kodi-noX-raspberry-pi2.changes
Changed
@@ -1,9 +1,16 @@ ------------------------------------------------------------------- -Sat Nov 25 14:41:22 UTC 2017 - sagiben@gmail.com +Fri Dec 22 07:27:37 UTC 2017 - olaf@aepfle.de - Version update to Kodi 17.6 Krypton ------------------------------------------------------------------- +Sun Dec 10 22:41:00 UTC 2017 - olaf@aepfle.de + +- Remove netcdf from BuildRequires + SLE_12 does not support it, and the private copy of ffmpeg will + most likely work just fine without it + +------------------------------------------------------------------- Mon Nov 20 09:49:03 UTC 2017 - davejplater@gmail.com - Build with kodi's ffmpeg, version 17.x doesn't work with
View file
kodi-noX.changes
Changed
@@ -1,9 +1,16 @@ ------------------------------------------------------------------- -Sat Nov 25 14:41:22 UTC 2017 - sagiben@gmail.com +Fri Dec 22 07:27:37 UTC 2017 - olaf@aepfle.de - Version update to Kodi 17.6 Krypton ------------------------------------------------------------------- +Sun Dec 10 22:41:00 UTC 2017 - olaf@aepfle.de + +- Remove netcdf from BuildRequires + SLE_12 does not support it, and the private copy of ffmpeg will + most likely work just fine without it + +------------------------------------------------------------------- Mon Nov 20 09:49:03 UTC 2017 - davejplater@gmail.com - Build with kodi's ffmpeg, version 17.x doesn't work with
View file
kodi.changes
Changed
@@ -1,9 +1,16 @@ ------------------------------------------------------------------- -Sat Nov 25 14:41:22 UTC 2017 - sagiben@gmail.com +Fri Dec 22 07:27:37 UTC 2017 - olaf@aepfle.de - Version update to Kodi 17.6 Krypton ------------------------------------------------------------------- +Sun Dec 10 22:41:00 UTC 2017 - olaf@aepfle.de + +- Remove netcdf from BuildRequires + SLE_12 does not support it, and the private copy of ffmpeg will + most likely work just fine without it + +------------------------------------------------------------------- Mon Nov 20 09:49:03 UTC 2017 - davejplater@gmail.com - Build with kodi's ffmpeg, version 17.x doesn't work with
View file
kodi-noX-raspberry-pi.spec
Changed
@@ -19,6 +19,7 @@ # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from # kodi.* files with the pre_checkin.sh script %define kodi_version Krypton +%define ffmpeg_version 3.1.11-Krypton-17.5 %define _kodi_addons_dir %{_datadir}/kodi/addons # set this parameter to enable building Kodi with ccache, debug information, etc. %define dev_build 0 @@ -38,7 +39,7 @@ # %bcond_without kodi_libbluray -ExclusiveArch: armv6l armv6hl +ExclusiveArch: does-not-build Name: kodi-noX-raspberry-pi Version: 17.6 @@ -58,6 +59,10 @@ Source21: libdvdnav-master.tar.gz Source22: libdvdcss-master.tar.gz Source23: libdvdread-master.tar.gz +%if %{without sysffmpeg} +# DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz +Source30: https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz +%endif Patch0: kodi.arm.patch Patch1: no-xbmc-symbolic-link.patch Patch2: kodi-texturepacker.patch @@ -72,7 +77,7 @@ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(python2) -BuildRequires: pkgconfig(mariadb) +BuildRequires: libmysqlclient-devel BuildRequires: pkgconfig(libass) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(openssl) @@ -119,13 +124,65 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(libcap) -BuildRequires: pkgconfig(libavcodec) >= 57.48.191 -BuildRequires: pkgconfig(libavfilter) >= 6.47.100 -BuildRequires: pkgconfig(libavformat) >= 57.41.100 -BuildRequires: pkgconfig(libavutil) >= 55.28.100 -BuildRequires: pkgconfig(libpostproc) >= 54.0.100 -BuildRequires: pkgconfig(libswscale) >= 4.1.100 -BuildRequires: pkgconfig(libswresample) >= 2.1.100 +%if %{with sysffmpeg} +BuildRequires: pkgconfig(libavcodec) >= 56.26.100 +BuildRequires: pkgconfig(libavfilter) >= 5.11.102 +BuildRequires: pkgconfig(libavformat) >= 56.25.101 +BuildRequires: pkgconfig(libavutil) >= 54.20.100 +BuildRequires: pkgconfig(libpostproc) >= 53.3.100 +BuildRequires: pkgconfig(libswscale) >= 3.1.101 +BuildRequires: pkgconfig(libswresample) >= 1.1.100 +%else +BuildRequires: ladspa-devel +BuildRequires: libgsm-devel +BuildRequires: pkg-config +BuildRequires: yasm +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(celt) >= 0.11.0 +BuildRequires: pkgconfig(enca) +BuildRequires: pkgconfig(fontconfig) >= 2.4.2 +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(fribidi) >= 0.19.0 +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(libass) +BuildRequires: pkgconfig(libbluray) +BuildRequires: pkgconfig(libcdio) +BuildRequires: pkgconfig(libcdio_paranoia) +BuildRequires: pkgconfig(libdc1394-2) +BuildRequires: pkgconfig(liboil-0.3) >= 0.3.15 +BuildRequires: pkgconfig(libopenjpeg) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libraw1394) +BuildRequires: pkgconfig(libva) >= 0.35.0 +BuildRequires: pkgconfig(libwebp) >= 0.4 +BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(schroedinger-1.0) +BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(speex) +BuildRequires: pkgconfig(theora) >= 1.1 +BuildRequires: pkgconfig(vdpau) +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(vpx) >= 1.3.0 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-render) +BuildRequires: pkgconfig(xcb-shape) +BuildRequires: pkgconfig(xcb-shm) +BuildRequires: pkgconfig(xcb-xfixes) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(librtmp) +BuildRequires: libmp3lame-devel +BuildRequires: libxvidcore-devel +BuildRequires: pkgconfig(opencore-amrnb) +BuildRequires: pkgconfig(twolame) +BuildRequires: pkgconfig(x264) +BuildRequires: pkgconfig(x265) +%endif BuildRequires: swig BuildRequires: java BuildRequires: doxygen @@ -235,9 +292,14 @@ cp %{SOURCE21} tools/depends/target/libdvdnav cp %{SOURCE22} tools/depends/target/libdvdcss cp %{SOURCE23} tools/depends/target/libdvdread +%if %{without sysffmpeg} +cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}.tar.gz +%endif %build - +export DVD_LIB=%{_lib} +export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss" +export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss" # build crossguid make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
View file
kodi-noX-raspberry-pi2.spec
Changed
@@ -19,6 +19,7 @@ # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from # kodi.* files with the pre_checkin.sh script %define kodi_version Krypton +%define ffmpeg_version 3.1.11-Krypton-17.5 %define _kodi_addons_dir %{_datadir}/kodi/addons # set this parameter to enable building Kodi with ccache, debug information, etc. %define dev_build 0 @@ -58,6 +59,10 @@ Source21: libdvdnav-master.tar.gz Source22: libdvdcss-master.tar.gz Source23: libdvdread-master.tar.gz +%if %{without sysffmpeg} +# DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz +Source30: https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz +%endif Patch0: kodi.arm.patch Patch1: no-xbmc-symbolic-link.patch Patch2: kodi-texturepacker.patch @@ -72,7 +77,7 @@ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(python2) -BuildRequires: pkgconfig(mariadb) +BuildRequires: libmysqlclient-devel BuildRequires: pkgconfig(libass) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(openssl) @@ -119,13 +124,65 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(libcap) -BuildRequires: pkgconfig(libavcodec) >= 57.48.191 -BuildRequires: pkgconfig(libavfilter) >= 6.47.100 -BuildRequires: pkgconfig(libavformat) >= 57.41.100 -BuildRequires: pkgconfig(libavutil) >= 55.28.100 -BuildRequires: pkgconfig(libpostproc) >= 54.0.100 -BuildRequires: pkgconfig(libswscale) >= 4.1.100 -BuildRequires: pkgconfig(libswresample) >= 2.1.100 +%if %{with sysffmpeg} +BuildRequires: pkgconfig(libavcodec) >= 56.26.100 +BuildRequires: pkgconfig(libavfilter) >= 5.11.102 +BuildRequires: pkgconfig(libavformat) >= 56.25.101 +BuildRequires: pkgconfig(libavutil) >= 54.20.100 +BuildRequires: pkgconfig(libpostproc) >= 53.3.100 +BuildRequires: pkgconfig(libswscale) >= 3.1.101 +BuildRequires: pkgconfig(libswresample) >= 1.1.100 +%else +BuildRequires: ladspa-devel +BuildRequires: libgsm-devel +BuildRequires: pkg-config +BuildRequires: yasm +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(celt) >= 0.11.0 +BuildRequires: pkgconfig(enca) +BuildRequires: pkgconfig(fontconfig) >= 2.4.2 +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(fribidi) >= 0.19.0 +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(libass) +BuildRequires: pkgconfig(libbluray) +BuildRequires: pkgconfig(libcdio) +BuildRequires: pkgconfig(libcdio_paranoia) +BuildRequires: pkgconfig(libdc1394-2) +BuildRequires: pkgconfig(liboil-0.3) >= 0.3.15 +BuildRequires: pkgconfig(libopenjpeg) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libraw1394) +BuildRequires: pkgconfig(libva) >= 0.35.0 +BuildRequires: pkgconfig(libwebp) >= 0.4 +BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(schroedinger-1.0) +BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(speex) +BuildRequires: pkgconfig(theora) >= 1.1 +BuildRequires: pkgconfig(vdpau) +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(vpx) >= 1.3.0 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-render) +BuildRequires: pkgconfig(xcb-shape) +BuildRequires: pkgconfig(xcb-shm) +BuildRequires: pkgconfig(xcb-xfixes) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(librtmp) +BuildRequires: libmp3lame-devel +BuildRequires: libxvidcore-devel +BuildRequires: pkgconfig(opencore-amrnb) +BuildRequires: pkgconfig(twolame) +BuildRequires: pkgconfig(x264) +BuildRequires: pkgconfig(x265) +%endif BuildRequires: swig BuildRequires: java BuildRequires: doxygen @@ -235,9 +292,14 @@ cp %{SOURCE21} tools/depends/target/libdvdnav cp %{SOURCE22} tools/depends/target/libdvdcss cp %{SOURCE23} tools/depends/target/libdvdread +%if %{without sysffmpeg} +cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}.tar.gz +%endif %build - +export DVD_LIB=%{_lib} +export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss" +export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss" # build crossguid make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
View file
kodi-noX.spec
Changed
@@ -19,6 +19,7 @@ # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from # kodi.* files with the pre_checkin.sh script %define kodi_version Krypton +%define ffmpeg_version 3.1.11-Krypton-17.5 %define _kodi_addons_dir %{_datadir}/kodi/addons # set this parameter to enable building Kodi with ccache, debug information, etc. %define dev_build 0 @@ -58,6 +59,10 @@ Source21: libdvdnav-master.tar.gz Source22: libdvdcss-master.tar.gz Source23: libdvdread-master.tar.gz +%if %{without sysffmpeg} +# DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz +Source30: https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz +%endif Patch0: kodi.arm.patch Patch1: no-xbmc-symbolic-link.patch Patch2: kodi-texturepacker.patch @@ -72,7 +77,7 @@ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(python2) -BuildRequires: pkgconfig(mariadb) +BuildRequires: libmysqlclient-devel BuildRequires: pkgconfig(libass) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(openssl) @@ -119,13 +124,65 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(libcap) -BuildRequires: pkgconfig(libavcodec) >= 57.48.191 -BuildRequires: pkgconfig(libavfilter) >= 6.47.100 -BuildRequires: pkgconfig(libavformat) >= 57.41.100 -BuildRequires: pkgconfig(libavutil) >= 55.28.100 -BuildRequires: pkgconfig(libpostproc) >= 54.0.100 -BuildRequires: pkgconfig(libswscale) >= 4.1.100 -BuildRequires: pkgconfig(libswresample) >= 2.1.100 +%if %{with sysffmpeg} +BuildRequires: pkgconfig(libavcodec) >= 56.26.100 +BuildRequires: pkgconfig(libavfilter) >= 5.11.102 +BuildRequires: pkgconfig(libavformat) >= 56.25.101 +BuildRequires: pkgconfig(libavutil) >= 54.20.100 +BuildRequires: pkgconfig(libpostproc) >= 53.3.100 +BuildRequires: pkgconfig(libswscale) >= 3.1.101 +BuildRequires: pkgconfig(libswresample) >= 1.1.100 +%else +BuildRequires: ladspa-devel +BuildRequires: libgsm-devel +BuildRequires: pkg-config +BuildRequires: yasm +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(celt) >= 0.11.0 +BuildRequires: pkgconfig(enca) +BuildRequires: pkgconfig(fontconfig) >= 2.4.2 +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(fribidi) >= 0.19.0 +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(libass) +BuildRequires: pkgconfig(libbluray) +BuildRequires: pkgconfig(libcdio) +BuildRequires: pkgconfig(libcdio_paranoia) +BuildRequires: pkgconfig(libdc1394-2) +BuildRequires: pkgconfig(liboil-0.3) >= 0.3.15 +BuildRequires: pkgconfig(libopenjpeg) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libraw1394) +BuildRequires: pkgconfig(libva) >= 0.35.0 +BuildRequires: pkgconfig(libwebp) >= 0.4 +BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(schroedinger-1.0) +BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(speex) +BuildRequires: pkgconfig(theora) >= 1.1 +BuildRequires: pkgconfig(vdpau) +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(vpx) >= 1.3.0 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-render) +BuildRequires: pkgconfig(xcb-shape) +BuildRequires: pkgconfig(xcb-shm) +BuildRequires: pkgconfig(xcb-xfixes) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(librtmp) +BuildRequires: libmp3lame-devel +BuildRequires: libxvidcore-devel +BuildRequires: pkgconfig(opencore-amrnb) +BuildRequires: pkgconfig(twolame) +BuildRequires: pkgconfig(x264) +BuildRequires: pkgconfig(x265) +%endif BuildRequires: swig BuildRequires: java BuildRequires: doxygen @@ -235,9 +292,14 @@ cp %{SOURCE21} tools/depends/target/libdvdnav cp %{SOURCE22} tools/depends/target/libdvdcss cp %{SOURCE23} tools/depends/target/libdvdread +%if %{without sysffmpeg} +cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}.tar.gz +%endif %build - +export DVD_LIB=%{_lib} +export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss" +export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss" # build crossguid make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
View file
kodi.spec
Changed
@@ -19,6 +19,7 @@ # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from # kodi.* files with the pre_checkin.sh script %define kodi_version Krypton +%define ffmpeg_version 3.1.11-Krypton-17.5 %define _kodi_addons_dir %{_datadir}/kodi/addons # set this parameter to enable building Kodi with ccache, debug information, etc. %define dev_build 0 @@ -38,7 +39,7 @@ # %bcond_without kodi_libbluray -ExclusiveArch: %ix86 x86_64 %arm aarch64 +ExclusiveArch: %ix86 x86_64 aarch64 Name: kodi Version: 17.6 @@ -58,6 +59,10 @@ Source21: libdvdnav-master.tar.gz Source22: libdvdcss-master.tar.gz Source23: libdvdread-master.tar.gz +%if %{without sysffmpeg} +# DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz +Source30: https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz +%endif Patch0: kodi.arm.patch Patch1: no-xbmc-symbolic-link.patch Patch2: kodi-texturepacker.patch @@ -72,7 +77,7 @@ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(python2) -BuildRequires: pkgconfig(mariadb) +BuildRequires: libmysqlclient-devel BuildRequires: pkgconfig(libass) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(openssl) @@ -119,13 +124,65 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(libcap) -BuildRequires: pkgconfig(libavcodec) >= 57.48.191 -BuildRequires: pkgconfig(libavfilter) >= 6.47.100 -BuildRequires: pkgconfig(libavformat) >= 57.41.100 -BuildRequires: pkgconfig(libavutil) >= 55.28.100 -BuildRequires: pkgconfig(libpostproc) >= 54.0.100 -BuildRequires: pkgconfig(libswscale) >= 4.1.100 -BuildRequires: pkgconfig(libswresample) >= 2.1.100 +%if %{with sysffmpeg} +BuildRequires: pkgconfig(libavcodec) >= 56.26.100 +BuildRequires: pkgconfig(libavfilter) >= 5.11.102 +BuildRequires: pkgconfig(libavformat) >= 56.25.101 +BuildRequires: pkgconfig(libavutil) >= 54.20.100 +BuildRequires: pkgconfig(libpostproc) >= 53.3.100 +BuildRequires: pkgconfig(libswscale) >= 3.1.101 +BuildRequires: pkgconfig(libswresample) >= 1.1.100 +%else +BuildRequires: ladspa-devel +BuildRequires: libgsm-devel +BuildRequires: pkg-config +BuildRequires: yasm +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(celt) >= 0.11.0 +BuildRequires: pkgconfig(enca) +BuildRequires: pkgconfig(fontconfig) >= 2.4.2 +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(fribidi) >= 0.19.0 +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(libass) +BuildRequires: pkgconfig(libbluray) +BuildRequires: pkgconfig(libcdio) +BuildRequires: pkgconfig(libcdio_paranoia) +BuildRequires: pkgconfig(libdc1394-2) +BuildRequires: pkgconfig(liboil-0.3) >= 0.3.15 +BuildRequires: pkgconfig(libopenjpeg) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libraw1394) +BuildRequires: pkgconfig(libva) >= 0.35.0 +BuildRequires: pkgconfig(libwebp) >= 0.4 +BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(schroedinger-1.0) +BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(speex) +BuildRequires: pkgconfig(theora) >= 1.1 +BuildRequires: pkgconfig(vdpau) +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(vpx) >= 1.3.0 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-render) +BuildRequires: pkgconfig(xcb-shape) +BuildRequires: pkgconfig(xcb-shm) +BuildRequires: pkgconfig(xcb-xfixes) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(librtmp) +BuildRequires: libmp3lame-devel +BuildRequires: libxvidcore-devel +BuildRequires: pkgconfig(opencore-amrnb) +BuildRequires: pkgconfig(twolame) +BuildRequires: pkgconfig(x264) +BuildRequires: pkgconfig(x265) +%endif BuildRequires: swig BuildRequires: java BuildRequires: doxygen @@ -235,9 +292,14 @@ cp %{SOURCE21} tools/depends/target/libdvdnav cp %{SOURCE22} tools/depends/target/libdvdcss cp %{SOURCE23} tools/depends/target/libdvdread +%if %{without sysffmpeg} +cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}.tar.gz +%endif %build - +export DVD_LIB=%{_lib} +export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss" +export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss" # build crossguid make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
View file
_link
Changed
@@ -1,4 +1,4 @@ -<link project="Multimedia" baserev="7b8e5a97a26c65928e1f37e44f07e557"> +<link project="Multimedia" baserev="3e5722a435644d42fe09830e12d76427"> <patches> <branch/> </patches>
View file
pre_checkin.sh
Changed
@@ -16,6 +16,7 @@ # armv6 boards for BOARDNAME in $armv6_platforms; do ARCH_RESTRICTIONS="armv6l armv6hl" # Not used for now + ARCH_RESTRICTIONS="does-not-build" # Enable platform build for the given platform (only noX version) sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
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
.