[arch-commits] Commit in phonon-gstreamer/repos (8 files)

Antonio Rojas arojas at archlinux.org
Thu Feb 23 12:00:59 UTC 2017


    Date: Thursday, February 23, 2017 @ 12:00:59
  Author: arojas
Revision: 289427

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  phonon-gstreamer/repos/extra-i686/PKGBUILD
    (from rev 289426, phonon-gstreamer/trunk/PKGBUILD)
  phonon-gstreamer/repos/extra-x86_64/PKGBUILD
    (from rev 289426, phonon-gstreamer/trunk/PKGBUILD)
Deleted:
  phonon-gstreamer/repos/extra-i686/PKGBUILD
  phonon-gstreamer/repos/extra-i686/phonon-gstreamer-gst15_include_dirs.patch
  phonon-gstreamer/repos/extra-i686/phonon-qt4-gstreamer.install
  phonon-gstreamer/repos/extra-x86_64/PKGBUILD
  phonon-gstreamer/repos/extra-x86_64/phonon-gstreamer-gst15_include_dirs.patch
  phonon-gstreamer/repos/extra-x86_64/phonon-qt4-gstreamer.install

--------------------------------------------------------+
 /PKGBUILD                                              |  120 +++++++++++++++
 extra-i686/PKGBUILD                                    |   67 --------
 extra-i686/phonon-gstreamer-gst15_include_dirs.patch   |   95 -----------
 extra-i686/phonon-qt4-gstreamer.install                |   11 -
 extra-x86_64/PKGBUILD                                  |   67 --------
 extra-x86_64/phonon-gstreamer-gst15_include_dirs.patch |   95 -----------
 extra-x86_64/phonon-qt4-gstreamer.install              |   11 -
 7 files changed, 120 insertions(+), 346 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-02-23 12:00:32 UTC (rev 289426)
+++ extra-i686/PKGBUILD	2017-02-23 12:00:59 UTC (rev 289427)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=phonon-gstreamer
-pkgname=('phonon-qt4-gstreamer' 'phonon-qt5-gstreamer')
-pkgver=4.9.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://phonon.kde.org/'
-license=('LGPL')
-depends=('gst-plugins-base')
-optdepends=('pulseaudio: PulseAudio support' 'gst-plugins-good: PulseAudio support and good codecs' 'gst-plugins-bad: additional codecs'
-	'gst-plugins-ugly: additional codecs' 'gst-libav: libav codec')
-makedepends=('gst-plugins-base' 'extra-cmake-modules' 'automoc4' 'phonon-qt4' 'phonon-qt5' 'qt5-x11extras')
-source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/phonon-backend-gstreamer-${pkgver}.tar.xz")
-md5sums=('b2b0ca327908948ce8cdba117e31bf80')
-
-prepare() {
-  mkdir build-qt4
-  mkdir build-qt5
-}
-
-build() {
-  cd build-qt4
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -D__KDE_HAVE_GCC_VISIBILITY=NO \
-    -DCMAKE_INSTALL_LIBDIR=lib
-  make
-
-  cd ../build-qt5
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -D__KDE_HAVE_GCC_VISIBILITY=NO \
-    -DPHONON_BUILD_PHONON4QT5=ON
-  make
-}
-
-package_phonon-qt4-gstreamer() {
-  pkgdesc="Phonon GStreamer backend for Qt4"
-  provides=('phonon-backend' 'phonon-qt4-backend')
-  replaces=('phonon-gstreamer')
-  conflicts=('phonon-gstreamer')
-  install="phonon-qt4-gstreamer.install"
-
-  cd build-qt4
-  make DESTDIR="${pkgdir}" install
-
-# Conflict with -qt5
-  rm -r "$pkgdir"/usr/share/icons
-}
-
-package_phonon-qt5-gstreamer() {
-  pkgdesc="Phonon GStreamer backend for Qt5"
-  provides=('phonon-qt5-backend')
-  replaces=('phonon-gstreamer')
-  conflicts=('phonon-gstreamer')
-  depends+=('qt5-x11extras')
-
-  cd build-qt5
-  make DESTDIR="${pkgdir}" install
-}

Copied: phonon-gstreamer/repos/extra-i686/PKGBUILD (from rev 289426, phonon-gstreamer/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-02-23 12:00:59 UTC (rev 289427)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=phonon-gstreamer
+pkgname=('phonon-qt4-gstreamer' 'phonon-qt5-gstreamer')
+pkgver=4.9.0
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://phonon.kde.org/'
+license=('LGPL')
+optdepends=('pulseaudio: PulseAudio support' 'gst-plugins-good: PulseAudio support and good codecs' 'gst-plugins-bad: additional codecs'
+	'gst-plugins-ugly: additional codecs' 'gst-libav: libav codec')
+makedepends=('gst-plugins-base' 'extra-cmake-modules' 'automoc4' 'phonon-qt4' 'phonon-qt5' 'qt5-x11extras')
+source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/phonon-backend-gstreamer-${pkgver}.tar.xz")
+md5sums=('b2b0ca327908948ce8cdba117e31bf80')
+
+prepare() {
+  mkdir build-qt4
+  mkdir build-qt5
+}
+
+build() {
+  cd build-qt4
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -D__KDE_HAVE_GCC_VISIBILITY=NO \
+    -DCMAKE_INSTALL_LIBDIR=lib
+  make
+
+  cd ../build-qt5
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -D__KDE_HAVE_GCC_VISIBILITY=NO \
+    -DPHONON_BUILD_PHONON4QT5=ON
+  make
+}
+
+package_phonon-qt4-gstreamer() {
+  pkgdesc="Phonon GStreamer backend for Qt4"
+  depends=(gst-plugins-base phonon-qt4)
+
+  cd build-qt4
+  make DESTDIR="${pkgdir}" install
+
+# Conflict with -qt5
+  rm -r "$pkgdir"/usr/share/icons
+}
+
+package_phonon-qt5-gstreamer() {
+  pkgdesc="Phonon GStreamer backend for Qt5"
+  depends=(gst-plugins-base qt5-x11extras phonon-qt5)
+
+  cd build-qt5
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/phonon-gstreamer-gst15_include_dirs.patch
===================================================================
--- extra-i686/phonon-gstreamer-gst15_include_dirs.patch	2017-02-23 12:00:32 UTC (rev 289426)
+++ extra-i686/phonon-gstreamer-gst15_include_dirs.patch	2017-02-23 12:00:59 UTC (rev 289427)
@@ -1,95 +0,0 @@
-diff -up phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake.gst15 phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake
---- phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake.gst15	2014-12-27 08:05:27.000000000 -0600
-+++ phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake	2015-07-06 08:46:39.288178885 -0500
-@@ -2,7 +2,7 @@
- # Once done this will define
- #
- #  GSTREAMER_FOUND - system has GStreamer
--#  GSTREAMER_INCLUDE_DIR - the GStreamer include directory
-+#  GSTREAMER_INCLUDE_DIRS - the GStreamer include directory
- #  GSTREAMER_LIBRARIES - the libraries needed to use GStreamer
- #  GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer
- #  GSTREAMER_VERSION - the version of GStreamer
-@@ -13,12 +13,12 @@
- # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_1.0_FOUND etc)
- 
- 
--IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-+IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-    # in cache already
-    SET(GStreamer_FIND_QUIETLY TRUE)
--ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-+ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-    SET(GStreamer_FIND_QUIETLY FALSE)
--ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-+ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
- 
- IF (NOT WIN32)
-    FIND_PACKAGE(PkgConfig REQUIRED)
-@@ -28,13 +28,15 @@ IF (NOT WIN32)
-    PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-1.0)
-    SET(GSTREAMER_VERSION ${PKG_GSTREAMER_VERSION})
-    SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
--ENDIF (NOT WIN32)
--
--FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
-+   SET(GSTREAMER_INCLUDE_DIRS ${PKG_GSTREAMER_INCLUDE_DIRS})
-+ELSE (NOT WIN32)
-+## FIXME?
-+FIND_PATH(GSTREAMER_INCLUDE_DIRS gst/gst.h
-    PATHS
-    ${PKG_GSTREAMER_INCLUDE_DIRS}
-    PATH_SUFFIXES gstreamer-1.0
-    )
-+ENDIF (NOT WIN32)
- 
- FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
-    PATHS
-@@ -51,10 +53,10 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES
-    ${PKG_GSTREAMER_LIBRARY_DIRS}
-    )
- 
--IF (GSTREAMER_INCLUDE_DIR)
--ELSE (GSTREAMER_INCLUDE_DIR)
--   MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
--ENDIF (GSTREAMER_INCLUDE_DIR)
-+IF (GSTREAMER_INCLUDE_DIRS)
-+ELSE (GSTREAMER_INCLUDE_DIRS)
-+   MESSAGE(STATUS "GStreamer: WARNING: include dirs not found")
-+ENDIF (GSTREAMER_INCLUDE_DIRS)
- 
- IF (GSTREAMER_LIBRARIES)
- ELSE (GSTREAMER_LIBRARIES)
-@@ -66,11 +68,11 @@ ELSE (GSTREAMER_APP_LIBRARY)
-    MESSAGE(STATUS "GStreamer: WARNING: app library not found")
- ENDIF (GSTREAMER_APP_LIBRARY)
- 
--IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-+IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-    SET(GSTREAMER_FOUND TRUE)
--ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-+ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-    SET(GSTREAMER_FOUND FALSE)
--ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-+ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
- 
- IF (GSTREAMER_FOUND)
-    IF (NOT GStreamer_FIND_QUIETLY)
-@@ -82,4 +84,4 @@ ELSE (GSTREAMER_FOUND)
-    ENDIF (GStreamer_FIND_REQUIRED)
- ENDIF (GSTREAMER_FOUND)
- 
--MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY GSTREAMER_APP_LIBRARY)
-+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY GSTREAMER_APP_LIBRARY)
-diff -up phonon-backend-gstreamer-4.8.2/gstreamer/CMakeLists.txt.gst15 phonon-backend-gstreamer-4.8.2/gstreamer/CMakeLists.txt
---- phonon-backend-gstreamer-4.8.2/gstreamer/CMakeLists.txt.gst15	2015-07-06 08:54:25.613865469 -0500
-+++ phonon-backend-gstreamer-4.8.2/gstreamer/CMakeLists.txt	2015-07-06 08:54:28.046921794 -0500
-@@ -15,7 +15,7 @@
- 
- include_directories(
-       ${CMAKE_CURRENT_BINARY_DIR}
--      ${GSTREAMER_INCLUDE_DIR}
-+      ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_INCLUDE_DIRS}
-       ${GSTREAMER_PLUGIN_VIDEO_INCLUDE_DIR}
-       ${GSTREAMER_PLUGIN_AUDIO_INCLUDE_DIR}
-       ${GSTREAMER_PLUGIN_PBUTILS_INCLUDE_DIR}

Deleted: extra-i686/phonon-qt4-gstreamer.install
===================================================================
--- extra-i686/phonon-qt4-gstreamer.install	2017-02-23 12:00:32 UTC (rev 289426)
+++ extra-i686/phonon-qt4-gstreamer.install	2017-02-23 12:00:59 UTC (rev 289427)
@@ -1,11 +0,0 @@
-post_install(){
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-02-23 12:00:32 UTC (rev 289426)
+++ extra-x86_64/PKGBUILD	2017-02-23 12:00:59 UTC (rev 289427)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=phonon-gstreamer
-pkgname=('phonon-qt4-gstreamer' 'phonon-qt5-gstreamer')
-pkgver=4.9.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://phonon.kde.org/'
-license=('LGPL')
-depends=('gst-plugins-base')
-optdepends=('pulseaudio: PulseAudio support' 'gst-plugins-good: PulseAudio support and good codecs' 'gst-plugins-bad: additional codecs'
-	'gst-plugins-ugly: additional codecs' 'gst-libav: libav codec')
-makedepends=('gst-plugins-base' 'extra-cmake-modules' 'automoc4' 'phonon-qt4' 'phonon-qt5' 'qt5-x11extras')
-source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/phonon-backend-gstreamer-${pkgver}.tar.xz")
-md5sums=('b2b0ca327908948ce8cdba117e31bf80')
-
-prepare() {
-  mkdir build-qt4
-  mkdir build-qt5
-}
-
-build() {
-  cd build-qt4
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -D__KDE_HAVE_GCC_VISIBILITY=NO \
-    -DCMAKE_INSTALL_LIBDIR=lib
-  make
-
-  cd ../build-qt5
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -D__KDE_HAVE_GCC_VISIBILITY=NO \
-    -DPHONON_BUILD_PHONON4QT5=ON
-  make
-}
-
-package_phonon-qt4-gstreamer() {
-  pkgdesc="Phonon GStreamer backend for Qt4"
-  provides=('phonon-backend' 'phonon-qt4-backend')
-  replaces=('phonon-gstreamer')
-  conflicts=('phonon-gstreamer')
-  install="phonon-qt4-gstreamer.install"
-
-  cd build-qt4
-  make DESTDIR="${pkgdir}" install
-
-# Conflict with -qt5
-  rm -r "$pkgdir"/usr/share/icons
-}
-
-package_phonon-qt5-gstreamer() {
-  pkgdesc="Phonon GStreamer backend for Qt5"
-  provides=('phonon-qt5-backend')
-  replaces=('phonon-gstreamer')
-  conflicts=('phonon-gstreamer')
-  depends+=('qt5-x11extras')
-
-  cd build-qt5
-  make DESTDIR="${pkgdir}" install
-}

Copied: phonon-gstreamer/repos/extra-x86_64/PKGBUILD (from rev 289426, phonon-gstreamer/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-02-23 12:00:59 UTC (rev 289427)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=phonon-gstreamer
+pkgname=('phonon-qt4-gstreamer' 'phonon-qt5-gstreamer')
+pkgver=4.9.0
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://phonon.kde.org/'
+license=('LGPL')
+optdepends=('pulseaudio: PulseAudio support' 'gst-plugins-good: PulseAudio support and good codecs' 'gst-plugins-bad: additional codecs'
+	'gst-plugins-ugly: additional codecs' 'gst-libav: libav codec')
+makedepends=('gst-plugins-base' 'extra-cmake-modules' 'automoc4' 'phonon-qt4' 'phonon-qt5' 'qt5-x11extras')
+source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/phonon-backend-gstreamer-${pkgver}.tar.xz")
+md5sums=('b2b0ca327908948ce8cdba117e31bf80')
+
+prepare() {
+  mkdir build-qt4
+  mkdir build-qt5
+}
+
+build() {
+  cd build-qt4
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -D__KDE_HAVE_GCC_VISIBILITY=NO \
+    -DCMAKE_INSTALL_LIBDIR=lib
+  make
+
+  cd ../build-qt5
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -D__KDE_HAVE_GCC_VISIBILITY=NO \
+    -DPHONON_BUILD_PHONON4QT5=ON
+  make
+}
+
+package_phonon-qt4-gstreamer() {
+  pkgdesc="Phonon GStreamer backend for Qt4"
+  depends=(gst-plugins-base phonon-qt4)
+
+  cd build-qt4
+  make DESTDIR="${pkgdir}" install
+
+# Conflict with -qt5
+  rm -r "$pkgdir"/usr/share/icons
+}
+
+package_phonon-qt5-gstreamer() {
+  pkgdesc="Phonon GStreamer backend for Qt5"
+  depends=(gst-plugins-base qt5-x11extras phonon-qt5)
+
+  cd build-qt5
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/phonon-gstreamer-gst15_include_dirs.patch
===================================================================
--- extra-x86_64/phonon-gstreamer-gst15_include_dirs.patch	2017-02-23 12:00:32 UTC (rev 289426)
+++ extra-x86_64/phonon-gstreamer-gst15_include_dirs.patch	2017-02-23 12:00:59 UTC (rev 289427)
@@ -1,95 +0,0 @@
-diff -up phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake.gst15 phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake
---- phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake.gst15	2014-12-27 08:05:27.000000000 -0600
-+++ phonon-backend-gstreamer-4.8.2/cmake/FindGStreamer.cmake	2015-07-06 08:46:39.288178885 -0500
-@@ -2,7 +2,7 @@
- # Once done this will define
- #
- #  GSTREAMER_FOUND - system has GStreamer
--#  GSTREAMER_INCLUDE_DIR - the GStreamer include directory
-+#  GSTREAMER_INCLUDE_DIRS - the GStreamer include directory
- #  GSTREAMER_LIBRARIES - the libraries needed to use GStreamer
- #  GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer
- #  GSTREAMER_VERSION - the version of GStreamer
-@@ -13,12 +13,12 @@
- # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_1.0_FOUND etc)
- 
- 
--IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-+IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-    # in cache already
-    SET(GStreamer_FIND_QUIETLY TRUE)
--ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-+ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-    SET(GStreamer_FIND_QUIETLY FALSE)
--ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-+ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
- 
- IF (NOT WIN32)
-    FIND_PACKAGE(PkgConfig REQUIRED)
-@@ -28,13 +28,15 @@ IF (NOT WIN32)
-    PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-1.0)
-    SET(GSTREAMER_VERSION ${PKG_GSTREAMER_VERSION})
-    SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
--ENDIF (NOT WIN32)
--
--FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
-+   SET(GSTREAMER_INCLUDE_DIRS ${PKG_GSTREAMER_INCLUDE_DIRS})
-+ELSE (NOT WIN32)
-+## FIXME?
-+FIND_PATH(GSTREAMER_INCLUDE_DIRS gst/gst.h
-    PATHS
-    ${PKG_GSTREAMER_INCLUDE_DIRS}
-    PATH_SUFFIXES gstreamer-1.0
-    )
-+ENDIF (NOT WIN32)
- 
- FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
-    PATHS
-@@ -51,10 +53,10 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES
-    ${PKG_GSTREAMER_LIBRARY_DIRS}
-    )
- 
--IF (GSTREAMER_INCLUDE_DIR)
--ELSE (GSTREAMER_INCLUDE_DIR)
--   MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
--ENDIF (GSTREAMER_INCLUDE_DIR)
-+IF (GSTREAMER_INCLUDE_DIRS)
-+ELSE (GSTREAMER_INCLUDE_DIRS)
-+   MESSAGE(STATUS "GStreamer: WARNING: include dirs not found")
-+ENDIF (GSTREAMER_INCLUDE_DIRS)
- 
- IF (GSTREAMER_LIBRARIES)
- ELSE (GSTREAMER_LIBRARIES)
-@@ -66,11 +68,11 @@ ELSE (GSTREAMER_APP_LIBRARY)
-    MESSAGE(STATUS "GStreamer: WARNING: app library not found")
- ENDIF (GSTREAMER_APP_LIBRARY)
- 
--IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-+IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-    SET(GSTREAMER_FOUND TRUE)
--ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-+ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-    SET(GSTREAMER_FOUND FALSE)
--ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
-+ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_APP_LIBRARY)
- 
- IF (GSTREAMER_FOUND)
-    IF (NOT GStreamer_FIND_QUIETLY)
-@@ -82,4 +84,4 @@ ELSE (GSTREAMER_FOUND)
-    ENDIF (GStreamer_FIND_REQUIRED)
- ENDIF (GSTREAMER_FOUND)
- 
--MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY GSTREAMER_APP_LIBRARY)
-+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY GSTREAMER_APP_LIBRARY)
-diff -up phonon-backend-gstreamer-4.8.2/gstreamer/CMakeLists.txt.gst15 phonon-backend-gstreamer-4.8.2/gstreamer/CMakeLists.txt
---- phonon-backend-gstreamer-4.8.2/gstreamer/CMakeLists.txt.gst15	2015-07-06 08:54:25.613865469 -0500
-+++ phonon-backend-gstreamer-4.8.2/gstreamer/CMakeLists.txt	2015-07-06 08:54:28.046921794 -0500
-@@ -15,7 +15,7 @@
- 
- include_directories(
-       ${CMAKE_CURRENT_BINARY_DIR}
--      ${GSTREAMER_INCLUDE_DIR}
-+      ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_INCLUDE_DIRS}
-       ${GSTREAMER_PLUGIN_VIDEO_INCLUDE_DIR}
-       ${GSTREAMER_PLUGIN_AUDIO_INCLUDE_DIR}
-       ${GSTREAMER_PLUGIN_PBUTILS_INCLUDE_DIR}

Deleted: extra-x86_64/phonon-qt4-gstreamer.install
===================================================================
--- extra-x86_64/phonon-qt4-gstreamer.install	2017-02-23 12:00:32 UTC (rev 289426)
+++ extra-x86_64/phonon-qt4-gstreamer.install	2017-02-23 12:00:59 UTC (rev 289427)
@@ -1,11 +0,0 @@
-post_install(){
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}



More information about the arch-commits mailing list