| 1 |
vapier 07/10/06 13:05:42 |
| 2 |
|
| 3 |
Added: SDLcam-0.8.0-build.patch digest-SDLcam-0.8.0 |
| 4 |
Log: |
| 5 |
Version bump #188475 by Leong Seh Hui. |
| 6 |
(Portage version: 2.1.3.11) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-video/SDLcam/files/SDLcam-0.8.0-build.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/SDLcam/files/SDLcam-0.8.0-build.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/SDLcam/files/SDLcam-0.8.0-build.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: SDLcam-0.8.0-build.patch |
| 15 |
=================================================================== |
| 16 |
--- Makefile.in.orig |
| 17 |
+++ Makefile.in |
| 18 |
@@ -1,16 +1,18 @@ |
| 19 |
CC = @CC@ |
| 20 |
-CPP = @CXX@ |
| 21 |
-LD = $(CPP) |
| 22 |
-LDFLAGS = `sdl-config --libs` `xml2-config --libs` -lSDL_image -lSDL_ttf -lm -lxml2 -rdynamic -ljpeg -ldl |
| 23 |
+CXX = @CXX@ |
| 24 |
+LD = $(CXX) |
| 25 |
+LDFLAGS = @LDFLAGS@ |
| 26 |
+LDLIBS = $(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_image -lSDL_ttf -lm -lxml2 -rdynamic -ljpeg -ldl |
| 27 |
PROG = SDLcam |
| 28 |
|
| 29 |
prefix=@prefix@ |
| 30 |
datadir=@datadir@ |
| 31 |
|
| 32 |
-FEATURES = -DMMX -DTIMER |
| 33 |
+CPPFLAGS = @CPPFLAGS@ -DMMX -DTIMER -DPROG_VERSION=\"0.7.3\" -DDATADIR="$(datadir)/SDLcam" |
| 34 |
|
| 35 |
-MMXFLAGS = -Wshadow -Wall -Wstrict-prototypes `sdl-config --cflags` `xml2-config --cflags` -DPROG_VERSION=\"0.7.3\" $(FEATURES) |
| 36 |
-CFLAGS = $(MMXFLAGS) -g -DDATADIR="$(datadir)/SDLcam" |
| 37 |
+MMXFLAGS = -Wshadow -Wall $(shell sdl-config --cflags) $(shell xml2-config --cflags) |
| 38 |
+CFLAGS = @CFLAGS@ $(MMXFLAGS) -Wstrict-prototypes |
| 39 |
+CXXFLAGS = @CXXFLAGS@ $(MMXFLAGS) |
| 40 |
|
| 41 |
|
| 42 |
OBJS = main.o init.o SDL_v4l.o SDL_v4l_filters.o webcam.o interface.o configuration.o config_file.o SDL_v4l_filters_thomas.o dump_thomas.o capture.o ftp-upload.o logo.o parser.o misc.o xml_theme.o dyn_misc.o |
| 43 |
@@ -34,32 +36,32 @@ |
| 44 |
./install |
| 45 |
|
| 46 |
%.o: %.cpp |
| 47 |
- $(CC) $(CFLAGS) -c $< |
| 48 |
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< |
| 49 |
|
| 50 |
%.o: %.c |
| 51 |
- $(CPP) $(CFLAGS) -c $< |
| 52 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< |
| 53 |
|
| 54 |
sources/%.so: sources/%.cpp |
| 55 |
- $(CPP) $(FEATURES) -g -fPIC -shared -o $@ $? |
| 56 |
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $? |
| 57 |
|
| 58 |
sources/jpeg.so: sources/jpeg.cpp |
| 59 |
- $(CPP) $(FEATURES) -g -fPIC -shared -o $@ $? -ljpeg |
| 60 |
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $? -ljpeg |
| 61 |
|
| 62 |
filter/%.so: filter/%.c |
| 63 |
- $(CC) $(FEATURES) -g -fPIC -shared -o $@ $? |
| 64 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $? |
| 65 |
|
| 66 |
capture/mpeg.so: capture/mpeg.c |
| 67 |
- - $(CC) $(FEATURES) -g -fPIC -shared -o $@ $? -lfame |
| 68 |
+ - $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $? -lfame |
| 69 |
|
| 70 |
capture/divx.so: capture/divx.c |
| 71 |
- - $(CC) $(FEATURES) -g -fPIC -shared -o $@ $? -ldivxencore |
| 72 |
+ - $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $? -ldivxencore |
| 73 |
|
| 74 |
capture/divx2.so: capture/divx2.cpp |
| 75 |
- - $(CPP) $(FEATURES) -g -fPIC -shared -o $@ $? |
| 76 |
+ - $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $? |
| 77 |
|
| 78 |
SDLcam: $(OBJS) |
| 79 |
- $(LD) $(LDFLAGS) $(OBJS) -o $(PROG) |
| 80 |
+ $(LD) $(LDFLAGS) $(OBJS) -o $(PROG) $(LDLIBS) |
| 81 |
# $(LD) $(LDFLAGS) $(OBJS) -o $(PROG) -laviplay |
| 82 |
|
| 83 |
SDL_v4l_filters_thomas.o: SDL_v4l_filters_thomas.c |
| 84 |
- $(CC) $(MMXFLAGS) -c SDL_v4l_filters_thomas.c |
| 85 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c SDL_v4l_filters_thomas.c |
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
1.1 media-video/SDLcam/files/digest-SDLcam-0.8.0 |
| 90 |
|
| 91 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/SDLcam/files/digest-SDLcam-0.8.0?rev=1.1&view=markup |
| 92 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/SDLcam/files/digest-SDLcam-0.8.0?rev=1.1&content-type=text/plain |
| 93 |
|
| 94 |
Index: digest-SDLcam-0.8.0 |
| 95 |
=================================================================== |
| 96 |
MD5 760a702a48ed839eedcc4af36dbe9f67 sdlcam-0.8.0.tar.gz 347284 |
| 97 |
RMD160 550a7170bba30fab1266610ba828b76a12ccdfcb sdlcam-0.8.0.tar.gz 347284 |
| 98 |
SHA256 7d227c042bf91b026ed0a585c378d34a2d50ad50061107f77adc8f367e21455a sdlcam-0.8.0.tar.gz 347284 |
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
-- |
| 103 |
gentoo-commits@g.o mailing list |
Archives