rpms/nucleo/devel nucleo-0.5-64bit.patch, NONE, 1.1 nucleo-0.5-gcc.patch, NONE, 1.1 nucleo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Christopher Stone (xulchris) fedora-extras-commits at redhat.com
Wed May 31 03:31:44 UTC 2006


Author: xulchris

Update of /cvs/extras/rpms/nucleo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4557/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nucleo-0.5-64bit.patch nucleo-0.5-gcc.patch nucleo.spec 
Log Message:
auto-import nucleo-0.5-2 on branch devel from nucleo-0.5-2.src.rpm

nucleo-0.5-64bit.patch:

--- NEW FILE nucleo-0.5-64bit.patch ---
--- nucleo/image/Image.cxx.orig	2006-05-20 12:38:57.000000000 -0700
+++ nucleo/image/Image.cxx	2006-05-20 12:39:07.000000000 -0700
@@ -240,7 +240,7 @@
     out << getWidth() << "x" << getHeight() << " " << std::flush ;
     out << getEncodingName(_encoding) ;
     out << " (" << _size ;
-    out << " " << std::hex << "0x" << (int)_data << std::dec ;
+    out << " " << std::hex << "0x" << (intptr_t)_data << std::dec ;
     out << " " << getFreeMethodName(_fmethod) ;
     out << ")" << std::flush ;
   }
--- nucleo/gl/scenegraph/sgNode.cxx.orig	2006-05-20 12:39:46.000000000 -0700
+++ nucleo/gl/scenegraph/sgNode.cxx	2006-05-20 12:40:00.000000000 -0700
@@ -283,7 +283,7 @@
   sgNode::selectGraph(void) {
     //    if (debugMode) std::cout << "select '" << _name << "' (" << this << ")" << std::endl ;
     if (_hidden) return;
-    glPushName((GLuint)this) ;
+    glPushName((intptr_t)this) ;
     glPushMatrix() ;
     glMultMatrixf((const GLfloat *)_transformations) ;
     select() ;

nucleo-0.5-gcc.patch:

--- NEW FILE nucleo-0.5-gcc.patch ---
--- nucleo/utils/StringUtils.cxx.orig	2006-05-20 12:37:48.000000000 -0700
+++ nucleo/utils/StringUtils.cxx	2006-05-20 12:37:58.000000000 -0700
@@ -17,10 +17,6 @@
 
 namespace nucleo {
 
-#if defined(__GNUC__)
-  template class std::basic_string<char, ci_char_traits> ;
-#endif
-
   void
   trimString(std::string &s, std::string badboys) {
     std::string::size_type end = s.find_last_not_of(badboys) ;


--- NEW FILE nucleo.spec ---
Name:           nucleo
Version:        0.5
Release:        2%{?dist}
Summary:        Toolkit for exploring new uses of video
Group:          Development/Tools
License:        LGPL
URL:            http://insitu.lri.fr/~roussel/projects/nucleo
Source0:        http://insitu.lri.fr/~chapuis/software/metisse/%{name}-%{version}.tar.gz
Patch0:         %{name}-%{version}-gcc.patch
Patch1:         %{name}-%{version}-64bit.patch
BuildRequires:  libGL-devel libGLU-devel
BuildRequires:  libjpeg-devel libpng-devel libexif-devel freetype-devel
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Nucleo is a toolkit for exploring new uses of video and new human-computer
interaction techniques.

%package devel
Summary:        Files necessary for developing with %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
This package contains files required to build applications that make
use of %{name}.

%prep
%setup -q
%patch0 -p0 -b .gcc
%patch1 -p0 -b .64bit

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%makeinstall

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING.LESSER INSTALL LICENSE NEWS README
%{_bindir}/nBundle
%{_bindir}/nTest
%{_bindir}/videoClient
%{_bindir}/videoServer
%{_libdir}/libNucleo.so.*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*

%files devel
%defattr(-,root,root,-)
%{_bindir}/%{name}-config
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*
%{_libdir}/libNucleo.so
%{_libdir}/pkgconfig/%{name}.pc
%exclude %{_libdir}/*.la

%changelog
* Sun May 21 2006 Christopher Stone <chris.stone at gmail.com> 0.5-2
- Add optional BuildRequires

* Sat May 20 2006 Christopher Stone <chris.stone at gmail.com> 0.5-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nucleo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 May 2006 03:31:00 -0000	1.1
+++ .cvsignore	31 May 2006 03:31:44 -0000	1.2
@@ -0,0 +1 @@
+nucleo-0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nucleo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 May 2006 03:31:00 -0000	1.1
+++ sources	31 May 2006 03:31:44 -0000	1.2
@@ -0,0 +1 @@
+e968b0ce94a69119a11d113f973aa616  nucleo-0.5.tar.gz




More information about the fedora-extras-commits mailing list