From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- media-sound/splay/Manifest | 4 +- .../files/splay-0.9.5.2-fix-buildsystem.patch | 85 ++++++++++++---------- media-sound/splay/splay-0.9.5.2-r2.ebuild | 15 ++-- 3 files changed, 54 insertions(+), 50 deletions(-) (limited to 'media-sound/splay') diff --git a/media-sound/splay/Manifest b/media-sound/splay/Manifest index ab1c94820287..2f8268854548 100644 --- a/media-sound/splay/Manifest +++ b/media-sound/splay/Manifest @@ -1,7 +1,7 @@ AUX splay-0.9.5.2-external-id3lib.diff 583 BLAKE2B bea1a5079d03b0fd602fcbe86e1a731fe3492c9fb7bd29836cc04d32065a2d648cedf590f64817e78a040212312d859c4e7b8aae6dbcb33ed1f0c5898867a9ce SHA512 fe5db7a4a624c15dbcfff3c1b6087b33970ae09ecdc6f83348eb6da7cd3ead5df71fac6cbabe6f5b1d3389696676da390982216f53acf9450511bfd9dbfa097e -AUX splay-0.9.5.2-fix-buildsystem.patch 6083 BLAKE2B f30ea37cbeff163df61d0b2a7930150812975ee981f0d7c310c6aaf4e09d91776188535a9b47dc7c7cfcc55a4b2a7b3b8f7f68705f0398bfc18203a35bd5c71a SHA512 135ff607f47322fc13d8d94277f24e4d844e04c9557e689e93d3bec80cb5806f631ebcb07f6b19be7724946592005359f558f0971fe62c5c3225f5c9cd274b95 +AUX splay-0.9.5.2-fix-buildsystem.patch 5907 BLAKE2B 5f352ac545968c53d27c5719de5ab431bbfddf213e5a8a75eb85a9d9893bb82e2a51ed996869fdfad33d3aa3f0070ede738b4ab1f02f2ccfbe61faa9a49fc692 SHA512 ad06d2368ad657717a5d54d69bdeaf8deb0f467b8f983fa46cfef265ffd05ca083888be5a606581532624c8a7ba69b1018dc98a6a434b33b16198e035c5c0fbf AUX splay-0.9.5.2-fix-c++14.patch 953 BLAKE2B 74f464a8a222bbdcc7d414046f998e490e3a81565ce4d0125fe2fb39bc90e4b33b51e8cfb1920f502ffc628f578d47c40621516988b3adfa566e523d9c8251e6 SHA512 150c4dbbb9f2f7dded871d245daffb25c4b3e67f6fe0db09a1f7c893dc2ef8a96eed70aefb32c4418aa83264b82d8a8504c29cb5561e0287fd448a0d398c360b AUX splay-0.9.5.2-gcc43-2.patch 1838 BLAKE2B bd43ad5a0733aae6a76e78f1c2a9ea752205e1767929505bcee8d831559e703888cc50e766387d90bdd3ed9a7516ffbbaf82afbb79392b830ec5cf9c1ea964f5 SHA512 41da577fd4fc7e28d99fd7dc4b340e5555cddef8965e05a2b166a776867a7ec610befe7e7231cd91fb695e438b6c9ba01b688e1030a0fe48d0636c72b6380cf2 DIST splay-0.9.5.2.tar.gz 105510 BLAKE2B fd25a4acb842ecfead7200532e12185da2d1b60bfb099c6339234df7a0ca6cbc2083b12ac32bdd4878744b9de1972196ef19b201b9a7c171b09512ef54639987 SHA512 cab1fa2c753c0d7be58b29328db6c444872969b33b24191409efcf782201716d10b14109f23b2f2368909aa60a8a517ec894aeeb649ee0ac5811413a8ebeae09 -EBUILD splay-0.9.5.2-r2.ebuild 634 BLAKE2B b270e83b1e1c554d78f0cd7c47b175b0e26e17aa155e09d9cb3ffb89bd743866e1fec30f0f150d922c42e1756a99986313faaeb6f731110f48c9f40a37d4197d SHA512 6872f4e3c72b6af615a46b5888baf646749060811c85ad32ac6fadf2b4b305b7d77f77ef8f0d76720f08912eb79d2a82c2204ef64baf9d3d4b64c4931c3bf405 +EBUILD splay-0.9.5.2-r2.ebuild 623 BLAKE2B 3863475c6e86c525bfd209ce5a7984a1552df39b138904f1854e2d3b630914bbfff79004085fa7959939262e531e3e57b31f3420a7501d6ccf0f6cb08ef88bc1 SHA512 3d375ebc74b13ab734e014089180abded936a9996867dd354bb76e33b5a16b4d721b1d47f877b73a08749d699d4e3af6e4535dd5dc88464e04108cd699b7cd8f MISC metadata.xml 328 BLAKE2B d0e57e006d2048a4ebf4eb9a8912f6a46169db378a9c7ba6e91dddee6d22f768ffa246ce228a15460a08a71cbd1f43e27172dbf624c0aae45af123f19699d0c6 SHA512 90224a6fed46fe48538837e0c6252b1b15f33231b9f639f6ab62e1104ebee98a540a831980920820bb4f00cb0bb5db02fddbb28c51ba68bd83613adf5782243a diff --git a/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch index 52cea88b89ed..07d6f2d3751c 100644 --- a/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch +++ b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch @@ -2,8 +2,19 @@ * Fix ancient C++ includes using '.h' suffixes * Fix warnings caused by not using 'const char*' ---- splay-0.9.5.2/apps/Makefile.am -+++ splay-0.9.5.2/apps/Makefile.am +--- a/apps/common.cc ++++ b/apps/common.cc +@@ -34,7 +34,7 @@ + int splay_threadnum=50; + #endif + +-char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]= ++const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]= + { "Failed to open sound device.", + "Sound device is busy.", + "Buffersize of sound device is wrong.", +--- a/apps/Makefile.am ++++ b/apps/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = splay @XSPLAY@ +bin_PROGRAMS = splay @@ -19,30 +30,8 @@ EXTRA_DIST = $(man_MANS) ---- splay-0.9.5.2/configure.ac -+++ splay-0.9.5.2/configure.ac -@@ -15,7 +15,7 @@ - AC_CHECK_LIB(id3, ID3Tag_New) - AC_CHECK_LIB(m, cos) - AC_CHECK_LIB(pthread,main,INCLUDEPTHREAD=1) --AC_CHECK_LIB(qt, main,XSPLAY=xsplay) -+ - - if test "$INCLUDEPTHREAD" = 1; then - LIBS="$LIBS -lpthread" ---- splay-0.9.5.2/apps/common.cc -+++ splay-0.9.5.2/apps/common.cc -@@ -34,7 +34,7 @@ - int splay_threadnum=50; - #endif - --char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]= -+const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]= - { "Failed to open sound device.", - "Sound device is busy.", - "Buffersize of sound device is wrong.", ---- splay-0.9.5.2/apps/splay.cc -+++ splay-0.9.5.2/apps/splay.cc +--- a/apps/splay.cc ++++ b/apps/splay.cc @@ -16,20 +16,23 @@ #include @@ -70,8 +59,8 @@ "\t-2 : playing with half frequency.\n" "\t-e : exit when playing is done. (only XSPLAY)\n" "\t-f : display frame and time info (played and remaining).\n" ---- splay-0.9.5.2/apps/splay.h -+++ splay-0.9.5.2/apps/splay.h +--- a/apps/splay.h ++++ b/apps/splay.h @@ -20,7 +20,7 @@ splay_forcetomonoflag, splay_frameinfo; @@ -81,8 +70,8 @@ #ifdef PTHREADEDMPEG extern int splay_threadnum; ---- splay-0.9.5.2/apps/xsplay.cc -+++ splay-0.9.5.2/apps/xsplay.cc +--- a/apps/xsplay.cc ++++ b/apps/xsplay.cc @@ -29,8 +29,8 @@ #include #include @@ -94,8 +83,24 @@ #include "mpegsound.h" #include "xsplay.h" ---- splay-0.9.5.2/libs/fileplayer.cc -+++ splay-0.9.5.2/libs/fileplayer.cc +--- a/configure.in ++++ b/configure.in +@@ -10,12 +10,12 @@ + AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_RANLIB ++AM_PROG_AR + + dnl Checks for libraries. + AC_CHECK_LIB(id3, ID3Tag_New) + AC_CHECK_LIB(m, cos) + AC_CHECK_LIB(pthread,main,INCLUDEPTHREAD=1) +-AC_CHECK_LIB(qt, main,XSPLAY=xsplay) + + if test "$INCLUDEPTHREAD" = 1; then + LIBS="$LIBS -lpthread" +--- a/libs/fileplayer.cc ++++ b/libs/fileplayer.cc @@ -10,7 +10,7 @@ #endif @@ -134,8 +139,8 @@ fprintf(stderr,"\tMPEG-%d Layer %d, %s,\n\t%dHz%s, %dkbit/s, ", server->getversion()+1, ---- splay-0.9.5.2/libs/mpegsound.h -+++ splay-0.9.5.2/libs/mpegsound.h +--- a/libs/mpegsound.h ++++ b/libs/mpegsound.h @@ -230,7 +230,7 @@ Soundplayer() {__errorcode=SOUND_ERROR_OK;}; virtual ~Soundplayer(); @@ -190,8 +195,8 @@ void setforcetomono(bool flag); void setdownfrequency(int value); bool playing(int verbose, bool frameinfo, int startframe); ---- splay-0.9.5.2/libs/mpegtoraw.cc -+++ splay-0.9.5.2/libs/mpegtoraw.cc +--- a/libs/mpegtoraw.cc ++++ b/libs/mpegtoraw.cc @@ -552,7 +552,7 @@ #endif @@ -201,8 +206,8 @@ // Convert mpeg to raw bool Mpegtoraw::run(int frames) { ---- splay-0.9.5.2/libs/rawplayer.cc -+++ splay-0.9.5.2/libs/rawplayer.cc +--- a/libs/rawplayer.cc ++++ b/libs/rawplayer.cc @@ -24,7 +24,7 @@ #define IOCTL(a,b,c) (c = ioctl(a,b,c) ) #endif @@ -230,8 +235,8 @@ return true; } ---- splay-0.9.5.2/libs/rawtofile.cc -+++ splay-0.9.5.2/libs/rawtofile.cc +--- a/libs/rawtofile.cc ++++ b/libs/rawtofile.cc @@ -20,7 +20,7 @@ close(filehandle); } diff --git a/media-sound/splay/splay-0.9.5.2-r2.ebuild b/media-sound/splay/splay-0.9.5.2-r2.ebuild index 2878aaf04bc3..b66657bceebf 100644 --- a/media-sound/splay/splay-0.9.5.2-r2.ebuild +++ b/media-sound/splay/splay-0.9.5.2-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -12,20 +12,19 @@ SRC_URI="http://splay.sourceforge.net/tgz/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" DEPEND="media-libs/id3lib" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${P}-external-id3lib.diff" - "${FILESDIR}/${P}-gcc43-2.patch" - "${FILESDIR}/${P}-fix-buildsystem.patch" - "${FILESDIR}/${P}-fix-c++14.patch" + "${FILESDIR}"/${P}-external-id3lib.diff + "${FILESDIR}"/${P}-gcc43-2.patch + "${FILESDIR}"/${P}-fix-buildsystem.patch + "${FILESDIR}"/${P}-fix-c++14.patch ) src_prepare() { - mv configure.{in,ac} || die default + mv configure.{in,ac} || die eautoreconf } -- cgit v1.2.3