aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-08-25 18:31:07 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-09-03 19:13:44 +0200
commit636ce2e82daff0751a366f30bd2582a4be9a6aa7 (patch)
tree4b360de7c333e1bb853c5cc0e0f5b371bcfc9f4a /meta-oe/recipes-multimedia
parentd4b344eb6e4bfc1028355083f1ad54eeaa0832ca (diff)
downloadmeta-openembedded-contrib-636ce2e82daff0751a366f30bd2582a4be9a6aa7.tar.gz
meta-openembedded-contrib-636ce2e82daff0751a366f30bd2582a4be9a6aa7.tar.bz2
meta-openembedded-contrib-636ce2e82daff0751a366f30bd2582a4be9a6aa7.zip
libmikmod: upgrade to 3.2.0
* 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>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r--meta-oe/recipes-multimedia/mikmod/libmikmod/CVE-2010-2971.patch24
-rw-r--r--meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch4
-rw-r--r--meta-oe/recipes-multimedia/mikmod/libmikmod_3.2.0.bb (renamed from meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb)7
3 files changed, 5 insertions, 30 deletions
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 94ea8f52a2..0000000000
--- 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 4261379ee4..de31139678 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
index e6bdcbe138..b1ebf97059 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