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

2021-12-01 Thread Sam James 
commit: 23139790af0807c7a92d0861e4601f02dd2ee808
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  1 15:59:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  1 16:25:43 2021 +
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:  gmail.com>
Signed-off-by: Sam James  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 ..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 \n;' pts_defl.c
+   sed -i '1s;^;#include \n;' pts_defl.c || die
 
# eautoreconf is still needed or you get bad warnings
eautoreconf

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

2019-11-18 Thread Aaron Bauman 
commit: 312c0ab25c0dad63411a4e2a6ca43d9477bc773a
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Nov 14 15:14:36 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Nov 18 22:16:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312c0ab2

media-gfx/sam2p: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13651
Signed-off-by: Aaron Bauman  gentoo.org>

 media-gfx/sam2p/files/sam2p-0.45-fbsd.patch   | 14 
 media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch | 18 --
 media-gfx/sam2p/files/sam2p-0.49.1-build.patch| 42 ---
 media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch| 39 -
 4 files changed, 113 deletions(-)

diff --git a/media-gfx/sam2p/files/sam2p-0.45-fbsd.patch 
b/media-gfx/sam2p/files/sam2p-0.45-fbsd.patch
deleted file mode 100644
index aed13acf08d..000
--- a/media-gfx/sam2p/files/sam2p-0.45-fbsd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
 gensio.cpp.origFri Feb  7 02:24:56 2003
