mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-12 17:20:13 +00:00
Code Issues Projects Releases Wiki Activity

libmikmod: upgrade to 3.2.0

Browse Source 
* 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>
This commit is contained in:
Martin Jansa
2013-08-25 18:31:07 +02:00
parent d4b344eb6e
commit 636ce2e82d
3 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch
-24
View File
@@ -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); \
meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
+2 -2
View File
@@ -5,8 +5,8 @@ diff -urN libmikmod-3.1.12.orig/libmikmod/Makefile.in libmikmod-3.1.12/libmikmod
rm -f Makefile rm -f Makefile
$(LIB): $(OBJ) $(LIB): $(OBJ)
- $(LIBTOOL) --mode=link $(CC) -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 2:4: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 \ dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \
$(top_srcdir)/dlapi/dlfcn.h $(top_srcdir)/dlapi/dlfcn.h
meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb → meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb
+3 -4
View File
@@ -6,16 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=b2b941d484c442e5c031a51463d8e11b"
DEPENDS = "alsa-lib texinfo" DEPENDS = "alsa-lib texinfo"
SRC_URI = "\ SRC_URI = "\
${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \ http://mikmod.shlomifish.org/files/${P}.tar.gz \
file://m4.patch \ file://m4.patch \
file://autofoo.patch \ file://autofoo.patch \
file://ldflags.patch \ file://ldflags.patch \
file://CVE-2010-2971.patch \
file://obsolete_automake_macros.patch \ file://obsolete_automake_macros.patch \
" "
SRC_URI[md5sum] = "9f3c740298260d5f88981fc0d51f6f16" SRC_URI[md5sum] = "96e9820d72a41fe27ff304071739696c"
SRC_URI[sha256sum] = "891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32" SRC_URI[sha256sum] = "734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e"
inherit autotools binconfig lib_package inherit autotools binconfig lib_package