| 1 |
xarthisius 10/06/29 19:32:01 |
| 2 |
|
| 3 |
Added: ivtv-utils-1.4.0-gentoo.patch |
| 4 |
Log: |
| 5 |
QA clean up and fixing build with --as-needed wrt bug 321303. Thanks to Diego for reporting. With beandog's blessing |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: ivtv-utils-1.4.0-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
Fixing multiple QA issues |
| 17 |
* respect user {CC,CXX,LD}FLAGS |
| 18 |
* fix linking order |
| 19 |
* make job server for install phase |
| 20 |
|
| 21 |
Don't install v4l2-ctl (bug #278255) |
| 22 |
Don't install duplicate kernel headers (bug #244584) |
| 23 |
|
| 24 |
https://bugs.gentoo.org/show_bug.cgi?id=321303 |
| 25 |
|
| 26 |
Patch written by Kacper Kowalik <xarthisius.kk@×××××.com> |
| 27 |
|
| 28 |
--- test/Makefile |
| 29 |
+++ test/Makefile |
| 30 |
@@ -7,13 +7,13 @@ |
| 31 |
ivtv-osd-dma-test ivtv-fb-colormap-test \ |
| 32 |
ivtv-fb-16-bit-test ps-analyzer |
| 33 |
|
| 34 |
-CFLAGS = -I../utils -D_GNU_SOURCE -O2 -Wall |
| 35 |
-CXXFLAGS = $(CFLAGS) |
| 36 |
-LDFLAGS = -lm |
| 37 |
+CFLAGS += -I../utils -D_GNU_SOURCE -Wall |
| 38 |
+CXXFLAGS += -I../utils -D_GNU_SOURCE -Wall |
| 39 |
+LDLIBS = -lm |
| 40 |
|
| 41 |
all: $(EXES) |
| 42 |
|
| 43 |
-install: all |
| 44 |
+install: |
| 45 |
|
| 46 |
clean: |
| 47 |
rm -f *.o $(EXES) |
| 48 |
--- utils/Makefile.orig 2010-05-24 15:35:11.321677941 +0000 |
| 49 |
+++ utils/Makefile 2010-05-24 15:35:15.595615306 +0000 |
| 50 |
@@ -9,41 +9,39 @@ |
| 51 |
X86_EXES := ivtvplay ivtv-mpegindex #ivtv-encoder |
| 52 |
endif |
| 53 |
|
| 54 |
-EXES := v4l2-ctl ivtv-ctl ivtv-radio $(X86_EXES) |
| 55 |
+EXES := ivtv-ctl ivtv-radio $(X86_EXES) |
| 56 |
|
| 57 |
BIN := $(EXES) ivtv-tune/ivtv-tune cx25840ctl/cx25840ctl |
| 58 |
|
| 59 |
|
| 60 |
HEADERS := linux/ivtv.h linux/ivtvfb.h |
| 61 |
|
| 62 |
-CFLAGS = -D_GNU_SOURCE -O2 -Wall -g -I. |
| 63 |
-CXXFLAGS = $(CFLAGS) |
| 64 |
+CFLAGS += -D_GNU_SOURCE -Wall -I. |
| 65 |
+CXXFLAGS += -D_GNU_SOURCE -Wall -I. |
| 66 |
|
| 67 |
-all:: $(EXES) |
| 68 |
- $(MAKE) CFLAGS="$(CFLAGS)" -C ivtv-tune |
| 69 |
- $(MAKE) CFLAGS="$(CFLAGS)" -C cx25840ctl |
| 70 |
+all: $(EXES) |
| 71 |
+ $(MAKE) $(MAKEOPTS) CFLAGS="$(CFLAGS)" -C ivtv-tune |
| 72 |
+ $(MAKE) $(MAKEOPTS) CFLAGS="$(CFLAGS)" -C cx25840ctl |
| 73 |
|
| 74 |
ivtv-ctl: ivtv-ctl.o |
| 75 |
- $(CC) -lm -o $@ $^ |
| 76 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm |
| 77 |
|
| 78 |
v4l2-ctl: v4l2-ctl.o |
| 79 |
- $(CXX) -lm -o $@ $^ |
| 80 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm |
| 81 |
|
| 82 |
v4l2-dbg: v4l2-dbg.o v4l2-driverids.o v4l2-chipids.o |
| 83 |
- $(CXX) -lm -o $@ $^ |
| 84 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm |
| 85 |
|
| 86 |
ivtvplay: ivtvplay.cc |
| 87 |
- $(CXX) $(CXXFLAGS) -lm -lpthread -o $@ $^ |
| 88 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm -lpthread |
| 89 |
|
| 90 |
encoder.o: encoder.c |
| 91 |
$(CC) $(CFLAGS) -DVIDEO_PORT=0 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -c $^ |
| 92 |
|
| 93 |
ivtv-encoder: enc_mindex.o enc_chann.o encoder.o |
| 94 |
- $(CC) -lpthread -o $@ $^ |
| 95 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread |
| 96 |
|
| 97 |
-install: all |
| 98 |
- install -d $(DESTDIR)/$(HDRDIR) |
| 99 |
- install -m 0644 $(HEADERS) $(DESTDIR)/$(HDRDIR) |
| 100 |
+install: |
| 101 |
install -d $(DESTDIR)/$(BINDIR) |
| 102 |
install -m 0755 $(BIN) $(DESTDIR)/$(BINDIR) |
| 103 |
|
| 104 |
--- Makefile |
| 105 |
+++ Makefile |
| 106 |
@@ -1,6 +1,6 @@ |
| 107 |
all clean install: |
| 108 |
- make -C utils $@ |
| 109 |
- make -C test $@ |
| 110 |
+ $(MAKE) -C utils $@ |
| 111 |
+ $(MAKE) -C test $@ |
| 112 |
|
| 113 |
distclean: clean |
Archives