rpms/ogre/FC-6 ogre-1.2.5-ppc64.patch, NONE, 1.1 ogre-samples.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 ogre-1.2.1-rpath.patch, 1.1, 1.2 ogre.spec, 1.4, 1.5 sources, 1.3, 1.4 ogre-1.2.1-char_height.patch, 1.1, NONE ogre-1.2.1-gtkmm.patch, 1.2, NONE ogre-1.2.1-visibility.patch, 1.1, NONE ogre-1.2.2-soname.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Jul 4 20:47:21 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/ogre/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13622
Modified Files:
.cvsignore ogre-1.2.1-rpath.patch ogre.spec sources
Added Files:
ogre-1.2.5-ppc64.patch ogre-samples.sh
Removed Files:
ogre-1.2.1-char_height.patch ogre-1.2.1-gtkmm.patch
ogre-1.2.1-visibility.patch ogre-1.2.2-soname.patch
Log Message:
* Sat Jun 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.2-1
- New upstream release 1.4.2
- Warning as always with a new upstream ogre release this breaks the ABI
and changes the soname!
- Warning this release also breaks the API!
ogre-1.2.5-ppc64.patch:
--- NEW FILE ogre-1.2.5-ppc64.patch ---
--- ogrenew/OgreMain/include/OgrePlatform.h~ 2007-05-24 10:52:23.000000000 +0200
+++ ogrenew/OgreMain/include/OgrePlatform.h 2007-05-24 10:52:23.000000000 +0200
@@ -91,7 +91,7 @@
#endif
/* Find the arch type */
-#if defined(__x86_64__) || defined(_M_X64)
+#if defined(__LP64__)
# define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64
#else
# define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32
--- NEW FILE ogre-samples.sh ---
#!/bin/bash
set -e
# find out LIBDIR
if [ -f /usr/lib64/OGRE/Samples/resources.cfg ]; then
LIBDIR=/usr/lib64
else
LIBDIR=/usr/lib
fi
mkdir -p $HOME/.ogre-samples
cd $HOME/.ogre-samples
cp -f $LIBDIR/OGRE/Samples/resources.cfg .
cp -f $LIBDIR/OGRE/Samples/media.cfg .
echo "# Defines plugins to load" > plugins.cfg
echo >> plugins.cfg
echo "# Define plugin folder" >> plugins.cfg
echo "PluginFolder=$LIBDIR/OGRE" >> plugins.cfg
echo >> plugins.cfg
echo "# Define D3D rendering implementation plugin" >> plugins.cfg
for i in `(cd $LIBDIR/OGRE; ls *.so)`; do
if [ $i != libOgrePlatform.so ]; then
echo "Plugin=$i" >> plugins.cfg
fi
done
set +e
for i in `(cd $LIBDIR/OGRE/Samples/; find -type f -perm +111)`; do
if [ $i != ./BSP ]; then
$LIBDIR/OGRE/Samples/$i
fi
done
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogre/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 1 Aug 2006 12:46:04 -0000 1.3
+++ .cvsignore 4 Jul 2007 20:46:45 -0000 1.4
@@ -1 +1 @@
-ogre-linux_osx-v1-2-2p1.tar.bz2
+ogre-linux-osx-v1-4-2.tar.bz2
ogre-1.2.1-rpath.patch:
Index: ogre-1.2.1-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/ogre/FC-6/ogre-1.2.1-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogre-1.2.1-rpath.patch 7 Jul 2006 18:24:11 -0000 1.1
+++ ogre-1.2.1-rpath.patch 4 Jul 2007 20:46:45 -0000 1.2
@@ -1,21 +1,24 @@
---- 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 @@
+diff -up ogrenew/OgreMain/src/Makefile.am~ ogrenew/OgreMain/src/Makefile.am
+--- ogrenew/OgreMain/src/Makefile.am~ 2007-06-30 21:18:34.000000000 +0200
++++ ogrenew/OgreMain/src/Makefile.am 2007-06-30 21:18:34.000000000 +0200
+@@ -185,7 +185,7 @@ endif
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@
+ libOgreMain_la_LIBADD= $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(GTK_LIBS) $(OGRE_THREAD_LIBS) $(PLATFORM_LIBS)
+-libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ -Wl,-rpath,$(platformdir)
++libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@
+ #-version-info @OGREMAIN_VERSION_INFO@ -Wl,-rpath,$(platformdir)
#-Wl,--version-script=$(top_srcdir)/OgreMain/src/ogremain.map
+diff -up ogrenew/OgreMain/src/Makefile.in~ ogrenew/OgreMain/src/Makefile.in
+--- ogrenew/OgreMain/src/Makefile.in~ 2007-06-30 21:19:23.000000000 +0200
++++ ogrenew/OgreMain/src/Makefile.in 2007-06-30 21:19:23.000000000 +0200
+@@ -488,7 +488,7 @@ platformdir = $(libdir)
+ libOgreMain_la_LIBADD = $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) \
+ $(GTK_LIBS) $(OGRE_THREAD_LIBS) $(PLATFORM_LIBS) \
+ $(am__append_3)
+-libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ -Wl,-rpath,$(platformdir)
++libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@
+ all: all-am
+
+ .SUFFIXES:
Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/FC-6/ogre.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ogre.spec 28 Aug 2006 12:04:02 -0000 1.4
+++ ogre.spec 4 Jul 2007 20:46:45 -0000 1.5
@@ -1,19 +1,18 @@
-%define version_postfix p1
-
Name: ogre
-Version: 1.2.2
-Release: 2.%{version_postfix}%{?dist}
+Version: 1.4.2
+Release: 1%{?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 . -)%{version_postfix}.tar.bz2
+Source0: http://downloads.sourceforge.net/ogre/ogre-linux-osx-v%(echo %{version} | tr . -).tar.bz2
+Source1: ogre-samples.sh
Patch0: ogre-1.2.1-rpath.patch
-Patch1: ogre-1.2.1-gtkmm.patch
-Patch2: ogre-1.2.2-soname.patch
+Patch1: ogre-1.2.5-ppc64.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
+BuildRequires: cegui-devel zziplib-devel DevIL-devel freetype-devel gtk2-devel
+BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
+BuildRequires: ois-devel
%description
OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,
@@ -39,36 +38,54 @@
%package devel-doc
Summary: Ogre development documentation
Group: Documentation
+Requires: %{name} = %{version}-%{release}
%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.
+%package samples
+Summary: Ogre samples executables and media
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description samples
+This package contains the compiled (not the source) sample applications coming
+with Ogre. It also contains some media (meshes, textures,...) needed by these
+samples. The samples are installed in %{_libdir}/Samples and can be executed
+with the wrapper script called "Ogre-Samples".
+
+
%prep
%setup -q -n ogrenew
%patch0 -p1 -z .rpath
-%patch1 -p1 -z .gtkmm
-%patch2 -p1 -z .soname
-# sigh stop autoxxx from rerunning because of our patches above.
-touch aclocal.m4
-touch configure
-touch `find -name Makefile.in`
-touch OgreMain/include/config.h.in
-# 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`
+%patch1 -p1 -z .ppc64
+# Don't try to build SSE optimised code on ppc64
+sed -i 's/\tpowerpc)$/\tpowerpc|powerpc64)/g' configure
+# stop some CVS stuff from getting installed
+rm -r `find Docs Samples/Media -name CVS` 'Docs/manual/.#manual_16.html.1.47' \
+ Docs/manual/manual_16.html.rej
+# fix line-endings of Docs
+sed -i 's/\r//g' Docs/manual/*.html
+# remove execute bits from src-files for -debuginfo package
+chmod -x `find RenderSystems/GL -type f` \
+ `find Samples/DeferredShading -type f` Samples/DynTex/src/DynTex.cpp
+# Fix path to Media files for the Samples
+sed -i 's|../../Media|%{_datadir}/OGRE/Samples/Media|g' \
+ Samples/Common/bin/resources.cfg
+# Remove spurious execute buts from some Media files
+chmod -x `find Samples/Media/DeferredShadingMedia -type f` \
+ Samples/Media/overlays/Example-DynTex.overlay \
+ Samples/Media/gui/TaharezLook.looknfeel \
+ Samples/Media/gui/Falagard.xsd \
+ Samples/Media/materials/scripts/Example-DynTex.material
%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
+# notice we disable freeimage (and thus use DevIL) because freeimage
+# is GPL not LGPL
+%configure --disable-cg --disable-freeimage
# 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
@@ -78,25 +95,23 @@
%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
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/OGRE/*.la
+
+# Install the samples
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
+# The Sample binaries get installed into the buildroot in a subdir of
+# the cwd??
+mv $RPM_BUILD_ROOT`pwd`/Samples/Common/bin/* \
+ $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
+for cfg in `find Samples/Common/bin -name \*.cfg -print -maxdepth 1`
+do
+ install -p -m 644 $cfg $RPM_BUILD_ROOT%{_libdir}/OGRE/Samples
+done
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/Ogre-Samples
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples
+cp -a Samples/Media $RPM_BUILD_ROOT%{_datadir}/OGRE/Samples
%clean
@@ -116,6 +131,9 @@
%{_libdir}/lib*Ogre*-%{version}.so
%{_libdir}/OGRE
%{_datadir}/OGRE
+%exclude %{_bindir}/Ogre-Samples
+%exclude %{_libdir}/OGRE/Samples
+%exclude %{_datadir}/OGRE/Samples
%files devel
%defattr(-,root,root,-)
@@ -128,8 +146,35 @@
%defattr(-,root,root,-)
%doc LINUX.DEV Docs/api Docs/manual Docs/vbo-update Docs/style.css
+%files samples
+%defattr(-,root,root)
+%{_bindir}/Ogre-Samples
+%{_libdir}/OGRE/Samples
+%{_datadir}/OGRE/Samples
+
%changelog
+* Sat Jun 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.2-1
+- New upstream release 1.4.2
+- Warning as always with a new upstream ogre release this breaks the ABI
+ and changes the soname!
+- Warning this release also breaks the API!
+
+* Thu May 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.5-2
+- Fix building on ppc64
+
+* Fri Feb 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.5-1
+- New upstream release 1.2.5
+
+* Fri Jan 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.3-2
+- Rebuild for new cairomm
+- Added a samples sub-package (suggested by Xavier Decoret)
+
+* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.3-1
+- New upstream release 1.2.3
+- Warning as always with a new upstream ogre release this breaks the ABI
+ and changes the soname!
+
* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-2.p1
- FE6 Rebuild
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 1 Aug 2006 12:31:47 -0000 1.3
+++ sources 4 Jul 2007 20:46:45 -0000 1.4
@@ -1 +1 @@
-34004bdde39427e9a3213286f8cc057a ogre-linux_osx-v1-2-2p1.tar.bz2
+52eea0cf5fc659d9ca63491348e0e0ec ogre-linux-osx-v1-4-2.tar.bz2
--- ogre-1.2.1-char_height.patch DELETED ---
--- ogre-1.2.1-gtkmm.patch DELETED ---
--- ogre-1.2.1-visibility.patch DELETED ---
--- ogre-1.2.2-soname.patch DELETED ---
More information about the scm-commits
mailing list