diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2010-12-15 17:09:04 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2010-12-15 17:09:04 +0000 |
| commit | 0a727774d98157499b8c0ec6abb78d4c241c3b91 (patch) | |
| tree | 3ecc61d09dcd101341f6c4d19632114a303a4d6e /media-plugins/vdr-xineliboutput | |
| parent | Removed new privacy extension as it's broken. (bugs #348785 and #348799) (diff) | |
| download | gentoo-2-0a727774d98157499b8c0ec6abb78d4c241c3b91.tar.gz gentoo-2-0a727774d98157499b8c0ec6abb78d4c241c3b91.tar.bz2 gentoo-2-0a727774d98157499b8c0ec6abb78d4c241c3b91.zip | |
Merge live ebuild patch with upstream changes.
(Portage version: 2.2.0_alpha8/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins/vdr-xineliboutput')
| -rw-r--r-- | media-plugins/vdr-xineliboutput/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch | 72 |
2 files changed, 12 insertions, 66 deletions
diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog index 9f790fc53e69..906cac0989e4 100644 --- a/media-plugins/vdr-xineliboutput/ChangeLog +++ b/media-plugins/vdr-xineliboutput/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-xineliboutput # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.59 2010/12/07 19:54:10 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.60 2010/12/15 17:09:04 idl0r Exp $ + + 15 Dec 2010; Christian Ruppert <idl0r@gentoo.org> + files/vdr-xineliboutput-9999-build-system.patch: + Merge live ebuild patch with upstream changes. 07 Dec 2010; Christian Ruppert <idl0r@gentoo.org> vdr-xineliboutput-9999.ebuild: diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch index 9caf58043bb0..9787219c30f8 100644 --- a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch +++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch @@ -1,11 +1,11 @@ Index: Makefile =================================================================== RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/Makefile,v -retrieving revision 1.101 -diff -u -b -B -r1.101 Makefile ---- Makefile 25 Nov 2010 14:28:49 -0000 1.101 -+++ Makefile 26 Nov 2010 19:42:55 -0000 -@@ -312,7 +312,7 @@ +retrieving revision 1.105 +diff -u -b -B -r1.105 Makefile +--- Makefile 15 Dec 2010 14:43:36 -0000 1.105 ++++ Makefile 15 Dec 2010 17:05:50 -0000 +@@ -323,7 +323,7 @@ install : XINELIBOUTPUT_INSTALL_MSG = .PHONY: all @@ -14,34 +14,7 @@ diff -u -b -B -r1.101 Makefile frontends: config $(TARGETS_FE) $(TARGETS_XINE) $(XINELIBOUTPUT_INSTALL_MSG) -@@ -329,8 +329,6 @@ - - $(VDRPLUGIN): $(OBJS) $(OBJS_MPG) - $(CXX) $(CXXFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS) $(OBJS_MPG) $(LIBS) $(LIBS_VDR) -o $@ -- @-rm -rf $(LIBDIR)/$@ -- @cp $@ $(LIBDIR)/$@ - - # - # vdr-sxfe -@@ -338,8 +336,6 @@ - - $(VDRPLUGIN_SXFE): $(OBJS_SXFE_SO) - $(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_SXFE_SO) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) -o $@ -- @-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE) -- @cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE) - $(VDRSXFE): $(OBJS_SXFE) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_SXFE) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@ - -@@ -349,8 +345,6 @@ - - $(VDRPLUGIN_FBFE): $(OBJS_FBFE_SO) - $(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_FBFE_SO) $(LIBS_XINE) $(LIBS_JPEG) -o $@ -- @-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE) -- @cp $@ $(LIBDIR)/$(VDRPLUGIN_FBFE) - $(VDRFBFE): $(OBJS_FBFE) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_FBFE) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@ - -@@ -371,7 +365,7 @@ +@@ -389,7 +389,7 @@ # install # @@ -50,44 +23,13 @@ diff -u -b -B -r1.101 Makefile ifeq ($(XINELIBOUTPUT_XINEPLUGIN), yes) @mkdir -p $(DESTDIR)/$(XINEPLUGINDIR)/post @echo Installing $(DESTDIR)/$(XINEPLUGINDIR)/$(XINEINPUTVDR) -@@ -392,12 +386,30 @@ - @mkdir -p $(DESTDIR)/$(BINDIR) - @-rm -rf $(DESTDIR)/$(BINDIR)/vdr-fbfe - @$(INSTALL) -m 0755 vdr-fbfe $(DESTDIR)/$(BINDIR)/vdr-fbfe -+ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes) -+ @echo Installing $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_FBFE) -+ @mkdir -p $(DESTDIR)$(LIBDIR) -+ @-rm -rf $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_FBFE) -+ @$(INSTALL) -m 0755 $(VDRPLUGIN_FBFE) $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_FBFE) -+endif - endif - ifeq ($(XINELIBOUTPUT_X11), yes) - @echo Installing $(DESTDIR)/$(BINDIR)/vdr-sxfe - @mkdir -p $(DESTDIR)/$(BINDIR) - @-rm -rf $(DESTDIR)/$(BINDIR)/vdr-sxfe - @$(INSTALL) -m 0755 vdr-sxfe $(DESTDIR)/$(BINDIR)/vdr-sxfe -+ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes) -+ @echo Installing $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_SXFE) -+ @mkdir -p $(DESTDIR)$(LIBDIR) -+ @-rm -rf $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_SXFE) -+ @$(INSTALL) -m 0755 $(VDRPLUGIN_SXFE) $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN_SXFE) -+endif -+endif -+ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes) -+ @echo Installing $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN) -+ @mkdir -p $(DESTDIR)$(LIBDIR) -+ @-rm -rf $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN) -+ @$(INSTALL) -D -m 0755 $(VDRPLUGIN) $(DESTDIR)$(LIBDIR)/$(VDRPLUGIN) - endif - - dist: clean Index: configure =================================================================== RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/configure,v retrieving revision 1.29 diff -u -b -B -r1.29 configure --- configure 23 Nov 2010 13:21:06 -0000 1.29 -+++ configure 26 Nov 2010 19:42:55 -0000 ++++ configure 15 Dec 2010 17:05:50 -0000 @@ -231,7 +231,6 @@ xshm xdpms |