Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1486993195208080"
MIME-Version: 1.0
Date: Mon, 13 Feb 2017 13:39:55 +0000
From: "Filip Hajny" <fhajny@netbsd.org>
Subject: CVS commit: pkgsrc/multimedia/x265
To: pkgsrc-changes@NetBSD.org
Reply-To: fhajny@netbsd.org
Message-Id: <20170213133955.A649DFBE3@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1486993195208080
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	fhajny
Date:		Mon Feb 13 13:39:55 UTC 2017

Modified Files:
	pkgsrc/multimedia/x265: distinfo
Added Files:
	pkgsrc/multimedia/x265/patches: patch-CMakeLists.txt

Log Message:
Add support for the Sun linker. Fixes joyent/pkgsrc/issues/455 on SunOS.
Based on jcea's pull request.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/multimedia/x265/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1486993195208080
Content-Disposition: inline
Content-Length: 2210
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/multimedia/x265/distinfo
diff -u pkgsrc/multimedia/x265/distinfo:1.15 pkgsrc/multimedia/x265/distinfo:1.16
--- pkgsrc/multimedia/x265/distinfo:1.15	Sun Jan  1 16:31:44 2017
+++ pkgsrc/multimedia/x265/distinfo	Mon Feb 13 13:39:55 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.15 2017/01/01 16:31:44 adam Exp $
+$NetBSD: distinfo,v 1.16 2017/02/13 13:39:55 fhajny Exp $
 
 SHA1 (x265_2.2.tar.gz) = 709ddcf639b414c65867683419de82bc34b587ca
 RMD160 (x265_2.2.tar.gz) = 5bc6e69601752f9ef7a8b80989f48767dfecab10
 SHA512 (x265_2.2.tar.gz) = 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef
 Size (x265_2.2.tar.gz) = 1203801 bytes
+SHA1 (patch-CMakeLists.txt) = fbf4d08133a48b342a060f1b45bab0253455a1b1

Added files:

Index: pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.1
--- /dev/null	Mon Feb 13 13:39:55 2017
+++ pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt	Mon Feb 13 13:39:55 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2017/02/13 13:39:55 fhajny Exp $
+
+Solaris ld: Provided assembler is not PIC, so we pass "-mimpure-text"
+            to the compiler so it doesn't send "-ztext" to ld.
+
+Solaris ld: Passing "-Wa,--noexecstack" to gcc will generate an ELF section
+            requesting a non executable stack. I don't know if Solaris ld
+            is complying or just ignoring it.
+
+--- CMakeLists.txt.OLD	2017-01-27 02:42:21.295232904 +0000
++++ CMakeLists.txt	2017-01-27 02:51:32.144600352 +0000
+@@ -523,7 +523,11 @@
+         elseif(CYGWIN)
+             # Cygwin is not officially supported or tested. MinGW with msys is recommended.
+         else()
+-            list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack")
++            if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
++                list(APPEND LINKER_OPTIONS "-mimpure-text -Wa,--noexecstack")
++            else()
++                list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack")
++            endif()
+         endif()
+     endif()
+     set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD})


--_----------=_1486993195208080--