| 1 |
ssuominen 09/09/29 11:14:23 |
| 2 |
|
| 3 |
Added: spcaview-20071224-Makefile.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
(Portage version: 2.2_rc42/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-video/spcaview/files/spcaview-20071224-Makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/spcaview/files/spcaview-20071224-Makefile.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/spcaview/files/spcaview-20071224-Makefile.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: spcaview-20071224-Makefile.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur spcaview-20071224.orig/Makefile spcaview-20071224/Makefile |
| 17 |
--- spcaview-20071224.orig/Makefile 2005-09-24 23:57:52.000000000 +0300 |
| 18 |
+++ spcaview-20071224/Makefile 2009-09-29 14:18:00.000000000 +0300 |
| 19 |
@@ -2,33 +2,18 @@ |
| 20 |
# spcaview Makefile |
| 21 |
############################## |
| 22 |
|
| 23 |
-INSTALLROOT=$(PWD) |
| 24 |
+CC ?= gcc |
| 25 |
+CFLAGS += $(shell sdl-config --cflags) |
| 26 |
+CPPFLAGS += -DUSE_SDL -DLINUX |
| 27 |
|
| 28 |
-CC=gcc |
| 29 |
-CPP=g++ |
| 30 |
INSTALL=install |
| 31 |
APP_BINARY=spcaview |
| 32 |
BIN=/usr/local/bin |
| 33 |
#SDLLIBS= -lSDL -lpthread -lSDL_image |
| 34 |
SDLLIBS = $(shell sdl-config --libs) |
| 35 |
-SDLFLAGS = $(shell sdl-config --cflags) |
| 36 |
- |
| 37 |
-SERVFLAGS= -O2 -DLINUX $(WARNINGS) |
| 38 |
MATH_LIB=-lm |
| 39 |
SERVLIBS= $(MATH_LIB) -lpthread |
| 40 |
|
| 41 |
-#WARNINGS = -Wall \ |
| 42 |
-# -Wundef -Wpointer-arith -Wbad-function-cast \ |
| 43 |
-# -Wcast-align -Wwrite-strings -Wstrict-prototypes \ |
| 44 |
-# -Wmissing-prototypes -Wmissing-declarations \ |
| 45 |
-# -Wnested-externs -Winline -Wcast-qual -W \ |
| 46 |
-# -Wno-unused |
| 47 |
-# -Wunused |
| 48 |
- |
| 49 |
-CFLAGS = -DUSE_SDL -O2 -DLINUX $(SDLFLAGS) $(WARNINGS) |
| 50 |
-CPPFLAGS = $(CFLAGS) |
| 51 |
-SHCFLAGS= -O2 -ffast-math -fforce-addr -fstrict-aliasing -fomit-frame-pointer |
| 52 |
-#CLIBFLAGS= -O9 -falign-functions=4 -march=athlon |
| 53 |
#LIB_ENCODE = libjpgenc.a |
| 54 |
#LIB_ENCODE_OBJECTS = encoder.o huffman.o marker.o quant.o |
| 55 |
|
| 56 |
@@ -52,63 +37,63 @@ |
| 57 |
|
| 58 |
# Applications: |
| 59 |
spcaview: $(OBJECTS) |
| 60 |
- $(CC) $(CFLAGS) $(OBJECTS) $(X11_LIB) $(XPM_LIB)\ |
| 61 |
+ $(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(X11_LIB) $(XPM_LIB)\ |
| 62 |
$(MATH_LIB) \ |
| 63 |
$(SDLLIBS)\ |
| 64 |
-o $(APP_BINARY) |
| 65 |
chmod 755 $(APP_BINARY) |
| 66 |
|
| 67 |
spcaserv: $(OBJSERVER) |
| 68 |
- gcc $(SERVFLAGS) -o spcaserv $(OBJSERVER) $(SERVLIBS) |
| 69 |
+ $(CC) $(LDFLAGS) $(CFLAGS) -o spcaserv $(OBJSERVER) $(SERVLIBS) |
| 70 |
|
| 71 |
spcacat: $(OBJCAT) |
| 72 |
- gcc $(SERVFLAGS) -o spcacat $(OBJCAT) $(SERVLIBS) |
| 73 |
+ $(CC) $(LDFLAGS) $(CFLAGS) -o spcacat $(OBJCAT) $(SERVLIBS) |
| 74 |
|
| 75 |
spcaview.o: spcaview.c jconfig.h dpsh.h utils.h SDL_audioin.h |
| 76 |
|
| 77 |
|
| 78 |
shc.o : shc.c shc.h |
| 79 |
- $(CC) $(SHCFLAGS) -c -o $@ $< |
| 80 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 81 |
shclib.o: shclib.c shclib.h |
| 82 |
- $(CC) $(SHCFLAGS) -c -o $@ $< |
| 83 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 84 |
dpsh.o: dpsh.c dpsh.h |
| 85 |
- $(CC) $(SHCFLAGS) -c -o $@ $< |
| 86 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 87 |
|
| 88 |
avilib.o: avilib.c avilib.h |
| 89 |
- $(CC) $(SERVFLAGS) -c -o $@ $< |
| 90 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 91 |
|
| 92 |
server.o: server.c |
| 93 |
- $(CC) $(SERVFLAGS) -c -o $@ $< |
| 94 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 95 |
|
| 96 |
spcacat.o: spcacat.c |
| 97 |
- $(CC) $(SERVFLAGS) -c -o $@ $< |
| 98 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 99 |
|
| 100 |
spcav4l.o: spcav4l.c spcav4l.h |
| 101 |
- $(CC) $(SERVFLAGS) -c -o $@ $< |
| 102 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 103 |
|
| 104 |
utils.o: utils.c utils.h |
| 105 |
- $(CC) $(SERVFLAGS) -c -o $@ $< |
| 106 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 107 |
|
| 108 |
picture.o: picture.c picture.h |
| 109 |
- $(CC) $(SERVFLAGS) -c -o $@ $< |
| 110 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 111 |
|
| 112 |
pargpio.o: pargpio.c pargpio.h |
| 113 |
- $(CC) $(SERVFLAGS) -c -o $@ $< |
| 114 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 115 |
|
| 116 |
tcputils.o: tcputils.c tcputils.h |
| 117 |
- $(CC) $(SERVFLAGS) -c -o $@ $< |
| 118 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 119 |
|
| 120 |
encoder.o: encoder.c encoder.h |
| 121 |
- $(CC) $(SERVFLAGS) -c -o $@ $< |
| 122 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 123 |
|
| 124 |
huffman.o: huffman.c huffman.h |
| 125 |
- $(CC) $(SERVFLAGS) -c -o $@ $< |
| 126 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 127 |
|
| 128 |
marker.o: marker.c marker.h |
| 129 |
- $(CC) $(SERVFLAGS) -c -o $@ $< |
| 130 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 131 |
|
| 132 |
quant.o: quant.c quant.h |
| 133 |
- $(CC) $(SERVFLAGS) -c -o $@ $< |
| 134 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
| 135 |
|
| 136 |
install_spcaserv: spcaserv |
| 137 |
$(INSTALL) -s -m 755 -g root -o root spcaserv $(BIN) |
Archives