-+++ gensio.cpp Fri Feb  7 02:25:11 2003
-@@ -491,11 +491,7 @@
- /* --- */
- 
- 
--#if HAVE_lstat_in_sys_stat
--#  define PTS_lstat lstat
--#else
- #  define PTS_lstat stat
--#endif
- 
- /** @param fname must start with '/' (dir separator)
-  * @return true if file successfully created

diff --git a/media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch 
b/media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch
deleted file mode 100644
index f96a9796939..000
--- a/media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/524048
-
-ignore warnings w/newer glibc-2.20
-
-patch by Dmitry Derevyanko
-
 a/ccdep.pl
-+++ b/ccdep.pl
-@@ -233,6 +233,9 @@
-   } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: this is the location of /) {
- # ^^^ gcc-3.1
- undef $included_from;
-+  } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: .*\bdeprecated\b/) {
-+# Example: /usr/include/features.h:148:3: warning: #warning "_BSD_SOURCE 
and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
-+undef $included_from;
-   } elsif ($S=~/: No such file or directory$/) {  # Depends on $ENV{LC_ALL}.
- # ^^^ gcc-3.3
- undef $included_from;

diff --git a/media-gfx/sam2p/files/sam2p-0.49.1-build.patch 
b/media-gfx/sam2p/files/sam2p-0.49.1-build.patch
deleted file mode 100644
index ba421463d53..000
--- a/media-gfx/sam2p/files/sam2p-0.49.1-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
 configure.in
-+++ configure.in
-@@ -81,7 +81,7 @@
- dnl Checks for programs.
- dnl AC_PROG_CC
- AC_LANG_CPLUSPLUS
--CXXFLAGS=" "
-+#CXXFLAGS=" "
- 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)
-@@ -215,7 +215,7 @@
- 
- dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot 
compute depends)])
- rm -f Makedep
--AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
-+AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
- AC_PTS_OK
- echo "configure done. Now you should run: make; make install"
- 
 Makefile
-+++ Makefile
-@@ -17,7 +17,7 @@
- export PERL_BADLANG
- 
- CXXX=$(CXD_assert)
--LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
-+LDALL=$(LDXX) $(LDFLAGS) $(LIBS)
- ifeq ($(ENABLE_DEBUG), no)
- CXXX=$(CXD_no)
- endif
-@@ -51,8 +51,8 @@
- IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
- IDE_TARGETS_release := $(TARGETS)
- 
--CXD_assert =$(CXX) -s -O2
--CXD_no =$(CXX) -s -DNDEBUG -O3
-+CXD_assert =$(CXX)
-+CXD_no =$(CXX) -DNDEBUG
- # CXD_yes=$(CXX) $(GFLAG) -lefence
- CXD_yes=$(CXX) $(GFLAG)
- CXD_checker=checkerg++ $(GFLAG)

diff --git a/media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch 
b/media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch
deleted file mode 100644
index d427c2076d3..000
--- a/media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: ccdep.pl
-===
 ccdep.pl   (revision 123)
-+++ ccdep.pl   (revision 125)
-@@ -137,13 +137,20 @@
- 
- my @DS=find_ds();
- my @DSQ=map{shq$_}@DS;
--my $R="$GCCP -DOBJDEP -M -MG -E 2>&1 @DSQ";
--$R=backtick($R);
-+my $DIAG=" -fno-diagnostics-show-caret";
-+my $Q="$GCCP -DOBJDEP$DIAG -M -MG -E 2>&1 @DSQ";
-+my $R=backtick($Q);
-+if ($R=~/\berror: .*-fno-diagnostics-show-caret\b/) {
-+  # gcc-4.6 and earlier don't have this flag, and they fail.
-+  $Q=~s@ -fno-diagnostics-show-caret(?=\s)@@;
-+  $DIAG="";
-+  $R=backtick($Q);
-+}
- 
- if ($R!~/: warning: #warning\b/) {
-   # config2.h:314:4: warning: #warning REQUIRES: c_lgcc3.o
-   # Dat: g++-3.3 ignores #warning with -M -MG -E
--  $R.="\n".backtick("$GCCP -DOBJDEP -E 2>&1 >/dev/null @DSQ");
-+  $R.="\n".backtick("$GCCP -DOBJDEP$DIAG -E 2>&1 >/dev/null @DSQ");
- }
- 
- ## die $R;
 rule.hpp   2013-04-18 12:14:20.385333527 +0200
-+++

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

2017-05-15 Thread Alexis Ballier 
commit: ffb4b769ec24ec1e0801375dadacffd557b6ce75
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon May 15 15:23:05 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon May 15 15:23:05 2017 +
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 000..cb24dbda1bd
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch
@@ -0,0 +1,23 @@
+commit 79a7de171f461a1c79089fa770f0da186e87c723
+Author: Peter Szabo 
+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"",; 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/

2017-01-04 Thread David Seifert 
commit: f75fc95b5672afeff3da21c6a46710b9aa1813a0
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Thu Dec 29 19:02:10 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jan  4 10:14:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75fc95b

media-gfx/sam2p: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/3276

 media-gfx/sam2p/files/sam2p-0.45-cflags.patch  | 37 --
 media-gfx/sam2p/files/sam2p-0.45-nostrip.patch | 13 -
 2 files changed, 50 deletions(-)

diff --git a/media-gfx/sam2p/files/sam2p-0.45-cflags.patch 
b/media-gfx/sam2p/files/sam2p-0.45-cflags.patch
deleted file mode 100644
index d6636d5..
--- a/media-gfx/sam2p/files/sam2p-0.45-cflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: sam2p-0.45/configure.in
-===
 sam2p-0.45.orig/configure.in
-+++ sam2p-0.45/configure.in
-@@ -81,7 +81,7 @@ fi
- dnl Checks for programs.
- dnl AC_PROG_CC
- AC_LANG_CPLUSPLUS
--CXXFLAGS=" "
-+#CXXFLAGS=" "
- 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)
-@@ -215,7 +215,7 @@ AC_OUTPUT(Makehelp)
- 
- dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot 
compute depends)])
- rm -f Makedep
--AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
-+AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
- AC_PTS_OK
- echo "configure done. Now you should run: make; make install"
- 
-Index: sam2p-0.45/Makefile
-===
 sam2p-0.45.orig/Makefile
-+++ sam2p-0.45/Makefile
-@@ -49,8 +49,8 @@ IDE_MODES := release debug
- IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
- IDE_TARGETS_release := $(TARGETS)
- 
--CXD_assert =$(CXX) -s -O2
--CXD_no =$(CXX) -s -DNDEBUG -O3
-+CXD_assert =$(CXX)
-+CXD_no =$(CXX) -DNDEBUG
- # CXD_yes=$(CXX) $(GFLAG) -lefence
- CXD_yes=$(CXX) $(GFLAG)
- CXD_checker=checkerg++ $(GFLAG)

diff --git a/media-gfx/sam2p/files/sam2p-0.45-nostrip.patch 
b/media-gfx/sam2p/files/sam2p-0.45-nostrip.patch
deleted file mode 100644
index d60a77c..
--- a/media-gfx/sam2p/files/sam2p-0.45-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sam2p-0.45/Makefile
-===
 sam2p-0.45.orig/Makefile
-+++ sam2p-0.45/Makefile
-@@ -17,7 +17,7 @@ PERL_BADLANG=x
- export PERL_BADLANG
- 
- CXXX=$(CXD_assert)
--LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
-+LDALL=$(LDXX) $(LDFLAGS) $(LIBS)
- ifeq ($(ENABLE_DEBUG), no)
- CXXX=$(CXD_no)
- endif