Projects
home:sagiben
kodi
Sign Up
Log In
Username
Password
Error getting diff: bad link: conflict in file kodi.spec
×
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 52
View file
kodi-noX.spec
Changed
@@ -56,9 +56,11 @@ #Patch2: disable_omxplayer_3d_support.patch Patch3: cmake_no_deps.patch Patch4: cmake_do_not_download.patch +Patch5: cmake_build64.patch Patch6: kodi-texturepacker.patch # PATCH-FIX-UPSTREAM: fix build with gcc5 (Tumbleweed) Patch7: kodi-15.0-gcc5.patch +Patch8: kodi-timestamp.patch BuildRequires: alsa-devel BuildRequires: avahi-devel BuildRequires: bluez-devel @@ -247,16 +249,12 @@ %patch1 %patch3 %patch4 +%ifarch x86_64 +%patch5 +%endif %patch6 %patch7 -p1 -# 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') -for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp; do - sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file -done - # Fix the final version string showing as "exported" # instead of the SVN revision number. export HAVE_GIT="no" GIT_REV="exported" @@ -277,12 +275,6 @@ # We do not provide sidplay2 library on any SUSE distribution rm -rf addons/audiodecoder.sidplay popd -# Setting the right libdir for 64bit builds -%if "%{_libdir}" == "%{_prefix}/lib64" -sed -i \ - -e 's:lib/${APP_NAME_LC}:lib64/${APP_NAME_LC}:g' \ - project/cmake/scripts/common/addon-helpers.cmake -%endif ### @@ -375,7 +367,6 @@ for file in audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file done - popd %install
View file
kodi.spec
Changed
@@ -56,9 +56,11 @@ #Patch2: disable_omxplayer_3d_support.patch Patch3: cmake_no_deps.patch Patch4: cmake_do_not_download.patch +Patch5: cmake_build64.patch Patch6: kodi-texturepacker.patch # PATCH-FIX-UPSTREAM: fix build with gcc5 (Tumbleweed) Patch7: kodi-15.0-gcc5.patch +Patch8: kodi-timestamp.patch BuildRequires: alsa-devel BuildRequires: avahi-devel BuildRequires: bluez-devel @@ -247,16 +249,12 @@ %patch1 %patch3 %patch4 +%ifarch x86_64 +%patch5 +%endif %patch6 %patch7 -p1 -# 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') -for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp; do - sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file -done - # Fix the final version string showing as "exported" # instead of the SVN revision number. export HAVE_GIT="no" GIT_REV="exported" @@ -277,12 +275,6 @@ # We do not provide sidplay2 library on any SUSE distribution rm -rf addons/audiodecoder.sidplay popd -# Setting the right libdir for 64bit builds -%if "%{_libdir}" == "%{_prefix}/lib64" -sed -i \ - -e 's:lib/${APP_NAME_LC}:lib64/${APP_NAME_LC}:g' \ - project/cmake/scripts/common/addon-helpers.cmake -%endif ### @@ -375,7 +367,6 @@ for file in audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file done - popd %install
View file
cmake_build64.patch
Added
@@ -0,0 +1,11 @@ +--- project/cmake/scripts/common/addon-helpers.cmake.orig 2015-06-08 22:03:02.469336590 +0300 ++++ project/cmake/scripts/common/addon-helpers.cmake 2015-06-09 06:36:59.947358400 +0300 +@@ -85,7 +85,7 @@ + message(FATAL_ERROR "CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} differs from ${APP_NAME} prefix ${${APP_NAME_UC}_PREFIX}. Please pass -DOVERRIDE_PATHS=1 to skip this check") + else() + if(NOT CMAKE_INSTALL_LIBDIR) +- set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${APP_NAME_LC}") ++ set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib64/${APP_NAME_LC}") + endif() + endif() + else()
View file
kodi-timestamp.patch
Added
@@ -0,0 +1,31 @@ +--- + xbmc/Application.cpp | 2 +- + xbmc/utils/SystemInfo.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: b/xbmc/Application.cpp +=================================================================== +--- a/xbmc/Application.cpp ++++ b/xbmc/Application.cpp +@@ -513,7 +513,7 @@ bool CApplication::Create() + // specialVersion = " (version for XXXX)"; + #endif + CLog::Log(LOGNOTICE, "Using %s %s x%d build%s", buildType.c_str(), CSysInfo::GetAppName().c_str(), g_sysinfo.GetXbmcBitness(), specialVersion.c_str()); +- CLog::Log(LOGNOTICE, "%s compiled " __DATE__ " by %s for %s %s %d-bit %s (%s)", CSysInfo::GetAppName().c_str(), g_sysinfo.GetUsedCompilerNameAndVer().c_str(), g_sysinfo.GetBuildTargetPlatformName().c_str(), ++ CLog::Log(LOGNOTICE, "%s compiled $DATE by %s for %s %s %d-bit %s (%s)", CSysInfo::GetAppName().c_str(), g_sysinfo.GetUsedCompilerNameAndVer().c_str(), g_sysinfo.GetBuildTargetPlatformName().c_str(), + g_sysinfo.GetBuildTargetCpuFamily().c_str(), g_sysinfo.GetXbmcBitness(), g_sysinfo.GetBuildTargetPlatformVersionDecoded().c_str(), + g_sysinfo.GetBuildTargetPlatformVersion().c_str()); + +Index: b/xbmc/utils/SystemInfo.cpp +=================================================================== +--- a/xbmc/utils/SystemInfo.cpp ++++ b/xbmc/utils/SystemInfo.cpp +@@ -1254,7 +1254,7 @@ std::string CSysInfo::GetVersion() + + std::string CSysInfo::GetBuildDate() + { +- return StringUtils::Format("%s", __DATE__); ++ return StringUtils::Format("%s", "$DATE"); + } + + bool CSysInfo::IsAppleTV2()
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
.