diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2016-09-15 11:59:43 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2016-09-15 11:59:43 +0000 |
| commit | ad1847f8ce2a613adb0f6b03e33bf4194401f963 (patch) | |
| tree | 0f03a6936acfe651c5788e3c64a626c9054d0f17 /multimedia/mplayer | |
| parent | lang/ypsilon: Update sources and fix builds (diff) | |
Update to recent upstream snapshot as of 2016-09-12
While on it:
- Add missing USE_XORG=xext for X11 OPTION
- Import patch by bar@ to deal with certain other ports
e.g. x11/slim
Notes
Notes:
svn path=/head/; revision=422188
Diffstat (limited to 'multimedia/mplayer')
| -rw-r--r-- | multimedia/mplayer/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile.common | 2 | ||||
| -rw-r--r-- | multimedia/mplayer/distinfo | 5 | ||||
| -rw-r--r-- | multimedia/mplayer/files/patch-gui_wm_ws.c | 23 |
4 files changed, 28 insertions, 4 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 7018cfaf2dbd..ed8bbd07b194 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -78,7 +78,7 @@ PLIST_SUB+= GMPLAYER="@comment " .endif #GUI && X11 .if ${PORT_OPTIONS:MX11} -USE_XORG= x11 xproto xscrnsaver +USE_XORG= x11 xext xproto xscrnsaver .if ${PORT_OPTIONS:MXVIDEO} USE_XORG+= xv .else diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common index 3ef13d60bd7c..03487b91cfa9 100644 --- a/multimedia/mplayer/Makefile.common +++ b/multimedia/mplayer/Makefile.common @@ -5,7 +5,7 @@ # $FreeBSD$ MPLAYER_PORT_VERSION= 1.3.0 -MPLAYER_SNAPSHOT_DATE= 2016-05-08 +MPLAYER_SNAPSHOT_DATE= 2016-09-12 MASTER_SITES= LOCAL/riggs/mplayer DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo index 97c62e803f1a..b9cc8641e4ec 100644 --- a/multimedia/mplayer/distinfo +++ b/multimedia/mplayer/distinfo @@ -1,2 +1,3 @@ -SHA256 (mplayer-1.3.0.20160508.tar.xz) = a7c09980636f27ad2b15186e753736719e99f30e674e6e2c04566f7245a8b627 -SIZE (mplayer-1.3.0.20160508.tar.xz) = 12499244 +TIMESTAMP = 1473836368 +SHA256 (mplayer-1.3.0.20160912.tar.xz) = 8be40d3205c95dbea494ee6250e63a119ee04a785664301b0079e9e97e3c7ec8 +SIZE (mplayer-1.3.0.20160912.tar.xz) = 12736924 diff --git a/multimedia/mplayer/files/patch-gui_wm_ws.c b/multimedia/mplayer/files/patch-gui_wm_ws.c new file mode 100644 index 000000000000..7a4b1e2d60c4 --- /dev/null +++ b/multimedia/mplayer/files/patch-gui_wm_ws.c @@ -0,0 +1,23 @@ +--- gui/wm/ws.c.orig 2015-11-18 16:16:39 UTC ++++ gui/wm/ws.c +@@ -193,8 +193,18 @@ void wsInit(Display *display) + int localdisp = 1; + + if (dispname && *dispname != ':') { +- localdisp = 0; +- wsUseXShm = False; ++ // check [Bug 206050] x11/slim: force use unix sockets ++ //localdisp = 0; ++ //wsUseXShm = False; ++ const char *udspfx = "unix:"; ++ size_t strsz = strlen(udspfx); ++ char substr[strsz]; ++ strncpy(substr, dispname, strsz); ++ substr[strsz] = '\0'; ++ if(strcmp(substr, udspfx) != 0) { ++ localdisp = 0; ++ wsUseXShm = False; ++ } + } + + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] display name: %s => %s display.\n", dispname, localdisp ? "local" : "REMOTE"); |