diff options
Diffstat (limited to 'media-video/spcaview/files/spcaview-20071224-Makefile.patch')
-rw-r--r-- | media-video/spcaview/files/spcaview-20071224-Makefile.patch | 122 |
1 files changed, 122 insertions, 0 deletions
diff --git a/media-video/spcaview/files/spcaview-20071224-Makefile.patch b/media-video/spcaview/files/spcaview-20071224-Makefile.patch new file mode 100644 index 000000000000..4ef289f2cbe0 --- /dev/null +++ b/media-video/spcaview/files/spcaview-20071224-Makefile.patch @@ -0,0 +1,122 @@ +diff -ur spcaview-20071224.orig/Makefile spcaview-20071224/Makefile +--- spcaview-20071224.orig/Makefile 2005-09-24 23:57:52.000000000 +0300 ++++ spcaview-20071224/Makefile 2009-09-29 14:18:00.000000000 +0300 +@@ -2,33 +2,18 @@ + # spcaview Makefile + ############################## + +-INSTALLROOT=$(PWD) ++CC ?= gcc ++CFLAGS += $(shell sdl-config --cflags) ++CPPFLAGS += -DUSE_SDL -DLINUX + +-CC=gcc +-CPP=g++ + INSTALL=install + APP_BINARY=spcaview + BIN=/usr/local/bin + #SDLLIBS= -lSDL -lpthread -lSDL_image + SDLLIBS = $(shell sdl-config --libs) +-SDLFLAGS = $(shell sdl-config --cflags) +- +-SERVFLAGS= -O2 -DLINUX $(WARNINGS) + MATH_LIB=-lm + SERVLIBS= $(MATH_LIB) -lpthread + +-#WARNINGS = -Wall \ +-# -Wundef -Wpointer-arith -Wbad-function-cast \ +-# -Wcast-align -Wwrite-strings -Wstrict-prototypes \ +-# -Wmissing-prototypes -Wmissing-declarations \ +-# -Wnested-externs -Winline -Wcast-qual -W \ +-# -Wno-unused +-# -Wunused +- +-CFLAGS = -DUSE_SDL -O2 -DLINUX $(SDLFLAGS) $(WARNINGS) +-CPPFLAGS = $(CFLAGS) +-SHCFLAGS= -O2 -ffast-math -fforce-addr -fstrict-aliasing -fomit-frame-pointer +-#CLIBFLAGS= -O9 -falign-functions=4 -march=athlon + #LIB_ENCODE = libjpgenc.a + #LIB_ENCODE_OBJECTS = encoder.o huffman.o marker.o quant.o + +@@ -52,63 +37,63 @@ + + # Applications: + spcaview: $(OBJECTS) +- $(CC) $(CFLAGS) $(OBJECTS) $(X11_LIB) $(XPM_LIB)\ ++ $(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(X11_LIB) $(XPM_LIB)\ + $(MATH_LIB) \ + $(SDLLIBS)\ + -o $(APP_BINARY) + chmod 755 $(APP_BINARY) + + spcaserv: $(OBJSERVER) +- gcc $(SERVFLAGS) -o spcaserv $(OBJSERVER) $(SERVLIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o spcaserv $(OBJSERVER) $(SERVLIBS) + + spcacat: $(OBJCAT) +- gcc $(SERVFLAGS) -o spcacat $(OBJCAT) $(SERVLIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o spcacat $(OBJCAT) $(SERVLIBS) + + spcaview.o: spcaview.c jconfig.h dpsh.h utils.h SDL_audioin.h + + + shc.o : shc.c shc.h +- $(CC) $(SHCFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + shclib.o: shclib.c shclib.h +- $(CC) $(SHCFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + dpsh.o: dpsh.c dpsh.h +- $(CC) $(SHCFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + avilib.o: avilib.c avilib.h +- $(CC) $(SERVFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + server.o: server.c +- $(CC) $(SERVFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + spcacat.o: spcacat.c +- $(CC) $(SERVFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + spcav4l.o: spcav4l.c spcav4l.h +- $(CC) $(SERVFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + utils.o: utils.c utils.h +- $(CC) $(SERVFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + picture.o: picture.c picture.h +- $(CC) $(SERVFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + pargpio.o: pargpio.c pargpio.h +- $(CC) $(SERVFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + tcputils.o: tcputils.c tcputils.h +- $(CC) $(SERVFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + encoder.o: encoder.c encoder.h +- $(CC) $(SERVFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + huffman.o: huffman.c huffman.h +- $(CC) $(SERVFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + marker.o: marker.c marker.h +- $(CC) $(SERVFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + quant.o: quant.c quant.h +- $(CC) $(SERVFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + install_spcaserv: spcaserv + $(INSTALL) -s -m 755 -g root -o root spcaserv $(BIN) |