* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/files/, dev-libs/libcdio/
@ 2017-11-24 14:13 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2017-11-24 14:13 UTC (permalink / raw
To: gentoo-commits
commit: ba52139c96a39f6f2285edb173af960a2afb51fa
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 14:12:39 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 14:12:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba52139c
dev-libs/libcdio: Revbump to fix LIBCDIO_VERSION_NUM breakage.
Bug: https://bugs.gentoo.org/638644
Package-Manager: Portage-2.3.16, Repoman-2.3.6
dev-libs/libcdio/files/libcdio-1.0.0-version.patch | 16 ++++++++++++++++
.../{libcdio-1.0.0.ebuild => libcdio-1.0.0-r1.ebuild} | 7 ++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
new file mode 100644
index 00000000000..3c812a9407a
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
@@ -0,0 +1,16 @@
+--- libcdio-1.0.0/configure.ac
++++ libcdio-1.0.0/configure.ac
+@@ -32,7 +32,12 @@
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
+ [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
+
+-LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
++# Broken by design. See also
++# https://savannah.gnu.org/bugs/?52491
++# and
++# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2d22ae18571caf29460a456340ff0603f04af6b4
++#LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
++LIBCDIO_VERSION_NUM=10000
+ AC_SUBST(LIBCDIO_VERSION_NUM)
+
+ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
diff --git a/dev-libs/libcdio/libcdio-1.0.0.ebuild b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
similarity index 94%
rename from dev-libs/libcdio/libcdio-1.0.0.ebuild
rename to dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
index 9d54cf3b873..5a278ab70ab 100644
--- a/dev-libs/libcdio/libcdio-1.0.0.ebuild
+++ b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils libtool multilib-minimal
+inherit autotools libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="https://www.gnu.org/software/libcdio/"
@@ -33,8 +33,13 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/cdio/version.h
)
+PATCHES=( "${FILESDIR}/${P}-version.patch" )
+
src_prepare() {
default
+
+ eautoreconf
+
sed \
-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-i configure || die
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/files/, dev-libs/libcdio/
@ 2017-11-27 17:59 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-11-27 17:59 UTC (permalink / raw
To: gentoo-commits
commit: 9c7e5953cdc545031ed5c83cb671176711931d62
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 17:53:48 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 17:58:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7e5953
dev-libs/libcdio: Fix build with USE=cddb
Reported-by: Nikolaj Šujskij <skrattaren <AT> yandex.ru>
Thanks-to: Bernard Cafarelli <voyageur <AT> gentoo.org>
Closes: https://bugs.gentoo.org/638576
Package-Manager: Portage-2.3.16, Repoman-2.3.6
dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch | 37 +++++++++++++++++++++++++
dev-libs/libcdio/libcdio-1.0.0-r1.ebuild | 6 +++-
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch b/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
new file mode 100644
index 00000000000..b3781d2a7e5
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
@@ -0,0 +1,37 @@
+From 4305bc1e093e4341aeddb857bd1e6203228000cb Mon Sep 17 00:00:00 2001
+From: "R. Bernstein" <rocky@gnu.org>
+Date: Sat, 25 Nov 2017 14:03:37 -0500
+Subject: Fix breakage caused by unshadowing i_first_track
+
+Reported and patch by KO Myung-Hun
+---
+ src/cdda-player.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/cdda-player.c b/src/cdda-player.c
+index efeee19..333e1f5 100644
+--- a/src/cdda-player.c
++++ b/src/cdda-player.c
+@@ -531,8 +531,8 @@ static void
+ get_cddb_disc_info(CdIo_t *p_cdio)
+ {
+ #ifdef HAVE_CDDB
+- b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track,
+- i_tracks, &i_cddb_matches);
++ b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track_global,
++ i_tracks_global, &i_cddb_matches);
+ if (b_db) {
+ int i_year;
+ i_year = atoi(year);
+@@ -831,7 +831,7 @@ get_cddb_track_info(track_t i_track)
+ {
+ #ifdef HAVE_CDDB
+ cddb_track_t *t = cddb_disc_get_track(p_cddb_disc,
+- i_track - i_first_track);
++ i_track - i_first_track_global);
+ if (t) {
+ cddb_track_set_title(t, title);
+ cddb_track_set_artist(t, artist);
+--
+cgit v1.0-41-gc330
+
diff --git a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
index 251281eb241..8f43e92c8f9 100644
--- a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
inherit autotools libtool ltprune multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
@@ -33,7 +34,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/cdio/version.h
)
-PATCHES=( "${FILESDIR}/${P}-version.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-version.patch"
+ "${FILESDIR}/${P}-cddb.patch"
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/files/, dev-libs/libcdio/
@ 2018-04-11 22:47 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2018-04-11 22:47 UTC (permalink / raw
To: gentoo-commits
commit: 465ccfbc65cb84e0a131262f79e1443a8cb7c881
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Wed Mar 28 04:48:52 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Apr 11 22:47:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=465ccfbc
dev-libs/libcdio: remove emul-linux-x86 references.
Also removed eutils/ltprune and bumped EAPI to 6, replaced prune_libtool_files
with a find -delete
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-libs/libcdio/files/libcdio-1.0.0-version.patch | 4 ++--
dev-libs/libcdio/libcdio-0.93.ebuild | 17 +++++++++++------
dev-libs/libcdio/libcdio-0.94-r1.ebuild | 14 +++++++++-----
dev-libs/libcdio/libcdio-1.0.0-r1.ebuild | 4 ++--
dev-libs/libcdio/libcdio-1.1.0.ebuild | 5 +++--
dev-libs/libcdio/libcdio-2.0.0.ebuild | 4 ++--
6 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
index 3c812a9407a..bdde131ffc8 100644
--- a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
+++ b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
@@ -1,5 +1,5 @@
---- libcdio-1.0.0/configure.ac
-+++ libcdio-1.0.0/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -32,7 +32,12 @@
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
diff --git a/dev-libs/libcdio/libcdio-0.93.ebuild b/dev-libs/libcdio/libcdio-0.93.ebuild
index 7272a7dbdef..cf8534c7750 100644
--- a/dev-libs/libcdio/libcdio-0.93.ebuild
+++ b/dev-libs/libcdio/libcdio-0.93.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils libtool multilib-minimal
+EAPI=6
+
+inherit libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="https://www.gnu.org/software/libcdio/"
@@ -19,13 +20,15 @@ RDEPEND="
cddb? ( >=media-libs/libcddb-1.3.2 )
)
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+"
+
DEPEND="${RDEPEND}
sys-apps/sed
sys-devel/gettext
virtual/pkgconfig
- test? ( dev-lang/perl )"
+ test? ( dev-lang/perl )
+"
+
DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
MULTILIB_WRAPPED_HEADERS=(
@@ -34,6 +37,8 @@ MULTILIB_WRAPPED_HEADERS=(
)
src_prepare() {
+ default
+
sed \
-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-i configure || die
@@ -63,5 +68,5 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/dev-libs/libcdio/libcdio-0.94-r1.ebuild b/dev-libs/libcdio/libcdio-0.94-r1.ebuild
index 7f63c92ba24..1a21ff3a2f4 100644
--- a/dev-libs/libcdio/libcdio-0.94-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-0.94-r1.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils libtool multilib-minimal
+
+inherit libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="https://www.gnu.org/software/libcdio/"
@@ -19,13 +20,15 @@ RDEPEND="
cddb? ( >=media-libs/libcddb-1.3.2 )
)
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+"
+
DEPEND="${RDEPEND}
sys-apps/sed
sys-devel/gettext
virtual/pkgconfig
- test? ( dev-lang/perl )"
+ test? ( dev-lang/perl )
+"
+
DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
MULTILIB_WRAPPED_HEADERS=(
@@ -35,6 +38,7 @@ MULTILIB_WRAPPED_HEADERS=(
src_prepare() {
default
+
sed \
-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-i configure || die
@@ -64,5 +68,5 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
index c4bdf2c7bd9..039608e47da 100644
--- a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit autotools libtool ltprune multilib-minimal
+inherit autotools libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="https://www.gnu.org/software/libcdio/"
@@ -74,5 +74,5 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/dev-libs/libcdio/libcdio-1.1.0.ebuild b/dev-libs/libcdio/libcdio-1.1.0.ebuild
index 1342280b6ce..e41ff785813 100644
--- a/dev-libs/libcdio/libcdio-1.1.0.ebuild
+++ b/dev-libs/libcdio/libcdio-1.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit autotools libtool ltprune multilib-minimal
+inherit autotools libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="https://www.gnu.org/software/libcdio/"
@@ -21,6 +21,7 @@ RDEPEND="
)
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
"
+
DEPEND="${RDEPEND}
sys-apps/sed
sys-devel/gettext
@@ -69,5 +70,5 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/dev-libs/libcdio/libcdio-2.0.0.ebuild b/dev-libs/libcdio/libcdio-2.0.0.ebuild
index f50f17d50c9..8c41fd9ef9d 100644
--- a/dev-libs/libcdio/libcdio-2.0.0.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit autotools libtool ltprune multilib-minimal
+inherit autotools libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="https://www.gnu.org/software/libcdio/"
@@ -69,5 +69,5 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/files/, dev-libs/libcdio/
@ 2019-04-18 15:25 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2019-04-18 15:25 UTC (permalink / raw
To: gentoo-commits
commit: 44c925eb8e7c575773810e21962e5af1b0023b69
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 11:48:57 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 15:25:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c925eb
dev-libs/libcdio: Removed old.
Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-libs/libcdio/Manifest | 1 -
dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch | 37 ----------
dev-libs/libcdio/files/libcdio-1.0.0-version.patch | 16 -----
dev-libs/libcdio/libcdio-1.0.0-r1.ebuild | 78 ----------------------
4 files changed, 132 deletions(-)
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index b6c43e44160..9eee9442b7b 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,6 +1,5 @@
DIST libcdio-0.93.tar.gz 2723371 BLAKE2B 3dc361f48c0ccc22c76ad691f856512a87906ddccdbf05a22d4c8f7f28221d201480e015532be382d576550ecabae40df9e325043fa6cff89b39d77e30b6509b SHA512 a2ea7a1f219e1abdbbb42633003e10ff77b6a879133c96a0c8e7a80fe205c08a48bade1d9941c6493f24d6eb2ed410469b57e19d9740a4400266a6f3f9d3da91
DIST libcdio-0.94.tar.gz 2355452 BLAKE2B c6a720fb714e6aa0d4425ccf92e4c08172d26d77a94e8a6897ffee197a740de78da8d480ec9af2dcfd59c3f96fb2a823a4e39259389dd82ece4108c6a05a4646 SHA512 e1d3c96c4acc7be923c97109c3f76223adc00b293278daef7d5008b1e5d67f33402f9f224f05120e9e1e8b3a8d1fa1b0bd5069dc6dd309741e3590e2c19e0e66
-DIST libcdio-1.0.0.tar.gz 2343992 BLAKE2B d187a0aba99efa1172cab302fcd020dc2a581633368230a6ba00db6250c8e7d5e66111fba1804ecb0ba5416c876f88f1d07549118bb003d4631c14d0f3e85ba6 SHA512 2beb5c9cf455c5b56f0a8ba641b8fe322c487256b017108fadbdf288e92787fa0b956d2291aa877df5a9b4494f8425de58c0f71d587ef5f9346987733f66e5dc
DIST libcdio-1.1.0.tar.gz 2348106 BLAKE2B c63959d6cd92288b2d098f19b28a61fc5a7005390186045c6f72392becf9eb5808da7a8b952de166c5b263b9c10e594031a3fb908331eda040c210b984b3e11e SHA512 fe5a0d726974c8678b59de74ce043a5ed464f6ab595bf938e90bc5a348e9e882755e75aa3eecce50ce910b28e2498b5a892402fc0ea8728d382d1af36db71985
DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f
DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch b/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
deleted file mode 100644
index b3781d2a7e5..00000000000
--- a/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4305bc1e093e4341aeddb857bd1e6203228000cb Mon Sep 17 00:00:00 2001
-From: "R. Bernstein" <rocky@gnu.org>
-Date: Sat, 25 Nov 2017 14:03:37 -0500
-Subject: Fix breakage caused by unshadowing i_first_track
-
-Reported and patch by KO Myung-Hun
----
- src/cdda-player.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/cdda-player.c b/src/cdda-player.c
-index efeee19..333e1f5 100644
---- a/src/cdda-player.c
-+++ b/src/cdda-player.c
-@@ -531,8 +531,8 @@ static void
- get_cddb_disc_info(CdIo_t *p_cdio)
- {
- #ifdef HAVE_CDDB
-- b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track,
-- i_tracks, &i_cddb_matches);
-+ b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track_global,
-+ i_tracks_global, &i_cddb_matches);
- if (b_db) {
- int i_year;
- i_year = atoi(year);
-@@ -831,7 +831,7 @@ get_cddb_track_info(track_t i_track)
- {
- #ifdef HAVE_CDDB
- cddb_track_t *t = cddb_disc_get_track(p_cddb_disc,
-- i_track - i_first_track);
-+ i_track - i_first_track_global);
- if (t) {
- cddb_track_set_title(t, title);
- cddb_track_set_artist(t, artist);
---
-cgit v1.0-41-gc330
-
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
deleted file mode 100644
index bdde131ffc8..00000000000
--- a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,12 @@
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
- [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
-
--LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
-+# Broken by design. See also
-+# https://savannah.gnu.org/bugs/?52491
-+# and
-+# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2d22ae18571caf29460a456340ff0603f04af6b4
-+#LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
-+LIBCDIO_VERSION_NUM=10000
- AC_SUBST(LIBCDIO_VERSION_NUM)
-
- AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
diff --git a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
deleted file mode 100644
index 039608e47da..00000000000
--- a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="A library to encapsulate CD-ROM reading and control"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/17" # subslot is based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cddb +cxx minimal static-libs test"
-
-RDEPEND="
- !minimal? (
- >=sys-libs/ncurses-5.7-r7:0=
- cddb? ( >=media-libs/libcddb-1.3.2 )
- )
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- sys-apps/sed
- sys-devel/gettext
- virtual/pkgconfig
- test? ( dev-lang/perl )
-"
-
-DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/cdio/cdio_config.h
- /usr/include/cdio/version.h
-)
-
-PATCHES=(
- "${FILESDIR}/${P}-version.patch"
- "${FILESDIR}/${P}-cddb.patch"
-)
-
-src_prepare() {
- default
-
- eautoreconf
-
- sed \
- -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
- -i configure || die
-
- elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
-}
-
-multilib_src_configure() {
- local util_switch
- if ! multilib_is_native_abi || use minimal ; then
- util_switch="--without"
- else
- util_switch="--with"
- fi
-
- # Tests fail if ECONF_SOURCE is not relative
- ECONF_SOURCE="../${P}" econf \
- --disable-maintainer-mode \
- $(use_enable cxx) \
- --disable-cpp-progs \
- --disable-example-progs \
- $(use_enable static-libs static) \
- $(use_enable cddb) \
- --disable-vcd-info \
- ${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/files/, dev-libs/libcdio/
@ 2022-08-17 16:21 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2022-08-17 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 86a18e9318d6bf1b327077e65f5a808ec5b7937d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 13:46:23 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 16:21:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a18e93
dev-libs/libcdio: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-libs/libcdio/Manifest | 1 -
.../libcdio/files/libcdio-2.0.0-iso-ioleak.patch | 37 -----------
dev-libs/libcdio/libcdio-2.0.0-r1.ebuild | 76 ----------------------
3 files changed, 114 deletions(-)
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index abf85af3b16a..5c2a9619040b 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,2 +1 @@
-DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f
DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
diff --git a/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch b/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch
deleted file mode 100644
index 17732104c3d1..000000000000
--- a/dev-libs/libcdio/files/libcdio-2.0.0-iso-ioleak.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8c0de2d3f0324ecf3fd135589589dcd783c15556 Mon Sep 17 00:00:00 2001
-From: rocky <rocky@gnu.org>
-Date: Fri, 16 Feb 2018 09:14:17 -0500
-Subject: Fix small I/O leak when we can't read ISO file
-
-See Savannah bug #53170. Thanks to David Binderman.
----
- src/iso-read.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/iso-read.c b/src/iso-read.c
-index 0541e27..8647485 100644
---- a/src/iso-read.c
-+++ b/src/iso-read.c
-@@ -1,5 +1,6 @@
- /*
-- Copyright (C) 2004-2006, 2008, 2012-2013, 2017 Rocky Bernstein <rocky@gnu.org>
-+ Copyright (C) 2004-2006, 2008, 2012-2013, 2017-2018 Rocky Bernstein
-+ <rocky@gnu.org>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
-@@ -364,7 +365,10 @@ main(int argc, char *argv[])
- ret = read_iso_file (opts.iso9660_image, opts.file_name,
- outfd, &bytes_written);
- }
-- if (ret != 0) return ret;
-+ if (ret != 0) {
-+ fclose (outfd);
-+ return ret;
-+ }
-
- fflush (outfd);
-
---
-cgit v1.0-41-gc330
-
diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
deleted file mode 100644
index 4144e54f2f0d..000000000000
--- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="A library to encapsulate CD-ROM reading and control"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/18" # subslot is based on SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cddb +cxx minimal static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- !minimal? (
- >=sys-libs/ncurses-5.7-r7:0=
- cddb? ( >=media-libs/libcddb-1.3.2 )
- )
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- sys-apps/sed
- sys-devel/gettext
- virtual/pkgconfig
- test? ( dev-lang/perl )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README{,.libcdio} THANKS TODO )
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/cdio/cdio_config.h
- /usr/include/cdio/version.h
-)
-
-PATCHES=( "${FILESDIR}/${P}-iso-ioleak.patch" )
-
-src_prepare() {
- default
-
- eautoreconf
-
- sed \
- -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
- -i configure || die
-
- elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
-}
-
-multilib_src_configure() {
- local util_switch
- if ! multilib_is_native_abi || use minimal ; then
- util_switch="--without"
- else
- util_switch="--with"
- fi
-
- # Tests fail if ECONF_SOURCE is not relative
- ECONF_SOURCE="../${P}" econf \
- --disable-maintainer-mode \
- $(use_enable cxx) \
- --disable-cpp-progs \
- --disable-example-progs \
- $(use_enable static-libs static) \
- $(use_enable cddb) \
- --disable-vcd-info \
- ${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/files/, dev-libs/libcdio/
@ 2023-09-16 11:44 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-09-16 11:44 UTC (permalink / raw
To: gentoo-commits
commit: d534bf00beacd0267825f4bcb21ad9caad9a99a1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 11:43:49 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 11:44:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d534bf00
dev-libs/libcdio: backport test(-only) fix
No revbump as it only affects the tests themselves (and fixes an error
in the tests), not runtime behaviour at all.
Closes: https://bugs.gentoo.org/834342
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libcdio-2.1.0-realpath-test-fix.patch | 48 ++++++++++++++++++++++
dev-libs/libcdio/libcdio-2.1.0-r1.ebuild | 1 +
2 files changed, 49 insertions(+)
diff --git a/dev-libs/libcdio/files/libcdio-2.1.0-realpath-test-fix.patch b/dev-libs/libcdio/files/libcdio-2.1.0-realpath-test-fix.patch
new file mode 100644
index 000000000000..10325682aec2
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-2.1.0-realpath-test-fix.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/834342
+https://git.savannah.gnu.org/cgit/libcdio.git/commit/?id=56335fff0f21d294cd0e478d49542a43e9495ed0
+
+From 56335fff0f21d294cd0e478d49542a43e9495ed0 Mon Sep 17 00:00:00 2001
+From: "R. Bernstein" <rocky@gnu.org>
+Date: Wed, 24 Aug 2022 14:34:33 -0400
+Subject: Correct realpath test failure
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+See https://savannah.gnu.org/bugs/?62948
+Patch courtesy of Martin Liška <marxin>
+--- a/test/driver/realpath.c
++++ b/test/driver/realpath.c
+@@ -1,5 +1,7 @@
+ /* -*- C -*-
+- Copyright (C) 2010-2012, 2015, 2017 Rocky Bernstein <rocky@gnu.org>
++
++ Copyright (C) 2010-2012, 2015, 2017, 2022 Rocky Bernstein
++ <rocky@gnu.org>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -175,16 +177,17 @@ main(int argc, const char *argv[])
+ rc = check_rc(symlink(psz_symlink_file, psz_symlink_file),
+ "symlink", psz_symlink_file);
+ if (0 == rc) {
+- cdio_realpath(psz_symlink_file, psz_file_check);
+- if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
++ char *retvalue = cdio_realpath(psz_symlink_file, psz_file_check);
++ if (0 != retvalue) {
++ if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
+ fprintf(stderr, "direct cdio_realpath cycle test failed. %s vs %s\n",
+ psz_file_check, symlink_file);
+ rc = 5;
+ goto err_exit;
++ }
++ check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
+ }
+- check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
+ }
+-
+ }
+
+ check_rc(unlink(psz_orig_file), "unlink", psz_orig_file);
+--
+cgit v1.1
diff --git a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
index 43365dc41f6e..122dfa96d536 100644
--- a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -38,6 +38,7 @@ MULTILIB_WRAPPED_HEADERS=(
PATCHES=(
"${FILESDIR}/${PN}-2.1.0-ncurses_pkgconfig.patch"
+ "${FILESDIR}/${P}-realpath-test-fix.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-09-16 11:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-11 22:47 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/files/, dev-libs/libcdio/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2023-09-16 11:44 Sam James
2022-08-17 16:21 Matt Turner
2019-04-18 15:25 Lars Wendler
2017-11-27 17:59 Andreas Sturmlechner
2017-11-24 14:13 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox