[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/files/, media-gfx/sam2p/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/files/, media-gfx/sam2p/

[Alexis Ballier]

commit:     ffb4b769ec24ec1e0801375dadacffd557b6ce75
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 15:23:05 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon May 15 15:23:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb4b769

media-gfx/sam2p: Import upstream fix to build with perl 5.26, bug #617014

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch | 23 +++++++++++++++++++++++
 media-gfx/sam2p/sam2p-0.49.3.ebuild              |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch b/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch
new file mode 100644
index 00000000000..cb24dbda1bd
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch
@@ -0,0 +1,23 @@
+commit 79a7de171f461a1c79089fa770f0da186e87c723
+Author: Peter Szabo <pts@fazekas.hu>
+Date:   Sun Apr 30 04:00:23 2017 +0200
+
+    fixed Perl 5.26 compatibility for perl -x (https://github.com/pts/sam2p/issues/2)
+
+diff --git a/Makefile b/Makefile
+index 849b09d..1791a9c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -71,10 +71,10 @@ sam2p_version.h: debian/changelog
+ sam2p_main.o: sam2p_version.h
+ 
+ xpmc.h: cols2.pl
+-	perl -x cols2.pl >xpmc.h
++	perl -x ./cols2.pl >xpmc.h
+ 
+ #HQ=perl -e'$$_=join"",<STDIN>; s@([^\w\.\/\-])@sprintf"\\%03o",ord$$1@ge; print "\"$$_\"\n"'
+-HQ=perl -x hq.pl
++HQ=perl -x ./hq.pl
+ #%.tth: %.tte
+ #	<$< >$@	$(HQ)
+ #%.tth: %.ttm

diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index 446f3a38cd3..d27c1270348 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DEPEND="dev-lang/perl"
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch )
+PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch "${FILESDIR}/${P}-perl526.patch" )
 
 src_prepare() {
 	default

[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/files/, media-gfx/sam2p/

[Sam James]

commit:     23139790af0807c7a92d0861e4601f02dd2ee808
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  1 15:59:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 16:25:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23139790

media-gfx/sam2p: fix configure with clang

Closes: https://bugs.gentoo.org/827925
Thanks-to: <nvinson234 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../sam2p-0.49.4_p20190718-fix-configure-clang.patch      | 15 +++++++++++++++
 media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild          |  7 +++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/media-gfx/sam2p/files/sam2p-0.49.4_p20190718-fix-configure-clang.patch b/media-gfx/sam2p/files/sam2p-0.49.4_p20190718-fix-configure-clang.patch
new file mode 100644
index 000000000000..0d8e769e903d
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.49.4_p20190718-fix-configure-clang.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/827925
+--- a/configure.in
++++ b/configure.in
+@@ -79,11 +79,11 @@ else
+ fi
+
+ dnl Checks for programs.
+ dnl AC_PROG_CC
+ AC_LANG_CPLUSPLUS
+-CXXFLAGS=" "
++CXXFLAGS="-fPIC"
+ dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
+ CCC="$CCC g++"
+ dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX)
+ AC_PROG_CXX

diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index 43f217aba10d..3adddb11fdbc 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -21,7 +21,10 @@ BDEPEND="dev-lang/perl"
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
-PATCHES=( "${FILESDIR}"/${PN}-build-fixes.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-build-fixes.patch
+	"${FILESDIR}"/${PN}-0.49.4_p20190718-fix-configure-clang.patch
+)
 
 src_prepare() {
 	default
@@ -30,7 +33,7 @@ src_prepare() {
 	mv configure.{in,ac} || die
 
 	# missing include for memset
-	sed -i '1s;^;#include <string.h>\n;' pts_defl.c
+	sed -i '1s;^;#include <string.h>\n;' pts_defl.c || die
 
 	# eautoreconf is still needed or you get bad warnings
 	eautoreconf