Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/quake3/files/
Date: Sun, 13 Aug 2017 11:31:47
Message-Id: 1502623700.f80b1b4ffd75203affc0e751be9a5937a1e53c72.soap@gentoo
1 commit: f80b1b4ffd75203affc0e751be9a5937a1e53c72
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Aug 12 11:30:13 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 13 11:28:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f80b1b4f
7
8 games-fps/quake3: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/5395
11
12 .../files/quake3-1.36-remove-bundled-jpeg.patch | 72 ----------------------
13 1 file changed, 72 deletions(-)
14
15 diff --git a/games-fps/quake3/files/quake3-1.36-remove-bundled-jpeg.patch b/games-fps/quake3/files/quake3-1.36-remove-bundled-jpeg.patch
16 deleted file mode 100644
17 index 485dd71d204..00000000000
18 --- a/games-fps/quake3/files/quake3-1.36-remove-bundled-jpeg.patch
19 +++ /dev/null
20 @@ -1,72 +0,0 @@
21 ---- Makefile.orig 2012-08-21 12:19:01.344696519 +0400
22 -+++ Makefile 2012-08-21 12:19:23.506696348 +0400
23 -@@ -164,7 +164,6 @@
24 - NDIR=$(MOUNT_DIR)/null
25 - UIDIR=$(MOUNT_DIR)/ui
26 - Q3UIDIR=$(MOUNT_DIR)/q3_ui
27 --JPDIR=$(MOUNT_DIR)/jpeg-6b
28 - SPEEXDIR=$(MOUNT_DIR)/libspeex
29 - Q3ASMDIR=$(MOUNT_DIR)/tools/asm
30 - LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
31 -@@ -297,7 +296,7 @@
32 - SHLIBLDFLAGS=-shared $(LDFLAGS)
33 -
34 - THREAD_LIBS=-lpthread
35 -- LIBS=-ldl -lm
36 -+ LIBS=-ldl -lm -ljpeg
37 -
38 - CLIENT_LIBS=$(shell sdl-config --libs) -lGL
39 -
40 -@@ -1297,42 +1296,6 @@
41 - $(B)/client/l_script.o \
42 - $(B)/client/l_struct.o \
43 - \
44 -- $(B)/client/jcapimin.o \
45 -- $(B)/client/jcapistd.o \
46 -- $(B)/client/jccoefct.o \
47 -- $(B)/client/jccolor.o \
48 -- $(B)/client/jcdctmgr.o \
49 -- $(B)/client/jchuff.o \
50 -- $(B)/client/jcinit.o \
51 -- $(B)/client/jcmainct.o \
52 -- $(B)/client/jcmarker.o \
53 -- $(B)/client/jcmaster.o \
54 -- $(B)/client/jcomapi.o \
55 -- $(B)/client/jcparam.o \
56 -- $(B)/client/jcphuff.o \
57 -- $(B)/client/jcprepct.o \
58 -- $(B)/client/jcsample.o \
59 -- $(B)/client/jdapimin.o \
60 -- $(B)/client/jdapistd.o \
61 -- $(B)/client/jdatasrc.o \
62 -- $(B)/client/jdcoefct.o \
63 -- $(B)/client/jdcolor.o \
64 -- $(B)/client/jddctmgr.o \
65 -- $(B)/client/jdhuff.o \
66 -- $(B)/client/jdinput.o \
67 -- $(B)/client/jdmainct.o \
68 -- $(B)/client/jdmarker.o \
69 -- $(B)/client/jdmaster.o \
70 -- $(B)/client/jdpostct.o \
71 -- $(B)/client/jdsample.o \
72 -- $(B)/client/jdtrans.o \
73 -- $(B)/client/jerror.o \
74 -- $(B)/client/jfdctflt.o \
75 -- $(B)/client/jidctflt.o \
76 -- $(B)/client/jmemmgr.o \
77 -- $(B)/client/jmemnobs.o \
78 -- $(B)/client/jutils.o \
79 -- \
80 - $(B)/client/tr_animation.o \
81 - $(B)/client/tr_backend.o \
82 - $(B)/client/tr_bsp.o \
83 -@@ -1921,9 +1884,6 @@
84 - $(B)/client/%.o: $(BLIBDIR)/%.c
85 - $(DO_BOT_CC)
86 -
87 --$(B)/client/%.o: $(JPDIR)/%.c
88 -- $(DO_CC)
89 --
90 - $(B)/client/%.o: $(SPEEXDIR)/%.c
91 - $(DO_CC)
92 -