Thanks, applied as 52f5c869305fb1ccb0b9bb0d6fbf91571e44b524. Michael
[sent from post-receive hook] On Mon, 18 May 2026 09:53:53 +0200, Thorsten Scherer <[email protected]> wrote: > Signed-off-by: Thorsten Scherer <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/patches/libmikmod-3.1.12/0001-libmikmod-add-LDFLAGS.patch > b/patches/libmikmod-3.1.12/0001-libmikmod-add-LDFLAGS.patch > deleted file mode 100644 > index ee7e244f0a5a..000000000000 > --- a/patches/libmikmod-3.1.12/0001-libmikmod-add-LDFLAGS.patch > +++ /dev/null > @@ -1,24 +0,0 @@ > -From: Wolfram Sang <[email protected]> > -Date: Wed, 21 Nov 2012 18:56:36 +0100 > -Subject: [PATCH] libmikmod: add LDFLAGS > - > -Taken from OpenEmbedded (c7a2bcb77ed92c0731bb696e0909ef3184a568e7) > - > -Signed-off-by: Wolfram Sang <[email protected]> > ---- > - libmikmod/Makefile.in | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/libmikmod/Makefile.in b/libmikmod/Makefile.in > -index 634acf4..a0743dd 100644 > ---- a/libmikmod/Makefile.in > -+++ b/libmikmod/Makefile.in > -@@ -72,7 +72,7 @@ distclean: clean > - 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) > - > - dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \ > - $(top_srcdir)/dlapi/dlfcn.h > diff --git > a/patches/libmikmod-3.1.12/0002-libmikmod-apply-patch-for-CVE-2010-2971.patch > b/patches/libmikmod-3.1.12/0002-libmikmod-apply-patch-for-CVE-2010-2971.patch > deleted file mode 100644 > index 3402e57373f4..000000000000 > --- > a/patches/libmikmod-3.1.12/0002-libmikmod-apply-patch-for-CVE-2010-2971.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From: Wolfram Sang <[email protected]> > -Date: Wed, 21 Nov 2012 18:59:12 +0100 > -Subject: [PATCH] libmikmod: apply patch for CVE-2010-2971 > - > -Signed-off-by: Chris Larson <[email protected]> > - > -Taken from OpenEmbedded (4880cfd0217466c737c14f5fe7687baa0a01c00d) > - > -Signed-off-by: Wolfram Sang <[email protected]> > ---- > - loaders/load_it.c | 4 ++++ > - 1 file changed, 4 insertions(+) > - > -diff --git a/loaders/load_it.c b/loaders/load_it.c > -index de40bb6..ca82613 100644 > ---- a/loaders/load_it.c > -+++ b/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/patches/libmikmod-3.1.12/0003-teach-libmikmod-config-about-sysroot.patch > b/patches/libmikmod-3.1.12/0003-teach-libmikmod-config-about-sysroot.patch > deleted file mode 100644 > index c3bae2067951..000000000000 > --- a/patches/libmikmod-3.1.12/0003-teach-libmikmod-config-about-sysroot.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From: Michael Olbrich <[email protected]> > -Date: Wed, 21 Nov 2012 19:01:03 +0100 > -Subject: [PATCH] teach libmikmod-config about sysroot > - > -Signed-off-by: Michael Olbrich <[email protected]> > ---- > - libmikmod-config.in | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/libmikmod-config.in b/libmikmod-config.in > -index 8698715..a7146cd 100644 > ---- a/libmikmod-config.in > -+++ b/libmikmod-config.in > -@@ -41,7 +41,7 @@ while test $# -gt 0 ; do > - --cflags) > - includedir=${prefix}/include > - if test $includedir != /usr/include ; then > -- includes=-I$includedir > -+ includes=-I${SYSROOT}$includedir > - fi > - echo $includes @REENTRANT@ > - ;; > -@@ -49,7 +49,7 @@ while test $# -gt 0 ; do > - echo @LIB_LDADD@ > - ;; > - --libs) > -- libdir=-L${exec_prefix}/lib > -+ libdir=-L${SYSROOT}${exec_prefix}/lib > - echo $libdir -lmikmod @LIBRARY_LIB@ > - ;; > - *) > diff --git a/patches/libmikmod-3.1.12/series b/patches/libmikmod-3.1.12/series > deleted file mode 100644 > index 821404436d35..000000000000 > --- a/patches/libmikmod-3.1.12/series > +++ /dev/null > @@ -1,6 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-libmikmod-add-LDFLAGS.patch > -0002-libmikmod-apply-patch-for-CVE-2010-2971.patch > -0003-teach-libmikmod-config-about-sysroot.patch > -# 66203e135151daf9ec17be64d76ab600 - git-ptx-patches magic > diff --git a/rules/libmikmod.in b/rules/libmikmod.in > deleted file mode 100644 > index 5f8d451b2e5c..000000000000 > --- a/rules/libmikmod.in > +++ /dev/null > @@ -1,14 +0,0 @@ > -## SECTION=staging > -## old section: > -### SECTION=multimedia_sound > - > -config LIBMIKMOD > - tristate > - prompt "libmikmod " > - help > - libmikmod is a module player library supporting many formats, > - including mod, s3m, it, and xm. > - > - STAGING: remove in PTXdist 2026.03.0 > - Unmaintained in PTXdist, fails to build with current toolchains. > - Needs updating to the latest version. > diff --git a/rules/libmikmod.make b/rules/libmikmod.make > deleted file mode 100644 > index 6510037eceaf..000000000000 > --- a/rules/libmikmod.make > +++ /dev/null > @@ -1,69 +0,0 @@ > -# -*-makefile-*- > -# > -# Copyright (C) 2012 by Wolfram Sang <[email protected]> > -# > -# For further information about the PTXdist project and license conditions > -# see the README file. > -# > - > -# > -# We provide this package > -# > -PACKAGES-$(PTXCONF_LIBMIKMOD) += libmikmod > - > -# > -# Paths and names > -# > -LIBMIKMOD_VERSION := 3.1.12 > -LIBMIKMOD_MD5 := 9f3c740298260d5f88981fc0d51f6f16 > -LIBMIKMOD := libmikmod-$(LIBMIKMOD_VERSION) > -LIBMIKMOD_SUFFIX := tar.gz > -LIBMIKMOD_URL := $(call ptx/mirror, SF, > mikmod/$(LIBMIKMOD).$(LIBMIKMOD_SUFFIX)) > -LIBMIKMOD_SOURCE := $(SRCDIR)/$(LIBMIKMOD).$(LIBMIKMOD_SUFFIX) > -LIBMIKMOD_DIR := $(BUILDDIR)/$(LIBMIKMOD) > -LIBMIKMOD_LICENSE := LGPL-2.0-or-later > - > -# > ---------------------------------------------------------------------------- > -# Prepare > -# > ---------------------------------------------------------------------------- > - > -LIBMIKMOD_CONF_ENV := \ > - $(CROSS_ENV) \ > - libmikmod_cv_makeinfo_html=yes \ > - MAKEINFO=: > - > -# > -# autoconf > -# > -LIBMIKMOD_CONF_TOOL := autoconf > -LIBMIKMOD_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --disable-af \ > - --enable-alsa \ > - --disable-esd \ > - --disable-oss \ > - --disable-sam9407 \ > - --disable-ultra \ > - --disable-esdtest \ > - --enable-threads > - > -# > ---------------------------------------------------------------------------- > -# Target-Install > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/libmikmod.targetinstall: > - @$(call targetinfo) > - > - @$(call install_init, libmikmod) > - @$(call install_fixup, libmikmod, PRIORITY, optional) > - @$(call install_fixup, libmikmod, SECTION, base) > - @$(call install_fixup, libmikmod, AUTHOR, "Wolfram Sang > <[email protected]>") > - @$(call install_fixup, libmikmod, DESCRIPTION, missing) > - > - @$(call install_lib, libmikmod, 0, 0, 0644, libmikmod) > - > - @$(call install_finish, libmikmod) > - > - @$(call touch) > - > -# vim: syntax=make
