diff options
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/libquicktime/libquicktime-1.2.4-faad2.patch | 86 | ||||
| -rw-r--r-- | libraries/libquicktime/libquicktime.SlackBuild | 37 |
2 files changed, 109 insertions, 14 deletions
diff --git a/libraries/libquicktime/libquicktime-1.2.4-faad2.patch b/libraries/libquicktime/libquicktime-1.2.4-faad2.patch new file mode 100644 index 0000000000000..563f46426f26f --- /dev/null +++ b/libraries/libquicktime/libquicktime-1.2.4-faad2.patch @@ -0,0 +1,86 @@ +diff -ruN a/configure.ac b/configure.ac +--- a/configure.ac 2012-03-29 21:44:28.000000000 +0200 ++++ b/configure.ac 2020-02-09 18:27:31.599127781 +0100 +@@ -728,82 +728,9 @@ + + if test "x$with_faad2" != "xno"; then + +-OLD_CFLAGS=$CFLAGS +-OLD_LIBS=$LIBS +- + CFLAGS="$CFLAGS" + LIBS="$LIBS -lfaad -lm" + +-AC_MSG_CHECKING(for neaacdec.h usability for faad2) +- +- +-AC_TRY_RUN([ +- #include <neaacdec.h> +- #include <stdio.h> +- main() +- { +- int faad_major; +- int faad_minor; +- faacDecHandle dec; +- +- if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2) +- return -1; +- dec = faacDecOpen(); +- if(!dec) +- return -1; +- return 0; +- } +- ], +- [ +- # program could be run +- have_faad2="true" +- AC_MSG_RESULT(yes) +- FAAD2_CFLAGS=$CFLAGS +- FAAD2_LIBS=$LIBS +- AC_DEFINE(HAVE_NEAACDEC_H) +- ], +- # program could not be run +- AC_MSG_RESULT(no) +-) +- +-if test "x$have_faad2" != "xtrue"; then +- +-AC_MSG_CHECKING(for faad.h usability for faad2) +- +-AC_TRY_RUN([ +- #include <faad.h> +- #include <stdio.h> +- main() +- { +- int faad_major; +- int faad_minor; +- faacDecHandle dec; +- +- if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2) +- return -1; +- dec = faacDecOpen(); +- if(!dec) +- return -1; +- return 0; +- } +- ], +- [ +- # program could be run +- have_faad2="true" +- AC_MSG_RESULT(yes) +- FAAD2_CFLAGS=$CFLAGS +- FAAD2_LIBS=$LIBS +- +- +- ], +- # program could not be run +- AC_MSG_RESULT(no) +-) +- +-fi +- +-CFLAGS=$OLD_CFLAGS +-LIBS=$OLD_LIBS + + fi + diff --git a/libraries/libquicktime/libquicktime.SlackBuild b/libraries/libquicktime/libquicktime.SlackBuild index b33cc29223085..d3335bcf52ef6 100644 --- a/libraries/libquicktime/libquicktime.SlackBuild +++ b/libraries/libquicktime/libquicktime.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libquicktime -# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -11,22 +11,22 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libquicktime VERSION=${VERSION:-1.2.4} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -50,8 +50,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -84,6 +84,11 @@ patch -p1 -i $CWD/libquicktime-1.2.4-ffmpeg2.patch patch -p1 -i $CWD/libquicktime-ffmpeg3.patch patch -p1 -i $CWD/libquicktime-1.2.4-ffmpeg4.patch +# Fix compiling against newer faad2 +patch -p1 -i $CWD/libquicktime-1.2.4-faad2.patch + +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -100,6 +105,10 @@ CXXFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG +# Don't ship .la/.a files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.a + find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION |