October 2012 - rpmfusion-commits

rpms/xorg-x11-drv-catalyst/F-18 sources,1.6,1.7

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24934 Modified Files: sources Log Message: remove old source Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 23 Oct 2012 12:22:47 -0000 1.6 +++ sources 23 Oct 2012 12:31:00 -0000 1.7 @@ -1,3 +1,2 @@ b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz -531c6a030078521b595815cfc19643f5 amd-driver-installer-12-9-beta-x86.x86_64.zip ef6ecd984e47e80849215b33fbfa5b7f amd-driver-installer-catalyst-12.10-x86.x86_64.zip

12 years, 1 month

1
0
0 / 0

rpms/xorg-x11-drv-catalyst/F-18 .cvsignore, 1.6, 1.7 sources, 1.5, 1.6 xorg-x11-drv-catalyst.spec, 1.6, 1.7

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24487 Modified Files: .cvsignore sources xorg-x11-drv-catalyst.spec Log Message: * Tue Oct 23 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.10-1 - Update to Catalyst 12.10 release (internal version 9.002) Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Oct 2012 06:51:21 -0000 1.6 +++ .cvsignore 23 Oct 2012 12:22:47 -0000 1.7 @@ -1,3 +1,4 @@ xvba-sdk-0.74-404001.tar.gz ati-driver-installer-11-11-x86.x86_64.run amd-driver-installer-12-9-beta-x86.x86_64.zip +amd-driver-installer-catalyst-12.10-x86.x86_64.zip Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Oct 2012 06:51:21 -0000 1.5 +++ sources 23 Oct 2012 12:22:47 -0000 1.6 @@ -1,2 +1,3 @@ b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz 531c6a030078521b595815cfc19643f5 amd-driver-installer-12-9-beta-x86.x86_64.zip +ef6ecd984e47e80849215b33fbfa5b7f amd-driver-installer-catalyst-12.10-x86.x86_64.zip Index: xorg-x11-drv-catalyst.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18/xorg-x11-drv-catalyst.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xorg-x11-drv-catalyst.spec 9 Oct 2012 06:51:21 -0000 1.6 +++ xorg-x11-drv-catalyst.spec 23 Oct 2012 12:22:47 -0000 1.7 @@ -1,16 +1,16 @@ %global atilibdir %{_libdir}/catalyst -%global amdrun amd-driver-installer-12-9-beta-x86.x86_64.run -%global debug_package %{nil} +%global amdrun amd-driver-installer-catalyst-12.10-x86.x86_64.run +%global debug_package %{nil} %global __strip /bin/true Name: xorg-x11-drv-catalyst -Version: 12.9 -Release: 0.1.beta%{?dist} +Version: 12.10 +Release: 1%{?dist} Summary: AMD's proprietary driver for ATI graphic cards Group: User Interface/X Hardware Support License: Redistributable, no modification permitted URL: http://www.ati.com/support/drivers/linux/radeon-linux.html -Source0: http://www2.ati.com/drivers/beta/amd-driver-installer-12-9-beta-x86.x86_6... +Source0: http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-12.10-x86... Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz Source2: catalyst-README.Fedora Source3: amdcccle.desktop @@ -397,6 +397,9 @@ %changelog +* Tue Oct 23 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.10-1 +- Update to Catalyst 12.10 release (internal version 9.002) + * Mon Oct 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.9-0.1.beta - Update to Catalyst 12.9 beta (internal version 9.00)

12 years, 1 month

1
0
0 / 0

rpms/catalyst-kmod/F-18 .cvsignore, 1.7, 1.8 catalyst-kmod.spec, 1.15, 1.16 sources, 1.6, 1.7

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/catalyst-kmod/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23198 Modified Files: .cvsignore catalyst-kmod.spec sources Log Message: * Tue Oct 23 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.10-1 - Update to Catalyst 12.10 release (internal version 9.002) Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-18/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Oct 2012 06:50:18 -0000 1.7 +++ .cvsignore 23 Oct 2012 12:00:07 -0000 1.8 @@ -1 +1 @@ -catalyst-kmod-data-12.9.tar.bz2 +catalyst-kmod-data-12.10.tar.bz2 Index: catalyst-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-18/catalyst-kmod.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- catalyst-kmod.spec 9 Oct 2012 06:50:18 -0000 1.15 +++ catalyst-kmod.spec 23 Oct 2012 12:00:08 -0000 1.16 @@ -12,8 +12,8 @@ %endif Name: catalyst-kmod -Version: 12.9 -Release: 0.1.beta%{?dist} +Version: 12.10 +Release: 1%{?dist} # Taken over by kmodtool Summary: AMD display driver kernel module Group: System Environment/Kernel @@ -97,6 +97,9 @@ %changelog +* Tue Oct 23 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.10-1 +- Update to Catalyst 12.10 release (internal version 9.002) + * Mon Oct 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.9-0.1.beta - Update to Catalyst 12.9 beta (internal version 9.00) Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-18/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Oct 2012 06:50:18 -0000 1.6 +++ sources 23 Oct 2012 12:00:08 -0000 1.7 @@ -1 +1 @@ -37e3e4494a9f83833a9ff3eb997433f1 catalyst-kmod-data-12.9.tar.bz2 +3f0b8c70672b43ed7ce8590e0ce24026 catalyst-kmod-data-12.10.tar.bz2

12 years, 1 month

1
0
0 / 0

rpms/bombono-dvd/F-18 bombono-dvd-boost-1.51.0-fix.patch, NONE, 1.1 bombono-dvd-buildflags.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 bombono-dvd.spec, 1.6, 1.7 sources, 1.4, 1.5

by Alec Leamas

Author: leamas Update of /cvs/free/rpms/bombono-dvd/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13051 Modified Files: .cvsignore bombono-dvd.spec sources Added Files: bombono-dvd-boost-1.51.0-fix.patch bombono-dvd-buildflags.patch Log Message: * Fri Jun 15 2012 Alec Leamas <alec(a)nowhere.com> 1.2.0-6.20120615gitcdab110 - Applying boost patch available as merge request at gitorious upstream. - Fixing build flags bombono-dvd-boost-1.51.0-fix.patch: libs/boost-lib/boost/filesystem/v2/fstream.hpp | 26 +++++----- libs/boost-lib/boost/filesystem/v2/operations.hpp | 2 libs/boost-lib/boost/filesystem/v2/path.hpp | 24 ++++----- libs/boost-lib/boost/filesystem/v3/path.hpp | 6 +- libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp | 4 - libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp | 2 libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp | 2 libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp | 2 libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp | 2 libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp | 2 libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp | 4 - libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp | 2 src/mbase/project/table.cpp | 2 src/mgui/author/script.cpp | 2 src/mgui/editor/toolbar.cpp | 2 src/mgui/mux.cpp | 2 src/mgui/project/add.cpp | 6 +- src/mgui/project/mconstructor.cpp | 2 src/mgui/project/serialize.cpp | 2 src/mgui/win_utils.cpp | 2 src/mlib/filesystem.cpp | 16 ------ 21 files changed, 51 insertions(+), 63 deletions(-) --- NEW FILE bombono-dvd-boost-1.51.0-fix.patch --- >From a144c07915e82607bbc76791251e8e576e17149e Mon Sep 17 00:00:00 2001 From: Slava Dubrovskiy <dubrsl(a)altlinux.ru> Date: Thu, 6 Sep 2012 20:18:45 +0300 Subject: [PATCH 2/2] Fix build with boost 1.51.0 --- libs/boost-lib/boost/filesystem/v2/fstream.hpp | 26 +++++++++++----------- libs/boost-lib/boost/filesystem/v2/operations.hpp | 2 +- libs/boost-lib/boost/filesystem/v2/path.hpp | 24 ++++++++++---------- libs/boost-lib/boost/filesystem/v3/path.hpp | 6 ++--- libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp | 4 ++-- .../boost/logging/writer/on_dedicated_thread.hpp | 2 +- .../samples/scenarios/ded_loger_one_filter.cpp | 2 +- .../samples/scenarios/ts_loger_one_filter.cpp | 2 +- .../logging/samples/scenarios/your_scenario.cpp | 2 +- .../tests/test_simple_tss/test_simple_tss.cpp | 2 +- .../test_ts_resource.cpp | 4 ++-- .../logging/tests/test_tss/test_tss_objects.cpp | 2 +- src/mbase/project/table.cpp | 2 +- src/mgui/author/script.cpp | 2 +- src/mgui/editor/toolbar.cpp | 2 +- src/mgui/mux.cpp | 2 +- src/mgui/project/add.cpp | 6 ++--- src/mgui/project/mconstructor.cpp | 2 +- src/mgui/project/serialize.cpp | 2 +- src/mgui/win_utils.cpp | 2 +- src/mlib/filesystem.cpp | 15 ++----------- 21 files changed, 51 insertions(+), 62 deletions(-) diff --git a/libs/boost-lib/boost/filesystem/v2/fstream.hpp b/libs/boost-lib/boost/filesystem/v2/fstream.hpp index bdcd485..101ed30 100644 --- a/libs/boost-lib/boost/filesystem/v2/fstream.hpp +++ b/libs/boost-lib/boost/filesystem/v2/fstream.hpp @@ -488,27 +488,27 @@ namespace boost std::ios_base::openmode mode ) { return std::basic_filebuf<charT,traits>::open( - file_ph.file_string().c_str(), mode ) == 0 ? 0 : this; + file_ph.string().c_str(), mode ) == 0 ? 0 : this; } # endif template <class charT, class traits> basic_ifstream<charT,traits>::basic_ifstream( const path & file_ph ) : std::basic_ifstream<charT,traits>( - file_ph.file_string().c_str(), std::ios_base::in ) {} + file_ph.string().c_str(), std::ios_base::in ) {} template <class charT, class traits> basic_ifstream<charT,traits>::basic_ifstream( const path & file_ph, std::ios_base::openmode mode ) : std::basic_ifstream<charT,traits>( - file_ph.file_string().c_str(), mode ) {} + file_ph.string().c_str(), mode ) {} # if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this template <class charT, class traits> void basic_ifstream<charT,traits>::open( const path & file_ph ) { std::basic_ifstream<charT,traits>::open( - file_ph.file_string().c_str(), std::ios_base::in ); + file_ph.string().c_str(), std::ios_base::in ); } template <class charT, class traits> @@ -516,27 +516,27 @@ namespace boost std::ios_base::openmode mode ) { std::basic_ifstream<charT,traits>::open( - file_ph.file_string().c_str(), mode ); + file_ph.string().c_str(), mode ); } # endif template <class charT, class traits> basic_ofstream<charT,traits>::basic_ofstream( const path & file_ph ) : std::basic_ofstream<charT,traits>( - file_ph.file_string().c_str(), std::ios_base::out ) {} + file_ph.string().c_str(), std::ios_base::out ) {} template <class charT, class traits> basic_ofstream<charT,traits>::basic_ofstream( const path & file_ph, std::ios_base::openmode mode ) : std::basic_ofstream<charT,traits>( - file_ph.file_string().c_str(), mode ) {} + file_ph.string().c_str(), mode ) {} # if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this template <class charT, class traits> void basic_ofstream<charT,traits>::open( const path & file_ph ) { std::basic_ofstream<charT,traits>::open( - file_ph.file_string().c_str(), std::ios_base::out ); + file_ph.string().c_str(), std::ios_base::out ); } template <class charT, class traits> @@ -544,14 +544,14 @@ namespace boost std::ios_base::openmode mode ) { std::basic_ofstream<charT,traits>::open( - file_ph.file_string().c_str(), mode ); + file_ph.string().c_str(), mode ); } # endif template <class charT, class traits> basic_fstream<charT,traits>::basic_fstream( const path & file_ph ) : std::basic_fstream<charT,traits>( - file_ph.file_string().c_str(), + file_ph.string().c_str(), std::ios_base::in|std::ios_base::out ) {} @@ -559,14 +559,14 @@ namespace boost basic_fstream<charT,traits>::basic_fstream( const path & file_ph, std::ios_base::openmode mode ) : std::basic_fstream<charT,traits>( - file_ph.file_string().c_str(), mode ) {} + file_ph.string().c_str(), mode ) {} # if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this template <class charT, class traits> void basic_fstream<charT,traits>::open( const path & file_ph ) { std::basic_fstream<charT,traits>::open( - file_ph.file_string().c_str(), std::ios_base::in|std::ios_base::out ); + file_ph.string().c_str(), std::ios_base::in|std::ios_base::out ); } template <class charT, class traits> @@ -574,7 +574,7 @@ namespace boost std::ios_base::openmode mode ) { std::basic_fstream<charT,traits>::open( - file_ph.file_string().c_str(), mode ); + file_ph.string().c_str(), mode ); } # endif } // namespace filesystem2 diff --git a/libs/boost-lib/boost/filesystem/v2/operations.hpp b/libs/boost-lib/boost/filesystem/v2/operations.hpp index 9bd35cd..ad08cc3 100644 --- a/libs/boost-lib/boost/filesystem/v2/operations.hpp +++ b/libs/boost-lib/boost/filesystem/v2/operations.hpp @@ -1081,7 +1081,7 @@ namespace boost { return path().filename(); } - typename Path::string_type leaf() const + typename Path::string_type filename().string() const { return path().filename(); } diff --git a/libs/boost-lib/boost/filesystem/v2/path.hpp b/libs/boost-lib/boost/filesystem/v2/path.hpp index d159c37..580b635 100644 --- a/libs/boost-lib/boost/filesystem/v2/path.hpp +++ b/libs/boost-lib/boost/filesystem/v2/path.hpp @@ -232,11 +232,11 @@ namespace boost // observers const string_type & string() const { return m_path; } - const string_type file_string() const; - const string_type directory_string() const { return file_string(); } + const string_type string() const; + const string_type string() const { return string(); } - const external_string_type external_file_string() const { return Traits::to_external( *this, file_string() ); } - const external_string_type external_directory_string() const { return Traits::to_external( *this, directory_string() ); } + const external_string_type external_file_string() const { return Traits::to_external( *this, string() ); } + const external_string_type external_directory_string() const { return Traits::to_external( *this, string() ); } basic_path root_path() const; string_type root_name() const; @@ -248,7 +248,7 @@ namespace boost string_type extension() const; # ifndef BOOST_FILESYSTEM_NO_DEPRECATED - string_type leaf() const { return filename(); } + string_type filename().string() const { return filename(); } basic_path branch_path() const { return parent_path(); } bool has_leaf() const { return !m_path.empty(); } bool has_branch_path() const { return !parent_path().empty(); } @@ -309,8 +309,8 @@ namespace boost // are only minor differences between generic and native path grammars. // Private members might be quite different in other implementations, // particularly where there were wide differences between portable and - // native path formats, or between file_string() and - // directory_string() formats, or simply that the implementation + // native path formats, or between string() and + // string() formats, or simply that the implementation // was willing expend additional memory to achieve greater speed for // some operations at the expense of other operations. @@ -338,8 +338,8 @@ namespace boost basic_path( const string_type & str, name_check ) { operator/=( str ); } basic_path( const typename string_type::value_type * s, name_check ) { operator/=( s );} - string_type native_file_string() const { return file_string(); } - string_type native_directory_string() const { return directory_string(); } + string_type native_file_string() const { return string(); } + string_type native_directory_string() const { return string(); } static bool default_name_check_writable() { return false; } static void default_name_check( name_check ) {} static name_check default_name_check() { return 0; } @@ -647,13 +647,13 @@ namespace boost if ( !path1_arg.empty() ) { target += ": \""; - target += path1_arg.file_string(); + target += path1_arg.string(); target += "\""; } if ( !path2_arg.empty() ) { target += ", \""; - target += path2_arg.file_string(); + target += path2_arg.string(); target += "\""; } } @@ -1294,7 +1294,7 @@ namespace boost template<class String, class Traits> const String - basic_path<String, Traits>::file_string() const + basic_path<String, Traits>::string() const { # ifdef BOOST_WINDOWS_PATH // for Windows, use the alternate separator, and bypass extra diff --git a/libs/boost-lib/boost/filesystem/v3/path.hpp b/libs/boost-lib/boost/filesystem/v3/path.hpp index 0caa19f..fe3c975 100644 --- a/libs/boost-lib/boost/filesystem/v3/path.hpp +++ b/libs/boost-lib/boost/filesystem/v3/path.hpp @@ -389,7 +389,7 @@ namespace filesystem3 // recently deprecated functions supplied by default path& normalize() { return m_normalize(); } path& remove_leaf() { return remove_filename(); } - path leaf() const { return filename(); } + path filename().string() const { return filename(); } path branch_path() const { return parent_path(); } bool has_leaf() const { return !m_pathname.empty(); } bool has_branch_path() const { return !parent_path().empty(); } @@ -399,8 +399,8 @@ namespace filesystem3 # if defined(BOOST_FILESYSTEM_DEPRECATED) // deprecated functions with enough signature or semantic changes that they are // not supplied by default - const std::string file_string() const { return string(); } - const std::string directory_string() const { return string(); } + const std::string string() const { return string(); } + const std::string string() const { return string(); } const std::string native_file_string() const { return string(); } const std::string native_directory_string() const { return string(); } const string_type external_file_string() const { return native(); } diff --git a/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp b/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp index 7adeaff..4fc0343 100644 --- a/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp +++ b/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp @@ -107,13 +107,13 @@ namespace boost // if ( !path1.empty() ) // { // target += ": \""; - // target += path1.file_string(); + // target += path1.string(); // target += "\""; // } // if ( !path2.empty() ) // { // target += ", \""; - // target += path2.file_string(); + // target += path2.string(); // target += "\""; // } // } diff --git a/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp b/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp index 7b0aa71..a4a6f28 100644 --- a/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp +++ b/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp @@ -166,7 +166,7 @@ private: } boost::xtime to_wait; - xtime_get(&to_wait, boost::TIME_UTC); + xtime_get(&to_wait, boost::TIME_UTC_); to_wait.sec += sleep_ms / 1000; to_wait.nsec += (sleep_ms % 1000) * (NANOSECONDS_PER_SECOND / 1000); to_wait.sec += to_wait.nsec / NANOSECONDS_PER_SECOND ; diff --git a/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp b/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp index 1d934da..d45beb4 100644 --- a/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp +++ b/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp @@ -103,7 +103,7 @@ BOOST_DEFINE_LOG(g_l, log_type) void do_sleep(int ms) { using namespace boost; xtime next; - xtime_get( &next, TIME_UTC); + xtime_get( &next, TIME_UTC_); next.nsec += (ms % 1000) * 1000000; int nano_per_sec = 1000000000; diff --git a/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp b/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp index 9746319..4b9f845 100644 --- a/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp +++ b/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp @@ -95,7 +95,7 @@ BOOST_DEFINE_LOG(g_l, log_type) void do_sleep(int ms) { using namespace boost; xtime next; - xtime_get( &next, TIME_UTC); + xtime_get( &next, TIME_UTC_); next.nsec += (ms % 1000) * 1000000; int nano_per_sec = 1000000000; diff --git a/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp b/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp index d447f24..f5ad955 100644 --- a/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp +++ b/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp @@ -124,7 +124,7 @@ BOOST_DEFINE_LOG(g_log_dbg, finder::logger ) void do_sleep(int ms) { using namespace boost; xtime next; - xtime_get( &next, TIME_UTC); + xtime_get( &next, TIME_UTC_); next.nsec += (ms % 1000) * 1000000; int nano_per_sec = 1000000000; diff --git a/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp b/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp index 627618e..205d07a 100644 --- a/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp +++ b/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp @@ -75,7 +75,7 @@ using namespace logging; void do_sleep(int ms) { xtime next; - xtime_get( &next, TIME_UTC); + xtime_get( &next, TIME_UTC_); next.nsec += (ms % 1000) * 1000000; int nano_per_sec = 1000000000; diff --git a/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp b/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp index 0bee896..2217c12 100644 --- a/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp +++ b/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp @@ -167,7 +167,7 @@ void test_resource(int idx) { void do_sleep(int ms) { xtime next; - xtime_get( &next, TIME_UTC); + xtime_get( &next, TIME_UTC_); next.nsec += (ms % 1000) * 1000000; int nano_per_sec = 1000000000; @@ -262,7 +262,7 @@ int g_run_period_secs = 200; int main() { - xtime_get( &g_start, TIME_UTC); + xtime_get( &g_start, TIME_UTC_); for ( int i = 0; i < g_update_thread_count; ++i) thread t(&update_thread); diff --git a/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp b/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp index b8e1ba6..14c8281 100644 --- a/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp +++ b/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp @@ -98,7 +98,7 @@ private: void do_sleep(int ms) { xtime next; - xtime_get( &next, TIME_UTC); + xtime_get( &next, TIME_UTC_); next.nsec += (ms % 1000) * 1000000; int nano_per_sec = 1000000000; diff --git a/src/mbase/project/table.cpp b/src/mbase/project/table.cpp index 33ee15a..feb851a 100644 --- a/src/mbase/project/table.cpp +++ b/src/mbase/project/table.cpp @@ -427,7 +427,7 @@ void GetThemeList(Str::List& t_lst) { for( fs::directory_iterator itr(dir), end; itr != end; ++itr ) if( IsFrameDir(*itr) ) - t_lst.push_back(itr->leaf()); + t_lst.push_back(itr->path().filename().string()); } } diff --git a/src/mgui/author/script.cpp b/src/mgui/author/script.cpp index aa2b494..0c34a08 100644 --- a/src/mgui/author/script.cpp +++ b/src/mgui/author/script.cpp @@ -370,7 +370,7 @@ static std::string SrcFilename(VideoItem vi) static std::string PrefixCnvPath(VideoItem vi, const std::string& out_dir) { std::string dst_fname = boost::format("%1%.%2%") % GetAuthorNumber(vi) - % fs::path(SrcFilename(vi)).leaf() % bf::stop; + % fs::path(SrcFilename(vi)).filename().string() % bf::stop; return AppendPath(out_dir, dst_fname); } diff --git a/src/mgui/editor/toolbar.cpp b/src/mgui/editor/toolbar.cpp index e549490..c6f15b3 100644 --- a/src/mgui/editor/toolbar.cpp +++ b/src/mgui/editor/toolbar.cpp @@ -287,7 +287,7 @@ Toolbar::Toolbar(): selTool(MakeSelectionToolImage()), txtTool(MakeTextToolLabel if( fs::is_directory(dir) ) { boost_foreach( const fs::path& pth, dir_range(dir) ) - o_lst.push_back(pth.filename()); + o_lst.push_back(pth.filename().string()); } } std::sort(o_lst.begin(), o_lst.end(), &ByExtName); diff --git a/src/mgui/mux.cpp b/src/mgui/mux.cpp index 4b4a5fa..0864bc2 100644 --- a/src/mgui/mux.cpp +++ b/src/mgui/mux.cpp @@ -72,7 +72,7 @@ void SetDialogStrict(Gtk::Dialog& dlg, int min_wdh, int min_hgt, bool set_resiza static bool RunMuxing(const std::string& dest_path, const std::string& args) { - Gtk::Dialog dlg(BF_("Muxing \"%1%\"") % fs::path(dest_path).leaf() % bf::stop); + Gtk::Dialog dlg(BF_("Muxing \"%1%\"") % fs::path(dest_path).filename().string() % bf::stop); SetDialogStrict(dlg, 400, -1); Gtk::TextView& txt_view = NewManaged<Gtk::TextView>(); diff --git a/src/mgui/project/add.cpp b/src/mgui/project/add.cpp index db4df17..0425a9b 100644 --- a/src/mgui/project/add.cpp +++ b/src/mgui/project/add.cpp @@ -420,7 +420,7 @@ void TryAddMediaQuiet(const std::string& fname, const std::string& desc) static std::string StandFNameOut(const fs::path& pth) { return "<span style=\"italic\" underline=\"low\">" + - pth.leaf() + "</span>"; + pth.filename().string() + "</span>"; } #if GTK_CHECK_VERSION(2,18,0) @@ -454,7 +454,7 @@ StorageItem CheckExists(const fs::path& pth, RefPtr<MediaStore> ms) void OneMediaError(const fs::path& err_pth, const std::string& desc) { - AddMediaError(BF_("Can't add file \"%1%\".") % err_pth.leaf() % bf::stop, desc); + AddMediaError(BF_("Can't add file \"%1%\".") % err_pth.filename().string() % bf::stop, desc); } void TryAddMedias(const Str::List& paths, MediaBrowser& brw, @@ -465,7 +465,7 @@ void TryAddMedias(const Str::List& paths, MediaBrowser& brw, { const std::string fname = paths[0]; fs::path pth(fname); - std::string leaf = pth.leaf(); + std::string leaf = pth.filename().string(); { static re::pattern dvd_video_vob("(VIDEO_TS|VTS_[0-9][0-9]_[0-9]).VOB", re::pattern::perl|re::pattern::icase); diff --git a/src/mgui/project/mconstructor.cpp b/src/mgui/project/mconstructor.cpp index 12e2f49..7ad2546 100644 --- a/src/mgui/project/mconstructor.cpp +++ b/src/mgui/project/mconstructor.cpp @@ -961,7 +961,7 @@ void RunConstructor(const std::string& prj_file_name, bool ask_save_on_exit) static const fs::directory_iterator end_itr; for( fs::directory_iterator itr(DataDirPath("bmd-icons")); itr != end_itr; ++itr ) - pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->string())); + pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->path().string())); Gtk::Window::set_default_icon_list(pix_lst); ActionFunctor after_fnr = BuildConstructor(app, prj_file_name); diff --git a/src/mgui/project/serialize.cpp b/src/mgui/project/serialize.cpp index 12b3c3a..2340b0b 100644 --- a/src/mgui/project/serialize.cpp +++ b/src/mgui/project/serialize.cpp @@ -71,7 +71,7 @@ static std::string MakeProjectTitle(bool with_path_breakdown = false) return "untitled.bmd"; fs::path full_path(db.GetProjectFName()); - std::string res_str = full_path.leaf(); + std::string res_str = full_path.filename().string(); if( with_path_breakdown ) res_str += " (" + full_path.branch_path().string() + ")"; return res_str; diff --git a/src/mgui/win_utils.cpp b/src/mgui/win_utils.cpp index 28ad9dd..175e241 100644 --- a/src/mgui/win_utils.cpp +++ b/src/mgui/win_utils.cpp @@ -418,7 +418,7 @@ bool CheckKeepOrigin(const std::string& fname) bool res = false; if( fs::exists(fname) && (Gtk::RESPONSE_OK != MessageBox(BF_("A file named \"%1%\" already exists. Do you want to replace it?") - % fs::path(fname).leaf() % bf::stop, + % fs::path(fname).filename().string() % bf::stop, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL, _("Replacing the file overwrite its contents."), true)) ) diff --git a/src/mlib/filesystem.cpp b/src/mlib/filesystem.cpp index bb84860..5d4f39c 100644 --- a/src/mlib/filesystem.cpp +++ b/src/mlib/filesystem.cpp @@ -47,7 +47,7 @@ const char* FindExtDot(const char* name) std::string get_basename(const fs::path& pth) { - std::string name_s = pth.leaf(); + std::string name_s = pth.filename().string(); const char* name = name_s.c_str(); //if( const char* dot = strstr(name, ".") ) @@ -58,24 +58,13 @@ std::string get_basename(const fs::path& pth) std::string get_extension(const fs::path& pth) { - std::string name_s = pth.leaf(); + std::string name_s = pth.filename().string(); if( const char* dot = FindExtDot(name_s.c_str()) ) return std::string(dot+1); return std::string(); } -// глобальная установка проверки имен файлов -class tune_boost_filesystem -{ - public: - tune_boost_filesystem() - { - // чтоб любые символы в именах файлов позволялись, для utf8 - fs::path::default_name_check(fs::native); - } -} tune_boost_filesystem_obj; - namespace Project { -- 1.7.11.7 bombono-dvd-buildflags.patch: SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE bombono-dvd-buildflags.patch --- --- SConstruct.ORG 2012-10-23 09:08:29.822511600 +0200 +++ SConstruct 2012-10-23 09:08:45.801184175 +0200 @@ -58,5 +58,5 @@ common_warn_flags = [] cxx_warn_flags = [] -debug_flags = ['-g', '-O0'] +debug_flags = ['-g'] release_flags = ['-O2'] defines = [] Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/bombono-dvd/F-18/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jun 2012 06:57:26 -0000 1.4 +++ .cvsignore 23 Oct 2012 07:58:07 -0000 1.5 @@ -1 +1 @@ -bombono-dvd-1.2.0-4.20120616gitcdab110.tar.gz +bombono-dvd-1.2.0.20120615gitcdab110.tar.gz Index: bombono-dvd.spec =================================================================== RCS file: /cvs/free/rpms/bombono-dvd/F-18/bombono-dvd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bombono-dvd.spec 26 Aug 2012 12:31:09 -0000 1.6 +++ bombono-dvd.spec 23 Oct 2012 07:58:07 -0000 1.7 @@ -1,22 +1,20 @@ -%global rel_tag .20120616gitcdab110 -%global rel_nr 5 +%global rel_tag .20120615gitcdab110 Name: bombono-dvd Version: 1.2.0 -Release: %{rel_nr}%{rel_tag}%{?dist}.2 +Release: 6%{rel_tag}%{?dist} Summary: DVD authoring program with nice and clean GUI # License breakdown in README. -License: GPLv2 and GPLv2+ and Boost and Python and LGPLv2+ +LiceNse: GPLv2 and GPLv2+ and Boost and Python and LGPLv2+ Group: Applications/Productivity Url: http://www.bombono.org # To create source tarball: # git clone https://git.gitorious.org/bombono-dvd/bombono-dvd.git bombono-dvd -# tag=.20120616gitcdab110; cd bombono-dvd; git reset --hard ${tag##*git}; cd .. -# tar czf bombono-dvd-1.2.0.20120616gitcdab110.tar.gz --exclude .git bombono-dvd -Source: bombono-dvd-%{version}-%{rel_nr}%{rel_tag}.tar.gz - -# needs to match TBB - from adobe-source-libraries -ExclusiveArch: i686 x86_64 ia64 +# tag=.20120615gitcdab110; cd bombono-dvd; git reset --hard ${tag##*git}; cd .. +# tar czf bombono-dvd-1.2.0$tag.tar.gz --exclude .git bombono-dvd +Source: bombono-dvd-%{version}%{?rel_tag}.tar.gz +Patch0: bombono-dvd-boost-1.51.0-fix.patch +Patch1: bombono-dvd-buildflags.patch BuildRequires: adobe-source-libraries-devel BuildRequires: boost-devel @@ -41,7 +39,7 @@ Provides: bundled(boost-logging) = 0.22.7.20120126svn76686 %global boost_flags \\\ - -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=2 + -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=3 %global warn_flags \ -Wno-reorder -Wno-unused-variable %global scons \ @@ -68,6 +66,8 @@ %prep %setup -q -n bombono-dvd +%patch0 -p1 +%patch1 -p0 sed -i '\;#![ ]*/usr/bin/env;d' $(find . -name SCons\*) rm -r debian libs/boost-lib src/mlib/tests libs/mpeg2dec ./libs/asl/adobe @@ -107,17 +107,14 @@ %{_mandir}/man1/* %changelog -* Tue Aug 21 2012 Alec Leamas <alec(a)nowhere.com> - 1.2.0-5.20120616gitcdab110.2 -- Rebuild for F-18 - -* Mon Jul 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.0-4.20120616gitcdab110.2 -- Add ExclusiveArch - inherited from TBB - -* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.0-4.20120616gitcdab110.1 -- Rebuilt for FFmpeg +* Fri Jun 15 2012 Alec Leamas <alec(a)nowhere.com> 1.2.0-6.20120615gitcdab110 +- Applying boost patch available as merge request at gitorious upstream. +- Fixing build flags +* Fri Jun 15 2012 Alec Leamas <alec(a)nowhere.com> 1.2.0-5.20120615gitcdab110 +- Rebuilding for F-18 -* Sat Jun 16 2012 Alec Leamas <alec(a)nowhere.com> 1.2.0-4.20120616gitcdab110 +* Fri Jun 15 2012 Alec Leamas <alec(a)nowhere.com> 1.2.0-4.20120615gitcdab110 - Updating to git HEAD, solving build problems w ffmpeg 11.1 * Thu Apr 12 2012 Alec Leamas <alec(a)nowhere.com> 1.2.0-3.20120412gite9390e7 Index: sources =================================================================== RCS file: /cvs/free/rpms/bombono-dvd/F-18/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jun 2012 06:57:26 -0000 1.4 +++ sources 23 Oct 2012 07:58:07 -0000 1.5 @@ -1 +1 @@ -a063a286ae1cb4b19b467a7d3c90f875 bombono-dvd-1.2.0-4.20120616gitcdab110.tar.gz +3ee30e14d6f128fa8df6dbcffc3fcd7f bombono-dvd-1.2.0.20120615gitcdab110.tar.gz

12 years, 1 month

1
0
0 / 0

rpms/openafs-kmod/F-16 openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch, NONE, 1.1 openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch, NONE, 1.1 openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch, NONE, 1.1 openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch, NONE, 1.1 openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch, NONE, 1.1 openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch, NONE, 1.1 openafs-1.

by Ken Dreyer

Author: ktdreyer Update of /cvs/free/rpms/openafs-kmod/F-16 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5324 Modified Files: openafs-kmod.spec Added Files: openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch openafs-1.6.1-clear_inode.patch openafs-1.6.1-encode_fh.patch Log Message: * Sat Oct 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-4 - Rebuild for F-18 Beta. Debugging is now disabled in F-18 kernels. openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch: afs_bypasscache.c | 64 ++++++++++++++++++++---------------------------------- 1 file changed, 24 insertions(+), 40 deletions(-) --- NEW FILE openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch --- >From a9b3e53dcb693182b51e7f5b43586e3e2dc29b8a Mon Sep 17 00:00:00 2001 From: Marc Dionne <marc.c.dionne(a)gmail.com> Date: Mon, 13 Aug 2012 20:32:08 -0400 Subject: [PATCH 1/8] Linux: bypass: consolidate copy_page macros into a single function The copy_page(s) macros are very similar; combine them into a single function that can be used for all cases. This will make it easier to add some pre-processor logic around the kmap_atomic calls to adapt to Linux API changes. Reviewed-on: http://gerrit.openafs.org/7980 Tested-by: BuildBot <buildbot(a)rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow(a)dementix.org> (cherry picked from commit 0a8256a26fafb490b454f2a857b0c15d859572c5) Change-Id: I6835a024428b26a8cd8d073f6304d0d0b3042b24 --- src/afs/afs_bypasscache.c | 63 ++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 39 deletions(-) diff --git a/src/afs/afs_bypasscache.c b/src/afs/afs_bypasscache.c index e447024..b350233 100644 --- a/src/afs/afs_bypasscache.c +++ b/src/afs/afs_bypasscache.c @@ -270,49 +270,12 @@ done: #ifdef UKERNEL typedef void * bypass_page_t; -#define copy_page(pp, pageoff, rxiov, iovno, iovoff, auio, curiov) \ - do { \ - int dolen = auio->uio_iov[curiov].iov_len - pageoff; \ - memcpy(((char *)pp) + pageoff, \ - ((char *)rxiov[iovno].iov_base) + iovoff, dolen); \ - auio->uio_resid -= dolen; \ - } while(0) - -#define copy_pages(pp, pageoff, rxiov, iovno, iovoff, auio, curiov) \ - do { \ - int dolen = rxiov[iovno].iov_len - iovoff; \ - memcpy(((char *)pp) + pageoff, \ - ((char *)rxiov[iovno].iov_base) + iovoff, dolen); \ - auio->uio_resid -= dolen; \ - } while(0) - #define unlock_and_release_pages(auio) #define release_full_page(pp, pageoff) #else typedef struct page * bypass_page_t; -#define copy_page(pp, pageoff, rxiov, iovno, iovoff, auio, curiov) \ - do { \ - char *address; \ - int dolen = auio->uio_iov[curiov].iov_len - pageoff; \ - address = kmap_atomic(pp, KM_USER0); \ - memcpy(address + pageoff, \ - (char *)(rxiov[iovno].iov_base) + iovoff, dolen); \ - kunmap_atomic(address, KM_USER0); \ - } while(0) - -#define copy_pages(pp, pageoff, rxiov, iovno, iovoff, auio, curiov) \ - do { \ - char *address; \ - int dolen = rxiov[iovno].iov_len - iovoff; \ - address = kmap_atomic(pp, KM_USER0); \ - memcpy(address + pageoff, \ - (char *)(rxiov[iovno].iov_base) + iovoff, dolen); \ - kunmap_atomic(address, KM_USER0); \ - } while(0) - - #define unlock_and_release_pages(auio) \ do { \ struct iovec *ciov; \ @@ -347,8 +310,30 @@ typedef struct page * bypass_page_t; afs_warn("afs_NoCacheFetchProc: page not locked!\n"); \ put_page(pp); /* decrement refcount */ \ } while(0) +#endif + +static void +afs_bypass_copy_page(bypass_page_t pp, int pageoff, struct iovec *rxiov, + int iovno, int iovoff, struct uio *auio, int curiov, int partial) +{ + char *address; + int dolen; + + if (partial) + dolen = rxiov[iovno].iov_len - iovoff; + else + dolen = auio->uio_iov[curiov].iov_len - pageoff; +#if !defined(UKERNEL) + address = kmap_atomic(pp, KM_USER0); +#else + address = pp; #endif + memcpy(address + pageoff, (char *)(rxiov[iovno].iov_base) + iovoff, dolen); +#if !defined(UKERNEL) + kunmap_atomic(address, KM_USER0); +#endif +} /* no-cache prefetch routine */ static afs_int32 @@ -447,7 +432,7 @@ afs_NoCacheFetchProc(struct rx_call *acall, if (pageoff + (rxiov[iovno].iov_len - iovoff) <= auio->uio_iov[curpage].iov_len) { /* Copy entire (or rest of) current iovec into current page */ if (pp) - copy_pages(pp, pageoff, rxiov, iovno, iovoff, auio, curpage); + afs_bypass_copy_page(pp, pageoff, rxiov, iovno, iovoff, auio, curpage, 0); length -= (rxiov[iovno].iov_len - iovoff); pageoff += rxiov[iovno].iov_len - iovoff; iovno++; @@ -455,7 +440,7 @@ afs_NoCacheFetchProc(struct rx_call *acall, } else { /* Copy only what's needed to fill current page */ if (pp) - copy_page(pp, pageoff, rxiov, iovno, iovoff, auio, curpage); + afs_bypass_copy_page(pp, pageoff, rxiov, iovno, iovoff, auio, curpage, 1); length -= (auio->uio_iov[curpage].iov_len - pageoff); iovoff += auio->uio_iov[curpage].iov_len - pageoff; pageoff = auio->uio_iov[curpage].iov_len; -- 1.7.11.4 openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch: acinclude.m4 | 1 + src/afs/afs_bypasscache.c | 8 ++++++++ src/cf/linux-test4.m4 | 13 ++++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) --- NEW FILE openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch --- >From 2e1c365052d43813ab2c7f5a4d4268c3b03315f0 Mon Sep 17 00:00:00 2001 From: Marc Dionne <marc.c.dionne(a)gmail.com> Date: Tue, 14 Aug 2012 16:34:42 -0400 Subject: [PATCH 2/8] Linux 3.6: kmap_atomic API change kmap_atomic no longer requires a KM_TYPE argument. Test for this and adjust the affected code. Reviewed-on: http://gerrit.openafs.org/7981 Tested-by: BuildBot <buildbot(a)rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow(a)dementix.org> (cherry picked from commit 049c485b4a39ba510035788b4959d839ef668c55) Change-Id: Iac8be7901da4b277864b1b6cc987cf5087992789 --- acinclude.m4 | 1 + src/afs/afs_bypasscache.c | 8 ++++++++ src/cf/linux-test4.m4 | 12 ++++++++++++ 3 files changed, 21 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index 25484cf..20fd15e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -959,6 +959,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) LINUX_IOP_MKDIR_TAKES_UMODE_T LINUX_IOP_CREATE_TAKES_UMODE_T LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES + LINUX_KMAP_ATOMIC_TAKES_NO_KM_TYPE dnl If we are guaranteed that keyrings will work - that is dnl a) The kernel has keyrings enabled diff --git a/src/afs/afs_bypasscache.c b/src/afs/afs_bypasscache.c index b350233..1138f89 100644 --- a/src/afs/afs_bypasscache.c +++ b/src/afs/afs_bypasscache.c @@ -325,13 +325,21 @@ afs_bypass_copy_page(bypass_page_t pp, int pageoff, struct iovec *rxiov, dolen = auio->uio_iov[curiov].iov_len - pageoff; #if !defined(UKERNEL) +# if defined(KMAP_ATOMIC_TAKES_NO_KM_TYPE) + address = kmap_atomic(pp); +# else address = kmap_atomic(pp, KM_USER0); +# endif #else address = pp; #endif memcpy(address + pageoff, (char *)(rxiov[iovno].iov_base) + iovoff, dolen); #if !defined(UKERNEL) +# if defined(KMAP_ATOMIC_TAKES_NO_KM_TYPE) + kunmap_atomic(address); +# else kunmap_atomic(address, KM_USER0); +# endif #endif } diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 index f13e97d..7db805f 100644 --- a/src/cf/linux-test4.m4 +++ b/src/cf/linux-test4.m4 @@ -675,3 +675,15 @@ AC_DEFUN([LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES], [ [define if encode_fh export op takes inode arguments], [-Werror]) ]) + + +AC_DEFUN([LINUX_KMAP_ATOMIC_TAKES_NO_KM_TYPE], [ + AC_CHECK_LINUX_BUILD([whether kmap_atomic takes no km_type argument], + [ac_cv_linux_kma_atomic_takes_no_km_type], + [#include <linux/highmem.h>], + [struct page *p = NULL; + kmap_atomic(p);], + [KMAP_ATOMIC_TAKES_NO_KM_TYPE], + [define if kmap_atomic takes no km_type argument], + [-Werror]) +]) -- 1.7.11.4 openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch: acinclude.m4 | 1 + src/afs/LINUX/osi_compat.h | 16 ++++++++++++++++ src/afs/LINUX/osi_file.c | 4 ++-- src/cf/linux-test4.m4 | 13 ++++++++++++- 4 files changed, 31 insertions(+), 3 deletions(-) --- NEW FILE openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch --- >From a03c03800be47c35a0a95bd88bc1e79fca81460f Mon Sep 17 00:00:00 2001 From: Marc Dionne <marc.c.dionne(a)gmail.com> Date: Mon, 13 Aug 2012 21:36:15 -0400 Subject: [PATCH 3/8] Linux 3.6: dentry_open API change dentry_open now takes a path argument that combines the dentry and the vfsmount pointers. Add a configure test and a new compat inline function to keep things cleaner in the main source file. Reviewed-on: http://gerrit.openafs.org/7982 Tested-by: BuildBot <buildbot(a)rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow(a)dementix.org> (cherry picked from commit 8766a65e97eb90cb6c97ccd35181c441ece14f8a) Change-Id: I2c0f59ad9aa6e544a2a613e902933d463f22a5b6 --- acinclude.m4 | 1 + src/afs/LINUX/osi_compat.h | 16 ++++++++++++++++ src/afs/LINUX/osi_file.c | 4 ++-- src/cf/linux-test4.m4 | 12 ++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 20fd15e..d99c755 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -960,6 +960,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) LINUX_IOP_CREATE_TAKES_UMODE_T LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES LINUX_KMAP_ATOMIC_TAKES_NO_KM_TYPE + LINUX_DENTRY_OPEN_TAKES_PATH dnl If we are guaranteed that keyrings will work - that is dnl a) The kernel has keyrings enabled diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h index 4c7c261..84fcaa5 100644 --- a/src/afs/LINUX/osi_compat.h +++ b/src/afs/LINUX/osi_compat.h @@ -445,4 +445,20 @@ afs_get_dentry_ref(struct path *path, struct vfsmount **mnt, struct dentry **dpp #endif } +#if defined(STRUCT_TASK_STRUCT_HAS_CRED) +static inline struct file * +afs_dentry_open(struct dentry *dp, struct vfsmount *mnt, int flags, const struct cred *creds) { +#if defined(DENTRY_OPEN_TAKES_PATH) + struct path path; + struct file *filp; + path.mnt = mnt; + path.dentry = dp; + filp = dentry_open(&path, flags, creds); + return filp; +#else + return dentry_open(dp, mntget(mnt), flags, creds); +#endif +} +#endif + #endif /* AFS_LINUX_OSI_COMPAT_H */ diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c index 3c20fd9..27806ab 100644 --- a/src/afs/LINUX/osi_file.c +++ b/src/afs/LINUX/osi_file.c @@ -56,9 +56,9 @@ afs_linux_raw_open(afs_dcache_id_t *ainode) #if defined(STRUCT_TASK_STRUCT_HAS_CRED) /* Use stashed credentials - prevent selinux/apparmor problems */ - filp = dentry_open(dp, mntget(afs_cacheMnt), O_RDWR, cache_creds); + filp = afs_dentry_open(dp, mntget(afs_cacheMnt), O_RDWR, cache_creds); if (IS_ERR(filp)) - filp = dentry_open(dp, mntget(afs_cacheMnt), O_RDWR, current_cred()); + filp = afs_dentry_open(dp, mntget(afs_cacheMnt), O_RDWR, current_cred()); #else filp = dentry_open(dp, mntget(afs_cacheMnt), O_RDWR); #endif diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 index 7db805f..427c5e1 100644 --- a/src/cf/linux-test4.m4 +++ b/src/cf/linux-test4.m4 @@ -687,3 +687,15 @@ AC_DEFUN([LINUX_KMAP_ATOMIC_TAKES_NO_KM_TYPE], [ [define if kmap_atomic takes no km_type argument], [-Werror]) ]) + + +AC_DEFUN([LINUX_DENTRY_OPEN_TAKES_PATH], [ + AC_CHECK_LINUX_BUILD([whether dentry_open takes a path argument], + [ac_cv_linux_dentry_open_takes_path], + [#include <linux/fs.h>], + [struct path p; + dentry_open(&p, 0, NULL);], + [DENTRY_OPEN_TAKES_PATH], + [define if dentry_open takes a path argument], + [-Werror]) +]) -- 1.7.11.4 openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch: acinclude.m4 | 1 + src/afs/LINUX/osi_vcache.c | 12 ++++++++++++ src/afs/afs_daemons.c | 5 +++++ src/cf/linux-test4.m4 | 14 +++++++++++++- 4 files changed, 31 insertions(+), 1 deletion(-) --- NEW FILE openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch --- >From 1eaf7b62e12affca7e529b790597fad330da01ee Mon Sep 17 00:00:00 2001 From: Marc Dionne <marc.c.dionne(a)gmail.com> Date: Mon, 13 Aug 2012 21:55:25 -0400 Subject: [PATCH 4/8] Linux 3.6: d_alias and i_dentry are now hlists The d_alias pointer is now the head of an hlist. This means the iterator is a different macro and has no "reverse" version since hlists have no direct pointer to the list tail. inode->i_dentry gets the same treatment. Adjust where we use it. Reviewed-on: http://gerrit.openafs.org/7983 Tested-by: BuildBot <buildbot(a)rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow(a)dementix.org> (cherry picked from commit 6bea047fb404bde828c6358ae06f7941aa2bc959) Change-Id: I7e7b87e5f5c240f3f0ff25fa723c857ab9d0108c --- acinclude.m4 | 1 + src/afs/LINUX/osi_vcache.c | 12 ++++++++++++ src/afs/afs_daemons.c | 5 +++++ src/cf/linux-test4.m4 | 13 +++++++++++++ 4 files changed, 31 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index d99c755..d52d149 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -961,6 +961,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES LINUX_KMAP_ATOMIC_TAKES_NO_KM_TYPE LINUX_DENTRY_OPEN_TAKES_PATH + LINUX_D_ALIAS_IS_HLIST dnl If we are guaranteed that keyrings will work - that is dnl a) The kernel has keyrings enabled diff --git a/src/afs/LINUX/osi_vcache.c b/src/afs/LINUX/osi_vcache.c index e82d78e..cd61c65 100644 --- a/src/afs/LINUX/osi_vcache.c +++ b/src/afs/LINUX/osi_vcache.c @@ -19,7 +19,11 @@ osi_TryEvictVCache(struct vcache *avc, int *slept, int defersleep) { struct dentry *dentry; struct inode *inode = AFSTOV(avc); +#if defined(D_ALIAS_IS_HLIST) + struct hlist_node *cur, *head; +#else struct list_head *cur, *head; +#endif /* First, see if we can evict the inode from the dcache */ if (defersleep && avc != afs_globalVp && VREFCOUNT(avc) > 1 && avc->opens == 0) { @@ -53,12 +57,20 @@ restart: spin_unlock(&dcache_lock); #else /* HAVE_DCACHE_LOCK */ spin_lock(&inode->i_lock); +#if defined(D_ALIAS_IS_HLIST) + head = inode->i_dentry.first; +#else head = &inode->i_dentry; +#endif restart: cur = head; while ((cur = cur->next) != head) { +#if defined(D_ALIAS_IS_HLIST) + dentry = hlist_entry(cur, struct dentry, d_alias); +#else dentry = list_entry(cur, struct dentry, d_alias); +#endif spin_lock(&dentry->d_lock); if (d_unhashed(dentry)) { diff --git a/src/afs/afs_daemons.c b/src/afs/afs_daemons.c index 23655e3..f47be0e 100644 --- a/src/afs/afs_daemons.c +++ b/src/afs/afs_daemons.c @@ -396,8 +396,13 @@ afs_CheckRootVolume(void) spin_lock(&dp->d_lock); #endif #endif +#if defined(D_ALIAS_IS_HLIST) + hlist_del_init(&dp->d_alias); + hlist_add_head(&dp->d_alias, &(AFSTOV(vcp)->i_dentry)); +#else list_del_init(&dp->d_alias); list_add(&dp->d_alias, &(AFSTOV(vcp)->i_dentry)); +#endif dp->d_inode = AFSTOV(vcp); #if defined(AFS_LINUX24_ENV) #if defined(AFS_LINUX26_ENV) diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 index 427c5e1..6b70059 100644 --- a/src/cf/linux-test4.m4 +++ b/src/cf/linux-test4.m4 @@ -699,3 +699,16 @@ AC_DEFUN([LINUX_DENTRY_OPEN_TAKES_PATH], [ [define if dentry_open takes a path argument], [-Werror]) ]) + + +AC_DEFUN([LINUX_D_ALIAS_IS_HLIST], [ + AC_CHECK_LINUX_BUILD([whether dentry->d_alias is an hlist], + [ac_cv_linux_d_alias_is_hlist], + [#include <linux/fs.h>], + [struct dentry *d = NULL; + struct hlist_node *hn = NULL; + d->d_alias = *hn;], + [D_ALIAS_IS_HLIST], + [define if dentry->d_alias is an hlist], + []) +]) -- 1.7.11.4 openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch: osi_vnodeops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch --- >From 439897bfcf7dbf4dc4f6967b69ca399252a54e29 Mon Sep 17 00:00:00 2001 From: Marc Dionne <marc.c.dionne(a)gmail.com> Date: Tue, 14 Aug 2012 17:11:08 -0400 Subject: [PATCH 5/8] Linux: fix variable used to test for the iop create API Use correct variable when testing for the create API to use. This is just for looks - there is no effect since mkdir and create were changed in the same kernel release. Reviewed-on: http://gerrit.openafs.org/7984 Reviewed-by: Alistair Ferguson <alistair.ferguson(a)mac.com> Tested-by: BuildBot <buildbot(a)rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow(a)dementix.org> (cherry picked from commit c633a92a1bc7881f18ee641082ff2efe7da1a8cb) Change-Id: Ib23fe9a34bc07227614c149b0f16d3b0a067501b --- src/afs/LINUX/osi_vnodeops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index 4cda547..b3bf115 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -1094,7 +1094,7 @@ struct dentry_operations afs_dentry_operations = { * name is in kernel space at this point. */ static int -#if defined(IOP_MKDIR_TAKES_UMODE_T) +#if defined(IOP_CREATE_TAKES_UMODE_T) afs_linux_create(struct inode *dip, struct dentry *dp, umode_t mode, struct nameidata *nd) #else -- 1.7.11.4 openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch: acinclude.m4 | 1 + src/afs/LINUX/osi_vnodeops.c | 9 +++++---- src/cf/linux-test4.m4 | 16 +++++++++++++++- 3 files changed, 21 insertions(+), 5 deletions(-) --- NEW FILE openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch --- >From 3e27f1e2e7302f0f87c03d5e174b1754379fb66e Mon Sep 17 00:00:00 2001 From: Marc Dionne <marc.c.dionne(a)gmail.com> Date: Tue, 14 Aug 2012 17:28:50 -0400 Subject: [PATCH 6/8] Linux 3.6: create inode operation API change The nameidata argument is dropped and a flag is added. Reviewed-on: http://gerrit.openafs.org/7985 Tested-by: BuildBot <buildbot(a)rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow(a)dementix.org> (cherry picked from commit 020e32779c103817ca89caa51259fb53bc3dde79) Change-Id: Iae2a0301a1c4acb6835eb0bdca6ae22b143b2cda --- acinclude.m4 | 1 + src/afs/LINUX/osi_vnodeops.c | 9 +++++---- src/cf/linux-test4.m4 | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index d52d149..1c84354 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -962,6 +962,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) LINUX_KMAP_ATOMIC_TAKES_NO_KM_TYPE LINUX_DENTRY_OPEN_TAKES_PATH LINUX_D_ALIAS_IS_HLIST + LINUX_IOP_I_CREATE_TAKES_BOOL dnl If we are guaranteed that keyrings will work - that is dnl a) The kernel has keyrings enabled diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index b3bf115..8c8045b 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -1094,17 +1094,18 @@ struct dentry_operations afs_dentry_operations = { * name is in kernel space at this point. */ static int -#if defined(IOP_CREATE_TAKES_UMODE_T) +#if defined(IOP_CREATE_TAKES_BOOL) +afs_linux_create(struct inode *dip, struct dentry *dp, umode_t mode, + bool excl) +#elif defined(IOP_CREATE_TAKES_UMODE_T) afs_linux_create(struct inode *dip, struct dentry *dp, umode_t mode, struct nameidata *nd) -#else -#ifdef IOP_CREATE_TAKES_NAMEIDATA +#elif defined(IOP_CREATE_TAKES_NAMEIDATA) afs_linux_create(struct inode *dip, struct dentry *dp, int mode, struct nameidata *nd) #else afs_linux_create(struct inode *dip, struct dentry *dp, int mode) #endif -#endif { struct vattr vattr; cred_t *credp = crref(); diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 index 6b70059..dc30770 100644 --- a/src/cf/linux-test4.m4 +++ b/src/cf/linux-test4.m4 @@ -712,3 +712,18 @@ AC_DEFUN([LINUX_D_ALIAS_IS_HLIST], [ [define if dentry->d_alias is an hlist], []) ]) + + +AC_DEFUN([LINUX_IOP_I_CREATE_TAKES_BOOL], [ + AC_CHECK_LINUX_BUILD([whether inode_operations.create takes a bool], + [ac_cv_linux_func_i_create_takes_bool], + [#include <linux/fs.h> + #include <linux/namei.h>], + [struct inode _inode = {}; + struct dentry _dentry; + bool b = true; + (void)_inode.i_op->create(&_inode, &_dentry, 0, b);], + [IOP_CREATE_TAKES_BOOL], + [define if your iops.create takes a bool argument], + [-Werror]) +]) -- 1.7.11.4 openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch: acinclude.m4 | 1 + src/afs/LINUX/osi_vnodeops.c | 8 +++++++- src/cf/linux-test4.m4 | 15 ++++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) --- NEW FILE openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch --- >From 57f3a2bbe873dae41bc57130a5985e8c334a5303 Mon Sep 17 00:00:00 2001 From: Marc Dionne <marc.c.dionne(a)gmail.com> Date: Tue, 14 Aug 2012 18:08:51 -0400 Subject: [PATCH 7/8] Linux 3.6: revalidate dentry op API change The nameidata argument is dropped, replaced by an unsigned flags value. The configure test is very specific; kernels with the older API with a signed int flags value should fall through. Reviewed-on: http://gerrit.openafs.org/7986 Tested-by: BuildBot <buildbot(a)rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow(a)dementix.org> (cherry picked from commit 7413cd09a53f89882a46fd100bf6c501348f2188) Change-Id: Ie68d70dcf414d24e7e980c8a8f35b83550d2da7c --- acinclude.m4 | 1 + src/afs/LINUX/osi_vnodeops.c | 8 +++++++- src/cf/linux-test4.m4 | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 1c84354..8bb5bf7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -963,6 +963,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) LINUX_DENTRY_OPEN_TAKES_PATH LINUX_D_ALIAS_IS_HLIST LINUX_IOP_I_CREATE_TAKES_BOOL + LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED dnl If we are guaranteed that keyrings will work - that is dnl a) The kernel has keyrings enabled diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index 8c8045b..49f8b96 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -906,7 +906,9 @@ afs_linux_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *sta * later on, we shouldn't have to do it until later. Perhaps in the future.. */ static int -#ifdef DOP_REVALIDATE_TAKES_NAMEIDATA +#if defined(DOP_REVALIDATE_TAKES_UNSIGNED) +afs_linux_dentry_revalidate(struct dentry *dp, unsigned int flags) +#elif defined(DOP_REVALIDATE_TAKES_NAMEIDATA) afs_linux_dentry_revalidate(struct dentry *dp, struct nameidata *nd) #else afs_linux_dentry_revalidate(struct dentry *dp, int flags) @@ -921,7 +923,11 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags) #ifdef LOOKUP_RCU /* We don't support RCU path walking */ +# if defined(DOP_REVALIDATE_TAKES_UNSIGNED) + if (flags & LOOKUP_RCU) +# else if (nd->flags & LOOKUP_RCU) +# endif return -ECHILD; #endif AFS_GLOCK(); diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 index dc30770..4a6ec02 100644 --- a/src/cf/linux-test4.m4 +++ b/src/cf/linux-test4.m4 @@ -727,3 +727,17 @@ AC_DEFUN([LINUX_IOP_I_CREATE_TAKES_BOOL], [ [define if your iops.create takes a bool argument], [-Werror]) ]) + + +AC_DEFUN([LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED], [ + AC_CHECK_LINUX_BUILD([whether dentry_operations.d_revalidate takes an unsigned int], + [ac_cv_linux_func_d_revalidate_takes_unsigned], + [#include <linux/fs.h> + #include <linux/namei.h>], + [struct dentry_operations dops; + int reval(struct dentry *d, unsigned int i) { return 0; }; + dops.d_revalidate = reval;], + [DOP_REVALIDATE_TAKES_UNSIGNED], + [define if your dops.d_revalidate takes an unsigned int argument], + [-Werror]) +]) -- 1.7.11.4 openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch: acinclude.m4 | 1 + src/afs/LINUX/osi_vnodeops.c | 5 ++++- src/cf/linux-test4.m4 | 15 ++++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) --- NEW FILE openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch --- >From a131b915fec5ca7679c092af2031ac20e9e78658 Mon Sep 17 00:00:00 2001 From: Marc Dionne <marc.c.dionne(a)gmail.com> Date: Tue, 14 Aug 2012 18:26:24 -0400 Subject: [PATCH 8/8] Linux 3.6: lookup inode operation API change The nameidata argument is replaced with an unsigned int flags argument. Reviewed-on: http://gerrit.openafs.org/7987 Tested-by: BuildBot <buildbot(a)rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow(a)dementix.org> (cherry picked from commit ec48dca871ef98adb69792a34047c6be5818f1b2) Change-Id: Ic8be26141ede6e1c4062872c79a846efb0045bda --- acinclude.m4 | 1 + src/afs/LINUX/osi_vnodeops.c | 5 ++++- src/cf/linux-test4.m4 | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 8bb5bf7..4b49449 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -964,6 +964,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) LINUX_D_ALIAS_IS_HLIST LINUX_IOP_I_CREATE_TAKES_BOOL LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED + LINUX_IOP_LOOKUP_TAKES_UNSIGNED dnl If we are guaranteed that keyrings will work - that is dnl a) The kernel has keyrings enabled diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index 49f8b96..c376bd1 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -1147,7 +1147,10 @@ afs_linux_create(struct inode *dip, struct dentry *dp, int mode) /* afs_linux_lookup */ static struct dentry * -#ifdef IOP_LOOKUP_TAKES_NAMEIDATA +#if defined(IOP_LOOKUP_TAKES_UNSIGNED) +afs_linux_lookup(struct inode *dip, struct dentry *dp, + unsigned flags) +#elif defined(IOP_LOOKUP_TAKES_NAMEIDATA) afs_linux_lookup(struct inode *dip, struct dentry *dp, struct nameidata *nd) #else diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 index 4a6ec02..fc0149f 100644 --- a/src/cf/linux-test4.m4 +++ b/src/cf/linux-test4.m4 @@ -741,3 +741,17 @@ AC_DEFUN([LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED], [ [define if your dops.d_revalidate takes an unsigned int argument], [-Werror]) ]) + + +AC_DEFUN([LINUX_IOP_LOOKUP_TAKES_UNSIGNED], [ + AC_CHECK_LINUX_BUILD([whether inode operation lookup takes an unsigned int], + [ac_cv_linux_func_lookup_takes_unsigned], + [#include <linux/fs.h> + #include <linux/namei.h>], + [struct inode_operations iops; + struct dentry *look(struct inode *i, struct dentry *d, unsigned int j) { return NULL; }; + iops.lookup = look;], + [IOP_LOOKUP_TAKES_UNSIGNED], + [define if your iops.lookup takes an unsigned int argument], + [-Werror]) +]) -- 1.7.11.4 openafs-1.6.1-clear_inode.patch: acinclude.m4 | 3 +++ src/afs/LINUX/osi_vfsops.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) --- NEW FILE openafs-1.6.1-clear_inode.patch --- >From cc63cbbc138f60d6b5964fa859dcd778717b24c2 Mon Sep 17 00:00:00 2001 From: Marc Dionne <marc.c.dionne(a)gmail.com> Date: Mon, 28 May 2012 21:43:12 -0400 Subject: [PATCH] Linux 3.4: replace end_writeback with clear_inode end_writeback() is renamed to clear_inode(). Add a configure test and cope. Change-Id: Icaf5b6b54d0ee377fabcf0b295d690eaa6b4be5e Reviewed-on: http://gerrit.openafs.org/7503 Reviewed-by: Derrick Brashear <shadow(a)dementix.org> Tested-by: BuildBot <buildbot(a)rampaginggeek.com> (cherry picked from commit 2b33384a4a7b88842281021129ffccc837d91d36) Reviewed-on: http://gerrit.openafs.org/7578 --- acinclude.m4 | 3 +++ src/afs/LINUX/osi_vfsops.c | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 45f06cb..9085afe 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -840,6 +840,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) #include <linux/page-flags.h>], [struct page *_page; int bchecked = PageFsMisc(_page);]) + AC_CHECK_LINUX_FUNC([clear_inode], + [#include <linux/fs.h>], + [clear_inode(NULL);]) AC_CHECK_LINUX_FUNC([current_kernel_time], [#include <linux/time.h>], [struct timespec s; diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c index a6be1b3..bc951a2 100644 --- a/src/afs/LINUX/osi_vfsops.c +++ b/src/afs/LINUX/osi_vfsops.c @@ -284,7 +284,11 @@ afs_evict_inode(struct inode *ip) osi_Panic("inode freed while still hashed"); truncate_inode_pages(&ip->i_data, 0); +#if defined(HAVE_LINUX_CLEAR_INODE) + clear_inode(ip); +#else end_writeback(ip); +#endif #if !defined(STRUCT_SUPER_OPERATIONS_HAS_ALLOC_INODE) afs_osi_Free(ip->u.generic_ip, sizeof(struct vcache)); -- 1.7.2.5 openafs-1.6.1-encode_fh.patch: acinclude.m4 | 1 + src/afs/LINUX/osi_compat.h | 4 ++++ src/cf/linux-test4.m4 | 15 ++++++++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) --- NEW FILE openafs-1.6.1-encode_fh.patch --- >From 407e7c90a97143d436ad3a6af6bbfa431c849191 Mon Sep 17 00:00:00 2001 From: Marc Dionne <marc.c.dionne(a)gmail.com> Date: Sat, 2 Jun 2012 21:35:53 -0400 Subject: [PATCH] Linux 3.5: encode_fh API change The encode_fh export operation now expects two inode arguments instead of a dentry and a "connectable" flag. Use the inode of the dentry we're interested in, and NULL as the parent inode which is the same as passing a 0 flag in the previous API. Change-Id: I05cf146fb2a4bacdca20a9f108d04ccb11530804 Reviewed-on: http://gerrit.openafs.org/7523 Tested-by: BuildBot <buildbot(a)rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow(a)dementix.org> (cherry picked from commit 5227148ae17949705487ea673d558ebfe143e635) Reviewed-on: http://gerrit.openafs.org/7579 --- acinclude.m4 | 1 + src/afs/LINUX/osi_compat.h | 4 ++++ src/cf/linux-test4.m4 | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index c14b581..25484cf 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -958,6 +958,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) LINUX_D_COUNT_IS_INT LINUX_IOP_MKDIR_TAKES_UMODE_T LINUX_IOP_CREATE_TAKES_UMODE_T + LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES dnl If we are guaranteed that keyrings will work - that is dnl a) The kernel has keyrings enabled diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h index b94295c..4c7c261 100644 --- a/src/afs/LINUX/osi_compat.h +++ b/src/afs/LINUX/osi_compat.h @@ -333,7 +333,11 @@ afs_get_dentry_from_fh(struct super_block *afs_cacheSBp, afs_dcache_id_t *ainode static inline int afs_get_fh_from_dentry(struct dentry *dp, afs_ufs_dcache_id_t *ainode, int *max_lenp) { if (dp->d_sb->s_export_op->encode_fh) +#if defined(EXPORT_OP_ENCODE_FH_TAKES_INODES) + return dp->d_sb->s_export_op->encode_fh(dp->d_inode, &ainode->raw[0], max_lenp, NULL); +#else return dp->d_sb->s_export_op->encode_fh(dp, &ainode->raw[0], max_lenp, 0); +#endif #if defined(NEW_EXPORT_OPS) /* If fs doesn't provide an encode_fh method, assume the default INO32 type */ *max_lenp = sizeof(struct fid)/4; diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 index f5e91b1..f13e97d 100644 --- a/src/cf/linux-test4.m4 +++ b/src/cf/linux-test4.m4 @@ -661,3 +661,17 @@ AC_DEFUN([LINUX_IOP_CREATE_TAKES_UMODE_T], [ [define if inode.i_op->create takes a umode_t argument], [-Werror]) ]) + + +AC_DEFUN([LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES], [ + AC_CHECK_LINUX_BUILD([whether export operation encode_fh takes inode arguments], + [ac_cv_linux_export_op_encode_fh__takes_inodes], + [#include <linux/exportfs.h>], + [struct export_operations _exp_ops; + int _encode_fh(struct inode *i, __u32 *fh, int *len, struct inode *p) + {return 0;}; + _exp_ops.encode_fh = _encode_fh;], + [EXPORT_OP_ENCODE_FH_TAKES_INODES], + [define if encode_fh export op takes inode arguments], + [-Werror]) +]) -- 1.7.2.5 Index: openafs-kmod.spec =================================================================== RCS file: /cvs/free/rpms/openafs-kmod/F-16/openafs-kmod.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- openafs-kmod.spec 18 Oct 2012 18:43:04 -0000 1.64 +++ openafs-kmod.spec 22 Oct 2012 21:03:29 -0000 1.65 @@ -21,7 +21,7 @@ Name: %{kmod_name}-kmod Version: 1.6.1 -Release: 1%{?dist}.24 +Release: 4%{?dist} Summary: Kernel module(s) Group: System Environment/Kernel @@ -31,6 +31,46 @@ Source0: http://dl.openafs.org/dl/%{version}/%{kmod_name}-%{version}-src.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Upstream patches to build on kernel 3.5 +Patch0: openafs-1.6.1-clear_inode.patch +Patch1: openafs-1.6.1-encode_fh.patch + +# Upstream patches to build on kernel 3.6. In-progress in Gerrit. +# Steps to create these patches: +# 1) git clone from openafs.org +# 2) git checkout openafs-stable-1_6_1 +# 3) git checkout -b fedora +# 4) Get the two Patches above (patch0 and patch1) +# git cherry-pick -x cc63cbbc138f60d6b5964fa859dcd778717b24c2 +# git cherry-pick -x 407e7c90a97143d436ad3a6af6bbfa431c849191 +# 5) Take note of the commit hash here. +# 6) Cherry-pick the appropriate patches from Gerrit onto this "fedora" branch +# When cherry-picking "d_alias and i_dentry are now hlists" +# (http://gerrit.openafs.org/8080), avoid the post-1.6.1 canonical_dentry() +# function from http://gerrit.openafs.org/7951 . +# 7) Create the patch files +# git format-patch <hash in step 5> +# If you forgot the hash from step 5, look with "git log --oneline" +# 8) Rename patche files according to Fedora package guidelines: +# for i in $(ls *.patch); do mv $i openafs-1.6.1-$i; done + +# http://gerrit.openafs.org/8077 +Patch4: openafs-1.6.1-0001-Linux-bypass-consolidate-copy_page-macros-into-a-sin.patch +# http://gerrit.openafs.org/8078 +Patch5: openafs-1.6.1-0002-Linux-3.6-kmap_atomic-API-change.patch +# http://gerrit.openafs.org/8079 +Patch6: openafs-1.6.1-0003-Linux-3.6-dentry_open-API-change.patch +# http://gerrit.openafs.org/8080 +Patch7: openafs-1.6.1-0004-Linux-3.6-d_alias-and-i_dentry-are-now-hlists.patch +# http://gerrit.openafs.org/8081 +Patch8: openafs-1.6.1-0005-Linux-fix-variable-used-to-test-for-the-iop-create-A.patch +# http://gerrit.openafs.org/8082 +Patch9: openafs-1.6.1-0006-Linux-3.6-create-inode-operation-API-change.patch +# http://gerrit.openafs.org/8083 +Patch10: openafs-1.6.1-0007-Linux-3.6-revalidate-dentry-op-API-change.patch +# http://gerrit.openafs.org/8084 +Patch11: openafs-1.6.1-0008-Linux-3.6-lookup-inode-operation-API-change.patch + %global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc, bison, automake BuildRequires: %{AkmodsBuildRequires} @@ -56,8 +96,21 @@ %setup -q -c -T -a 0 # apply patches and do other stuff here -#pushd %{kmod_name}-%{version} -#popd +pushd %{kmod_name}-%{version} +# Kernel 3.5 patches +%patch0 -p1 +%patch1 -p1 +# Kernel 3.6 patches +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +./regen.sh +popd for kernel_version in %{?kernel_versions} ; do cp -a %{kmod_name}-%{version} _kmod_build_${kernel_version%%___*} @@ -94,74 +147,14 @@ %changelog -* Thu Oct 18 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.24 -- Rebuilt for updated kernel - -* Wed Oct 17 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.23 -- Rebuilt for updated kernel - -* Thu Oct 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.22 -- Rebuilt for updated kernel - -* Wed Oct 03 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.21 -- Rebuilt for updated kernel - -* Mon Sep 17 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.20 -- Rebuilt for updated kernel - -* Sun Aug 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.19 -- Rebuilt for updated kernel - -* Thu Aug 16 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.18 -- Rebuilt for updated kernel - -* Tue Jul 31 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.17 -- Rebuilt for updated kernel - -* Thu Jul 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.16 -- Rebuilt for updated kernel - -* Tue Jul 17 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.15 -- Rebuilt for updated kernel - -* Fri Jul 06 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.14 -- Rebuilt for updated kernel - -* Thu Jun 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.13 -- Rebuilt for updated kernel - -* Sun Jun 17 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.12 -- Rebuilt for updated kernel - -* Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.11 -- Rebuilt for updated kernel +* Sat Oct 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-4 +- Rebuild for F-18 Beta. Debugging is now disabled in F-18 kernels. -* Wed May 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.10 -- Rebuilt for updated kernel +* Wed Sep 19 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-3 +- Add upstream patches for kernel 3.6 -* Fri May 18 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.9 -- Rebuilt for release kernel - -* Wed May 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.8 -- rebuild for updated kernel - -* Fri May 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.7 -- rebuild for updated kernel - -* Wed May 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.6 -- rebuild for updated kernel - -* Sun Apr 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.4 -- rebuild for updated kernel - -* Mon Apr 16 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.3 -- rebuild for updated kernel - -* Thu Apr 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.2 -- rebuild for updated kernel - -* Sat Apr 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-1.1 -- rebuild for updated kernel +* Wed Aug 01 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-2 +- Add upstream patches for kernel 3.5 * Wed Apr 04 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-1 - Update to OpenAFS 1.6.1 final

12 years, 1 month

1
0
0 / 0

rpms/smesh/F-16 smesh.spec,1.1,1.2

by Richard Shaw

Author: hobbes1069 Update of /cvs/nonfree/rpms/smesh/F-16 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4158 Modified Files: smesh.spec Log Message: * Mon Oct 22 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-5.svn54 - Remove build requirement for fortran (f2c). - Initial packaging for EPEL 6. Index: smesh.spec =================================================================== RCS file: /cvs/nonfree/rpms/smesh/F-16/smesh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- smesh.spec 27 Jan 2012 20:09:02 -0000 1.1 +++ smesh.spec 22 Oct 2012 20:35:02 -0000 1.2 @@ -1,6 +1,11 @@ +# Use a newer version of cmake on EL. +%if 0%{?rhel} +%global cmake %cmake28 +%endif + Name: smesh Version: 5.1.2.2 -Release: 2.svn54%{?dist} +Release: 5.svn54%{?dist} Summary: OpenCascade based MESH framework # This library is LGPLv2+ but links against the non-free library OCE. @@ -15,18 +20,28 @@ # on 12/21/11. Patch0: smesh.patch Patch1: smesh-cmake_fixes.patch +Patch2: smesh-5.1.2.2-rm_f2c.patch -BuildRequires: cmake doxygen +%if 0%{?rhel} +BuildRequires: cmake28 +%else +BuildRequires: cmake +%endif +BuildRequires: doxygen graphviz BuildRequires: OCE-devel BuildRequires: boost-devel BuildRequires: gcc-gfortran -BuildRequires: f2c +# Do we need this? +#BuildRequires: f2c f2c-devel BuildRequires: dos2unix %description A complete OpenCascade based MESH framework. +NOTE: Fortran support (f2c) has been disabled. If it is needed please open a +bug against the smesh component at: http://bugzilla.rpmfusion.org + %package doc Summary: Development documentation for %{name} @@ -49,6 +64,7 @@ %setup -q -c %{name}-%{version} %patch0 -p1 %patch1 -p1 -b .cmakefix +%patch2 -p1 -b .f2c dos2unix -k LICENCE.lgpl.txt @@ -92,6 +108,16 @@ %changelog +* Mon Oct 22 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-5.svn54 +- Remove build requirement for fortran (f2c). +- Initial packaging for EPEL 6. + +* Wed Sep 26 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-4.svn54 +- Rebuild due to package not being signed in F-18 repo. + +* Thu Mar 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.1.2.2-3.svn54 +- Rebuilt for c++ ABI breakage + * Thu Jan 19 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-2.svn54 - Minor updates to spec file.

