public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-cdr/cuecue/files/, app-cdr/cuecue/
@ 2016-08-19  6:38 Jeroen Roovers
  0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2016-08-19  6:38 UTC (permalink / raw
  To: gentoo-commits

commit:     8ef6aaf69ff1bc21e8b0335cfe9baa312ca95bc9
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 06:37:43 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 06:38:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef6aaf6

app-cdr/cuecue: Fix build issues.

Package-Manager: portage-2.3.0

 app-cdr/cuecue/cuecue-0.2.2-r2.ebuild             | 53 +++++++++++++++++++++++
 app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff    |  5 +--
 app-cdr/cuecue/files/cuecue-0.2.2-namespace.patch | 12 +++++
 app-cdr/cuecue/files/cuecue-0.2.2-unused.patch    | 23 ++++++++++
 4 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild
new file mode 100644
index 0000000..9cf7789
--- /dev/null
+++ b/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin"
+HOMEPAGE="http://cuecue.berlios.de/"
+#SRC_URI="mirror://berlios/cuecue/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Enable one use flag by default, bug 254745"
+IUSE="flac mp3 +vorbis"
+REQUIRED_USE="|| ( flac mp3 vorbis )"
+
+DEPEND="
+	flac? ( media-libs/flac )
+	mp3? ( media-libs/libmad )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flac113.diff # bug 157706
+	"${FILESDIR}"/${P}-namespace.patch
+	"${FILESDIR}"/${P}-unused.patch
+)
+DOCS="CHANGES README TODO"
+
+src_configure() {
+	econf \
+		$(use_enable flac) \
+		$(use_enable mp3) \
+		$(use_enable vorbis ogg) \
+		--disable-dependency-tracking \
+		--disable-libFLACtest \
+		--disable-oggtest \
+		--disable-vorbistest
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	insinto /usr/include
+	doins src/libcuecue/cuecue.h
+}

diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff b/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
index 8a02521..ddf10dc 100644
--- a/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
@@ -1,6 +1,5 @@
-diff -Naur src.orig/libcuecue/flac.c src/libcuecue/flac.c
---- src.orig/libcuecue/flac.c	2004-09-22 04:28:21.000000000 +0200
-+++ src/libcuecue/flac.c	2007-02-27 23:25:36.000000000 +0100
+--- a/src/libcuecue/flac.c
++++ b/src/libcuecue/flac.c
 @@ -27,6 +27,12 @@
  #include "cuecue.h"
  #include "cuecue_internal.h"

diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-namespace.patch b/app-cdr/cuecue/files/cuecue-0.2.2-namespace.patch
new file mode 100644
index 0000000..42ebf42
--- /dev/null
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-namespace.patch
@@ -0,0 +1,12 @@
+--- a/src/libcuecue/cuecue.c
++++ b/src/libcuecue/cuecue.c
+@@ -24,7 +24,9 @@
+ 
+ 
+ #define LINE_MAX 1024
++#ifndef FILENAME_MAX
+ #define FILENAME_MAX 1024
++#endif
+ 
+ FUNC_DECODER decoders[]=
+ {

diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-unused.patch b/app-cdr/cuecue/files/cuecue-0.2.2-unused.patch
new file mode 100644
index 0000000..86874a2
--- /dev/null
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-unused.patch
@@ -0,0 +1,23 @@
+--- a/src/libcuecue/cuecue.c
++++ b/src/libcuecue/cuecue.c
+@@ -163,12 +163,8 @@
+ 	char str[CUECUE_FILENAME_MAX];
+ 	char *ext;
+ 	int i;
+-	int found=0;
+-
+-	ext = strrchr(filename,'.');
+ 
+ 	for(i=0; i<DECODER_MAX; i++) {
+-		char *ext;
+ 
+ 		strcpy(str,filename);
+ 		ext = strrchr(str,'.');
+@@ -176,7 +172,6 @@
+ 			strcpy(ext,Extensions[i]);
+ 			if (FileExists(str)) {
+ 				strcpy(cuefile,str);
+-				found=1;
+ 				return 1;
+ 			}
+ 		}


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

* [gentoo-commits] repo/gentoo:master commit in: app-cdr/cuecue/files/, app-cdr/cuecue/
@ 2020-05-15  7:33 Jeroen Roovers
  0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2020-05-15  7:33 UTC (permalink / raw
  To: gentoo-commits

commit:     b04f51efbcb86d59a1657347973e19168e5dd538
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 07:25:18 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri May 15 07:33:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b04f51ef

app-cdr/cuecue: Fix building with CFLAGS=-fno-common

Also:
- Drop flag-o-matic
- Set AR
- Set RDEPEND

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Closes: https://bugs.gentoo.org/show_bug.cgi?id=707444
Closes: https://bugs.gentoo.org/show_bug.cgi?id=722024
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 app-cdr/cuecue/cuecue-0.2.2-r3.ebuild              | 53 ++++++++++++++++++++++
 app-cdr/cuecue/files/cuecue-0.2.2-fno-common.patch | 11 +++++
 2 files changed, 64 insertions(+)

diff --git a/app-cdr/cuecue/cuecue-0.2.2-r3.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r3.ebuild
new file mode 100644
index 00000000000..03166b162e3
--- /dev/null
+++ b/app-cdr/cuecue/cuecue-0.2.2-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Enable one use flag by default, bug 254745"
+IUSE="flac mp3 +vorbis"
+REQUIRED_USE="|| ( flac mp3 vorbis )"
+
+DEPEND="
+	flac? ( media-libs/flac )
+	mp3? ( media-libs/libmad )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flac113.diff # bug 157706
+	"${FILESDIR}"/${P}-namespace.patch
+	"${FILESDIR}"/${P}-unused.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable flac) \
+		$(use_enable mp3) \
+		$(use_enable vorbis ogg) \
+		--disable-libFLACtest \
+		--disable-oggtest \
+		--disable-vorbistest
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	insinto /usr/include
+	doins src/libcuecue/cuecue.h
+}

diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-fno-common.patch b/app-cdr/cuecue/files/cuecue-0.2.2-fno-common.patch
new file mode 100644
index 00000000000..9eb8b18e838
--- /dev/null
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/libcuecue/cuecue_internal.h
++++ b/src/libcuecue/cuecue_internal.h
+@@ -57,7 +57,7 @@
+ typedef int (*FUNC_DECODER)(char* file_source, char* file_destination, PROGRESS_CALLBACK callback);
+ 
+ #define CUECUE_ERROR_LENGTH 1024
+-char cuecue_error[CUECUE_ERROR_LENGTH];
++extern char cuecue_error[CUECUE_ERROR_LENGTH];
+ 
+ #endif /* __CUECUE_INTERNAL__ */
+ 


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

* [gentoo-commits] repo/gentoo:master commit in: app-cdr/cuecue/files/, app-cdr/cuecue/
@ 2022-11-22  3:23 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-11-22  3:23 UTC (permalink / raw
  To: gentoo-commits

commit:     806eccf534d69aa1deaa266ec35491bb89cfa441
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 02:25:02 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 03:17:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=806eccf5

app-cdr/cuecue: fix configure w/ clang 16

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{cuecue-0.2.2-r4.ebuild => cuecue-0.2.2-r5.ebuild}      | 12 ++++++++++--
 app-cdr/cuecue/files/cuecue-0.2.2-configure.patch           | 13 +++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app-cdr/cuecue/cuecue-0.2.2-r4.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r5.ebuild
similarity index 88%
rename from app-cdr/cuecue/cuecue-0.2.2-r4.ebuild
rename to app-cdr/cuecue/cuecue-0.2.2-r5.ebuild
index 72d3a48deb62..24e5f7cca2ac 100644
--- a/app-cdr/cuecue/cuecue-0.2.2-r4.ebuild
+++ b/app-cdr/cuecue/cuecue-0.2.2-r5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -30,8 +30,16 @@ PATCHES=(
 	"${FILESDIR}"/${P}-namespace.patch
 	"${FILESDIR}"/${P}-unused.patch
 	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-configure.patch
 )
 
+src_prepare() {
+	default
+
+	# Clang 16
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable flac) \

diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-configure.patch b/app-cdr/cuecue/files/cuecue-0.2.2-configure.patch
new file mode 100644
index 000000000000..d0a9864228aa
--- /dev/null
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-configure.patch
@@ -0,0 +1,13 @@
+-ansi -pednatic breaks various configure tests. autoconf already says
+not to use -Werror but any -W* is dangerous for configure itself.
+--- a/configure.in
++++ b/configure.in
+@@ -4,7 +4,7 @@ dnl AM_INIT_AUTOMAKE
+ 
+ AC_CONFIG_SRCDIR(src/libcuecue/cuecue.c)
+ 
+-CFLAGS="$CFLAGS -Wall -ansi -pedantic -g -Os"
++CFLAGS="-Wall -O2 ${CFLAGS}"
+ VERSION=0.2.2
+ 
+ PACKAGE="cuecue"


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

end of thread, other threads:[~2022-11-22  3:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-22  3:23 [gentoo-commits] repo/gentoo:master commit in: app-cdr/cuecue/files/, app-cdr/cuecue/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2020-05-15  7:33 Jeroen Roovers
2016-08-19  6:38 Jeroen Roovers

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