summaryrefslogtreecommitdiffstats
path: root/source/ap/flac
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2016-06-30 20:26:57 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:31:18 +0200
commitd31c50870d0bee042ce660e445c9294a59a3a65b (patch)
tree6bfc0de3c95267b401b620c2c67859557dc60f97 /source/ap/flac
parent76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff)
downloadcurrent-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz
current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.xz
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
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.