rpms/ogre/devel ogre-1.2.1-char_height.patch, NONE, 1.1 ogre-1.2.1-gtkmm.patch, NONE, 1.1 ogre-1.2.1-rpath.patch, NONE, 1.1 ogre.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Jul 7 18:24:11 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29986/devel
Modified Files:
.cvsignore sources
Added Files:
ogre-1.2.1-char_height.patch ogre-1.2.1-gtkmm.patch
ogre-1.2.1-rpath.patch ogre.spec
Log Message:
auto-import ogre-1.2.1-2 on branch devel from ogre-1.2.1-2.src.rpm
ogre-1.2.1-char_height.patch:
--- NEW FILE ogre-1.2.1-char_height.patch ---
--- ogrenew/OgreMain/src/OgreTextAreaOverlayElement.cpp~ 2006-06-26 15:01:47.000000000 +0200
+++ ogrenew/OgreMain/src/OgreTextAreaOverlayElement.cpp 2006-06-26 15:01:47.000000000 +0200
@@ -356,7 +356,7 @@
}
else
{
- mCharHeight = static_cast<unsigned>(height);
+ mCharHeight = height;
}
mGeomPositionsOutOfDate = true;
}
ogre-1.2.1-gtkmm.patch:
--- NEW FILE ogre-1.2.1-gtkmm.patch ---
diff -ur ogrenew/PlatformManagers/SDL/include/OgreSDLConfig_gtk.h ogrenew.new/PlatformManagers/SDL/include/OgreSDLConfig_gtk.h
--- ogrenew/PlatformManagers/SDL/include/OgreSDLConfig_gtk.h 2005-02-04 18:50:41.000000000 +0100
+++ ogrenew.new/PlatformManagers/SDL/include/OgreSDLConfig_gtk.h 2006-06-16 22:30:36.000000000 +0200
@@ -40,7 +40,7 @@
namespace Ogre {
/** GTK+ config */
- class SDLConfig : public ConfigDialog, public SigC::Object
+ class SDLConfig : public ConfigDialog, public sigc::trackable
{
public:
SDLConfig()
diff -ur ogrenew/PlatformManagers/SDL/src/OgreSDLConfig_gtk.cpp ogrenew.new/PlatformManagers/SDL/src/OgreSDLConfig_gtk.cpp
--- ogrenew/PlatformManagers/SDL/src/OgreSDLConfig_gtk.cpp 2006-01-26 13:38:24.000000000 +0100
+++ ogrenew.new/PlatformManagers/SDL/src/OgreSDLConfig_gtk.cpp 2006-06-16 22:30:00.000000000 +0200
@@ -23,6 +23,7 @@
*/
#include "OgreSDLConfig.h"
+#include "OgreLogManager.h"
#include <libglademm/xml.h>
@@ -65,17 +66,16 @@
_opt_menu = NULL;
// Hookup signals
- _winConfig->signal_delete_event().connect(SigC::slot(*this,
- &SDLConfig::on_window_delete));
+ _winConfig->signal_delete_event().connect(sigc::mem_fun(this, &SDLConfig::on_window_delete));
_option_selection = _lstOptions->get_selection();
- _option_selection->signal_changed().connect(SigC::slot(*this,
+ _option_selection->signal_changed().connect(sigc::mem_fun(this,
&SDLConfig::on_option_changed));
- _optRenderer->signal_changed().connect(SigC::slot(*this,
+ _optRenderer->signal_changed().connect(sigc::mem_fun(this,
&SDLConfig::on_renderer_changed));
- _optOptValues->signal_changed().connect(SigC::slot(*this,
+ _optOptValues->signal_changed().connect(sigc::mem_fun(this,
&SDLConfig::on_value_changed));
- btn_ok->signal_clicked().connect(SigC::slot(*this, &SDLConfig::on_btn_ok));
- btn_cancel->signal_clicked().connect(SigC::slot(&Gtk::Main::quit));
+ btn_ok->signal_clicked().connect(sigc::mem_fun(this, &SDLConfig::on_btn_ok));
+ btn_cancel->signal_clicked().connect(sigc::ptr_fun(&Gtk::Main::quit));
// Initialize
ogre-1.2.1-rpath.patch:
--- NEW FILE ogre-1.2.1-rpath.patch ---
--- ogrenew/OgreMain/src/Makefile.in~ 2006-06-15 23:31:11.000000000 +0200
+++ ogrenew/OgreMain/src/Makefile.in 2006-06-15 23:31:11.000000000 +0200
@@ -452,7 +452,7 @@
OgreCompiler2Pass.cpp $(am__append_1)
platformdir = $(libdir)
libOgreMain_la_LIBADD = $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(OGRE_THREAD_LIBS)
-libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@ -Wl,-rpath,$(platformdir)
+libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@
all: all-am
.SUFFIXES:
--- ogrenew/OgreMain/src/Makefile.am~ 2006-06-15 23:31:02.000000000 +0200
+++ ogrenew/OgreMain/src/Makefile.am 2006-06-15 23:31:02.000000000 +0200
@@ -174,6 +174,6 @@
platformdir = $(libdir)
libOgreMain_la_LIBADD= $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(OGRE_THREAD_LIBS)
-libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@ -Wl,-rpath,$(platformdir)
+libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@
#-Wl,--version-script=$(top_srcdir)/OgreMain/src/ogremain.map
--- NEW FILE ogre.spec ---
Name: ogre
Version: 1.2.1
Release: 2%{?dist}
Summary: Object-Oriented Graphics Rendering Engine
License: LGPL
Group: System Environment/Libraries
URL: http://www.ogre3d.org/
Source0: http://dl.sf.net/sourceforge/ogre/ogre-linux_osx-v%(echo %{version} | tr . -).tar.bz2
Patch0: ogre-1.2.1-rpath.patch
Patch1: ogre-1.2.1-gtkmm.patch
Patch2: ogre-1.2.1-char_height.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cegui-devel zziplib-devel DevIL-devel SDL-devel freetype-devel
BuildRequires: libglademm24-devel libsigc++20-devel
%description
OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,
flexible 3D engine written in C++ designed to make it easier and more
intuitive for developers to produce applications utilising
hardware-accelerated 3D graphics. The class library abstracts all the
details of using the underlying system libraries like Direct3D and
OpenGL and provides an interface based on world objects and other
intuitive classes.
%package devel
Summary: Ogre header files and documentation
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
This package contains the header files for Ogre.
Install this package if you want to develop programs that use Ogre.
%package devel-doc
Summary: Ogre development documentation
Group: Documentation
%description devel-doc
This package contains the Ogre API documentation and the Ogre development
manual. Install this package if you want to develop programs that use Ogre.
%prep
%setup -q -n ogrenew
%patch0 -p1 -z .rpath
%patch1 -p1 -z .gtkmm
%patch2 -p1 -z .char_height
# we don't do this with a patch since we need %{_libdir}
sed -i 's|libOgrePlatform.so|%{_libdir}/OGRE/libOgrePlatform.so|' \
OgreMain/include/OgrePlatform.h
rm -fr `find Docs -name CVS`
#remove execute bits from src-files for -debuginfo package
chmod -x `find RenderSystems/GL -type f`
%build
# Upstream advises --with-platform=GLX, but that uses Xrandr for fullscreen,
# which has issues (see bz 190918).
# Notice that if we switch back to GLX --with-cfgtk=gtk can be removed and so
# can the libglademm24-devel and libsigc++20-devel BuildRequires.
%configure --with-platform=SDL --with-cfgtk=gtk --disable-cg
# Don't use rpath!
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/OGRE/*.la
# move libOgrePlatform.so out of %{_libdir} and into the OGRE plugins dirs as
# its not versioned and only used through dlopen, so its effectivly a plugin.
mv $RPM_BUILD_ROOT%{_libdir}/libOgrePlatform.so $RPM_BUILD_ROOT%{_libdir}/OGRE
# fix rpm-debuginfo not handling symlinks correctly <sigh> see BZ 189928
pushd PlatformManagers/SDL
rm src/OgreSDLConfig.cpp
cp src/OgreSDLConfig_gtk.cpp src/OgreSDLConfig.cpp
rm include/OgreSDLConfig.h
cp include/OgreSDLConfig_gtk.h include/OgreSDLConfig.h
popd
# the gtk-configurator wants this file and it doesn't get installed
# by make install so DYI
mkdir -p $RPM_BUILD_ROOT%{_datadir}/OGRE/Media
install -p -m 644 Samples/Media/materials/textures/ogrelogo-small.jpg \
$RPM_BUILD_ROOT%{_datadir}/OGRE/Media
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING
%doc Docs/ChangeLog.html Docs/ReadMe.html Docs/style.css Docs/ogre-logo.gif
%{_bindir}/Ogre*
%{_libdir}/lib*.so.*
%{_libdir}/OGRE
%{_datadir}/OGRE
%files devel
%defattr(-,root,root,-)
%{_libdir}/lib*.so
%{_includedir}/OGRE
%{_libdir}/pkgconfig/*.pc
%files devel-doc
%defattr(-,root,root,-)
%doc LINUX.DEV Docs/api Docs/manual Docs/vbo-update Docs/style.css
%changelog
* Fri Jul 7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-2
- Make -devel package Requires on the main package fully versioned.
- Move libOgrePlatform.so out of %%{_libdir} and into the OGRE plugins dirs as
its not versioned and only used through dlopen, so its effectivly a plugin.
* Thu Jun 15 2006 Hans de Goede 1.2.1-1
- Initial FE packaging attempt, loosely based on a specfile created by
Xavier Decoret <Xavier.Decoret at imag.fr>
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 7 Jul 2006 18:11:58 -0000 1.1
+++ .cvsignore 7 Jul 2006 18:24:11 -0000 1.2
@@ -0,0 +1 @@
+ogre-linux_osx-v1-2-1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 7 Jul 2006 18:11:58 -0000 1.1
+++ sources 7 Jul 2006 18:24:11 -0000 1.2
@@ -0,0 +1 @@
+6ff98b1f14ca679ceaeec00daff2ff87 ogre-linux_osx-v1-2-1.tar.bz2
More information about the fedora-extras-commits
mailing list