[gentoo-commits] gentoo-x86 commit in media-tv/linuxtv-dvb-apps/files: linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch linuxtv-dvb-apps-1.1.1.20100223-alevt.patch

[gentoo-commits] gentoo-x86 commit in media-tv/linuxtv-dvb-apps/files: linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch linuxtv-dvb-apps-1.1.1.20100223-alevt.patch

[Michael Weber (xmw)]

xmw         13/06/02 18:40:09

  Added:                linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch
                        linuxtv-dvb-apps-1.1.1.20100223-alevt.patch
  Log:
  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).
  
  (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

Revision  Changes    Path
1.1                  media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch

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
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

Index: linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch
===================================================================
--- linuxtv-dvb-apps-1.1.1.20100223/Make.rules
+++ linuxtv-dvb-apps-1.1.1.20100223/Make.rules
@@ -46,7 +46,7 @@
 %: %.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS)
 %.so:
-	$(CC) -shared -o $@ $^
+	$(CC) $(LDFLAGS) -Wl,-soname -Wl,$@ -shared -o $@ $^
 %.a:
 	$(AR) rcs $@ $^
 clean::
@@ -76,7 +76,7 @@
 	@$(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS)
 %.so:
 	@echo CC $@
-	@$(CC) -shared -o $@ $^
+	@$(CC) $(LDFLAGS) -Wl,-soname -Wl,$@ -shared -o $@ $^
 %.a:
 	@echo AR $@
 	@$(AR) rcs $@ $^



1.1                  media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch

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
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

Index: linuxtv-dvb-apps-1.1.1.20100223-alevt.patch
===================================================================
--- linuxtv-dvb-apps-1.1.1.20100223/util/alevt/exp-gfx.c
+++ linuxtv-dvb-apps-1.1.1.20100223/util/alevt/exp-gfx.c
@@ -137,6 +137,7 @@
 
 #ifdef WITH_PNG
 
+#include <zlib.h>
 #include <png.h>
 static int png_open(struct export *e);
 static int png_option(struct export *e, int opt, char *arg);
--- linuxtv-dvb-apps-1.1.1.20100223/util/alevt/Makefile
+++ linuxtv-dvb-apps-1.1.1.20100223/util/alevt/Makefile
@@ -25,13 +25,13 @@
 all: alevt alevt-date alevt-cap alevt.1 alevt-date.1 alevt-cap.1
 
 alevt: $(OBJS)
-	$(CC) $(OPT) $(OBJS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS)
+	$(CC) $(OPT) $(OBJS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS) $(LDFLAGS)
 
 alevt-date: $(TOBJS)
-	$(CC) $(OPT) $(TOBJS) -o alevt-date $(ZVBILIB)
+	$(CC) $(OPT) $(TOBJS) -o alevt-date $(ZVBILIB) $(LDFLAGS)
 
 alevt-cap: $(COBJS)
-	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
+	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS) $(LDFLAGS)
 
 font.o: font1.xbm font2.xbm font3.xbm font4.xbm
 fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm
@@ -73,7 +73,6 @@
 	install -m 0644 alevt.1		$(DESTDIR)$(PREFIX)/share/man/man1
 	install -m 0644 alevt-date.1	$(DESTDIR)$(PREFIX)/share/man/man1
 	install -m 0644 alevt-cap.1	$(DESTDIR)$(PREFIX)/share/man/man1
-	install -m 0644 alevt.png $(DESTDIR)$(PREFIX)/share/pixmaps
 	install -m 0644 alevt.desktop $(DESTDIR)$(PREFIX)/share/applications
 
 uninstall: clean