* [gentoo-commits] repo/gentoo:master commit in: dev-perl/IO-Compress-Brotli/files/, dev-perl/IO-Compress-Brotli/
@ 2020-02-04 10:43 Kent Fredric
0 siblings, 0 replies; 2+ messages in thread
From: Kent Fredric @ 2020-02-04 10:43 UTC (permalink / raw
To: gentoo-commits
commit: 30d6e9e94eb2a0b2a72778d9fcda422678eed08e
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 4 10:38:40 2020 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Tue Feb 4 10:40:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d6e9e9
dev-perl/IO-Compress-Brotli: Add w/ version 0.4.1
Required as a dependency for bumping www-apps/webdavcgi to 1.1.2
Change suggested by Christian Affolter, but reworked from scratch
to incorporate unbundling of brotli, and to employ proper versions,
and EAPI7.
Bug: https://bugs.gentoo.org/658470
Bug: https://github.com/gentoo/gentoo/pull/10826
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org>
.../IO-Compress-Brotli-0.4.1.ebuild | 28 +++++++++++++
dev-perl/IO-Compress-Brotli/Manifest | 1 +
.../IO-Compress-Brotli-0.004001-unbundle.patch | 49 ++++++++++++++++++++++
dev-perl/IO-Compress-Brotli/metadata.xml | 13 ++++++
4 files changed, 91 insertions(+)
diff --git a/dev-perl/IO-Compress-Brotli/IO-Compress-Brotli-0.4.1.ebuild b/dev-perl/IO-Compress-Brotli/IO-Compress-Brotli-0.4.1.ebuild
new file mode 100644
index 00000000000..812152ba488
--- /dev/null
+++ b/dev-perl/IO-Compress-Brotli/IO-Compress-Brotli-0.4.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=MGV
+DIST_VERSION=0.004001
+inherit perl-module
+
+DESCRIPTION="Read/write Brotli buffers/streams"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-perl/File-Slurper
+ virtual/perl-Getopt-Long
+ virtual/perl-Time-HiRes
+ app-arch/brotli:=
+"
+DEPEND="
+ app-arch/brotli:=
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
+PATCHES=(
+ "${FILESDIR}/${PN}-${DIST_VERSION}-unbundle.patch"
+)
diff --git a/dev-perl/IO-Compress-Brotli/Manifest b/dev-perl/IO-Compress-Brotli/Manifest
new file mode 100644
index 00000000000..fd5e5bbefcb
--- /dev/null
+++ b/dev-perl/IO-Compress-Brotli/Manifest
@@ -0,0 +1 @@
+DIST IO-Compress-Brotli-0.004001.tar.gz 7674244 BLAKE2B b3c4d6a1101429fc47f345f0ba119e5196873a0e5d368b31d02f76ca2a0ac269ed4c9c82972de527052b55e73a2a4724ebf4f644c23c383304082413b512dfad SHA512 7cc198ecef15c912d8b62e6851935c433159e7f3680f2034949c032d23827f5a5720dd02b77b89b60d43b0a2a7df059c9e76c8f4e44993c28630624f0e17a377
diff --git a/dev-perl/IO-Compress-Brotli/files/IO-Compress-Brotli-0.004001-unbundle.patch b/dev-perl/IO-Compress-Brotli/files/IO-Compress-Brotli-0.004001-unbundle.patch
new file mode 100644
index 00000000000..84205c548bd
--- /dev/null
+++ b/dev-perl/IO-Compress-Brotli/files/IO-Compress-Brotli-0.004001-unbundle.patch
@@ -0,0 +1,49 @@
+From 59541041bc3b39e8539fd12a8e584a63040ad7a5 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Tue, 4 Feb 2020 23:17:49 +1300
+Subject: Disable using bundled brotli
+
+---
+ Makefile.PL | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 0c59c05..b10234d 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,6 +1,8 @@
+ use 5.014000;
+ use ExtUtils::MakeMaker;
+
++my $bundled = $ENV{IO_COMPRESS_BROTLI_BUNDLED} || 0;
++
+ WriteMakefile(
+ NAME => 'IO::Compress::Brotli',
+ VERSION_FROM => 'lib/IO/Compress/Brotli.pm',
+@@ -16,9 +18,13 @@ WriteMakefile(
+ 'Time::HiRes' => '0',
+ },
+ BUILD_REQUIRES => {},
++ ( $bundled ) ? (
+ INC => '-Ibrotli/c/include',
+ MYEXTLIB => 'brotli/libbrotli$(LIB_EXT)',
+ clean => { FILES => 'brotli/libbrotli$(LIB_EXT)' },
++ ) : (
++ LIBS => ['-lbrotlienc -lbrotlidec'],
++ ),
+ META_ADD => {
+ dynamic_config => 0,
+ resources => {
+@@ -27,7 +33,9 @@ WriteMakefile(
+ }
+ );
+
++
+ sub MY::postamble {
++ return '' unless $bundled;
+ '
+ $(MYEXTLIB): brotli/Makefile
+ cd brotli && CFLAGS=-fPIC `which gmake || echo $(MAKE)` lib
+--
+2.25.0
+
diff --git a/dev-perl/IO-Compress-Brotli/metadata.xml b/dev-perl/IO-Compress-Brotli/metadata.xml
new file mode 100644
index 00000000000..b55083f195d
--- /dev/null
+++ b/dev-perl/IO-Compress-Brotli/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="cpan">IO-Compress-Brotli</remote-id>
+ <remote-id type="cpan-module">IO::Compress::Brotli</remote-id>
+ <remote-id type="cpan-module">IO::Uncompress::Brotli</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/IO-Compress-Brotli/files/, dev-perl/IO-Compress-Brotli/
@ 2023-11-13 4:53 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-11-13 4:53 UTC (permalink / raw
To: gentoo-commits
commit: 3fc84e7cb8eb0f4d7f22127b96f38241893a2c2e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 04:51:54 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 04:51:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc84e7c
dev-perl/IO-Compress-Brotli: fix unbundle patch for 0.17.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../IO-Compress-Brotli-0.17.0.ebuild | 2 +-
.../files/IO-Compress-Brotli-0.017-unbundle.patch | 55 ++++++++++++++++++++++
2 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/dev-perl/IO-Compress-Brotli/IO-Compress-Brotli-0.17.0.ebuild b/dev-perl/IO-Compress-Brotli/IO-Compress-Brotli-0.17.0.ebuild
index 69dee213f563..11a2b12873d8 100644
--- a/dev-perl/IO-Compress-Brotli/IO-Compress-Brotli-0.17.0.ebuild
+++ b/dev-perl/IO-Compress-Brotli/IO-Compress-Brotli-0.17.0.ebuild
@@ -25,5 +25,5 @@ BDEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.010-unbundle.patch
+ "${FILESDIR}"/${PN}-0.017-unbundle.patch
)
diff --git a/dev-perl/IO-Compress-Brotli/files/IO-Compress-Brotli-0.017-unbundle.patch b/dev-perl/IO-Compress-Brotli/files/IO-Compress-Brotli-0.017-unbundle.patch
new file mode 100644
index 000000000000..d07e691840a7
--- /dev/null
+++ b/dev-perl/IO-Compress-Brotli/files/IO-Compress-Brotli-0.017-unbundle.patch
@@ -0,0 +1,55 @@
+From 59541041bc3b39e8539fd12a8e584a63040ad7a5 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Tue, 4 Feb 2020 23:17:49 +1300
+Subject: Disable using bundled brotli
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 57063cf..809001a 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,6 +1,5 @@
+ use 5.014000;
+ use ExtUtils::MakeMaker;
+-use Alien::cmake3;
+ use File::Spec::Functions qw/catfile/;
+ use Config;
+
+@@ -18,6 +17,12 @@ if ($Config{myuname} =~ /strawberry/i || $Config{osname} =~ /MSWin/i ) {
+ }
+ }
+
++my $bundled = $ENV{IO_COMPRESS_BROTLI_BUNDLED} || 0;
++
++# Avoid unnecessary dependency
++use if $bundled, 'Alien::cmake3';
++
++
+ WriteMakefile(
+ NAME => 'IO::Compress::Brotli',
+ VERSION_FROM => 'lib/IO/Compress/Brotli.pm',
+@@ -32,6 +37,7 @@ WriteMakefile(
+ 'Getopt::Long' => '0',
+ 'Time::HiRes' => '0',
+ },
++ ( $bundled ) ? (
+ CONFIGURE_REQUIRES => {
+ 'Alien::cmake3' => '0',
+ },
+@@ -41,6 +47,9 @@ WriteMakefile(
+ INC => '-Ibrotli/c/include',
+ MYEXTLIB => $myextlib,
+ clean => { FILES => "brotli/Makefile $myextlib brotli/CMakeCache.txt brotli/CMakeFiles/* brotli/CTestTestfile.cmake brotli/DartConfiguration.tcl brotli/brotli* brotli/cmake_install.cmake brotli/libbrotlicommon.pc brotli/libbrotlidec.pc brotli/libbrotlienc.pc" },
++ ) : (
++ LIBS => ['-lbrotlienc -lbrotlidec'],
++ ),
+ META_ADD => {
+ dynamic_config => 0,
+ resources => {
+@@ -50,6 +59,7 @@ WriteMakefile(
+ );
+
+ sub MY::postamble {
++ return '' unless $bundled;
+ my @dirs = Alien::cmake3->bin_dir;
+ my $cmake = defined $dirs[0] ? catfile($dirs[0] , Alien::cmake3->exe) : Alien::cmake3->exe;
+ '
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-13 4:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-13 4:53 [gentoo-commits] repo/gentoo:master commit in: dev-perl/IO-Compress-Brotli/files/, dev-perl/IO-Compress-Brotli/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-02-04 10:43 Kent Fredric
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox