diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2007-05-29 16:07:04 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-05-29 16:07:04 +0000 |
| commit | d67c8a5b2d136993908e2745ca1c194436167121 (patch) | |
| tree | 7f50fb96c9c2b61e495b2168a6b8e2e5e47b73a4 /media-plugins | |
| parent | Version bump. (diff) | |
| download | gentoo-2-d67c8a5b2d136993908e2745ca1c194436167121.tar.gz gentoo-2-d67c8a5b2d136993908e2745ca1c194436167121.tar.bz2 gentoo-2-d67c8a5b2d136993908e2745ca1c194436167121.zip | |
Corrected parallel make problem.
(Portage version: 2.1.2.7)
Diffstat (limited to 'media-plugins')
| -rw-r--r-- | media-plugins/vdr-live/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/vdr-live/files/0.1.0/linking.diff | 25 | ||||
| -rw-r--r-- | media-plugins/vdr-live/files/digest-vdr-live-0.1.0 | 6 | ||||
| -rw-r--r-- | media-plugins/vdr-live/vdr-live-0.1.0.ebuild | 4 |
4 files changed, 22 insertions, 19 deletions
diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog index 73b80af9dd9e..528557c3ed80 100644 --- a/media-plugins/vdr-live/ChangeLog +++ b/media-plugins/vdr-live/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-live # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.2 2007/05/29 14:24:40 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.3 2007/05/29 16:07:04 zzam Exp $ + + 29 May 2007; Matthias Schwarzott <zzam@gentoo.org> + files/0.1.0/linking.diff, vdr-live-0.1.0.ebuild: + Corrected parallel make problem. 29 May 2007; Matthias Schwarzott <zzam@gentoo.org> +files/confd, +files/rc-addon.sh: diff --git a/media-plugins/vdr-live/files/0.1.0/linking.diff b/media-plugins/vdr-live/files/0.1.0/linking.diff index 7dbd385bd376..730f1cc4c6f8 100644 --- a/media-plugins/vdr-live/files/0.1.0/linking.diff +++ b/media-plugins/vdr-live/files/0.1.0/linking.diff @@ -7,26 +7,25 @@ Index: live-0.1.0/Makefile CXXFLAGS += `tntnet-config --cxxflags` -LDFLAGS += `tntnet-config --libs` -+LDLIBS += $(shell tntnet-config --libs) ++LIBS += $(shell tntnet-config --libs) ### The directory environment: -@@ -54,7 +54,8 @@ INCLUDES += -I$(VDRDIR)/include -Ihttpd - DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' - export DEFINES +@@ -71,7 +71,7 @@ WEBLIBS = pages/libpages.a css/libcss --LIBS += httpd/libhttpd.a -lssl -+LIBS += httpd/libhttpd.a -+LDLIBS += -lssl + .PHONY: all dist clean SUBDIRS - SUBDIRS = httpd pages css images javascript +-all: SUBDIRS libvdr-$(PLUGIN).so ++all: libvdr-$(PLUGIN).so -@@ -95,7 +96,7 @@ SUBDIRS: + ### Implicit rules: + +@@ -94,7 +94,7 @@ SUBDIRS: + make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" || exit 1; \ done - libvdr-$(PLUGIN).so: $(PLUGINOBJS) $(LIBS) $(WEBLIBS) -- $(CXX) $(LDFLAGS) -shared -o $@ $(PLUGINOBJS) -Wl,--whole-archive $(WEBLIBS) -Wl,--no-whole-archive $(LIBS) -+ $(CXX) $(LDFLAGS) -shared -o $@ $(PLUGINOBJS) -Wl,--whole-archive $(WEBLIBS) -Wl,--no-whole-archive $(LIBS) $(LDLIBS) +-libvdr-$(PLUGIN).so: $(PLUGINOBJS) $(LIBS) $(WEBLIBS) ++libvdr-$(PLUGIN).so: SUBDIRS $(PLUGINOBJS) + $(CXX) $(LDFLAGS) -shared -o $@ $(PLUGINOBJS) -Wl,--whole-archive $(WEBLIBS) -Wl,--no-whole-archive $(LIBS) @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) - dist: clean diff --git a/media-plugins/vdr-live/files/digest-vdr-live-0.1.0 b/media-plugins/vdr-live/files/digest-vdr-live-0.1.0 index 2ab921f3bed5..b45dedfd40f4 100644 --- a/media-plugins/vdr-live/files/digest-vdr-live-0.1.0 +++ b/media-plugins/vdr-live/files/digest-vdr-live-0.1.0 @@ -1,3 +1,3 @@ -MD5 bf6070e8839180239b0f983c71ec1128 live-0.1.0.tar.gz 268899 -RMD160 303cd0b95520d20c70931fa546533962dd624634 live-0.1.0.tar.gz 268899 -SHA256 6d8467434e47b1127e7dc61a56f67011cf14cc348036591ef10e2069009d6dc2 live-0.1.0.tar.gz 268899 +MD5 bf6070e8839180239b0f983c71ec1128 vdr-live-0.1.0.tar.gz 268899 +RMD160 303cd0b95520d20c70931fa546533962dd624634 vdr-live-0.1.0.tar.gz 268899 +SHA256 6d8467434e47b1127e7dc61a56f67011cf14cc348036591ef10e2069009d6dc2 vdr-live-0.1.0.tar.gz 268899 diff --git a/media-plugins/vdr-live/vdr-live-0.1.0.ebuild b/media-plugins/vdr-live/vdr-live-0.1.0.ebuild index 6737dc5e65d6..e6a6d099e6b3 100644 --- a/media-plugins/vdr-live/vdr-live-0.1.0.ebuild +++ b/media-plugins/vdr-live/vdr-live-0.1.0.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.1.0.ebuild,v 1.1 2007/05/29 14:01:03 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.1.0.ebuild,v 1.2 2007/05/29 16:07:04 zzam Exp $ inherit vdr-plugin DESCRIPTION="VDR Plugin: Web Access To Settings" HOMEPAGE="http://live.vdr-developer.org" -SRC_URI="http://live.vdr-developer.org/downloads/${P#vdr-}.tar.gz" +SRC_URI="http://live.vdr-developer.org/downloads/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" |