From 305c41fc6d7835e38cb3a2a099d9fa80ed7f3f28 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 28 Nov 2019 19:26:24 +0100 Subject: Deps: remove qt-gstreamer which was only used by KDE Telepathy --- deps/alldeps.SlackBuild | 3 - deps/qt-gstreamer/.url | 1 - deps/qt-gstreamer/doinst.sh | 5 - .../patches/qt-gstreamer_find_gstconfig.patch | 29 ----- deps/qt-gstreamer/qt-gstreamer.SlackBuild | 134 --------------------- deps/qt-gstreamer/slack-desc | 19 --- deps/qt-gstreamer0/doinst.sh | 5 - deps/qt-gstreamer0/qt-gstreamer0.SlackBuild | 126 ------------------- deps/qt-gstreamer0/slack-desc | 19 --- deps/updates.SlackBuild | 3 - 10 files changed, 344 deletions(-) delete mode 100644 deps/qt-gstreamer/.url delete mode 100644 deps/qt-gstreamer/doinst.sh delete mode 100644 deps/qt-gstreamer/patches/qt-gstreamer_find_gstconfig.patch delete mode 100755 deps/qt-gstreamer/qt-gstreamer.SlackBuild delete mode 100644 deps/qt-gstreamer/slack-desc delete mode 100644 deps/qt-gstreamer0/doinst.sh delete mode 100755 deps/qt-gstreamer0/qt-gstreamer0.SlackBuild delete mode 100644 deps/qt-gstreamer0/slack-desc diff --git a/deps/alldeps.SlackBuild b/deps/alldeps.SlackBuild index b871947..83ca43a 100755 --- a/deps/alldeps.SlackBuild +++ b/deps/alldeps.SlackBuild @@ -25,7 +25,6 @@ ALLDEPS=" \ qt5-webkit \ SDL_sound \ OpenAL \ - qt-gstreamer \ qjson \ phonon \ phonon-gstreamer \ @@ -86,8 +85,6 @@ ALLDEPS=" \ " # Only needed when adding support for Wayland: #elogind \ - # Not needed, conflicts with qt-gstreamer files - #qt-gstreamer0 \ # Allow for specification of individual packages to be built: if [ -z "$1" ]; then diff --git a/deps/qt-gstreamer/.url b/deps/qt-gstreamer/.url deleted file mode 100644 index a31a2c5..0000000 --- a/deps/qt-gstreamer/.url +++ /dev/null @@ -1 +0,0 @@ -http://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-1.2.0.tar.xz diff --git a/deps/qt-gstreamer/doinst.sh b/deps/qt-gstreamer/doinst.sh deleted file mode 100644 index aab1b9e..0000000 --- a/deps/qt-gstreamer/doinst.sh +++ /dev/null @@ -1,5 +0,0 @@ - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1 -fi - diff --git a/deps/qt-gstreamer/patches/qt-gstreamer_find_gstconfig.patch b/deps/qt-gstreamer/patches/qt-gstreamer_find_gstconfig.patch deleted file mode 100644 index 7371a93..0000000 --- a/deps/qt-gstreamer/patches/qt-gstreamer_find_gstconfig.patch +++ /dev/null @@ -1,29 +0,0 @@ -Description: apply gstreamer pkg-config definitions - To ensure gstreamer builds correctly, pick up its cflags in FindGstreamer - and apply them to the build as definitions -Author: José Manuel Santamaría -Origin: vendor, https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html -Forwarded: https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html -Reviewed-by: Harald Sitter ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/cmake/modules/FindGStreamer.cmake -+++ b/cmake/modules/FindGStreamer.cmake -@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND) - exec_program(${PKG_CONFIG_EXECUTABLE} - ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION} - OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR) -+ set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) - endif() - - find_library(GSTREAMER_LIBRARY ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,6 +106,7 @@ find_package(GObject) - macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE) - - set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES}) -+add_definitions(${GSTREAMER_DEFINITIONS}) - include(CheckCXXSourceCompiles) - check_cxx_source_compiles(" - #include diff --git a/deps/qt-gstreamer/qt-gstreamer.SlackBuild b/deps/qt-gstreamer/qt-gstreamer.SlackBuild deleted file mode 100755 index 9fb80a2..0000000 --- a/deps/qt-gstreamer/qt-gstreamer.SlackBuild +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/sh - -# Copyright 2014, 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2014, 2015, 2016, 2017 Eric Hameleers, Eindhoven, NL -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 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. - - -PKGNAM=qt-gstreamer -VERSION=${VERSION:-1.2.0} -BUILD=${BUILD:-6} - -NUMJOBS=${NUMJOBS:--j7} - -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) -if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -# Find the gstreamer header files: -cat $CWD/patches/qt-gstreamer_find_gstconfig.patch \ - | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DQT_VERSION=4 \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd - - -# Conditional build of Qt5 support: -if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then - mkdir -p build-qt5 - cd build-qt5 - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DQT_VERSION=5 \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 - cd - -fi - -if [ -d $PKG/usr/man ]; then - gzip -9 $PKG/usr/man/man?/* -fi - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - COPYING HACKING NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/qt-gstreamer/slack-desc b/deps/qt-gstreamer/slack-desc deleted file mode 100644 index 3ae6605..0000000 --- a/deps/qt-gstreamer/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# 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 leave one space after the ':'. - - |-----handy-ruler-----------------------------------------------------| -qt-gstreamer: qt-gstreamer (C++ bindings for gstreamer) -qt-gstreamer: -qt-gstreamer: QtGStreamer provides C++ bindings for GStreamer with a Qt-style API, -qt-gstreamer: plus some helper classes and elements for integrating GStreamer -qt-gstreamer: better in Qt applications. -qt-gstreamer: The goal of this module is to allow easy use of GStreamer for -qt-gstreamer: applications targetting MeeGo Mobile or the KDE desktop. -qt-gstreamer: -qt-gstreamer: Homepage: -qt-gstreamer: http://gstreamer.freedesktop.org/modules/qt-gstreamer.html -qt-gstreamer: diff --git a/deps/qt-gstreamer0/doinst.sh b/deps/qt-gstreamer0/doinst.sh deleted file mode 100644 index aab1b9e..0000000 --- a/deps/qt-gstreamer0/doinst.sh +++ /dev/null @@ -1,5 +0,0 @@ - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1 -fi - diff --git a/deps/qt-gstreamer0/qt-gstreamer0.SlackBuild b/deps/qt-gstreamer0/qt-gstreamer0.SlackBuild deleted file mode 100755 index 7b2fcaf..0000000 --- a/deps/qt-gstreamer0/qt-gstreamer0.SlackBuild +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/sh - -# Copyright 2014 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2014, 2015, 2016 Eric Hameleers, Eindhoven, NL -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 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. - - -PKGNAM=qt-gstreamer0 -SRCNAM=qt-gstreamer -VERSION=${VERSION:-0.10.3} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:--j7} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 -cd $SRCNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DQT_VERSION=4 \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd - - -# Conditional build of Qt5 support: -if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then - mkdir -p build-qt5 - cd build-qt5 - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DQT_VERSION=5 \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 - cd - -fi - -if [ -d $PKG/usr/man ]; then - gzip -9 $PKG/usr/man/man?/* -fi - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - COPYING HACKING NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/qt-gstreamer0/slack-desc b/deps/qt-gstreamer0/slack-desc deleted file mode 100644 index 16b3300..0000000 --- a/deps/qt-gstreamer0/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# 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 leave one space after the ':'. - - |-----handy-ruler-----------------------------------------------------| -qt-gstreamer0: qt-gstreamer0 (C++ bindings for gstreamer 0.x) -qt-gstreamer0: -qt-gstreamer0: QtGStreamer provides C++ bindings for GStreamer with a Qt-style API, -qt-gstreamer0: plus some helper classes and elements for integrating GStreamer -qt-gstreamer0: better in Qt applications. -qt-gstreamer0: The goal of this module is to allow easy use of GStreamer for -qt-gstreamer0: applications targetting MeeGo Mobile or the KDE desktop. -qt-gstreamer0: -qt-gstreamer0: Homepage: -qt-gstreamer0: http://gstreamer.freedesktop.org/modules/qt-gstreamer.html -qt-gstreamer0: diff --git a/deps/updates.SlackBuild b/deps/updates.SlackBuild index d219439..3161973 100755 --- a/deps/updates.SlackBuild +++ b/deps/updates.SlackBuild @@ -27,7 +27,6 @@ ALLDEPS=" \ qt5-webkit \ qca-qt5 \ libdbusmenu-qt5 \ - qt-gstreamer \ phonon \ phonon-gstreamer \ phonon-qt4 \ @@ -84,8 +83,6 @@ ALLDEPS=" \ " # Only needed when adding support for Wayland: #elogind \ - # Not needed, conflicts with qt-gstreamer files - #qt-gstreamer0 \ # Allow for specification of individual packages to be built: if [ -z "$1" ]; then -- cgit v1.2.3