rpms/player/F-12 player-3.0.1.fixdocs.patch, NONE, 1.1 player-3.0.1.fixflexiport.patch, NONE, 1.1 player-3.0.1.fixlibload.patch, NONE, 1.1 player-3.0.1.fixrubyinstall.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 player.spec, 1.12, 1.13 sources, 1.3, 1.4 player-3.0.0-fixcmake64.patch, 1.1, NONE

Tim Niemueller timn at fedoraproject.org
Sun Jan 10 13:29:38 UTC 2010 

Author: timn

Update of /cvs/pkgs/rpms/player/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9145

Modified Files:
	.cvsignore player.spec sources 
Added Files:
	player-3.0.1.fixdocs.patch player-3.0.1.fixflexiport.patch 
	player-3.0.1.fixlibload.patch 
	player-3.0.1.fixrubyinstall.patch 
Removed Files:
	player-3.0.0-fixcmake64.patch 
Log Message:
Update to Player 3.0.1

player-3.0.1.fixdocs.patch:
 header.html   |    2 +-
 player.dox.in |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE player-3.0.1.fixdocs.patch ---
diff -up ./doc/header.html.fixdocs ./doc/header.html
--- ./doc/header.html.fixdocs	2010-01-09 23:20:28.000000000 -0500
+++ ./doc/header.html	2010-01-09 23:20:48.000000000 -0500
@@ -138,7 +138,7 @@ div.topbar { position: absolute; top:0px
 <ul class=menu1>
 <li class=menu><a href="group__drivers.html">drivers</a></li>
 </ul>
-<li class=menu><a href="group__libplayererror.html">libplayererror</a>
+<li class=menu><a href="group__libplayercommon.html">libplayercommon</a>
 <li class=menu><a href="group__libplayerutils.html">libplayerutils</a>
 <li class=menu><a href="group__libplayersd.html">libplayersd</a>
 <li class=menu><a href="group__libplayertcp.html">libplayertcp</a>
diff -up ./doc/player.dox.in.fixdocs ./doc/player.dox.in
--- ./doc/player.dox.in.fixdocs	2010-01-09 23:20:38.000000000 -0500
+++ ./doc/player.dox.in	2010-01-09 23:20:48.000000000 -0500
@@ -460,7 +460,8 @@ WARN_LOGFILE           =
 # with spaces.
 
 #INPUT                  = player.txt install.html migration.html tutorials.html utils.html clients.html plugin_driver.html configfile.html protocol.html ../libplayerxdr/playerxdr.html ../libplayerxdr ../libplayercore/playercore.h ../server/libplayerdrivers ../libplayertcp ../libplayercore ../server/drivers/ ../utils/playerv/playerv.c ../utils/playernav/playernav.c ../utils/playercam/playercam.c ../utils/playerjoy/playerjoy.cc ../utils/playerprint/playerprint.cc ../utils/playervcr/playervcr.c ../utils/dgps_server/dgps_server.dox ../client_libs/libplayerc/doc/mainpage.html ../client_libs/libplayerc/doc/libplayerc_py.html ../client_libs/libplayerc/playerc.h ../client_libs/libplayerc++/playerclient.h ../client_libs/libplayerc++/utility.h ../client_libs/libplayerc++/clientproxy.h ../client_libs/libplayerc++/playerc++.h ../client_libs/libplayerc++/playerc++.cc ../client_libs/libplayerc++/playererror.h
-INPUT                  = player.txt quick_start.txt architecture.txt supported_hardware.txt tutorial_devices.txt tutorial_migration.txt tutorial_cameras.txt tutorial_automake.txt tutorial_crosscompiling.txt tutorial_args.txt tutorial_datalog.txt tutorial_config.txt tutorial_interface.txt tutorial_plugins.txt tutorial_maps.txt install.txt ../server/server.cc ../libplayercore/player.h @PROJECT_BINARY_DIR@/libplayercore/player_interfaces.h ../libplayercore/error.h ../libplayercore/configfile.h ../libplayercore/driver.h ../libplayercore/device.h ../libplayercore/message.h ../server/drivers ../libplayercore/interface_util.h ../libplayersd/playersd.h ../libplayertcp/playertcp.h ../libplayerxdr/playerxdr.html @PROJECT_BINARY_DIR@/libplayerxdr/playerxdr.h ../server/libplayerdrivers/driverregistry.h ../utils/playerv/playerv.c ../utils/playernav/playernav.c ../utils/playercam/playercam.c ../utils/playerjoy/playerjoy.cc ../utils/playerprint/playerprint.cc ../utils/playervcr/playervcr.c
  ../utils/dgps_server/dgps_server.dox ../utils/playerwritemap/playerwritemap.c ../client_libs/libplayerc/playerc.h ../client_libs/libplayerc/bindings/python/libplayerc_py.html ../client_libs/libplayerc++/playerclient.h ../client_libs/libplayerc++/playerc++.h ../client_libs/libplayerc++/playerc++.cc ../client_libs/libplayerc++/playererror.h ../client_libs/libplayerc++/utility.h ../client_libs/libplayerc++/clientproxy.h ../libplayercore/property.h
+INPUT                  = player.txt quick_start.txt architecture.txt supported_hardware.txt tutorial_devices.txt tutorial_migration.txt tutorial_cameras.txt tutorial_automake.txt tutorial_crosscompiling.txt tutorial_args.txt tutorial_datalog.txt tutorial_config.txt tutorial_interface.txt tutorial_plugins.txt tutorial_maps.txt install.txt ../server/server.cc ../libplayerinterface/player.h @PROJECT_BINARY_DIR@/libplayerinterface/player_interfaces.h ../libplayercommon/error.h ../libplayercore/configfile.h ../libplayercore/driver.h ../libplayercore/device.h ../libplayercore/message.h ../server/drivers ../libplayerinterface/interface_util.h ../libplayersd/playersd.h ../libplayertcp/playertcp.h ../libplayerinterface/playerxdr.html @PROJECT_BINARY_DIR@/libplayerinterface/playerxdr.h ../server/libplayerdrivers/driverregistry.h ../utils/playerv/playerv.c ../utils/playernav/playernav.c ../utils/playercam/playercam.c ../utils/playerjoy/playerjoy.cc ../utils/playerprint/playerprint.cc .
 ./utils/playervcr/playervcr.c ../utils/dgps_server/dgps_server.dox ../utils/playerwritemap/playerwritemap.c ../client_libs/libplayerc/playerc.h ../client_libs/libplayerc/bindings/python/libplayerc_py.html ../client_libs/libplayerc++/playerclient.h ../client_libs/libplayerc++/playerc++.h ../client_libs/libplayerc++/playerc++.cc ../client_libs/libplayerc++/playererror.h ../client_libs/libplayerc++/utility.h ../client_libs/libplayerc++/clientproxy.h ../libplayercore/property.h
+
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left

player-3.0.1.fixflexiport.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE player-3.0.1.fixflexiport.patch ---
diff -up ./server/drivers/opaque/CMakeLists.txt.fixflexiport ./server/drivers/opaque/CMakeLists.txt
--- ./server/drivers/opaque/CMakeLists.txt.fixflexiport	2010-01-10 00:34:33.000000000 -0500
+++ ./server/drivers/opaque/CMakeLists.txt	2010-01-10 00:35:23.000000000 -0500
@@ -1,6 +1,6 @@
 PLAYERDRIVER_OPTION (flexiport build_flexiport ON)
 PLAYERDRIVER_REQUIRE_PKG (flexiport build_flexiport flexiport flexiport_includeDirs
-    flexiport_libDirs flexiport_linkLibs flexiport_linkFlags flexiport_cFlags 1.0.0)
+    flexiport_libDirs flexiport_linkLibs flexiport_linkFlags flexiport_cFlags =1.0.0)
 PLAYERDRIVER_ADD_DRIVER (flexiport build_flexiport
     INCLUDEDIRS ${flexiport_includeDirs} LIBDIRS ${flexiport_libDirs}
     LINKLIBS ${flexiport_linkLibs} LINKFLAGS ${flexiport_linkFlags} CFLAGS ${flexiport_cFlags}

player-3.0.1.fixlibload.patch:
 cmake/internal/SetupDirectories.cmake |    5 +++++
 config.h.in                           |    2 ++
 libplayercore/plugins.cc              |   13 ++++++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

--- NEW FILE player-3.0.1.fixlibload.patch ---
diff -up ./cmake/internal/SetupDirectories.cmake.fixlibload ./cmake/internal/SetupDirectories.cmake
--- ./cmake/internal/SetupDirectories.cmake.fixlibload	2010-01-09 22:59:16.000000000 -0500
+++ ./cmake/internal/SetupDirectories.cmake	2010-01-09 23:03:17.000000000 -0500
@@ -19,3 +19,8 @@ ELSE (PLAYER_PROC_64BIT)
     MESSAGE (STATUS "Player libraries will be in lib")
 ENDIF (PLAYER_PROC_64BIT)
 
+IF (PLAYER_OS_WIN)
+    SET(PLAYER_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}\\lib")
+ELSE(PLAYER_OS_WIN)
+    SET(PLAYER_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${PLAYER_LIBRARY_INSTALL_DIR}/player/")
+ENDIF(PLAYER_OS_WIN)
diff -up ./config.h.in.fixlibload ./config.h.in
--- ./config.h.in.fixlibload	2010-01-09 22:57:28.000000000 -0500
+++ ./config.h.in	2010-01-09 23:05:03.000000000 -0500
@@ -2,6 +2,8 @@
 
 /* Install prefix */
 #define PLAYER_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
+#define PLAYER_LIBRARY_DIR "@PLAYER_LIBRARY_INSTALL_DIR@"
+#define PLAYER_PLUGIN_PATH "@PLAYER_PLUGIN_PATH@"
 
 /* enable TCP_NODELAY */
 #cmakedefine ENABLE_TCP_NODELAY 1
diff -up ./libplayercore/plugins.cc.fixlibload ./libplayercore/plugins.cc
--- ./libplayercore/plugins.cc.fixlibload	2009-08-10 23:44:43.000000000 -0400
+++ ./libplayercore/plugins.cc	2010-01-09 23:09:48.000000000 -0500
@@ -122,13 +122,20 @@ LoadPlugin(const char* pluginname, const
         PLAYER_ERROR1( "failed to add config file directory %s to the plugin path", cfgdir );
       free(tmp);
     }
+    
+    // add $PLAYER_INSTALL_PREFIX/lib(64)/player/
+    if( lt_dladdsearchdir( PLAYER_PLUGIN_PATH ) )
+      PLAYER_ERROR1( "failed to add working directory %s to the plugin path", PLAYER_PLUGIN_PATH );
 
-    // add $PLAYER_INSTALL_PREFIX/lib
+    // add $PLAYER_INSTALL_PREFIX/lib(64)/
     char installdir[ PATH_MAX ];
     strncpy( installdir, PLAYER_INSTALL_PREFIX, PATH_MAX);
-    strncat( installdir, "/lib/", PATH_MAX);
+    strncat( installdir, "/", PATH_MAX);
+    strncat( installdir, PLAYER_LIBRARY_DIR, PATH_MAX);
+    strncat( installdir, "/", PATH_MAX);
     if( lt_dladdsearchdir( installdir ) )
       PLAYER_ERROR1( "failed to add working directory %s to the plugin path", installdir );
+    
   }
 
   PLAYER_MSG1(3, "loading plugin %s", pluginname);
@@ -144,7 +151,7 @@ LoadPlugin(const char* pluginname, const
 
   return handle;
 #elif defined (WIN32)
-  std::vector<std::string> paths;
+  std::vector<std::string> paths;   
 
   if(pluginname[0] == '/' || pluginname[0] == '~')
   {

player-3.0.1.fixrubyinstall.patch:
 libplayerc++/bindings/ruby/CMakeLists.txt |   10 +++++-----
 libplayerc/bindings/ruby/CMakeLists.txt   |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE player-3.0.1.fixrubyinstall.patch ---
diff -up ./client_libs/libplayerc/bindings/ruby/CMakeLists.txt.fixrubyinstall ./client_libs/libplayerc/bindings/ruby/CMakeLists.txt
--- ./client_libs/libplayerc/bindings/ruby/CMakeLists.txt.fixrubyinstall	2010-01-09 23:40:08.000000000 -0500
+++ ./client_libs/libplayerc/bindings/ruby/CMakeLists.txt	2010-01-09 23:42:12.000000000 -0500
@@ -53,11 +53,11 @@ IF(RUBY_FOUND)
             ENDIF (HAVE_JPEG)
 
             #TODO: find ruby in windows, check install dir is correct  
-            STRING(REPLACE "/usr/" "" ruby_relative_sitelib_dir ${RUBY_SITELIB_DIR})
-            STRING(REPLACE "/opt/" "" ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir})
-            STRING(REPLACE "local/" "" ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir})
-	        STRING(REPLACE "lib/" ${PLAYER_LIBRARY_INSTALL_DIR}/ ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir} )
-            SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitelib_dir} CACHE PATH "Ruby bindings installation directory under $RUBY_SITELIB_DIR")
+            STRING(REPLACE "/usr/" "" ruby_relative_sitearch_dir ${RUBY_SITEARCH_DIR})
+            STRING(REPLACE "/opt/" "" ruby_relative_sitearch_dir ${ruby_relative_sitearch_dir})
+            STRING(REPLACE "local/" "" ruby_relative_sitearch_dir ${ruby_relative_sitearch_dir})
+	        STRING(REPLACE "lib/" ${PLAYER_LIBRARY_INSTALL_DIR}/ ruby_relative_sitearch_dir ${ruby_relative_sitearch_dir} )
+            SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitearch_dir} CACHE PATH "Ruby bindings installation directory under $RUBY_sitearch_DIR")
             MARK_AS_ADVANCED (RUBY_BINDINGS_INSTALL_DIR)
 
             INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/playercr.so
diff -up ./client_libs/libplayerc++/bindings/ruby/CMakeLists.txt.fixrubyinstall ./client_libs/libplayerc++/bindings/ruby/CMakeLists.txt
--- ./client_libs/libplayerc++/bindings/ruby/CMakeLists.txt.fixrubyinstall	2010-01-09 23:40:59.000000000 -0500
+++ ./client_libs/libplayerc++/bindings/ruby/CMakeLists.txt	2010-01-09 23:41:39.000000000 -0500
@@ -31,11 +31,11 @@ IF(BUILD_PLAYERCC)
                 SWIG_LINK_LIBRARIES (playercppr ${RUBY_LIBRARY} playerc++)
 
                 # TODO: find ruby in windows, check install dir is correct  
-                STRING(REPLACE "/usr/" "" ruby_relative_sitelib_dir ${RUBY_SITELIB_DIR})
-                STRING(REPLACE "/opt/" "" ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir})
-                STRING(REPLACE "local/" "" ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir})
-                STRING(REPLACE "lib/" ${PLAYER_LIBRARY_INSTALL_DIR}/ ruby_relative_sitelib_dir ${ruby_relative_sitelib_dir})
-                SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitelib_dir} CACHE PATH "Ruby bindings for the c++ library installation directory under $RUBY_SITELIB_DIR")
+                STRING(REPLACE "/usr/" "" ruby_relative_sitearch_dir ${RUBY_SITEARCH_DIR})
+                STRING(REPLACE "/opt/" "" ruby_relative_sitearch_dir ${ruby_relative_sitearch_dir})
+                STRING(REPLACE "local/" "" ruby_relative_sitearch_dir ${ruby_relative_sitearch_dir})
+                STRING(REPLACE "lib/" ${PLAYER_LIBRARY_INSTALL_DIR}/ ruby_relative_sitearch_dir ${ruby_relative_sitearch_dir})
+                SET (RUBY_BINDINGS_INSTALL_DIR ${ruby_relative_sitearch_dir} CACHE PATH "Ruby bindings for the c++ library installation directory under $RUBY_SITEARCH_DIR")
                 MARK_AS_ADVANCED (RUBY_BINDINGS_INSTALL_DIR)
 
                 INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/playercppr.so


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Nov 2009 23:50:57 -0000	1.3
+++ .cvsignore	10 Jan 2010 13:27:40 -0000	1.4
@@ -1 +1 @@
-player-3.0.0.tar.gz
+player-3.0.1.tar.gz


Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-12/player.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- player.spec	19 Nov 2009 12:33:29 -0000	1.12
+++ player.spec	10 Jan 2010 13:27:40 -0000	1.13
@@ -1,8 +1,9 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:           player
-Version:        3.0.0
-Release:        4%{?dist}
+Version:        3.0.1
+Release:        1%{?dist}
 Summary:        Cross-platform robot device interface and server
 
 Group:          Applications/System
@@ -12,7 +13,14 @@ Source0:        http://downloads.sourcef
 Source1:        playernav.desktop 
 Source2:        playercam.desktop 
 Source3:        playerv.desktop 
-Patch0:         %{name}-3.0.0-fixcmake64.patch
+# This patch adds a search directory for plugin libraries, proposed at http://old.nabble.com/Proposal%3A-Plugin-locations-for-Player-and-Stage-ts26868070.html 
+Patch0:         %{name}-%{version}.fixlibload.patch
+# This patch fixes some documentation build errors: http://sourceforge.net/tracker/index.php?func=detail&aid=2927173&group_id=42445&atid=433166
+Patch1:         %{name}-%{version}.fixdocs.patch
+# This patch fixes the Ruby install path to bring it in line with ruby packaging standards. Patch submitted https://sourceforge.net/tracker/?func=detail&aid=2929113&group_id=42445&atid=433166
+Patch2:         %{name}-%{version}.fixrubyinstall.patch
+# This patch adds correct version checking for Flexiport (once the gearbox packages are present in Fedora).  https://sourceforge.net/tracker/?func=detail&aid=2919373&group_id=42445&atid=433164
+Patch3:         %{name}-%{version}.fixflexiport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Sort order: build tools, feature libs, within alphabetically, group related
@@ -26,9 +34,10 @@ BuildRequires:  libtool, libtool-ltdl-de
 # Libs to enable Player features
 BuildRequires:  alsa-lib-devel
 BuildRequires:  avahi-compat-howl-devel
-BuildRequires:  boost-devel
+BuildRequires:  boost-devel boost-thread
 BuildRequires:  festival-devel
 BuildRequires:  fltk-devel
+#BuildRequires:  gearbox-devel
 BuildRequires:  geos-devel
 BuildRequires:  gsl-devel
 BuildRequires:  gtk2-devel, libgnomecanvas-devel
@@ -113,14 +122,17 @@ are experimental.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .fixcmake64
+%patch0 -p1 -b .fixlibload
+%patch1 -p1 -b .fixdocs
+%patch2 -p1 -b .fixrubyinstall
+%patch3 -p1 -b .fixflexiport
 find . -name '*.c' -exec chmod -x {} \;
 find . -name '*.cc' -exec chmod -x {} \;
 find . -name '*.cpp' -exec chmod -x {} \;
 find . -name '*.h' -exec chmod -x {} \;
 
 %build
-%cmake -DBUILD_DOCUMENTATION=ON -DBUILD_PLAYERCC=ON -DBUILD_PLAYERCC_BOOST=ON -DBUILD_PYTHONC_BINDINGS=ON -DBUILD_PYTHONCPP_BINDINGS=ON -DBUILD_EXAMPLES=ON -DBUILD_RUBYCPP_BINDINGS=ON .
+%cmake -DBUILD_DOCUMENTATION=ON -DBUILD_PLAYERCC=ON -DBUILD_PLAYERCC_BOOST=ON -DBUILD_PYTHONC_BINDINGS=ON -DBUILD_PYTHONCPP_BINDINGS=ON -DBUILD_EXAMPLES=ON -DBUILD_RUBYCPP_BINDINGS=ON -DBoost_USE_MULTITHREAD=ON .
 make
 
 pushd doc
