summaryrefslogtreecommitdiff
blob: 9787219c30f8a15e71a1769a6c7fe1ef9ab737ef (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
Index: Makefile
===================================================================
RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/Makefile,v
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
-all: config $(TARGETS_VDR) frontends i18n
+all: config $(TARGETS_VDR) frontends
 
 frontends: config $(TARGETS_FE) $(TARGETS_XINE)
 	$(XINELIBOUTPUT_INSTALL_MSG)
@@ -389,7 +389,7 @@
 # install
 #
 
-install: all
+install: all i18n
 ifeq ($(XINELIBOUTPUT_XINEPLUGIN), yes)
 	@mkdir -p $(DESTDIR)/$(XINEPLUGINDIR)/post
 	@echo Installing $(DESTDIR)/$(XINEPLUGINDIR)/$(XINEINPUTVDR)
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	15 Dec 2010 17:05:50 -0000
@@ -231,7 +231,6 @@
   xshm
   xdpms
   xinerama
-  xrandr
   xrender
   xshape
   opengl
@@ -267,7 +266,6 @@
   echo "  --disable-xshm         disable XShm support [no]"
   echo "  --disable-xdpms        disable Xdpms support [no]"
   echo "  --disable-xinerama     disable Xinerama support [no]"
-  echo "  --disable-xrandr       disable Xrandr support (video mode switching) [no]"
   echo "  --disable-xrender      disable Xrender support (HUD OSD) [no]"
   echo "  --disable-xshape       disable Xshape support (non-transparent HUD OSD without composite manager) [no]"
   echo "  --disable-opengl       disable OpenGL support (transparent HUD OSD without composite manager) [no]"
@@ -326,7 +324,7 @@
 
 check_deps(){
   disabled libxine && disable x11 fb libavutil libjpeg
-  disabled x11     && disable dbus-glib-1 xshm xrender xshape opengl xrandr xdpms xinerama vdpau
+  disabled x11     && disable dbus-glib-1 xshm xrender xshape opengl xdpms xinerama vdpau
   disabled vdr     && disable libextractor
   disabled xrender && disable opengl
   disabled xshape  && disable opengl
@@ -367,7 +365,6 @@
     test_library X11  xshm         "X11/extensions/XShm.h"     "-lXext"      "XShmQueryExtension(0)"
     test_library X11  xrender      "X11/extensions/Xrender.h"  "-lXrender"   "XRenderQueryFormats(0)"
     test_library X11  xshape       "X11/extensions/shape.h"    "-lXext"      "XShapeQueryExtension(0,0,0)"
-    test_library X11  xrandr       "X11/extensions/Xrandr.h"   "-lXrandr"    "XRRGetScreenInfo(0,0)"
     test_library X11  xdpms        "X11/extensions/dpms.h"     "-lXext"      "DPMSDisable(0)"
     test_library X11  xinerama     "X11/extensions/Xinerama.h" "-lXinerama"  "XineramaQueryScreens(0,0)"
     test_library X11  opengl       "GL/glx.h"                  "-lGL -lGLU -lglut"  "glXQueryVersion(0,0,0)"