12 years, 1 month

1
0
0 / 0

rpms/smesh/F-17 smesh.spec,1.2,1.3

by Richard Shaw

Author: hobbes1069 Update of /cvs/nonfree/rpms/smesh/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4126 Modified Files: smesh.spec Log Message: * Mon Oct 22 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-5.svn54 - Remove build requirement for fortran (f2c). - Initial packaging for EPEL 6. Index: smesh.spec =================================================================== RCS file: /cvs/nonfree/rpms/smesh/F-17/smesh.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- smesh.spec 7 Mar 2012 23:13:52 -0000 1.2 +++ smesh.spec 22 Oct 2012 20:34:51 -0000 1.3 @@ -1,6 +1,11 @@ +# Use a newer version of cmake on EL. +%if 0%{?rhel} +%global cmake %cmake28 +%endif + Name: smesh Version: 5.1.2.2 -Release: 3.svn54%{?dist} +Release: 5.svn54%{?dist} Summary: OpenCascade based MESH framework # This library is LGPLv2+ but links against the non-free library OCE. @@ -15,18 +20,28 @@ # on 12/21/11. Patch0: smesh.patch Patch1: smesh-cmake_fixes.patch +Patch2: smesh-5.1.2.2-rm_f2c.patch -BuildRequires: cmake doxygen +%if 0%{?rhel} +BuildRequires: cmake28 +%else +BuildRequires: cmake +%endif +BuildRequires: doxygen graphviz BuildRequires: OCE-devel BuildRequires: boost-devel BuildRequires: gcc-gfortran -BuildRequires: f2c +# Do we need this? +#BuildRequires: f2c f2c-devel BuildRequires: dos2unix %description A complete OpenCascade based MESH framework. +NOTE: Fortran support (f2c) has been disabled. If it is needed please open a +bug against the smesh component at: http://bugzilla.rpmfusion.org + %package doc Summary: Development documentation for %{name} @@ -49,6 +64,7 @@ %setup -q -c %{name}-%{version} %patch0 -p1 %patch1 -p1 -b .cmakefix +%patch2 -p1 -b .f2c dos2unix -k LICENCE.lgpl.txt @@ -92,6 +108,13 @@ %changelog +* Mon Oct 22 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-5.svn54 +- Remove build requirement for fortran (f2c). +- Initial packaging for EPEL 6. + +* Wed Sep 26 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-4.svn54 +- Rebuild due to package not being signed in F-18 repo. + * Thu Mar 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.1.2.2-3.svn54 - Rebuilt for c++ ABI breakage

12 years, 1 month

1
0
0 / 0

rpms/smesh/F-18 smesh.spec,1.3,1.4

by Richard Shaw

Author: hobbes1069 Update of /cvs/nonfree/rpms/smesh/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4091 Modified Files: smesh.spec Log Message: * Mon Oct 22 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-5.svn54 - Remove build requirement for fortran (f2c). - Initial packaging for EPEL 6. Index: smesh.spec =================================================================== RCS file: /cvs/nonfree/rpms/smesh/F-18/smesh.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- smesh.spec 26 Sep 2012 13:41:49 -0000 1.3 +++ smesh.spec 22 Oct 2012 20:34:39 -0000 1.4 @@ -1,6 +1,11 @@ +# Use a newer version of cmake on EL. +%if 0%{?rhel} +%global cmake %cmake28 +%endif + Name: smesh Version: 5.1.2.2 -Release: 4.svn54%{?dist} +Release: 5.svn54%{?dist} Summary: OpenCascade based MESH framework # This library is LGPLv2+ but links against the non-free library OCE. @@ -15,18 +20,28 @@ # on 12/21/11. Patch0: smesh.patch Patch1: smesh-cmake_fixes.patch +Patch2: smesh-5.1.2.2-rm_f2c.patch -BuildRequires: cmake doxygen +%if 0%{?rhel} +BuildRequires: cmake28 +%else +BuildRequires: cmake +%endif +BuildRequires: doxygen graphviz BuildRequires: OCE-devel BuildRequires: boost-devel BuildRequires: gcc-gfortran -BuildRequires: f2c +# Do we need this? +#BuildRequires: f2c f2c-devel BuildRequires: dos2unix %description A complete OpenCascade based MESH framework. +NOTE: Fortran support (f2c) has been disabled. If it is needed please open a +bug against the smesh component at: http://bugzilla.rpmfusion.org + %package doc Summary: Development documentation for %{name} @@ -49,6 +64,7 @@ %setup -q -c %{name}-%{version} %patch0 -p1 %patch1 -p1 -b .cmakefix +%patch2 -p1 -b .f2c dos2unix -k LICENCE.lgpl.txt @@ -92,6 +108,10 @@ %changelog +* Mon Oct 22 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-5.svn54 +- Remove build requirement for fortran (f2c). +- Initial packaging for EPEL 6. + * Wed Sep 26 2012 Richard Shaw <hobbes1069(a)gmail.com> - 5.1.2.2-4.svn54 - Rebuild due to package not being signed in F-18 repo.

