public/rpms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changes for Fedora26

Browse Source
This commit is contained in:
dani
2017-07-18 18:29:15 +02:00
parent 33f23cdd9e
commit c2fb0fcfb3
3 changed files with 67 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
fedora/SPECS/kodi.spec
View File

@@ -1,14 +1,13 @@
#global PRERELEASE rc1
%global myversion 17.3
%global DIRVERSION %{myversion}
#global PRERELEASE rc4
%global DIRVERSION %{version}
#global GITCOMMIT Gotham_r2-ge988513
# use the line below for pre-releases
#global DIRVERSION %{version}%{PRERELEASE}
%global _hardened_build 1
%define debug_package %{nil}
%global _with_dvd 0
Name: kodi
Version: %myversion
Version: 17.3
Release: 1%{?dist}
Summary: Media center
@@ -25,25 +24,24 @@ Source0: %{name}-%{DIRVERSION}-patched.tar.xz
# ./kodi-generate-tarball-xz.sh
Source1: kodi-generate-tarball-xz.sh
# filed ticket, but patch still needs work
# http://trac.xbmc.org/ticket/9658
Patch1: xbmc-13.0-dvdread.patch
%if 0%{?_with_dvd}
# kodi uses modified libdvd{css,nav,read} source and downloads at build time
# wget -O kodi-libdvdnav-master.tar.gz https://github.com/xbmc/libdvdnav/archive/master.tar.gz
Source2: kodi-libdvdnav-master.tar.gz
# wget -O kodi-libdvdread-master.tar.gz https://github.com/xbmc/libdvdread/archive/master.tar.gz
Source3: kodi-libdvdread-master.tar.gz
# wget -O kodi-libdvdcss-master.tar.gz https://github.com/xbmc/libdvdcss/archive/master.tar.gz
Source4: kodi-libdvdcss-master.tar.gz
%endif
# Set program version parameters
Patch2: kodi-16.0-versioning.patch
Patch1: kodi-16.0-versioning.patch
# Remove call to internal ffmpeg function (misued anyway)
Patch3: kodi-14.0-dvddemux-ffmpeg.patch
# Drop DVD library support
Patch2: kodi-17a2-libdvd.patch
# Disable dcadec library detection when using external ffmpeg (dcadec is only
# needed to build bundled ffmpeg)
Patch4: kodi-16.0-dcadec.patch
Patch5: ffmpeg-2.9.patch
Patch6: gcc6.patch
Patch7: kodi-avicodec.patch
Patch8: kodi-AEDefines_disable.patch
# Problem with variable definitions in FTPParse module:
Patch3: kodi-ftpparse.patch
# Optional deps (not in EPEL)
%if 0%{?fedora}
@@ -61,7 +59,8 @@ Patch8: kodi-AEDefines_disable.patch
%endif
# Upstream does not support ppc64
ExcludeArch: ppc64
# ARM support is restricted to one GPU per build
ExclusiveArch: i686 x86_64
BuildRequires: SDL2-devel
BuildRequires: SDL_image-devel
@@ -102,6 +101,7 @@ BuildRequires: gperf
BuildRequires: jasper-devel
BuildRequires: java-devel
BuildRequires: lame-devel
BuildRequires: lcms2-devel
BuildRequires: libXinerama-devel
BuildRequires: libXmu-devel
BuildRequires: libXtst-devel
@@ -112,14 +112,17 @@ BuildRequires: libbluray-devel
BuildRequires: libcap-devel
BuildRequires: libcdio-devel
%if 0%{?_with_libcec}
BuildRequires: libcec-devel >= 3.0.0
%if 0%{?fedora} > 24
BuildRequires: libcec-devel >= 4.0.0
%else
BuildRequires: libcec-devel < 4.0.0
%endif
%endif
%if 0%{?_with_crystalhd}
BuildRequires: libcrystalhd-devel
%endif
BuildRequires: libcurl-devel
BuildRequires: libdca-devel
BuildRequires: libdvdread-devel
%if 0%{?el6}
BuildRequires: libjpeg-devel
%else
@@ -183,7 +186,7 @@ BuildRequires: weston-devel
BuildRequires: yajl-devel
BuildRequires: zlib-devel
Requires: google-roboto-fonts
Requires: dejavu-sans-fonts
# need explicit requires for these packages
# as they are dynamically loaded via XBMC's arcane
# pseudo-DLL loading scheme (sigh)
@@ -191,7 +194,11 @@ Requires: google-roboto-fonts
Requires: libbluray%{?_isa}
%endif
%if 0%{?_with_libcec}
Requires: libcec%{?_isa} >= 3.0.0
%if 0%{?fedora} > 24
Requires: libcec%{?_isa} >= 4.0.0
%else
Requires: libcec%{?_isa} < 4.0.0
%endif
%endif
%if 0%{?_with_crystalhd}
Requires: libcrystalhd%{?_isa}
@@ -253,16 +260,15 @@ library.
%prep
%setup -q -n %{name}-%{DIRVERSION}
#%patch1 -p1
%patch2 -p1
#%patch3 -p0
#%patch4 -p0
#%patch5 -p1
#%if 0%{?fedora} >= 24
#%patch6 -p1
#%endif
%patch7
%patch8
%patch1 -p1 -b.versioning
%if 0%{?_with_dvd}
cp -p %{SOURCE2} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
cp -p %{SOURCE3} tools/depends/target/libdvdread/libdvdread-master.tar.gz
cp -p %{SOURCE4} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz
%else
%patch2 -p1 -b.libdvd
%endif
%patch3 -p0 -b.ftpparse
%build
@@ -292,29 +298,29 @@ chmod +x bootstrap
%else
--disable-ssh \
%endif
%if ! 0%{?_with_dvd}
--disable-optical-drive \
%endif
--disable-optimizations --disable-debug \
%ifnarch %{arm}
--enable-gl \
--disable-gles \
--enable-vdpau \
%else
--enable-gl \
--enable-gles \
--disable-vdpau \
--disable-vaapi \
--enable-vdpau \
--enable-vaapi \
%ifarch armv7hl \
--enable-tegra \
--disable-neon \
%endif
%ifarch armv7hnl
--enable-neon \
%endif
%endif
CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/samba-4.0/ -D__STDC_CONSTANT_MACROS" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/samba-4.0/ -D__STDC_CONSTANT_MACROS" \
LDFLAGS="-fPIC" \
LDFLAGS="$RPM_LD_FLAGS -fPIC" \
ASFLAGS=-fPIC
make %{?_smp_mflags} VERBOSE=1
make %{?_smp_mflags} V=1
%install
@@ -328,6 +334,9 @@ desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/kodi.desktop
# Stop shipping the duplicate xsession file
rm -f $RPM_BUILD_ROOT/%{_datadir}/xsessions/xbmc.desktop
# Normally we are expected to build these manually. But since we are using
# the system Python interpreter, we also want to use the system libraries
install -d $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib
@@ -335,9 +344,8 @@ ln -s %{python_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module
#install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib
#ln -s %{python_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2
# Use external Roboto font files instead of bundled ones
#ln -sf %{_fontbasedir}/google-roboto/Roboto-Regular.ttf ${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.confluence/fonts/
#ln -sf %{_fontbasedir}/google-roboto/Roboto-Bold.ttf ${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.confluence/fonts/
# Use external font files instead of bundled ones
ln -sf %{_fontbasedir}/dejavu/DejaVuSans-Bold.ttf ${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.estouchy/fonts/
# Move man-pages into system dir
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/
@@ -358,7 +366,9 @@ fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
if [ ! -L %{_libdir}/xbmc ] ; then
rmdir %{_libdir}/xbmc %{_datadir}/xbmc
if [ -d %{_libdir}/xbmc ] ; then
rmdir %{_libdir}/xbmc %{_datadir}/xbmc
fi
ln -s kodi ${RPM_BUILD_ROOT}%{_libdir}/xbmc
ln -s kodi ${RPM_BUILD_ROOT}%{_datadir}/xbmc
fi
@@ -366,7 +376,9 @@ fi
%posttrans devel
if [ ! -L %{_includedir}/xbmc ] ; then
rmdir %{_includedir}/xbmc
if [ -d %{_includedir}/xbmc ] ; then
rmdir %{_includedir}/xbmc
fi
ln -s kodi ${RPM_BUILD_ROOT}%{_includedir}/xbmc
fi
@@ -383,7 +395,6 @@ fi
%{_datadir}/kodi
%ghost %{_datadir}/xbmc
%{_datadir}/xsessions/kodi.desktop
%{_datadir}/xsessions/xbmc.desktop
%{_datadir}/applications/kodi.desktop
%{_datadir}/icons/hicolor/*/*/*.png
%{_mandir}/man1/kodi.1.gz
@@ -416,36 +427,6 @@ fi
%changelog
* Thu Jun 6 2017 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton 17.3
* Sat Feb 25 2017 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton 17.1rc1
* Wed Feb 8 2017 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton Final
* Sun Jan 29 2017 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton RC 4
* Sat Jan 14 2017 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton RC 3
* Sat Dec 3 2016 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton Beta6
* Fri Nov 25 2016 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton Beta5, built on Fedora 25
* Wed Oct 26 2016 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton Beta4
* Thu Oct 6 2016 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton Beta3
* Tue Sep 20 2016 Daniel Steiner <elpito@bluewin.ch>
- Update to Krypton Beta2
* Sun Jul 31 2016 Daniel Steiner <elpito@bluewin.ch>
- New build for Fedora 24
* Tue Jul 18 2017 Daniel Steiner <dsteiner@redhat.com> - 17.3-1
- Kodi 17.3 final for Fedora 26