@@ -131,6 +143,7 @@ popd
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/%{name}
 mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/config $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
 find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
 
@@ -164,6 +177,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %dir %{_datadir}/player
 %{_datadir}/applications/*.desktop
+%dir %{_libdir}/player
 
 %files devel
 %defattr(-,root,root,-)
@@ -188,9 +202,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files ruby
 %defattr (-,root,root,-)
-%{_libdir}/ruby
+%{ruby_sitearch}/*.so
 
 %changelog
+* Sun Jan 10 2010 Rich Mattes <richmattes at gmail.com> - 3.0.1-1
+- Updated to release 3.0.1
+- Fixed ruby bindings install path
+- Fixed documentation build process
+- Added libdir/player to plugin search path
+
 * Sun Nov 08 2009 Tim Niemueller <tim at niemueller.de> - 3.0.0-4
 - devel sub-package obsoletes no longer available static sub-package
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Nov 2009 23:50:58 -0000	1.3
+++ sources	10 Jan 2010 13:27:40 -0000	1.4
@@ -1 +1 @@
-5beee8655754559d5b80d9fcfbd3dd69  player-3.0.0.tar.gz
+69bdb26324e42458e1b8e7b9277e1a66  player-3.0.1.tar.gz


--- player-3.0.0-fixcmake64.patch DELETED ---

More information about the scm-commits mailing list