View | Details | Raw Unified | Return to bug 256818 | Differences between
and this patch

Collapse All | Expand All

(-)vdr-plugin-xineliboutput/Makefile (-2 lines)
Lines 14-21 Link Here
14
LICENSE=	GPLv2
14
LICENSE=	GPLv2
15
LICENSE_FILE=	${WRKSRC}/COPYING
15
LICENSE_FILE=	${WRKSRC}/COPYING
16
16
17
BROKEN=		does not build: invalid suffix on literal; C++11 requires a space between literal and identifier
18
19
LIB_DEPENDS=	libxine.so:multimedia/libxine \
17
LIB_DEPENDS=	libxine.so:multimedia/libxine \
20
		libavutil.so:multimedia/ffmpeg \
18
		libavutil.so:multimedia/ffmpeg \
21
		libdbus-glib-1.so:devel/dbus-glib \
19
		libdbus-glib-1.so:devel/dbus-glib \
(-)vdr-plugin-xineliboutput/files/patch-c++11 (+163 lines)
Line 0 Link Here
1
diff -ruN vdr-xineliboutput.orig/device.c vdr-xineliboutput/device.c
2
--- vdr-xineliboutput.orig/device.c	2012-05-11 09:37:27.000000000 +0200
3
+++ vdr-xineliboutput/device.c	2021-08-30 10:52:36.560762000 +0200
4
@@ -967,7 +967,7 @@
5
 #ifdef LOG_TRICKSPEED
6
       if(PictureType != NO_PICTURE && PES_HAS_PTS(buf)) {
7
 	int64_t pts = pes_get_pts(buf, length);
8
-	LOGMSG("    TrickSpeed: frame %s pts %"PRId64, picture_type_str[PictureType], pts);
9
+	LOGMSG("    TrickSpeed: frame %s pts %" PRId64, picture_type_str[PictureType], pts);
10
       }
11
 #endif
12
 
13
@@ -1019,11 +1019,11 @@
14
       if(m_TrickSpeedPts == 0) {
15
 	m_TrickSpeedMode |= trs_NoAudio;
16
 	m_TrickSpeedPts = pts;
17
-	LOGTRICKSPEED("    Seen video pts = %"PRId64, pts);
18
+	LOGTRICKSPEED("    Seen video pts = %" PRId64, pts);
19
       } else {
20
 	if(pts < m_TrickSpeedPts) {
21
 	  /* -> playing fast backwards */
22
-	  LOGTRICKSPEED("    Detected fast backward mode. last %"PRId64" now %"PRId64, 
23
+	  LOGTRICKSPEED("    Detected fast backward mode. last %" PRId64 " now %" PRId64,
24
 			m_TrickSpeedPts, pts);
25
 	  //if(!(m_TrickSpeedMode & trs_PTS_recalc))
26
 	  //  ForEach(m_clients, &cXinelibThread::Clear);
27
@@ -1051,7 +1051,7 @@
28
       if(m_TrickSpeedPts == 0)
29
 	m_TrickSpeedPts = pts;
30
 
31
-      LOGTRICKSPEED("    pts %"PRId64" -> %"PRId64" (diff %"PRId64")  %"PRId64"", pts, 
32
+      LOGTRICKSPEED("    pts %" PRId64 " -> %" PRId64 " (diff %" PRId64 ")  %" PRId64 "", pts,
33
 		    m_TrickSpeedPts + 40*12*90, m_TrickSpeedPts + 40*12*90 - pts,
34
 		    (m_TrickSpeedPts + 40*12*90)^0x80000000);
35
       pts = m_TrickSpeedPts = m_TrickSpeedPts + 40*12*90; /* 12 frames * 40ms -> pts units */
36
diff -ruN vdr-xineliboutput.orig/tools/ts.c vdr-xineliboutput/tools/ts.c
37
--- vdr-xineliboutput.orig/tools/ts.c	2012-05-11 09:37:27.000000000 +0200
38
+++ vdr-xineliboutput/tools/ts.c	2021-08-30 10:54:49.676758000 +0200
39
@@ -545,7 +545,7 @@
40
 
41
 #ifdef LOG_PCR
42
   uint epcr = ((pkt[10] & 0x1) << 8) | pkt[11];
43
-  LOGPCR("ts_get_pcr: PCR: %"PRId64", EPCR: %u", pcr, epcr);
44
+  LOGPCR("ts_get_pcr: PCR: %" PRId64 ", EPCR: %u", pcr, epcr);
45
 #endif
46
 
47
   *ppcr = pcr;
48
diff -ruN vdr-xineliboutput.orig/xine/BluRay/decode_spuhdmv.c vdr-xineliboutput/xine/BluRay/decode_spuhdmv.c
49
--- vdr-xineliboutput.orig/xine/BluRay/decode_spuhdmv.c	2012-05-11 09:37:27.000000000 +0200
50
+++ vdr-xineliboutput/xine/BluRay/decode_spuhdmv.c	2021-08-30 10:50:45.900369000 +0200
51
@@ -925,7 +925,7 @@
52
 
53
 static void decode_segment(spuhdmv_decoder_t *this)
54
 {
55
-  XINE_HDMV_TRACE("*** new segment, pts %010"PRId64": 0x%02x (%8d bytes)\n",
56
+  XINE_HDMV_TRACE("*** new segment, pts %010" PRId64 ": 0x%02x (%8d bytes)\n",
57
                   this->pts, this->buf->segment_type, this->buf->segment_len);
58
 
59
   switch (segbuf_segment_type(this->buf)) {
60
diff -ruN vdr-xineliboutput.orig/xine/BluRay/input_bluray.c vdr-xineliboutput/xine/BluRay/input_bluray.c
61
--- vdr-xineliboutput.orig/xine/BluRay/input_bluray.c	2012-05-11 09:37:27.000000000 +0200
62
+++ vdr-xineliboutput/xine/BluRay/input_bluray.c	2021-08-30 10:54:23.289681000 +0200
63
@@ -568,7 +568,7 @@
64
 
65
 #ifdef LOG
66
   int ms = this->title_info->duration / INT64_C(90);
67
-  lprintf("Opened title %d. Length %"PRId64" bytes / %02d:%02d:%02d.%03d\n",
68
+  lprintf("Opened title %d. Length %" PRId64 " bytes / %02d:%02d:%02d.%03d\n",
69
           this->current_title_idx, bd_get_title_size(this->bdh),
70
           ms / 3600000, (ms % 3600000 / 60000), (ms % 60000) / 1000, ms % 1000);
71
 #endif
72
diff -ruN vdr-xineliboutput.orig/xine/adjustable_scr.c vdr-xineliboutput/xine/adjustable_scr.c
73
--- vdr-xineliboutput.orig/xine/adjustable_scr.c	2012-05-11 09:37:27.000000000 +0200
74
+++ vdr-xineliboutput/xine/adjustable_scr.c	2021-08-30 10:50:17.820989000 +0200
75
@@ -274,13 +274,13 @@
76
       set_pivot( this );
77
       this->buffering = 1;
78
       this->buffering_start_time = time_ms();
79
-      LOGMSG("start buffering at %"PRId64, this->cur_pts);
80
+      LOGMSG("start buffering at %" PRId64, this->cur_pts);
81
     }
82
   } else {
83
     if (this->buffering) {
84
       set_pivot( this );
85
       this->buffering = 0;
86
-      LOGMSG("stop buffering at %"PRId64" (buffering took %"PRIu64" ms)",
87
+      LOGMSG("stop buffering at %" PRId64 " (buffering took %" PRIu64 " ms)",
88
 	     this->cur_pts, elapsed(this->buffering_start_time));
89
     }
90
   }
91
diff -ruN vdr-xineliboutput.orig/xine/demux_xvdr.c vdr-xineliboutput/xine/demux_xvdr.c
92
--- vdr-xineliboutput.orig/xine/demux_xvdr.c	2012-05-11 09:37:27.000000000 +0200
93
+++ vdr-xineliboutput/xine/demux_xvdr.c	2021-08-30 10:51:33.112992000 +0200
94
@@ -227,7 +227,7 @@
95
     int still_mode  = (int)this->stream->metronom->get_option(this->stream->metronom, XVDR_METRONOM_STILL_MODE);
96
     int trick_speed = (int)this->stream->metronom->get_option(this->stream->metronom, XVDR_METRONOM_TRICK_SPEED);
97
     if (still_mode > 0 || trick_speed > 0) {
98
-      LOGMSG("Skipping new pts %"PRId64" (still=%d trickspeed=%d)", buf->pts, still_mode, trick_speed);
99
+      LOGMSG("Skipping new pts %" PRId64 " (still=%d trickspeed=%d)", buf->pts, still_mode, trick_speed);
100
       return;
101
     }
102
   }
103
@@ -239,7 +239,7 @@
104
 
105
     if (this->send_newpts || (this->last_pts[video] && abs(diff)>WRAP_THRESHOLD)) {
106
 
107
-      LOGVERBOSE("New PTS: %"PRId64" (%s)", buf->pts, video ? "VIDEO" : "AUDIO");
108
+      LOGVERBOSE("New PTS: %" PRId64 " (%s)", buf->pts, video ? "VIDEO" : "AUDIO");
109
 
110
       if (this->buf_flag_seek) {
111
         _x_demux_control_newpts(this->stream, buf->pts, BUF_FLAG_SEEK);
112
diff -ruN vdr-xineliboutput.orig/xine/vo_lastpts.c vdr-xineliboutput/xine/vo_lastpts.c
113
--- vdr-xineliboutput.orig/xine/vo_lastpts.c	2012-05-11 09:37:27.000000000 +0200
114
+++ vdr-xineliboutput/xine/vo_lastpts.c	2021-08-30 10:55:43.802524000 +0200
115
@@ -83,7 +83,7 @@
116
     if (this->xvdr_metronom) {
117
       ASSERT_RET(this->xvdr_metronom->set_option, return);
118
 
119
-      LOGVERBOSE("last pts %"PRId64, vo_img->pts);
120
+      LOGVERBOSE("last pts %" PRId64, vo_img->pts);
121
 
122
       this->xvdr_metronom->set_option(this->xvdr_metronom, XVDR_METRONOM_LAST_VO_PTS, vo_img->pts);
123
     }
124
diff -ruN vdr-xineliboutput.orig/xine/xvdr_metronom.c vdr-xineliboutput/xine/xvdr_metronom.c
125
--- vdr-xineliboutput.orig/xine/xvdr_metronom.c	2012-05-11 09:37:27.000000000 +0200
126
+++ vdr-xineliboutput/xine/xvdr_metronom.c	2021-08-30 10:57:30.121628000 +0200
127
@@ -37,11 +37,11 @@
128
     int64_t dv = this->vid_pts - this->disc_pts;
129
     int64_t d_min = min64(da, dv);
130
     LOGMSG("  stream A-V diff %d ms", (int)(this->vid_pts - this->aud_pts)/90);
131
-    LOGMSG("  reported stream start at pts %"PRId64, this->disc_pts);
132
-    LOGMSG("  output fifo end at: audio %"PRId64" video %"PRId64, this->aud_pts, this->vid_pts);
133
-    LOGMSG("  dA %"PRId64" dV %"PRId64, da, dv);
134
+    LOGMSG("  reported stream start at pts %" PRId64, this->disc_pts);
135
+    LOGMSG("  output fifo end at: audio %" PRId64 " video %" PRId64, this->aud_pts, this->vid_pts);
136
+    LOGMSG("  dA %" PRId64 " dV %" PRId64, da, dv);
137
     if (d_min < 0 && d_min > -10*90000) {
138
-      LOGMSG("  *** output is late %"PRId64" ticks (%"PRId64" ms) ***", d_min, -d_min/90);
139
+      LOGMSG("  *** output is late %" PRId64 " ticks (%" PRId64 " ms) ***", d_min, -d_min/90);
140
       this->scr->jump(this->scr, d_min);
141
     }
142
     this->buffering = 0;
143
diff -ruN vdr-xineliboutput.orig/xine_input_vdr.c vdr-xineliboutput/xine_input_vdr.c
144
--- vdr-xineliboutput.orig/xine_input_vdr.c	2012-05-11 09:37:27.000000000 +0200
145
+++ vdr-xineliboutput/xine_input_vdr.c	2021-08-30 10:56:35.415173000 +0200
146
@@ -3963,7 +3963,7 @@
147
   }
148
 
149
   if (this->discard_index != this->curpos) {
150
-    LOGMSG("wait_stream_sync: discard_index %"PRIu64" != curpos %"PRIu64" ! (diff %"PRId64")",
151
+    LOGMSG("wait_stream_sync: discard_index %"PRIu64" != curpos %"PRIu64" ! (diff %" PRId64 ")",
152
            this->discard_index, this->curpos, (int64_t)(this->discard_index - this->curpos));
153
   }
154
 
155
@@ -3983,7 +3983,7 @@
156
     errno = EINTR;
157
   }
158
   else if (counter <= 0) {
159
-    LOGMSG("wait_stream_sync: Timed out ! diff %"PRId64,
160
+    LOGMSG("wait_stream_sync: Timed out ! diff %" PRId64,
161
            (int64_t)(this->discard_index - this->discard_index_ds));
162
     errno = EAGAIN;
163
   }
(-)vdr-plugin-xineliboutput/files/patch-configure (-5 / +23 lines)
Lines 1-6 Link Here
1
--- a/configure
1
diff -ruN b/configure a/configure
2
+++ a/configure
2
--- b/configure	2012-05-11 09:37:27.000000000 +0200
3
@@ -349,11 +349,14 @@ test_pkgconfig
3
+++ a/configure	2021-08-31 08:43:00.871579000 +0200
4
@@ -234,6 +234,7 @@
5
   xrender
6
   xshape
7
   opengl
8
+  glx
9
   pthread
10
   dlfcn
11
   vdpau
12
@@ -333,6 +334,7 @@
13
   disabled x11     && disable dbus-glib-1 xshm xrender xshape opengl xdpms xinerama vdpau
14
   disabled vdr     && disable libextractor libcap libbluray
15
   disabled dlfcn   && disable opengl
16
+  disabled glx     && disable opengl
17
   disabled pthread && disable opengl
18
   disabled xrender && disable xshape xshm
19
 }
20
@@ -349,11 +351,14 @@
4
 [ $debug = yes ] && \
21
 [ $debug = yes ] && \
5
   test_library   X11  do_error     "none.h"         "-lnolib"
22
   test_library   X11  do_error     "none.h"         "-lnolib"
6
 
23
 
Lines 20-26 Link Here
20
 
37
 
21
 if enabled libxine; then
38
 if enabled libxine; then
22
 
39
 
23
@@ -365,24 +368,40 @@ if enabled libxine; then
40
@@ -365,24 +370,41 @@
24
   fi
41
   fi
25
   log " $XINEPLUGINDIR"
42
   log " $XINEPLUGINDIR"
26
 
43
 
Lines 56-62 Link Here
56
+#    test_library X11  xinerama     "X11/extensions/Xinerama.h" "-lXinerama"  "XineramaQueryScreens(0,0)"
73
+#    test_library X11  xinerama     "X11/extensions/Xinerama.h" "-lXinerama"  "XineramaQueryScreens(0,0)"
57
+    test_library X11  xinerama     "X11/extensions/Xinerama.h" "-lXinerama"  "XineramaQueryScreens(0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
74
+    test_library X11  xinerama     "X11/extensions/Xinerama.h" "-lXinerama"  "XineramaQueryScreens(0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
58
+#    test_library X11  opengl       "GL/glx.h"                  "-lGL -lGLU"  "glXQueryVersion(0,0,0)"
75
+#    test_library X11  opengl       "GL/glx.h"                  "-lGL -lGLU"  "glXQueryVersion(0,0,0)"
59
+    test_library X11  opengl       "GL/glx.h"                  "-lGL -lGLU"  "glXQueryVersion(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
76
+    test_library X11  opengl       "GL/gl.h"                   "-lGL -LGLU"  "glTexCoord2f(0.0,0.0)"  "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
77
+    test_library X11  glx          "GL/glx.h"                  "-lGLX"       "glXQueryVersion(0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
60
+#    test_library none vdpau        "vdpau/vdpau_x11.h"         "-lvdpau"     "vdp_device_create_x11(0,0,0,0)"
78
+#    test_library none vdpau        "vdpau/vdpau_x11.h"         "-lvdpau"     "vdp_device_create_x11(0,0,0,0)"
61
+    test_library none vdpau        "vdpau/vdpau_x11.h"         "-lvdpau"     "vdp_device_create_x11(0,0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
79
+    test_library none vdpau        "vdpau/vdpau_x11.h"         "-lvdpau"     "vdp_device_create_x11(0,0,0,0)" "-I${LOCALBASE}/include -L${LOCALBASE}/lib"
62
+#    test_library X11  dbus-glib-1  \
80
+#    test_library X11  dbus-glib-1  \

Return to bug 256818