From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- media-libs/libprojectm/Manifest | 3 +- .../files/libprojectm-3.1.3-bashisms.patch | 47 ++++++++++++++++++++++ media-libs/libprojectm/libprojectm-3.1.3.ebuild | 4 ++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch (limited to 'media-libs/libprojectm') diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest index aa47f45759ac..258d9d92c1df 100644 --- a/media-libs/libprojectm/Manifest +++ b/media-libs/libprojectm/Manifest @@ -1,6 +1,7 @@ AUX libprojectm-2.1.0-fix-c++14.patch 1505 BLAKE2B 102d3e8aa719fa42e92e81c5dd4fa0f7395672bd0b94fe83ac35d1961acc58f3aba0529d49c5579e8ad4c3661268dd7bdacdd1f5445d1d08cd894daca65b4156 SHA512 071070f2f8c890cccdba09bbe9cb1a68451ebdf30ae339263e322afbaccf974be41a0eabeab12e1432382bc94bff4df46a4f1e2c227c3de77577f5a8776aa3c6 AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd04699938f08bfe2b9dbebe95f19abcd1e16c4f7f9619c44639586611f3c7b69784af92d2fbff02ab301503ca626ff9da0d7c0 SHA512 562e9616500a49b52e29d50d7c40b8db2b8eb36dbcf28c2b415975b0ce751d21d8ecc06747c3c810303078a2e83ee1c6ed438818d936ddd86efe94900d1a348d AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3 +AUX libprojectm-3.1.3-bashisms.patch 1741 BLAKE2B 16cf0a172fd79ed442313ce27761540d71f2d45e611aea80f29a8638b5c6fe1dc0b04ca8322fbfba3b7f2d60b9d220b6d5ba7367ef60094d483f6a922ddcf336 SHA512 e5600dd34d48d476331b897c87f6c1c88cf5fe3ded8140bc225b95783795f57433d1e44efb61cc5c38dbb57927c9a309090296f09e00a3a2775f17059657eb89 DIST libprojectm-3.1.1_rc8.tar.gz 54503673 BLAKE2B f7d781c6a0e54414d0a9ba5ab601556384e6af9b6a23a3123d3f3e0b1613549727b75901681beba1cd3fdd4193415d9e0bb927c4f7b69c41f4e4e85adb5f8597 SHA512 dcf2e7a0a826438bee538f052287b2057a303f5c29e77804874c9d5ea9f3cc0395a51f7734eec027a4f4e687c7b9f818bf908084c8b9da0953cd95d7fa12c864 DIST libprojectm-3.1.2.tar.gz 54503159 BLAKE2B 5b520a6c1553e80de3fc8b0aedff12c50226252ae7a6d651dff910104244e2f0747fc43791b0524f46f8fa305688749fc4f508b76d04506aa17292f2c8789d1c SHA512 c7c8e61b6262324a7d4094f92796732f7c7bf9fdd82df3dc327efe82fd1d3d8277763059ba72e3fea70875952dd763998cd3b69ed64f594fbff8ae489110dfa2 DIST libprojectm-3.1.3.tar.gz 54503797 BLAKE2B 2aa8900887201f00f85cbd2e4eb908d5825b95364a2df39cecd9ccdd63e677766bc45fc5280b4b773632b920b3331127be159d9e5e29304c3df4f049e49021c3 SHA512 c9910ec9dd3e6625df885a23cb72616723142974ee80cc40d108992e997342f7b8962c63d5a0512b793f425c7abb0477dbd5d641a70161d8e42f1489e08f402b @@ -8,6 +9,6 @@ DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b96 EBUILD libprojectm-2.1.0-r2.ebuild 1469 BLAKE2B 61fc28b30b33e2efa6ee6cad2ba6da19193b1cff80ea981348cb4481cdf7eb6c783492d82ff0d99bce6891914cd71ff6f3c9513a3164bef454f7f45d7dcc3811 SHA512 b05e16995fe77d7ccedbeba67aee38dbae64c2a5f6effdb8f7d67b2bcc353393f2aeea6227e4c8df8753be84ec2b3d301595184a40b008dbe68461922b9f27a3 EBUILD libprojectm-3.1.1_rc8-r1.ebuild 1211 BLAKE2B b32f57d7dcce5a3c32dd0cd4a6277bd427159b06ba8cd1068049856c97e8337a5d351e98486e1648931224b784c87bf6d06a3b5bece4a0916cb3b004014364b4 SHA512 8952925a4c9573f7b97b44a10b91c42872a7f5d9c2fc3a7f36bf4a8f9ed7cf80aaea453f88918e9f5c98471aa2f00e72b729ddbe1470478c94ca7b0897a14ca4 EBUILD libprojectm-3.1.2.ebuild 1352 BLAKE2B 6edbdf10a3721fbd4a9aea76f4c7f5400ef0c422e26c61cbceae4c0f47930f9dd72f220932a569b54b251b1b059ca8c278e490d0fa3cee0f838ffd48c0ee6ef6 SHA512 321d2cfb92e76976aac1a5c96e7df2c9712f58a56017e06f218fbff44eddf4d531a6cbf3405f98966bbb2a663d081f52bdc52706f87058644aad94c1cada5504 -EBUILD libprojectm-3.1.3.ebuild 1352 BLAKE2B 6edbdf10a3721fbd4a9aea76f4c7f5400ef0c422e26c61cbceae4c0f47930f9dd72f220932a569b54b251b1b059ca8c278e490d0fa3cee0f838ffd48c0ee6ef6 SHA512 321d2cfb92e76976aac1a5c96e7df2c9712f58a56017e06f218fbff44eddf4d531a6cbf3405f98966bbb2a663d081f52bdc52706f87058644aad94c1cada5504 +EBUILD libprojectm-3.1.3.ebuild 1400 BLAKE2B a1d8c7b7f9dc0a0c4e65ab3e31b1dff97f769d343e6f4074b24632bba4568f42e60f76ef11b77d5d93ef30b0c602cf83f9044f5cab8bba83f412c38c2e943277 SHA512 8dcec3005bd5f5f2f8b357afbc4da25a3e374b12b964019531b58ff2bcd96ded871a7fe8c69c97d7b0337a05536947b49890fd1d6df34bdc522d4553ccffc3d1 EBUILD libprojectm-9999.ebuild 1352 BLAKE2B 6edbdf10a3721fbd4a9aea76f4c7f5400ef0c422e26c61cbceae4c0f47930f9dd72f220932a569b54b251b1b059ca8c278e490d0fa3cee0f838ffd48c0ee6ef6 SHA512 321d2cfb92e76976aac1a5c96e7df2c9712f58a56017e06f218fbff44eddf4d531a6cbf3405f98966bbb2a663d081f52bdc52706f87058644aad94c1cada5504 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0 diff --git a/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch b/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch new file mode 100644 index 000000000000..8d84ece802cb --- /dev/null +++ b/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch @@ -0,0 +1,47 @@ +From 8a522d975890a4512be0f04285f356c6db653a57 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Thu, 14 May 2020 11:46:50 +0200 +Subject: [PATCH] configure.ac: Avoid bashisms + +or else we end up like this: + + ./configure: 18902: ./configure: Syntax error: redirection unexpected + +or + + ./configure: 20152: ./configure: my_CFLAGS+=-DDATADIR_PATH=\""$(pkgdatadir)"\" : not found + ./configure: 20153: ./configure: my_CFLAGS+=-I$(top_srcdir)/vendor : not found + +Gentoo-bug: https://bugs.gentoo.org/714098 +Signed-off-by: Lars Wendler +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5fa53eca5..ecf85e076 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -163,7 +163,7 @@ AC_PREFIX_DEFAULT([/usr/local]) + + AC_PROG_MKDIR_P + +-AS_IF([grep android <<< ${host}], [], ++AS_IF([echo ${host} | grep -Fq android], [], + [AX_CHECK_COMPILE_FLAG([-stdlib=libc++], [ + CXXFLAGS="$CXXFLAGS -stdlib=libc++"]) + ]) +@@ -237,10 +237,10 @@ AM_CONDITIONAL([ENABLE_EMSCRIPTEN], [test "x$enable_emscripten" = "xyes"]) + AM_CONDITIONAL([ENABLE_PRESET_SUBDIRS], [test "x$enable_preset_subdirs" = "xyes"]) + + +-my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits " ++my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits" + #my_CFLAGS+="-fsanitize=address -fno-omit-frame-pointer " +-my_CFLAGS+='-DDATADIR_PATH=\""$(pkgdatadir)"\" ' +-my_CFLAGS+='-I$(top_srcdir)/vendor ' ++my_CFLAGS="${my_CFLAGS} -DDATADIR_PATH=\\\"\"\$(pkgdatadir)\\\"\"" ++my_CFLAGS="${my_CFLAGS} -I\$(top_srcdir)/vendor" + AC_SUBST([my_CFLAGS]) + + diff --git a/media-libs/libprojectm/libprojectm-3.1.3.ebuild b/media-libs/libprojectm/libprojectm-3.1.3.ebuild index 1dc01b435666..8a83145eb817 100644 --- a/media-libs/libprojectm/libprojectm-3.1.3.ebuild +++ b/media-libs/libprojectm/libprojectm-3.1.3.ebuild @@ -22,6 +22,10 @@ LICENSE="LGPL-2" SLOT="0/2" IUSE="gles2 jack qt5 sdl" +PATCHES=( + "${FILESDIR}/${P}-bashisms.patch" +) + RDEPEND="gles2? ( media-libs/mesa[gles2] ) media-libs/glm media-libs/mesa[X(+)] -- cgit v1.2.3