rpms/Miro/devel Miro-1.2.6-boost.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 Miro.spec, 1.36, 1.37 sources, 1.11, 1.12

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24149

Modified Files:
	.cvsignore Miro.spec sources 
Added Files:
	Miro-1.2.6-boost.patch 
Log Message:
* Fri Aug 22 2008 Michel Salim <salimma at fedoraproject.org> - 1.2.6-1
- Update to 1.2.6
- Patch for boost API change


Miro-1.2.6-boost.patch:

--- NEW FILE Miro-1.2.6-boost.patch ---
--- Miro-1.2.6/portable/libtorrent/include/libtorrent/disk_io_thread.hpp.boost	2008-08-15 00:50:40.000000000 -0400
+++ Miro-1.2.6/portable/libtorrent/include/libtorrent/disk_io_thread.hpp	2008-08-22 18:52:56.000000000 -0400
@@ -37,6 +37,7 @@
 #include "libtorrent/storage.hpp"
 #include <boost/thread/thread.hpp>
 #include <boost/function.hpp>
+#include <boost/thread/condition.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/bind.hpp>
 #include <boost/pool/pool.hpp>
--- Miro-1.2.6/portable/libtorrent/src/torrent_info.cpp.boost	2008-08-15 00:50:41.000000000 -0400
+++ Miro-1.2.6/portable/libtorrent/src/torrent_info.cpp	2008-08-22 18:06:31.000000000 -0400
@@ -352,7 +352,7 @@
 		fs::path tmp = m_name;
 		if (tmp.is_complete()) throw std::runtime_error("torrent contains "
 			"a file with an absolute path: '" + m_name + "'");
-		if (tmp.has_branch_path()) throw std::runtime_error(
+		if (tmp.has_parent_path()) throw std::runtime_error(
 			"torrent contains name with directories: '" + m_name + "'");
 	
 		// extract file list
@@ -556,7 +556,7 @@
 	{
 //		TORRENT_ASSERT(file.begin() != file.end());
 
-		if (!file.has_branch_path())
+		if (!file.has_parent_path())
 		{
 			// you have already added at least one file with a
 			// path to the file (branch_path), which means that
@@ -644,7 +644,7 @@
 					fs::path const* file_path;
 					if (i->orig_path) file_path = &(*i->orig_path);
 					else file_path = &i->path;
-					TORRENT_ASSERT(file_path->has_branch_path());
+					TORRENT_ASSERT(file_path->has_parent_path());
 					TORRENT_ASSERT(*file_path->begin() == m_name);
 
 					for (fs::path::iterator j = boost::next(file_path->begin());


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	15 Jun 2008 12:07:54 -0000	1.11
+++ .cvsignore	23 Aug 2008 00:36:59 -0000	1.12
@@ -1 +1 @@
-Miro-1.2.4.tar.gz
+Miro-1.2.6.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Miro.spec	12 Aug 2008 10:33:52 -0000	1.36
+++ Miro.spec	23 Aug 2008 00:36:59 -0000	1.37
@@ -4,8 +4,8 @@
 %define gecko_ver 1.9.0.1
 
 Name:           Miro
-Version:        1.2.4
-Release:        4%{?dist}
+Version:        1.2.6
+Release:        1%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -14,6 +14,7 @@
 Patch0:         %{name}-1.1-utf8.patch
 Patch1:		%{name}-xulrunner.patch
 Patch2:		%{name}-gcc43.patch
+Patch3:         %{name}-1.2.6-boost.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel xine-lib-devel Pyrex 
 BuildRequires:  boost-devel pygtk2-devel libXv-devel openssl-devel
@@ -32,9 +33,10 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1 -b .utf8
+%patch1 -p1 -b .xulrunner
+%patch2 -p1 -b .gcc43
+%patch3 -p1 -b .boost
 
 %build
 cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -79,6 +81,10 @@
 
 
 %changelog
+* Fri Aug 22 2008 Michel Salim <salimma at fedoraproject.org> - 1.2.6-1
+- Update to 1.2.6
+- Patch for boost API change
+
 * Tue Aug 12 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-4
 - Rebuild for new boost (fixes broken deps).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	15 Jun 2008 12:07:54 -0000	1.11
+++ sources	23 Aug 2008 00:36:59 -0000	1.12
@@ -1 +1 @@
-0bb345164b1b6f79ed60f5aab891385f  Miro-1.2.4.tar.gz
+7425284e553a41a52b173f748391f3d5  Miro-1.2.6.tar.gz