Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/aldumb/files/, media-libs/aldumb/
Date: Thu, 02 Jul 2020 10:48:55
Message-Id: 1593686857.b370400e46d3df152beabfdc9100a9c4954d5382.zlogene@gentoo
1 commit: b370400e46d3df152beabfdc9100a9c4954d5382
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 2 10:47:37 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 2 10:47:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b370400e
7
8 media-libs/aldumb: remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/724686
11
12 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
13
14 media-libs/aldumb/Manifest | 1 -
15 media-libs/aldumb/aldumb-0.9.3.ebuild | 52 ----------------
16 .../aldumb/files/aldumb-0.9.3-PIC-as-needed.patch | 72 ----------------------
17 .../aldumb/files/aldumb-0.9.3_CVE-2006-3668.patch | 16 -----
18 media-libs/aldumb/metadata.xml | 11 ----
19 5 files changed, 152 deletions(-)
20
21 diff --git a/media-libs/aldumb/Manifest b/media-libs/aldumb/Manifest
22 deleted file mode 100644
23 index 089690e1d59..00000000000
24 --- a/media-libs/aldumb/Manifest
25 +++ /dev/null
26 @@ -1 +0,0 @@
27 -DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658
28
29 diff --git a/media-libs/aldumb/aldumb-0.9.3.ebuild b/media-libs/aldumb/aldumb-0.9.3.ebuild
30 deleted file mode 100644
31 index 6349d6817e3..00000000000
32 --- a/media-libs/aldumb/aldumb-0.9.3.ebuild
33 +++ /dev/null
34 @@ -1,52 +0,0 @@
35 -# Copyright 1999-2018 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -
40 -DESCRIPTION="Allegro support for DUMB (an IT, XM, S3M, and MOD player library)"
41 -HOMEPAGE="http://dumb.sourceforge.net/"
42 -SRC_URI="mirror://sourceforge/dumb/dumb-${PV}.tar.gz"
43 -
44 -LICENSE="DUMB-0.9.3"
45 -SLOT="0"
46 -KEYWORDS="amd64 ppc x86"
47 -IUSE="debug"
48 -
49 -DEPEND="
50 - >=media-libs/dumb-0.9.3
51 - media-libs/allegro:0
52 -"
53 -RDEPEND="${DEPEND}"
54 -
55 -S="${WORKDIR}/${P/aldumb/dumb}"
56 -
57 -PATCHES=(
58 - "${FILESDIR}"/${P}-PIC-as-needed.patch
59 - "${FILESDIR}"/${P}_CVE-2006-3668.patch
60 -)
61 -
62 -src_prepare() {
63 - default
64 -
65 - cat << EOF > make/config.txt
66 -include make/unix.inc
67 -ALL_TARGETS := allegro allegro-examples allegro-headers
68 -PREFIX := /usr
69 -EOF
70 - sed -i '/= -s/d' Makefile || die "sed failed"
71 - cp -f Makefile Makefile.rdy || die
72 -}
73 -
74 -src_compile() {
75 - emake OFLAGS="${CFLAGS}" all
76 -}
77 -
78 -src_install() {
79 - dobin examples/dumbplay
80 - dolib.so lib/unix/libaldmb.so
81 -
82 - use debug && lib/unix/libaldmd.so
83 -
84 - insinto /usr/include
85 - doins include/aldumb.h
86 -}
87
88 diff --git a/media-libs/aldumb/files/aldumb-0.9.3-PIC-as-needed.patch b/media-libs/aldumb/files/aldumb-0.9.3-PIC-as-needed.patch
89 deleted file mode 100644
90 index 217caa406b3..00000000000
91 --- a/media-libs/aldumb/files/aldumb-0.9.3-PIC-as-needed.patch
92 +++ /dev/null
93 @@ -1,72 +0,0 @@
94 -diff -Naur dumb.orig/Makefile dumb/Makefile
95 ---- dumb.orig/Makefile 2003-04-03 16:34:18.000000000 -0800
96 -+++ dumb/Makefile 2004-07-06 14:43:38.158063165 -0700
97 -@@ -199,11 +199,11 @@
98 - ALLEGRO_EXAMPLES_EXE := $(addprefix examples/, $(notdir $(patsubst %.c, %$(EXE_SUFFIX), $(ALLEGRO_EXAMPLES))))
99 -
100 -
101 --CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.a
102 --ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.a
103 -+CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.so
104 -+ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.so
105 -
106 --CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.a
107 --ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.a
108 -+CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.so
109 -+ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.so
110 -
111 -
112 - core: $(CORE_LIB_FILE_RELEASE) $(CORE_LIB_FILE_DEBUG)
113 -@@ -272,22 +272,22 @@
114 -
115 - OBJDIR := $(OBJDIR_BASE)/release
116 - CFLAGS := $(CFLAGS_RELEASE)
117 --CORE_LIB_FILE := $(LIBDIR)/libdumb.a
118 --ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.a
119 -+CORE_LIB_FILE := $(LIBDIR)/libdumb.so
120 -+ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.so
121 - include make/Makefile.inc
122 -
123 - OBJDIR := $(OBJDIR_BASE)/debug
124 - CFLAGS := $(CFLAGS_DEBUG)
125 --CORE_LIB_FILE := $(LIBDIR)/libdumbd.a
126 --ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.a
127 -+CORE_LIB_FILE := $(LIBDIR)/libdumbd.so
128 -+ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.so
129 - include make/Makefile.inc
130 -
131 -
132 - $(CORE_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(CORE_LIB_FILE_RELEASE)
133 -- $(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)
134 -+ $(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)
135 -
136 - $(ALLEGRO_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(ALLEGRO_LIB_FILE_RELEASE) $(CORE_LIB_FILE_RELEASE)
137 -- $(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO)
138 -+ $(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO)
139 -
140 - $(CORE_EXAMPLES_OBJ): examples/%.o: examples/%.c include/dumb.h
141 - $(CC) -c $< -o $@ $(CFLAGS_RELEASE)
142 -diff -Naur dumb.orig/make/Makefile.inc dumb/make/Makefile.inc
143 ---- dumb.orig/make/Makefile.inc 2003-04-03 16:34:18.000000000 -0800
144 -+++ dumb/make/Makefile.inc 2004-07-06 14:37:13.082037585 -0700
145 -@@ -10,8 +10,8 @@
146 - # accurately, create a local copy of the current CFLAGS variable. This is
147 - # necessary because Make doesn't expand variables in commands until they are
148 - # executed.
149 --$(CORE_LIB_FILE): CFLAGS := $(CFLAGS)
150 --$(ALLEGRO_LIB_FILE): CFLAGS := $(CFLAGS)
151 -+$(CORE_LIB_FILE): CFLAGS := $(CFLAGS) -fPIC -DPIC
152 -+$(ALLEGRO_LIB_FILE): CFLAGS := $(CFLAGS) -fPIC -DPIC
153 -
154 -
155 - $(OBJDIR)/%.o: src/core/%.c include/dumb.h include/internal/dumb.h
156 -@@ -28,7 +28,7 @@
157 - $(CC) -c -o $@ $< $(CFLAGS) $(WFLAGS_ALLEGRO)
158 -
159 - $(CORE_LIB_FILE): $(CORE_OBJECTS)
160 -- $(AR) rs $@ $^
161 -+ $(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -lm
162 -
163 - $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS)
164 -- $(AR) rs $@ $^
165 -+ $(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -ldumb
166
167 diff --git a/media-libs/aldumb/files/aldumb-0.9.3_CVE-2006-3668.patch b/media-libs/aldumb/files/aldumb-0.9.3_CVE-2006-3668.patch
168 deleted file mode 100644
169 index 09d2fb68f4c..00000000000
170 --- a/media-libs/aldumb/files/aldumb-0.9.3_CVE-2006-3668.patch
171 +++ /dev/null
172 @@ -1,16 +0,0 @@
173 -Index: libdumb-0.9.3/src/it/itread.c
174 -===================================================================
175 ---- libdumb-0.9.3.orig/src/it/itread.c 2006-07-21 11:05:48.000000000 +0200
176 -+++ libdumb-0.9.3/src/it/itread.c 2006-07-21 11:07:22.000000000 +0200
177 -@@ -292,6 +292,11 @@
178 -
179 - envelope->flags = dumbfile_getc(f);
180 - envelope->n_nodes = dumbfile_getc(f);
181 -+ if(envelope->n_nodes > 25) {
182 -+ TRACE("IT error: wrong number of envelope nodes (%d)\n", envelope->n_nodes);
183 -+ envelope->n_nodes = 0;
184 -+ return -1;
185 -+ }
186 - envelope->loop_start = dumbfile_getc(f);
187 - envelope->loop_end = dumbfile_getc(f);
188 - envelope->sus_loop_start = dumbfile_getc(f);
189
190 diff --git a/media-libs/aldumb/metadata.xml b/media-libs/aldumb/metadata.xml
191 deleted file mode 100644
192 index 18f5db99219..00000000000
193 --- a/media-libs/aldumb/metadata.xml
194 +++ /dev/null
195 @@ -1,11 +0,0 @@
196 -<?xml version="1.0" encoding="UTF-8"?>
197 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
198 -<pkgmetadata>
199 - <maintainer type="project">
200 - <email>sound@g.o</email>
201 - <name>Gentoo Sound project</name>
202 - </maintainer>
203 - <upstream>
204 - <remote-id type="sourceforge">dumb</remote-id>
205 - </upstream>
206 -</pkgmetadata>