public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mt-daapd/, media-sound/mt-daapd/files/
@ 2019-04-08 16:43 David Seifert
  0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2019-04-08 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     7973ae7960b6cd0827dfe217c43e59cf1004bc84
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  8 16:43:23 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Apr  8 16:43:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7973ae79

media-sound/mt-daapd: Port to EAPI 7

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../mt-daapd/files/mt-daapd-0.2.3-sparc.patch      |  5 +-
 .../files/mt-daapd-0.2.4.1-libsorder.patch         |  9 ++-
 .../mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch  |  5 +-
 .../files/mt-daapd-0.2.4.2-maintainer-mode.patch   |  4 +-
 .../files/mt-daapd-0.2.4.2-oggvorbis.patch         |  4 +-
 media-sound/mt-daapd/files/mt-daapd.init.2         |  4 +-
 media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild       | 69 ++++++++++++----------
 7 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch
index 482b25c1377..71d3009c8ac 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch
@@ -1,6 +1,5 @@
-diff -Nura mt-daapd-0.2.3/src/mp3-scanner.c mt-daapd-0.2.3.sparc/src/mp3-scanner.c
---- mt-daapd-0.2.3/src/mp3-scanner.c	2005-02-05 18:22:47.000000000 -0300
-+++ mt-daapd-0.2.3.sparc/src/mp3-scanner.c	2006-01-03 16:39:50.000000000 -0300
+--- a/src/mp3-scanner.c
++++ b/src/mp3-scanner.c
 @@ -1663,14 +1663,14 @@
      /* now check for an XING header */
      if(strncasecmp((char*)&buffer[index+fi.xing_offset+4],"XING",4) == 0) {

diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
index a4c5a176ada..91d9e848c12 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
@@ -1,6 +1,5 @@
-diff -ur mt-daapd-0.2.4.1.orig/configure.in mt-daapd-0.2.4.1/configure.in
---- mt-daapd-0.2.4.1.orig/configure.in	2007-10-22 02:50:24.000000000 +0300
-+++ mt-daapd-0.2.4.1/configure.in	2007-10-28 23:31:43.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -20,8 +20,9 @@
  CPPFLAGS="${CPPFLAGS} -g"
  
@@ -126,8 +125,8 @@ diff -ur mt-daapd-0.2.4.1.orig/configure.in mt-daapd-0.2.4.1/configure.in
    fi
  fi
 diff -ur mt-daapd-0.2.4.1.orig/src/Makefile.am mt-daapd-0.2.4.1/src/Makefile.am
---- mt-daapd-0.2.4.1.orig/src/Makefile.am	2007-10-22 03:32:27.000000000 +0300
-+++ mt-daapd-0.2.4.1/src/Makefile.am	2007-10-28 23:31:33.000000000 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -34,6 +34,9 @@
  	redblack.c redblack.h dynamic-art.c dynamic-art.h query.c query.h \
  	$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(OGGVORBISSRC) $(ARENDSRC)

diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
index 5976316e5bf..71178f67811 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
@@ -1,6 +1,5 @@
-diff -ur mt-daapd-0.2.4.1.orig/src/main.c mt-daapd-0.2.4.1/src/main.c
---- mt-daapd-0.2.4.1.orig/src/main.c	2007-10-22 02:27:57.000000000 +0300
-+++ mt-daapd-0.2.4.1/src/main.c	2007-10-28 23:54:29.000000000 +0200
+--- a/src/main.c
++++ b/src/main.c
 @@ -551,6 +551,7 @@
      printf("  -m             Disable mDNS\n");
      printf("  -c <file>      Use configfile specified\n");

diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch
index a81483db6a1..7fc127fa695 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2008-07-06 23:57:08.000000000 +0200
-+++ configure.in	2008-07-06 23:57:46.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -17,10 +17,12 @@
  rend_posix=true
  

diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch
index 714f34142ac..b0352587a96 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2009-03-11 08:15:14.000000000 -0500
-+++ configure.in	2009-03-11 08:25:36.000000000 -0500
+--- a/configure.in
++++ b/configure.in
 @@ -63,9 +63,14 @@
  AC_SUBST(AVAHI_LIBS)
  

diff --git a/media-sound/mt-daapd/files/mt-daapd.init.2 b/media-sound/mt-daapd/files/mt-daapd.init.2
index eacc6ea7b7e..c77b7dd2bb5 100644
--- a/media-sound/mt-daapd/files/mt-daapd.init.2
+++ b/media-sound/mt-daapd/files/mt-daapd.init.2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # Somehow based on init.d file shipped with mt-daapd itself.
 #
@@ -26,7 +26,7 @@ fi
 
 depend() {
 	need net
-	#USEHOWL need mDNSResponderPosix
+	need avahi-daemon
 }
 
 start() {

diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
index a36e59993f8..572b7c21787 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A multi-threaded implementation of Apple's DAAP server"
-HOMEPAGE="http://www.mt-daapd.org"
+HOMEPAGE="https://sourceforge.net/projects/mt-daapd/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -13,63 +14,69 @@ SLOT="0"
 KEYWORDS="amd64 arm ~hppa ~mips ppc sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="vorbis"
 
-RDEPEND="media-libs/libid3tag
-	sys-libs/gdbm
-	net-dns/avahi[dbus]
-	vorbis? ( media-libs/libvorbis )"
+RDEPEND="
+	media-libs/libid3tag:=
+	net-dns/avahi:=[dbus]
+	sys-libs/gdbm:=
+	sys-libs/zlib:=
+	vorbis? (
+		media-libs/libvorbis:=
+		media-libs/libogg:=
+	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	cp "${FILESDIR}"/${PN}.init.2 initd
-
-	sed -i -e 's:#USEHOWL need mDNSResponderPosix:need avahi-daemon:' initd
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.3-sparc.patch
+	"${FILESDIR}"/${PN}-0.2.4.1-libsorder.patch
+	"${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch
+	"${FILESDIR}"/${P}-maintainer-mode.patch
+	"${FILESDIR}"/${P}-oggvorbis.patch
+)
 
-	epatch "${FILESDIR}"/${PN}-0.2.3-sparc.patch \
-		"${FILESDIR}"/${PN}-0.2.4.1-libsorder.patch \
-		"${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch \
-		"${FILESDIR}"/${P}-maintainer-mode.patch \
-		"${FILESDIR}"/${P}-oggvorbis.patch
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable vorbis oggvorbis) \
+	econf \
+		$(use_enable vorbis oggvorbis) \
 		--disable-maintainer-mode \
 		--enable-avahi \
 		--disable-mdns
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	default
 
 	insinto /etc
 	newins contrib/mt-daapd.conf mt-daapd.conf.example
 	doins contrib/mt-daapd.playlist
 
-	newinitd initd ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
 
 	keepdir /var/cache/mt-daapd /etc/mt-daapd.d
-	dodoc AUTHORS ChangeLog CREDITS NEWS README TODO
 }
 
 pkg_postinst() {
-	einfo
+	elog
 	elog "You have to configure your mt-daapd.conf following"
-	elog "/etc/mt-daapd.conf.example file."
-	einfo
+	elog "${EROOT}/etc/mt-daapd.conf.example file."
+	elog
 
 	if use vorbis; then
-		einfo
-		elog "You need to edit you extensions list in /etc/mt-daapd.conf"
+		elog
+		elog "You need to edit you extensions list in ${EROOT}/etc/mt-daapd.conf"
 		elog "if you want your mt-daapd to serve ogg files."
-		einfo
+		elog
 	fi
 
-	einfo
+	elog
 	elog "If you want to start more than one ${PN} service, symlink"
-	elog "/etc/init.d/${PN} to /etc/init.d/${PN}.<name>, and it will"
-	elog "load the data from /etc/${PN}.d/<name>.conf."
+	elog "${EROOT}/etc/init.d/${PN} to ${EROOT}/etc/init.d/${PN}.<name>, and it will"
+	elog "load the data from ${EROOT}/etc/${PN}.d/<name>.conf."
 	elog "Make sure that you have different cache directories for them."
-	einfo
+	elog
 }


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mt-daapd/, media-sound/mt-daapd/files/
@ 2023-02-12  2:04 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-02-12  2:04 UTC (permalink / raw
  To: gentoo-commits

commit:     0ef37beab8dd53a9badc9a4a953093fdef1fc757
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 23:30:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 02:03:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef37bea

media-sound/mt-daapd: update EAPI 7 -> 8; fix musl; fix clang 16

- EAPI 8
- Fix musl build
- Fix Clang 16 compat
- Use tmpfiles for /var/cache

Closes: https://bugs.gentoo.org/875011
Closes: https://bugs.gentoo.org/860879
Closes: https://bugs.gentoo.org/520582
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch  | 80 ++++++++++++++++++
 .../mt-daapd/files/mt-daapd-0.2.4.2-musl.patch     | 32 ++++++++
 media-sound/mt-daapd/files/mt-daapd.tmpfiles       |  1 +
 media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild    | 95 ++++++++++++++++++++++
 4 files changed, 208 insertions(+)

diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch
new file mode 100644
index 000000000000..3380cc0da44a
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch
@@ -0,0 +1,80 @@
+https://bugs.gentoo.org/860879
+https://bugs.gentoo.org/875011
+--- a/configure.in
++++ b/configure.in
+@@ -21,6 +21,9 @@ CPPFLAGS="${CPPFLAGS} -g"
+ 
+ AM_MAINTAINER_MODE
+ 
++# For strcasestr
++AC_USE_SYSTEM_EXTENSIONS
++
+ dnl fix freebsd's broken (?) libpthread
+ AC_CHECK_LIB(c_r,pthread_creat,THREAD_LIBS="-lc_r", [
+   AC_CHECK_LIB(pthread,pthread_create,THREAD_LIBS="-lpthread") ])
+--- a/src/configfile.c
++++ b/src/configfile.c
+@@ -48,6 +48,7 @@
+ #include <sys/wait.h>
+ 
+ #include "configfile.h"
++#include "db-memory.h"
+ #include "err.h"
+ 
+ #ifndef WITHOUT_MDNS
+--- a/src/dynamic-art.c
++++ b/src/dynamic-art.c
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
+ 
+ #include "configfile.h"
++#include "dynamic-art.h"
+ #include "err.h"
+ #include "playlist.h"
+ #include "restart.h"
+--- a/src/mp3-scanner.h
++++ b/src/mp3-scanner.h
+@@ -74,5 +74,6 @@ extern void make_composite_tags(MP3FILE *song);
+ 
+ /* this should be refactored out of here... */
+ extern off_t aac_drilltoatom(FILE *aac_fp, char *atom_path, unsigned int *atom_length);
++extern long scan_aac_findatom(FILE *fin, long max_offset, char *which_atom, int *atom_size);
+ 
+ #endif /* _MP3_SCANNER_H_ */
+--- a/src/parser.y
++++ b/src/parser.y
+@@ -26,11 +26,14 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ #include "playlist.h"
+ 
++#define YYPARSE_PARAM
+ #define YYERROR_VERBOSE 1
+ 
+ extern int yyerror(char *msg);
++extern int yylex(void);
+ 
+ /* Forwards */
+ 
+--- a/src/query.c
++++ b/src/query.c
+@@ -2,6 +2,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <ctype.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+--- a/src/webserver.c
++++ b/src/webserver.c
+@@ -41,6 +41,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ 
++#include "configfile.h"
+ #include "err.h"
+ #include "webserver.h"
+ 

diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-musl.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-musl.patch
new file mode 100644
index 000000000000..707b7ac3b828
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-musl.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/716010
+--- a/src/mp3-scanner.c
++++ b/src/mp3-scanner.c
+@@ -378,7 +378,7 @@ int scan_init(char *path) {
+  */
+ int scan_path(char *path) {
+     DIR *current_dir;
+-    char de[sizeof(struct dirent) + MAXNAMLEN + 1]; /* overcommit for solaris */
++    char de[sizeof(struct dirent) + NAME_MAX + 1]; /* overcommit for solaris */
+     struct dirent *pde;
+     int err;
+     char mp3_path[PATH_MAX];
+--- a/src/webserver.c
++++ b/src/webserver.c
+@@ -1029,14 +1029,14 @@ int ws_returnerror(WS_CONNINFO *pwsc,int error, char *description) {
+  * and serves it up
+  */
+ void ws_defaulthandler(WS_PRIVATE *pwsp, WS_CONNINFO *pwsc) {
+-    char path[MAXPATHLEN];
+-    char resolved_path[MAXPATHLEN];
++    char path[PATH_MAX];
++    char resolved_path[PATH_MAX];
+     int file_fd;
+     off_t len;
+ 
+     DPRINTF(E_SPAM,L_WS,"Entering ws_defaulthandler\n");
+ 
+-    snprintf(path,MAXPATHLEN,"%s/%s",pwsp->wsconfig.web_root,pwsc->uri);
++    snprintf(path,PATH_MAX,"%s/%s",pwsp->wsconfig.web_root,pwsc->uri);
+     if(!realpath(path,resolved_path)) {
+         pwsc->error=errno;
+         DPRINTF(E_WARN,L_WS,"Exiting ws_defaulthandler: Cannot resolve %s\n",path);

diff --git a/media-sound/mt-daapd/files/mt-daapd.tmpfiles b/media-sound/mt-daapd/files/mt-daapd.tmpfiles
new file mode 100644
index 000000000000..e0923ac06d7c
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd.tmpfiles
@@ -0,0 +1 @@
+d /var/cache/mt-daapd 0755 root root -

diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild
new file mode 100644
index 000000000000..1ef6c391d0db
--- /dev/null
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools tmpfiles
+
+DESCRIPTION="A multi-threaded implementation of Apple's DAAP server"
+HOMEPAGE="https://sourceforge.net/projects/mt-daapd/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="vorbis"
+
+RDEPEND="
+	media-libs/libid3tag:=
+	net-dns/avahi[dbus]
+	sys-libs/gdbm:=
+	sys-libs/zlib:=
+	vorbis? (
+		media-libs/libvorbis
+		media-libs/libogg
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/yacc
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.3-sparc.patch
+	"${FILESDIR}"/${PN}-0.2.4.1-libsorder.patch
+	"${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch
+	"${FILESDIR}"/${P}-maintainer-mode.patch
+	"${FILESDIR}"/${P}-oggvorbis.patch
+	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-musl.patch
+)
+
+src_prepare() {
+	default
+
+	# parser.y is fixed by the clang16 patch, force regeneration
+	rm src/parser.c || die
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable vorbis oggvorbis) \
+		--disable-maintainer-mode \
+		--enable-avahi \
+		--disable-mdns
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins contrib/mt-daapd.conf mt-daapd.conf.example
+	doins contrib/mt-daapd.playlist
+
+	newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
+
+	keepdir /etc/mt-daapd.d
+
+	newtmpfiles "${FILESDIR}"/mt-daapd.tmpfiles mt-daapd.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process mt-daapd.conf
+
+	elog
+	elog "You have to configure your mt-daapd.conf following"
+	elog "${EROOT}/etc/mt-daapd.conf.example file."
+	elog
+
+	if use vorbis; then
+		elog
+		elog "You need to edit you extensions list in ${EROOT}/etc/mt-daapd.conf"
+		elog "if you want your mt-daapd to serve ogg files."
+		elog
+	fi
+
+	elog
+	elog "If you want to start more than one ${PN} service, symlink"
+	elog "${EROOT}/etc/init.d/${PN} to ${EROOT}/etc/init.d/${PN}.<name>, and it will"
+	elog "load the data from ${EROOT}/etc/${PN}.d/<name>.conf."
+	elog "Make sure that you have different cache directories for them."
+	elog
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mt-daapd/, media-sound/mt-daapd/files/
@ 2023-02-13  0:18 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-02-13  0:18 UTC (permalink / raw
  To: gentoo-commits

commit:     192cd4d71140674f42364774cfb1b9f809c27b74
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 00:17:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 00:17:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=192cd4d7

media-sound/mt-daapd: build with byacc

Incompatible with Bison 3 and this package is on life-support, long-dead
upstream.

Bug: https://bugs.gentoo.org/875011
Closes: https://bugs.gentoo.org/894024
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch | 2 +-
 media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild           | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch
index 3380cc0da44a..f9efbe4419bc 100644
--- a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-clang16.patch
@@ -50,7 +50,7 @@ https://bugs.gentoo.org/875011
 +#include <time.h>
  #include "playlist.h"
  
-+#define YYPARSE_PARAM
++#define YYPARSE_PARAM param
  #define YYERROR_VERBOSE 1
  
  extern int yyerror(char *msg);

diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild
index 1ef6c391d0db..0ed43fc3e9fb 100644
--- a/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2-r2.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	app-alternatives/yacc
+	dev-util/byacc
 	virtual/pkgconfig
 "
 
@@ -50,6 +50,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Incompatible with Bison 3, dead upstream
+	export YACC=byacc
+
 	econf \
 		$(use_enable vorbis oggvorbis) \
 		--disable-maintainer-mode \


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-02-13  0:18 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-12  2:04 [gentoo-commits] repo/gentoo:master commit in: media-sound/mt-daapd/, media-sound/mt-daapd/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-02-13  0:18 Sam James
2019-04-08 16:43 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox