From bbc499352966a67d1da15780840e3485a061a5e5 Mon Sep 17 00:00:00 2001 From: rmattes Date: Jul 12 2010 02:27:09 +0000 Subject: - Update to release 3.0.2 --- diff --git a/.cvsignore b/.cvsignore index 7a00555..cbade02 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -player-3.0.1.tar.gz +player-3.0.2.tar.gz diff --git a/player-3.0.1.fixdocs.patch b/player-3.0.1.fixdocs.patch deleted file mode 100644 index cae88fe..0000000 --- a/player-3.0.1.fixdocs.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 - --
  • libplayererror -+
  • libplayercommon -
  • libplayerutils -
  • libplayersd -
  • libplayertcp -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 diff --git a/player-3.0.1.fixflexiport.patch b/player-3.0.1.fixflexiport.patch deleted file mode 100644 index 8a29947..0000000 --- a/player-3.0.1.fixflexiport.patch +++ /dev/null @@ -1,11 +0,0 @@ -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} diff --git a/player-3.0.1.fixrubyinstall.patch b/player-3.0.1.fixrubyinstall.patch deleted file mode 100644 index 1616870..0000000 --- a/player-3.0.1.fixrubyinstall.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 diff --git a/player-3.0.2.fixlinuxwifi.patch b/player-3.0.2.fixlinuxwifi.patch new file mode 100644 index 0000000..bd7014f --- /dev/null +++ b/player-3.0.2.fixlinuxwifi.patch @@ -0,0 +1,11 @@ +Index: server/drivers/wifi/CMakeLists.txt +=================================================================== +--- server/drivers/wifi/CMakeLists.txt (revision 8808) ++++ server/drivers/wifi/CMakeLists.txt (working copy) +@@ -8,5 +8,5 @@ + + PLAYERDRIVER_OPTION (linuxwifi build_linuxwifi ON) + PLAYERDRIVER_REJECT_OS (linuxwifi build_linuxwifi PLAYER_OS_WIN) +-PLAYERDRIVER_REQUIRE_HEADER (linuxwifi build_linuxwifi linux/wireless.h) ++PLAYERDRIVER_REQUIRE_HEADER (linuxwifi build_linuxwifi "sys/socket.h;linux/wireless.h") + PLAYERDRIVER_ADD_DRIVER (linuxwifi build_linuxwifi SOURCES linuxwifi.cc) diff --git a/player-3.0.2.fixunicapimage.patch b/player-3.0.2.fixunicapimage.patch new file mode 100644 index 0000000..885965f --- /dev/null +++ b/player-3.0.2.fixunicapimage.patch @@ -0,0 +1,58 @@ +Index: server/drivers/camera/unicap/unicapImage.cc +=================================================================== +--- server/drivers/camera/unicap/unicapImage.cc (revision 8808) ++++ server/drivers/camera/unicap/unicapImage.cc (working copy) +@@ -92,7 +92,7 @@ + + //////////////////////////////////////////////////////////////////////////////// + // The UniCap_Image device class. +-class UniCap_Image : public Driver ++class UniCap_Image : public ThreadedDriver + { + public: + // Constructor +@@ -145,7 +145,7 @@ + // Constructor. Retrieve options from the configuration file and do any + // pre-Setup() setup. + UniCap_Image::UniCap_Image (ConfigFile* cf, int section) +- : Driver (cf, section) ++ : ThreadedDriver (cf, section) + { + memset (&this->cam_id, 0, sizeof (player_devaddr_t)); + +@@ -247,8 +247,6 @@ + buffer.data = (unsigned char*)(malloc (format.size.width * format.size.height * format.bpp / 8)); + buffer.buffer_size = format.size.width * format.size.height * format.bpp / 8; + +- // Start the device thread +- StartThread (); + + return (0); + } +@@ -257,8 +255,6 @@ + // Shutdown the device + int UniCap_Image::Shutdown () + { +- // Stop the driver thread +- StopThread (); + + // Stop the device + if ( !SUCCESS (unicap_stop_capture (handle) ) ) +Index: server/drivers/camera/unicap/CMakeLists.txt +=================================================================== +--- server/drivers/camera/unicap/CMakeLists.txt (revision 8808) ++++ server/drivers/camera/unicap/CMakeLists.txt (working copy) +@@ -7,11 +7,11 @@ + SET (unicapExtraFlags "") + SET (unicapExtraLibs "-lunicap -lrt") + ELSE ("${UNICAP_DIR}" STREQUAL "") +- SET (unicapReqHeader "${UNICAP_DIR}/include/unicap/unicap.h") ++ SET (unicapReqHeader "${UNICAP_DIR}/include/unicap/unicap.h;${UNICAP_DIR}/include/unicap/unicap_status.h;${UNICAP_DIR}/include/unicap/unicap_version.h") + SET (unicapExtraFlags "-I${UNICAP_DIR}/include/unicap") + SET (unicapExtraLibs "-L${UNICAP_DIR}/lib -lcanlib -lrt") + ENDIF ("${UNICAP_DIR}" STREQUAL "") +- ++SET (CMAKE_REQUIRED_FLAGS ${unicapExtraFlags}) + PLAYERDRIVER_REQUIRE_HEADER (unicapimage build_unicapimage ${unicapReqHeader}) + + PLAYERDRIVER_ADD_DRIVER (unicapimage build_unicapimage diff --git a/player-3.0.2.s390.patch b/player-3.0.2.s390.patch new file mode 100644 index 0000000..5a2fbb6 --- /dev/null +++ b/player-3.0.2.s390.patch @@ -0,0 +1,13 @@ +diff -up ./cmake/internal/FindOS.cmake.s390 ./cmake/internal/FindOS.cmake +--- ./cmake/internal/FindOS.cmake.s390 2010-07-11 19:14:02.236941704 -0400 ++++ ./cmake/internal/FindOS.cmake 2010-07-11 19:15:08.014946749 -0400 +@@ -61,6 +61,9 @@ IF (PLAYER_OS_LINUX) + ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64") + MESSAGE (STATUS "Linux ppc64 Detected") + SET (PLAYER_PROC_64BIT TRUE BOOL INTERNAL) ++ ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x") ++ MESSAGE (STATUS "Linux s390x Detected") ++ SET (PLAYER_PROC_64BIT TRUE BOOL INTERNAL) + ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") + ENDIF (PLAYER_OS_LINUX) + diff --git a/player.spec b/player.spec index ad39e40..b544314 100644 --- a/player.spec +++ b/player.spec @@ -2,8 +2,8 @@ %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')} Name: player -Version: 3.0.1 -Release: 5%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: Cross-platform robot device interface and server Group: Applications/System @@ -14,13 +14,13 @@ Source1: playernav.desktop Source2: playercam.desktop Source3: playerv.desktop # 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 +Patch0: %{name}-3.0.1.fixlibload.patch +# This patch fixes detection of the Unicap headers +Patch1: %{name}-3.0.2.fixunicapimage.patch +# This patch fixes automatic detection of linux/wireless.h +Patch2: %{name}-3.0.2.fixlinuxwifi.patch +# This patch enables correct multilib packaging for s390x +Patch3: %{name}-3.0.2.s390.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Sort order: build tools, feature libs, within alphabetically, group related @@ -29,29 +29,24 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Build tools BuildRequires: cmake BuildRequires: desktop-file-utils -BuildRequires: doxygen, graphviz, texlive-latex, texlive, texlive-dvips, latex2html +BuildRequires: doxygen, texlive-latex, texlive, texlive-dvips, latex2html BuildRequires: libtool, libtool-ltdl-devel # Libs to enable Player features BuildRequires: alsa-lib-devel BuildRequires: avahi-compat-howl-devel -BuildRequires: boost-devel -%if 0%{?fedora} > 11 -BuildRequires: boost-thread -%endif +BuildRequires: boost-devel boost-thread BuildRequires: festival-devel -BuildRequires: fltk-devel BuildRequires: gearbox-devel BuildRequires: geos-devel BuildRequires: gsl-devel +BuildRequires: gstreamer-devel BuildRequires: gtk2-devel, libgnomecanvas-devel -BuildRequires: ImageMagick-devel BuildRequires: libdc1394-devel, libraw1394-devel BuildRequires: libjpeg-devel BuildRequires: libpqxx-devel BuildRequires: libstatgrab-devel BuildRequires: libusb-devel -BuildRequires: libXmu-devel -BuildRequires: mesa-libGL-devel, freeglut-devel +BuildRequires: libXext-devel BuildRequires: opencv-devel BuildRequires: openssl-devel BuildRequires: perl @@ -131,9 +126,9 @@ are experimental. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .fixlibload -%patch1 -p1 -b .fixdocs -%patch2 -p1 -b .fixrubyinstall -%patch3 -p1 -b .fixflexiport +%patch1 -p0 +%patch2 -p0 +%patch3 -p1 -b .s390 find . -name '*.c' -exec chmod -x {} \; find . -name '*.cc' -exec chmod -x {} \; find . -name '*.cpp' -exec chmod -x {} \; @@ -204,6 +199,7 @@ rm -rf $RPM_BUILD_ROOT %files doc %defattr(-,root,root,-) +%doc COPYING %doc doc/*.txt %doc doc/*.html %doc doc/player-docs @@ -213,6 +209,9 @@ rm -rf $RPM_BUILD_ROOT %{ruby_sitearch}/*.so %changelog +* Sun Jul 11 2010 Rich Mattes - 3.0.2-1 +- Update to release 3.0.2 + * Sun Apr 4 2010 Rich Mattes - 3.0.1-5 - Rebuild for GEOS soname bump - Enable nimu and acr120u drivers diff --git a/sources b/sources index da53601..466412b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69bdb26324e42458e1b8e7b9277e1a66 player-3.0.1.tar.gz +b92b5ea028e6bfc49351849f420167db player-3.0.2.tar.gz