summaryrefslogtreecommitdiffstats
path: root/source/ap/flac
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap/flac')
-rwxr-xr-xsource/ap/flac/flac.SlackBuild4
-rw-r--r--source/ap/flac/flac.gcc45.diff10
-rw-r--r--source/ap/flac/flac.man.diff4
3 files changed, 4 insertions, 14 deletions
diff --git a/source/ap/flac/flac.SlackBuild b/source/ap/flac/flac.SlackBuild
index 4cc97ea58..5e514bd53 100755
--- a/source/ap/flac/flac.SlackBuild
+++ b/source/ap/flac/flac.SlackBuild
@@ -23,7 +23,7 @@
PKGNAM=flac
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -63,7 +63,6 @@ rm -rf flac-$VERSION
tar xvf $CWD/flac-$VERSION.tar.?z* || exit 1
cd flac-$VERSION
zcat $CWD/flac.man.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-zcat $CWD/flac.gcc45.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
chown -R root:root .
find . \
@@ -87,6 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
+ --disable-silent-rules \
$DISABLE_ASM_OPTIMIZATIONS \
--build=$ARCH-slackware-linux
diff --git a/source/ap/flac/flac.gcc45.diff b/source/ap/flac/flac.gcc45.diff
deleted file mode 100644
index a2c241cc9..000000000
--- a/source/ap/flac/flac.gcc45.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./examples/cpp/encode/file/main.cpp.orig 2007-09-13 10:58:03.000000000 -0500
-+++ ./examples/cpp/encode/file/main.cpp 2011-03-09 14:06:05.329999998 -0600
-@@ -30,6 +30,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- #include "FLAC++/metadata.h"
- #include "FLAC++/encoder.h"
-
diff --git a/source/ap/flac/flac.man.diff b/source/ap/flac/flac.man.diff
index f96eebc60..2f31e9590 100644
--- a/source/ap/flac/flac.man.diff
+++ b/source/ap/flac/flac.man.diff
@@ -4,9 +4,9 @@
.PP
metaflac(1).
.PP
--The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/flac/html\fR on Debian GNU/Linux systems.
+-The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/libflac-doc/html\fR on Debian GNU/Linux systems.
+The programs are documented fully by HTML format documentation, available in \fI/usr/doc/flac-*.*.*/html\fR on Slackware GNU/Linux systems.
.SH "AUTHOR"
.PP
+The flac program was developed by Josh Coalson.
- This manual page was written by Matt Zimmerman <mdz@debian.org> for the Debian GNU/Linux system (but may be used by others).
+ This manual page was initially written by Matt Zimmerman <mdz@debian.org> for the Debian GNU/Linux system (but may be used by others). It has been kept up-to-date by the Xiph.org Foundation.