summaryrefslogtreecommitdiff
path: root/media-sound/pwavecat
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/pwavecat')
-rw-r--r--media-sound/pwavecat/Manifest8
-rw-r--r--media-sound/pwavecat/files/pwavecat-0.4.5-Makefile.patch27
-rw-r--r--media-sound/pwavecat/files/pwavecat-0.4.5-fno-common.patch65
-rw-r--r--media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch2
-rw-r--r--media-sound/pwavecat/files/pwavecat-0.4.5-version.patch11
-rw-r--r--media-sound/pwavecat/files/pwavecat-0.4.5.diff27
-rw-r--r--media-sound/pwavecat/pwavecat-0.4.5.ebuild21
7 files changed, 119 insertions, 42 deletions
diff --git a/media-sound/pwavecat/Manifest b/media-sound/pwavecat/Manifest
index 5005c00e910f..8168c5aa9d75 100644
--- a/media-sound/pwavecat/Manifest
+++ b/media-sound/pwavecat/Manifest
@@ -1,5 +1,7 @@
-AUX pwavecat-0.4.5-overflow.patch 1255 BLAKE2B fba5c647534041b1e22884422dcc09d540d706ca716fa0b640061b12839cbe910d17bd1099bfed78e4633cc415855778290fe10afe1fe3441969d7c6d6f5277b SHA512 560281481a1de5550f8a491d77aed483a297c5d192d71d75d0aca2274c7afb15fa7ebe01070a07961f05c15fc0adbff41548e9722d9a94b369120b8ffea225c5
-AUX pwavecat-0.4.5.diff 823 BLAKE2B c6cbd638495c8dc1bf011c26fb6ee2bf07cfb3ca77b1c29fed56585f1680c0514055f1f3b446f7b57a30682d874b729b20af1aa76e0db2d04cb9f2df5d5c0f17 SHA512 a92e9f242cb79af4392f099b2fc2014c97676e679e2646cfb5eeb5fca8173e953c031eeee8e72de08efe68750773fae77d8009ee12a43ed8be7eff6d57818336
+AUX pwavecat-0.4.5-Makefile.patch 517 BLAKE2B 4251dc8fbb415ffa800bf4db13e9f4c8af717e2c12e06d23a61e9cfa21f6875d71a4bba002728288233cbdce71cb28056bba8df09df6c04b07d15ba86441fb2b SHA512 15c3dbb210ee6bb0a00b7553cc63b5748e91fb16ff16c80da71301645d7f39d96344211973c61a0712cbb75dd0b6466a9932d1c4e704e374977747be161e08e3
+AUX pwavecat-0.4.5-fno-common.patch 1321 BLAKE2B e05ff91073e186f4dd21db8206ce7a7a6c3265331d60bdf8e447eb82e380532159f7f5f35e1814064f586d8e93cf1de00be2bd6a0301c4de7badaa53f5e3b947 SHA512 364d10b624afcd4c1833526ee1e7bde59314a95d54f2430b2120498ce67793be66dfd947790ba8142957ea296fb8605adb6075b401da970e26e77d1d158238e3
+AUX pwavecat-0.4.5-overflow.patch 1194 BLAKE2B e26022b3f90857d066784ef7e6a28914fdfec98135a955325ffd6cc58a6cd0ad9b64e3214d8da27ffd0de6efff477c31054d4ac34dec1e0942608ffdd09a539e SHA512 3d8de7db2aa0522f8fd6a0b5c5c820822eb00ab22603bd8cb385870783e9dfee679712bfb6d6d7f439ffcbfcb5a8cfbecafa0ad71822510c181b2e93164f79ba
+AUX pwavecat-0.4.5-version.patch 172 BLAKE2B d5ad793c259b22116e7a4ab56693825853c06cf6c75702ee34e0fd0e475fa1b662539d9417bfbd2a27fa9fe3888834e4aea488240720094e410bbda5cdfd636c SHA512 41c6474b6e17572486f8215285d383933a3a8d6da2cdfc24f08784ceade3aebf94888ad513b357f90621a87783c30d1bcd79e9547f4869caa4b1d86790724b2d
DIST pwavecat-0.4.5.tgz 13110 BLAKE2B 084286e2e056f73ed410f23ecea245466934f8475bd4143d216df312a51c62335155381ddfa1db2e9d5fcacd35dfd9fbb27d8b8cf0af5d4cdc110b64e03a57d5 SHA512 3faa03d08cc1cde47294837c0295eeabb8461327c9e13caa317b985fc12bdc8d00ec7207411aad1325a54c7cc63cca5f5638db5c988c7e6887f3a0d77b5ace55
-EBUILD pwavecat-0.4.5.ebuild 633 BLAKE2B efb22190797d5e304f300c2e2c3a28d48c411ce2253ecb394960e869f7d7f370863fe2e44b41726fa249a099ef93c8ed75b71dded7113cbbec687d8755ec2d57 SHA512 62148f51efb4b5f08e4c12f04b00a6dd891ff5d1308ca81e73dfbe1de893c487d3992a87a6c9165c2821a6eee5ab9ac18d69966b2d97c68a3cc7690332ed93e3
+EBUILD pwavecat-0.4.5.ebuild 620 BLAKE2B 5032dd4b59b3320e9a6aa6a99eda8020d63474f5bf7226fdb0b65393ac1d1507966daeb4a7dce01a705104bdec6f6e8057031940e4b484943d02fa437f550dfb SHA512 58cfada7955199b72856db88fe2afbe5ff332f19655399fdb9d6dc414d06c541e6c70b544948cd92d93c06ea79de22f50d5cf004b6a7c45c5e52d4660ad9fff9
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5-Makefile.patch b/media-sound/pwavecat/files/pwavecat-0.4.5-Makefile.patch
new file mode 100644
index 000000000000..c46bbc6ef100
--- /dev/null
+++ b/media-sound/pwavecat/files/pwavecat-0.4.5-Makefile.patch
@@ -0,0 +1,27 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+ #CC=/usr/local/bin/gcc
+
+
+-CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
++CFLAGS += -Wall
+
+ LIBRARY =
+
+@@ -14,14 +14,8 @@
+ pwavecat.o \
+ parts.o
+
+-all:
+- gcc $(CFLAGS) -c $(SRC1)
+-
+- gcc -o pwavecat $(OBJECT1) $(LIBRARY)
+-
+ # DEPENDENCIES
+-pwavecat.o : pwavecat.c pwavecat.h pwavecat_proto.h parts.h wave_header.h
+-parts.o : parts.c parts.h pwavecat.h pwavecat_proto.h wave_header.h
++pwavecat: parts.o
+
+ install:
+ cp pwavecat /usr/local/bin/
diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5-fno-common.patch b/media-sound/pwavecat/files/pwavecat-0.4.5-fno-common.patch
new file mode 100644
index 000000000000..7fb567e0425c
--- /dev/null
+++ b/media-sound/pwavecat/files/pwavecat-0.4.5-fno-common.patch
@@ -0,0 +1,65 @@
+--- a/parts.c
++++ b/parts.c
+@@ -19,6 +19,7 @@
+
+ #include "pwavecat.h"
+
++struct part *parttab[2];
+
+ struct part *lookup_part(char *name)
+ {
+--- a/parts.h
++++ b/parts.h
+@@ -12,7 +12,7 @@
+ struct part *nxtentr;
+ struct part *prventr;
+ };
+-struct part *parttab[2];
++extern struct part *parttab[2];
+ /* first element points to first entry, second element to last entry */
+
+ #endif /* _PARTS_H_ */
+--- a/pwavecat.c
++++ b/pwavecat.c
+@@ -38,6 +38,9 @@
+ // DWORD data_length; /* length of data */
+ // } wave_header;
+
++int debug_flag;
++int verbose_flag;
++
+ int modus;
+ int sample_fq;
+ int byte_p_sec;
+--- a/pwavecat.h
++++ b/pwavecat.h
+@@ -12,20 +12,20 @@
+ #include "wave_header.h"
+ #include "parts.h"
+
+-int debug_flag;
+-int verbose_flag;
++extern int debug_flag;
++extern int verbose_flag;
+
+-int sample_fq;
+-int byte_p_sec;
+-int byte_p_spl;
+-int bit_p_spl;
+-int modus;
+-int have_format_flag; // set if first wave header is read, now file format is set.
++extern int sample_fq;
++extern int byte_p_sec;
++extern int byte_p_spl;
++extern int bit_p_spl;
++extern int modus;
++extern int have_format_flag; // set if first wave header is read, now file format is set.
+
+ #define MAX_FILES 100
+ #define BUFFER_SIZE 65536
+
+-char *input_filename[MAX_FILES];
++extern char *input_filename[MAX_FILES];
+
+ #define VERSION "0.4.5"
+
diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch b/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch
index f3d54221bc7d..12db68a57cf2 100644
--- a/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch
+++ b/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch
@@ -1,5 +1,3 @@
-diff --git a/parts.c b/parts.c
-index 670d0d5..a59ad98 100644
--- a/parts.c
+++ b/parts.c
@@ -338,10 +338,10 @@ if(! file_header)
diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5-version.patch b/media-sound/pwavecat/files/pwavecat-0.4.5-version.patch
new file mode 100644
index 000000000000..07e263b13be4
--- /dev/null
+++ b/media-sound/pwavecat/files/pwavecat-0.4.5-version.patch
@@ -0,0 +1,11 @@
+--- a/pwavecat.h
++++ b/pwavecat.h
+@@ -27,7 +27,7 @@
+
+ char *input_filename[MAX_FILES];
+
+-#define VERSION "0.4.4"
++#define VERSION "0.4.5"
+
+ #endif /* _PWAVECAT_H_ */
+
diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5.diff b/media-sound/pwavecat/files/pwavecat-0.4.5.diff
deleted file mode 100644
index abe00c69daec..000000000000
--- a/media-sound/pwavecat/files/pwavecat-0.4.5.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur pwavecat-0.4.5.orig/Makefile pwavecat-0.4.5/Makefile
---- pwavecat-0.4.5.orig/Makefile 2005-10-06 15:52:56.000000000 +0200
-+++ pwavecat-0.4.5/Makefile 2007-10-06 16:27:25.000000000 +0200
-@@ -15,9 +15,9 @@
- parts.o
-
- all:
-- gcc $(CFLAGS) -c $(SRC1)
-+ $(CC) $(CFLAGS) -c $(SRC1)
-
-- gcc -o pwavecat $(OBJECT1) $(LIBRARY)
-+ $(CC) $(LDFLAGS) -o pwavecat $(OBJECT1) $(LIBRARY)
-
- # DEPENDENCIES
- pwavecat.o : pwavecat.c pwavecat.h pwavecat_proto.h parts.h wave_header.h
-diff -Naur pwavecat-0.4.5.orig/pwavecat.h pwavecat-0.4.5/pwavecat.h
---- pwavecat-0.4.5.orig/pwavecat.h 2005-10-06 15:52:56.000000000 +0200
-+++ pwavecat-0.4.5/pwavecat.h 2007-10-06 16:27:50.000000000 +0200
-@@ -27,7 +27,7 @@
-
- char *input_filename[MAX_FILES];
-
--#define VERSION "0.4.4"
-+#define VERSION "0.4.5"
-
- #endif /* _PWAVECAT_H_ */
-
diff --git a/media-sound/pwavecat/pwavecat-0.4.5.ebuild b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
index 21a4580caba4..f49e51ba3f36 100644
--- a/media-sound/pwavecat/pwavecat-0.4.5.ebuild
+++ b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit toolchain-funcs flag-o-matic
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="concatenates any number of audio files to stdout"
HOMEPAGE="http://panteltje.com/panteltje/dvd/"
@@ -12,19 +12,20 @@ SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
PATCHES=(
- "${FILESDIR}/${P}.diff"
- "${FILESDIR}/${P}-overflow.patch"
+ "${FILESDIR}"/${P}-Makefile.patch
+ "${FILESDIR}"/${P}-version.patch
+ "${FILESDIR}"/${P}-overflow.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
-src_compile() {
- append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+src_configure() {
+ append-lfs-flags
+ tc-export CC
}
src_install() {
dobin pwavecat
- default
+ einstalldocs
}