January 2011 - rpmfusion-commits

rpms/lightspark/devel lightspark.spec,1.8,1.9 sources,1.7,1.8

by Hicham HAOUARI

Author: hicham Update of /cvs/free/rpms/lightspark/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv14138/devel Modified Files: lightspark.spec sources Log Message: Today's snap, with gradients support Index: lightspark.spec =================================================================== RCS file: /cvs/free/rpms/lightspark/devel/lightspark.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- lightspark.spec 16 Dec 2010 14:09:04 -0000 1.8 +++ lightspark.spec 8 Jan 2011 16:00:47 -0000 1.9 @@ -1,6 +1,6 @@ %define debug 0 -%define git 0 +%define git 1 %if %{git} %define git_snapshot 1 @@ -9,15 +9,15 @@ %define pre_release 0 %if %{?git} -%define commit 2530e6cd11d5d3fc9cbd92f2adf503cfafcc2692 -%define date 20100825 +%define commit c9fbbca66ce214e8df2d59aae90af6427af5057f +%define date 20110108 %endif %if %{pre_release} %define pre rc1 %endif -%define rel 1 +%define rel 2 %define major 0.4.5 @@ -59,7 +59,7 @@ BuildRequires: libcurl-devel BuildRequires: boost-devel BuildRequires: gettext -BuildRequires: libxml++-devel +BuildRequires: libxml++-devel >= 2.33.1 Requires: hicolor-icon-theme @@ -151,8 +151,10 @@ %defattr(-,root,root,-) %{_libdir}/mozilla/plugins/lib%{name}plugin.so - %changelog +* Fri Jan 08 2011 Hicham HAOAURI <hicham.haouari(a)gmail.com> - 0.4.5.1-2.20110108git +- Today's snapshot, with gradients support + * Thu Dec 16 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.5.1-1 - New bugfix release Index: sources =================================================================== RCS file: /cvs/free/rpms/lightspark/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 16 Dec 2010 14:09:04 -0000 1.7 +++ sources 8 Jan 2011 16:00:47 -0000 1.8 @@ -1 +1 @@ -3ef25cdf4fecd9b7c1820c138893ce4f lightspark-0.4.5.1.tar.gz +2939bf38418358f04e3dfbedd70136a2 lightspark-0.4.5.1-20110108git.tar.bz2

13 years, 3 months

1
0
0 / 0

rpms/staging-kmod-addons/F-14 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 staging-kmod-addons.spec, 1.5, 1.6

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/staging-kmod-addons/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv6096 Modified Files: .cvsignore sources staging-kmod-addons.spec Log Message: * Thu Jan 06 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1 - update to 2.6.35.10 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/staging-kmod-addons/F-14/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Oct 2010 20:41:32 -0000 1.4 +++ .cvsignore 6 Jan 2011 17:34:46 -0000 1.5 @@ -1 +1 @@ -linux-staging-2.6.35.6.tar.bz2 +linux-staging-2.6.35.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/staging-kmod-addons/F-14/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Oct 2010 20:41:32 -0000 1.4 +++ sources 6 Jan 2011 17:34:46 -0000 1.5 @@ -1 +1 @@ -165f5dd532fcf649a6f0b1a1f05ac4c3 linux-staging-2.6.35.6.tar.bz2 +50a46108c42bbe57eeed80df0c09ea2e linux-staging-2.6.35.10.tar.bz2 Index: staging-kmod-addons.spec =================================================================== RCS file: /cvs/free/rpms/staging-kmod-addons/F-14/staging-kmod-addons.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- staging-kmod-addons.spec 30 Oct 2010 20:41:32 -0000 1.5 +++ staging-kmod-addons.spec 6 Jan 2011 17:34:46 -0000 1.6 @@ -5,7 +5,7 @@ #global prever rc8 Name: staging-kmod-addons -Version: 2.6.35.6 +Version: 2.6.35.10 Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist} Summary: Documentation and shared parts for the kmod-staging packages @@ -58,6 +58,9 @@ %changelog +* Thu Jan 06 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1 +- update to 2.6.35.10 + * Sat Oct 30 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1 - update to 2.6.35.6 for F14 - enable FB_XGI

13 years, 3 months

1
0
0 / 0

rpms/smc/devel smc-fixes-for-cegui-v0-7.diff, NONE, 1.1 smc.spec, 1.13, 1.14

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/smc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv4663 Modified Files: smc.spec Added Files: smc-fixes-for-cegui-v0-7.diff Log Message: * Mon Jan 3 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9-6 - rebuild for new cegui smc-fixes-for-cegui-v0-7.diff: core/editor.cpp | 16 +----- core/editor.h | 3 - core/game_core.cpp | 6 +- core/main.cpp | 8 +-- gui/hud.cpp | 2 input/mouse.cpp | 13 +---- level/level_settings.cpp | 8 +-- objects/sprite.cpp | 2 video/video.cpp | 36 ++++---------- video/video.h | 118 +++++++++++++++++++++++++++++++++++++---------- 10 files changed, 129 insertions(+), 83 deletions(-) --- NEW FILE smc-fixes-for-cegui-v0-7.diff --- diff -up smc-1.9/src/core/editor.cpp.cegui07 smc-1.9/src/core/editor.cpp --- smc-1.9/src/core/editor.cpp.cegui07 2009-08-13 17:11:42.000000000 +0200 +++ smc-1.9/src/core/editor.cpp 2010-11-06 10:53:08.897490538 +0100 @@ -118,16 +118,10 @@ CEGUI::Size cEditor_Item_Object :: getPi return tmp; } -void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const +void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const { // draw text - list_text->draw( position, alpha, clipper ); -} - -void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const -{ - // draw text - list_text->draw( cache, targetRect, zBase, alpha, clipper ); + list_text->draw( buffer, targetRect, alpha, clipper ); } void cEditor_Item_Object :: Draw_Image( void ) @@ -533,12 +527,12 @@ void cEditor :: Draw( void ) if( editor_window->getXPosition().asRelative( 1 ) >= 0 ) { // Listbox dimension - float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley; - float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley; + float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley; + float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley; // Vertical ScrollBar Position float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley; // font height - float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley; + float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley; // draw items for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ ) diff -up smc-1.9/src/core/editor.h.cegui07 smc-1.9/src/core/editor.h --- smc-1.9/src/core/editor.h.cegui07 2009-02-18 05:21:30.000000000 +0100 +++ smc-1.9/src/core/editor.h 2010-11-06 10:52:19.825490350 +0100 @@ -62,8 +62,7 @@ public: */ virtual CEGUI::Size getPixelSize( void ) const; // draw - void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const; - void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const; + void draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const; // draw image void Draw_Image( void ); diff -up smc-1.9/src/core/game_core.cpp.cegui07 smc-1.9/src/core/game_core.cpp --- smc-1.9/src/core/game_core.cpp.cegui07 2010-11-06 10:53:41.992489061 +0100 +++ smc-1.9/src/core/game_core.cpp 2010-11-06 10:56:40.341489992 +0100 @@ -265,7 +265,7 @@ int cDialogBox_Question :: Enter( std::s // align text - CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" ); + CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" ); // fixme : Can't handle multiple lines of text float text_width = font->getTextExtent( text ) * global_downscalex; @@ -1182,7 +1182,7 @@ void Draw_Static_Text( const std::string text_default->setText( gui_text ); // align text - CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" ); + CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" ); float text_width = font->getTextExtent( gui_text ) * global_downscalex; text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) ); @@ -1190,7 +1190,7 @@ void Draw_Static_Text( const std::string text_default->moveToFront(); // set window height - text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) ); + text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) ); while( draw ) { diff -up smc-1.9/src/core/main.cpp.cegui07 smc-1.9/src/core/main.cpp --- smc-1.9/src/core/main.cpp.cegui07 2009-05-12 10:36:04.000000000 +0200 +++ smc-1.9/src/core/main.cpp 2010-11-06 10:42:04.718489998 +0100 @@ -444,13 +444,15 @@ void Exit_Game( void ) if( pGuiSystem ) { - delete pGuiSystem; + CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider(); + pGuiSystem->destroy(); pGuiSystem = NULL; + delete rp; } if( pGuiRenderer ) { - delete pGuiRenderer; + pGuiRenderer->destroy( *pGuiRenderer ); pGuiRenderer = NULL; } @@ -507,7 +509,7 @@ bool Handle_Input_Global( SDL_Event *ev } case SDL_VIDEORESIZE: { - pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); + pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); break; } case SDL_KEYDOWN: diff -up smc-1.9/src/gui/hud.cpp.cegui07 smc-1.9/src/gui/hud.cpp --- smc-1.9/src/gui/hud.cpp.cegui07 2009-05-01 15:00:16.000000000 +0200 +++ smc-1.9/src/gui/hud.cpp 2010-11-06 10:42:04.719489996 +0100 @@ -946,7 +946,7 @@ void cDebugDisplay :: Update( void ) m_text_debug_text->setVisible( 1 ); // update position - CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" ); + CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" ); float text_width = font->getTextExtent( gui_text ) * global_downscalex; if( text_width > 800.0f ) diff -up smc-1.9/src/input/mouse.cpp.cegui07 smc-1.9/src/input/mouse.cpp --- smc-1.9/src/input/mouse.cpp.cegui07 2009-04-24 21:16:58.000000000 +0200 +++ smc-1.9/src/input/mouse.cpp 2010-11-06 10:42:04.721489995 +0100 @@ -432,17 +432,12 @@ void cMouseCursor :: Draw( void ) void cMouseCursor :: Render( void ) const { - if( !m_active ) - { + CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr(); + + if ( m_active == mouse->isVisible() ) return; - } - // Render CEGUI Mouse - pGuiRenderer->setQueueingEnabled( 0 ); - CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr(); - mouse->setVisible( 1 ); - mouse->draw(); - mouse->setVisible( 0 ); + mouse->setVisible( m_active ); } void cMouseCursor :: Update_Position( void ) diff -up smc-1.9/src/level/level_settings.cpp.cegui07 smc-1.9/src/level/level_settings.cpp --- smc-1.9/src/level/level_settings.cpp.cegui07 2009-08-07 03:04:28.000000000 +0200 +++ smc-1.9/src/level/level_settings.cpp 2010-11-06 10:42:04.722489998 +0100 @@ -163,8 +163,8 @@ void cLevel_Settings :: Init( void ) editbox->setText( int_to_string( bg_color_2.blue ).c_str() ); // preview window CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" ); - background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 ); - background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 ); + background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 ); + background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 ); Update_BG_Colors( CEGUI::EventArgs() ); @@ -555,8 +555,8 @@ void cLevel_Settings :: Set_Background_I // set default rect CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" ); - background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex; - background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley; + background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex; + background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley; if( !File_Exists( filename ) ) { diff -up smc-1.9/src/objects/sprite.cpp.cegui07 smc-1.9/src/objects/sprite.cpp --- smc-1.9/src/objects/sprite.cpp.cegui07 2009-04-18 09:55:06.000000000 +0200 +++ smc-1.9/src/objects/sprite.cpp 2010-11-06 10:42:04.724490001 +0100 @@ -1663,7 +1663,7 @@ void cSprite :: Editor_Add( const CEGUI: window_name->setText( name ); window_name->setTooltipText( tooltip ); // get text width - CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" ); + CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" ); float text_width = 12 + font->getTextExtent( name ) * global_downscalex; // all names should have the same width if( text_width > m_editor_window_name_width ) diff -up smc-1.9/src/video/video.cpp.cegui07 smc-1.9/src/video/video.cpp --- smc-1.9/src/video/video.cpp.cegui07 2009-07-04 11:46:56.000000000 +0200 +++ smc-1.9/src/video/video.cpp 2010-11-06 11:01:01.086490002 +0100 @@ -101,18 +101,6 @@ CEGUI::colour Color :: Get_cegui_Color( return CEGUI::colour( static_cast<float>(red) / 255, static_cast<float>(green) / 255, static_cast<float>(blue) / 255, static_cast<float>(alpha) / 255 ); } -/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */ - -cFake_Renderer :: cFake_Renderer( void ) -{ - d_identifierString = "Fake Renderer"; -} - -cFake_Renderer :: ~cFake_Renderer( void ) -{ - -} - /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */ cVideo :: cVideo( void ) @@ -158,7 +146,7 @@ void cVideo :: Init_CEGUI_Fake( void ) c std::string log_dump_dir = "/dev/null"; #endif // create fake system and renderer - pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir ); + pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir ); } void cVideo :: Delete_CEGUI_Fake( void ) const @@ -166,7 +154,7 @@ void cVideo :: Delete_CEGUI_Fake( void ) CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider(); CEGUI::Renderer *renderer = pGuiSystem->getRenderer(); - delete pGuiSystem; + pGuiSystem->destroy(); pGuiSystem = NULL; delete renderer; delete rp; @@ -177,7 +165,7 @@ void cVideo :: Init_CEGUI( void ) const // create renderer try { - pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h ); + pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) ); } // catch CEGUI Exceptions catch( CEGUI::Exception &ex ) @@ -186,10 +174,10 @@ void cVideo :: Init_CEGUI( void ) const exit( EXIT_FAILURE ); } - /* create Resource Provider - * no need to destroy it later since it is handled by the CEGUI renderer - */ - CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider()); + pGuiRenderer->enableExtraStateSettings(true); + + // create Resource Provider + CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider; // set Resource Provider directories rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" ); @@ -215,7 +203,7 @@ void cVideo :: Init_CEGUI( void ) const // create system try { - pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" ); + pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" ); } // catch CEGUI Exceptions catch( CEGUI::Exception &ex ) @@ -242,7 +230,7 @@ void cVideo :: Init_CEGUI_Data( void ) c // load the scheme file, which auto-loads the imageset try { - CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" ); + CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" ); } // catch CEGUI Exceptions catch( CEGUI::Exception &ex ) @@ -254,9 +242,7 @@ void cVideo :: Init_CEGUI_Data( void ) c // default mouse cursor pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" ); // force new mouse image - CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) ); - // hide CEGUI mouse always because we render it manually - CEGUI::MouseCursor::getSingleton().hide(); + CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) ); // default tooltip pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" ); // create default root window @@ -553,7 +539,7 @@ void cVideo :: Init_Video( bool reload_t pFont->Restore_Textures(); // send new size to CEGUI - pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) ); + pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) ); // check if CEGUI is initialized bool cegui_initialized = pGuiSystem->getGUISheet() != NULL; diff -up smc-1.9/src/video/video.h.cegui07 smc-1.9/src/video/video.h --- smc-1.9/src/video/video.h.cegui07 2009-07-04 10:49:50.000000000 +0200 +++ smc-1.9/src/video/video.h 2010-11-06 10:42:04.728489998 +0100 @@ -23,7 +23,7 @@ #include "SDL_opengl.h" // CEGUI #include "CEGUI.h" -#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h" +#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h> namespace SMC { @@ -129,31 +129,101 @@ enum Effect_Fadein EFFECT_IN_AMOUNT }; -/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */ - -class cFake_Renderer : public CEGUI::Renderer +/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */ +// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did... +class cFake_GeometryBuffer : public CEGUI::GeometryBuffer +{ + void draw() const {} + void setTranslation(const CEGUI::Vector3&) {} + void setRotation(const CEGUI::Vector3&) {} + void setPivot(const CEGUI::Vector3&) {} + void setClippingRegion(const CEGUI::Rect&) {} + void appendVertex(const CEGUI::Vertex&) {} + void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {} + void setActiveTexture(CEGUI::Texture*) {} + void reset() {} + CEGUI::Texture* getActiveTexture() const { return 0; } + CEGUI::uint getVertexCount() const { return 0; } + CEGUI::uint getBatchCount() const { return 0; } + void setRenderEffect(CEGUI::RenderEffect*) {} + CEGUI::RenderEffect* getRenderEffect() { return 0; } +}; + +class cFake_Texture : public CEGUI::Texture { public: - cFake_Renderer( void ); - virtual ~cFake_Renderer( void ); - - virtual void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {}; - virtual void doRender(void) {}; - virtual void clearRenderList(void) {}; - virtual void setQueueingEnabled(bool setting) {}; - virtual CEGUI::Texture *createTexture(void) { return NULL; }; - virtual CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; }; - virtual CEGUI::Texture *createTexture(float size) { return NULL; }; - virtual void destroyTexture(CEGUI::Texture* texture) {}; - virtual void destroyAllTextures(void) {}; - virtual bool isQueueingEnabled(void) const { return 0; }; - virtual float getWidth(void) const { return 0; }; - virtual float getHeight(void) const { return 0; }; - virtual CEGUI::Size getSize(void) const { return CEGUI::Size();}; - virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();}; - virtual unsigned int getMaxTextureSize(void) const { return 0; }; - virtual unsigned int getHorzScreenDPI(void) const { return 0; }; - virtual unsigned int getVertScreenDPI(void) const { return 0; }; + cFake_Texture() : + m_size(1, 1), + m_scaling(1, 1) + {} + + const CEGUI::Size& getSize() const { return m_size; } + const CEGUI::Size& getOriginalDataSize() const { return m_size; } + const CEGUI::Vector2& getTexelScaling() const { return m_scaling; } + void loadFromFile(const CEGUI::String&, const CEGUI::String&) {} + void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {} + void saveToMemory(void*) {} + +private: + CEGUI::Size m_size; + CEGUI::Vector2 m_scaling; +}; + +class cFake_RenderTarget : public CEGUI::RenderTarget +{ +public: + cFake_RenderTarget() : m_area(0, 0, 0, 0) {} + void draw(const CEGUI::GeometryBuffer&) {} + void draw(const CEGUI::RenderQueue&) {} + void setArea(const CEGUI::Rect&) {} + const CEGUI::Rect& getArea() const { return m_area; } + bool isImageryCache() const { return false; } + void activate() {} + void deactivate() {} + void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {} + +private: + CEGUI::Rect m_area; +}; + +class cFake_Renderer : public CEGUI::Renderer +{ +public: + cFake_Renderer( void ) : + m_size(0, 0), + m_dpi(0, 0), + m_identifierString("Fake Renderer"), + m_root(m_target) + {} + + CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; } + CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; } + void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {} + void destroyAllGeometryBuffers() {} + CEGUI::TextureTarget* createTextureTarget() { return 0; } + void destroyTextureTarget(CEGUI::TextureTarget*) {} + void destroyAllTextureTargets() {} + CEGUI::Texture& createTexture() { return m_texture; } + CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; } + CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; } + void destroyTexture(CEGUI::Texture&) {} + void destroyAllTextures() {} + void beginRendering() {} + void endRendering() {} + void setDisplaySize(const CEGUI::Size&) {} + const CEGUI::Size& getDisplaySize() const { return m_size; } + const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; } + CEGUI::uint getMaxTextureSize() const { return 0; } + const CEGUI::String& getIdentifierString() const { return m_identifierString; } + +private: + CEGUI::Size m_size; + CEGUI::Vector2 m_dpi; + CEGUI::String m_identifierString; + cFake_GeometryBuffer m_geometry; + cFake_Texture m_texture; + cFake_RenderTarget m_target; + CEGUI::RenderingRoot m_root; }; /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */ Index: smc.spec =================================================================== RCS file: /cvs/free/rpms/smc/devel/smc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- smc.spec 25 Aug 2010 12:57:45 -0000 1.13 +++ smc.spec 6 Jan 2011 08:50:47 -0000 1.14 @@ -1,6 +1,6 @@ Name: smc Version: 1.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: 2D platform game that uses OpenGL in a style similar to Super Mario Group: Amusements/Games License: GPLv3 @@ -10,11 +10,13 @@ Source2: dochelper.pl # suggested in http://thread.gmane.org/gmane.linux.redhat.fedora.rpmfusion.devel/7651/fo... Patch0: http://repo.calcforge.org/temp/smc-1.9-fix-implicit-linking.patch +# patch from upstream forum +Patch1: smc-fixes-for-cegui-v0-7.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel BuildRequires: gettext-devel BuildRequires: boost-devel >= 1.31 -BuildRequires: cegui-devel >= 0.5 +BuildRequires: cegui-devel >= 0.7 BuildRequires: libGLU-devel BuildRequires: pkgconfig >= 0.9.0 BuildRequires: SDL-devel >= 1.2.10 @@ -37,6 +39,8 @@ #Fix EOL chars sed -i 's/\r//' docs/style.css docs/*.html docs/*.txt %patch0 -p1 -b .patch0 +%patch1 -p1 -b .cegui07 + %build %configure LIBS=-lboost_system @@ -111,6 +115,9 @@ %changelog +* Mon Jan 3 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9-6 +- rebuild for new cegui + * Wed Aug 25 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9-5 - rebuild for new libboost

13 years, 3 months

1
0
0 / 0

rpms/mpg321/F-14 .cvsignore, 1.3, 1.4 mpg321.spec, 1.8, 1.9 sources, 1.3, 1.4

by Adrian Reber

Author: adrian Update of /cvs/free/rpms/mpg321/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv21249 Modified Files: .cvsignore mpg321.spec sources Log Message: * Wed Jan 05 2011 Adrian Reber <adrian(a)lisas.de> - 0.2.12-2 - updated to 0.12.12 (#1582) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mpg321/F-14/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Apr 2009 06:38:40 -0000 1.3 +++ .cvsignore 5 Jan 2011 19:22:11 -0000 1.4 @@ -1 +1 @@ -mpg321_0.2.10.6.tar.gz +mpg321-0.2.12-1.tar.gz Index: mpg321.spec =================================================================== RCS file: /cvs/free/rpms/mpg321/F-14/mpg321.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mpg321.spec 29 Sep 2010 10:13:48 -0000 1.8 +++ mpg321.spec 5 Jan 2011 19:22:11 -0000 1.9 @@ -1,11 +1,11 @@ Name: mpg321 -Version: 0.2.10.6 -Release: 3%{?dist} +Version: 0.2.12 +Release: 2%{?dist} Summary: Command line MPEG audio player (fixed-point calculations) Group: Applications/Multimedia License: GPLv2+ URL: http://mpg321.sourceforge.net/ -Source0: http://ftp.debian.org/debian/pool/main/m/mpg321/%{name}_%{version}.tar.gz +Source0: http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}-1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libao-devel BuildRequires: libmad-devel @@ -31,7 +31,7 @@ fast as mpg123 on systems which have a floating point unit. %prep -%setup -q +%setup -q -n %{name}-%{version}-1 %build %configure \ @@ -82,6 +82,9 @@ %ghost %{_mandir}/man1/mpg123.1* %changelog +* Wed Jan 05 2011 Adrian Reber <adrian(a)lisas.de> - 0.2.12-2 +- updated to 0.12.12 (#1582) + * Wed Sep 29 2010 Adrian Reber <adrian(a)lisas.de> - 0.2.10.6-3 - rebuilt for #1399 (not possible to install mpg321) Index: sources =================================================================== RCS file: /cvs/free/rpms/mpg321/F-14/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Apr 2009 06:38:40 -0000 1.3 +++ sources 5 Jan 2011 19:22:11 -0000 1.4 @@ -1 +1 @@ -cc7bc446d5a24a89c558759264494aa4 mpg321_0.2.10.6.tar.gz +abd1e2ea6a606389ff19da66d252e530 mpg321-0.2.12-1.tar.gz

13 years, 3 months

1
0
0 / 0

rpms/mpg321/devel mpg321.spec,1.9,1.10

by Adrian Reber

Author: adrian Update of /cvs/free/rpms/mpg321/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20833 Modified Files: mpg321.spec Log Message: forgot to update common Index: mpg321.spec =================================================================== RCS file: /cvs/free/rpms/mpg321/devel/mpg321.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mpg321.spec 5 Jan 2011 19:04:06 -0000 1.9 +++ mpg321.spec 5 Jan 2011 19:13:42 -0000 1.10 @@ -1,6 +1,6 @@ Name: mpg321 Version: 0.2.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line MPEG audio player (fixed-point calculations) Group: Applications/Multimedia License: GPLv2+ @@ -82,7 +82,7 @@ %ghost %{_mandir}/man1/mpg123.1* %changelog -* Wed Jan 05 2011 Adrian Reber <adrian(a)lisas.de> - 0.2.12-1 +* Wed Jan 05 2011 Adrian Reber <adrian(a)lisas.de> - 0.2.12-2 - updated to 0.12.12 (#1582) * Wed Sep 29 2010 Adrian Reber <adrian(a)lisas.de> - 0.2.10.6-3

13 years, 3 months

1
0
0 / 0

rpms/mpg321/devel .cvsignore, 1.3, 1.4 mpg321.spec, 1.8, 1.9 sources, 1.3, 1.4

by Adrian Reber

Author: adrian Update of /cvs/free/rpms/mpg321/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv19947 Modified Files: .cvsignore mpg321.spec sources Log Message: * Wed Jan 05 2011 Adrian Reber <adrian(a)lisas.de> - 0.2.12-1 - updated to 0.12.12 (#1582) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mpg321/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Apr 2009 06:38:40 -0000 1.3 +++ .cvsignore 5 Jan 2011 19:04:06 -0000 1.4 @@ -1 +1 @@ -mpg321_0.2.10.6.tar.gz +mpg321-0.2.12-1.tar.gz Index: mpg321.spec =================================================================== RCS file: /cvs/free/rpms/mpg321/devel/mpg321.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mpg321.spec 29 Sep 2010 10:13:48 -0000 1.8 +++ mpg321.spec 5 Jan 2011 19:04:06 -0000 1.9 @@ -1,11 +1,11 @@ Name: mpg321 -Version: 0.2.10.6 -Release: 3%{?dist} +Version: 0.2.12 +Release: 1%{?dist} Summary: Command line MPEG audio player (fixed-point calculations) Group: Applications/Multimedia License: GPLv2+ URL: http://mpg321.sourceforge.net/ -Source0: http://ftp.debian.org/debian/pool/main/m/mpg321/%{name}_%{version}.tar.gz +Source0: http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}-1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libao-devel BuildRequires: libmad-devel @@ -31,7 +31,7 @@ fast as mpg123 on systems which have a floating point unit. %prep -%setup -q +%setup -q -n %{name}-%{version}-1 %build %configure \ @@ -82,6 +82,9 @@ %ghost %{_mandir}/man1/mpg123.1* %changelog +* Wed Jan 05 2011 Adrian Reber <adrian(a)lisas.de> - 0.2.12-1 +- updated to 0.12.12 (#1582) + * Wed Sep 29 2010 Adrian Reber <adrian(a)lisas.de> - 0.2.10.6-3 - rebuilt for #1399 (not possible to install mpg321) Index: sources =================================================================== RCS file: /cvs/free/rpms/mpg321/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Apr 2009 06:38:40 -0000 1.3 +++ sources 5 Jan 2011 19:04:06 -0000 1.4 @@ -1 +1 @@ -cc7bc446d5a24a89c558759264494aa4 mpg321_0.2.10.6.tar.gz +abd1e2ea6a606389ff19da66d252e530 mpg321-0.2.12-1.tar.gz

13 years, 3 months

1
0
0 / 0

rpms/kplayer/F-14 kplayer.spec,1.7,1.8

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/kplayer/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv15593 Modified Files: kplayer.spec Log Message: * Mon Jan 03 2011 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-5.20081211cvs - Fixed the documentation build Index: kplayer.spec =================================================================== RCS file: /cvs/free/rpms/kplayer/F-14/kplayer.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kplayer.spec 3 Jan 2011 23:44:25 -0000 1.7 +++ kplayer.spec 4 Jan 2011 02:50:00 -0000 1.8 @@ -3,7 +3,7 @@ Name: kplayer Epoch: 1 Version: 0.7.0 -Release: 4.%cvsversion%{?dist} +Release: 5.%cvsversion%{?dist} Summary: A media player based on MPlayer Group: Applications/Multimedia License: GPLv3+ and GFDL @@ -45,6 +45,8 @@ %{cmake_kde4} -DCMAKE_SKIP_RPATH:BOOL=ON . +# Fix documentation build +sed -i 's|V4.1.2|V4.2|' doc/*/index.docbook %build make %{?_smp_mflags} VERBOSE=1 @@ -121,6 +123,9 @@ %changelog +* Mon Jan 03 2011 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-5.20081211cvs +- Fixed the documentation build + * Mon Jan 03 2011 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-4.20081211cvs - Rebuild to workaround bug#1588

13 years, 3 months

1
0
0 / 0

rpms/kplayer/devel kplayer.spec,1.8,1.9

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/kplayer/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv12394 Modified Files: kplayer.spec Log Message: * Mon Jan 03 2011 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-5.20081211cvs - Fixed the documentation build Index: kplayer.spec =================================================================== RCS file: /cvs/free/rpms/kplayer/devel/kplayer.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- kplayer.spec 3 Jan 2011 23:40:34 -0000 1.8 +++ kplayer.spec 4 Jan 2011 02:04:32 -0000 1.9 @@ -3,7 +3,7 @@ Name: kplayer Epoch: 1 Version: 0.7.0 -Release: 4.%cvsversion%{?dist} +Release: 5.%cvsversion%{?dist} Summary: A media player based on MPlayer Group: Applications/Multimedia License: GPLv3+ and GFDL @@ -45,6 +45,8 @@ %{cmake_kde4} -DCMAKE_SKIP_RPATH:BOOL=ON . +# Fix documentation build +sed -i 's|V4.1.2|V4.2|' doc/*/index.docbook %build make %{?_smp_mflags} VERBOSE=1 @@ -121,6 +123,9 @@ %changelog +* Mon Jan 03 2011 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-5.20081211cvs +- Fixed the documentation build + * Mon Jan 03 2011 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-4.20081211cvs - Rebuild to workaround bug#1588

13 years, 3 months

1
0
0 / 0

rpms/kplayer/F-14 kplayer.spec,1.6,1.7

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/kplayer/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv3247 Modified Files: kplayer.spec Log Message: * Mon Jan 03 2011 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-4.20081211cvs - Rebuild to workaround bug#1588 Index: kplayer.spec =================================================================== RCS file: /cvs/free/rpms/kplayer/F-14/kplayer.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kplayer.spec 15 Aug 2010 05:38:57 -0000 1.6 +++ kplayer.spec 3 Jan 2011 23:44:25 -0000 1.7 @@ -3,7 +3,7 @@ Name: kplayer Epoch: 1 Version: 0.7.0 -Release: 3.%cvsversion%{?dist} +Release: 4.%cvsversion%{?dist} Summary: A media player based on MPlayer Group: Applications/Multimedia License: GPLv3+ and GFDL @@ -121,6 +121,9 @@ %changelog +* Mon Jan 03 2011 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-4.20081211cvs +- Rebuild to workaround bug#1588 + * Sun Aug 15 2010 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-3.20081211cvs - Fix mimetypes in the .desktop file (RFBZ#1195) - Switch to modern scriptlets

13 years, 3 months

1
0
0 / 0

rpms/kplayer/devel kplayer.spec,1.7,1.8

by Orcan Ogetbil

Author: oget Update of /cvs/free/rpms/kplayer/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv2832 Modified Files: kplayer.spec Log Message: fix date on the last changelog entry Index: kplayer.spec =================================================================== RCS file: /cvs/free/rpms/kplayer/devel/kplayer.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kplayer.spec 3 Jan 2011 23:39:46 -0000 1.7 +++ kplayer.spec 3 Jan 2011 23:40:34 -0000 1.8 @@ -121,7 +121,7 @@ %changelog -* Mon Jan 03 2010 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-4.20081211cvs +* Mon Jan 03 2011 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-4.20081211cvs - Rebuild to workaround bug#1588 * Sun Aug 15 2010 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com> - 1:0.7.0-3.20081211cvs

13 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits January 2011