[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#667447: 2 patches for ocamlsdl



Le 05/06/2012 17:43, Olivier Andrieu a écrit :
>>> I've made a new tarball release (0.9.0).
>>
>> Thanks. What about the first patch? It still applies to 0.9.0...
> 
> AFAICT it's just a workaround for the same issue (typo in the META
> file that prevented the
> inclusion of the dependency).

I was expecting a reaction from Florent to this mail, but I've just
noticed that it was sent to me in private.

I am quite puzzled by the fact that both patches were applied in the
Mageia package, and Florent came to us with was looked like two
independent patches.

Florent, could you give more explanations? Why did you need both
patches? I am wondering if the other patch (attached) should be applied
or not...


Cheers,

-- 
Stéphane
From: Stephane Glondu <steph@glondu.net>
Date: Tue, 5 Jun 2012 11:54:47 +0200
Subject: Fix runtime error due to missing sdlvideo

Bug-Mageia: https://bugs.mageia.org/show_bug.cgi?id=4460
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667447
---
 src/Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index e1f77e1..a60d7f4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -14,6 +14,8 @@ loader_MODULES = sdlloader
 mixer_MODULES  = sdlmixer
 ttf_MODULES    = sdlttf
 gfx_MODULES    = sdlgfx
+video_MODULES  = sdlvideo
+gfx_C_SRC      = common.c
 
 TARGETS  = sdl.cma $(patsubst %,sdl%.cma,$(PARTS))
 TARGETS += libsdlstub.$(A) $(patsubst %,libsdl%stub.$(A),$(PARTS))
@@ -55,7 +57,7 @@ sdlgfx.cma : $(call ML_OBJS,gfx)
 	$(call MKCMA,sdlgfx,sdlgfxstub,$^,$(call SYSLIB,SDL_gfx))
 sdlgfx.cmxa : $(call ML_OPT_OBJS,gfx)
 	$(call MKCMXA,sdlgfx,sdlgfxstub,$^,$(call SYSLIB,SDL_gfx))
-libsdlgfxstub.$(A) dllsdlgfxstub.so : $(call STUB_OBJS,gfx)
+libsdlgfxstub.$(A) dllsdlgfxstub.so : $(call STUB_OBJS,gfx) $(call STUB_OBJS,video)
 	$(call MKCLIB,sdlgfx,sdlgfxstub,$^,$(call SYSLIB,SDL_gfx))
 
 
-- 

Reply to: