| 1 |
commit: e165fdb0cfb398fd4daf82945bd7f66948af68d8 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 17 13:46:31 2022 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 17 16:21:06 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e165fdb0 |
| 7 |
|
| 8 |
media-libs/dumb: Drop old versions |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
media-libs/dumb/Manifest | 1 - |
| 13 |
media-libs/dumb/dumb-0.9.3-r3.ebuild | 69 --------------------- |
| 14 |
.../dumb/files/dumb-0.9.3-PIC-as-needed.patch | 72 ---------------------- |
| 15 |
.../dumb/files/dumb-0.9.3_CVE-2006-3668.patch | 16 ----- |
| 16 |
4 files changed, 158 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest |
| 19 |
index 4f2c4403b6ae..51a1a920a57a 100644 |
| 20 |
--- a/media-libs/dumb/Manifest |
| 21 |
+++ b/media-libs/dumb/Manifest |
| 22 |
@@ -1,2 +1 @@ |
| 23 |
-DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658 |
| 24 |
DIST dumb-2.0.3.tar.gz 186576 BLAKE2B 0bd2e512b88260e67b11856630aecfdda2f11a8c5f931c1da3451dbfc15cd5e7e38e718d12b99e0598d9522cf259317a98c5d3088dd979c487a8971fd562ee3f SHA512 18b10a507d69a754cdf97fbeae41c17f211a6ba1f166a822276bdb6769d3edc326919067a3f4d1247d6715d7a5a8276669d83b9427e7336c6d111593fb7e36cf |
| 25 |
|
| 26 |
diff --git a/media-libs/dumb/dumb-0.9.3-r3.ebuild b/media-libs/dumb/dumb-0.9.3-r3.ebuild |
| 27 |
deleted file mode 100644 |
| 28 |
index 83ad5b247d53..000000000000 |
| 29 |
--- a/media-libs/dumb/dumb-0.9.3-r3.ebuild |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,69 +0,0 @@ |
| 32 |
-# Copyright 1999-2020 Gentoo Authors |
| 33 |
-# Distributed under the terms of the GNU General Public License v2 |
| 34 |
- |
| 35 |
-EAPI=6 |
| 36 |
- |
| 37 |
-inherit toolchain-funcs multilib-build multilib-minimal |
| 38 |
- |
| 39 |
-DESCRIPTION="IT/XM/S3M/MOD player library with click removal and IT filters" |
| 40 |
-HOMEPAGE="http://dumb.sourceforge.net/" |
| 41 |
-SRC_URI="mirror://sourceforge/dumb/${P}.tar.gz" |
| 42 |
- |
| 43 |
-LICENSE="DUMB-0.9.3" |
| 44 |
-SLOT="0" |
| 45 |
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" |
| 46 |
-IUSE="debug" |
| 47 |
- |
| 48 |
-RDEPEND="" |
| 49 |
-DEPEND="" |
| 50 |
- |
| 51 |
-PATCHES=( |
| 52 |
- "${FILESDIR}"/${P}-PIC-as-needed.patch |
| 53 |
- "${FILESDIR}"/${P}_CVE-2006-3668.patch |
| 54 |
-) |
| 55 |
- |
| 56 |
-src_prepare() { |
| 57 |
- default |
| 58 |
- |
| 59 |
- cat << EOF > make/config.txt |
| 60 |
-include make/unix.inc |
| 61 |
-ALL_TARGETS := core core-examples core-headers |
| 62 |
-PREFIX := /usr |
| 63 |
-EOF |
| 64 |
- |
| 65 |
- sed -i '/= -s/d' Makefile || die "sed failed" |
| 66 |
- cp -f Makefile Makefile.rdy |
| 67 |
- |
| 68 |
- multilib_copy_sources |
| 69 |
-} |
| 70 |
- |
| 71 |
-multilib_src_compile() { |
| 72 |
- emake CC="$(tc-getCC)" OFLAGS="${CFLAGS}" all |
| 73 |
-} |
| 74 |
- |
| 75 |
-multilib_src_install() { |
| 76 |
- dolib.so lib/unix/libdumb.so |
| 77 |
- use debug && dolib.so lib/unix/libdumbd.so |
| 78 |
- |
| 79 |
- doheader include/dumb.h |
| 80 |
- |
| 81 |
- dobin examples/{dumbout,dumb2wav} |
| 82 |
- dodoc readme.txt release.txt docs/* |
| 83 |
-} |
| 84 |
- |
| 85 |
-pkg_postinst() { |
| 86 |
- elog "DUMB's core has been installed. This will enable you to convert module" |
| 87 |
- elog "files to PCM data (ready for sending to /dev/dsp, writing to a .wav" |
| 88 |
- elog "file, piping through oggenc, etc.)." |
| 89 |
- elog |
| 90 |
- elog "If you are using Allegro, you will also want to 'emerge aldumb'. This" |
| 91 |
- elog "provides you with a convenient API for playing module files through" |
| 92 |
- elog "Allegro's sound system, and also enables DUMB to integrate with" |
| 93 |
- elog "Allegro's datafile system so you can add modules to datafiles." |
| 94 |
- elog |
| 95 |
- elog "As a developer, when you distribute your game and write your docs, be" |
| 96 |
- elog "aware that 'dumb' and 'aldumb' actually come from the same download." |
| 97 |
- elog "People who don't use Gentoo will only have to download and install one" |
| 98 |
- elog "package. See readme.txt in /usr/share/doc/${PF} for details on" |
| 99 |
- elog "how DUMB would be compiled manually." |
| 100 |
-} |
| 101 |
|
| 102 |
diff --git a/media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch b/media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch |
| 103 |
deleted file mode 100644 |
| 104 |
index 217caa406b3e..000000000000 |
| 105 |
--- a/media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch |
| 106 |
+++ /dev/null |
| 107 |
@@ -1,72 +0,0 @@ |
| 108 |
-diff -Naur dumb.orig/Makefile dumb/Makefile |
| 109 |
---- dumb.orig/Makefile 2003-04-03 16:34:18.000000000 -0800 |
| 110 |
-+++ dumb/Makefile 2004-07-06 14:43:38.158063165 -0700 |
| 111 |
-@@ -199,11 +199,11 @@ |
| 112 |
- ALLEGRO_EXAMPLES_EXE := $(addprefix examples/, $(notdir $(patsubst %.c, %$(EXE_SUFFIX), $(ALLEGRO_EXAMPLES)))) |
| 113 |
- |
| 114 |
- |
| 115 |
--CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.a |
| 116 |
--ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.a |
| 117 |
-+CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.so |
| 118 |
-+ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.so |
| 119 |
- |
| 120 |
--CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.a |
| 121 |
--ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.a |
| 122 |
-+CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.so |
| 123 |
-+ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.so |
| 124 |
- |
| 125 |
- |
| 126 |
- core: $(CORE_LIB_FILE_RELEASE) $(CORE_LIB_FILE_DEBUG) |
| 127 |
-@@ -272,22 +272,22 @@ |
| 128 |
- |
| 129 |
- OBJDIR := $(OBJDIR_BASE)/release |
| 130 |
- CFLAGS := $(CFLAGS_RELEASE) |
| 131 |
--CORE_LIB_FILE := $(LIBDIR)/libdumb.a |
| 132 |
--ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.a |
| 133 |
-+CORE_LIB_FILE := $(LIBDIR)/libdumb.so |
| 134 |
-+ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.so |
| 135 |
- include make/Makefile.inc |
| 136 |
- |
| 137 |
- OBJDIR := $(OBJDIR_BASE)/debug |
| 138 |
- CFLAGS := $(CFLAGS_DEBUG) |
| 139 |
--CORE_LIB_FILE := $(LIBDIR)/libdumbd.a |
| 140 |
--ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.a |
| 141 |
-+CORE_LIB_FILE := $(LIBDIR)/libdumbd.so |
| 142 |
-+ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.so |
| 143 |
- include make/Makefile.inc |
| 144 |
- |
| 145 |
- |
| 146 |
- $(CORE_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(CORE_LIB_FILE_RELEASE) |
| 147 |
-- $(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH) |
| 148 |
-+ $(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH) |
| 149 |
- |
| 150 |
- $(ALLEGRO_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(ALLEGRO_LIB_FILE_RELEASE) $(CORE_LIB_FILE_RELEASE) |
| 151 |
-- $(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO) |
| 152 |
-+ $(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO) |
| 153 |
- |
| 154 |
- $(CORE_EXAMPLES_OBJ): examples/%.o: examples/%.c include/dumb.h |
| 155 |
- $(CC) -c $< -o $@ $(CFLAGS_RELEASE) |
| 156 |
-diff -Naur dumb.orig/make/Makefile.inc dumb/make/Makefile.inc |
| 157 |
---- dumb.orig/make/Makefile.inc 2003-04-03 16:34:18.000000000 -0800 |
| 158 |
-+++ dumb/make/Makefile.inc 2004-07-06 14:37:13.082037585 -0700 |
| 159 |
-@@ -10,8 +10,8 @@ |
| 160 |
- # accurately, create a local copy of the current CFLAGS variable. This is |
| 161 |
- # necessary because Make doesn't expand variables in commands until they are |
| 162 |
- # executed. |
| 163 |
--$(CORE_LIB_FILE): CFLAGS := $(CFLAGS) |
| 164 |
--$(ALLEGRO_LIB_FILE): CFLAGS := $(CFLAGS) |
| 165 |
-+$(CORE_LIB_FILE): CFLAGS := $(CFLAGS) -fPIC -DPIC |
| 166 |
-+$(ALLEGRO_LIB_FILE): CFLAGS := $(CFLAGS) -fPIC -DPIC |
| 167 |
- |
| 168 |
- |
| 169 |
- $(OBJDIR)/%.o: src/core/%.c include/dumb.h include/internal/dumb.h |
| 170 |
-@@ -28,7 +28,7 @@ |
| 171 |
- $(CC) -c -o $@ $< $(CFLAGS) $(WFLAGS_ALLEGRO) |
| 172 |
- |
| 173 |
- $(CORE_LIB_FILE): $(CORE_OBJECTS) |
| 174 |
-- $(AR) rs $@ $^ |
| 175 |
-+ $(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -lm |
| 176 |
- |
| 177 |
- $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS) |
| 178 |
-- $(AR) rs $@ $^ |
| 179 |
-+ $(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -ldumb |
| 180 |
|
| 181 |
diff --git a/media-libs/dumb/files/dumb-0.9.3_CVE-2006-3668.patch b/media-libs/dumb/files/dumb-0.9.3_CVE-2006-3668.patch |
| 182 |
deleted file mode 100644 |
| 183 |
index 09d2fb68f4cb..000000000000 |
| 184 |
--- a/media-libs/dumb/files/dumb-0.9.3_CVE-2006-3668.patch |
| 185 |
+++ /dev/null |
| 186 |
@@ -1,16 +0,0 @@ |
| 187 |
-Index: libdumb-0.9.3/src/it/itread.c |
| 188 |
-=================================================================== |
| 189 |
---- libdumb-0.9.3.orig/src/it/itread.c 2006-07-21 11:05:48.000000000 +0200 |
| 190 |
-+++ libdumb-0.9.3/src/it/itread.c 2006-07-21 11:07:22.000000000 +0200 |
| 191 |
-@@ -292,6 +292,11 @@ |
| 192 |
- |
| 193 |
- envelope->flags = dumbfile_getc(f); |
| 194 |
- envelope->n_nodes = dumbfile_getc(f); |
| 195 |
-+ if(envelope->n_nodes > 25) { |
| 196 |
-+ TRACE("IT error: wrong number of envelope nodes (%d)\n", envelope->n_nodes); |
| 197 |
-+ envelope->n_nodes = 0; |
| 198 |
-+ return -1; |
| 199 |
-+ } |
| 200 |
- envelope->loop_start = dumbfile_getc(f); |
| 201 |
- envelope->loop_end = dumbfile_getc(f); |
| 202 |
- envelope->sus_loop_start = dumbfile_getc(f); |
Archives