[WIP,02/66] libmikmod: upgrade to 3.2.0

Submitted by Martin Jansa on Aug. 29, 2013, 3:50 p.m.

Details

Message ID ce667a200941cb8764ff7ce563650571fc3b3378.1377791377.git.Martin.Jansa@gmail.com
State Accepted, archived
Headers show

Commit Message

Martin Jansa Aug. 29, 2013, 3:50 p.m.
* 3.3 is only beta
* 3.1.12 was failing to build with texinfo-5, see
  http://sourceforge.net/p/mikmod/mercurial/ci/1fd17189f82561a3a0e343aef05e5cf0b39b8f26/

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../mikmod/libmikmod/CVE-2010-2971.patch           | 24 ----------------------
 .../mikmod/libmikmod/ldflags.patch                 |  4 ++--
 .../{libmikmod_3.1.12.bb => libmikmod_3.2.0.bb}    |  7 +++----
 3 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch
 rename meta-oe/recipes-multimedia/mikmod/{libmikmod_3.1.12.bb => libmikmod_3.2.0.bb} (73%)

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch b/meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch
deleted file mode 100644
index 94ea8f5..0000000
--- a/meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch
+++ /dev/null
@@ -1,24 +0,0 @@ 
----
- loaders/load_it.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- libmikmod-3.1.12.orig/loaders/load_it.c
-+++ libmikmod-3.1.12/loaders/load_it.c
-@@ -743,6 +743,8 @@ BOOL IT_Load(BOOL curious)
- #define IT_LoadEnvelope(name,type) 										\
-				ih. name##flg   =_mm_read_UBYTE(modreader);				\
-				ih. name##pts   =_mm_read_UBYTE(modreader);				\
-+				if (ih. name##pts > ITENVCNT)							\
-+					ih. name##pts = ITENVCNT;							\
-				ih. name##beg   =_mm_read_UBYTE(modreader);				\
-				ih. name##end   =_mm_read_UBYTE(modreader);				\
-				ih. name##susbeg=_mm_read_UBYTE(modreader);				\
-@@ -756,6 +758,8 @@ BOOL IT_Load(BOOL curious)
- #define IT_LoadEnvelope(name,type) 										\
-				ih. name/**/flg   =_mm_read_UBYTE(modreader);			\
-				ih. name/**/pts   =_mm_read_UBYTE(modreader);			\
-+				if (ih. name/**/pts > ITENVCNT)							\
-+					ih. name/**/pts = ITENVCNT;							\
-				ih. name/**/beg   =_mm_read_UBYTE(modreader);			\
-				ih. name/**/end   =_mm_read_UBYTE(modreader);			\
-				ih. name/**/susbeg=_mm_read_UBYTE(modreader);			\
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch b/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
index 4261379..de31139 100644
--- a/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
+++ b/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
@@ -5,8 +5,8 @@  diff -urN libmikmod-3.1.12.orig/libmikmod/Makefile.in libmikmod-3.1.12/libmikmod
  	rm -f Makefile
  
  $(LIB): $(OBJ)
--	$(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
+-	$(LIBTOOL) --mode=link $(CC) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
  
  dl_hpux.lo:	$(top_srcdir)/dlapi/dl_hpux.c \
  			$(top_srcdir)/dlapi/dlfcn.h
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb
similarity index 73%
rename from meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb
rename to meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb
index e6bdcbe..b1ebf97 100644
--- a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb
+++ b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb
@@ -6,16 +6,15 @@  LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=b2b941d484c442e5c031a51463d8e11b"
 DEPENDS = "alsa-lib texinfo"
 
 SRC_URI = "\
-    ${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \
+    http://mikmod.shlomifish.org/files/${P}.tar.gz \
     file://m4.patch \
     file://autofoo.patch \
     file://ldflags.patch \
-    file://CVE-2010-2971.patch \
     file://obsolete_automake_macros.patch \
 "
 
-SRC_URI[md5sum] = "9f3c740298260d5f88981fc0d51f6f16"
-SRC_URI[sha256sum] = "891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32"
+SRC_URI[md5sum] = "96e9820d72a41fe27ff304071739696c"
+SRC_URI[sha256sum] = "734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e"
 
 inherit autotools binconfig lib_package
 

Comments

Marko Lindqvist Aug. 29, 2013, 4:27 p.m.
On 29 August 2013 18:50, Martin Jansa <martin.jansa@gmail.com> wrote:
> * 3.3 is only beta
> * 3.1.12 was failing to build with texinfo-5, see
>   http://sourceforge.net/p/mikmod/mercurial/ci/1fd17189f82561a3a0e343aef05e5cf0b39b8f26/

 As libSDL-mixer dependency, and thus recursive dependency for many
recipes in meta-games, this is important for me. In my local tree I've
solved the build issue by simply patching doc building part away. Let
me know if you want that patch (say, to go in to stable branch instead
of full version upgrade)


 - ML
Martin Jansa Aug. 29, 2013, 6:29 p.m.
On Thu, Aug 29, 2013 at 07:27:54PM +0300, Marko Lindqvist wrote:
> On 29 August 2013 18:50, Martin Jansa <martin.jansa@gmail.com> wrote:
> > * 3.3 is only beta
> > * 3.1.12 was failing to build with texinfo-5, see
> >   http://sourceforge.net/p/mikmod/mercurial/ci/1fd17189f82561a3a0e343aef05e5cf0b39b8f26/
> 
>  As libSDL-mixer dependency, and thus recursive dependency for many
> recipes in meta-games, this is important for me. In my local tree I've
> solved the build issue by simply patching doc building part away. Let
> me know if you want that patch (say, to go in to stable branch instead
> of full version upgrade)

I was thinking about it, but if you confirm that 3.2.0 doesn't break any
of your games I'm fine with it.
Marko Lindqvist Sept. 2, 2013, 11:38 p.m.
On 29 August 2013 21:29, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, Aug 29, 2013 at 07:27:54PM +0300, Marko Lindqvist wrote:
>> On 29 August 2013 18:50, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > * 3.3 is only beta
>> > * 3.1.12 was failing to build with texinfo-5, see
>> >   http://sourceforge.net/p/mikmod/mercurial/ci/1fd17189f82561a3a0e343aef05e5cf0b39b8f26/
>>
>>  As libSDL-mixer dependency, and thus recursive dependency for many
>> recipes in meta-games, this is important for me. In my local tree I've
>> solved the build issue by simply patching doc building part away. Let
>> me know if you want that patch (say, to go in to stable branch instead
>> of full version upgrade)
>
> I was thinking about it, but if you confirm that 3.2.0 doesn't break any
> of your games I'm fine with it.

 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>


 - ML