12 years, 1 month

1
0
0 / 0

rpms/gnome-shell-extension-weather/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8

by Mattia Meneguzzo

Author: odysseus Update of /cvs/free/rpms/gnome-shell-extension-weather/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3535 Modified Files: .cvsignore sources Log Message: * Mon Oct 22 2012 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.8.git6c1d6ab - Update to latest upstream version Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gnome-shell-extension-weather/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 13 Oct 2012 07:37:38 -0000 1.7 +++ .cvsignore 22 Oct 2012 20:22:59 -0000 1.8 @@ -1 +1 @@ -Neroth-gnome-shell-extension-weather-734987b.tar.gz +Neroth-gnome-shell-extension-weather-6c1d6ab.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/gnome-shell-extension-weather/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 13 Oct 2012 07:37:38 -0000 1.7 +++ sources 22 Oct 2012 20:22:59 -0000 1.8 @@ -1 +1 @@ -806a7e6ea790583454d1b8d4cca80235 Neroth-gnome-shell-extension-weather-734987b.tar.gz +b08f45a913b9b1f6027adfabe2e73f6e Neroth-gnome-shell-extension-weather-6c1d6ab.tar.gz

12 years, 1 month

1
0
0 / 0

rpms/gnome-shell-extension-weather/F-18 gnome-shell-extension-weather.spec, 1.7, 1.8

