1 |
idl0r 10/11/26 19:44:44 |
2 |
|
3 |
Modified: vdr-xineliboutput-9999-build-system.patch |
4 |
Log: |
5 |
Merge live ebuild patch with upstream changes. |
6 |
|
7 |
(Portage version: 2.2.0_alpha5/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: vdr-xineliboutput-9999-build-system.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- vdr-xineliboutput-9999-build-system.patch 23 Nov 2010 17:55:49 -0000 1.2 |
23 |
+++ vdr-xineliboutput-9999-build-system.patch 26 Nov 2010 19:44:44 -0000 1.3 |
24 |
@@ -1,41 +1,11 @@ |
25 |
Index: Makefile |
26 |
=================================================================== |
27 |
RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/Makefile,v |
28 |
-retrieving revision 1.99 |
29 |
-diff -u -b -B -r1.99 Makefile |
30 |
---- Makefile 23 Nov 2010 13:46:59 -0000 1.99 |
31 |
-+++ Makefile 23 Nov 2010 17:53:25 -0000 |
32 |
-@@ -127,9 +127,9 @@ |
33 |
- ### The name of executable and libraries |
34 |
- ### |
35 |
- |
36 |
--VDRPLUGIN = libvdr-$(PLUGIN).so |
37 |
--VDRPLUGIN_SXFE = lib$(PLUGIN)-sxfe.so |
38 |
--VDRPLUGIN_FBFE = lib$(PLUGIN)-fbfe.so |
39 |
-+VDRPLUGIN = libvdr-$(PLUGIN).so.$(APIVERSION) |
40 |
-+VDRPLUGIN_SXFE = lib$(PLUGIN)-sxfe.so.$(VERSION) |
41 |
-+VDRPLUGIN_FBFE = lib$(PLUGIN)-fbfe.so.$(VERSION) |
42 |
- VDRSXFE = vdr-sxfe |
43 |
- VDRFBFE = vdr-fbfe |
44 |
- XINEINPUTVDR = xineplug_inp_xvdr.so |
45 |
-@@ -273,7 +273,7 @@ |
46 |
- $(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(CFLAGS_X11) $(OPTFLAGS) -o $@ $< |
47 |
- |
48 |
- ### Internationalization (I18N): |
49 |
-- |
50 |
-+ifeq ($(HAVE_I18N), yes) |
51 |
- PODIR = po |
52 |
- LOCALEDIR ?= $(DESTDIR)$(VDRDIR)/locale |
53 |
- I18Npo = $(wildcard $(PODIR)/*.po) |
54 |
-@@ -293,6 +293,7 @@ |
55 |
- $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo |
56 |
- @mkdir -p $(dir $@) |
57 |
- cp $< $@ |
58 |
-+endif |
59 |
- |
60 |
- .PHONY: i18n |
61 |
- i18n: $(I18Nmsgs) |
62 |
-@@ -311,7 +312,7 @@ |
63 |
+retrieving revision 1.101 |
64 |
+diff -u -b -B -r1.101 Makefile |
65 |
+--- Makefile 25 Nov 2010 14:28:49 -0000 1.101 |
66 |
++++ Makefile 26 Nov 2010 19:42:55 -0000 |
67 |
+@@ -312,7 +312,7 @@ |
68 |
install : XINELIBOUTPUT_INSTALL_MSG = |
69 |
|
70 |
.PHONY: all |
71 |
@@ -44,34 +14,34 @@ |
72 |
|
73 |
frontends: config $(TARGETS_FE) $(TARGETS_XINE) |
74 |
$(XINELIBOUTPUT_INSTALL_MSG) |
75 |
-@@ -328,8 +329,6 @@ |
76 |
+@@ -329,8 +329,6 @@ |
77 |
|
78 |
$(VDRPLUGIN): $(OBJS) $(OBJS_MPG) |
79 |
$(CXX) $(CXXFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS) $(OBJS_MPG) $(LIBS) $(LIBS_VDR) -o $@ |
80 |
-- @-rm -rf $(LIBDIR)/$@.$(APIVERSION) |
81 |
-- @cp $@ $(LIBDIR)/$@.$(APIVERSION) |
82 |
+- @-rm -rf $(LIBDIR)/$@ |
83 |
+- @cp $@ $(LIBDIR)/$@ |
84 |
|
85 |
# |
86 |
# vdr-sxfe |
87 |
-@@ -337,8 +336,6 @@ |
88 |
+@@ -338,8 +336,6 @@ |
89 |
|
90 |
$(VDRPLUGIN_SXFE): $(OBJS_SXFE_SO) |
91 |
$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_SXFE_SO) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) -o $@ |
92 |
-- @-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE).$(VERSION) |
93 |
-- @cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE).$(VERSION) |
94 |
+- @-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE) |
95 |
+- @cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE) |
96 |
$(VDRSXFE): $(OBJS_SXFE) |
97 |
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_SXFE) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@ |
98 |
|
99 |
-@@ -348,8 +345,6 @@ |
100 |
+@@ -349,8 +345,6 @@ |
101 |
|
102 |
$(VDRPLUGIN_FBFE): $(OBJS_FBFE_SO) |
103 |
$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_FBFE_SO) $(LIBS_XINE) $(LIBS_JPEG) -o $@ |
104 |
-- @-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE).$(VERSION) |
105 |
-- @cp $@ $(LIBDIR)/$(VDRPLUGIN_FBFE).$(VERSION) |
106 |
+- @-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE) |
107 |
+- @cp $@ $(LIBDIR)/$(VDRPLUGIN_FBFE) |
108 |
$(VDRFBFE): $(OBJS_FBFE) |
109 |
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_FBFE) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@ |
110 |
|
111 |
-@@ -370,7 +365,7 @@ |
112 |
+@@ -371,7 +365,7 @@ |
113 |
# install |
114 |
# |
115 |
|
116 |
@@ -80,7 +50,7 @@ |
117 |
ifeq ($(XINELIBOUTPUT_XINEPLUGIN), yes) |
118 |
@mkdir -p $(DESTDIR)/$(XINEPLUGINDIR)/post |
119 |
@echo Installing $(DESTDIR)/$(XINEPLUGINDIR)/$(XINEINPUTVDR) |
120 |
-@@ -391,12 +386,30 @@ |
121 |
+@@ -392,12 +386,30 @@ |
122 |
@mkdir -p $(DESTDIR)/$(BINDIR) |
123 |
@-rm -rf $(DESTDIR)/$(BINDIR)/vdr-fbfe |
124 |
@$(INSTALL) -m 0755 vdr-fbfe $(DESTDIR)/$(BINDIR)/vdr-fbfe |
125 |
@@ -111,23 +81,13 @@ |
126 |
endif |
127 |
|
128 |
dist: clean |
129 |
-@@ -413,6 +426,7 @@ |
130 |
- tools/*.o tools/*~ tools/*.flc xine/*.o xine/*~ \ |
131 |
- xine/*.flc $(VDR_FBFE) $(VDR_SXFE) mpg2c black_720x576.c \ |
132 |
- nosignal_720x576.c vdrlogo_720x576.c vdr-sxfe vdr-fbfe \ |
133 |
-- $(PODIR)/*.mo $(PODIR)/*.pot \ |
134 |
- features.h config.mak configure.log |
135 |
-- |
136 |
-+ifeq ($(HAVE_I18N), yes) |
137 |
-+ @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot |
138 |
-+endif |
139 |
Index: configure |
140 |
=================================================================== |
141 |
RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/configure,v |
142 |
retrieving revision 1.29 |
143 |
diff -u -b -B -r1.29 configure |
144 |
--- configure 23 Nov 2010 13:21:06 -0000 1.29 |
145 |
-+++ configure 23 Nov 2010 17:53:25 -0000 |
146 |
++++ configure 26 Nov 2010 19:42:55 -0000 |
147 |
@@ -231,7 +231,6 @@ |
148 |
xshm |
149 |
xdpms |