summaryrefslogtreecommitdiffstats
path: root/source/ap
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-08-10 04:55:27 +0000
committer Eric Hameleers <alien@slackware.com>2019-08-10 17:59:45 +0200
commit6aa6ed8ad8738ff626989c44d74e34576e7f51e5 (patch)
tree71c83809c919e0222a949b810cff3b8cccc5912e /source/ap
parentb0034a250684032a5dfb1416a4e9f599eb5772da (diff)
downloadcurrent-6aa6ed8ad8738ff626989c44d74e34576e7f51e5.tar.gz
current-6aa6ed8ad8738ff626989c44d74e34576e7f51e5.tar.xz
Sat Aug 10 04:55:27 UTC 201920190810045527
a/kernel-generic-4.19.66-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.66-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.66-x86_64-1.txz: Upgraded. ap/amp-0.7.6-x86_64-3.txz: Rebuilt. Patched to clean up the code for a modern compiler and to not use overly aggressive optimizations that can lead to crashes. Thanks to Labinnah. d/doxygen-1.8.16-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.66-x86-1.txz: Upgraded. d/scons-3.1.1-x86_64-1.txz: Upgraded. k/kernel-source-4.19.66-noarch-1.txz: Upgraded. n/NetworkManager-1.20.0-x86_64-1.txz: Upgraded. n/wpa_supplicant-2.9-x86_64-1.txz: Upgraded. x/libinput-1.14.0-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/ap')
-rwxr-xr-xsource/ap/amp/_amp/usr/bin/amp0
-rwxr-xr-xsource/ap/amp/amp.SlackBuild14
-rw-r--r--source/ap/amp/amp.do.not.overoptimize.diff70
3 files changed, 77 insertions, 7 deletions
diff --git a/source/ap/amp/_amp/usr/bin/amp b/source/ap/amp/_amp/usr/bin/amp
deleted file mode 100755
index e69de29bb..000000000
--- a/source/ap/amp/_amp/usr/bin/amp
+++ /dev/null
diff --git a/source/ap/amp/amp.SlackBuild b/source/ap/amp/amp.SlackBuild
index cc19533e7..89dc135ce 100755
--- a/source/ap/amp/amp.SlackBuild
+++ b/source/ap/amp/amp.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=amp
VERSION=0.7.6
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -50,20 +50,20 @@ PKG=$TMP/package-amp
rm -rf $PKG
mkdir -p $TMP $PKG
-# Explode the package framework:
-cd $PKG
-explodepkg $CWD/_amp.tar.gz
-
cd $TMP
rm -rf amp-$VERSION
-tar xvf $CWD/amp-$VERSION.tar.gz || exit 1
+tar xvf $CWD/amp-$VERSION.tar.?z || exit 1
cd amp-$VERSION || exit 1
zcat $CWD/amp-gcc34.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+# Avoid crashes caused by using agressive optimization with newer compilers:
+zcat $CWD/amp.do.not.overoptimize.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
chown -R root:root .
./configure --prefix=/usr $ARCH-slackware-linux || exit 1
make || exit 1
+mkdir -p $PKG/usr/doc $PKG/usr/bin $PKG/usr/man/man1
strip amp
cat amp > $PKG/usr/bin/amp
+chmod 755 $PKG/usr/bin/amp
cat amp.1 | gzip -9c > $PKG/usr/man/man1/amp.1.gz
mkdir -p $PKG/usr/doc/amp-$VERSION
cp -a \
diff --git a/source/ap/amp/amp.do.not.overoptimize.diff b/source/ap/amp/amp.do.not.overoptimize.diff
new file mode 100644
index 000000000..918f9a1c6
--- /dev/null
+++ b/source/ap/amp/amp.do.not.overoptimize.diff
@@ -0,0 +1,70 @@
+--- ./configure.orig 1997-08-23 06:11:24.000000000 -0500
++++ ./configure 2019-08-09 00:26:06.951488547 -0500
+@@ -1409,7 +1409,7 @@
+ if test "$OS_TYPE" = "FreeBSD" ; then
+ OS_TYPE="BSD"
+ fi
+- CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
++ CFLAGS="-O0 ${CFLAGS_ARCH}"
+ DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
+ ;;
+
+--- ./audio.h.orig 1997-08-21 08:00:18.000000000 -0500
++++ ./audio.h 2019-08-09 00:26:06.950488547 -0500
+@@ -7,6 +7,8 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+
+ struct AUDIO_HEADER {
+ int ID;
+--- ./misc2.h.orig 1997-08-16 13:19:29.000000000 -0500
++++ ./misc2.h 2019-08-09 00:26:06.955488547 -0500
+@@ -9,6 +9,7 @@
+
+ extern void requantize_mono(int gr,int ch,struct SIDE_INFO *info,struct AUDIO_HEADER *header);
+ extern void requantize_ms(int gr,struct SIDE_INFO *info,struct AUDIO_HEADER *header);
++extern void requantize_downmix(int gr,struct SIDE_INFO *info,struct AUDIO_HEADER *header);
+ extern void alias_reduction(int ch);
+ extern void calculate_t43(void);
+
+--- ./audio.c.orig 1997-08-23 06:30:21.000000000 -0500
++++ ./audio.c 2019-08-09 00:26:06.949488547 -0500
+@@ -31,11 +31,13 @@
+
+ #define AUDIO
+ #include "audio.h"
++#include "dump.h"
+ #include "formats.h"
+ #include "getbits.h"
+ #include "huffman.h"
+ #include "layer2.h"
+ #include "layer3.h"
++#include "misc2.h"
+ #include "position.h"
+ #include "rtbuf.h"
+ #include "transform.h"
+--- ./configure.in.orig 1997-08-23 06:35:41.000000000 -0500
++++ ./configure.in 2019-08-09 00:26:06.952488547 -0500
+@@ -69,7 +69,7 @@
+ if test "$OS_TYPE" = "FreeBSD" ; then
+ OS_TYPE="BSD"
+ fi
+- CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
++ CFLAGS="-O0 ${CFLAGS_ARCH}"
+ DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
+ ;;
+
+--- ./guicontrol.c.orig 2019-08-09 00:25:48.432489684 -0500
++++ ./guicontrol.c 2019-08-09 00:26:06.953488547 -0500
+@@ -276,6 +276,8 @@
+ return cnt;
+ }
+
++int decodeMPEG_2(int inFilefd);
++
+ void gui_control(void)
+ {
+ int flags,dummy;