rpms/ufoai/F-17 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 ufoai.spec, 1.11, 1.12
by Karel Volný
Author: kvolny
Update of /cvs/nonfree/rpms/ufoai/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21221
Modified Files:
.cvsignore sources ufoai.spec
Log Message:
* Fri Jun 29 2012 Karel Volny <kvolny(a)redhat.com> 2.4-1
- Version bump
- Changelog: http://ufoai.org/wiki/index.php/Changelog/2.4
- Fixed duplicate packaging of md2tag_export.py
- Added ufoslicer to -tools
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/F-17/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 14 Mar 2011 14:13:50 -0000 1.4
+++ .cvsignore 1 Jul 2012 14:48:30 -0000 1.5
@@ -1 +1 @@
-ufoai-2.3.1-source.tar.bz2
+ufoai-2.4-source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/F-17/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 14 Mar 2011 14:13:51 -0000 1.4
+++ sources 1 Jul 2012 14:48:30 -0000 1.5
@@ -1 +1 @@
-87b3e1bf3439dc6e5413936034f47d17 ufoai-2.3.1-source.tar.bz2
+d7e88aee0ea94149c8b9d90eb6c21ba9 ufoai-2.4-source.tar.bz2
Index: ufoai.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/F-17/ufoai.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ufoai.spec 15 May 2012 22:35:52 -0000 1.11
+++ ufoai.spec 1 Jul 2012 14:48:30 -0000 1.12
@@ -1,6 +1,6 @@
Name: ufoai
-Version: 2.3.1
-Release: 5%{?dist}
+Version: 2.4
+Release: 1%{?dist}
Summary: UFO: Alien Invasion
Group: Amusements/Games
@@ -9,13 +9,7 @@
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.tar.bz2
Source1: %{name}-wrapper.sh
Source2: uforadiant-wrapper.sh
-Patch0: ufoai-2.3-no-lua.patch
-Patch1: ufoai-2.3-radiant-ldl.patch
-Patch2: ufoai-2.3-desktop-files.patch
-Patch3: ufoai-2.3.1-radiant-apppath.patch
-Patch4: ufoai-2.3.1-zpng.patch
-Patch5: ufoai-2.3.1-gcc47.patch
-Patch6: ufoai-2.3.1-glib.patch
+Patch0: ufoai-2.3-desktop-files.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -120,30 +114,35 @@
%prep
%setup -q -n %{name}-%{version}-source
-# ufoai-2.3-no-lua.patch - disable bundled lua
-%patch0 -p0
-# ufoai-2.3-radiant-ldl.patch - add 'ldl' to RADIANT_LIBS
-# need to use fuzz, the Makefile has changed since 2.3
-%patch1 -F2 -p0
# ufoai-2.3-desktop-files.patch - fix executable and icon names
-%patch2 -p0
-# ufoai-2.3.1-radiant-apppath.patch - fix test for appPath
-%patch3 -p0
-## we do not like "arch-dependent-file" in /usr/share
-# change the target for the library
-sed -i -e "s/base/./" build/game.mk
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1 -b .glib
+%patch0 -p0
+# maps and models are in ufoai-data package, do not try to build them
+sed -i -e "/maps.mk/d" Makefile
+sed -i -e "/models.mk/d" Makefile
+# we don't use any of the installers
+sed -i -e "/install.mk/d" Makefile
%build
-%configure --enable-release
+# don't use %%configure, UFOAI doesn't like default configure options
+./configure \
+ --disable-dependency-tracking \
+ --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --datadir=%{_datadir}/%{name} \
+ --libdir=%{_libdir}/%{name} \
+ --localedir=%{_datarootdir}/locale \
+ --enable-ufoded \
+ --enable-uforadiant \
+ --enable-ufo2map \
+ --enable-ufomodel \
+ --enable-release
+
make %{?_smp_mflags}
make %{?_smp_mflags} lang
# build documentation
-make %{?_smp_mflags} pdf-manual
+make %{?_smp_mflags} manual
# build uforadiant
make %{?_smp_mflags} uforadiant
@@ -166,12 +165,11 @@
desktop-file-install --dir=%{buildroot}%{_datadir}/applications debian/ufoai.desktop
## install common
-install -D -m 0755 game.so %{buildroot}%{_libdir}/%{name}/game.so
+install -D -m 0755 base/game.so %{buildroot}%{_libdir}/%{name}/game.so
## install doc
mkdir -p -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}
-cp -pr README COPYING src/docs/tex/*.pdf \
- %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr README COPYING src/docs/tex/*.pdf %{buildroot}%{_docdir}/%{name}-%{version}/
## install server
install -D -m 0755 ufoded %{buildroot}%{_bindir}
@@ -183,6 +181,7 @@
install -D -m 0755 ufo2map %{buildroot}%{_bindir}
install -D -m 0644 debian/ufo2map.6 %{buildroot}%{_mandir}/man6/ufo2map.6
install -D -m 0755 ufomodel %{buildroot}%{_bindir}
+install -D -m 0755 ufoslicer %{buildroot}%{_bindir}
install -D src/tools/blender/md2tag_export.py %{buildroot}%{_datadir}/%{name}/tools/md2tag_export.py
# not available in our sources
#install -D -m 0644 contrib/scripts/bashcompletion/ufo2map %%{buildroot}%%{_sysconfdir}/bash_completion.d/ufo2map
@@ -192,12 +191,11 @@
install -D -m 0755 radiant/uforadiant %{buildroot}%{_bindir}/uforadiant
install -p -m 0755 %{SOURCE2} %{buildroot}%{_bindir}
install -D -m 0644 debian/uforadiant.6 %{buildroot}%{_mandir}/man6/uforadiant.6
-install -D -m 0755 radiant/plugins/brushexport.so %{buildroot}%{_libdir}/uforadiant/brushexport.so
mkdir -p -m 0755 %{buildroot}%{_datadir}/%{name}/radiant
+cp -p radiant/*.xml %{buildroot}%{_datadir}/%{name}/radiant/
+cp -p radiant/mapdef.template %{buildroot}%{_datadir}/%{name}/radiant/
cp -pr radiant/bitmaps %{buildroot}%{_datadir}/%{name}/radiant
-cp -pr radiant/games %{buildroot}%{_datadir}/%{name}/radiant
cp -pr radiant/prefabs %{buildroot}%{_datadir}/%{name}/radiant
-cp -pr radiant/shaders %{buildroot}%{_datadir}/%{name}/radiant
cp -pr radiant/sourceviewer %{buildroot}%{_datadir}/%{name}/radiant
cp -pr radiant/i18n/* %{buildroot}%{_datadir}/locale/
%find_lang uforadiant
@@ -290,6 +288,7 @@
%defattr(-,root,root,-)
%{_bindir}/ufo2map
%{_bindir}/ufomodel
+%{_bindir}/ufoslicer
%dir %{_datadir}/%{name}/
# not available in our sources
#%%{_sysconfdir}/bash_completion.d/
@@ -304,12 +303,16 @@
%{_datadir}/applications/uforadiant.desktop
%{_datadir}/icons/hicolor/32x32/apps/uforadiant.xpm
%{_datadir}/%{name}/radiant/
-%{_libdir}/uforadiant/
%doc %{_mandir}/man6/uforadiant.6*
-%{_datadir}/%{name}/tools/md2tag_export.py
%changelog
+* Fri Jun 29 2012 Karel Volny <kvolny(a)redhat.com> 2.4-1
+- Version bump
+- Changelog: http://ufoai.org/wiki/index.php/Changelog/2.4
+- Fixed duplicate packaging of md2tag_export.py
+- Added ufoslicer to -tools
+
* Tue May 15 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-5
- Fix FTBFS
11 years, 10 months
- 1
- 0
rpms/ufoai-data/F-17 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 ufoai-data.spec, 1.5, 1.6
by Karel Volný
Author: kvolny
Update of /cvs/nonfree/rpms/ufoai-data/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18518
Modified Files:
.cvsignore sources ufoai-data.spec
Log Message:
* Fri Jun 29 2012 Karel Volny <kvolny(a)redhat.com> 2.4-1
- Version bump
- Added introductory video
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/F-17/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 12 Mar 2011 16:21:59 -0000 1.4
+++ .cvsignore 1 Jul 2012 13:57:29 -0000 1.5
@@ -1,2 +1,3 @@
-ufoai-2.3.1-data.tar
+ufoai-2.4-data.tar
+intro.ogm
1maps.pk3
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/F-17/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 12 Mar 2011 16:21:59 -0000 1.4
+++ sources 1 Jul 2012 13:57:29 -0000 1.5
@@ -1,2 +1,3 @@
-11468144bc00618c38667eec04b12a4a ufoai-2.3.1-data.tar
+4f3f343754a4aae401582021901c4737 ufoai-2.4-data.tar
+692737788043d2fc049b060393f17b7a intro.ogm
0187f2169401d59423c6e01184fff90d 1maps.pk3
Index: ufoai-data.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/F-17/ufoai-data.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ufoai-data.spec 8 Feb 2012 23:50:09 -0000 1.5
+++ ufoai-data.spec 1 Jul 2012 13:57:29 -0000 1.6
@@ -1,16 +1,19 @@
%define game_name ufoai
Name: ufoai-data
-Version: 2.3.1
-Release: 2
+Version: 2.4
+Release: 1
Summary: UFO: Alien Invasion data files
Group: Amusements/Games
License: GPLv2+
URL: http://ufoai.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{game_name}/%{game_name}-%{version}-dat...
+# not included in the package, downloaded from
+# http://ufoai.git.sourceforge.net/git/gitweb.cgi?p=ufoai/ufoai;a=blob;f=ba...
+Source1: intro.ogm
# city maps hotfix
-Source1: http://mattn.ninex.info/1maps.pk3
+Source2: http://mattn.ninex.info/1maps.pk3
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -46,8 +49,11 @@
rm -rf %{buildroot}
mkdir -p -m 0755 %{buildroot}%{_datadir}/%{game_name}
cp -pr base %{buildroot}%{_datadir}/%{game_name}/
+# introductory video not in data pack
+mkdir -p -m 0755 %{buildroot}%{_datadir}/%{game_name}/base/videos/
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{game_name}/base/videos/
# city maps hotfix
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{game_name}/base/
+install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/%{game_name}/base/
%clean
@@ -63,6 +69,8 @@
%{_datadir}/%{game_name}/base/0pics.pk3
%{_datadir}/%{game_name}/base/0snd.pk3
%{_datadir}/%{game_name}/base/0shaders.pk3
+%{_datadir}/%{game_name}/base/0textures.pk3
+%{_datadir}/%{game_name}/base/videos/
%files server
@@ -77,6 +85,10 @@
%changelog
+* Fri Jun 29 2012 Karel Volny <kvolny(a)redhat.com> 2.4-1
+- Version bump
+- Added introductory video
+
* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
11 years, 10 months
- 1
- 0
rpms/xbmc/EL-6 xbmc-11.0-tsp-Eden-pvr.patch, 1.1, 1.2 xbmc.spec, 1.46, 1.47
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/xbmc/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5943
Modified Files:
xbmc-11.0-tsp-Eden-pvr.patch xbmc.spec
Log Message:
* Sun Jul 01 2012 Ken Dreyer <ktdreyer@ktdreyer..com> - 11.0-7
- Set up with_* conditionals for optional dependencies
- Disable hdhomerun and crystalhd for EPEL (#2339)
xbmc-11.0-tsp-Eden-pvr.patch:
/dev/null |binary
addons/skin.confluence/language/Portuguese | 3
b/.gitattributes | 1
b/.gitignore | 56
b/Makefile.in | 60
b/XBMC-ATV2.xcodeproj/project.pbxproj |binary
b/XBMC-IOS.xcodeproj/project.pbxproj |binary
b/XBMC.xcodeproj/project.pbxproj |binary
b/addons/library.xbmc.addon/dlfcn-win32.cpp | 263
b/addons/library.xbmc.addon/dlfcn-win32.h | 46
b/addons/library.xbmc.addon/libXBMC_addon.h | 192
b/addons/library.xbmc.gui/libXBMC_gui.h | 352
b/addons/library.xbmc.pvr/libXBMC_pvr.h | 170
b/addons/pvr.demo/addon.xml | 19
b/addons/pvr.hts/addon.xml | 22
b/addons/pvr.hts/icon.png |binary
b/addons/pvr.hts/pthreadVC2.dll |binary
b/addons/pvr.hts/pthreadVC2d.dll |binary
b/addons/pvr.hts/resources/language/Dutch/strings.xml | 15
b/addons/pvr.hts/resources/language/English/strings.xml | 15
b/addons/pvr.hts/resources/language/Finnish/strings.xml | 15
b/addons/pvr.hts/resources/language/German/strings.xml | 16
b/addons/pvr.hts/resources/settings.xml | 10
b/addons/pvr.mythtv.cmyth/Thumbs.db |binary
b/addons/pvr.mythtv.cmyth/addon.xml | 23
b/addons/pvr.mythtv.cmyth/icon.png |binary
b/addons/pvr.mythtv.cmyth/pthreadVC2.dll |binary
b/addons/pvr.mythtv.cmyth/pthreadVC2d.dll |binary
b/addons/pvr.mythtv.cmyth/resources/language/Danish/strings.xml | 11
b/addons/pvr.mythtv.cmyth/resources/language/English/strings.xml | 18
b/addons/pvr.mythtv.cmyth/resources/language/German/strings.xml | 14
b/addons/pvr.mythtv.cmyth/resources/settings.xml | 14
b/addons/pvr.mythtv.cmyth/resources/skins/skin.confluence/720p/DialogRecordingRulesSettings.xml | 155
b/addons/pvr.mythtv.cmyth/resources/skins/skin.confluence/720p/RecordingRules.xml | 339
b/addons/pvr.mythtv/addon.xml | 23
b/addons/pvr.mythtv/icon.png |binary
b/addons/pvr.mythtv/resources/language/English/strings.xml | 7
b/addons/pvr.mythtv/resources/language/Finnish/strings.xml | 6
b/addons/pvr.mythtv/resources/language/German/strings.xml | 7
b/addons/pvr.mythtv/resources/settings.xml | 6
b/addons/pvr.team-mediaportal.tvserver/LICENSE.txt | 282
b/addons/pvr.team-mediaportal.tvserver/addon.xml | 23
b/addons/pvr.team-mediaportal.tvserver/changelog.txt | 89
b/addons/pvr.team-mediaportal.tvserver/icon.png |binary
b/addons/pvr.team-mediaportal.tvserver/resources/genre_translation.xml | 128
b/addons/pvr.team-mediaportal.tvserver/resources/language/Dutch/strings.xml | 44
b/addons/pvr.team-mediaportal.tvserver/resources/language/English/strings.xml | 44
b/addons/pvr.team-mediaportal.tvserver/resources/language/Finnish/strings.xml | 25
b/addons/pvr.team-mediaportal.tvserver/resources/language/German/strings.xml | 21
b/addons/pvr.team-mediaportal.tvserver/resources/language/Italian/strings.xml | 25
b/addons/pvr.team-mediaportal.tvserver/resources/settings.xml | 22
b/addons/pvr.vdr.vnsi/addon.xml | 23
b/addons/pvr.vdr.vnsi/icon.png |binary
b/addons/pvr.vdr.vnsi/pthreadVC2.dll |binary
b/addons/pvr.vdr.vnsi/pthreadVC2d.dll |binary
b/addons/pvr.vdr.vnsi/resources/language/Dutch/strings.xml | 48
b/addons/pvr.vdr.vnsi/resources/language/English/strings.xml | 51
b/addons/pvr.vdr.vnsi/resources/language/Finnish/strings.xml | 51
b/addons/pvr.vdr.vnsi/resources/language/German/strings.xml | 51
b/addons/pvr.vdr.vnsi/resources/settings.xml | 10
b/addons/pvr.vdr.vnsi/resources/skins/Confluence/720p/ChannelScan.xml | 733 +
b/addons/skin.confluence/720p/DialogButtonMenu.xml | 40
b/addons/skin.confluence/720p/DialogExtendedProgressBar.xml | 48
b/addons/skin.confluence/720p/DialogPVRChannelManager.xml | 539 +
b/addons/skin.confluence/720p/DialogPVRChannelsOSD.xml | 296
b/addons/skin.confluence/720p/DialogPVRGroupManager.xml | 433
b/addons/skin.confluence/720p/DialogPVRGuideInfo.xml | 226
b/addons/skin.confluence/720p/DialogPVRGuideOSD.xml | 253
b/addons/skin.confluence/720p/DialogPVRGuideSearch.xml | 456 +
b/addons/skin.confluence/720p/DialogPVRRecordingInfo.xml | 267
b/addons/skin.confluence/720p/DialogPVRTimerSettings.xml | 155
b/addons/skin.confluence/720p/Home.xml | 363
b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml | 120
b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml | 44
b/addons/skin.confluence/720p/MusicOSD.xml | 6
b/addons/skin.confluence/720p/MyPVR.xml | 256
b/addons/skin.confluence/720p/PlayerControls.xml | 148
b/addons/skin.confluence/720p/Settings.xml | 18
b/addons/skin.confluence/720p/SettingsSystemInfo.xml | 15
b/addons/skin.confluence/720p/VideoFullScreen.xml | 324
b/addons/skin.confluence/720p/VideoOSD.xml | 254
b/addons/skin.confluence/720p/ViewsPVR.xml | 2378 +++++
b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml | 8
b/addons/skin.confluence/720p/defaults.xml | 1
b/addons/skin.confluence/720p/includes.xml | 132
b/addons/skin.confluence/backgrounds/tv.jpg |binary
b/addons/skin.confluence/language/Czech/strings.xml | 15
b/addons/skin.confluence/language/Dutch/strings.xml | 11
b/addons/skin.confluence/language/English/strings.xml | 15
b/addons/skin.confluence/language/Finnish/strings.xml | 13
b/addons/skin.confluence/language/French/strings.xml | 16
b/addons/skin.confluence/language/German/strings.xml | 27
b/addons/skin.confluence/language/Greek/strings.xml | 175
b/addons/skin.confluence/language/Japanese/strings.xml | 264
b/addons/skin.confluence/language/Slovak/strings.xml | 175
b/addons/skin.confluence/language/Slovenian/strings.xml | 13
b/addons/skin.confluence/media/OSDChannelDownFO.png |binary
b/addons/skin.confluence/media/OSDChannelDownNF.png |binary
b/addons/skin.confluence/media/OSDChannelListFO.png |binary
b/addons/skin.confluence/media/OSDChannelListNF.png |binary
b/addons/skin.confluence/media/OSDChannelUPFO.png |binary
b/addons/skin.confluence/media/OSDChannelUPNF.png |binary
b/addons/skin.confluence/media/OSDRecordOffFO.png |binary
b/addons/skin.confluence/media/OSDRecordOffNF.png |binary
b/addons/skin.confluence/media/OSDRecordOnFO.png |binary
b/addons/skin.confluence/media/OSDRecordOnNF.png |binary
b/addons/skin.confluence/media/OSDTeleTextFO.png |binary
b/addons/skin.confluence/media/OSDTeleTextNF.png |binary
b/addons/skin.confluence/media/OSDepgFO.png |binary
b/addons/skin.confluence/media/OSDepgNF.png |binary
b/addons/skin.confluence/media/PVR-HasTimer.png |binary
b/addons/skin.confluence/media/PVR-IsRecording.png |binary
b/addons/skin.confluence/media/StackNF.png |binary
b/addons/skin.confluence/media/epg-genres/0.png |binary
b/addons/skin.confluence/media/epg-genres/112.png |binary
b/addons/skin.confluence/media/epg-genres/128.png |binary
b/addons/skin.confluence/media/epg-genres/144.png |binary
b/addons/skin.confluence/media/epg-genres/16.png |binary
b/addons/skin.confluence/media/epg-genres/160.png |binary
b/addons/skin.confluence/media/epg-genres/176.png |binary
b/addons/skin.confluence/media/epg-genres/192.png |binary
b/addons/skin.confluence/media/epg-genres/208.png |binary
b/addons/skin.confluence/media/epg-genres/224.png |binary
b/addons/skin.confluence/media/epg-genres/240.png |binary
b/addons/skin.confluence/media/epg-genres/32.png |binary
b/addons/skin.confluence/media/epg-genres/48.png |binary
b/addons/skin.confluence/media/epg-genres/64.png |binary
b/addons/skin.confluence/media/epg-genres/80.png |binary
b/addons/skin.confluence/media/epg-genres/96.png |binary
b/addons/skin.confluence/media/epg-genres/genre-numbers.txt | 18
b/addons/skin.confluence/media/gradient.png |binary
b/addons/skin.confluence/media/home-power-inhibit-FO.png |binary
b/addons/skin.confluence/media/home-power-inhibit.png |binary
b/addons/webinterface.default/js/iscroll.js | 709 +
b/configure.in | 42
b/language/Czech/strings.xml | 444 +
b/language/Dutch/strings.xml | 552 +
b/language/English/strings.xml | 463 +
b/language/Finnish/strings.xml | 451 +
b/language/French/strings.xml | 430
b/language/German/strings.xml | 439 +
b/language/Greek/strings.xml | 892 +-
b/language/Japanese/strings.xml | 1867 +++-
b/language/Polish/strings.xml | 249
b/language/Russian/langinfo.xml | 22
b/language/Russian/strings.xml | 455 +
b/language/Slovak/strings.xml | 1738 +---
b/language/Slovenian/strings.xml | 454 +
b/language/Swedish/strings.xml | 434 +
b/lib/addons/library.xbmc.addon/Makefile.in | 27
b/lib/addons/library.xbmc.addon/libXBMC_addon.cpp | 152
b/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj | 89
b/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj.filters | 19
b/lib/addons/library.xbmc.gui/Makefile.in | 27
b/lib/addons/library.xbmc.gui/libXBMC_gui.cpp | 673 +
b/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj | 86
b/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj.filters | 14
b/lib/addons/library.xbmc.pvr/Makefile.in | 27
b/lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp | 181
b/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj | 86
b/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj.filters | 18
b/lib/cmyth/Win32/libcmyth.def | 72
b/lib/cmyth/Win32/libcmyth.vcproj | 4
b/lib/cmyth/Win32/libcmyth.vcxproj | 7
b/lib/cmyth/Win32/libcmyth.vcxproj.filters | 3
b/lib/cmyth/include/cmyth/cmyth.h | 205
b/lib/cmyth/include/refmem/atomic.h | 2
b/lib/cmyth/libcmyth/Makefile | 2
b/lib/cmyth/libcmyth/bookmark.c | 19
b/lib/cmyth/libcmyth/cmyth_local.h | 84
b/lib/cmyth/libcmyth/connection.c | 206
b/lib/cmyth/libcmyth/event.c | 25
b/lib/cmyth/libcmyth/file.c | 152
b/lib/cmyth/libcmyth/input.c | 235
b/lib/cmyth/libcmyth/livetv.c | 42
b/lib/cmyth/libcmyth/mysql_query.c | 1
b/lib/cmyth/libcmyth/mythtv_mysql.c | 1184 ++
b/lib/cmyth/libcmyth/proginfo.c | 91
b/lib/cmyth/libcmyth/proglist.c | 359
b/lib/cmyth/libcmyth/socket.c | 147
b/lib/platform/os.h | 38
b/lib/platform/posix/os-socket.h | 326
b/lib/platform/posix/os-threads.h | 119
b/lib/platform/posix/os-types.h | 54
b/lib/platform/posix/serialport.cpp | 193
b/lib/platform/sockets/serialport.h | 115
b/lib/platform/sockets/socket.h | 228
b/lib/platform/sockets/tcp.h | 130
b/lib/platform/threads/mutex.h | 353
b/lib/platform/threads/threads.h | 152
b/lib/platform/util/StdString.h | 4337 ++++++++++
b/lib/platform/util/baudrate.h | 211
b/lib/platform/util/buffer.h | 98
b/lib/platform/util/timeutils.h | 122
b/lib/platform/windows/dlfcn-win32.cpp | 263
b/lib/platform/windows/dlfcn-win32.h | 46
b/lib/platform/windows/os-socket.h | 297
b/lib/platform/windows/os-threads.cpp | 136
b/lib/platform/windows/os-threads.h | 65
b/lib/platform/windows/os-types.h | 80
b/lib/platform/windows/serialport.cpp | 211
b/lib/platform/windows/stdint.h | 247
b/project/VS2010Express/XBMC.vcxproj | 122
b/project/VS2010Express/XBMC.vcxproj.filters | 331
b/system/PVRDemoAddonSettings.xml | 460 +
b/system/keymaps/keyboard.xml | 56
b/system/keymaps/remote.xml | 154
b/system/playercorefactory.xml | 3
b/xbmc/Application.cpp | 119
b/xbmc/Application.h | 8
b/xbmc/ApplicationMessenger.cpp | 29
b/xbmc/ApplicationMessenger.h | 7
b/xbmc/FileItem.cpp | 349
b/xbmc/FileItem.h | 72
b/xbmc/GUIInfoManager.cpp | 628 +
b/xbmc/GUIInfoManager.h | 121
b/xbmc/GUIViewControl.cpp | 5
b/xbmc/GUIViewState.cpp | 5
b/xbmc/SortFileItem.cpp | 18
b/xbmc/SortFileItem.h | 2
b/xbmc/URL.cpp | 3
b/xbmc/Util.cpp | 36
b/xbmc/Util.h | 4
b/xbmc/XBDateTime.cpp | 39
b/xbmc/XBDateTime.h | 3
b/xbmc/addons/Addon.cpp | 6
b/xbmc/addons/Addon.h | 5
b/xbmc/addons/AddonCallbacks.cpp | 142
b/xbmc/addons/AddonCallbacks.h | 292
b/xbmc/addons/AddonCallbacksAddon.cpp | 359
b/xbmc/addons/AddonCallbacksAddon.h | 109
b/xbmc/addons/AddonCallbacksGUI.cpp | 1762 ++++
b/xbmc/addons/AddonCallbacksGUI.h | 225
b/xbmc/addons/AddonCallbacksPVR.cpp | 311
b/xbmc/addons/AddonCallbacksPVR.h | 153
b/xbmc/addons/AddonDatabase.cpp | 8
b/xbmc/addons/AddonDatabase.h | 4
b/xbmc/addons/AddonDll.h | 16
b/xbmc/addons/AddonManager.cpp | 77
b/xbmc/addons/AddonManager.h | 8
b/xbmc/addons/AddonStatusHandler.cpp | 2
b/xbmc/addons/DllPVRClient.h | 30
b/xbmc/addons/GUIDialogAddonInfo.cpp | 17
b/xbmc/addons/Makefile | 4
b/xbmc/addons/Skin.cpp | 1
b/xbmc/addons/include/xbmc_pvr_dll.h | 441 +
b/xbmc/addons/include/xbmc_pvr_types.h | 412
b/xbmc/cores/DllLoader/DllLoaderContainer.cpp | 2
b/xbmc/cores/DllLoader/Win32DllLoader.cpp | 3
b/xbmc/cores/IPlayer.h | 6
b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 26
b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h | 14
b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 1
b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp | 4
b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp | 317
b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h | 108
b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h | 37
b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.h | 2
b/xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp | 36
b/xbmc/cores/dvdplayer/DVDDemuxers/Makefile.in | 1
b/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp | 3
b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h | 14
b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.cpp | 34
b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h | 15
b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp | 294
b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.h | 107
b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp | 9
b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h | 7
b/xbmc/cores/dvdplayer/DVDInputStreams/Makefile | 1
b/xbmc/cores/dvdplayer/DVDMessage.h | 3
b/xbmc/cores/dvdplayer/DVDPlayer.cpp | 324
b/xbmc/cores/dvdplayer/DVDPlayer.h | 24
b/xbmc/cores/dvdplayer/DVDSubtitles/SamiTagConvertor.cpp | 242
b/xbmc/cores/dvdplayer/DVDSubtitles/SamiTagConvertor.h | 68
b/xbmc/cores/dvdplayer/Edl.cpp | 5
b/xbmc/cores/paplayer/CodecFactory.cpp | 3
b/xbmc/dialogs/GUIDialogContextMenu.h | 20
b/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp | 103
b/xbmc/dialogs/GUIDialogExtendedProgressBar.h | 44
b/xbmc/dialogs/GUIDialogMediaSource.cpp | 10
b/xbmc/dialogs/GUIDialogNumeric.cpp | 9
b/xbmc/dialogs/GUIDialogNumeric.h | 2
b/xbmc/dialogs/GUIDialogSeekBar.cpp | 2
b/xbmc/dialogs/Makefile | 1
b/xbmc/epg/Epg.cpp | 999 ++
b/xbmc/epg/Epg.h | 367
b/xbmc/epg/EpgContainer.cpp | 624 +
b/xbmc/epg/EpgContainer.h | 296
b/xbmc/epg/EpgDatabase.cpp | 449 +
b/xbmc/epg/EpgDatabase.h | 163
b/xbmc/epg/EpgInfoTag.cpp | 974 ++
b/xbmc/epg/EpgInfoTag.h | 469 +
b/xbmc/epg/EpgSearchFilter.cpp | 246
b/xbmc/epg/EpgSearchFilter.h | 81
b/xbmc/epg/GUIEPGGridContainer.cpp | 1915 ++++
b/xbmc/epg/GUIEPGGridContainer.h | 223
b/xbmc/epg/Makefile | 13
b/xbmc/filesystem/AddonsDirectory.cpp | 7
b/xbmc/filesystem/DllLibCMyth.h | 21
b/xbmc/filesystem/FactoryDirectory.cpp | 6
b/xbmc/filesystem/FileFactory.cpp | 6
b/xbmc/filesystem/ILiveTV.h | 4
b/xbmc/filesystem/Makefile.in | 2
b/xbmc/filesystem/MythFile.cpp | 8
b/xbmc/filesystem/MythFile.h | 4
b/xbmc/filesystem/PVRDirectory.cpp | 126
b/xbmc/filesystem/PVRDirectory.h | 46
b/xbmc/filesystem/PVRFile.cpp | 324
b/xbmc/filesystem/PVRFile.h | 81
b/xbmc/filesystem/Slingbox.cpp | 4
b/xbmc/filesystem/Slingbox.h | 4
b/xbmc/filesystem/VTPFile.cpp | 4
b/xbmc/filesystem/VTPFile.h | 4
b/xbmc/guilib/GUIControl.h | 1
b/xbmc/guilib/GUIControlFactory.cpp | 14
b/xbmc/guilib/GUIDialog.cpp | 13
b/xbmc/guilib/GUIDialog.h | 3
b/xbmc/guilib/GUIEditControl.cpp | 16
b/xbmc/guilib/GUIEditControl.h | 1
b/xbmc/guilib/GUILabelControl.cpp | 7
b/xbmc/guilib/GUILabelControl.h | 1
b/xbmc/guilib/GUIListGroup.cpp | 44
b/xbmc/guilib/GUIListGroup.h | 2
b/xbmc/guilib/GUIListItemLayout.cpp | 14
b/xbmc/guilib/GUIListItemLayout.h | 2
b/xbmc/guilib/GUIListLabel.cpp | 12
b/xbmc/guilib/GUIListLabel.h | 1
b/xbmc/guilib/GUIProgressControl.cpp | 4
b/xbmc/guilib/GUIProgressControl.h | 1
b/xbmc/guilib/GUIWindow.cpp | 4
b/xbmc/guilib/GUIWindow.h | 2
b/xbmc/guilib/Key.h | 36
b/xbmc/input/ButtonTranslator.cpp | 29
b/xbmc/input/XBIRRemote.h | 5
b/xbmc/interfaces/Builtins.cpp | 41
b/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp | 14
b/xbmc/interfaces/json-rpc/JSONUtils.h | 26
b/xbmc/interfaces/json-rpc/Makefile | 1
b/xbmc/interfaces/json-rpc/PVROperations.cpp | 207
b/xbmc/interfaces/json-rpc/PVROperations.h | 41
b/xbmc/interfaces/json-rpc/ServiceDescription.h | 81
b/xbmc/interfaces/json-rpc/methods.json | 81
b/xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp | 55
b/xbmc/pvr/Makefile | 8
b/xbmc/pvr/PVRDatabase.cpp | 935 ++
b/xbmc/pvr/PVRDatabase.h | 258
b/xbmc/pvr/PVRGUIInfo.cpp | 864 +
b/xbmc/pvr/PVRGUIInfo.h | 172
b/xbmc/pvr/PVRManager.cpp | 1116 ++
b/xbmc/pvr/PVRManager.h | 595 +
b/xbmc/pvr/addons/Makefile | 7
b/xbmc/pvr/addons/PVRClient.cpp | 1137 ++
b/xbmc/pvr/addons/PVRClient.h | 499 +
b/xbmc/pvr/addons/PVRClients.cpp | 1365 +++
b/xbmc/pvr/addons/PVRClients.h | 681 +
b/xbmc/pvr/channels/Makefile | 10
b/xbmc/pvr/channels/PVRChannel.cpp | 797 +
b/xbmc/pvr/channels/PVRChannel.h | 513 +
b/xbmc/pvr/channels/PVRChannelGroup.cpp | 1073 ++
b/xbmc/pvr/channels/PVRChannelGroup.h | 467 +
b/xbmc/pvr/channels/PVRChannelGroupInternal.cpp | 398
b/xbmc/pvr/channels/PVRChannelGroupInternal.h | 184
b/xbmc/pvr/channels/PVRChannelGroups.cpp | 509 +
b/xbmc/pvr/channels/PVRChannelGroups.h | 211
b/xbmc/pvr/channels/PVRChannelGroupsContainer.cpp | 336
b/xbmc/pvr/channels/PVRChannelGroupsContainer.h | 215
b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp | 839 +
b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h | 85
b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp | 239
b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h | 53
b/xbmc/pvr/dialogs/GUIDialogPVRCutterOSD.cpp | 62
b/xbmc/pvr/dialogs/GUIDialogPVRCutterOSD.h | 37
b/xbmc/pvr/dialogs/GUIDialogPVRDirectorOSD.cpp | 68
b/xbmc/pvr/dialogs/GUIDialogPVRDirectorOSD.h | 37
b/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp | 388
b/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.h | 73
b/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp | 224
b/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.h | 56
b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp | 165
b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.h | 49
b/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.cpp | 369
b/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.h | 58
b/xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.cpp | 61
b/xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.h | 41
b/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp | 389
b/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h | 61
b/xbmc/pvr/dialogs/Makefile | 15
b/xbmc/pvr/recordings/Makefile | 7
b/xbmc/pvr/recordings/PVRRecording.cpp | 210
b/xbmc/pvr/recordings/PVRRecording.h | 107
b/xbmc/pvr/recordings/PVRRecordings.cpp | 355
b/xbmc/pvr/recordings/PVRRecordings.h | 70
b/xbmc/pvr/timers/Makefile | 7
b/xbmc/pvr/timers/PVRTimerInfoTag.cpp | 628 +
b/xbmc/pvr/timers/PVRTimerInfoTag.h | 181
b/xbmc/pvr/timers/PVRTimers.cpp | 755 +
b/xbmc/pvr/timers/PVRTimers.h | 198
b/xbmc/pvr/windows/GUIViewStatePVR.cpp | 69
b/xbmc/pvr/windows/GUIViewStatePVR.h | 40
b/xbmc/pvr/windows/GUIWindowPVR.cpp | 288
b/xbmc/pvr/windows/GUIWindowPVR.h | 89
b/xbmc/pvr/windows/GUIWindowPVRChannels.cpp | 581 +
b/xbmc/pvr/windows/GUIWindowPVRChannels.h | 75
b/xbmc/pvr/windows/GUIWindowPVRCommon.cpp | 826 +
b/xbmc/pvr/windows/GUIWindowPVRCommon.h | 141
b/xbmc/pvr/windows/GUIWindowPVRGuide.cpp | 456 +
b/xbmc/pvr/windows/GUIWindowPVRGuide.h | 72
b/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp | 322
b/xbmc/pvr/windows/GUIWindowPVRRecordings.h | 62
b/xbmc/pvr/windows/GUIWindowPVRSearch.cpp | 288
b/xbmc/pvr/windows/GUIWindowPVRSearch.h | 61
b/xbmc/pvr/windows/GUIWindowPVRTimers.cpp | 284
b/xbmc/pvr/windows/GUIWindowPVRTimers.h | 56
b/xbmc/pvr/windows/Makefile | 13
b/xbmc/pvrclients/Makefile.include.in | 29
b/xbmc/pvrclients/MediaPortal/Cards.cpp | 81
b/xbmc/pvrclients/MediaPortal/Cards.h | 63
b/xbmc/pvrclients/MediaPortal/FileUtils.h | 10
b/xbmc/pvrclients/MediaPortal/GenreTable.cpp | 143
b/xbmc/pvrclients/MediaPortal/GenreTable.h | 45
b/xbmc/pvrclients/MediaPortal/Makefile.in | 33
b/xbmc/pvrclients/MediaPortal/README | 162
b/xbmc/pvrclients/MediaPortal/Socket.cpp | 755 +
b/xbmc/pvrclients/MediaPortal/Socket.h | 302
b/xbmc/pvrclients/MediaPortal/channels.cpp | 74
b/xbmc/pvrclients/MediaPortal/channels.h | 48
b/xbmc/pvrclients/MediaPortal/client.cpp | 734 +
b/xbmc/pvrclients/MediaPortal/client.h | 71
b/xbmc/pvrclients/MediaPortal/epg.cpp | 149
b/xbmc/pvrclients/MediaPortal/epg.h | 82
b/xbmc/pvrclients/MediaPortal/lib/tinyxml/Makefile | 9
b/xbmc/pvrclients/MediaPortal/lib/tinyxml/readme.txt | 8
b/xbmc/pvrclients/MediaPortal/lib/tinyxml/tinystr.cpp | 111
b/xbmc/pvrclients/MediaPortal/lib/tinyxml/tinystr.h | 305
b/xbmc/pvrclients/MediaPortal/lib/tinyxml/tinyxml.cpp | 1886 ++++
b/xbmc/pvrclients/MediaPortal/lib/tinyxml/tinyxml.h | 1807 ++++
b/xbmc/pvrclients/MediaPortal/lib/tinyxml/tinyxmlerror.cpp | 52
b/xbmc/pvrclients/MediaPortal/lib/tinyxml/tinyxmlparser.cpp | 1638 +++
b/xbmc/pvrclients/MediaPortal/os-dependent.h | 37
b/xbmc/pvrclients/MediaPortal/posix/os_posix.h | 30
b/xbmc/pvrclients/MediaPortal/project/VS2010Express/XBMC_MPTV.vcxproj | 167
b/xbmc/pvrclients/MediaPortal/project/VS2010Express/XBMC_MPTV.vcxproj.filters | 143
b/xbmc/pvrclients/MediaPortal/pvrclient-mediaportal.cpp | 1452 +++
b/xbmc/pvrclients/MediaPortal/pvrclient-mediaportal.h | 124
b/xbmc/pvrclients/MediaPortal/recordings.cpp | 289
b/xbmc/pvrclients/MediaPortal/recordings.h | 128
b/xbmc/pvrclients/MediaPortal/timers.cpp | 506 +
b/xbmc/pvrclients/MediaPortal/timers.h | 132
b/xbmc/pvrclients/MediaPortal/uri.cpp | 221
b/xbmc/pvrclients/MediaPortal/uri.h | 71
b/xbmc/pvrclients/MediaPortal/utils.cpp | 133
b/xbmc/pvrclients/MediaPortal/utils.h | 55
b/xbmc/pvrclients/MediaPortal/windows/FileUtils.cpp | 91
b/xbmc/pvrclients/MediaPortal/windows/WindowsUtils.cpp | 104
b/xbmc/pvrclients/MediaPortal/windows/WindowsUtils.h | 27
b/xbmc/pvrclients/MediaPortal/windows/os_windows.h | 30
b/xbmc/pvrclients/mythtv-cmyth/Makefile.in | 34
b/xbmc/pvrclients/mythtv-cmyth/boost_d.txt | 4
b/xbmc/pvrclients/mythtv-cmyth/boost_win32_dependency.bat | 48
b/xbmc/pvrclients/mythtv-cmyth/client.cpp | 754 +
b/xbmc/pvrclients/mythtv-cmyth/client.h | 67
b/xbmc/pvrclients/mythtv-cmyth/cppmyth.h | 12
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythChannel.cpp | 84
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythChannel.h | 27
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythConnection.cpp | 317
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythConnection.h | 51
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythDatabase.cpp | 224
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythDatabase.h | 45
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythEventHandler.cpp | 268
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythEventHandler.h | 26
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythFile.cpp | 68
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythFile.h | 24
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythPointer.h | 48
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythProgramInfo.cpp | 169
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythProgramInfo.h | 37
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythRecorder.cpp | 264
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythRecorder.h | 36
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythSGFile.cpp | 43
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythSGFile.h | 21
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythSignal.cpp | 15
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythSignal.h | 23
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythTimer.cpp | 378
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythTimer.h | 138
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythTimestamp.cpp | 88
b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythTimestamp.h | 28
b/xbmc/pvrclients/mythtv-cmyth/fileOps.cpp | 351
b/xbmc/pvrclients/mythtv-cmyth/fileOps.h | 69
b/xbmc/pvrclients/mythtv-cmyth/libcmyth.h | 1679 +++
b/xbmc/pvrclients/mythtv-cmyth/project/VS2010Express/XBMC_mythtc_cmyth.vcxproj | 163
b/xbmc/pvrclients/mythtv-cmyth/project/VS2010Express/XBMC_mythtc_cmyth.vcxproj.filters | 141
b/xbmc/pvrclients/mythtv-cmyth/pvrclient-mythtv.cpp | 1306 +++
b/xbmc/pvrclients/mythtv-cmyth/pvrclient-mythtv.h | 110
b/xbmc/pvrclients/mythtv-cmyth/recordingRules.cpp | 312
b/xbmc/pvrclients/mythtv-cmyth/recordingRules.h | 35
b/xbmc/pvrclients/mythtv-cmyth/tools.h | 145
b/xbmc/pvrclients/mythtv/Makefile.in | 25
b/xbmc/pvrclients/mythtv/MythXml.cpp | 144
b/xbmc/pvrclients/mythtv/MythXml.h | 34
b/xbmc/pvrclients/mythtv/client.cpp | 482 +
b/xbmc/pvrclients/mythtv/client.h | 48
b/xbmc/pvrclients/mythtv/libmythxml/GetChannelListCommand.h | 25
b/xbmc/pvrclients/mythtv/libmythxml/GetChannelListParameters.h | 19
b/xbmc/pvrclients/mythtv/libmythxml/GetChannelListResult.cpp | 53
b/xbmc/pvrclients/mythtv/libmythxml/GetChannelListResult.h | 17
b/xbmc/pvrclients/mythtv/libmythxml/GetNumChannelsCommand.h | 24
b/xbmc/pvrclients/mythtv/libmythxml/GetNumChannelsParameters.h | 19
b/xbmc/pvrclients/mythtv/libmythxml/GetNumChannelsResult.cpp | 54
b/xbmc/pvrclients/mythtv/libmythxml/GetNumChannelsResult.h | 23
b/xbmc/pvrclients/mythtv/libmythxml/GetProgramGuideCommand.h | 18
b/xbmc/pvrclients/mythtv/libmythxml/GetProgramGuideParameters.cpp | 43
b/xbmc/pvrclients/mythtv/libmythxml/GetProgramGuideParameters.h | 38
b/xbmc/pvrclients/mythtv/libmythxml/GetProgramGuideResult.cpp | 331
b/xbmc/pvrclients/mythtv/libmythxml/GetProgramGuideResult.h | 25
b/xbmc/pvrclients/mythtv/libmythxml/Makefile | 16
b/xbmc/pvrclients/mythtv/libmythxml/MythXmlCommand.cpp | 42
b/xbmc/pvrclients/mythtv/libmythxml/MythXmlCommand.h | 49
b/xbmc/pvrclients/mythtv/libmythxml/MythXmlCommandParameters.cpp | 33
b/xbmc/pvrclients/mythtv/libmythxml/MythXmlCommandParameters.h | 43
b/xbmc/pvrclients/mythtv/libmythxml/MythXmlCommandResult.h | 35
b/xbmc/pvrclients/mythtv/libmythxml/SChannel.h | 18
b/xbmc/pvrclients/mythtv/libmythxml/SEpg.h | 29
b/xbmc/pvrclients/pvr-demo/Makefile.in | 23
b/xbmc/pvrclients/pvr-demo/PVRDemoData.cpp | 360
b/xbmc/pvrclients/pvr-demo/PVRDemoData.h | 94
b/xbmc/pvrclients/pvr-demo/client.cpp | 290
b/xbmc/pvrclients/pvr-demo/client.h | 30
b/xbmc/pvrclients/tvheadend/HTSPConnection.cpp | 364
b/xbmc/pvrclients/tvheadend/HTSPConnection.h | 76
b/xbmc/pvrclients/tvheadend/HTSPData.cpp | 1117 ++
b/xbmc/pvrclients/tvheadend/HTSPData.h | 121
b/xbmc/pvrclients/tvheadend/HTSPDemux.cpp | 539 +
b/xbmc/pvrclients/tvheadend/HTSPDemux.h | 69
b/xbmc/pvrclients/tvheadend/HTSPTypes.h | 234
b/xbmc/pvrclients/tvheadend/Makefile.in | 25
b/xbmc/pvrclients/tvheadend/client.cpp | 554 +
b/xbmc/pvrclients/tvheadend/client.h | 46
b/xbmc/pvrclients/tvheadend/project/VS2010Express/XBMC_tvheadend.vcxproj | 112
b/xbmc/pvrclients/tvheadend/project/VS2010Express/XBMC_tvheadend.vcxproj.filters | 54
b/xbmc/pvrclients/vdr-vnsi/COPYING | 340
b/xbmc/pvrclients/vdr-vnsi/Makefile.in | 29
b/xbmc/pvrclients/vdr-vnsi/README | 71
b/xbmc/pvrclients/vdr-vnsi/VNSIChannelScan.cpp | 598 +
b/xbmc/pvrclients/vdr-vnsi/VNSIChannelScan.h | 95
b/xbmc/pvrclients/vdr-vnsi/VNSIData.cpp | 986 ++
b/xbmc/pvrclients/vdr-vnsi/VNSIData.h | 94
b/xbmc/pvrclients/vdr-vnsi/VNSIDemux.cpp | 487 +
b/xbmc/pvrclients/vdr-vnsi/VNSIDemux.h | 66
b/xbmc/pvrclients/vdr-vnsi/VNSIRecording.cpp | 180
b/xbmc/pvrclients/vdr-vnsi/VNSIRecording.h | 51
b/xbmc/pvrclients/vdr-vnsi/VNSISession.cpp | 371
b/xbmc/pvrclients/vdr-vnsi/VNSISession.h | 100
b/xbmc/pvrclients/vdr-vnsi/client.cpp | 642 +
b/xbmc/pvrclients/vdr-vnsi/client.h | 45
b/xbmc/pvrclients/vdr-vnsi/project/VS2010Express/XBMC_VDR_vnsi.vcxproj | 126
b/xbmc/pvrclients/vdr-vnsi/project/VS2010Express/XBMC_VDR_vnsi.vcxproj.filters | 79
b/xbmc/pvrclients/vdr-vnsi/requestpacket.cpp | 146
b/xbmc/pvrclients/vdr-vnsi/requestpacket.h | 62
b/xbmc/pvrclients/vdr-vnsi/responsepacket.cpp | 161
b/xbmc/pvrclients/vdr-vnsi/responsepacket.h | 79
b/xbmc/pvrclients/vdr-vnsi/tools.cpp | 52
b/xbmc/pvrclients/vdr-vnsi/tools.h | 26
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/COPYING | 340
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/HISTORY | 6
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/Makefile | 98
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/README | 26
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/bitstream.c | 131
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/bitstream.h | 50
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/config.c | 42
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/config.h | 81
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/cxsocket.c | 174
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/cxsocket.h | 65
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer.c | 362
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer.h | 307
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_AAC.c | 281
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_AAC.h | 62
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_AC3.c | 371
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_AC3.h | 79
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_DTS.c | 45
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_DTS.h | 45
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_MPEGAudio.c | 396
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_MPEGAudio.h | 118
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_MPEGVideo.c | 414
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_MPEGVideo.h | 68
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_Subtitle.c | 139
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_Subtitle.h | 53
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_Teletext.c | 113
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_Teletext.h | 50
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_h264.c | 455 +
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/demuxer_h264.h | 99
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/hash.c | 111
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/hash.h | 37
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/patches/vdr-wirbelscan-0.0.5-pre11e-AddServiceInterface.diff | 426
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/receiver.c | 1212 ++
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/receiver.h | 116
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/recordingscache.c | 70
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/recordingscache.h | 56
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/recplayer.c | 295
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/recplayer.h | 80
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/requestpacket.c | 123
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/requestpacket.h | 73
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/responsepacket.c | 214
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/responsepacket.h | 75
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/vnsi.c | 138
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/vnsi.h | 59
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/vnsiclient.c | 1926 ++++
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/vnsiclient.h | 168
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/vnsicommand.h | 127
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/vnsiserver.c | 271
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/vnsiserver.h | 57
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/vnsiserver/allowed_hosts.conf | 13
b/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver/wirbelscanservice.h | 57
b/xbmc/pvrclients/vdr-vnsi/vnsicommand.h | 122
b/xbmc/settings/AdvancedSettings.cpp | 61
b/xbmc/settings/AdvancedSettings.h | 18
b/xbmc/settings/GUIDialogSettings.cpp | 130
b/xbmc/settings/GUIDialogSettings.h | 10
b/xbmc/settings/GUISettings.cpp | 90
b/xbmc/settings/GUISettings.h | 12
b/xbmc/settings/GUIWindowSettingsCategory.cpp | 89
b/xbmc/settings/GUIWindowSettingsCategory.h | 2
b/xbmc/settings/Settings.cpp | 2
b/xbmc/settings/VideoSettings.h | 3
b/xbmc/system.h | 1
b/xbmc/utils/Makefile | 2
b/xbmc/utils/MathUtils.h | 8
b/xbmc/utils/Observer.cpp | 189
b/xbmc/utils/Observer.h | 136
b/xbmc/utils/TextSearch.cpp | 166
b/xbmc/utils/TextSearch.h | 50
b/xbmc/utils/URIUtils.cpp | 15
b/xbmc/utils/URIUtils.h | 1
b/xbmc/utils/XMLUtils.cpp | 8
b/xbmc/utils/XMLUtils.h | 1
b/xbmc/utils/log.cpp | 15
b/xbmc/video/GUIViewStateVideo.cpp | 2
b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp | 5
b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp | 12
b/xbmc/video/dialogs/GUIDialogVideoSettings.cpp | 6
b/xbmc/video/windows/GUIWindowFullScreen.cpp | 245
b/xbmc/video/windows/GUIWindowFullScreen.h | 4
b/xbmc/video/windows/GUIWindowVideoBase.cpp | 63
b/xbmc/win32/stdbool.h | 53
b/xbmc/windowing/X11/WinSystemX11GLES.cpp | 14
b/xbmc/windows/GUIMediaWindow.cpp | 3
b/xbmc/windows/GUIWindowSystemInfo.cpp | 19
lib/libhts/Win32/include/stdint.h | 222
lib/libhts/Win32/libhts_2003.sln | 21
lib/libhts/Win32/libhts_2003.vcproj | 161
lib/libhts/Win32/libhts_2008.sln | 20
lib/libhts/Win32/libhts_2008.vcproj | 237
project/VS2010Express/XBMC | 247
651 files changed, 111735 insertions(+), 3393 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 xbmc-11.0-tsp-Eden-pvr.patch
Index: xbmc-11.0-tsp-Eden-pvr.patch
===================================================================
RCS file: /cvs/free/rpms/xbmc/EL-6/xbmc-11.0-tsp-Eden-pvr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xbmc-11.0-tsp-Eden-pvr.patch 17 May 2012 18:51:51 -0000 1.1
+++ xbmc-11.0-tsp-Eden-pvr.patch 1 Jul 2012 12:28:44 -0000 1.2
@@ -27774,10 +27774,22 @@
+</Project>
\ No newline at end of file
diff --git a/lib/cmyth/Win32/libcmyth.def b/lib/cmyth/Win32/libcmyth.def
-index 7ea4356..a4ed819 100644
+index 7ea4356..4562442 100644
--- a/lib/cmyth/Win32/libcmyth.def
+++ b/lib/cmyth/Win32/libcmyth.def
-@@ -98,6 +98,7 @@ EXPORTS
+@@ -45,6 +45,11 @@ EXPORTS
+ cmyth_file_request_block
+ cmyth_file_seek
+ cmyth_freespace_create
++ cmyth_inputlist_create
++ cmyth_input_destroy
++ cmyth_input_create
++ cmyth_rcv_free_inputlist
++ cmyth_get_free_inputlist
+ cmyth_keyframe_create
+ cmyth_keyframe_fill
+ cmyth_keyframe_string
+@@ -98,6 +103,7 @@ EXPORTS
cmyth_chanlist_get_count
cmyth_channel_chanid
cmyth_channel_channum
@@ -27785,7 +27797,7 @@
cmyth_channel_name
cmyth_channel_icon
cmyth_channel_visible
-@@ -117,6 +118,8 @@ EXPORTS
+@@ -117,6 +123,8 @@ EXPORTS
cmyth_proginfo_category
cmyth_proginfo_seriesid
cmyth_proginfo_programid
@@ -27794,7 +27806,7 @@
cmyth_proginfo_stars
cmyth_proginfo_playgroup
cmyth_proginfo_originalairdate
-@@ -215,4 +218,66 @@ EXPORTS
+@@ -215,4 +223,66 @@ EXPORTS
cmyth_ringbuf_read
cmyth_file_read
cmyth_livetv_read
@@ -27863,8 +27875,23 @@
+ cmyth_storagegroup_file_get_lastmodified
+ cmyth_storagegroup_file_get_size
+
+diff --git a/lib/cmyth/Win32/libcmyth.vcproj b/lib/cmyth/Win32/libcmyth.vcproj
+index 55cf9af..ddca3fb 100644
+--- a/lib/cmyth/Win32/libcmyth.vcproj
++++ b/lib/cmyth/Win32/libcmyth.vcproj
+@@ -216,6 +216,10 @@
+ >
+ </File>
+ <File
++ RelativePath="..\libcmyth\input.c"
++ >
++ </File>
++ <File
+ RelativePath="..\libcmyth\keyframe.c"
+ >
+ </File>
diff --git a/lib/cmyth/Win32/libcmyth.vcxproj b/lib/cmyth/Win32/libcmyth.vcxproj
-index a698d8a..9619138 100644
+index a698d8a..17d7c57 100644
--- a/lib/cmyth/Win32/libcmyth.vcxproj
+++ b/lib/cmyth/Win32/libcmyth.vcxproj
@@ -54,7 +54,7 @@
@@ -27901,11 +27928,57 @@
</Link>
<PostBuildEvent>
<Command>
+@@ -137,6 +139,7 @@
+ <ClCompile Include="..\libcmyth\event.c" />
+ <ClCompile Include="..\libcmyth\file.c" />
+ <ClCompile Include="..\libcmyth\freespace.c" />
++ <ClCompile Include="..\libcmyth\input.c" />
+ <ClCompile Include="..\libcmyth\keyframe.c" />
+ <ClCompile Include="..\libcmyth\livetv.c" />
+ <ClCompile Include="..\libcmyth\mysql_query.c" />
+diff --git a/lib/cmyth/Win32/libcmyth.vcxproj.filters b/lib/cmyth/Win32/libcmyth.vcxproj.filters
+index 0032e92..96b7eb2 100644
+--- a/lib/cmyth/Win32/libcmyth.vcxproj.filters
++++ b/lib/cmyth/Win32/libcmyth.vcxproj.filters
+@@ -31,6 +31,9 @@
+ <ClCompile Include="..\libcmyth\freespace.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
++ <ClCompile Include="..\libcmyth\input.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
+ <ClCompile Include="..\libcmyth\keyframe.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
diff --git a/lib/cmyth/include/cmyth/cmyth.h b/lib/cmyth/include/cmyth/cmyth.h
-index 52f2f68..090381d 100644
+index 52f2f68..51ea428 100644
--- a/lib/cmyth/include/cmyth/cmyth.h
+++ b/lib/cmyth/include/cmyth/cmyth.h
-@@ -255,7 +255,7 @@ extern cmyth_file_t cmyth_conn_connect_file(cmyth_proginfo_t prog,
+@@ -154,6 +154,23 @@ typedef struct cmyth_chanlist *cmyth_chanlist_t;
+ struct cmyth_tvguide_progs;
+ typedef struct cmyth_tvguide_progs *cmyth_tvguide_progs_t;
+
++/* fetzerch: Added to support querying of free inputs (is tunable on) */
++struct cmyth_input {
++ char *inputname;
++ unsigned long sourceid;
++ unsigned long inputid;
++ unsigned long cardid;
++ unsigned long multiplexid;
++ unsigned long livetvorder; /* new in V71 */
++};
++typedef struct cmyth_input *cmyth_input_t;
++
++struct cmyth_inputlist {
++ cmyth_input_t *input_list;
++ long input_count;
++};
++typedef struct cmyth_inputlist *cmyth_inputlist_t;
++
+ /*
+ * -----------------------------------------------------------------
+ * Debug Output Control
+@@ -255,7 +272,7 @@ extern cmyth_file_t cmyth_conn_connect_file(cmyth_proginfo_t prog,
* \return file handle
*/
extern cmyth_file_t cmyth_conn_connect_path(char* path, cmyth_conn_t control,
@@ -27914,7 +27987,7 @@
/**
* Create a ring buffer connection to a recorder.
-@@ -349,6 +349,30 @@ extern int cmyth_conn_get_protocol_version(cmyth_conn_t conn);
+@@ -349,6 +366,30 @@ extern int cmyth_conn_get_protocol_version(cmyth_conn_t conn);
extern char * cmyth_conn_get_setting(cmyth_conn_t conn,
const char* hostname, const char* setting);
@@ -27945,7 +28018,7 @@
/*
* -----------------------------------------------------------------
* Event Operations
-@@ -524,6 +548,8 @@ extern cmyth_livetv_chain_t cmyth_livetv_chain_create(char * chainid);
+@@ -524,6 +565,8 @@ extern cmyth_livetv_chain_t cmyth_livetv_chain_create(char * chainid);
extern cmyth_file_t cmyth_livetv_get_cur_file(cmyth_recorder_t rec);
@@ -27954,7 +28027,7 @@
extern int cmyth_livetv_chain_switch(cmyth_recorder_t rec, int dir);
extern int cmyth_livetv_chain_switch_last(cmyth_recorder_t rec);
-@@ -573,6 +599,9 @@ extern int cmyth_database_set_user(cmyth_database_t db, char *user);
+@@ -573,6 +616,9 @@ extern int cmyth_database_set_user(cmyth_database_t db, char *user);
extern int cmyth_database_set_pass(cmyth_database_t db, char *pass);
extern int cmyth_database_set_name(cmyth_database_t db, char *name);
@@ -27964,10 +28037,38 @@
/*
* -----------------------------------------------------------------
* Ring Buffer Operations
-@@ -805,6 +834,20 @@ extern char *cmyth_proginfo_seriesid(cmyth_proginfo_t prog);
+@@ -749,6 +795,20 @@ extern char *cmyth_proginfo_subtitle(cmyth_proginfo_t prog);
+ extern char *cmyth_proginfo_description(cmyth_proginfo_t prog);
+
+ /**
++ * Retrieve the season of a program.
++ * \param prog proginfo handle
++ * \return season
++ */
++extern unsigned short cmyth_proginfo_season(cmyth_proginfo_t prog);
++
++/**
++ * Retrieve the episode of a program.
++ * \param prog proginfo handle
++ * \return episode
++ */
++extern unsigned short cmyth_proginfo_episode(cmyth_proginfo_t prog);
++
++/**
+ * Retrieve the category of a program.
+ * \param prog proginfo handle
+ * \return null-terminated string
+@@ -805,6 +865,27 @@ extern char *cmyth_proginfo_seriesid(cmyth_proginfo_t prog);
extern char *cmyth_proginfo_programid(cmyth_proginfo_t prog);
/**
++ * Retrieve the inetref of a program.
++ * \param prog proginfo handle
++ * \return null-terminated string
++ */
++extern char *cmyth_proginfo_inetref(cmyth_proginfo_t prog);
++
++/**
[...1949 lines suppressed...]
\ No newline at end of file
diff --git a/xbmc/pvrclients/mythtv-cmyth/pvrclient-mythtv.cpp b/xbmc/pvrclients/mythtv-cmyth/pvrclient-mythtv.cpp
new file mode 100644
-index 0000000..a469050
+index 0000000..b033679
--- /dev/null
+++ b/xbmc/pvrclients/mythtv-cmyth/pvrclient-mythtv.cpp
-@@ -0,0 +1,1291 @@
+@@ -0,0 +1,1306 @@
+#include "pvrclient-mythtv.h"
+#include "client.h"
+#include <time.h>
@@ -101410,7 +102507,8 @@
+ if(iStart!=m_EPGstart&&iEnd!=m_EPGend)
+ {
+ m_EPG=m_db.GetGuide(iStart,iEnd);
-+ XBMC->Log(LOG_DEBUG,"%s: Fetching EPG - size: %i",__FUNCTION__,m_EPG.size());
++ if(g_bExtraDebug)
++ XBMC->Log(LOG_DEBUG,"%s: Fetching EPG - size: %i",__FUNCTION__,m_EPG.size());
+ m_EPGstart=iStart;
+ m_EPGend=iEnd;
+ }
@@ -101692,7 +102790,8 @@
+ tag.strTitle=title;
+ CStdString summary=proginfo.Description();
+ tag.strSummary=summary;
-+ XBMC->Log(LOG_DEBUG,"%s ## - State: %d - ##",__FUNCTION__,proginfo.Status());
++ if(g_bExtraDebug)
++ XBMC->Log(LOG_DEBUG,"%s ## - State: %d - ##",__FUNCTION__,proginfo.Status());
+ switch(proginfo.Status())
+ {
+ case RS_RECORDING:
@@ -101999,18 +103098,22 @@
+{
+ if(g_bExtraDebug)
+ XBMC->Log(LOG_DEBUG,"%s - chanID: %i, channumber: %i",__FUNCTION__,channel.iUniqueId,channel.iChannelNumber);
++ SingleLock<PLATFORM::CMutex> lock(&m_lock);
+ if(m_rec.IsNull())
+ {
+ MythChannel chan=m_channels.at(channel.iUniqueId);
+ for(std::vector<int>::iterator it=m_sources.at(chan.SourceID()).begin();it!=m_sources.at(chan.SourceID()).end();it++)
+ {
+ m_rec=m_con.GetRecorder(*it);
-+ if(!m_rec.IsRecording())
++ if(!m_rec.IsRecording() && m_rec.IsTunable(chan))
+ {
-+ XBMC->Log(LOG_DEBUG,"%s: Opening new recorder %i",__FUNCTION__,m_rec.ID());
++ if(g_bExtraDebug)
++ XBMC->Log(LOG_DEBUG,"%s: Opening new recorder %i",__FUNCTION__,m_rec.ID());
+ m_eventHandler.SetRecorder(m_rec);
+ if(m_rec.SpawnLiveTV(chan))
++ {
+ return true;
++ }
+ }
+ m_rec=MythRecorder();
+ m_eventHandler.SetRecorder(m_rec);//Redundant
@@ -102032,6 +103135,7 @@
+{
+ if(g_bExtraDebug)
+ XBMC->Log(LOG_DEBUG,"%s",__FUNCTION__);
++ SingleLock<PLATFORM::CMutex> lock(&m_lock);
+ m_eventHandler.PreventLiveChainUpdate();
+ m_rec.Stop();
+ m_rec=MythRecorder();
@@ -102046,6 +103150,7 @@
+{
+ if(g_bExtraDebug)
+ XBMC->Log(LOG_DEBUG,"%s - size: %i",__FUNCTION__,iBufferSize);
++ SingleLock<PLATFORM::CMutex> lock(&m_lock);
+ if(m_rec.IsNull())
+ return -1;
+ int dataread=m_rec.ReadLiveTV(pBuffer,iBufferSize);
@@ -102058,6 +103163,7 @@
+
+int PVRClientMythTV::GetCurrentClientChannel()
+{
++ SingleLock<PLATFORM::CMutex> lock(&m_lock);
+ if(g_bExtraDebug)
+ XBMC->Log(LOG_DEBUG,"%s",__FUNCTION__);
+ if(m_rec.IsNull())
@@ -102090,6 +103196,9 @@
+long long PVRClientMythTV::SeekLiveStream(long long iPosition, int iWhence) {
+ if(g_bExtraDebug)
+ XBMC->Log(LOG_DEBUG,"%s - pos: %i, whence: %i",__FUNCTION__,iPosition,iWhence);
++ SingleLock<PLATFORM::CMutex> lock(&m_lock);
++ if(m_rec.IsNull())
++ return -1;
+ int whence=iWhence==SEEK_SET?WHENCE_SET:iWhence==SEEK_CUR?WHENCE_CUR:WHENCE_END;
+ long long retval= m_rec.LiveTVSeek(iPosition,whence);
+ if(g_bExtraDebug)
@@ -102101,6 +103210,9 @@
+{
+ if(g_bExtraDebug)
+ XBMC->Log(LOG_DEBUG,"%s",__FUNCTION__);
++ SingleLock<PLATFORM::CMutex> lock(&m_lock);
++ if(m_rec.IsNull())
++ return -1;
+ long long retval=m_rec.LiveTVDuration();
+ if(g_bExtraDebug)
+ XBMC->Log(LOG_DEBUG,"%s - Done - duration: %i",__FUNCTION__,retval);
@@ -102121,7 +103233,7 @@
+ signalStatus.iUNC=signal.UNC();
+ CStdString ID;
+ CStdString adaptorStatus=signal.AdapterStatus();
-+ ID.Format("Myth Recorder %i",m_rec.ID());
++ ID.Format("Myth Recorder %i",signal.ID());
+ strcpy(signalStatus.strAdapterName,ID.Buffer());
+ strcpy(signalStatus.strAdapterStatus,adaptorStatus.Buffer());
+ if(g_bExtraDebug)
@@ -102276,13 +103388,12 @@
+ m_con.SetSetting(m_con.GetHostname(),"LiveTVPriority",value);
+ }
+}
-\ No newline at end of file
diff --git a/xbmc/pvrclients/mythtv-cmyth/pvrclient-mythtv.h b/xbmc/pvrclients/mythtv-cmyth/pvrclient-mythtv.h
new file mode 100644
-index 0000000..f8e058f
+index 0000000..167a20f
--- /dev/null
+++ b/xbmc/pvrclients/mythtv-cmyth/pvrclient-mythtv.h
-@@ -0,0 +1,109 @@
+@@ -0,0 +1,110 @@
+#include "cppmyth.h"
+#include "xbmc_pvr_types.h"
+#include <map>
@@ -102378,6 +103489,7 @@
+ MythEventHandler m_eventHandler;
+ MythDatabase m_db;
+ MythRecorder m_rec;
++ CMutex m_lock;
+ MythFile m_file;
+ CStdString m_protocolVersion;
+ CStdString m_connectionString;
@@ -102755,10 +103867,10 @@
\ No newline at end of file
diff --git a/xbmc/pvrclients/mythtv-cmyth/tools.h b/xbmc/pvrclients/mythtv-cmyth/tools.h
new file mode 100644
-index 0000000..f973d4a
+index 0000000..7627339
--- /dev/null
+++ b/xbmc/pvrclients/mythtv-cmyth/tools.h
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2005-2009 Team XBMC
+ * http://www.xbmc.org
@@ -102857,6 +103969,52 @@
+ int retval = ptm->tm_wday;
+ return retval;
+}
++
++template <class T> class SingleLock {
++private:
++ T *m_mutex;
++ bool m_locked;
++ bool Lock()
++ {
++ if (m_mutex && !m_locked)
++ {
++ m_mutex->Lock();
++ m_locked = true;
++ return true;
++ }
++ return false;
++ }
++
++ bool Unlock()
++ {
++ if (m_mutex && m_locked)
++ {
++ m_mutex->Unlock();
++ m_locked = false;
++ return true;
++ }
++ return false;
++ }
++
++public:
++ SingleLock(T *Mutex)
++ {
++ m_mutex = Mutex;
++ m_locked = false;
++ Lock();
++ }
++
++ ~SingleLock()
++ {
++ Unlock();
++ }
++
++ void Leave() { Unlock(); }
++ void Enter() { Lock(); }
++};
++
++
++
+#endif //__TOOLS_H
diff --git a/xbmc/pvrclients/mythtv/Makefile.in b/xbmc/pvrclients/mythtv/Makefile.in
new file mode 100644
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/EL-6/xbmc.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xbmc.spec 17 May 2012 18:11:49 -0000 1.46
+++ xbmc.spec 1 Jul 2012 12:28:45 -0000 1.47
@@ -5,7 +5,7 @@
Name: xbmc
Version: 11.0
-Release: 3%{?dist}
+Release: 7%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -52,12 +52,12 @@
# minor tweaks may be needed)
Patch5: xbmc-11.0-tsp-Eden-pvr.patch
-# backport myth-0.25 patch to Eden-PVR from dteirney
-#
-# git clone --branch myth-0.25 https://github.com/dteirney/xbmc.git xbmc-myth-0.25
-# cd xbmc-myth-0.25
-# git diff 00e6c1c > xbmc-11.0-dteirney-myth-0.25.patch
-Patch6: xbmc-11.0-dteirney-myth-0.25.patch
+# Optional deps (not in EPEL)
+# (libbluray in EPEL 6 is too old.)
+%{?fedora:%global _with_hdhomerun 1}
+%{?fedora:%global _with_crystalhd 1}
+%{?fedora:%global _with_libbluray 1}
+%{?fedora:%global _with_cwiid 1}
ExcludeArch: ppc64
Buildroot: %{_tmppath}/%{name}-%{version}
@@ -127,19 +127,34 @@
BuildRequires: pulseaudio-libs-devel
BuildRequires: libdca-devel
BuildRequires: libass-devel >= 0.9.7
+%if 0%{?_with_hdhomerun}
BuildRequires: hdhomerun-devel
+%endif
+%if 0%{?_with_crystalhd}
BuildRequires: libcrystalhd-devel
+%endif
BuildRequires: libmodplug-devel
BuildRequires: libmicrohttpd-devel
BuildRequires: expat-devel
BuildRequires: zip
+BuildRequires: libudev-devel
+# for AirPlay support
+BuildRequires: libplist-devel
+%if 0%{?el6}
+BuildRequires: gettext-devel
+%else
BuildRequires: gettext-autopoint
+%endif
BuildRequires: librtmp-devel
+%if 0%{?_with_libbluray}
BuildRequires: libbluray-devel
#BuildRequires: libbluray-devel >= 0.2.1
+%endif
BuildRequires: yajl-devel
BuildRequires: bluez-libs-devel
+%if 0%{?_with_cwiid}
BuildRequires: cwiid-devel
+%endif
# nfs-utils-lib-devel package currently broken
#BuildRequires: nfs-utils-lib-devel
@@ -150,9 +165,16 @@
# need explicit requires for these packages
# as they are dynamically loaded via XBMC's arcane
# pseudo-DLL loading scheme (sigh)
-Requires: libcrystalhd
Requires: librtmp
+%if 0%{?_with_hdhomerun}
+BuildRequires: hdhomerun
+%endif
+%if 0%{?_with_crystalhd}
+Requires: libcrystalhd
+%endif
+%if 0%{?_with_libbluray}
Requires: libbluray
+%endif
# needed when doing a minimal install, see
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1844
@@ -164,18 +186,6 @@
BuildRequires: python-imaging
Requires: python-imaging
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%description
XBMC media center is a free cross-platform media-player jukebox and
entertainment hub. XBMC can play a spectrum of of multimedia formats,
@@ -206,7 +216,17 @@
#patch3 -p0
%patch4 -p0
%patch5 -p1
-%patch6 -p1
+
+%if 0%{?_with_hdhomerun}
+%else
+ # Remove hdhomerun from the build.
+ pushd xbmc/filesystem/
+ rm HDHomeRun.cpp HDHomeRun.h
+ sed -i Makefile.in -e '/HDHomeRun\.cpp/d'
+ sed -i FactoryDirectory.cpp -e '/HomeRun/d'
+ sed -i FileFactory.cpp -e '/HomeRun/d'
+ popd
+%endif
%build
@@ -227,7 +247,7 @@
CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \
LDFLAGS="-fPIC" \
-LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \
+LIBS="-L%{_libdir}/mysql %{?_with_hdhomerun:-lhdhomerun} $LIBS" \
ASFLAGS=-fPIC
make %{?_smp_mflags} VERBOSE=1
@@ -255,10 +275,21 @@
#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
-
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%defattr(-,root,root)
%doc copying.txt keymapping.txt LICENSE.GPL README.linux
@@ -287,6 +318,27 @@
#%%{_includedir}/xbmc/xbmcclient.h
%changelog
+* Sun Jul 01 2012 Ken Dreyer <ktdreyer@ktdreyer..com> - 11.0-7
+- Set up with_* conditionals for optional dependencies
+- Disable hdhomerun and crystalhd for EPEL (#2339)
+
+* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 11.0-6
+- Rebuilt for FFmpeg
+
+* Wed Jun 6 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-5
+- Add missing BRs for libudev-devel and libplist-devel (needed for AirPlay)
+
+* Tue Jun 5 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-4
+- Drop separate dteirney-myth-0.25.patch and ktdryer's boost patch,
+ both are merged into tsp's Eden-pvr branch
+- Cleanup spec, fix position of scriplets (#2334)
+
+* Sat May 19 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 11.0-3.1
+- Changes for EL-6: (#2339)
+- Conditionally use gettext-devel instead of gettext-autopoint
+- Conditionally disable libbluray and cwiid BRs (unavailable in EL6)
+- Patch to build pvr with EL6's boost 1.41
+
* Thu May 17 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-3
- Remove the old MythTV add-on (no longer works
and can be confused with the new cmyth-based version)
11 years, 10 months
- 1
- 0
rpms/xbmc/devel xbmc.spec,1.49,1.50
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/xbmc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3850
Modified Files:
xbmc.spec
Log Message:
* Sun Jul 01 2012 Ken Dreyer <ktdreyer@ktdreyer..com> - 11.0-7
- Set up with_* conditionals for optional dependencies
- Disable hdhomerun and crystalhd for EPEL (#2339)
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xbmc.spec 26 Jun 2012 09:10:16 -0000 1.49
+++ xbmc.spec 1 Jul 2012 11:59:24 -0000 1.50
@@ -5,7 +5,7 @@
Name: xbmc
Version: 11.0
-Release: 6%{?dist}
+Release: 7%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -52,6 +52,13 @@
# minor tweaks may be needed)
Patch5: xbmc-11.0-tsp-Eden-pvr.patch
+# Optional deps (not in EPEL)
+# (libbluray in EPEL 6 is too old.)
+%{?fedora:%global _with_hdhomerun 1}
+%{?fedora:%global _with_crystalhd 1}
+%{?fedora:%global _with_libbluray 1}
+%{?fedora:%global _with_cwiid 1}
+
ExcludeArch: ppc64
Buildroot: %{_tmppath}/%{name}-%{version}
Summary: Media center
@@ -120,8 +127,12 @@
BuildRequires: pulseaudio-libs-devel
BuildRequires: libdca-devel
BuildRequires: libass-devel >= 0.9.7
+%if 0%{?_with_hdhomerun}
BuildRequires: hdhomerun-devel
+%endif
+%if 0%{?_with_crystalhd}
BuildRequires: libcrystalhd-devel
+%endif
BuildRequires: libmodplug-devel
BuildRequires: libmicrohttpd-devel
BuildRequires: expat-devel
@@ -135,17 +146,13 @@
BuildRequires: gettext-autopoint
%endif
BuildRequires: librtmp-devel
-%if 0%{?el6}
-# libbluray in EPEL 6 is too old.
-%else
+%if 0%{?_with_libbluray}
BuildRequires: libbluray-devel
-%endif
#BuildRequires: libbluray-devel >= 0.2.1
+%endif
BuildRequires: yajl-devel
BuildRequires: bluez-libs-devel
-%if 0%{?el6}
-# EPEL 6 does not have cwiid
-%else
+%if 0%{?_with_cwiid}
BuildRequires: cwiid-devel
%endif
@@ -158,11 +165,14 @@
# need explicit requires for these packages
# as they are dynamically loaded via XBMC's arcane
# pseudo-DLL loading scheme (sigh)
-Requires: libcrystalhd
Requires: librtmp
-%if 0%{?el6}
-# libbluray in EPEL 6 is too old.
-%else
+%if 0%{?_with_hdhomerun}
+BuildRequires: hdhomerun
+%endif
+%if 0%{?_with_crystalhd}
+Requires: libcrystalhd
+%endif
+%if 0%{?_with_libbluray}
Requires: libbluray
%endif
@@ -207,6 +217,17 @@
%patch4 -p0
%patch5 -p1
+%if 0%{?_with_hdhomerun}
+%else
+ # Remove hdhomerun from the build.
+ pushd xbmc/filesystem/
+ rm HDHomeRun.cpp HDHomeRun.h
+ sed -i Makefile.in -e '/HDHomeRun\.cpp/d'
+ sed -i FactoryDirectory.cpp -e '/HomeRun/d'
+ sed -i FileFactory.cpp -e '/HomeRun/d'
+ popd
+%endif
+
%build
chmod +x bootstrap
@@ -226,7 +247,7 @@
CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \
LDFLAGS="-fPIC" \
-LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \
+LIBS="-L%{_libdir}/mysql %{?_with_hdhomerun:-lhdhomerun} $LIBS" \
ASFLAGS=-fPIC
make %{?_smp_mflags} VERBOSE=1
@@ -297,6 +318,10 @@
#%%{_includedir}/xbmc/xbmcclient.h
%changelog
+* Sun Jul 01 2012 Ken Dreyer <ktdreyer@ktdreyer..com> - 11.0-7
+- Set up with_* conditionals for optional dependencies
+- Disable hdhomerun and crystalhd for EPEL (#2339)
+
* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 11.0-6
- Rebuilt for FFmpeg
11 years, 10 months
- 1
- 0
rpms/ufoai-data/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 ufoai-data.spec, 1.5, 1.6
by Karel Volný
Author: kvolny
Update of /cvs/nonfree/rpms/ufoai-data/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2608
Modified Files:
.cvsignore sources ufoai-data.spec
Log Message:
* Fri Jun 29 2012 Karel Volny <kvolny(a)redhat.com> 2.4-1
- Version bump
- Added introductory video
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 12 Mar 2011 16:21:59 -0000 1.4
+++ .cvsignore 1 Jul 2012 11:42:39 -0000 1.5
@@ -1,2 +1,3 @@
-ufoai-2.3.1-data.tar
+ufoai-2.4-data.tar
+intro.ogm
1maps.pk3
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 12 Mar 2011 16:21:59 -0000 1.4
+++ sources 1 Jul 2012 11:42:40 -0000 1.5
@@ -1,2 +1,3 @@
-11468144bc00618c38667eec04b12a4a ufoai-2.3.1-data.tar
+4f3f343754a4aae401582021901c4737 ufoai-2.4-data.tar
+692737788043d2fc049b060393f17b7a intro.ogm
0187f2169401d59423c6e01184fff90d 1maps.pk3
Index: ufoai-data.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/devel/ufoai-data.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ufoai-data.spec 8 Feb 2012 23:50:09 -0000 1.5
+++ ufoai-data.spec 1 Jul 2012 11:42:40 -0000 1.6
@@ -1,16 +1,19 @@
%define game_name ufoai
Name: ufoai-data
-Version: 2.3.1
-Release: 2
+Version: 2.4
+Release: 1
Summary: UFO: Alien Invasion data files
Group: Amusements/Games
License: GPLv2+
URL: http://ufoai.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{game_name}/%{game_name}-%{version}-dat...
+# not included in the package, downloaded from
+# http://ufoai.git.sourceforge.net/git/gitweb.cgi?p=ufoai/ufoai;a=blob;f=ba...
+Source1: intro.ogm
# city maps hotfix
-Source1: http://mattn.ninex.info/1maps.pk3
+Source2: http://mattn.ninex.info/1maps.pk3
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -46,8 +49,11 @@
rm -rf %{buildroot}
mkdir -p -m 0755 %{buildroot}%{_datadir}/%{game_name}
cp -pr base %{buildroot}%{_datadir}/%{game_name}/
+# introductory video not in data pack
+mkdir -p -m 0755 %{buildroot}%{_datadir}/%{game_name}/base/videos/
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{game_name}/base/videos/
# city maps hotfix
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{game_name}/base/
+install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/%{game_name}/base/
%clean
@@ -63,6 +69,8 @@
%{_datadir}/%{game_name}/base/0pics.pk3
%{_datadir}/%{game_name}/base/0snd.pk3
%{_datadir}/%{game_name}/base/0shaders.pk3
+%{_datadir}/%{game_name}/base/0textures.pk3
+%{_datadir}/%{game_name}/base/videos/
%files server
@@ -77,6 +85,10 @@
%changelog
+* Fri Jun 29 2012 Karel Volny <kvolny(a)redhat.com> 2.4-1
+- Version bump
+- Added introductory video
+
* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
11 years, 10 months
- 1
- 0
rpms/ufoai/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 ufoai.spec, 1.11, 1.12 ufoai-2.3-no-lua.patch, 1.1, NONE ufoai-2.3-radiant-ldl.patch, 1.1, NONE ufoai-2.3.1-gcc47.patch, 1.1, NONE ufoai-2.3.1-glib.patch, 1.1, NONE ufoai-2.3.1-radiant-apppath.patch, 1.1, NONE ufoai-2.3.1-zpng.patch, 1.1, NONE
by Karel Volný
Author: kvolny
Update of /cvs/nonfree/rpms/ufoai/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv549
Modified Files:
.cvsignore sources ufoai.spec
Removed Files:
ufoai-2.3-no-lua.patch ufoai-2.3-radiant-ldl.patch
ufoai-2.3.1-gcc47.patch ufoai-2.3.1-glib.patch
ufoai-2.3.1-radiant-apppath.patch ufoai-2.3.1-zpng.patch
Log Message:
* Fri Jun 29 2012 Karel Volny <kvolny(a)redhat.com> 2.4-1
- Version bump
- Changelog: http://ufoai.org/wiki/index.php/Changelog/2.4
- Fixed duplicate packaging of md2tag_export.py
- Added ufoslicer to -tools
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 14 Mar 2011 14:13:50 -0000 1.4
+++ .cvsignore 1 Jul 2012 11:17:30 -0000 1.5
@@ -1 +1 @@
-ufoai-2.3.1-source.tar.bz2
+ufoai-2.4-source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 14 Mar 2011 14:13:51 -0000 1.4
+++ sources 1 Jul 2012 11:17:30 -0000 1.5
@@ -1 +1 @@
-87b3e1bf3439dc6e5413936034f47d17 ufoai-2.3.1-source.tar.bz2
+d7e88aee0ea94149c8b9d90eb6c21ba9 ufoai-2.4-source.tar.bz2
Index: ufoai.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/ufoai.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ufoai.spec 15 May 2012 22:35:24 -0000 1.11
+++ ufoai.spec 1 Jul 2012 11:17:30 -0000 1.12
@@ -1,6 +1,6 @@
Name: ufoai
-Version: 2.3.1
-Release: 5%{?dist}
+Version: 2.4
+Release: 1%{?dist}
Summary: UFO: Alien Invasion
Group: Amusements/Games
@@ -9,13 +9,7 @@
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.tar.bz2
Source1: %{name}-wrapper.sh
Source2: uforadiant-wrapper.sh
-Patch0: ufoai-2.3-no-lua.patch
-Patch1: ufoai-2.3-radiant-ldl.patch
-Patch2: ufoai-2.3-desktop-files.patch
-Patch3: ufoai-2.3.1-radiant-apppath.patch
-Patch4: ufoai-2.3.1-zpng.patch
-Patch5: ufoai-2.3.1-gcc47.patch
-Patch6: ufoai-2.3.1-glib.patch
+Patch0: ufoai-2.3-desktop-files.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -120,30 +114,35 @@
%prep
%setup -q -n %{name}-%{version}-source
-# ufoai-2.3-no-lua.patch - disable bundled lua
-%patch0 -p0
-# ufoai-2.3-radiant-ldl.patch - add 'ldl' to RADIANT_LIBS
-# need to use fuzz, the Makefile has changed since 2.3
-%patch1 -F2 -p0
# ufoai-2.3-desktop-files.patch - fix executable and icon names
-%patch2 -p0
-# ufoai-2.3.1-radiant-apppath.patch - fix test for appPath
-%patch3 -p0
-## we do not like "arch-dependent-file" in /usr/share
-# change the target for the library
-sed -i -e "s/base/./" build/game.mk
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1 -b .glib
+%patch0 -p0
+# maps and models are in ufoai-data package, do not try to build them
+sed -i -e "/maps.mk/d" Makefile
+sed -i -e "/models.mk/d" Makefile
+# we don't use any of the installers
+sed -i -e "/install.mk/d" Makefile
%build
-%configure --enable-release
+# don't use %%configure, UFOAI doesn't like default configure options
+./configure \
+ --disable-dependency-tracking \
+ --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --datadir=%{_datadir}/%{name} \
+ --libdir=%{_libdir}/%{name} \
+ --localedir=%{_datarootdir}/locale \
+ --enable-ufoded \
+ --enable-uforadiant \
+ --enable-ufo2map \
+ --enable-ufomodel \
+ --enable-release
+
make %{?_smp_mflags}
make %{?_smp_mflags} lang
# build documentation
-make %{?_smp_mflags} pdf-manual
+make %{?_smp_mflags} manual
# build uforadiant
make %{?_smp_mflags} uforadiant
@@ -166,12 +165,11 @@
desktop-file-install --dir=%{buildroot}%{_datadir}/applications debian/ufoai.desktop
## install common
-install -D -m 0755 game.so %{buildroot}%{_libdir}/%{name}/game.so
+install -D -m 0755 base/game.so %{buildroot}%{_libdir}/%{name}/game.so
## install doc
mkdir -p -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}
-cp -pr README COPYING src/docs/tex/*.pdf \
- %{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr README COPYING src/docs/tex/*.pdf %{buildroot}%{_docdir}/%{name}-%{version}/
## install server
install -D -m 0755 ufoded %{buildroot}%{_bindir}
@@ -183,6 +181,7 @@
install -D -m 0755 ufo2map %{buildroot}%{_bindir}
install -D -m 0644 debian/ufo2map.6 %{buildroot}%{_mandir}/man6/ufo2map.6
install -D -m 0755 ufomodel %{buildroot}%{_bindir}
+install -D -m 0755 ufoslicer %{buildroot}%{_bindir}
install -D src/tools/blender/md2tag_export.py %{buildroot}%{_datadir}/%{name}/tools/md2tag_export.py
# not available in our sources
#install -D -m 0644 contrib/scripts/bashcompletion/ufo2map %%{buildroot}%%{_sysconfdir}/bash_completion.d/ufo2map
@@ -192,12 +191,11 @@
install -D -m 0755 radiant/uforadiant %{buildroot}%{_bindir}/uforadiant
install -p -m 0755 %{SOURCE2} %{buildroot}%{_bindir}
install -D -m 0644 debian/uforadiant.6 %{buildroot}%{_mandir}/man6/uforadiant.6
-install -D -m 0755 radiant/plugins/brushexport.so %{buildroot}%{_libdir}/uforadiant/brushexport.so
mkdir -p -m 0755 %{buildroot}%{_datadir}/%{name}/radiant
+cp -p radiant/*.xml %{buildroot}%{_datadir}/%{name}/radiant/
+cp -p radiant/mapdef.template %{buildroot}%{_datadir}/%{name}/radiant/
cp -pr radiant/bitmaps %{buildroot}%{_datadir}/%{name}/radiant
-cp -pr radiant/games %{buildroot}%{_datadir}/%{name}/radiant
cp -pr radiant/prefabs %{buildroot}%{_datadir}/%{name}/radiant
-cp -pr radiant/shaders %{buildroot}%{_datadir}/%{name}/radiant
cp -pr radiant/sourceviewer %{buildroot}%{_datadir}/%{name}/radiant
cp -pr radiant/i18n/* %{buildroot}%{_datadir}/locale/
%find_lang uforadiant
@@ -290,6 +288,7 @@
%defattr(-,root,root,-)
%{_bindir}/ufo2map
%{_bindir}/ufomodel
+%{_bindir}/ufoslicer
%dir %{_datadir}/%{name}/
# not available in our sources
#%%{_sysconfdir}/bash_completion.d/
@@ -304,12 +303,16 @@
%{_datadir}/applications/uforadiant.desktop
%{_datadir}/icons/hicolor/32x32/apps/uforadiant.xpm
%{_datadir}/%{name}/radiant/
-%{_libdir}/uforadiant/
%doc %{_mandir}/man6/uforadiant.6*
-%{_datadir}/%{name}/tools/md2tag_export.py
%changelog
+* Fri Jun 29 2012 Karel Volny <kvolny(a)redhat.com> 2.4-1
+- Version bump
+- Changelog: http://ufoai.org/wiki/index.php/Changelog/2.4
+- Fixed duplicate packaging of md2tag_export.py
+- Added ufoslicer to -tools
+
* Tue May 15 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-5
- Fix FTBFS
--- ufoai-2.3-no-lua.patch DELETED ---
--- ufoai-2.3-radiant-ldl.patch DELETED ---
--- ufoai-2.3.1-gcc47.patch DELETED ---
--- ufoai-2.3.1-glib.patch DELETED ---
--- ufoai-2.3.1-radiant-apppath.patch DELETED ---
--- ufoai-2.3.1-zpng.patch DELETED ---
11 years, 10 months
- 1
- 0