Projects
home:sagiben
kodi
Sign Up
Log In
Username
Password
Problem getting expanded diff: service error: bad link: conflict in file kodi.spec
×
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 180
View file
kodi-noX-raspberry-pi.changes
Changed
@@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Mon Mar 9 11:30:15 UTC 2020 - manfred.h@gmx.net + +- Version update to Kodi 18.6 Leia +- 1157e9a11218945a14d9272814e78509c3e5b6c6.patch has been applied, + remove it. + +------------------------------------------------------------------- +Thu Dec 5 16:32:26 UTC 2019 - olaf@aepfle.de + +- Use flatbuffers from OBS +- Use fmt from OBS +- Use fstrcmp from OBS +- Use rapidjson from OBS +- Disable bluez on SLE_12 + +------------------------------------------------------------------- +Mon Nov 18 18:01:33 UTC 2019 - Sagi <sagiben@gmail.com> + +- Version update to Kodi 18.5 Leia + +------------------------------------------------------------------- Thu Oct 31 09:36:52 UTC 2019 - manfred.h@gmx.net - Use gcc-9/g++-9 on Tumbleweed/Factory.
View file
kodi-noX-raspberry-pi2.changes
Changed
@@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Mon Mar 9 11:30:15 UTC 2020 - manfred.h@gmx.net + +- Version update to Kodi 18.6 Leia +- 1157e9a11218945a14d9272814e78509c3e5b6c6.patch has been applied, + remove it. + +------------------------------------------------------------------- +Thu Dec 5 16:32:26 UTC 2019 - olaf@aepfle.de + +- Use flatbuffers from OBS +- Use fmt from OBS +- Use fstrcmp from OBS +- Use rapidjson from OBS +- Disable bluez on SLE_12 + +------------------------------------------------------------------- +Mon Nov 18 18:01:33 UTC 2019 - Sagi <sagiben@gmail.com> + +- Version update to Kodi 18.5 Leia + +------------------------------------------------------------------- Thu Oct 31 09:36:52 UTC 2019 - manfred.h@gmx.net - Use gcc-9/g++-9 on Tumbleweed/Factory.
View file
kodi-noX.changes
Changed
@@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Mon Mar 9 11:30:15 UTC 2020 - manfred.h@gmx.net + +- Version update to Kodi 18.6 Leia +- 1157e9a11218945a14d9272814e78509c3e5b6c6.patch has been applied, + remove it. + +------------------------------------------------------------------- +Thu Dec 5 16:32:26 UTC 2019 - olaf@aepfle.de + +- Use flatbuffers from OBS +- Use fmt from OBS +- Use fstrcmp from OBS +- Use rapidjson from OBS +- Disable bluez on SLE_12 + +------------------------------------------------------------------- +Mon Nov 18 18:01:33 UTC 2019 - Sagi <sagiben@gmail.com> + +- Version update to Kodi 18.5 Leia + +------------------------------------------------------------------- Thu Oct 31 09:36:52 UTC 2019 - manfred.h@gmx.net - Use gcc-9/g++-9 on Tumbleweed/Factory.
View file
kodi.changes
Changed
@@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Mon Mar 9 11:30:15 UTC 2020 - manfred.h@gmx.net + +- Version update to Kodi 18.6 Leia +- 1157e9a11218945a14d9272814e78509c3e5b6c6.patch has been applied, + remove it. + +------------------------------------------------------------------- +Thu Dec 5 16:32:26 UTC 2019 - olaf@aepfle.de + +- Use flatbuffers from OBS +- Use fmt from OBS +- Use fstrcmp from OBS +- Use rapidjson from OBS +- Disable bluez on SLE_12 + +------------------------------------------------------------------- Mon Nov 18 18:01:33 UTC 2019 - Sagi <sagiben@gmail.com> - Version update to Kodi 18.5 Leia
View file
kodi-noX-raspberry-pi.spec
Changed
@@ -46,7 +46,7 @@ ExclusiveArch: does-not-build Name: kodi-noX-raspberry-pi -Version: 18.5 +Version: 18.6 Release: 0 Summary: Media center (formerly known as XBMC) License: GPL-2.0+ and GPL-3.0+ @@ -64,10 +64,6 @@ Source22: https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz # DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz Source23: libdvdread-6.0.0-Leia-Alpha-3.tar.gz -Source24: http://mirrors.kodi.tv/build-deps/sources/fmt-5.1.0.tar.gz -Source25: http://mirrors.kodi.tv/build-deps/sources/rapidjson-1.1.0.tar.gz -Source26: http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.9.0.tar.gz -Source27: http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz %if %{without sysffmpeg} Source30: https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz %endif @@ -97,6 +93,10 @@ BuildRequires: groff-full BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: flatbuffers-devel +BuildRequires: fstrcmp-devel +BuildRequires: pkgconfig(fmt) +BuildRequires: pkgconfig(RapidJSON) >= 1.0.2 BuildRequires: pkgconfig(python2) BuildRequires: libmysqlclient-devel BuildRequires: pkgconfig(libass) @@ -146,7 +146,9 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libcec) >= 4.0.0 BuildRequires: pkgconfig(lcms2) +%if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(bluez) +%endif BuildRequires: libcap-devel %if %{with sysffmpeg} BuildRequires: pkgconfig(libavcodec) >= 58.18.100 @@ -291,7 +293,6 @@ %prep %setup -q -n xbmc-%{version}-%{kodi_version} -#%patch0 #%patch1 #%patch2 #%patch3 @@ -302,6 +303,7 @@ %patch8 -p1 # Remove build time references so build-compare can do its work +date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes) for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/" $file @@ -340,20 +342,16 @@ %endif -DCMAKE_C_COMPILER=$CC \ -DCMAKE_CXX_COMPILER=$CXX \ - -DFMT_URL=%{SOURCE24} \ - -DENABLE_INTERNAL_FMT=ON \ - -DRapidJSON_URL=%{SOURCE25} \ - -DENABLE_INTERNAL_RapidJSON=ON \ + -DENABLE_INTERNAL_FMT=OFF \ + -DENABLE_INTERNAL_RapidJSON=OFF \ -DFFMPEG_URL=%{SOURCE30} \ -DENABLE_INTERNAL_FFMPEG=OFF \ -DCROSSGUID_URL=%{SOURCE20} \ -DLIBDVDNAV_URL=%{SOURCE21} \ -DLIBDVDCSS_URL=%{SOURCE22} \ -DLIBDVDREAD_URL=%{SOURCE23} \ - -DENABLE_INTERNAL_FLATBUFFERS=ON \ - -DFLATBUFFERS_URL=%{SOURCE26} \ - -DENABLE_INTERNAL_FSTRCMP=ON \ - -DFSTRCMP_URL=%{SOURCE27} \ + -DENABLE_INTERNAL_FLATBUFFERS=OFF \ + -DENABLE_INTERNAL_FSTRCMP=OFF \ -DBUILD_SHARED_LIBS=1 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
View file
kodi-noX-raspberry-pi2.spec
Changed
@@ -46,7 +46,7 @@ ExclusiveArch: does-not-build Name: kodi-noX-raspberry-pi2 -Version: 18.5 +Version: 18.6 Release: 0 Summary: Media center (formerly known as XBMC) License: GPL-2.0+ and GPL-3.0+ @@ -64,10 +64,6 @@ Source22: https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz # DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz Source23: libdvdread-6.0.0-Leia-Alpha-3.tar.gz -Source24: http://mirrors.kodi.tv/build-deps/sources/fmt-5.1.0.tar.gz -Source25: http://mirrors.kodi.tv/build-deps/sources/rapidjson-1.1.0.tar.gz -Source26: http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.9.0.tar.gz -Source27: http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz %if %{without sysffmpeg} Source30: https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz %endif @@ -97,6 +93,10 @@ BuildRequires: groff-full BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: flatbuffers-devel +BuildRequires: fstrcmp-devel +BuildRequires: pkgconfig(fmt) +BuildRequires: pkgconfig(RapidJSON) >= 1.0.2 BuildRequires: pkgconfig(python2) BuildRequires: libmysqlclient-devel BuildRequires: pkgconfig(libass) @@ -146,7 +146,9 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libcec) >= 4.0.0 BuildRequires: pkgconfig(lcms2) +%if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(bluez) +%endif BuildRequires: libcap-devel %if %{with sysffmpeg} BuildRequires: pkgconfig(libavcodec) >= 58.18.100 @@ -291,7 +293,6 @@ %prep %setup -q -n xbmc-%{version}-%{kodi_version} -#%patch0 #%patch1 #%patch2 #%patch3 @@ -302,6 +303,7 @@ %patch8 -p1 # Remove build time references so build-compare can do its work +date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes) for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/" $file @@ -340,20 +342,16 @@ %endif -DCMAKE_C_COMPILER=$CC \ -DCMAKE_CXX_COMPILER=$CXX \ - -DFMT_URL=%{SOURCE24} \ - -DENABLE_INTERNAL_FMT=ON \ - -DRapidJSON_URL=%{SOURCE25} \ - -DENABLE_INTERNAL_RapidJSON=ON \ + -DENABLE_INTERNAL_FMT=OFF \ + -DENABLE_INTERNAL_RapidJSON=OFF \ -DFFMPEG_URL=%{SOURCE30} \ -DENABLE_INTERNAL_FFMPEG=OFF \ -DCROSSGUID_URL=%{SOURCE20} \ -DLIBDVDNAV_URL=%{SOURCE21} \ -DLIBDVDCSS_URL=%{SOURCE22} \ -DLIBDVDREAD_URL=%{SOURCE23} \ - -DENABLE_INTERNAL_FLATBUFFERS=ON \ - -DFLATBUFFERS_URL=%{SOURCE26} \ - -DENABLE_INTERNAL_FSTRCMP=ON \ - -DFSTRCMP_URL=%{SOURCE27} \ + -DENABLE_INTERNAL_FLATBUFFERS=OFF \ + -DENABLE_INTERNAL_FSTRCMP=OFF \ -DBUILD_SHARED_LIBS=1 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
View file
kodi-noX.spec
Changed
@@ -46,7 +46,7 @@ ExclusiveArch: does-not-build Name: kodi-noX -Version: 18.5 +Version: 18.6 Release: 0 Summary: Media center (formerly known as XBMC) License: GPL-2.0+ and GPL-3.0+ @@ -64,10 +64,6 @@ Source22: https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz # DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz Source23: libdvdread-6.0.0-Leia-Alpha-3.tar.gz -Source24: http://mirrors.kodi.tv/build-deps/sources/fmt-5.1.0.tar.gz -Source25: http://mirrors.kodi.tv/build-deps/sources/rapidjson-1.1.0.tar.gz -Source26: http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.9.0.tar.gz -Source27: http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz %if %{without sysffmpeg} Source30: https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz %endif @@ -97,6 +93,10 @@ BuildRequires: groff-full BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: flatbuffers-devel +BuildRequires: fstrcmp-devel +BuildRequires: pkgconfig(fmt) +BuildRequires: pkgconfig(RapidJSON) >= 1.0.2 BuildRequires: pkgconfig(python2) BuildRequires: libmysqlclient-devel BuildRequires: pkgconfig(libass) @@ -146,7 +146,9 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libcec) >= 4.0.0 BuildRequires: pkgconfig(lcms2) +%if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(bluez) +%endif BuildRequires: libcap-devel %if %{with sysffmpeg} BuildRequires: pkgconfig(libavcodec) >= 58.18.100 @@ -291,7 +293,6 @@ %prep %setup -q -n xbmc-%{version}-%{kodi_version} -#%patch0 #%patch1 #%patch2 #%patch3 @@ -302,6 +303,7 @@ %patch8 -p1 # Remove build time references so build-compare can do its work +date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes) for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/" $file @@ -340,20 +342,16 @@ %endif -DCMAKE_C_COMPILER=$CC \ -DCMAKE_CXX_COMPILER=$CXX \ - -DFMT_URL=%{SOURCE24} \ - -DENABLE_INTERNAL_FMT=ON \ - -DRapidJSON_URL=%{SOURCE25} \ - -DENABLE_INTERNAL_RapidJSON=ON \ + -DENABLE_INTERNAL_FMT=OFF \ + -DENABLE_INTERNAL_RapidJSON=OFF \ -DFFMPEG_URL=%{SOURCE30} \ -DENABLE_INTERNAL_FFMPEG=OFF \ -DCROSSGUID_URL=%{SOURCE20} \ -DLIBDVDNAV_URL=%{SOURCE21} \ -DLIBDVDCSS_URL=%{SOURCE22} \ -DLIBDVDREAD_URL=%{SOURCE23} \ - -DENABLE_INTERNAL_FLATBUFFERS=ON \ - -DFLATBUFFERS_URL=%{SOURCE26} \ - -DENABLE_INTERNAL_FSTRCMP=ON \ - -DFSTRCMP_URL=%{SOURCE27} \ + -DENABLE_INTERNAL_FLATBUFFERS=OFF \ + -DENABLE_INTERNAL_FSTRCMP=OFF \ -DBUILD_SHARED_LIBS=1 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
View file
kodi.spec
Changed
@@ -67,7 +67,6 @@ %if %{without sysffmpeg} Source30: https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz %endif -Patch0: 1157e9a11218945a14d9272814e78509c3e5b6c6.patch #Patch0: kodi.arm.patch #Patch1: no-xbmc-symbolic-link.patch #Patch2: kodi-texturepacker.patch @@ -294,7 +293,6 @@ %prep %setup -q -n xbmc-%{version}-%{kodi_version} -#%patch0 -p1 #%patch1 #%patch2 #%patch3
View file
_link
Changed
@@ -1,4 +1,4 @@ -<link project="Multimedia" baserev="6f0e9e7a1608d9ea39a29e04a290323e"> +<link project="Multimedia" baserev="6f380f2098c9f3e20042e16b12a76f90"> <patches> <branch/> </patches>
View file
kodi.VERSION
Changed
@@ -1,1 +1,1 @@ -20191116-37f51f6 +20200229-8e967df
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
.