From 2272516812813a02d3878e3346790ea825faeca1 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 15 Mar 2021 13:07:48 +0100 Subject: [PATCH 1/6] =?UTF-8?q?media-sound/ibniz:=20pelulamu.net=20?= =?UTF-8?q?=E2=86=92=20viznut.fi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/776346 Signed-off-by: Haelwenn (lanodan) Monnier --- media-sound/ibniz/ibniz-1.18.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media-sound/ibniz/ibniz-1.18.ebuild b/media-sound/ibniz/ibniz-1.18.ebuild index 5c80dc61eb..6765da88cb 100644 --- a/media-sound/ibniz/ibniz-1.18.ebuild +++ b/media-sound/ibniz/ibniz-1.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,8 +6,8 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="virtual machine designed for extremely compact low-level audiovisual programs" -HOMEPAGE="http://pelulamu.net/ibniz/" -SRC_URI="http://pelulamu.net/ibniz/${P}.tar.gz" +HOMEPAGE="http://viznut.fi/ibniz/" +SRC_URI="http://viznut.fi/ibniz/${P}.tar.gz" LICENSE="ZLIB" SLOT="0" From 7f2e5212e1cb8156e2d2a14de54b3e91b4d09a77 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 15 Mar 2021 15:01:01 +0100 Subject: [PATCH 2/6] games-board/openriichi: Add vala_depend Signed-off-by: Haelwenn (lanodan) Monnier --- games-board/openriichi/openriichi-0.2.1.1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/games-board/openriichi/openriichi-0.2.1.1.ebuild b/games-board/openriichi/openriichi-0.2.1.1.ebuild index 78ec26f9ec..159b9acaa9 100644 --- a/games-board/openriichi/openriichi-0.2.1.1.ebuild +++ b/games-board/openriichi/openriichi-0.2.1.1.ebuild @@ -24,6 +24,7 @@ RESTRICT="mirror" S="${WORKDIR}/${MY_PN}-${PV}" RDEPEND=" + $(vala_depend) dev-libs/libgee:0.8 media-libs/glew:0 media-libs/libsdl2[haptic,joystick,opengl,sound,threads,video] From 0b9dc090db00b9811b42bac865e7c8b30fd757cd Mon Sep 17 00:00:00 2001 From: Michele Santullo Date: Mon, 15 Mar 2021 19:40:06 +0100 Subject: [PATCH 3/6] media-libs/libbpg: new package Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --force Signed-off-by: Michele Santullo --- media-libs/libbpg/Manifest | 1 + .../libbpg/files/libbpg-0.9.8-add-chost.patch | 13 ++++ .../files/libbpg-0.9.8-dont-strip-bins.patch | 13 ++++ .../libbpg-0.9.8-remove-forced-options.patch | 27 +++++++ media-libs/libbpg/libbpg-0.9.8.ebuild | 72 +++++++++++++++++++ media-libs/libbpg/metadata.xml | 18 +++++ 6 files changed, 144 insertions(+) create mode 100644 media-libs/libbpg/Manifest create mode 100644 media-libs/libbpg/files/libbpg-0.9.8-add-chost.patch create mode 100644 media-libs/libbpg/files/libbpg-0.9.8-dont-strip-bins.patch create mode 100644 media-libs/libbpg/files/libbpg-0.9.8-remove-forced-options.patch create mode 100644 media-libs/libbpg/libbpg-0.9.8.ebuild create mode 100644 media-libs/libbpg/metadata.xml diff --git a/media-libs/libbpg/Manifest b/media-libs/libbpg/Manifest new file mode 100644 index 0000000000..a8ff0b6ccd --- /dev/null +++ b/media-libs/libbpg/Manifest @@ -0,0 +1 @@ +DIST libbpg-0.9.8.tar.gz 2029021 BLAKE2B 827d819d6e392a1a0186a58b16b9b69c41f4a0c94046ff2a1aab0e735e01aae8c10d06ad03c1bf9f0722a7620f50ae7da25bddda681e457ad4cdeec8cb922edc SHA512 2d5f7a035033d8b969c2765a4f1368e1a2c8c5ace12aec5d449ca5cc4ef5eb89431a75f2d6d03fd7117b548801b5554503411f499f497da69ff33ca6e714553d diff --git a/media-libs/libbpg/files/libbpg-0.9.8-add-chost.patch b/media-libs/libbpg/files/libbpg-0.9.8-add-chost.patch new file mode 100644 index 0000000000..9b5054de1a --- /dev/null +++ b/media-libs/libbpg/files/libbpg-0.9.8-add-chost.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 8364e93..d3fc48f 100644 +--- a/Makefile ++++ b/Makefile +@@ -27,7 +27,7 @@ CROSS_PREFIX:=x86_64-w64-mingw32- + #CROSS_PREFIX=i686-w64-mingw32- + EXE:=.exe + else +-CROSS_PREFIX:= ++CROSS_PREFIX:=${CHOST}- + EXE:= + endif + diff --git a/media-libs/libbpg/files/libbpg-0.9.8-dont-strip-bins.patch b/media-libs/libbpg/files/libbpg-0.9.8-dont-strip-bins.patch new file mode 100644 index 0000000000..486086adad --- /dev/null +++ b/media-libs/libbpg/files/libbpg-0.9.8-dont-strip-bins.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index a5ba63b..8364e93 100644 +--- a/Makefile ++++ b/Makefile +@@ -214,7 +214,7 @@ size: + gzip < bpgdec | wc + + install: bpgenc bpgdec +- install -s -m 755 $^ $(prefix)/bin ++ install -m 755 $^ $(prefix)/bin + + CLEAN_DIRS=doc html libavcodec libavutil \ + jctvc jctvc/TLibEncoder jctvc/TLibVideoIO jctvc/TLibCommon jctvc/libmd5 diff --git a/media-libs/libbpg/files/libbpg-0.9.8-remove-forced-options.patch b/media-libs/libbpg/files/libbpg-0.9.8-remove-forced-options.patch new file mode 100644 index 0000000000..1ebf05faed --- /dev/null +++ b/media-libs/libbpg/files/libbpg-0.9.8-remove-forced-options.patch @@ -0,0 +1,27 @@ +diff --git a/Makefile b/Makefile +index 3a8db4c..a5ba63b 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,11 +5,11 @@ + # Enable compilation of Javascript decoder with Emscripten + #USE_EMCC=y + # Enable x265 for the encoder +-USE_X265=y ++#USE_X265=y + # Enable the JCTVC code (best quality but slow) for the encoder + #USE_JCTVC=y + # Compile bpgview (SDL and SDL_image libraries needed) +-USE_BPGVIEW=y ++#USE_BPGVIEW=y + # Enable it to use bit depths > 12 (need more tests to validate encoder) + #USE_JCTVC_HIGH_BIT_DEPTH=y + # Enable the cross compilation for Windows +@@ -17,7 +17,7 @@ USE_BPGVIEW=y + # Enable for compilation on MacOS X + #CONFIG_APPLE=y + # Installation prefix +-prefix=/usr/local ++#prefix=/usr/local + + + ################################# diff --git a/media-libs/libbpg/libbpg-0.9.8.ebuild b/media-libs/libbpg/libbpg-0.9.8.ebuild new file mode 100644 index 0000000000..e55afb24dd --- /dev/null +++ b/media-libs/libbpg/libbpg-0.9.8.ebuild @@ -0,0 +1,72 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Better Portable Graphics reference implementation" +HOMEPAGE="https://bellard.org/bpg/" +SRC_URI="${HOMEPAGE}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+x265 bpgview jctvc emcc static-libs" + +PATCHES=( + "${FILESDIR}"/${P}-remove-forced-options.patch + "${FILESDIR}"/${P}-dont-strip-bins.patch + "${FILESDIR}"/${P}-add-chost.patch +) + +DEPEND="" +RDEPEND="${DEPEND}" +BDEPEND=" + media-video/ffmpeg + media-libs/libpng + virtual/jpeg + bpgview? ( media-libs/sdl-image ) + bpgview? ( media-libs/libsdl ) +" + +src_prepare() { + default + + cat < ${PN}.pc +prefix="${EPREFIX}/usr" +libdir="\${prefix}/$(get_libdir)" +includedir="\${prefix}/include" + +Name: ${PN} +Description: ${DESCRIPTION} +URL: ${HOMEPAGE} +Version: ${PV} +Libs: "-L\${libdir}" -lbpg +Cflags: "-I\${includedir}" +EOF +} + +src_compile() { + emake \ + $(usex x265 USE_X265=y '') \ + $(usex bpgview USE_BPGVIEW=y '') \ + $(usex jctvc USE_JCTVC=y '') \ + $(usex emcc USE_EMCC=y '') +} + +src_install() { + mkdir -p "${D}"/usr/bin + emake prefix="${D}"/usr install + + if use bpgview; then + dobin bpgview + fi + + if use static-libs; then + dolib.a libbpg.a + doheader libbpg.h + doheader bpgenc.h + + insinto /usr/$(get_libdir)/pkgconfig + doins ${PN}.pc + fi +} diff --git a/media-libs/libbpg/metadata.xml b/media-libs/libbpg/metadata.xml new file mode 100644 index 0000000000..f0651d33ae --- /dev/null +++ b/media-libs/libbpg/metadata.xml @@ -0,0 +1,18 @@ + + + + + BPG (Better Portable Graphics) is a new image format. Its purpose is + to replace the JPEG image format when quality or file size is an issue. + + + m.santullo@posteo.net + Michele Santullo + + + + Fabrice Bellard + fabrice@bellard.org + + + From b55c5a7e8f100a6d7a095753525a0e3bb6f122b2 Mon Sep 17 00:00:00 2001 From: Michele Santullo Date: Mon, 15 Mar 2021 21:13:56 +0100 Subject: [PATCH 4/6] media-libs/libbpg: add fPIC or lib doesn't link to other libs Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --force Signed-off-by: Michele Santullo --- media-libs/libbpg/files/libbpg-0.9.8-add-fpic.patch | 13 +++++++++++++ media-libs/libbpg/libbpg-0.9.8.ebuild | 1 + 2 files changed, 14 insertions(+) create mode 100644 media-libs/libbpg/files/libbpg-0.9.8-add-fpic.patch diff --git a/media-libs/libbpg/files/libbpg-0.9.8-add-fpic.patch b/media-libs/libbpg/files/libbpg-0.9.8-add-fpic.patch new file mode 100644 index 0000000000..2cc647666c --- /dev/null +++ b/media-libs/libbpg/files/libbpg-0.9.8-add-fpic.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 3a8db4c..eaccfd8 100644 +--- a/Makefile ++++ b/Makefile +@@ -86,7 +86,7 @@ LIBBPG_JS8_OBJS:=$(patsubst %.o, %.js8.o, $(LIBBPG_OBJS)) tmalloc.js8.o + + LIBBPG_JS8A_OBJS:=$(patsubst %.o, %.js8a.o, $(LIBBPG_OBJS)) tmalloc.js8a.o + +-$(LIBBPG_OBJS): CFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_VAR_BIT_DEPTH -DUSE_PRED ++$(LIBBPG_OBJS): CFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_VAR_BIT_DEPTH -DUSE_PRED -fPIC + + $(LIBBPG_JS_OBJS): EMCFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_VAR_BIT_DEPTH + diff --git a/media-libs/libbpg/libbpg-0.9.8.ebuild b/media-libs/libbpg/libbpg-0.9.8.ebuild index e55afb24dd..6092cdf721 100644 --- a/media-libs/libbpg/libbpg-0.9.8.ebuild +++ b/media-libs/libbpg/libbpg-0.9.8.ebuild @@ -16,6 +16,7 @@ PATCHES=( "${FILESDIR}"/${P}-remove-forced-options.patch "${FILESDIR}"/${P}-dont-strip-bins.patch "${FILESDIR}"/${P}-add-chost.patch + "${FILESDIR}"/${P}-add-fpic.patch ) DEPEND="" From 34cd25319d156c12ba87f238e3c3fe4ab495788e Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Tue, 16 Mar 2021 01:54:37 +0100 Subject: [PATCH 5/6] eclass: install documentation in DOCDIR Signed-off-by: Alessandro Barbieri --- eclass/R-packages-guru.eclass | 37 ++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/eclass/R-packages-guru.eclass b/eclass/R-packages-guru.eclass index 6419cfec92..8475f97515 100644 --- a/eclass/R-packages-guru.eclass +++ b/eclass/R-packages-guru.eclass @@ -11,6 +11,13 @@ IUSE="byte-compile" DEPEND="dev-lang/R" RDEPEND="${DEPEND}" +dodocrm() { + if [ -e "${1}" ]; then + dodoc -r "${1}" + rm -rf "${1}" || die + fi +} + R-packages-guru_src_unpack() { unpack ${A} if [[ -d "${PN//_/.}" ]] && [[ ! -d "${P}" ]]; then @@ -18,15 +25,11 @@ R-packages-guru_src_unpack() { fi } -if has "${EAPI:-0}" 0 1 2 3 4 5; then - R-packages-guru_src_prepare() { - epatch_user - } -else - R-packages-guru_src_prepare() { - default - } -fi +R-packages-guru_src_prepare() { + rm -f LICENSE || die + default +} + R-packages-guru_src_compile() { MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" \ @@ -34,6 +37,22 @@ R-packages-guru_src_compile() { } R-packages-guru_src_install() { + cd "${WORKDIR}"/${PN//_/.} || die + + dodocrm examples || die +# dodocrm DESCRIPTION || die #keep this + dodocrm NEWS.md || die + dodocrm README.md || die + dodocrm html || die + docinto "${DOCSDIR}/html" + if [ -e doc ]; then + ls doc/*.html &>/dev/null && dodoc -r doc/*.html + rm -rf doc/*.html || die + docinto "${DOCSDIR}" + dodoc -r doc/. + rm -rf doc + fi + insinto /usr/$(get_libdir)/R/site-library doins -r "${WORKDIR}"/${PN//_/.} } From fa8b7227e9c4af1ff07f1662ff4de153c041bb98 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 16 Mar 2021 10:45:28 +0100 Subject: [PATCH 6/6] media-libs/libbpg: makes repoman happy add iuse flags definition Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Mathieu Tortuyaux --- media-libs/libbpg/metadata.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/media-libs/libbpg/metadata.xml b/media-libs/libbpg/metadata.xml index f0651d33ae..37fa48cf0f 100644 --- a/media-libs/libbpg/metadata.xml +++ b/media-libs/libbpg/metadata.xml @@ -15,4 +15,10 @@ fabrice@bellard.org + + + + + +