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 6
View file
kodi-noX.changes
Changed
@@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Sat Jan 10 09:57:56 UTC 2015 - obs@botter.cc + +- delete RUNPATH from installed binary, fixes PM-130, referencing + http://trac.kodi.tv/ticket/15497 and http://bugzilla.opensuse.org/show_bug.cgi?id=902421 +- along the line ALSA support was included in Request #1545 + +------------------------------------------------------------------- +Fri Jan 9 09:45:50 UTC 2015 - obs@botter.cc + +- Require: xpdyinfo on != -noX version + +------------------------------------------------------------------- +Thu Jan 8 22:39:58 UTC 2015 - obs@botter.cc + +- remove __DATE and __TIME__ from source tree and ffmpeg archive + +------------------------------------------------------------------- Fri Dec 12 06:21:30 UTC 2014 - sagiben at gmail dot com - Update to Kodi 14.0 Helix
View file
kodi.changes
Changed
@@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Sat Jan 10 09:57:56 UTC 2015 - obs@botter.cc + +- delete RUNPATH from installed binary, fixes PM-130, referencing + http://trac.kodi.tv/ticket/15497 and http://bugzilla.opensuse.org/show_bug.cgi?id=902421 +- along the line ALSA support was included in Request #1545 + +------------------------------------------------------------------- +Fri Jan 9 09:45:50 UTC 2015 - obs@botter.cc + +- Require: xpdyinfo on != -noX version + +------------------------------------------------------------------- +Thu Jan 8 22:39:58 UTC 2015 - obs@botter.cc + +- remove __DATE and __TIME__ from source tree and ffmpeg archive + +------------------------------------------------------------------- Fri Dec 12 06:21:30 UTC 2014 - sagiben at gmail dot com - Update to Kodi 14.0 Helix
View file
kodi-noX.spec
Changed
@@ -73,6 +73,7 @@ %endif %endif BuildRequires: -post-build-checks +BuildRequires: alsa-devel BuildRequires: avahi-devel BuildRequires: boost-devel BuildRequires: ccache @@ -173,6 +174,7 @@ %if 0%{?suse_version} >= 1220 %if !%{noX_build} Requires: Mesa-demo-x +Requires: xdpyinfo %endif %endif %if %{with enable_opengles} @@ -188,6 +190,8 @@ %endif %endif %endif +# needed to delete the fixed rpath introduced by smbclient +BuildRequires: chrpath %description KODI media center is a free cross-platform media-player jukebox and @@ -223,12 +227,24 @@ ./bootstrap popd -cp %{SOURCE2} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz +#cp %{SOURCE2} 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') -sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" xbmc/GUIInfoManager.cpp xbmc/Application.cpp lib/timidity/timidity/speex_a.c + +# 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 + 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 chmod +x bootstrap ./bootstrap @@ -250,6 +266,7 @@ --enable-optimizations \ --disable-static \ --enable-libcec \ +--enable-alsa \ %if %{with enable_opengl} --enable-goom \ --enable-vaapi \ @@ -313,6 +330,12 @@ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/kodi.desktop +# delete fixed rpath from smbclient.pc - this fixes +# http://trac.kodi.tv/ticket/15497 and +# http://bugzilla.opensuse.org/show_bug.cgi?id=902421 +chrpath %{buildroot}%{_libdir}/kodi/kodi.bin >/dev/null 2>&1 && \ + chrpath -d %{buildroot}%{_libdir}/kodi/kodi.bin + %fdupes %{buildroot} %files
View file
kodi.spec
Changed
@@ -73,6 +73,7 @@ %endif %endif BuildRequires: -post-build-checks +BuildRequires: alsa-devel BuildRequires: avahi-devel BuildRequires: boost-devel BuildRequires: ccache @@ -173,6 +174,7 @@ %if 0%{?suse_version} >= 1220 %if !%{noX_build} Requires: Mesa-demo-x +Requires: xdpyinfo %endif %endif %if %{with enable_opengles} @@ -188,6 +190,8 @@ %endif %endif %endif +# needed to delete the fixed rpath introduced by smbclient +BuildRequires: chrpath %description KODI media center is a free cross-platform media-player jukebox and @@ -223,12 +227,24 @@ ./bootstrap popd -cp %{SOURCE2} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz +#cp %{SOURCE2} 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') -sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" xbmc/GUIInfoManager.cpp xbmc/Application.cpp lib/timidity/timidity/speex_a.c + +# 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 + 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 chmod +x bootstrap ./bootstrap @@ -250,6 +266,7 @@ --enable-optimizations \ --disable-static \ --enable-libcec \ +--enable-alsa \ %if %{with enable_opengl} --enable-goom \ --enable-vaapi \ @@ -313,6 +330,12 @@ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/kodi.desktop +# delete fixed rpath from smbclient.pc - this fixes +# http://trac.kodi.tv/ticket/15497 and +# http://bugzilla.opensuse.org/show_bug.cgi?id=902421 +chrpath %{buildroot}%{_libdir}/kodi/kodi.bin >/dev/null 2>&1 && \ + chrpath -d %{buildroot}%{_libdir}/kodi/kodi.bin + %fdupes %{buildroot} %files
View file
_link
Changed
@@ -1,4 +1,4 @@ -<link project="Multimedia" baserev="b3725ea643e73ca281dbf08374d76cb1"> +<link project="Multimedia" baserev="62caad9518dc0f0249d53597af7fe014"> <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
.