by Mattia Meneguzzo

Author: odysseus Update of /cvs/free/rpms/gnome-shell-extension-weather/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32271 Modified Files: gnome-shell-extension-weather.spec Log Message: * Mon Oct 22 2012 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.8.git6c1d6ab - Update to latest upstream version Index: gnome-shell-extension-weather.spec =================================================================== RCS file: /cvs/free/rpms/gnome-shell-extension-weather/F-18/gnome-shell-extension-weather.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gnome-shell-extension-weather.spec 13 Oct 2012 07:43:12 -0000 1.7 +++ gnome-shell-extension-weather.spec 22 Oct 2012 20:15:53 -0000 1.8 @@ -1,11 +1,11 @@ -%global git 734987b +%global git 6c1d6ab %global uuid weather(a)gnome-shell-extensions.gnome.org %global github Neroth-gnome-shell-extension-weather %global checkout git%{git} Name: gnome-shell-extension-weather Version: 0 -Release: 0.7.%{checkout}%{?dist} +Release: 0.8.%{checkout}%{?dist} Summary: An extension for displaying weather notifications in GNOME Shell Group: User Interface/Desktops @@ -51,6 +51,9 @@ %{_datadir}/gnome-shell/extensions/%{uuid}/ %changelog +* Mon Oct 22 2012 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.8.git6c1d6ab +- Update to latest upstream version + * Sat Oct 13 2012 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.7.git734987b - Update to latest upstream version

12 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits October 2012