Overview
Request 1010 (accepted)
- Update to 13.0 Gotham:
* Dramatic Audio Engine Improvements
* Improved UPnP capabilities
* Settings Improvements
* Making Subtitle Search Better
* Stereoscopic 3D Rendering
* Raspberry Pi and Android speed improvements
* An Extended Python and JSON-RPC API for developers
* Many minor fixes and improvements
- Add enable-external-ffmpeg.patch: build again system ffmpeg.
- Drop xbmc-12.2-subtitles.patch: fixed upstream.
- Drop samba4-fix.patch: fixed upstream.
- Drop git_rev.patch: fixed upstream.
xbmc-noX.changes
Changed
-------------------------------------------------------------------
+Sat May 17 12:50:02 UTC 2014 - fisiu@opensuse.org
+
+- Update to 13.0 Gotham:
+ * Dramatic Audio Engine Improvements
+ * Improved UPnP capabilities
+ * Settings Improvements
+ * Making Subtitle Search Better
+ * Stereoscopic 3D Rendering
+ * Raspberry Pi and Android speed improvements
+ * An Extended Python and JSON-RPC API for developers
+ * Many minor fixes and improvements
+- Add enable-external-ffmpeg.patch: build again system ffmpeg.
+- Drop xbmc-12.2-subtitles.patch: fixed upstream.
+- Drop samba4-fix.patch: fixed upstream.
+- Drop git_rev.patch: fixed upstream.
+
+-------------------------------------------------------------------
Mon Feb 17 12:21:46 UTC 2014 - guillaume@opensuse.org
- Replace raspberrypi-gfx-devel package by raspberrypi-userland-devel
xbmc.changes
Changed
-------------------------------------------------------------------
+Sat May 17 12:50:02 UTC 2014 - fisiu@opensuse.org
+
+- Update to 13.0 Gotham:
+ * Dramatic Audio Engine Improvements
+ * Improved UPnP capabilities
+ * Settings Improvements
+ * Making Subtitle Search Better
+ * Stereoscopic 3D Rendering
+ * Raspberry Pi and Android speed improvements
+ * An Extended Python and JSON-RPC API for developers
+ * Many minor fixes and improvements
+- Add enable-external-ffmpeg.patch: build again system ffmpeg.
+- Drop xbmc-12.2-subtitles.patch: fixed upstream.
+- Drop samba4-fix.patch: fixed upstream.
+- Drop git_rev.patch: fixed upstream.
+
+-------------------------------------------------------------------
Mon Feb 17 12:21:46 UTC 2014 - guillaume@opensuse.org
- Replace raspberrypi-gfx-devel package by raspberrypi-userland-devel
xbmc-noX.spec
Changed
# Please edit xbmc.spec and xbmc.changes only. *-noX.* files are generated from xbmc.* files with the pre_checkin.sh script
#
+
%define _libtag_ver %(version="`rpm -q --qf '%{VERSION}' libtag-devel`"; echo "$version")
+%define _xbmc_addons_dir %{_datadir}/xbmc/addons
%bcond_without enable_rpi_build
%bcond_without enable_rpi_omxplayer
-Name: xbmc-noX
# xbmc can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
%define noX_build ("%{name}" == "xbmc-noX")
%if %{noX_build}
%bcond_with enable_opengl
%bcond_without enable_opengles
%else
-%ifarch %arm armv6l armv6hl
+%ifarch %{arm} armv6l armv6hl
%bcond_with enable_opengl
%bcond_without enable_opengles
%else
%bcond_with enable_opengles
%endif
%endif
-Version: 12.3
+
+Name: xbmc-noX
+Version: 13.0
Release: 0
Summary: XBMC Media center
License: GPL-2.0+ and GPL-3.0+
Group: Productivity/Multimedia/Video/Players
Url: http://www.xbmc.org/
-Source0: http://mirrors.xbmc.org/releases/source/xbmc-%{version}.tar.gz
-Source1: https://github.com/opdenkamp/xbmc-pvr-addons/archive/frodo.zip
-# PATCH-FIX-UPSTREAM xbmc-12.2-subtitles.patch -- already merged in git rev
-Patch0: xbmc-12.2-subtitles.patch
-# PATCH-FIX-UPSTREAM samba4-fix.patch -- Fix path for libsmbclient.h shipped with samba4 -- already in master git.
-Patch1: samba4-fix.patch
-Patch2: git_rev.patch
-Patch3: pvr-addons-enable-all.patch
+Source0: http://mirrors.xbmc.org/releases/source/xbmc-13.0_r2.tar.gz
+Source1: https://github.com/opdenkamp/xbmc-pvr-addons/archive/13.0-Gotham.tar.gz
+# PATCH-FEATURE-OPENSUSE -- enable external ffmpeg
+Patch0: enable-external-ffmpeg.patch
+# PATCH-FIX-OPENSUSE -- enable all pvr addons
+Patch1: pvr-addons-enable-all.patch
# Raspberry Pi (armv6) only: Fix include path for XBMCTex.cpp:38:25: fatal error: guilib/XBTF.h: No such file or directory
-Patch4: texture.patch
+### FIXME Rebase required!
+Patch2: texture.patch
# omxplayer 3D support is only available for non X11 XBMC
-Patch5: disable_omxplayer_3d_support.patch
+Patch3: disable_omxplayer_3d_support.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: ppc64
%if %{noX_build}
BuildRequires: doxygen
BuildRequires: enca-devel
BuildRequires: fdupes
-BuildRequires: ffmpeg1-devel
+BuildRequires: libffmpeg-devel
BuildRequires: flac-devel
BuildRequires: flex
BuildRequires: fontconfig-devel
BuildRequires: sqlite-devel
BuildRequires: swig
BuildRequires: tinyxml-devel
+BuildRequires: libxml2-devel
+BuildRequires: libxslt-devel
BuildRequires: unzip
+BuildRequires: libgnutls-devel
+BuildRequires: bluez-devel
+BuildRequires: libcap-devel
%if !%{noX_build}
BuildRequires: xorg-x11-devel
%endif
Development files for the XBMC media Center
%prep
-%setup -q -n xbmc-%{version}-Frodo
-%patch0 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4
-%if !%{noX_build}
-%patch5
+%setup -q -n xbmc-%{version}-Gotham_r2
+%patch0
+%patch1
+%ifarch armv6l armv6hl
+%if %{with enable_rpi_build}
+%patch2
%endif
-%if 0%{?suse_version} >= 1310
-%patch1 -p0
%endif
-unzip -q %{S:1}
-mv xbmc-pvr-addons-frodo pvr-addons
+%if !%{noX_build}
+%patch3
+%endif
+tar -xf %{SOURCE1}
+mv xbmc-pvr-addons-13.0-Gotham pvr-addons
pushd pvr-addons
./bootstrap
popd
./bootstrap
%build
-export CPPFLAGS="-I/usr/include/ffmpeg"
-export CFLAGS="%{optflags} -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS"
-export CXXFLAGS="%{optflags} -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS"
-export LDFLAGS="-fPIC"
-export LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS"
-export ASFLAGS=-fPIC
%ifarch armv6l armv6hl
%if %{with enable_rpi_build}
export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
%endif
%endif
%configure \
---enable-libusb \
--enable-airplay \
--enable-external-libraries \
---enable-external-ffmpeg \
+--enable-ffmpeg-libvorbis \
--enable-rtmp \
--enable-libbluray \
--disable-debug \
+--enable-shared \
+--enable-optimizations \
--disable-static \
--enable-libcec \
%if %{with enable_opengl}
make %{?_smp_mflags} VERBOSE=1
%install
-
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
# remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
rm -r %{buildroot}/%{_datadir}/doc/
%files
%defattr(-,root,root)
-%doc copying.txt LICENSE.GPL docs/README.linux
+%doc copying.txt LICENSE.GPL docs/README.linux
%{_bindir}/xbmc
%{_bindir}/xbmc-standalone
%{_libdir}/xbmc
-#%%{_datadir}/xbmc
%{_datadir}/xsessions/XBMC.desktop
%{_datadir}/applications/xbmc.desktop
%{_datadir}/icons/hicolor/*/*/*.png
-%{_mandir}/man1/xbmc-standalone.1.gz
-%{_mandir}/man1/xbmc.1.gz
-
%{_datadir}/xbmc/FEH.py
-%{_datadir}/xbmc/addons/metadata.album.universal/*
-%{_datadir}/xbmc/addons/metadata.artists.universal/*
-%{_datadir}/xbmc/addons/metadata.common.allmusic.com/*
-%{_datadir}/xbmc/addons/metadata.common.amazon.de/*
-%{_datadir}/xbmc/addons/metadata.common.fanart.tv/*
-%{_datadir}/xbmc/addons/metadata.common.hdtrailers.net/*
-%{_datadir}/xbmc/addons/metadata.common.htbackdrops.com/*
-%{_datadir}/xbmc/addons/metadata.common.imdb.com/*
-%{_datadir}/xbmc/addons/metadata.common.last.fm/*
-%{_datadir}/xbmc/addons/metadata.common.musicbrainz.org/*
-%{_datadir}/xbmc/addons/metadata.common.theaudiodb.com/*
-%{_datadir}/xbmc/addons/metadata.common.themoviedb.org/*
-%{_datadir}/xbmc/addons/metadata.musicvideos.theaudiodb.com/*
-%{_datadir}/xbmc/addons/metadata.themoviedb.org/*
-%{_datadir}/xbmc/addons/metadata.tvdb.com/*
-%{_datadir}/xbmc/addons/repository.pvr-android.xbmc.org/*
-%{_datadir}/xbmc/addons/repository.pvr-ios.xbmc.org/*
-%{_datadir}/xbmc/addons/repository.pvr-osx32.xbmc.org/*
-%{_datadir}/xbmc/addons/repository.pvr-osx64.xbmc.org/*
-%{_datadir}/xbmc/addons/repository.pvr-win32.xbmc.org/*
-%{_datadir}/xbmc/addons/repository.xbmc.org/*
-%{_datadir}/xbmc/addons/screensaver.rsxs.euphoria/*
-%{_datadir}/xbmc/addons/screensaver.rsxs.plasma/*
-%{_datadir}/xbmc/addons/screensaver.rsxs.solarwinds/*
-%{_datadir}/xbmc/addons/screensaver.xbmc.builtin.black/*
-%{_datadir}/xbmc/addons/screensaver.xbmc.builtin.dim/*
-%{_datadir}/xbmc/addons/script.module.pil/*
-%{_datadir}/xbmc/addons/skin.confluence/*
-%{_datadir}/xbmc/addons/visualization.dxspectrum/*
-%{_datadir}/xbmc/addons/visualization.glspectrum/*
-%if %{with enable_opengl}
-%{_datadir}/xbmc/addons/visualization.goom/*
-%endif
-%{_datadir}/xbmc/addons/visualization.milkdrop/*
-%{_datadir}/xbmc/addons/visualization.projectm/*
-%{_datadir}/xbmc/addons/visualization.waveform/*
-%{_datadir}/xbmc/addons/weather.wunderground/*
-%{_datadir}/xbmc/addons/webinterface.default/*
-%{_datadir}/xbmc/addons/xbmc.addon/*
-%{_datadir}/xbmc/addons/xbmc.core/*
-%{_datadir}/xbmc/addons/xbmc.gui/*
-%{_datadir}/xbmc/addons/xbmc.json/*
-%{_datadir}/xbmc/addons/xbmc.metadata/*
-%{_datadir}/xbmc/addons/xbmc.pvr/*
-%{_datadir}/xbmc/addons/xbmc.python/*
-%{_datadir}/xbmc/addons/pvr.argustv/*
-%{_datadir}/xbmc/addons/pvr.demo/*
-%{_datadir}/xbmc/addons/pvr.dvbviewer/*
-%{_datadir}/xbmc/addons/pvr.hts/*
-%{_datadir}/xbmc/addons/pvr.iptvsimple/*
-%{_datadir}/xbmc/addons/pvr.mediaportal.tvserver/*
-%{_datadir}/xbmc/addons/pvr.mythtv.cmyth/*
-%{_datadir}/xbmc/addons/pvr.nextpvr/*
-%{_datadir}/xbmc/addons/pvr.njoy/*
-%{_datadir}/xbmc/addons/pvr.vdr.vnsi/*
-%{_datadir}/xbmc/addons/pvr.vuplus/*
-%{_datadir}/xbmc/addons/pvr.wmc/*
%{_datadir}/xbmc/language/*
%{_datadir}/xbmc/media/*
%{_datadir}/xbmc/sounds/*
%{_datadir}/xbmc/system/*
%{_datadir}/xbmc/userdata/*
+%{_mandir}/man1/xbmc.1.gz
+%{_mandir}/man1/xbmc-standalone.1.gz
+%{_xbmc_addons_dir}/xbmc.codec/addon.xml
+%{_xbmc_addons_dir}/metadata.album.universal/*
+%{_xbmc_addons_dir}/metadata.artists.universal/*
+%{_xbmc_addons_dir}/metadata.common.allmusic.com/*
+%{_xbmc_addons_dir}/metadata.common.amazon.de/*
+%{_xbmc_addons_dir}/metadata.common.fanart.tv/*
+%{_xbmc_addons_dir}/metadata.common.hdtrailers.net/*
+%{_xbmc_addons_dir}/metadata.common.htbackdrops.com/*
+%{_xbmc_addons_dir}/metadata.common.imdb.com/*
+%{_xbmc_addons_dir}/metadata.common.last.fm/*
+%{_xbmc_addons_dir}/metadata.common.musicbrainz.org/*
+%{_xbmc_addons_dir}/metadata.common.theaudiodb.com/*
+%{_xbmc_addons_dir}/metadata.common.themoviedb.org/*
+%{_xbmc_addons_dir}/metadata.local/*
+%{_xbmc_addons_dir}/metadata.musicvideos.theaudiodb.com/*
+%{_xbmc_addons_dir}/metadata.themoviedb.org/*
+%{_xbmc_addons_dir}/metadata.tvdb.com/*
+%{_xbmc_addons_dir}/repository.xbmc.org/*
+%{_xbmc_addons_dir}/screensaver.rsxs.euphoria/*
+%{_xbmc_addons_dir}/screensaver.rsxs.plasma/*
+%{_xbmc_addons_dir}/screensaver.rsxs.solarwinds/*
+%{_xbmc_addons_dir}/screensaver.xbmc.builtin.black/*
+%{_xbmc_addons_dir}/screensaver.xbmc.builtin.dim/*
+%{_xbmc_addons_dir}/script.module.pil/*
+%{_xbmc_addons_dir}/service.xbmc.versioncheck/*
+%{_xbmc_addons_dir}/skin.confluence/*
+%{_xbmc_addons_dir}/visualization.fishbmc/*
+%{_xbmc_addons_dir}/visualization.glspectrum/*
+%if %{with enable_opengl}
+%{_xbmc_addons_dir}/visualization.goom/*
+%endif
+%{_xbmc_addons_dir}/visualization.projectm/*
+%{_xbmc_addons_dir}/visualization.vortex/*
+%{_xbmc_addons_dir}/visualization.waveform/*
+%{_xbmc_addons_dir}/webinterface.default/*
+%{_xbmc_addons_dir}/xbmc.addon/*
+%{_xbmc_addons_dir}/xbmc.core/*
+%{_xbmc_addons_dir}/xbmc.debug/*
+%{_xbmc_addons_dir}/xbmc.gui/*
+%{_xbmc_addons_dir}/xbmc.json/*
+%{_xbmc_addons_dir}/xbmc.metadata/*
+%{_xbmc_addons_dir}/xbmc.pvr/*
+%{_xbmc_addons_dir}/xbmc.python/*
+%{_xbmc_addons_dir}/pvr.argustv/*
+%{_xbmc_addons_dir}/pvr.demo/*
+%{_xbmc_addons_dir}/pvr.dvblink/*
+%{_xbmc_addons_dir}/pvr.dvbviewer/*
+%{_xbmc_addons_dir}/pvr.hts/*
+%{_xbmc_addons_dir}/pvr.iptvsimple/*
+%{_xbmc_addons_dir}/pvr.mediaportal.tvserver/*
+%{_xbmc_addons_dir}/pvr.mythtv.cmyth/*
+%{_xbmc_addons_dir}/pvr.nextpvr/*
+%{_xbmc_addons_dir}/pvr.njoy/*
+%{_xbmc_addons_dir}/pvr.vdr.vnsi/*
+%{_xbmc_addons_dir}/pvr.vuplus/*
+%{_xbmc_addons_dir}/pvr.wmc/*
%files devel
%defattr(-,root,root)
-%{_datadir}/xbmc/addons/library.xbmc.addon/dlfcn-win32.cpp
-%{_datadir}/xbmc/addons/library.xbmc.addon/dlfcn-win32.h
-%{_datadir}/xbmc/addons/library.xbmc.gui/libXBMC_gui.h
-%{_datadir}/xbmc/addons/library.xbmc.addon/libXBMC_addon.h
-%{_datadir}/xbmc/addons/library.xbmc.pvr/libXBMC_pvr.h
+%{_includedir}/xbmc/DVDDemuxPacket.h
+%{_includedir}/xbmc/libXBMC_addon.h
+%{_includedir}/xbmc/libXBMC_codec.h
+%{_includedir}/xbmc/libXBMC_gui.h
+%{_includedir}/xbmc/libXBMC_pvr.h
+%{_includedir}/xbmc/xbmc_addon_cpp_dll.h
+%{_includedir}/xbmc/xbmc_addon_dll.h
+%{_includedir}/xbmc/xbmc_addon_types.h
+%{_includedir}/xbmc/xbmc_codec_types.h
+%{_includedir}/xbmc/xbmc_epg_types.h
+%{_includedir}/xbmc/xbmc_pvr_dll.h
+%{_includedir}/xbmc/xbmc_pvr_types.h
+%{_includedir}/xbmc/xbmc_scr_dll.h
+%{_includedir}/xbmc/xbmc_scr_types.h
+%{_includedir}/xbmc/xbmc_stream_utils.hpp
+%{_includedir}/xbmc/xbmc_vis_dll.h
+%{_includedir}/xbmc/xbmc_vis_types.h
+%{_xbmc_addons_dir}/library.xbmc.addon/dlfcn-win32.cpp
+%{_xbmc_addons_dir}/library.xbmc.addon/dlfcn-win32.h
+%{_xbmc_addons_dir}/library.xbmc.addon/libXBMC_addon.h
+%{_xbmc_addons_dir}/library.xbmc.codec/libXBMC_codec.h
+%{_xbmc_addons_dir}/library.xbmc.gui/libXBMC_gui.h
+%{_xbmc_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
%changelog
xbmc.spec
Changed
# Please edit xbmc.spec and xbmc.changes only. *-noX.* files are generated from xbmc.* files with the pre_checkin.sh script
#
+
%define _libtag_ver %(version="`rpm -q --qf '%{VERSION}' libtag-devel`"; echo "$version")
+%define _xbmc_addons_dir %{_datadir}/xbmc/addons
%bcond_without enable_rpi_build
%bcond_without enable_rpi_omxplayer
-Name: xbmc
# xbmc can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
%define noX_build ("%{name}" == "xbmc-noX")
%if %{noX_build}
%bcond_with enable_opengl
%bcond_without enable_opengles
%else
-%ifarch %arm armv6l armv6hl
+%ifarch %{arm} armv6l armv6hl
%bcond_with enable_opengl
%bcond_without enable_opengles
%else
%bcond_with enable_opengles
%endif
%endif
-Version: 12.3
+
+Name: xbmc
+Version: 13.0
Release: 0
Summary: XBMC Media center
License: GPL-2.0+ and GPL-3.0+
Group: Productivity/Multimedia/Video/Players
Url: http://www.xbmc.org/
-Source0: http://mirrors.xbmc.org/releases/source/xbmc-%{version}.tar.gz
-Source1: https://github.com/opdenkamp/xbmc-pvr-addons/archive/frodo.zip
-# PATCH-FIX-UPSTREAM xbmc-12.2-subtitles.patch -- already merged in git rev
-Patch0: xbmc-12.2-subtitles.patch
-# PATCH-FIX-UPSTREAM samba4-fix.patch -- Fix path for libsmbclient.h shipped with samba4 -- already in master git.
-Patch1: samba4-fix.patch
-Patch2: git_rev.patch
-Patch3: pvr-addons-enable-all.patch
+Source0: http://mirrors.xbmc.org/releases/source/xbmc-13.0_r2.tar.gz
+Source1: https://github.com/opdenkamp/xbmc-pvr-addons/archive/13.0-Gotham.tar.gz
+# PATCH-FEATURE-OPENSUSE -- enable external ffmpeg
+Patch0: enable-external-ffmpeg.patch
+# PATCH-FIX-OPENSUSE -- enable all pvr addons
+Patch1: pvr-addons-enable-all.patch
# Raspberry Pi (armv6) only: Fix include path for XBMCTex.cpp:38:25: fatal error: guilib/XBTF.h: No such file or directory
-Patch4: texture.patch
+### FIXME Rebase required!
+Patch2: texture.patch
# omxplayer 3D support is only available for non X11 XBMC
-Patch5: disable_omxplayer_3d_support.patch
+Patch3: disable_omxplayer_3d_support.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: ppc64
%if %{noX_build}
BuildRequires: doxygen
BuildRequires: enca-devel
BuildRequires: fdupes
-BuildRequires: ffmpeg1-devel
+BuildRequires: libffmpeg-devel
BuildRequires: flac-devel
BuildRequires: flex
BuildRequires: fontconfig-devel
BuildRequires: sqlite-devel
BuildRequires: swig
BuildRequires: tinyxml-devel
+BuildRequires: libxml2-devel
+BuildRequires: libxslt-devel
BuildRequires: unzip
+BuildRequires: libgnutls-devel
+BuildRequires: bluez-devel
+BuildRequires: libcap-devel
%if !%{noX_build}
BuildRequires: xorg-x11-devel
%endif
Development files for the XBMC media Center
%prep
-%setup -q -n xbmc-%{version}-Frodo
-%patch0 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4
-%if !%{noX_build}
-%patch5
+%setup -q -n xbmc-%{version}-Gotham_r2
+%patch0
+%patch1
+%ifarch armv6l armv6hl
+%if %{with enable_rpi_build}
+%patch2
+%endif
%endif
-%if 0%{?suse_version} >= 1310
-%patch1 -p0
+%if !%{noX_build}
+%patch3
%endif
-unzip -q %{S:1}
-mv xbmc-pvr-addons-frodo pvr-addons
+tar -xf %{SOURCE1}
+mv xbmc-pvr-addons-13.0-Gotham pvr-addons
pushd pvr-addons
./bootstrap
popd
./bootstrap
%build
-export CPPFLAGS="-I/usr/include/ffmpeg"
-export CFLAGS="%{optflags} -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS"
-export CXXFLAGS="%{optflags} -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS"
-export LDFLAGS="-fPIC"
-export LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS"
-export ASFLAGS=-fPIC
%ifarch armv6l armv6hl
%if %{with enable_rpi_build}
export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
%endif
%endif
%configure \
---enable-libusb \
--enable-airplay \
--enable-external-libraries \
---enable-external-ffmpeg \
+--enable-ffmpeg-libvorbis \
--enable-rtmp \
--enable-libbluray \
--disable-debug \
+--enable-shared \
+--enable-optimizations \
--disable-static \
--enable-libcec \
%if %{with enable_opengl}
make %{?_smp_mflags} VERBOSE=1
%install
-
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
# remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
rm -r %{buildroot}/%{_datadir}/doc/
install -m 644 -D docs/manpages/xbmc-standalone.1 %{buildroot}%{_mandir}/man1/xbmc-standalone.1
install -m 644 -D docs/manpages/xbmc.bin.1 %{buildroot}%{_mandir}/man1/xbmc.1
+# remove win32 source files
+rm -f %{buildroot}%{_xbmc_addons_dir}/library.xbmc.addon/dlfcn-win32.cpp
+rm -f %{buildroot}%{_xbmc_addons_dir}/library.xbmc.addon/dlfcn-win32.h
+
+# remove duplicate header files
+rm -f %{buildroot}%{_xbmc_addons_dir}/library.xbmc.addon/libXBMC_addon.h
+rm -f %{buildroot}%{_xbmc_addons_dir}/library.xbmc.codec/libXBMC_codec.h
+rm -f %{buildroot}%{_xbmc_addons_dir}/library.xbmc.gui/libXBMC_gui.h
+rm -f %{buildroot}%{_xbmc_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
+
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/xbmc.desktop
%files
%defattr(-,root,root)
-%doc copying.txt LICENSE.GPL docs/README.linux
+%doc copying.txt LICENSE.GPL docs/README.linux
%{_bindir}/xbmc
%{_bindir}/xbmc-standalone
%{_libdir}/xbmc
-#%%{_datadir}/xbmc
%{_datadir}/xsessions/XBMC.desktop
%{_datadir}/applications/xbmc.desktop
%{_datadir}/icons/hicolor/*/*/*.png
-%{_mandir}/man1/xbmc-standalone.1.gz
-%{_mandir}/man1/xbmc.1.gz
-
%{_datadir}/xbmc/FEH.py
-%{_datadir}/xbmc/addons/metadata.album.universal/*
-%{_datadir}/xbmc/addons/metadata.artists.universal/*
-%{_datadir}/xbmc/addons/metadata.common.allmusic.com/*
-%{_datadir}/xbmc/addons/metadata.common.amazon.de/*
-%{_datadir}/xbmc/addons/metadata.common.fanart.tv/*
-%{_datadir}/xbmc/addons/metadata.common.hdtrailers.net/*
-%{_datadir}/xbmc/addons/metadata.common.htbackdrops.com/*
-%{_datadir}/xbmc/addons/metadata.common.imdb.com/*
-%{_datadir}/xbmc/addons/metadata.common.last.fm/*
-%{_datadir}/xbmc/addons/metadata.common.musicbrainz.org/*
-%{_datadir}/xbmc/addons/metadata.common.theaudiodb.com/*
-%{_datadir}/xbmc/addons/metadata.common.themoviedb.org/*
-%{_datadir}/xbmc/addons/metadata.musicvideos.theaudiodb.com/*
-%{_datadir}/xbmc/addons/metadata.themoviedb.org/*
-%{_datadir}/xbmc/addons/metadata.tvdb.com/*
-%{_datadir}/xbmc/addons/repository.pvr-android.xbmc.org/*
-%{_datadir}/xbmc/addons/repository.pvr-ios.xbmc.org/*
-%{_datadir}/xbmc/addons/repository.pvr-osx32.xbmc.org/*
-%{_datadir}/xbmc/addons/repository.pvr-osx64.xbmc.org/*
-%{_datadir}/xbmc/addons/repository.pvr-win32.xbmc.org/*
-%{_datadir}/xbmc/addons/repository.xbmc.org/*
-%{_datadir}/xbmc/addons/screensaver.rsxs.euphoria/*
-%{_datadir}/xbmc/addons/screensaver.rsxs.plasma/*
-%{_datadir}/xbmc/addons/screensaver.rsxs.solarwinds/*
-%{_datadir}/xbmc/addons/screensaver.xbmc.builtin.black/*
-%{_datadir}/xbmc/addons/screensaver.xbmc.builtin.dim/*
-%{_datadir}/xbmc/addons/script.module.pil/*
-%{_datadir}/xbmc/addons/skin.confluence/*
-%{_datadir}/xbmc/addons/visualization.dxspectrum/*
-%{_datadir}/xbmc/addons/visualization.glspectrum/*
-%if %{with enable_opengl}
-%{_datadir}/xbmc/addons/visualization.goom/*
-%endif
-%{_datadir}/xbmc/addons/visualization.milkdrop/*
-%{_datadir}/xbmc/addons/visualization.projectm/*
-%{_datadir}/xbmc/addons/visualization.waveform/*
-%{_datadir}/xbmc/addons/weather.wunderground/*
-%{_datadir}/xbmc/addons/webinterface.default/*
-%{_datadir}/xbmc/addons/xbmc.addon/*
-%{_datadir}/xbmc/addons/xbmc.core/*
-%{_datadir}/xbmc/addons/xbmc.gui/*
-%{_datadir}/xbmc/addons/xbmc.json/*
-%{_datadir}/xbmc/addons/xbmc.metadata/*
-%{_datadir}/xbmc/addons/xbmc.pvr/*
-%{_datadir}/xbmc/addons/xbmc.python/*
-%{_datadir}/xbmc/addons/pvr.argustv/*
-%{_datadir}/xbmc/addons/pvr.demo/*
-%{_datadir}/xbmc/addons/pvr.dvbviewer/*
-%{_datadir}/xbmc/addons/pvr.hts/*
-%{_datadir}/xbmc/addons/pvr.iptvsimple/*
-%{_datadir}/xbmc/addons/pvr.mediaportal.tvserver/*
-%{_datadir}/xbmc/addons/pvr.mythtv.cmyth/*
-%{_datadir}/xbmc/addons/pvr.nextpvr/*
-%{_datadir}/xbmc/addons/pvr.njoy/*
-%{_datadir}/xbmc/addons/pvr.vdr.vnsi/*
-%{_datadir}/xbmc/addons/pvr.vuplus/*
-%{_datadir}/xbmc/addons/pvr.wmc/*
%{_datadir}/xbmc/language/*
%{_datadir}/xbmc/media/*
%{_datadir}/xbmc/sounds/*
%{_datadir}/xbmc/system/*
%{_datadir}/xbmc/userdata/*
+%{_mandir}/man1/xbmc.1.gz
+%{_mandir}/man1/xbmc-standalone.1.gz
+%{_xbmc_addons_dir}/xbmc.codec/addon.xml
+%{_xbmc_addons_dir}/metadata.album.universal/*
+%{_xbmc_addons_dir}/metadata.artists.universal/*
+%{_xbmc_addons_dir}/metadata.common.allmusic.com/*
+%{_xbmc_addons_dir}/metadata.common.amazon.de/*
+%{_xbmc_addons_dir}/metadata.common.fanart.tv/*
+%{_xbmc_addons_dir}/metadata.common.hdtrailers.net/*
+%{_xbmc_addons_dir}/metadata.common.htbackdrops.com/*
+%{_xbmc_addons_dir}/metadata.common.imdb.com/*
+%{_xbmc_addons_dir}/metadata.common.last.fm/*
+%{_xbmc_addons_dir}/metadata.common.musicbrainz.org/*
+%{_xbmc_addons_dir}/metadata.common.theaudiodb.com/*
+%{_xbmc_addons_dir}/metadata.common.themoviedb.org/*
+%{_xbmc_addons_dir}/metadata.local/*
+%{_xbmc_addons_dir}/metadata.musicvideos.theaudiodb.com/*
+%{_xbmc_addons_dir}/metadata.themoviedb.org/*
+%{_xbmc_addons_dir}/metadata.tvdb.com/*
+%{_xbmc_addons_dir}/repository.xbmc.org/*
+%{_xbmc_addons_dir}/screensaver.rsxs.euphoria/*
+%{_xbmc_addons_dir}/screensaver.rsxs.plasma/*
+%{_xbmc_addons_dir}/screensaver.rsxs.solarwinds/*
+%{_xbmc_addons_dir}/screensaver.xbmc.builtin.black/*
+%{_xbmc_addons_dir}/screensaver.xbmc.builtin.dim/*
+%{_xbmc_addons_dir}/script.module.pil/*
+%{_xbmc_addons_dir}/service.xbmc.versioncheck/*
+%{_xbmc_addons_dir}/skin.confluence/*
+%{_xbmc_addons_dir}/visualization.fishbmc/*
+%{_xbmc_addons_dir}/visualization.glspectrum/*
+%if %{with enable_opengl}
+%{_xbmc_addons_dir}/visualization.goom/*
+%endif
+%{_xbmc_addons_dir}/visualization.projectm/*
+%{_xbmc_addons_dir}/visualization.vortex/*
+%{_xbmc_addons_dir}/visualization.waveform/*
+%{_xbmc_addons_dir}/webinterface.default/*
+%{_xbmc_addons_dir}/xbmc.addon/*
+%{_xbmc_addons_dir}/xbmc.core/*
+%{_xbmc_addons_dir}/xbmc.debug/*
+%{_xbmc_addons_dir}/xbmc.gui/*
+%{_xbmc_addons_dir}/xbmc.json/*
+%{_xbmc_addons_dir}/xbmc.metadata/*
+%{_xbmc_addons_dir}/xbmc.pvr/*
+%{_xbmc_addons_dir}/xbmc.python/*
+%{_xbmc_addons_dir}/pvr.argustv/*
+%{_xbmc_addons_dir}/pvr.demo/*
+%{_xbmc_addons_dir}/pvr.dvblink/*
+%{_xbmc_addons_dir}/pvr.dvbviewer/*
+%{_xbmc_addons_dir}/pvr.hts/*
+%{_xbmc_addons_dir}/pvr.iptvsimple/*
+%{_xbmc_addons_dir}/pvr.mediaportal.tvserver/*
+%{_xbmc_addons_dir}/pvr.mythtv.cmyth/*
+%{_xbmc_addons_dir}/pvr.nextpvr/*
+%{_xbmc_addons_dir}/pvr.njoy/*
+%{_xbmc_addons_dir}/pvr.vdr.vnsi/*
+%{_xbmc_addons_dir}/pvr.vuplus/*
+%{_xbmc_addons_dir}/pvr.wmc/*
%files devel
%defattr(-,root,root)
-%{_datadir}/xbmc/addons/library.xbmc.addon/dlfcn-win32.cpp
-%{_datadir}/xbmc/addons/library.xbmc.addon/dlfcn-win32.h
-%{_datadir}/xbmc/addons/library.xbmc.gui/libXBMC_gui.h
-%{_datadir}/xbmc/addons/library.xbmc.addon/libXBMC_addon.h
-%{_datadir}/xbmc/addons/library.xbmc.pvr/libXBMC_pvr.h
+%{_includedir}/xbmc/DVDDemuxPacket.h
+%{_includedir}/xbmc/libXBMC_addon.h
+%{_includedir}/xbmc/libXBMC_codec.h
+%{_includedir}/xbmc/libXBMC_gui.h
+%{_includedir}/xbmc/libXBMC_pvr.h
+%{_includedir}/xbmc/xbmc_addon_cpp_dll.h
+%{_includedir}/xbmc/xbmc_addon_dll.h
+%{_includedir}/xbmc/xbmc_addon_types.h
+%{_includedir}/xbmc/xbmc_codec_types.h
+%{_includedir}/xbmc/xbmc_epg_types.h
+%{_includedir}/xbmc/xbmc_pvr_dll.h
+%{_includedir}/xbmc/xbmc_pvr_types.h
+%{_includedir}/xbmc/xbmc_scr_dll.h
+%{_includedir}/xbmc/xbmc_scr_types.h
+%{_includedir}/xbmc/xbmc_stream_utils.hpp
+%{_includedir}/xbmc/xbmc_vis_dll.h
+%{_includedir}/xbmc/xbmc_vis_types.h
%changelog
disable_omxplayer_3d_support.patch
Changed
---- ./xbmc/cores/omxplayer/OMXPlayerVideo.cpp.orig 2013-10-02 20:25:58.342026870 +0200
-+++ ./xbmc/cores/omxplayer/OMXPlayerVideo.cpp 2013-10-02 20:26:53.703458220 +0200
-@@ -765,6 +765,7 @@ void OMXPlayerVideo::ResolutionUpdateCal
- m_bAllowFullscreen = false; // only allow on first configure
- }
+Index: xbmc/cores/omxplayer/OMXPlayerVideo.cpp
+===================================================================
+--- xbmc/cores/omxplayer/OMXPlayerVideo.cpp.orig
++++ xbmc/cores/omxplayer/OMXPlayerVideo.cpp
+@@ -721,6 +721,7 @@ void OMXPlayerVideo::ResolutionUpdateCal
+
+ flags |= GetStereoModeFlags(GetStereoMode());
+ #if 0
- if(m_flags & CONF_FLAGS_FORMAT_SBS)
+ if(flags & CONF_FLAGS_STEREO_MODE_SBS)
{
if(g_Windowing.Support3D(video_width, video_height, D3DPRESENTFLAG_MODE3DSBS))
-@@ -781,6 +782,7 @@ void OMXPlayerVideo::ResolutionUpdateCal
- flags |= CONF_FLAGS_FORMAT_TB;
- }
- }
-+#endif
+@@ -744,6 +745,7 @@ void OMXPlayerVideo::ResolutionUpdateCal
+ else
+ CLog::Log(LOGNOTICE, "not a 3D movie");
++ #endif
unsigned int iDisplayWidth = width;
unsigned int iDisplayHeight = height;
+
enable-external-ffmpeg.patch
Added
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
+@@ -600,7 +600,7 @@ PKG_PROG_PKG_CONFIG
+ MAKE="${MAKE:-make}"
+ OBJDUMP="${OBJDUMP:-objdump}"
+
+-use_external_ffmpeg=no
++use_external_ffmpeg=yes
+ use_static_ffmpeg=no
+
+ # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
+@@ -632,7 +632,7 @@ case $host in
+ use_arch="x86"
+ use_cpu="i686"
+ fi
+- use_static_ffmpeg=yes
++ use_static_ffmpeg=no
+ ;;
+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
+ ARCH="x86_64-linux"
+@@ -640,7 +640,7 @@ case $host in
+ use_arch="x86_64"
+ use_cpu="x86_64"
+ fi
+- use_static_ffmpeg=yes
++ use_static_ffmpeg=no
+ ;;
+ i386-*-freebsd*)
+ ARCH="x86-freebsd"
+@@ -696,7 +696,7 @@ case $host in
+ use_sdl=no
+ use_x11=no
+ use_wayland=no
+- use_static_ffmpeg=yes
++ use_static_ffmpeg=no
+ ;;
+ arm*-*linux-android*)
+ target_platform=target_android
+Index: lib/DllAvCodec.h
+===================================================================
+--- lib/DllAvCodec.h.orig
++++ lib/DllAvCodec.h
+@@ -43,6 +43,7 @@ extern "C" {
+
+ #if (defined USE_EXTERNAL_FFMPEG)
+ #include <libavcodec/avcodec.h>
++ #include <libavutil/frame.h>
+ #else
+ #include "libavcodec/avcodec.h"
+ #endif
+Index: lib/DllAvUtil.h
+===================================================================
+--- lib/DllAvUtil.h.orig
++++ lib/DllAvUtil.h
+@@ -31,33 +31,19 @@
+ #endif
+
+ extern "C" {
+-#if (defined USE_EXTERNAL_FFMPEG)
+- #include <libavutil/avutil.h>
+- // for av_get_default_channel_layout
+- #include <libavutil/audioconvert.h>
+- #include <libavutil/crc.h>
+- #include <libavutil/fifo.h>
+- // for LIBAVCODEC_VERSION_INT:
+- #include <libavcodec/avcodec.h>
+- // for enum AVSampleFormat
+- #include <libavutil/samplefmt.h>
+- #include <libavutil/opt.h>
+- #include <libavutil/mem.h>
+- #include <libavutil/mathematics.h>
+- #if (defined USE_LIBAV_HACKS)
+- #include "xbmc-libav-hacks/libav_hacks.h"
+- #endif
+-#else
+- #include "libavutil/avutil.h"
+- //for av_get_default_channel_layout
+- #include "libavutil/audioconvert.h"
+- #include "libavutil/crc.h"
+- #include "libavutil/opt.h"
+- #include "libavutil/mem.h"
+- #include "libavutil/fifo.h"
+- // for enum AVSampleFormat
+- #include "libavutil/samplefmt.h"
+-#endif
++#include <libavutil/avutil.h>
++#include <libavutil/frame.h>
++// for av_get_default_channel_layout
++#include <libavutil/audioconvert.h>
++#include <libavutil/crc.h>
++#include <libavutil/fifo.h>
++// for LIBAVCODEC_VERSION_INT:
++#include <libavcodec/avcodec.h>
++// for enum AVSampleFormat
++#include <libavutil/samplefmt.h>
++#include <libavutil/opt.h>
++#include <libavutil/mem.h>
++#include <libavutil/mathematics.h>
+ }
+
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,29,100)
git_rev.patch
Deleted
---- configure.in 2013-05-03 08:57:40.000000000 +0300
-+++ configure.in.gitrev 2013-09-14 20:48:46.869716968 +0300
-@@ -2113,6 +2113,10 @@
- if test "$GIT_REV" = ""; then
- GIT_REV="Unknown"
- fi
-+if test -e VERSION; then
-+ FULL_GIT_REV=$(cat VERSION | tail -1 )
-+ GIT_REV=${FULL_GIT_REV:0:7}
-+fi
- if test "$host_vendor" = "apple"; then
- echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h
- else
pvr-addons-enable-all.patch
Changed
---- configure.in 2013-05-03 08:57:40.000000000 +0300
-+++ configure.in.pvr-addons 2013-09-16 09:38:01.238313554 +0300
-@@ -2745,6 +2745,7 @@
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
+@@ -2991,6 +2991,7 @@ XB_CONFIG_MODULE([pvr-addons], [
--host=$host_alias \
--build=$build_alias \
--target=$target_alias \
+ --enable-addons-with-dependencies \
- $PVR_EXT_FFMPEG \
CC="$CC" \
CXX="$CXX" \
+ CFLAGS="$CFLAGS" \
samba4-fix.patch
Deleted
-Index: xbmc/filesystem/SMBDirectory.cpp
-===================================================================
---- xbmc/filesystem/SMBDirectory.cpp.orig
-+++ xbmc/filesystem/SMBDirectory.cpp
-@@ -44,7 +44,7 @@
- #include "threads/SingleLock.h"
- #include "PasswordManager.h"
-
--#include <libsmbclient.h>
-+#include <samba-4.0/libsmbclient.h>
-
- #if defined(TARGET_DARWIN)
- #define XBMC_SMB_MOUNT_PATH "Library/Application Support/XBMC/Mounts/"
-Index: xbmc/filesystem/SmbFile.cpp
-===================================================================
---- xbmc/filesystem/SmbFile.cpp.orig
-+++ xbmc/filesystem/SmbFile.cpp
-@@ -27,7 +27,7 @@
- #include "PasswordManager.h"
- #include "SMBDirectory.h"
- #include "Util.h"
--#include <libsmbclient.h>
-+#include <samba-4.0/libsmbclient.h>
- #include "settings/AdvancedSettings.h"
- #include "settings/GUISettings.h"
- #include "threads/SingleLock.h"
xbmc-12.2-subtitles.patch
Deleted
---- a/lib/DllAvCodec.h 2013-05-02 16:46:47.000000000 +0200
-+++ b/lib/DllAvCodec.h 2013-05-16 02:01:26.940819415 +0200
-@@ -63,6 +63,12 @@
- #endif
- }
-
-+#if LIBAVCODEC_VERSION_MICRO >= 100
-+ #define LIBAVCODEC_FROM_FFMPEG
-+#else
-+ #define LIBAVCODEC_FROM_LIBAV
-+#endif
-+
- #include "threads/SingleLock.h"
-
- class DllAvCodecInterface
---- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp 2013-05-02 16:46:47.000000000 +0200
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp 2013-05-16 02:05:08.899391141 +0200
-@@ -26,7 +26,9 @@
- #include "Audio/DVDAudioCodec.h"
- #include "Overlay/DVDOverlayCodec.h"
-
-+#if defined(HAVE_LIBVDADECODER)
- #include "Video/DVDVideoCodecVDA.h"
-+#endif
- #if defined(HAVE_VIDEOTOOLBOXDECODER)
- #include "Video/DVDVideoCodecVideoToolBox.h"
- #endif
-@@ -346,6 +348,12 @@
- switch (hint.codec)
- {
- case CODEC_ID_TEXT:
-+#if defined(LIBAVCODEC_FROM_FFMPEG) && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,53,100)
-+ // API changed in:
-+ // ffmpeg: commit 2626cc4580bfd560c6983338d77b2c11c16af94f (11 Aug 2012)
-+ // release 1.0 (28 Sept 2012)
-+ case AV_CODEC_ID_SUBRIP:
-+#endif
- pCodec = OpenCodec(new CDVDOverlayCodecText(), hint, options);
- if( pCodec ) return pCodec;
- break;
---- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp 2013-05-02 16:46:47.000000000 +0200
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp 2013-05-16 02:07:43.197469670 +0200
-@@ -44,6 +44,13 @@
- m_bIsSSA = (hints.codec == CODEC_ID_SSA);
- if(hints.codec == CODEC_ID_TEXT || hints.codec == CODEC_ID_SSA)
- return true;
-+#if defined(LIBAVCODEC_FROM_FFMPEG) && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,53,100)
-+ // API changed in:
-+ // ffmpeg: commit 2626cc4580bfd560c6983338d77b2c11c16af94f (11 Aug 2012)
-+ // release 1.0 (28 Sept 2012)
-+ if(hints.codec == AV_CODEC_ID_SUBRIP)
-+ return true;
-+#endif
- return false;
- }
-
---- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h 2013-05-02 16:46:47.000000000 +0200
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h 2013-05-16 02:08:34.419827631 +0200
-@@ -21,6 +21,7 @@
- */
-
- #include "DVDOverlayCodec.h"
-+#include "DllAvCodec.h"
-
- class CDVDOverlayText;
-
Request History
Fisiu created request almost 11 years ago
- Update to 13.0 Gotham:
* Dramatic Audio Engine Improvements
* Improved UPnP capabilities
* Settings Improvements
* Making Subtitle Search Better
* Stereoscopic 3D Rendering
* Raspberry Pi and Android speed improvements
* An Extended Python and JSON-RPC API for developers
* Many minor fixes and improvements
- Add enable-external-ffmpeg.patch: build again system ffmpeg.
- Drop xbmc-12.2-subtitles.patch: fixed upstream.
- Drop samba4-fix.patch: fixed upstream.
- Drop git_rev.patch: fixed upstream.
mrdocs accepted request almost 11 years ago
Please add a comment
mrdocs wrote almost 11 years ago
ok, Thanks