diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-28 19:12:29 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:39:35 +0200 |
commit | 646a5c1cbfd95873950a87b5f75d52073a967023 (patch) | |
tree | b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/l/taglib-extras | |
parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
download | current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz |
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt.
installpkg: default line length for --terselength is the number of columns.
removepkg: added --terse mode.
upgradepkg: default line length for --terselength is the number of columns.
upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz: Upgraded.
d/bison-3.0.5-x86_64-1.txz: Upgraded.
e/emacs-26.1-x86_64-1.txz: Upgraded.
kde/kopete-4.14.3-x86_64-8.txz: Rebuilt.
Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz: Upgraded.
n/links-2.16-x86_64-2.txz: Rebuilt.
Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded.
n/nftables-0.8.5-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz: Upgraded.
n/ulogd-2.0.7-x86_64-1.txz: Upgraded.
n/whois-5.3.1-x86_64-1.txz: Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/taglib-extras')
-rw-r--r-- | source/l/taglib-extras/slack-desc | 6 | ||||
-rw-r--r-- | source/l/taglib-extras/taglib-extras-0.1-multilib-1.patch | 20 | ||||
-rw-r--r-- | source/l/taglib-extras/taglib-extras-1.0.1-taglib_ver.patch | 25 | ||||
-rw-r--r-- | source/l/taglib-extras/taglib-extras-1.0.1-version.patch | 12 | ||||
-rwxr-xr-x | source/l/taglib-extras/taglib-extras.SlackBuild | 31 |
5 files changed, 82 insertions, 12 deletions
diff --git a/source/l/taglib-extras/slack-desc b/source/l/taglib-extras/slack-desc index 3af63b48..84a5daaa 100644 --- a/source/l/taglib-extras/slack-desc +++ b/source/l/taglib-extras/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/l/taglib-extras/taglib-extras-0.1-multilib-1.patch b/source/l/taglib-extras/taglib-extras-0.1-multilib-1.patch new file mode 100644 index 00000000..ad67e17c --- /dev/null +++ b/source/l/taglib-extras/taglib-extras-0.1-multilib-1.patch @@ -0,0 +1,20 @@ +diff -up taglib-extras-0.1/taglib-extras-config.cmake.multilib taglib-extras-0.1/taglib-extras-config.cmake +--- taglib-extras-0.1/taglib-extras-config.cmake.multilib 2009-03-12 11:12:04.000000000 -0500 ++++ taglib-extras-0.1/taglib-extras-config.cmake 2009-03-23 07:57:25.000000000 -0500 +@@ -16,7 +16,6 @@ EOH + + prefix=${CMAKE_INSTALL_PREFIX} + exec_prefix=${CMAKE_INSTALL_PREFIX} +-libdir=${LIB_INSTALL_DIR} + includedir=${INCLUDE_INSTALL_DIR} + + flags="" +@@ -29,7 +28,7 @@ while test $# -gt 0 + do + case $1 in + --libs) +- flags="$flags -L$libdir -ltag-extras" ++ flags="$flags -ltag-extras" + ;; + --cflags) + flags="$flags -I$includedir/taglib-extras" diff --git a/source/l/taglib-extras/taglib-extras-1.0.1-taglib_ver.patch b/source/l/taglib-extras/taglib-extras-1.0.1-taglib_ver.patch new file mode 100644 index 00000000..4f5d1870 --- /dev/null +++ b/source/l/taglib-extras/taglib-extras-1.0.1-taglib_ver.patch @@ -0,0 +1,25 @@ +diff -up taglib-extras-1.0.1/cmake/modules/FindTaglib.cmake.taglib taglib-extras-1.0.1/cmake/modules/FindTaglib.cmake +--- taglib-extras-1.0.1/cmake/modules/FindTaglib.cmake.taglib 2009-03-13 16:40:24.000000000 -0500 ++++ taglib-extras-1.0.1/cmake/modules/FindTaglib.cmake 2016-02-14 09:06:57.209838045 -0600 +@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE) + + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) + +- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") ++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) + message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") + set(TAGLIB_FOUND FALSE) +- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") ++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) + + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) + +@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE) + set(TAGLIB_FOUND TRUE) + endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") +- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") ++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) + mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) + + else(TAGLIBCONFIG_EXECUTABLE) diff --git a/source/l/taglib-extras/taglib-extras-1.0.1-version.patch b/source/l/taglib-extras/taglib-extras-1.0.1-version.patch new file mode 100644 index 00000000..911b9178 --- /dev/null +++ b/source/l/taglib-extras/taglib-extras-1.0.1-version.patch @@ -0,0 +1,12 @@ +diff -up taglib-extras-1.0.1/CMakeLists.txt.version taglib-extras-1.0.1/CMakeLists.txt +--- taglib-extras-1.0.1/CMakeLists.txt.version 2009-09-17 14:31:50.000000000 -0500 ++++ taglib-extras-1.0.1/CMakeLists.txt 2009-09-21 19:40:38.076666807 -0500 +@@ -29,7 +29,7 @@ endif (WIN32) + + set(TAGLIB-EXTRAS_LIB_MAJOR_VERSION "1") + set(TAGLIB-EXTRAS_LIB_MINOR_VERSION "0") +-set(TAGLIB-EXTRAS_LIB_PATCH_VERSION "0") ++set(TAGLIB-EXTRAS_LIB_PATCH_VERSION "1") + + set(TAGLIB-EXTRAS_LIB_VERSION_STRING "${TAGLIB-EXTRAS_LIB_MAJOR_VERSION}.${TAGLIB-EXTRAS_LIB_MINOR_VERSION}.${TAGLIB-EXTRAS_LIB_PATCH_VERSION}") + diff --git a/source/l/taglib-extras/taglib-extras.SlackBuild b/source/l/taglib-extras/taglib-extras.SlackBuild index 127a70cb..8ba6ed46 100755 --- a/source/l/taglib-extras/taglib-extras.SlackBuild +++ b/source/l/taglib-extras/taglib-extras.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2009, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,24 +20,34 @@ # 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) +PKGNAM=taglib-extras VERSION=${VERSION:-1.0.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -50,7 +60,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=/tmp/package-taglib-extras @@ -67,6 +76,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/taglib-extras-0.1-multilib-1.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/taglib-extras-1.0.1-taglib_ver.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/taglib-extras-1.0.1-version.patch.gz | patch -p1 --verbose || exit 1 + mkdir -p build cd build cmake \ @@ -77,9 +90,9 @@ cd build -DMAN_INSTALL_DIR=/usr/man \ -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - .. + .. || exit 1 make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG + make install DESTDIR=$PKG || exit 1 cd - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ |