* [gentoo-commits] repo/gentoo:master commit in: media-sound/orpheus/, media-sound/orpheus/files/
@ 2020-01-26 20:08 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-01-26 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 976e5f54d60a1fef5b3a87744a598dcc4856d23e
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 20:08:39 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 20:08:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=976e5f54
media-sound/orpheus: Fix for gettext-0.20
Closes: https://bugs.gentoo.org/686052
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/orpheus-1.6-fix-buildsystem.patch | 61 +++++++++++++---------
media-sound/orpheus/orpheus-1.6-r3.ebuild | 31 +++++------
2 files changed, 49 insertions(+), 43 deletions(-)
diff --git a/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch b/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch
index 5819fe9a053..35f229ed3cf 100644
--- a/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch
+++ b/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch
@@ -1,5 +1,5 @@
---- orpheus-1.6/configure.ac
-+++ orpheus-1.6/configure.ac
+--- a/configure.in
++++ b/configure.in
@@ -1,5 +1,5 @@
-AC_INIT(aclocal.m4)
-AM_INIT_AUTOMAKE(orpheus, 1.6)
@@ -18,7 +18,7 @@
### use option --enable-locales-fix to fix problems with double-byte
### encodings on systems with broken locale, iscntrl()
-@@ -20,30 +20,21 @@
+@@ -20,30 +21,21 @@
AC_CHECK_HEADERS(sys/soundcard.h soundcard.h machine/soundcard.h, break)
@@ -54,13 +54,14 @@
+LIBS="$LIBS $LIBICONV $DEPENDENCIES_LIBS"
ALL_LINGUAS="ru ca"
- AM_GNU_GETTEXT
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
AC_CONFIG_SUBDIRS(kkstrtext-0.1 kkconsui-0.1)
-AC_OUTPUT(Makefile src/Makefile src/abstract/Makefile po/Makefile.in intl/Makefile)
+AC_CONFIG_FILES([Makefile src/Makefile src/abstract/Makefile po/Makefile.in intl/Makefile])
+AC_OUTPUT
---- orpheus-1.6/kkconsui-0.1/configure.ac
-+++ orpheus-1.6/kkconsui-0.1/configure.ac
+--- a/kkconsui-0.1/configure.in
++++ b/kkconsui-0.1/configure.in
@@ -6,7 +6,7 @@
AC_PROG_CC
AC_PROG_CXX
@@ -70,8 +71,8 @@
### use option --enable-locales-fix to fix problems with double-byte
### encodings on systems with broken locale, iscntrl()
---- orpheus-1.6/kkstrtext-0.1/configure.ac
-+++ orpheus-1.6/kkstrtext-0.1/configure.ac
+--- a/kkstrtext-0.1/configure.in
++++ b/kkstrtext-0.1/configure.in
@@ -6,6 +6,7 @@
AC_PROG_CC
AC_PROG_CXX
@@ -80,8 +81,16 @@
AC_CHECK_HEADERS(_G_config.h)
AC_LANG_CPLUSPLUS
---- orpheus-1.6/po/Makefile.in.in
-+++ orpheus-1.6/po/Makefile.in.in
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = kkstrtext-0.1 kkconsui-0.1 intl po src
++SUBDIRS = kkstrtext-0.1 kkconsui-0.1 po src
+ dist-hook:
+ cd $(top_distdir); subs=`egrep "^[:space:]*SUBDIRS" Makefile.am | sed 's/SUBDIRS[ =]\+//g'`; \
+ echo "SUBDIRS = kkstrtext-0.1 kkconsui-0.1 $$subs" >>.makefile.am; \
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
@@ -29,7 +29,7 @@
INSTALL = @INSTALL@
@@ -91,8 +100,8 @@
mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
GMSGFMT = @GMSGFMT@
---- orpheus-1.6/src/cdtrack.cc
-+++ orpheus-1.6/src/cdtrack.cc
+--- a/src/cdtrack.cc
++++ b/src/cdtrack.cc
@@ -22,6 +22,8 @@
*
*/
@@ -102,8 +111,8 @@
#include "cdtrack.h"
#include "playlist.h"
---- orpheus-1.6/src/main.cc
-+++ orpheus-1.6/src/main.cc
+--- a/src/main.cc
++++ b/src/main.cc
@@ -21,6 +21,9 @@
* USA
*
@@ -114,8 +123,8 @@
#include "uitext.h"
#include "cdtrack.h"
#include "mp3track.h"
---- orpheus-1.6/src/mp3track.cc
-+++ orpheus-1.6/src/mp3track.cc
+--- a/src/mp3track.cc
++++ b/src/mp3track.cc
@@ -22,6 +22,8 @@
*
*/
@@ -125,8 +134,8 @@
#include "mp3track.h"
#include "orpheusconf.h"
---- orpheus-1.6/src/oggtrack.cc
-+++ orpheus-1.6/src/oggtrack.cc
+--- a/src/oggtrack.cc
++++ b/src/oggtrack.cc
@@ -22,6 +22,8 @@
*
*/
@@ -136,8 +145,8 @@
#include "oggtrack.h"
#include "orpheusconf.h"
---- orpheus-1.6/src/orpheusconf.cc
-+++ orpheus-1.6/src/orpheusconf.cc
+--- a/src/orpheusconf.cc
++++ b/src/orpheusconf.cc
@@ -22,6 +22,8 @@
*
*/
@@ -147,8 +156,8 @@
#include "orpheusconf.h"
#include <sys/stat.h>
---- orpheus-1.6/src/playlist.cc
-+++ orpheus-1.6/src/playlist.cc
+--- a/src/playlist.cc
++++ b/src/playlist.cc
@@ -22,6 +22,8 @@
*
*/
@@ -158,8 +167,8 @@
#include "playlist.h"
#include "mp3track.h"
#include "oggtrack.h"
---- orpheus-1.6/src/streamtrack.cc
-+++ orpheus-1.6/src/streamtrack.cc
+--- a/src/streamtrack.cc
++++ b/src/streamtrack.cc
@@ -22,6 +22,8 @@
*
*/
@@ -169,8 +178,8 @@
#include "streamtrack.h"
#include "playlist.h"
---- orpheus-1.6/src/uitext.cc
-+++ orpheus-1.6/src/uitext.cc
+--- a/src/uitext.cc
++++ b/src/uitext.cc
@@ -22,6 +22,8 @@
*
*/
diff --git a/media-sound/orpheus/orpheus-1.6-r3.ebuild b/media-sound/orpheus/orpheus-1.6-r3.ebuild
index d56b810a102..cd2786b8a7b 100644
--- a/media-sound/orpheus/orpheus-1.6-r3.ebuild
+++ b/media-sound/orpheus/orpheus-1.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,26 +21,23 @@ RDEPEND="sys-libs/ncurses:0=
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}/1.5-amd64.patch"
- "${FILESDIR}/101_fix-buffer-overflow.diff"
- "${FILESDIR}/${P}-fix-buildsystem.patch"
- "${FILESDIR}/${P}-cppflags.patch"
- "${FILESDIR}/${P}-bufsize.patch"
- "${FILESDIR}/${P}-gcc47.patch"
- "${FILESDIR}/${P}-constify.patch"
+ "${FILESDIR}"/1.5-amd64.patch
+ "${FILESDIR}"/101_fix-buffer-overflow.diff
+ "${FILESDIR}"/${P}-fix-buildsystem.patch
+ "${FILESDIR}"/${P}-cppflags.patch
+ "${FILESDIR}"/${P}-bufsize.patch
+ "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-constify.patch
)
src_prepare() {
- # rename all configure.in files to prevent future
- # autoconf breakage
- local i
- for i in "" "kkstrtext-0.1" "kkconsui-0.1"
- do
- mv ./${i}/configure.{in,ac} || die
- done
-
default
- cp "${S}"/{config.rpath,kkstrtext-0.1} || die
+
+ cp config.rpath kkstrtext-0.1/ || die
+
+ mv configure.{in,ac} || die
+ mv kkstrtext-0.1/configure.{in,ac} || die
+ mv kkconsui-0.1/configure.{in,ac} || die
eautoreconf
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/orpheus/, media-sound/orpheus/files/
@ 2021-12-29 7:10 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-12-29 7:10 UTC (permalink / raw
To: gentoo-commits
commit: 6d41e4cd7dcfcd7825098b194e68119362022353
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 07:00:58 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 07:10:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d41e4cd
media-sound/orpheus: update EAPI 6 -> 7, fix build on musl
Closes: https://bugs.gentoo.org/715698
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../orpheus/files/orpheus-1.6-musl-stdint.patch | 31 ++++++++++++++++++++++
media-sound/orpheus/orpheus-1.6-r3.ebuild | 6 ++---
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch b/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch
new file mode 100644
index 000000000000..9665d342b6f2
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-musl-stdint.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/715698
+--- a/src/mp3track.cc
++++ b/src/mp3track.cc
+@@ -33,6 +33,7 @@
+ #include <sys/stat.h>
+ #include <signal.h>
+ #include <unistd.h>
++#include <stdint.h>
+ #include <stdio.h>
+ #include <netinet/in.h>
+
+@@ -55,8 +56,8 @@ static int cpid = -1, trackcount = 0;
+ static FILE *fpread, *fpwrite;
+ static char cbuf[65535];
+
+-static u_int32_t extract_bitfield(unsigned char *h, int start, int end) {
+- u_int32_t hdr;
++static uint32_t extract_bitfield(unsigned char *h, int start, int end) {
++ uint32_t hdr;
+ memcpy(&hdr, h, 4);
+ hdr = ntohl(hdr);
+ hdr = hdr << start;
+@@ -237,7 +238,7 @@ void mp3track::readtag() {
+ 11025, 12000, 8000, 0
+ };
+
+- u_int32_t aux;
++ uint32_t aux;
+ int i, filelen;
+
+ if(f.is_open()) {
diff --git a/media-sound/orpheus/orpheus-1.6-r3.ebuild b/media-sound/orpheus/orpheus-1.6-r3.ebuild
index cd2786b8a7b5..2c29e8793369 100644
--- a/media-sound/orpheus/orpheus-1.6-r3.ebuild
+++ b/media-sound/orpheus/orpheus-1.6-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
@@ -12,7 +12,6 @@ SRC_URI="http://konst.org.ua/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
-IUSE=""
RDEPEND="sys-libs/ncurses:0=
media-libs/libvorbis
@@ -28,6 +27,7 @@ PATCHES=(
"${FILESDIR}"/${P}-bufsize.patch
"${FILESDIR}"/${P}-gcc47.patch
"${FILESDIR}"/${P}-constify.patch
+ "${FILESDIR}"/${P}-musl-stdint.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/orpheus/, media-sound/orpheus/files/
@ 2023-06-23 5:41 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2023-06-23 5:41 UTC (permalink / raw
To: gentoo-commits
commit: 6b7f492e66ba9685d3b2634d2b3374f9c0d41c06
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Tue Jun 20 05:55:27 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 05:41:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b7f492e
media-sound/orpheus: Fix build \w clang-16
Mainly dropping register storage class and replacing some functions
which are removed in C++17.
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://bugs.gentoo.org/897794
Closes: https://bugs.gentoo.org/740478
Closes: https://github.com/gentoo/gentoo/pull/31549
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/orpheus-1.6-fix-build-w-clang-16.patch | 87 ++++++++++++++++++++++
media-sound/orpheus/orpheus-1.6-r4.ebuild | 44 +++++++++++
2 files changed, 131 insertions(+)
diff --git a/media-sound/orpheus/files/orpheus-1.6-fix-build-w-clang-16.patch b/media-sound/orpheus/files/orpheus-1.6-fix-build-w-clang-16.patch
new file mode 100644
index 000000000000..603b6767f250
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-fix-build-w-clang-16.patch
@@ -0,0 +1,87 @@
+Bug: https://bugs.gentoo.org/897794
+Some replacements for making it possible to be built with clang-16
+Some of the functions (for eample binary_function and bind1st) are removed in C++17
+--- a/kkconsui-0.1/src/texteditor.cc
++++ b/kkconsui-0.1/src/texteditor.cc
+@@ -791,7 +791,8 @@ void texteditor::showline(int ln, int startx, int distance, int extrax) {
+ const char *p;
+
+ if(!(cs = (char *) curfile->lines->at(ln))) return;
+- char cp[i = (strlen(cs)+1)*4];
++ i = (strlen(cs)+1)*4;
++ char cp[i];
+ char buf[i];
+
+ eolstart = i;
+--- a/kkstrtext-0.1/kkstrtext.cc
++++ b/kkstrtext-0.1/kkstrtext.cc
+@@ -167,7 +167,7 @@ string toutf8(const string &text) {
+ }
+
+ char *unmime(char *text) {
+- register int s, d;
++ int s, d;
+ int htm;
+
+ for(s = 0, d = 0; text[s] != 0; s++) {
+@@ -185,7 +185,7 @@ char *unmime(char *text) {
+ }
+
+ char *mime(char *dst, const char *src) {
+- register int s, d;
++ int s, d;
+ char c;
+
+ for(s = 0, d = 0; src[s]; s++) {
+--- a/src/cdtrack.cc
++++ b/src/cdtrack.cc
+@@ -45,8 +45,12 @@ int cdfd = -1, numtracks;
+ string cddbquery, cdid, cdtitle;
+ bool ejected = false;
+
+-struct istracknumber: public binary_function<int, const track*, bool> {
+- public: bool operator()(int n, const track *c) const {
++struct istracknumber {
++ public:
++ using first_argument_type = int;
++ using second_argument_type = const track*;
++ using result_type = bool;
++ bool operator()(int n, const track *c) const {
+ const cdtrack *cdt = static_cast<const cdtrack *>(c);
+
+ if(cdt) {
+@@ -104,7 +108,7 @@ vector<string> cdtrack::getstatus() const {
+
+ r.push_back("CD: " + cdtitle + "; " + buf);
+
+- it = find_if(plist.begin(), plist.end(), bind1st(istracknumber(), subc.cdsc_trk));
++ it = find_if(plist.begin(), plist.end(), bind(istracknumber(), subc.cdsc_trk, std::placeholders::_1));
+
+ if(it != plist.end()) {
+ cdtrack *ct = static_cast<cdtrack *>(*it);
+@@ -332,7 +336,7 @@ bool cdtrack::loadtracks(const string &fname) {
+
+ } else if(param.substr(0, 6) == "TTITLE") {
+ ntrack = strtoul(param.substr(6).c_str(), 0, 0);
+- it = find_if(plist.begin(), plist.end(), bind1st(istracknumber(), ntrack+1));
++ it = find_if(plist.begin(), plist.end(), bind(istracknumber(), ntrack+1, std::placeholders::_1));
+
+ if(it != plist.end()) {
+ cdtrack *ct = static_cast<cdtrack *>(*it);
+--- a/src/streamtrack.cc
++++ b/src/streamtrack.cc
+@@ -283,8 +283,12 @@ string streamtrack::makerequest(const string &url) {
+ return reply;
+ }
+
+-struct equals_url: public binary_function<const char *, const track*, bool> {
+- public: bool operator()(const char *aurl, const track *c) const {
++struct equals_url {
++ public:
++ using first_argument_type = const char*;
++ using second_argument_type = const track*;
++ using result_type = bool;
++ bool operator()(const char *aurl, const track *c) const {
+ const streamtrack *st = static_cast<const streamtrack *>(c);
+
+ if(st) {
diff --git a/media-sound/orpheus/orpheus-1.6-r4.ebuild b/media-sound/orpheus/orpheus-1.6-r4.ebuild
new file mode 100644
index 000000000000..493d42db27f7
--- /dev/null
+++ b/media-sound/orpheus/orpheus-1.6-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Command line MP3 player"
+HOMEPAGE="http://konst.org.ua/en/orpheus"
+SRC_URI="http://konst.org.ua/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="sys-libs/ncurses:0=
+ media-libs/libvorbis
+ media-sound/mpg123
+ media-sound/vorbis-tools[ogg123]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/1.5-amd64.patch
+ "${FILESDIR}"/101_fix-buffer-overflow.diff
+ "${FILESDIR}"/${P}-fix-buildsystem.patch
+ "${FILESDIR}"/${P}-cppflags.patch
+ "${FILESDIR}"/${P}-bufsize.patch
+ "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-constify.patch
+ "${FILESDIR}"/${P}-musl-stdint.patch
+ "${FILESDIR}"/${P}-fix-build-w-clang-16.patch
+)
+
+src_prepare() {
+ default
+
+ cp config.rpath kkstrtext-0.1/ || die
+
+ mv configure.{in,ac} || die
+ mv kkstrtext-0.1/configure.{in,ac} || die
+ mv kkconsui-0.1/configure.{in,ac} || die
+
+ eautoreconf
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-23 5:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-29 7:10 [gentoo-commits] repo/gentoo:master commit in: media-sound/orpheus/, media-sound/orpheus/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-06-23 5:41 Miroslav Šulc
2020-01-26 20:08 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox