svn commit: r493792 - in branches/2019Q1/multimedia: mencoder mplayer

[Thomas Zander]

Author: riggs
Date: Sun Feb 24 18:02:16 2019
New Revision: 493792
URL: https://svnweb.freebsd.org/changeset/ports/493792

Log:
  MFH: r493791
  
  Fix linking error with lld 7
  
  Details:
  - The linker script in mplayer's WRKSRC causes linking problems when
    used with lld 7. Remove it during post-patch
  
  PR:		235957, 220103
  Reported by:	jakub_lach at mailplus.pl, dim
  Reviewed by:	dim
  
  Approved by:	ports-secteam (riggs)

Modified:
  branches/2019Q1/multimedia/mencoder/Makefile
  branches/2019Q1/multimedia/mplayer/Makefile
  branches/2019Q1/multimedia/mplayer/Makefile.common
  branches/2019Q1/multimedia/mplayer/Makefile.options
Directory Properties:
  branches/2019Q1/   (props changed)

Modified: branches/2019Q1/multimedia/mencoder/Makefile
==============================================================================
--- branches/2019Q1/multimedia/mencoder/Makefile	Sun Feb 24 17:57:36 2019	(r493791)
+++ branches/2019Q1/multimedia/mencoder/Makefile	Sun Feb 24 18:02:16 2019	(r493792)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
+PORTREVISION=	3
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs at FreeBSD.org

Modified: branches/2019Q1/multimedia/mplayer/Makefile
==============================================================================
--- branches/2019Q1/multimedia/mplayer/Makefile	Sun Feb 24 17:57:36 2019	(r493791)
+++ branches/2019Q1/multimedia/mplayer/Makefile	Sun Feb 24 18:02:16 2019	(r493792)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
+PORTREVISION=	3
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs at FreeBSD.org

Modified: branches/2019Q1/multimedia/mplayer/Makefile.common
==============================================================================
--- branches/2019Q1/multimedia/mplayer/Makefile.common	Sun Feb 24 17:57:36 2019	(r493791)
+++ branches/2019Q1/multimedia/mplayer/Makefile.common	Sun Feb 24 18:02:16 2019	(r493792)
@@ -72,3 +72,4 @@ common-post-patch:
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
+	@${RM} ${WRKSRC}/binary.ver

Modified: branches/2019Q1/multimedia/mplayer/Makefile.options
==============================================================================
--- branches/2019Q1/multimedia/mplayer/Makefile.options	Sun Feb 24 17:57:36 2019	(r493791)
+++ branches/2019Q1/multimedia/mplayer/Makefile.options	Sun Feb 24 18:02:16 2019	(r493792)
@@ -51,6 +51,8 @@ CFLAGS_i386+=	-mstack-alignment=16 -mstackrealign
 CFLAGS_armv6+=	-no-integrated-as
 CFLAGS_armv7+=	-no-integrated-as
 
+LDFLAGS_i386+=	-Wl,-z,notext
+
 # Extra build options for debugging
 # =================================