kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to recent upstream snapshot as of 2016-09-12

Browse source 
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
This commit is contained in:
Thomas Zander 2016-09-15 11:59:43 +00:00
parent 788f9a609c
commit ad1847f8ce
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=422188
6 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
multimedia/mencoder/Makefile
View file

@ -3,7 +3,6 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
PORTREVISION= 2
CATEGORIES= multimedia audio
MAINTAINER= riggs@FreeBSD.org

5
multimedia/mencoder/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (mplayer-1.3.0.20160508.tar.xz) = a7c09980636f27ad2b15186e753736719e99f30e674e6e2c04566f7245a8b627
SIZE (mplayer-1.3.0.20160508.tar.xz) = 12499244
TIMESTAMP = 1473848106
SHA256 (mplayer-1.3.0.20160912.tar.xz) = 8be40d3205c95dbea494ee6250e63a119ee04a785664301b0079e9e97e3c7ec8
SIZE (mplayer-1.3.0.20160912.tar.xz) = 12736924

2
multimedia/mplayer/Makefile
View file

@ -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

2
multimedia/mplayer/Makefile.common
View file

@ -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}

5
multimedia/mplayer/distinfo
View file

@ -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

23
multimedia/mplayer/files/patch-gui_wm_ws.c Normal file
View file

@ -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");