Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Jul 2018 13:16:07 +0000 (UTC)
From:      Wen Heping <wen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r475369 - in head/multimedia/vdr-plugin-xineliboutput: . files
Message-ID:  <201807261316.w6QDG7u0015316@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wen
Date: Thu Jul 26 13:16:06 2018
New Revision: 475369
URL: https://svnweb.freebsd.org/changeset/ports/475369

Log:
  - Fix build with clang6
  
  PR:		229573
  Submitted by:	shoesoft@gmx.net

Added:
  head/multimedia/vdr-plugin-xineliboutput/files/patch-frontend.c   (contents, props changed)
  head/multimedia/vdr-plugin-xineliboutput/files/patch-osd.c   (contents, props changed)
  head/multimedia/vdr-plugin-xineliboutput/files/patch-tools_sdp.h   (contents, props changed)
  head/multimedia/vdr-plugin-xineliboutput/files/patch-tools_udp__pes__scheduler.c   (contents, props changed)
  head/multimedia/vdr-plugin-xineliboutput/files/patch-xineliboutput.c   (contents, props changed)
Modified:
  head/multimedia/vdr-plugin-xineliboutput/Makefile
  head/multimedia/vdr-plugin-xineliboutput/distinfo

Modified: head/multimedia/vdr-plugin-xineliboutput/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-xineliboutput/Makefile	Thu Jul 26 13:04:25 2018	(r475368)
+++ head/multimedia/vdr-plugin-xineliboutput/Makefile	Thu Jul 26 13:16:06 2018	(r475369)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vdr-plugin-xineliboutput
 PORTVERSION=	1.0.90s20120511
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/xineliboutput/files/xineliboutput/vdr-xineliboutput-${PORTVERSION}/:release \
 		LOCAL/nox:snapshot

Modified: head/multimedia/vdr-plugin-xineliboutput/distinfo
==============================================================================
--- head/multimedia/vdr-plugin-xineliboutput/distinfo	Thu Jul 26 13:04:25 2018	(r475368)
+++ head/multimedia/vdr-plugin-xineliboutput/distinfo	Thu Jul 26 13:16:06 2018	(r475369)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1532570045
 SHA256 (vdr/vdr-plugin-xineliboutput-1.0.90s20120511.tar.bz2) = 87d6903cb66e29452c2e0c380dcbe7eed2c5414281a8ebf9be7f7e12b2dd611f
 SIZE (vdr/vdr-plugin-xineliboutput-1.0.90s20120511.tar.bz2) = 372415

Added: head/multimedia/vdr-plugin-xineliboutput/files/patch-frontend.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/vdr-plugin-xineliboutput/files/patch-frontend.c	Thu Jul 26 13:16:06 2018	(r475369)
@@ -0,0 +1,11 @@
+--- a/frontend.c.orig	2012-05-11 07:37:27 UTC
++++ b/frontend.c
+@@ -91,7 +91,7 @@ void cXinelibThread::KeypressHandler(con
+     if (!remote->Put(key, repeat, release)) {
+       if (!strcmp(keymap, "KBD")) {
+         uint64_t value = 0;
+-        sscanf(key, "%"PRIX64, &value);
++        sscanf(key, "%" 	PRIX64, &value);
+         if (value) {
+           remote->cRemote::Put(KBDKEY(value));
+           return;

Added: head/multimedia/vdr-plugin-xineliboutput/files/patch-osd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/vdr-plugin-xineliboutput/files/patch-osd.c	Thu Jul 26 13:16:06 2018	(r475369)
@@ -0,0 +1,11 @@
+--- a/osd.c.orig	2012-05-11 07:37:27 UTC
++++ b/osd.c
+@@ -567,7 +567,7 @@ void cXinelibOsd::Flush(void)
+       int NumColors;
+       const tColor *Colors = Bitmap->Colors(NumColors);
+       if (Colors) {
+-	osd_rect_t DirtyArea = {x1:x1, y1:y1, x2:x2, y2:y2};
++	osd_rect_t DirtyArea = {x1:(uint16_t)x1, y1:(uint16_t)y1, x2:(uint16_t)x2, y2:(uint16_t)y2};
+         CmdLut8(i,
+                 Left() + Bitmap->X0() + XOffset, Top() + Bitmap->Y0() + YOffset,
+                 Bitmap->Width(), Bitmap->Height(),

Added: head/multimedia/vdr-plugin-xineliboutput/files/patch-tools_sdp.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/vdr-plugin-xineliboutput/files/patch-tools_sdp.h	Thu Jul 26 13:16:06 2018	(r475369)
@@ -0,0 +1,11 @@
+--- a/tools/sdp.h.orig	2012-05-11 07:37:27 UTC
++++ b/tools/sdp.h
+@@ -54,7 +54,7 @@ static const char *vdr_sdp_description(c
+   s_data = cString::sprintf(
+            /*** session ***/
+            /* version    */        "v=0"
+-           /* origin     */ "\r\n" "o=%s %u %"PRIu64" IN IP4 %s"
++           /* origin     */ "\r\n" "o=%s %u %" PRIu64 " IN IP4 %s"
+            /* name       */ "\r\n" "s=%s@%s (multicast %s:%d)"
+            /* opt:info   */ /*"\r\n" "i=vdr-xineliboutput primary device output"*/
+            /* time       */ "\r\n" "t=0 0"

Added: head/multimedia/vdr-plugin-xineliboutput/files/patch-tools_udp__pes__scheduler.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/vdr-plugin-xineliboutput/files/patch-tools_udp__pes__scheduler.c	Thu Jul 26 13:16:06 2018	(r475369)
@@ -0,0 +1,11 @@
+--- a/tools/udp_pes_scheduler.c.orig	2012-05-11 07:37:27 UTC
++++ b/tools/udp_pes_scheduler.c
+@@ -674,7 +674,7 @@ void cUdpScheduler::Schedule(const uchar
+ 
+   if (DATA_IS_TS(Data)) {
+     if (ts_get_pcr_n(Data, Length/TS_SIZE, &pts)) {
+-      LOGSCR("UDP PCR: %"PRId64, pts);
++      LOGSCR("UDP PCR: %" PRId64, pts);
+       ScrSource = eScrFromPcr;
+       elapsed   = CalcElapsedVtime(pts, eScrFromPcr);
+     }

Added: head/multimedia/vdr-plugin-xineliboutput/files/patch-xineliboutput.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/vdr-plugin-xineliboutput/files/patch-xineliboutput.c	Thu Jul 26 13:16:06 2018	(r475369)
@@ -0,0 +1,11 @@
+--- a/xineliboutput.c.orig	2012-05-11 07:37:27 UTC
++++ b/xineliboutput.c
+@@ -104,7 +104,7 @@ const char cmdLineHelp[] =
+ "                           fbfe    (framebuffer)\n"
+ "                           none    (only remote frontends)\n"
+ "  -r PORT   --remote=PORT  Listen PORT for remote clients\n"
+-"                           (default "LISTEN_PORT_S")\n"
++"                           (default " LISTEN_PORT_S ")\n"
+ "                           none or 0 disables remote mode\n"
+ "                           Also local interface address can be specified:\n"
+ "                           --remote=<ip>:<port>  (default is all interfaces)\n"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807261316.w6QDG7u0015316>