* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libmirage/files/, dev-libs/libmirage/
@ 2020-08-10 2:38 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2020-08-10 2:38 UTC (permalink / raw
To: gentoo-commits
commit: 3d920a75eed32d30e6ad433371596f579e776928
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 02:23:51 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 02:25:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d920a75
dev-libs/libmirage: Fix gcc-10 build
Closes: https://bugs.gentoo.org/707446
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../libmirage/files/libmirage-3.2.4-gcc-10.patch | 34 ++++++++++++++++++++++
dev-libs/libmirage/libmirage-3.2.4.ebuild | 4 +++
2 files changed, 38 insertions(+)
diff --git a/dev-libs/libmirage/files/libmirage-3.2.4-gcc-10.patch b/dev-libs/libmirage/files/libmirage-3.2.4-gcc-10.patch
new file mode 100644
index 00000000000..7834e39eed7
--- /dev/null
+++ b/dev-libs/libmirage/files/libmirage-3.2.4-gcc-10.patch
@@ -0,0 +1,34 @@
+From 7288d06f79d935798b917f707b86a33f5b69125a Mon Sep 17 00:00:00 2001
+From: Rok Mandeljc <rok.mandeljc@gmail.com>
+Date: Sat, 2 May 2020 17:37:34 +0200
+Subject: [PATCH] libMirage: utils.h: added missing extern specifiers
+
+The lack thereof seems to be causing errors with gcc 10 on Fedora 32.
+---
+ libmirage/mirage/utils.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libmirage/mirage/utils.h b/libmirage/mirage/utils.h
+index 64611810..fc431d2f 100644
+--- a/mirage/utils.h
++++ b/mirage/utils.h
+@@ -83,8 +83,8 @@ gchar mirage_helper_isrc2ascii (guint8 c);
+ gboolean mirage_helper_validate_isrc (const gchar *isrc);
+
+ /* CRC utility functions */
+-guint16 *crc16_1021_lut;
+-guint32 *crc32_d8018001_lut;
++extern guint16 *crc16_1021_lut;
++extern guint32 *crc32_d8018001_lut;
+
+ guint16 *mirage_helper_init_crc16_lut (guint16 genpoly);
+ guint32 *mirage_helper_init_crc32_lut (guint32 genpoly, guint slices);
+@@ -139,7 +139,7 @@ const gchar *mirage_helper_encoding_from_bom (const guint8 *buffer);
+
+
+ /* ECMA-130 Annex B sector data scrambler */
+-guint8 *ecma_130_scrambler_lut;
++extern guint8 *ecma_130_scrambler_lut;
+
+ guint8 *mirage_helper_init_ecma_130b_scrambler_lut (void);
+
diff --git a/dev-libs/libmirage/libmirage-3.2.4.ebuild b/dev-libs/libmirage/libmirage-3.2.4.ebuild
index ba836ebd339..4aad2870f2d 100644
--- a/dev-libs/libmirage/libmirage-3.2.4.ebuild
+++ b/dev-libs/libmirage/libmirage-3.2.4.ebuild
@@ -30,6 +30,10 @@ BDEPEND="
doc? ( dev-util/gtk-doc )
introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc-10.patch
+)
+
DOCS=( AUTHORS README )
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libmirage/files/, dev-libs/libmirage/
@ 2022-01-02 10:59 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2022-01-02 10:59 UTC (permalink / raw
To: gentoo-commits
commit: 8808cb843369ec0f9826bbcea9cfed654848dc2e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 2 08:05:21 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 2 10:59:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8808cb84
dev-libs/libmirage: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-libs/libmirage/Manifest | 2 -
.../libmirage/files/libmirage-3.2.4-gcc-10.patch | 34 --------------
dev-libs/libmirage/libmirage-3.2.4.ebuild | 54 ----------------------
dev-libs/libmirage/libmirage-3.2.5.ebuild | 50 --------------------
4 files changed, 140 deletions(-)
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index cf0c8d0ad195..4b6fb536b1e5 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,3 +1 @@
-DIST libmirage-3.2.4.tar.bz2 234530 BLAKE2B 72329350a9e2a197ff52d396a011d3cf0178731909066ee1dab75f0d870fd751d50e2cacb69c849aa8045e94fa492732c21d201bdd4cbe3a9048f5c3f90ea881 SHA512 6fe718ad7beaf457ef0a7cc037b3bcf268574606ea9cbc1ba9abb5088c734fe9a100a35320d393a47625bbdde5515cded02e767618f2fc0801cf755af1414091
-DIST libmirage-3.2.5.tar.xz 229380 BLAKE2B ee73bf8418a209633afe7b30888c851cc0f206c03413d0b8d2717bbdb6fe77f3f32e81e1210931753cf453759ff7e4af48164866ad973b3a219381cbafd3d6f6 SHA512 f1247430d428b63734ab16328c3a484acab05fa2189b5979dc0e5759812190abd38b84bacc87b68f166f77cc88c3d4e9fb64ab0d7ec24c116c08d9314dd6b75b
DIST libmirage-3.2.6.tar.xz 229408 BLAKE2B 38402e37acf42e58fc896621cfb0f253a53b23eb8c783a900521fa8fb297fd3df8397b2f8d341e33fd7e0edcae9ac1a4e178cc9414498f27399b8e5f2a1984c5 SHA512 085ca774c047f845a61e9c1015f4b249073e72239c55dbb84c335799815cfe93b0c883c6e56cac3c0c11db009f44a6b48680c6fe6793dde63a5006cdbb627197
diff --git a/dev-libs/libmirage/files/libmirage-3.2.4-gcc-10.patch b/dev-libs/libmirage/files/libmirage-3.2.4-gcc-10.patch
deleted file mode 100644
index 7834e39eed7c..000000000000
--- a/dev-libs/libmirage/files/libmirage-3.2.4-gcc-10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7288d06f79d935798b917f707b86a33f5b69125a Mon Sep 17 00:00:00 2001
-From: Rok Mandeljc <rok.mandeljc@gmail.com>
-Date: Sat, 2 May 2020 17:37:34 +0200
-Subject: [PATCH] libMirage: utils.h: added missing extern specifiers
-
-The lack thereof seems to be causing errors with gcc 10 on Fedora 32.
----
- libmirage/mirage/utils.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libmirage/mirage/utils.h b/libmirage/mirage/utils.h
-index 64611810..fc431d2f 100644
---- a/mirage/utils.h
-+++ b/mirage/utils.h
-@@ -83,8 +83,8 @@ gchar mirage_helper_isrc2ascii (guint8 c);
- gboolean mirage_helper_validate_isrc (const gchar *isrc);
-
- /* CRC utility functions */
--guint16 *crc16_1021_lut;
--guint32 *crc32_d8018001_lut;
-+extern guint16 *crc16_1021_lut;
-+extern guint32 *crc32_d8018001_lut;
-
- guint16 *mirage_helper_init_crc16_lut (guint16 genpoly);
- guint32 *mirage_helper_init_crc32_lut (guint32 genpoly, guint slices);
-@@ -139,7 +139,7 @@ const gchar *mirage_helper_encoding_from_bom (const guint8 *buffer);
-
-
- /* ECMA-130 Annex B sector data scrambler */
--guint8 *ecma_130_scrambler_lut;
-+extern guint8 *ecma_130_scrambler_lut;
-
- guint8 *mirage_helper_init_ecma_130b_scrambler_lut (void);
-
diff --git a/dev-libs/libmirage/libmirage-3.2.4.ebuild b/dev-libs/libmirage/libmirage-3.2.4.ebuild
deleted file mode 100644
index 4aad2870f2df..000000000000
--- a/dev-libs/libmirage/libmirage-3.2.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="CD and DVD image access library"
-HOMEPAGE="https://cdemu.sourceforge.io"
-SRC_URI="https://download.sourceforge.net/cdemu/libmirage/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="amd64 x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=app-arch/bzip2-1:=
- >=app-arch/xz-utils-5:=
- >=dev-libs/glib-2.38:2
- >=media-libs/libsamplerate-0.1:=
- >=media-libs/libsndfile-1.0:=
- sys-libs/zlib:=
- introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/desktop-file-utils
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( dev-util/gtk-doc )
- introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc-10.patch
-)
-
-DOCS=( AUTHORS README )
-
-src_configure() {
- local mycmakeargs=(
- -DGTKDOC_ENABLED="$(usex doc)"
- -DINTROSPECTION_ENABLED="$(usex introspection)"
- -DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
- )
- cmake_src_configure
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/libmirage/libmirage-3.2.5.ebuild b/dev-libs/libmirage/libmirage-3.2.5.ebuild
deleted file mode 100644
index 6c4473dd19e2..000000000000
--- a/dev-libs/libmirage/libmirage-3.2.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="CD and DVD image access library"
-HOMEPAGE="https://cdemu.sourceforge.io"
-SRC_URI="https://download.sourceforge.net/cdemu/libmirage/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="amd64 x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=app-arch/bzip2-1:=
- >=app-arch/xz-utils-5:=
- >=dev-libs/glib-2.38:2
- >=media-libs/libsamplerate-0.1:=
- >=media-libs/libsndfile-1.0:=
- sys-libs/zlib:=
- introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/desktop-file-utils
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( dev-util/gtk-doc )
- introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-
-DOCS=( AUTHORS README )
-
-src_configure() {
- local mycmakeargs=(
- -DGTKDOC_ENABLED="$(usex doc)"
- -DINTROSPECTION_ENABLED="$(usex introspection)"
- -DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
- )
- cmake_src_configure
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-02 11:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-10 2:38 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libmirage/files/, dev-libs/libmirage/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-01-02 10:59 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox