rpms/ogre/devel ogre-1.2.2-soname.patch,NONE,1.1
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Tue Aug 1 12:50:10 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1024
Added Files:
ogre-1.2.2-soname.patch
Log Message:
* Thu Jul 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1.p1
- New upstream release 1.2.2p1
- Drop integrated char_height patch
- Drop ogre-1.2.1-visibility.patch since this is fixed with the latest gcc
release, but keep it in CVS in case things break again.
- Add a patch that replaces -version-info libtool argument with -release,
which results in hardcoding the version number into the soname. This is
needed because upstream changes the ABI every release, without changing the
CURRENT argument passed to -version-info .
- Also add -release when linking libCEGUIOgreRenderer.so as that was previously
unversioned.
ogre-1.2.2-soname.patch:
--- NEW FILE ogre-1.2.2-soname.patch ---
--- ogrenew/OgreMain/src/Makefile.am.soname 2006-07-31 12:53:33.000000000 +0200
+++ ogrenew/OgreMain/src/Makefile.am 2006-07-31 12:53:33.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@
+libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@
#-Wl,--version-script=$(top_srcdir)/OgreMain/src/ogremain.map
--- ogrenew/OgreMain/src/Makefile.in.soname 2006-07-31 12:54:18.000000000 +0200
+++ ogrenew/OgreMain/src/Makefile.in 2006-07-31 12:56:32.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@
+libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@
all: all-am
.SUFFIXES:
--- ogrenew/configure.soname 2006-07-31 12:54:01.000000000 +0200
+++ ogrenew/configure 2006-07-31 12:54:58.000000000 +0200
@@ -462,7 +462,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL_!
LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE OGREMAIN_VERSION_INFO LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL_!
LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -23065,13 +23065,6 @@
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
-OGREMAIN_CURRENT=11
-OGREMAIN_REVISION=2
-OGREMAIN_AGE=0
-OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
-
-
-
!
ac_config_files="$ac_config_files Makefile OgreMain/Makefile OgreMain/src/Makefile OgreMain/include/Makefile PlatformManagers/Makefile PlatformManagers/SDL/Makefile PlatformManagers/SDL/src/Makefile PlatformManagers/SDL/include/Makefile PlatformManagers/gtk/Makefile PlatformManagers/gtk/src/Makefile PlatformManagers/gtk/include/Makefile PlatformManagers/GLX/Makefile PlatformManagers/GLX/src/Makefile PlatformManagers/GLX/include/Makefile PlatformManagers/Win32/Makefile PlatformManagers/Win32/src/Makefile PlatformManagers/Win32/include/Makefile PlugIns/Makefile PlugIns/BSPSceneManager/Makefi!
le PlugIns/BSPSceneManager/src/Makefile PlugIns/BSPSceneManage!
r/incl
/Makefile PlugIns/CgProgramManager/Makefile PlugIns/CgProgramManager/src/Makefile PlugIns/CgProgramManager/include/Makefile PlugIns/OctreeSceneManager/Makefile PlugIns/OctreeSceneManager/src/Makefile PlugIns/OctreeSceneManager/include/Makefile PlugIns/ParticleFX/Makefile PlugIns/ParticleFX/src/Makefile PlugIns/ParticleFX/include/Makefile RenderSystems/Makefile RenderSystems/GL/Makefile RenderSystems/GL/src/Makefile RenderSystems/GL/include/Makefile RenderSystems/GL/src/atifs/Makefile RenderSystems/GL/src/atifs/include/Makefile RenderSystems/GL/src/atifs/src/Makefile RenderSystems/GL/src/GLSL/Makefile RenderSystems/GL/src/GLSL/include/Makefile RenderSystems/GL/src/GLSL/src/Makefile RenderSystems/GL/src/nvparse/Makefile RenderSystems/Direct3D9/Makefile RenderSystems/Direct3D9/src/Makefile RenderSystems/Direct3D9/include/Makefile Samples/Makefile Samples/Common/Makefile Samples/Common/include/Makefile Samples/Common/bin/Makefile Samples/BezierPatch/Makefile Samples/BezierPatch/!
src/Makefile Samples/BezierPatch/include/Makefile Samples/CameraTrack/Makefile Samples/CameraTrack/src/Makefile Samples/CelShading/Makefile Samples/CelShading/src/Makefile Samples/Compositor/Makefile Samples/Compositor/src/Makefile Samples/Compositor/include/Makefile Samples/CubeMapping/Makefile Samples/CubeMapping/src/Makefile Samples/CubeMapping/include/Makefile Samples/DeferredShading/Makefile Samples/DeferredShading/src/Makefile Samples/DeferredShading/include/Makefile Samples/Dot3Bump/Makefile Samples/Dot3Bump/src/Makefile Samples/EnvMapping/Makefile Samples/EnvMapping/src/Makefile Samples/EnvMapping/include/Makefile Samples/FacialAnimation/Makefile Samples/FacialAnimation/src/Makefile Samples/Fresnel/Makefile Samples/Fresnel/src/Makefile Samples/Grass/Makefile Samples/Grass/src/Makefile Samples/Transpacency/Makefile Samples/Transpacency/src/Makefile Samples/Transpacency/include/Makefile Samples/Lighting/Makefile Samples/Lighting/src/Makefile Samples/Lighting/include/M!
akefile Samples/OceanDemo/Makefile Samples/OceanDemo/src/Makef!
ile Sa
es/OceanDemo/include/Makefile Samples/ParticleFX/Makefile Samples/ParticleFX/src/Makefile Samples/ParticleFX/include/Makefile Samples/RenderToTexture/Makefile Samples/RenderToTexture/src/Makefile Samples/TextureFX/Makefile Samples/TextureFX/src/Makefile Samples/TextureFX/include/Makefile Samples/Shadows/Makefile Samples/Shadows/src/Makefile Samples/SkyBox/Makefile Samples/SkyBox/src/Makefile Samples/SkyBox/include/Makefile Samples/SkyDome/Makefile Samples/SkyDome/src/Makefile Samples/SkyDome/include/Makefile Samples/SkyPlane/Makefile Samples/SkyPlane/src/Makefile Samples/SkyPlane/include/Makefile Samples/Smoke/Makefile Samples/Smoke/src/Makefile Samples/Smoke/include/Makefile Samples/BSP/Makefile Samples/BSP/src/Makefile Samples/SkeletalAnimation/Makefile Samples/SkeletalAnimation/src/Makefile Samples/SkeletalAnimation/include/Makefile Samples/Terrain/Makefile Samples/Terrain/src/Makefile Samples/Terrain/include/Makefile Samples/Water/Makefile Samples/Water/src/Makefile Samp!
les/Water/include/Makefile Samples/DynTex/Makefile Samples/DynTex/src/Makefile Samples/DynTex/include/Makefile Samples/VolumeTex/Makefile Samples/VolumeTex/src/Makefile Samples/VolumeTex/include/Makefile Tests/Makefile Tests/src/Makefile Tools/Makefile Tools/MaterialUpgrader/Makefile Tools/MaterialUpgrader/src/Makefile Tools/MaterialUpgrader/include/Makefile Tools/MeshUpgrader/Makefile Tools/MeshUpgrader/src/Makefile Tools/XMLConverter/Makefile Tools/XMLConverter/src/Makefile Tools/XMLConverter/include/Makefile Tools/LightwaveConverter/Makefile Tools/LightwaveConverter/src/Makefile Tools/LightwaveConverter/include/Makefile OGRE.pc"
@@ -24058,7 +24048,6 @@
s, at CEGUI_LIBS@,$CEGUI_LIBS,;t t
s, at HAVE_CEGUI_TRUE@,$HAVE_CEGUI_TRUE,;t t
s, at HAVE_CEGUI_FALSE@,$HAVE_CEGUI_FALSE,;t t
-s, at OGREMAIN_VERSION_INFO@,$OGREMAIN_VERSION_INFO,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
--- ogrenew/configure.in.soname 2006-07-23 00:12:06.000000000 +0200
+++ ogrenew/configure.in 2006-07-31 12:53:33.000000000 +0200
@@ -78,15 +78,6 @@
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
-dnl versioning info for libtool
-dnl Note this is the ABI version which is not the same as our actual library version
-OGREMAIN_CURRENT=11
-OGREMAIN_REVISION=2
-OGREMAIN_AGE=0
-OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
-AC_SUBST(OGREMAIN_VERSION_INFO)
-
-
dnl Create the makefiles
AC_CONFIG_FILES([Makefile \
OgreMain/Makefile \
--- ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.in~ 2006-08-01 12:31:32.000000000 +0200
+++ ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.in 2006-08-01 12:31:32.000000000 +0200
@@ -246,6 +246,8 @@
OgreCEGUITexture.cpp \
OgreCEGUIResourceProvider.cpp
+libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@
+
all: all-am
.SUFFIXES:
--- ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.am~ 2006-08-01 12:31:33.000000000 +0200
+++ ogrenew/Samples/Common/CEGUIRenderer/src/Makefile.am 2006-08-01 12:31:33.000000000 +0200
@@ -6,3 +6,5 @@
libCEGUIOgreRenderer_la_SOURCES = OgreCEGUIRenderer.cpp \
OgreCEGUITexture.cpp \
OgreCEGUIResourceProvider.cpp
+
+libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@
More information about the fedora-extras-commits
mailing list