| 1 |
xmw 13/06/02 18:40:09 |
| 2 |
|
| 3 |
Added: linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch |
| 4 |
linuxtv-dvb-apps-1.1.1.20100223-alevt.patch |
| 5 |
Log: |
| 6 |
Add alevt videotext decoder support (bug 423687, thanks Tobias Leupold), add perl DEPEND (bug 433155, thanks bay), rename scan to scan-dvb (bug 348371, thanks Bill Prendergast), support LDFLAGS (bug 331095, thanks Olivier Huber and thomasg). |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch |
| 17 |
=================================================================== |
| 18 |
--- linuxtv-dvb-apps-1.1.1.20100223/Make.rules |
| 19 |
+++ linuxtv-dvb-apps-1.1.1.20100223/Make.rules |
| 20 |
@@ -46,7 +46,7 @@ |
| 21 |
%: %.c |
| 22 |
$(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS) |
| 23 |
%.so: |
| 24 |
- $(CC) -shared -o $@ $^ |
| 25 |
+ $(CC) $(LDFLAGS) -Wl,-soname -Wl,$@ -shared -o $@ $^ |
| 26 |
%.a: |
| 27 |
$(AR) rcs $@ $^ |
| 28 |
clean:: |
| 29 |
@@ -76,7 +76,7 @@ |
| 30 |
@$(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS) |
| 31 |
%.so: |
| 32 |
@echo CC $@ |
| 33 |
- @$(CC) -shared -o $@ $^ |
| 34 |
+ @$(CC) $(LDFLAGS) -Wl,-soname -Wl,$@ -shared -o $@ $^ |
| 35 |
%.a: |
| 36 |
@echo AR $@ |
| 37 |
@$(AR) rcs $@ $^ |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: linuxtv-dvb-apps-1.1.1.20100223-alevt.patch |
| 47 |
=================================================================== |
| 48 |
--- linuxtv-dvb-apps-1.1.1.20100223/util/alevt/exp-gfx.c |
| 49 |
+++ linuxtv-dvb-apps-1.1.1.20100223/util/alevt/exp-gfx.c |
| 50 |
@@ -137,6 +137,7 @@ |
| 51 |
|
| 52 |
#ifdef WITH_PNG |
| 53 |
|
| 54 |
+#include <zlib.h> |
| 55 |
#include <png.h> |
| 56 |
static int png_open(struct export *e); |
| 57 |
static int png_option(struct export *e, int opt, char *arg); |
| 58 |
--- linuxtv-dvb-apps-1.1.1.20100223/util/alevt/Makefile |
| 59 |
+++ linuxtv-dvb-apps-1.1.1.20100223/util/alevt/Makefile |
| 60 |
@@ -25,13 +25,13 @@ |
| 61 |
all: alevt alevt-date alevt-cap alevt.1 alevt-date.1 alevt-cap.1 |
| 62 |
|
| 63 |
alevt: $(OBJS) |
| 64 |
- $(CC) $(OPT) $(OBJS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS) |
| 65 |
+ $(CC) $(OPT) $(OBJS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS) $(LDFLAGS) |
| 66 |
|
| 67 |
alevt-date: $(TOBJS) |
| 68 |
- $(CC) $(OPT) $(TOBJS) -o alevt-date $(ZVBILIB) |
| 69 |
+ $(CC) $(OPT) $(TOBJS) -o alevt-date $(ZVBILIB) $(LDFLAGS) |
| 70 |
|
| 71 |
alevt-cap: $(COBJS) |
| 72 |
- $(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS) |
| 73 |
+ $(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS) $(LDFLAGS) |
| 74 |
|
| 75 |
font.o: font1.xbm font2.xbm font3.xbm font4.xbm |
| 76 |
fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm |
| 77 |
@@ -73,7 +73,6 @@ |
| 78 |
install -m 0644 alevt.1 $(DESTDIR)$(PREFIX)/share/man/man1 |
| 79 |
install -m 0644 alevt-date.1 $(DESTDIR)$(PREFIX)/share/man/man1 |
| 80 |
install -m 0644 alevt-cap.1 $(DESTDIR)$(PREFIX)/share/man/man1 |
| 81 |
- install -m 0644 alevt.png $(DESTDIR)$(PREFIX)/share/pixmaps |
| 82 |
install -m 0644 alevt.desktop $(DESTDIR)$(PREFIX)/share/applications |
| 83 |
|
| 84 |
uninstall: clean |
Archives