rpms/player/F-12 player-3.0.2.fixlinuxwifi.patch, NONE, 1.1 player-3.0.2.fixunicapimage.patch, NONE, 1.1 player-3.0.2.s390.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 player.spec, 1.17, 1.18 sources, 1.4, 1.5 player-3.0.1.fixdocs.patch, 1.1, NONE player-3.0.1.fixflexiport.patch, 1.1, NONE player-3.0.1.fixrubyinstall.patch, 1.1, NONE

Mon Jul 12 02:27:09 UTC 2010

Author: rmattes

Update of /cvs/pkgs/rpms/player/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21441

Modified Files:
	.cvsignore player.spec sources 
Added Files:
	player-3.0.2.fixlinuxwifi.patch 
	player-3.0.2.fixunicapimage.patch player-3.0.2.s390.patch 
Removed Files:
	player-3.0.1.fixdocs.patch player-3.0.1.fixflexiport.patch 
	player-3.0.1.fixrubyinstall.patch 
Log Message:
* Sun Jul 11 2010 Rich Mattes <richmattes at gmail.com> - 3.0.2-1
- Update to release 3.0.2


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

--- NEW FILE player-3.0.2.fixlinuxwifi.patch ---
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)

player-3.0.2.fixunicapimage.patch:
 CMakeLists.txt |    4 ++--
 unicapImage.cc |    8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

--- NEW FILE player-3.0.2.fixunicapimage.patch ---
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

player-3.0.2.s390.patch:
 FindOS.cmake |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE player-3.0.2.s390.patch ---
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)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Jan 2010 13:27:40 -0000	1.4
+++ .cvsignore	12 Jul 2010 02:27:09 -0000	1.5
@@ -1 +1 @@
-player-3.0.1.tar.gz
+player-3.0.2.tar.gz


Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-12/player.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- player.spec	4 Apr 2010 20:31:01 -0000	1.17
+++ player.spec	12 Jul 2010 02:27:09 -0000	1.18
@@ -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}-%{ve
 # 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 <richmattes at gmail.com> - 3.0.2-1
+- Update to release 3.0.2
+
 * Sun Apr 4 2010 Rich Mattes <richmattes at gmail.com> - 3.0.1-5
 - Rebuild for GEOS soname bump
 - Enable nimu and acr120u drivers


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Jan 2010 13:27:40 -0000	1.4
+++ sources	12 Jul 2010 02:27:09 -0000	1.5
@@ -1 +1 @@
-69bdb26324e42458e1b8e7b9277e1a66  player-3.0.1.tar.gz
+b92b5ea028e6bfc49351849f420167db  player-3.0.2.tar.gz


--- player-3.0.1.fixdocs.patch DELETED ---


--- player-3.0.1.fixflexiport.patch DELETED ---


--- player-3.0.1.fixrubyinstall.patch DELETED ---

