rpms/player/devel player-3.0.2.fixlinuxwifi.patch, NONE, 1.1 player-3.0.2.fixunicapimage.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 player.spec, 1.18, 1.19 sources, 1.4, 1.5
rmattes
rmattes at fedoraproject.org
Wed Jun 30 02:46:58 UTC 2010
Author: rmattes
Update of /cvs/pkgs/rpms/player/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7490
Modified Files:
.cvsignore player.spec sources
Added Files:
player-3.0.2.fixlinuxwifi.patch
player-3.0.2.fixunicapimage.patch
Log Message:
* Tue Jun 29 2010 Rich Mattes <richmattes at gmail.com> - 3.0.2-1
- Upgrade to release 3.0.2
- Remove more supurious BuildRequires
- Add BuildRequires to enable more features
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/player/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 10 Jan 2010 15:35:39 -0000 1.4
+++ .cvsignore 30 Jun 2010 02:46:58 -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/devel/player.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- player.spec 26 Jun 2010 15:55:41 -0000 1.18
+++ player.spec 30 Jun 2010 02:46:58 -0000 1.19
@@ -2,8 +2,8 @@
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
Name: player
-Version: 3.0.1
-Release: 7%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
Summary: Cross-platform robot device interface and server
Group: Applications/System
@@ -14,13 +14,11 @@ 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
+Patch0: %{name}-3.0.1.fixlibload.patch
+Patch1: %{name}-3.0.2.fixunicapimage.patch
+Patch2: %{name}-3.0.2.fixlinuxwifi.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
+#Patch3: %{name}-%{version}.fixflexiport.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Sort order: build tools, feature libs, within alphabetically, group related
@@ -39,14 +37,14 @@ BuildRequires: festival-devel
BuildRequires: gearbox-devel
BuildRequires: geos-devel
BuildRequires: gsl-devel
+BuildRequires: gstreamer-devel
BuildRequires: gtk2-devel, libgnomecanvas-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
@@ -126,16 +124,15 @@ 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
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 -DBoost_USE_MULTITHREAD=ON -DENABLE_DRIVER_OCEANSERVER=OFF .
+%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 -DENABLE_DRIVER_OCEANSERVER=OFF -DUNICAP_DIR=/usr .
make
pushd doc
@@ -208,6 +205,11 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_sitearch}/*.so
%changelog
+* Tue Jun 29 2010 Rich Mattes <richmattes at gmail.com> - 3.0.2-1
+- Upgrade to release 3.0.2
+- Remove more supurious BuildRequires
+- Add BuildRequires to enable more features
+
* Sun Jun 26 2010 Rich Mattes <richmattes at gmail.com> - 3.0.1-7
- Rebuild for OpenCV soname change
- Remove unnecessary BuildRequires
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/player/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 10 Jan 2010 15:35:39 -0000 1.4
+++ sources 30 Jun 2010 02:46:58 -0000 1.5
@@ -1 +1 @@
-69bdb26324e42458e1b8e7b9277e1a66 player-3.0.1.tar.gz
+b92b5ea028e6bfc49351849f420167db player-3.0.2.tar.gz
More information about the scm-commits
mailing list