| 1 |
coldwind 08/04/02 14:38:56 |
| 2 |
|
| 3 |
Added: w_scan-20080105-build-and-path-fixes.patch |
| 4 |
Log: |
| 5 |
Version bump wrt bug #215761, fixed paths and honour CFLAGS, LDFLAGS and CC. Add me as maintainer. |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-tv/w_scan/files/w_scan-20080105-build-and-path-fixes.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/w_scan/files/w_scan-20080105-build-and-path-fixes.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/w_scan/files/w_scan-20080105-build-and-path-fixes.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: w_scan-20080105-build-and-path-fixes.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur w_scan-20080105.orig/Makefile w_scan-20080105/Makefile |
| 17 |
--- w_scan-20080105.orig/Makefile 2008-04-02 16:02:00.000000000 +0200 |
| 18 |
+++ w_scan-20080105/Makefile 2008-04-02 16:28:16.000000000 +0200 |
| 19 |
@@ -1,7 +1,7 @@ |
| 20 |
|
| 21 |
-CC = gcc |
| 22 |
-CFLAGS = -MD -g -Wall -O2 |
| 23 |
-LFLAGS = -g -Wall |
| 24 |
+CC ?= gcc |
| 25 |
+ALL_CFLAGS = -MD -g -Wall -O2 $(CFLAGS) |
| 26 |
+ALL_LDFLAGS = -g -Wall $(LDFLAGS) |
| 27 |
|
| 28 |
OBJS = dump-vdr.o dump-xine.o dump-dvbscan.o dump-kaffeine.o scan.o |
| 29 |
SRCS = $(OBJS:.o=.c) |
| 30 |
@@ -10,19 +10,26 @@ |
| 31 |
VERSION = $(shell sed -n '/uint version/p' scan.c | sed -e 's/uint version = //' | sed -e 's/;//') |
| 32 |
TMPDIR = w_scan-$(VERSION) |
| 33 |
|
| 34 |
+BINDIR = /usr/bin |
| 35 |
+SHAREDIR = /usr/share/w_scan |
| 36 |
+DOCDIR = /usr/share/doc/w_scan |
| 37 |
+ |
| 38 |
$(TARGET): $(OBJS) |
| 39 |
- $(CC) $(LFLAGS) -o $(TARGET) $(OBJS) |
| 40 |
+ $(CC) $(ALL_LDFLAGS) -o $(TARGET) $(OBJS) |
| 41 |
$(RM) *.o *.d |
| 42 |
.c.o: |
| 43 |
- $(CC) $(CFLAGS) --static -c $< -o $@ |
| 44 |
+ $(CC) $(ALL_CFLAGS) -c $< -o $@ |
| 45 |
|
| 46 |
install: |
| 47 |
- install -m 755 $(TARGET) /usr/bin |
| 48 |
- install -m 755 w_scan_start.sh /usr/bin |
| 49 |
- install pci.ids /usr/bin |
| 50 |
- install pci.classes /usr/bin |
| 51 |
- install usb.ids /usr/bin |
| 52 |
- install usb.classes /usr/bin |
| 53 |
+ @mkdir -p $(DESTDIR)$(BINDIR) |
| 54 |
+ @mkdir -p $(DESTDIR)$(SHAREDIR) |
| 55 |
+ @mkdir -p $(DESTDIR)$(DOCDIR) |
| 56 |
+ install -m 755 $(TARGET) $(DESTDIR)$(BINDIR) |
| 57 |
+ install -m 755 w_scan_start.sh $(DESTDIR)$(BINDIR) |
| 58 |
+ install pci.ids $(DESTDIR)$(SHAREDIR) |
| 59 |
+ install pci.classes $(DESTDIR)$(SHAREDIR) |
| 60 |
+ install usb.ids $(DESTDIR)$(SHAREDIR) |
| 61 |
+ install usb.classes $(DESTDIR)$(SHAREDIR) |
| 62 |
|
| 63 |
dist: |
| 64 |
@-rm -rf $(TMPDIR) |
| 65 |
Los ficheros w_scan-20080105.orig/w_scan y w_scan-20080105/w_scan son distintos |
| 66 |
diff -ur w_scan-20080105.orig/w_scan_start.sh w_scan-20080105/w_scan_start.sh |
| 67 |
--- w_scan-20080105.orig/w_scan_start.sh 2008-04-02 16:02:00.000000000 +0200 |
| 68 |
+++ w_scan-20080105/w_scan_start.sh 2008-04-02 16:27:55.000000000 +0200 |
| 69 |
@@ -414,8 +414,8 @@ |
| 70 |
read idVendor < $i/idVendor |
| 71 |
read idProduct < $i/idProduct |
| 72 |
# avoid errors if ressource not available |
| 73 |
- if [ ! -e $(pwd)/usb.ids ] || |
| 74 |
- [ ! -e $(pwd)/usb.classes ]; then |
| 75 |
+ if [ ! -e /usr/share/w_scan/usb.ids ] || |
| 76 |
+ [ ! -e /usr/share/w_scan/usb.classes ]; then |
| 77 |
DEBUG_LOADDRIVER=false |
| 78 |
fi |
| 79 |
if [ $DEBUG_LOADDRIVER == true ]; then |
| 80 |
@@ -424,7 +424,7 @@ |
| 81 |
class_name=${line:6:40} |
| 82 |
break |
| 83 |
fi |
| 84 |
- done < $(pwd)/usb.classes |
| 85 |
+ done < /usr/share/w_scan/usb.classes |
| 86 |
while read line; do |
| 87 |
if [ "${line:0:4}" == "$idVendor" ]; then |
| 88 |
vendor_name=${line:6:80} |
| 89 |
@@ -438,7 +438,7 @@ |
| 90 |
done |
| 91 |
break |
| 92 |
fi |
| 93 |
- done < $(pwd)/usb.ids |
| 94 |
+ done < /usr/share/w_scan/usb.ids |
| 95 |
fi |
| 96 |
while read line; do |
| 97 |
data=$line |
| 98 |
@@ -507,8 +507,8 @@ |
| 99 |
read subvendor < $i/subsystem_vendor |
| 100 |
read subdevice < $i/subsystem_device |
| 101 |
# avoid errors if ressource not available |
| 102 |
- if [ ! -e $(pwd)/pci.ids ] || |
| 103 |
- [ ! -e $(pwd)/pci.classes ]; then |
| 104 |
+ if [ ! -e /usr/share/w_scan/pci.ids ] || |
| 105 |
+ [ ! -e /usr/share/w_scan/pci.classes ]; then |
| 106 |
DEBUG_LOADDRIVER=false |
| 107 |
fi |
| 108 |
if [ $DEBUG_LOADDRIVER == true ]; then |
| 109 |
@@ -517,7 +517,7 @@ |
| 110 |
class_name=${line:5:40} |
| 111 |
break |
| 112 |
fi |
| 113 |
- done < $(pwd)/pci.classes |
| 114 |
+ done < /usr/share/w_scan/pci.classes |
| 115 |
while read line; do |
| 116 |
if [ "${line:0:4}" == "${vendor:2:4}" ]; then |
| 117 |
vendor_name=${line:5:80} |
| 118 |
@@ -531,13 +531,13 @@ |
| 119 |
done |
| 120 |
break |
| 121 |
fi |
| 122 |
- done < $(pwd)/pci.ids |
| 123 |
+ done < /usr/share/w_scan/pci.ids |
| 124 |
while read line; do |
| 125 |
if [ "${line:0:4}" == "${subvendor:2:4}" ]; then |
| 126 |
subvendor_name=${line:5:80} |
| 127 |
break |
| 128 |
fi |
| 129 |
- done < $(pwd)/pci.ids |
| 130 |
+ done < /usr/share/w_scan/pci.ids |
| 131 |
fi |
| 132 |
while read line; do |
| 133 |
data=$line |
| 134 |
|
| 135 |
|
| 136 |
|
| 137 |
-- |
| 138 |
gentoo-commits@l.g.o mailing list |
Archives