Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Feb 2019 17:57:37 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r493791 - in head/multimedia: mencoder mplayer
Message-ID:  <201902241757.x1OHvbKh039985@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Sun Feb 24 17:57:36 2019
New Revision: 493791
URL: https://svnweb.freebsd.org/changeset/ports/493791

Log:
  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@mailplus.pl, dim
  Reviewed by:	dim
  MFH:		2019Q1

Modified:
  head/multimedia/mencoder/Makefile
  head/multimedia/mplayer/Makefile
  head/multimedia/mplayer/Makefile.common
  head/multimedia/mplayer/Makefile.options

Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile	Sun Feb 24 17:56:56 2019	(r493790)
+++ head/multimedia/mencoder/Makefile	Sun Feb 24 17:57:36 2019	(r493791)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Sun Feb 24 17:56:56 2019	(r493790)
+++ head/multimedia/mplayer/Makefile	Sun Feb 24 17:57:36 2019	(r493791)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org

Modified: head/multimedia/mplayer/Makefile.common
==============================================================================
--- head/multimedia/mplayer/Makefile.common	Sun Feb 24 17:56:56 2019	(r493790)
+++ head/multimedia/mplayer/Makefile.common	Sun Feb 24 17:57:36 2019	(r493791)
@@ -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: head/multimedia/mplayer/Makefile.options
==============================================================================
--- head/multimedia/mplayer/Makefile.options	Sun Feb 24 17:56:56 2019	(r493790)
+++ head/multimedia/mplayer/Makefile.options	Sun Feb 24 17:57:36 2019	(r493791)
@@ -53,10 +53,6 @@ CFLAGS_armv7+=	-no-integrated-as
 
 LDFLAGS_i386+=	-Wl,-z,notext
 
-.if ${OSVERSION} >= 1300000 #Hopefully transient linker issue on head
-LLD_UNSAFE=	yes
-.endif
-
 # Extra build options for debugging
 # =================================
 



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